From 40791ca462a3102420d2129189ee988d39d5bfeb Mon Sep 17 00:00:00 2001 From: Gergely Hegedus Date: Mon, 24 Jan 2022 16:00:49 +0200 Subject: [PATCH] Issue#16 Move login state setup into homerobot --- .../java/org/fnives/test/showcase/ui/home/HomeRobot.kt | 10 ++++++++++ .../fnives/test/showcase/ui/home/MainActivityTest.kt | 3 +-- .../fnives/test/showcase/ui/home/MainActivityTest.kt | 3 +-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/src/sharedTest/java/org/fnives/test/showcase/ui/home/HomeRobot.kt b/app/src/sharedTest/java/org/fnives/test/showcase/ui/home/HomeRobot.kt index 43b31d8..8a9f398 100644 --- a/app/src/sharedTest/java/org/fnives/test/showcase/ui/home/HomeRobot.kt +++ b/app/src/sharedTest/java/org/fnives/test/showcase/ui/home/HomeRobot.kt @@ -19,7 +19,10 @@ import androidx.test.espresso.matcher.ViewMatchers.withText import org.fnives.test.showcase.R import org.fnives.test.showcase.model.content.Content import org.fnives.test.showcase.model.content.FavouriteContent +import org.fnives.test.showcase.network.mockserver.MockServerScenarioSetup +import org.fnives.test.showcase.testutils.configuration.MainDispatcherTestRule import org.fnives.test.showcase.testutils.robot.Robot +import org.fnives.test.showcase.testutils.statesetup.SetupAuthenticationState import org.fnives.test.showcase.testutils.viewactions.PullToRefresh import org.fnives.test.showcase.testutils.viewactions.WithDrawable import org.fnives.test.showcase.testutils.viewactions.notIntended @@ -100,4 +103,11 @@ class HomeRobot : Robot { Espresso.onView(withId(R.id.error_message)) .check(matches(allOf(isDisplayed(), withText(R.string.something_went_wrong)))) } + + fun setupLogin( + mainDispatcherTestRule: MainDispatcherTestRule, + mockServerScenarioSetup: MockServerScenarioSetup + ) { + SetupAuthenticationState.setupLogin(mainDispatcherTestRule, mockServerScenarioSetup) + } } diff --git a/app/src/sharedTestHilt/java/org/fnives/test/showcase/ui/home/MainActivityTest.kt b/app/src/sharedTestHilt/java/org/fnives/test/showcase/ui/home/MainActivityTest.kt index 6cfee42..aacaf2b 100644 --- a/app/src/sharedTestHilt/java/org/fnives/test/showcase/ui/home/MainActivityTest.kt +++ b/app/src/sharedTestHilt/java/org/fnives/test/showcase/ui/home/MainActivityTest.kt @@ -17,7 +17,6 @@ import org.fnives.test.showcase.testutils.idling.NetworkSynchronization import org.fnives.test.showcase.testutils.idling.loopMainThreadFor import org.fnives.test.showcase.testutils.idling.loopMainThreadUntilIdleWithIdlingResources import org.fnives.test.showcase.testutils.robot.RobotTestRule -import org.fnives.test.showcase.testutils.statesetup.SetupAuthenticationState import org.junit.After import org.junit.Before import org.junit.Rule @@ -69,7 +68,7 @@ class MainActivityTest { hiltRule.inject() disposable = networkSynchronization.registerNetworkingSynchronization() - SetupAuthenticationState.setupLogin(mainDispatcherTestRule, mockServerScenarioSetupTestRule.mockServerScenarioSetup) + homeRobot.setupLogin(mainDispatcherTestRule, mockServerScenarioSetupTestRule.mockServerScenarioSetup) } @After diff --git a/app/src/sharedTestKoin/java/org/fnives/test/showcase/ui/home/MainActivityTest.kt b/app/src/sharedTestKoin/java/org/fnives/test/showcase/ui/home/MainActivityTest.kt index 39c076a..aa2d19a 100644 --- a/app/src/sharedTestKoin/java/org/fnives/test/showcase/ui/home/MainActivityTest.kt +++ b/app/src/sharedTestKoin/java/org/fnives/test/showcase/ui/home/MainActivityTest.kt @@ -16,7 +16,6 @@ import org.fnives.test.showcase.testutils.idling.NetworkSynchronization import org.fnives.test.showcase.testutils.idling.loopMainThreadFor import org.fnives.test.showcase.testutils.idling.loopMainThreadUntilIdleWithIdlingResources import org.fnives.test.showcase.testutils.robot.RobotTestRule -import org.fnives.test.showcase.testutils.statesetup.SetupAuthenticationState import org.junit.After import org.junit.Before import org.junit.Rule @@ -64,7 +63,7 @@ class MainActivityTest : KoinTest { .invoke(mockServerScenarioSetupTestRule.mockServerScenarioSetup) disposable = NetworkSynchronization.registerNetworkingSynchronization() - SetupAuthenticationState.setupLogin( + homeRobot.setupLogin( mainDispatcherTestRule, mockServerScenarioSetupTestRule.mockServerScenarioSetup )