Move KoinTest to base class

wireapp · Jun 30, 2020 · a665d4a · a665d4a
1 parent a417833
commit a665d4a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/app/src/androidTest/kotlin/com/wire/android/FunctionalTest.kt b/app/src/androidTest/kotlin/com/wire/android/FunctionalTest.kt
@@ -6,16 +6,21 @@ import androidx.test.filters.LargeTest
 import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
 import androidx.test.rule.ActivityTestRule
 import androidx.test.uiautomator.UiDevice
+import com.wire.android.framework.koinMockRule
 import org.junit.Rule
 import org.junit.runner.RunWith
+import org.koin.test.KoinTest
 
 @RunWith(AndroidJUnit4::class)
 @LargeTest
-open class FunctionalTest(clazz: Class<out Activity>) {
+abstract class FunctionalTest(clazz: Class<out Activity>) : KoinTest {
 
     @get:Rule
     val activityRule = ActivityTestRule(clazz)
 
+    @get:Rule
+    val mockProvider = koinMockRule()
+
     val uiDevice = UiDevice.getInstance(getInstrumentation())
 
     fun rotateScreen(block: () -> Unit) = with(uiDevice) {

diff --git a/...roidTest/kotlin/com/wire/android/feature/auth/registration/CreateAccountActivityUITest.kt b/...roidTest/kotlin/com/wire/android/feature/auth/registration/CreateAccountActivityUITest.kt
@@ -11,19 +11,13 @@ import com.wire.android.core.exception.Conflict
 import com.wire.android.core.exception.Forbidden
 import com.wire.android.core.functional.Either
 import com.wire.android.feature.auth.activation.ActivationRepository
-import com.wire.android.framework.koinMockRule
 import kotlinx.coroutines.runBlocking
 import org.junit.Before
-import org.junit.Rule
 import org.junit.Test
-import org.koin.test.KoinTest
 import org.koin.test.mock.declareMock
 import org.mockito.Mockito.`when`
 
-class CreateAccountActivityUITest : FunctionalTest(CreateAccountActivity::class.java), KoinTest {
-
-    @get:Rule
-    val mockProvider = koinMockRule()
+class CreateAccountActivityUITest : FunctionalTest(CreateAccountActivity::class.java) {
 
     @Before
     fun setup() {