Skip to content
Snippets Groups Projects
Unverified Commit 3d3aa0cb authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

chore: update tests

parent c4d8ef42
No related branches found
No related tags found
No related merge requests found
/* /*
* Quasseldroid - Quassel client for Android * Quasseldroid - Quassel client for Android
* *
* Copyright (c) 2019 Janne Mareike Koschinski * Copyright (c) 2024 Janne Mareike Koschinski
* Copyright (c) 2019 The Quassel Project * Copyright (c) 2024 The Quassel Project
* *
* This program is free software: you can redistribute it and/or modify it * This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 3 as published * under the terms of the GNU General Public License version 3 as published
...@@ -137,5 +137,6 @@ dependencies { ...@@ -137,5 +137,6 @@ dependencies {
androidTestImplementation(libs.androidx.test.espresso.core) androidTestImplementation(libs.androidx.test.espresso.core)
androidTestImplementation(libs.androidx.test.espresso.contrib) androidTestImplementation(libs.androidx.test.espresso.contrib)
androidTestImplementation(libs.androidx.test.junit) androidTestImplementation(libs.androidx.test.junit)
androidTestImplementation(libs.androidx.test.junit.ktx)
androidTestImplementation(libs.androidx.test.runner) androidTestImplementation(libs.androidx.test.runner)
} }
/* /*
* Quasseldroid - Quassel client for Android * Quasseldroid - Quassel client for Android
* *
* Copyright (c) 2020 Janne Mareike Koschinski * Copyright (c) 2024 Janne Mareike Koschinski
* Copyright (c) 2020 The Quassel Project * Copyright (c) 2024 The Quassel Project
* *
* This program is free software: you can redistribute it and/or modify it * This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 3 as published * under the terms of the GNU General Public License version 3 as published
...@@ -22,15 +22,17 @@ package de.kuschku.quasseldroid ...@@ -22,15 +22,17 @@ package de.kuschku.quasseldroid
import android.view.View import android.view.View
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import androidx.test.espresso.Espresso.onView import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.action.ViewActions.* import androidx.test.espresso.action.ViewActions.clearText
import androidx.test.espresso.action.ViewActions.click
import androidx.test.espresso.action.ViewActions.typeText
import androidx.test.espresso.contrib.RecyclerViewActions import androidx.test.espresso.contrib.RecyclerViewActions
import androidx.test.espresso.matcher.ViewMatchers import androidx.test.espresso.matcher.ViewMatchers
import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility
import androidx.test.espresso.matcher.ViewMatchers.withId import androidx.test.espresso.matcher.ViewMatchers.withId
import androidx.test.ext.junit.rules.ActivityScenarioRule
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.LargeTest import androidx.test.filters.LargeTest
import androidx.test.platform.app.InstrumentationRegistry import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.rule.ActivityTestRule
import com.google.android.material.floatingactionbutton.FloatingActionButton import com.google.android.material.floatingactionbutton.FloatingActionButton
import com.google.android.material.textfield.TextInputEditText import com.google.android.material.textfield.TextInputEditText
import de.kuschku.quasseldroid.ui.chat.ChatActivity import de.kuschku.quasseldroid.ui.chat.ChatActivity
...@@ -49,7 +51,7 @@ import java.lang.Thread.sleep ...@@ -49,7 +51,7 @@ import java.lang.Thread.sleep
@LargeTest @LargeTest
class AccountBehaviorTest { class AccountBehaviorTest {
@get:Rule @get:Rule
val activityActivityTestRule = ActivityTestRule(ChatActivity::class.java) val activityScenarioTestRule = ActivityScenarioRule(ChatActivity::class.java)
data class TestData( data class TestData(
val host: String, val host: String,
......
/* /*
* Quasseldroid - Quassel client for Android * Quasseldroid - Quassel client for Android
* *
* Copyright (c) 2020 Janne Mareike Koschinski * Copyright (c) 2024 Janne Mareike Koschinski
* Copyright (c) 2020 The Quassel Project * Copyright (c) 2024 The Quassel Project
* *
* This program is free software: you can redistribute it and/or modify it * This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 3 as published * under the terms of the GNU General Public License version 3 as published
...@@ -27,17 +27,17 @@ class ActivityLifecycleHandler : Application.ActivityLifecycleCallbacks { ...@@ -27,17 +27,17 @@ class ActivityLifecycleHandler : Application.ActivityLifecycleCallbacks {
var currentActivity: Activity? = null var currentActivity: Activity? = null
private set private set
override fun onActivityCreated(activity: Activity?, savedInstanceState: Bundle?) = Unit override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) = Unit
override fun onActivityStarted(activity: Activity?) = Unit override fun onActivityStarted(activity: Activity) = Unit
override fun onActivityResumed(activity: Activity?) { override fun onActivityResumed(activity: Activity) {
currentActivity = activity currentActivity = activity
} }
override fun onActivityPaused(activity: Activity?) { override fun onActivityPaused(activity: Activity) {
currentActivity = null currentActivity = null
} }
override fun onActivityStopped(activity: Activity?) = Unit override fun onActivityStopped(activity: Activity) = Unit
override fun onActivitySaveInstanceState(activity: Activity?, outState: Bundle?) = Unit override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) = Unit
override fun onActivityDestroyed(activity: Activity?) = Unit override fun onActivityDestroyed(activity: Activity) = Unit
} }
...@@ -5,6 +5,7 @@ androidx-espresso = "3.6.1" ...@@ -5,6 +5,7 @@ androidx-espresso = "3.6.1"
androidx-lifecycle = "2.8.7" androidx-lifecycle = "2.8.7"
androidx-room = "2.6.1" androidx-room = "2.6.1"
androidx-test = "1.6.2" androidx-test = "1.6.2"
androidx-test-junit = "1.2.1"
dagger = "2.52" dagger = "2.52"
glide = "4.16.0" glide = "4.16.0"
kotlin = "2.0.21" kotlin = "2.0.21"
...@@ -39,7 +40,8 @@ androidx-swiperefreshlayout = { module = "androidx.swiperefreshlayout:swiperefre ...@@ -39,7 +40,8 @@ androidx-swiperefreshlayout = { module = "androidx.swiperefreshlayout:swiperefre
androidx-test-core = { module = "androidx.arch.core:core-testing", version = "2.2.0" } androidx-test-core = { module = "androidx.arch.core:core-testing", version = "2.2.0" }
androidx-test-espresso-contrib = { module = "androidx.test.espresso:espresso-contrib", version.ref = "androidx-espresso" } androidx-test-espresso-contrib = { module = "androidx.test.espresso:espresso-contrib", version.ref = "androidx-espresso" }
androidx-test-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidx-espresso" } androidx-test-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidx-espresso" }
androidx-test-junit = { module = "androidx.test.ext:junit", version = "1.2.1" } androidx-test-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-test-junit" }
androidx-test-junit-ktx = { module = "androidx.test.ext:junit-ktx", version.ref = "androidx-test-junit" }
androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidx-test" } androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidx-test" }
androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidx-test" } androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidx-test" }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment