shared-tests #4

pieteckhart · Sep 3, 2023 · d950c79 · d950c79
1 parent 24c2f47
commit d950c79
Show file tree

Hide file tree

Showing 38 changed files with 709 additions and 997 deletions.
diff --git a/app-wear-shared/shared-impl/src/test/kotlin/info/nightscout/androidaps/TestBase.kt b/app-wear-shared/shared-impl/src/test/kotlin/info/nightscout/androidaps/TestBase.kt
diff --git a/...androidaps/mocks/SharedPreferencesMock.kt → ...cout/shared/impl/SharedPreferencesMock.kt b/...androidaps/mocks/SharedPreferencesMock.kt → ...cout/shared/impl/SharedPreferencesMock.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.mocks
+package info.nightscout.shared.impl
 
 import android.content.SharedPreferences
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener

diff --git a/app-wear-shared/shared-impl/src/test/kotlin/info/nightscout/shared/impl/logging/LImplTest.kt b/app-wear-shared/shared-impl/src/test/kotlin/info/nightscout/shared/impl/logging/LImplTest.kt
@@ -1,14 +1,19 @@
 package info.nightscout.shared.impl.logging
 
-import info.nightscout.androidaps.TestBase
 import info.nightscout.rx.logging.LTag
 import info.nightscout.shared.sharedPreferences.SP
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.extension.ExtendWith
 import org.mockito.Mock
+import org.mockito.junit.jupiter.MockitoExtension
+import org.mockito.junit.jupiter.MockitoSettings
+import org.mockito.quality.Strictness
 
-class LImplTest : TestBase() {
+@ExtendWith(MockitoExtension::class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class LImplTest {
 
     @Mock lateinit var sp: SP
 

diff --git a/...mpl/src/test/kotlin/info/nightscout/shared/impl/sharedPreferences/SPImplementationTest.kt b/...mpl/src/test/kotlin/info/nightscout/shared/impl/sharedPreferences/SPImplementationTest.kt
@@ -1,15 +1,20 @@
 package info.nightscout.shared.impl.sharedPreferences
 
 import android.content.Context
-import info.nightscout.androidaps.TestBase
-import info.nightscout.androidaps.mocks.SharedPreferencesMock
+import info.nightscout.shared.impl.SharedPreferencesMock
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.extension.ExtendWith
 import org.mockito.Mock
 import org.mockito.Mockito
+import org.mockito.junit.jupiter.MockitoExtension
+import org.mockito.junit.jupiter.MockitoSettings
+import org.mockito.quality.Strictness
 
-class SPImplementationTest : TestBase() {
+@ExtendWith(MockitoExtension::class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class SPImplementationTest {
 
     private val sharedPreferences: SharedPreferencesMock = SharedPreferencesMock()
     @Mock lateinit var context: Context

diff --git a/core/main/build.gradle b/core/main/build.gradle
@@ -20,6 +20,8 @@ dependencies {
     implementation project(':core:ui')
     implementation project(':core:utils')
 
+    testImplementation project(':app-wear-shared:shared-tests')
+
     api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
     api "com.google.guava:guava:$guava_version"

diff --git a/core/main/src/test/java/info/nightscout/androidaps/HardLimitsMock.kt b/core/main/src/test/java/info/nightscout/androidaps/HardLimitsMock.kt
diff --git a/core/main/src/test/java/info/nightscout/androidaps/TestBase.kt b/core/main/src/test/java/info/nightscout/androidaps/TestBase.kt
diff --git a/core/main/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt b/core/main/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
diff --git a/core/main/src/test/java/info/nightscout/androidaps/TestPumpPlugin.kt b/core/main/src/test/java/info/nightscout/androidaps/TestPumpPlugin.kt