Fix kpref tests

4 files changed, 69 insertions, 25 deletions

diff --git a/sample/build.gradle b/sample/build.gradle
index 2bd5ba8..77165e8 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -26,7 +26,7 @@ android {
         versionName androidGitVersion.name()
         versionCode androidGitVersion.code()
         multiDexEnabled true
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "ca.allanwang.kau.sample.SampleTestRunner"
     }
     viewBinding {
         enabled = true
diff --git a/sample/src/androidTest/kotlin/ca/allanwang/kau/sample/KPrefViewTest.kt b/sample/src/androidTest/kotlin/ca/allanwang/kau/sample/KPrefViewTest.kt
index 5847a94..156b66f 100644
--- a/sample/src/androidTest/kotlin/ca/allanwang/kau/sample/KPrefViewTest.kt
+++ b/sample/src/androidTest/kotlin/ca/allanwang/kau/sample/KPrefViewTest.kt
@@ -26,7 +26,6 @@ import androidx.test.espresso.matcher.ViewMatchers.withChild
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.MediumTest
-import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.ActivityTestRule
 import org.hamcrest.BaseMatcher
 import org.hamcrest.Description
@@ -35,13 +34,11 @@ import org.hamcrest.Matchers.allOf
 import org.hamcrest.Matchers.instanceOf
 import org.junit.Rule
 import org.junit.Test
+import org.junit.rules.RuleChain
+import org.junit.rules.TestRule
 import org.junit.runner.RunWith
-import org.koin.android.ext.koin.androidContext
-import org.koin.core.context.startKoin
-import org.koin.core.context.stopKoin
 import org.koin.test.KoinTest
 import org.koin.test.inject
-import kotlin.test.AfterTest
 import kotlin.test.BeforeTest
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
@@ -55,24 +52,18 @@ import kotlin.test.assertTrue
 @MediumTest
 class KPrefViewTest : KoinTest {
 
-    @get:Rule
     val activity: ActivityTestRule<MainActivity> = ActivityTestRule(MainActivity::class.java)
 
+    @get:Rule
+    val rule: TestRule = RuleChain.outerRule(SampleTestRule()).around(activity)
+
+    private val pref: KPrefSample by inject()
+
     @BeforeTest
     fun before() {
-        startKoin {
-            androidContext(InstrumentationRegistry.getInstrumentation().context)
-            modules(listOf(SampleApp.prefModule(), SampleTestApp.prefFactoryModule()))
-        }
-    }
-
-    @AfterTest
-    fun after() {
-        stopKoin()
+        pref.reset()
     }
 
-    private val pref: KPrefSample by inject()
-
     fun verifyCheck(checked: Boolean): Matcher<View> {
         return object : BoundedMatcher<View, View>(View::class.java) {
 
@@ -132,20 +123,24 @@ class KPrefViewTest : KoinTest {
     fun dependentCheckboxToggle() {
         val checkbox2 = onCheckboxView(withChild(withText(R.string.checkbox_2)))
         val checkbox3 =
-            onCheckboxView(withChild(withText(R.string.checkbox_3)), withChild(withText(R.string.desc_dependent)))
+            onCheckboxView(
+                withChild(withText(R.string.checkbox_3)),
+                withChild(withText(R.string.desc_dependent))
+            )
 
         assertFalse(pref.check2, "check2 not normalized")
         assertFalse(pref.check3, "check3 not normalized")
 
-        checkbox3.verifyCheck("checkbox3 init", true, true)
+        checkbox2.verifyCheck("checkbox2 init", checked = false, enabled = true)
+        checkbox3.verifyCheck("checkbox3 init", checked = false, enabled = false)
         checkbox3.perform(click())
-        checkbox3.verifyCheck("checkbox3 after click", false, true)
+        checkbox3.verifyCheck("checkbox3 after disabled click", checked = false, enabled = false)
 
         checkbox2.perform(click())
-        checkbox2.verifyCheck("checkbox2 after click", false, true)
-        checkbox3.verifyCheck("checkbox3 after checkbox2 click", false, false)
+        checkbox2.verifyCheck("checkbox2 after click", checked = true, enabled = true)
+        checkbox3.verifyCheck("checkbox3 after checkbox2 click", checked = false, enabled = true)
 
         checkbox3.perform(click())
-        checkbox3.verifyCheck("checkbox3 after disabled click", false, false)
+        checkbox3.verifyCheck("checkbox3 after enabled click", checked = true, enabled = true)
     }
 }
diff --git a/sample/src/androidTest/kotlin/ca/allanwang/kau/sample/SampleTestApp.kt b/sample/src/androidTest/kotlin/ca/allanwang/kau/sample/SampleTestApp.kt
index 4b0c4a7..8705fbc 100644
--- a/sample/src/androidTest/kotlin/ca/allanwang/kau/sample/SampleTestApp.kt
+++ b/sample/src/androidTest/kotlin/ca/allanwang/kau/sample/SampleTestApp.kt
@@ -1,10 +1,57 @@
 package ca.allanwang.kau.sample
 
+import android.app.Application
+import android.content.Context
+import androidx.test.runner.AndroidJUnitRunner
 import ca.allanwang.kau.kpref.KPrefFactory
 import ca.allanwang.kau.kpref.KPrefFactoryInMemory
+import ca.allanwang.kau.logging.KL
+import org.junit.rules.TestRule
+import org.junit.runner.Description
+import org.junit.runners.model.Statement
+import org.koin.android.ext.koin.androidContext
+import org.koin.android.ext.koin.androidLogger
+import org.koin.core.KoinComponent
+import org.koin.core.context.startKoin
+import org.koin.core.get
 import org.koin.dsl.module
 
-object SampleTestApp {
+class SampleTestRunner : AndroidJUnitRunner() {
+    override fun newApplication(
+        cl: ClassLoader?,
+        className: String?,
+        context: Context?
+    ): Application {
+        return super.newApplication(cl, SampleTestApp::class.java.name, context)
+    }
+}
+
+class SampleTestRule : TestRule {
+    override fun apply(base: Statement, description: Description): Statement =
+        object : Statement(), KoinComponent {
+            override fun evaluate() {
+
+                // Reset prefs
+                val pref: KPrefSample = get()
+                pref.reset()
+
+                base.evaluate()
+            }
+        }
+}
+
+class SampleTestApp : Application() {
+    override fun onCreate() {
+        super.onCreate()
+        startKoin {
+            if (BuildConfig.DEBUG) {
+                androidLogger()
+            }
+            androidContext(this@SampleTestApp)
+            modules(listOf(prefFactoryModule(), SampleApp.prefModule()))
+        }
+    }
+
     fun prefFactoryModule() = module {
         single<KPrefFactory> {
             KPrefFactoryInMemory
diff --git a/sample/src/androidTest/kotlin/ca/allanwang/kau/sample/utils/EspressoUtils.kt b/sample/src/androidTest/kotlin/ca/allanwang/kau/sample/utils/EspressoUtils.kt
index 09ad00a..2a6f0a9 100644
--- a/sample/src/androidTest/kotlin/ca/allanwang/kau/sample/utils/EspressoUtils.kt
+++ b/sample/src/androidTest/kotlin/ca/allanwang/kau/sample/utils/EspressoUtils.kt
@@ -15,6 +15,8 @@
  */
 package ca.allanwang.kau.sample.utils
 
+import android.content.Context
+import androidx.test.platform.app.InstrumentationRegistry
 import org.hamcrest.BaseMatcher
 import org.hamcrest.Description
 import org.hamcrest.Matcher