From 3d3aa0cbac623e1652a802d956f549acf3614e8d Mon Sep 17 00:00:00 2001
From: Janne Mareike Koschinski <mail@justjanne.de>
Date: Fri, 22 Nov 2024 21:42:50 +0100
Subject: [PATCH] chore: update tests

---
 app/build.gradle.kts                           |  5 +++--
 .../quasseldroid/AccountBehaviorTest.kt        | 12 +++++++-----
 .../quasseldroid/ActivityLifecycleHandler.kt   | 18 +++++++++---------
 gradle/libs.versions.toml                      |  4 +++-
 4 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 917a9b8d6..bca3b5201 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,8 +1,8 @@
 /*
  * Quasseldroid - Quassel client for Android
  *
- * Copyright (c) 2019 Janne Mareike Koschinski
- * Copyright (c) 2019 The Quassel Project
+ * Copyright (c) 2024 Janne Mareike Koschinski
+ * Copyright (c) 2024 The Quassel Project
  *
  * 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
@@ -137,5 +137,6 @@ dependencies {
   androidTestImplementation(libs.androidx.test.espresso.core)
   androidTestImplementation(libs.androidx.test.espresso.contrib)
   androidTestImplementation(libs.androidx.test.junit)
+  androidTestImplementation(libs.androidx.test.junit.ktx)
   androidTestImplementation(libs.androidx.test.runner)
 }
diff --git a/app/src/androidTest/java/de/kuschku/quasseldroid/AccountBehaviorTest.kt b/app/src/androidTest/java/de/kuschku/quasseldroid/AccountBehaviorTest.kt
index 06b2ce8dd..0f8dcbcb1 100644
--- a/app/src/androidTest/java/de/kuschku/quasseldroid/AccountBehaviorTest.kt
+++ b/app/src/androidTest/java/de/kuschku/quasseldroid/AccountBehaviorTest.kt
@@ -1,8 +1,8 @@
 /*
  * Quasseldroid - Quassel client for Android
  *
- * Copyright (c) 2020 Janne Mareike Koschinski
- * Copyright (c) 2020 The Quassel Project
+ * Copyright (c) 2024 Janne Mareike Koschinski
+ * Copyright (c) 2024 The Quassel Project
  *
  * 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
@@ -22,15 +22,17 @@ package de.kuschku.quasseldroid
 import android.view.View
 import androidx.recyclerview.widget.RecyclerView
 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.matcher.ViewMatchers
 import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility
 import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
 import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.rule.ActivityTestRule
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.google.android.material.textfield.TextInputEditText
 import de.kuschku.quasseldroid.ui.chat.ChatActivity
@@ -49,7 +51,7 @@ import java.lang.Thread.sleep
 @LargeTest
 class AccountBehaviorTest {
   @get:Rule
-  val activityActivityTestRule = ActivityTestRule(ChatActivity::class.java)
+  val activityScenarioTestRule = ActivityScenarioRule(ChatActivity::class.java)
 
   data class TestData(
     val host: String,
diff --git a/app/src/androidTest/java/de/kuschku/quasseldroid/ActivityLifecycleHandler.kt b/app/src/androidTest/java/de/kuschku/quasseldroid/ActivityLifecycleHandler.kt
index 629e9f2bd..f2c38f743 100644
--- a/app/src/androidTest/java/de/kuschku/quasseldroid/ActivityLifecycleHandler.kt
+++ b/app/src/androidTest/java/de/kuschku/quasseldroid/ActivityLifecycleHandler.kt
@@ -1,8 +1,8 @@
 /*
  * Quasseldroid - Quassel client for Android
  *
- * Copyright (c) 2020 Janne Mareike Koschinski
- * Copyright (c) 2020 The Quassel Project
+ * Copyright (c) 2024 Janne Mareike Koschinski
+ * Copyright (c) 2024 The Quassel Project
  *
  * 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
@@ -27,17 +27,17 @@ class ActivityLifecycleHandler : Application.ActivityLifecycleCallbacks {
   var currentActivity: Activity? = null
     private set
 
-  override fun onActivityCreated(activity: Activity?, savedInstanceState: Bundle?) = Unit
-  override fun onActivityStarted(activity: Activity?) = Unit
-  override fun onActivityResumed(activity: Activity?) {
+  override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) = Unit
+  override fun onActivityStarted(activity: Activity) = Unit
+  override fun onActivityResumed(activity: Activity) {
     currentActivity = activity
   }
 
-  override fun onActivityPaused(activity: Activity?) {
+  override fun onActivityPaused(activity: Activity) {
     currentActivity = null
   }
 
-  override fun onActivityStopped(activity: Activity?) = Unit
-  override fun onActivitySaveInstanceState(activity: Activity?, outState: Bundle?) = Unit
-  override fun onActivityDestroyed(activity: Activity?) = Unit
+  override fun onActivityStopped(activity: Activity) = Unit
+  override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) = Unit
+  override fun onActivityDestroyed(activity: Activity) = Unit
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8bd8b81ad..053780ccb 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -5,6 +5,7 @@ androidx-espresso = "3.6.1"
 androidx-lifecycle = "2.8.7"
 androidx-room = "2.6.1"
 androidx-test = "1.6.2"
+androidx-test-junit = "1.2.1"
 dagger = "2.52"
 glide = "4.16.0"
 kotlin = "2.0.21"
@@ -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-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-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-runner = { module = "androidx.test:runner", version.ref = "androidx-test" }
 
-- 
GitLab