From 2c01fbba204e852197895e6df44c8eb08d97f5f5 Mon Sep 17 00:00:00 2001 From: Gergely Hegedus Date: Fri, 27 May 2022 16:45:01 +0300 Subject: [PATCH] Issue#67 Extract IdlingResources helpers into a separate module --- .../org/fnives/test/showcase/ui/AuthComposeInstrumentedTest.kt | 2 +- .../fnives/test/showcase/testutils/idling/DispatcherTestRule.kt | 2 ++ .../test/showcase/testutils/idling/MainDispatcherTestRule.kt | 2 ++ .../synchronization/idlingresources/IdlingResourcesHelper.kt | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) rename app/src/sharedTest/java/org/fnives/test/showcase/testutils/idling/awaitIdlingResources.kt => test-util-android/src/main/java/org/fnives/test/showcase/android/testutil/synchronization/idlingresources/IdlingResourcesHelper.kt (94%) diff --git a/app/src/androidTest/java/org/fnives/test/showcase/ui/AuthComposeInstrumentedTest.kt b/app/src/androidTest/java/org/fnives/test/showcase/ui/AuthComposeInstrumentedTest.kt index 4ee0571..ad48717 100644 --- a/app/src/androidTest/java/org/fnives/test/showcase/ui/AuthComposeInstrumentedTest.kt +++ b/app/src/androidTest/java/org/fnives/test/showcase/ui/AuthComposeInstrumentedTest.kt @@ -10,7 +10,7 @@ import org.fnives.test.showcase.core.login.IsUserLoggedInUseCase import org.fnives.test.showcase.network.mockserver.scenario.auth.AuthScenario import org.fnives.test.showcase.testutils.MockServerScenarioSetupResetingTestRule import org.fnives.test.showcase.testutils.idling.DispatcherTestRule -import org.fnives.test.showcase.testutils.idling.anyResourceIdling +import org.fnives.test.showcase.android.testutil.synchronization.idlingresources.anyResourceIdling import org.junit.Before import org.junit.Rule import org.junit.Test diff --git a/app/src/sharedTest/java/org/fnives/test/showcase/testutils/idling/DispatcherTestRule.kt b/app/src/sharedTest/java/org/fnives/test/showcase/testutils/idling/DispatcherTestRule.kt index 26a7d43..687a8ce 100644 --- a/app/src/sharedTest/java/org/fnives/test/showcase/testutils/idling/DispatcherTestRule.kt +++ b/app/src/sharedTest/java/org/fnives/test/showcase/testutils/idling/DispatcherTestRule.kt @@ -3,11 +3,13 @@ package org.fnives.test.showcase.testutils.idling import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.StandardTestDispatcher import kotlinx.coroutines.test.TestDispatcher +import org.fnives.test.showcase.android.testutil.synchronization.idlingresources.anyResourceIdling import org.fnives.test.showcase.android.testutil.synchronization.runOnUIAwaitOnCurrent import org.fnives.test.showcase.testutils.storage.TestDatabaseInitialization import org.junit.rules.TestRule import org.junit.runner.Description import org.junit.runners.model.Statement +import org.fnives.test.showcase.android.testutil.synchronization.idlingresources.awaitIdlingResources @OptIn(ExperimentalCoroutinesApi::class) class DispatcherTestRule : TestRule { diff --git a/app/src/sharedTest/java/org/fnives/test/showcase/testutils/idling/MainDispatcherTestRule.kt b/app/src/sharedTest/java/org/fnives/test/showcase/testutils/idling/MainDispatcherTestRule.kt index 59a1fb9..5721e0e 100644 --- a/app/src/sharedTest/java/org/fnives/test/showcase/testutils/idling/MainDispatcherTestRule.kt +++ b/app/src/sharedTest/java/org/fnives/test/showcase/testutils/idling/MainDispatcherTestRule.kt @@ -6,11 +6,13 @@ import kotlinx.coroutines.test.StandardTestDispatcher import kotlinx.coroutines.test.TestDispatcher import kotlinx.coroutines.test.resetMain import kotlinx.coroutines.test.setMain +import org.fnives.test.showcase.android.testutil.synchronization.idlingresources.anyResourceIdling import org.fnives.test.showcase.android.testutil.synchronization.runOnUIAwaitOnCurrent import org.fnives.test.showcase.testutils.storage.TestDatabaseInitialization import org.junit.rules.TestRule import org.junit.runner.Description import org.junit.runners.model.Statement +import org.fnives.test.showcase.android.testutil.synchronization.idlingresources.awaitIdlingResources @OptIn(ExperimentalCoroutinesApi::class) class MainDispatcherTestRule : TestRule { diff --git a/app/src/sharedTest/java/org/fnives/test/showcase/testutils/idling/awaitIdlingResources.kt b/test-util-android/src/main/java/org/fnives/test/showcase/android/testutil/synchronization/idlingresources/IdlingResourcesHelper.kt similarity index 94% rename from app/src/sharedTest/java/org/fnives/test/showcase/testutils/idling/awaitIdlingResources.kt rename to test-util-android/src/main/java/org/fnives/test/showcase/android/testutil/synchronization/idlingresources/IdlingResourcesHelper.kt index 1814f2a..e8288f7 100644 --- a/app/src/sharedTest/java/org/fnives/test/showcase/testutils/idling/awaitIdlingResources.kt +++ b/test-util-android/src/main/java/org/fnives/test/showcase/android/testutil/synchronization/idlingresources/IdlingResourcesHelper.kt @@ -1,4 +1,4 @@ -package org.fnives.test.showcase.testutils.idling +package org.fnives.test.showcase.android.testutil.synchronization.idlingresources import androidx.test.espresso.IdlingRegistry import androidx.test.espresso.IdlingResource