From 1223bfdc9afd214ccb934ede2e3cf5f4b9ff0331 Mon Sep 17 00:00:00 2001
From: Gergely Hegedus <hegedusgergely@yahoo.com>
Date: Wed, 26 Jan 2022 00:22:00 +0200
Subject: [PATCH] Issue#39 Fix most test's running time via using close on
 ActivityScenario.

---
 .../testutils/statesetup/SetupAuthenticationState.kt         | 4 ++--
 .../org/fnives/test/showcase/ui/home/MainActivityTest.kt     | 5 ++---
 .../org/fnives/test/showcase/ui/login/AuthActivityTest.kt    | 3 +--
 .../org/fnives/test/showcase/ui/splash/SplashActivityTest.kt | 2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/src/sharedTest/java/org/fnives/test/showcase/testutils/statesetup/SetupAuthenticationState.kt b/app/src/sharedTest/java/org/fnives/test/showcase/testutils/statesetup/SetupAuthenticationState.kt
index b6a6dd3..febf535 100644
--- a/app/src/sharedTest/java/org/fnives/test/showcase/testutils/statesetup/SetupAuthenticationState.kt
+++ b/app/src/sharedTest/java/org/fnives/test/showcase/testutils/statesetup/SetupAuthenticationState.kt
@@ -29,7 +29,7 @@ object SetupAuthenticationState : KoinTest {
 
         mainDispatcherTestRule.advanceUntilIdleOrActivityIsDestroyed()
 
-        activityScenario.moveToState(Lifecycle.State.DESTROYED)
+        activityScenario.close()
     }
 
     fun setupLogout(
@@ -43,6 +43,6 @@ object SetupAuthenticationState : KoinTest {
 
         mainDispatcherTestRule.advanceUntilIdleOrActivityIsDestroyed()
 
-        activityScenario.moveToState(Lifecycle.State.DESTROYED)
+        activityScenario.close()
     }
 }
diff --git a/app/src/sharedTest/java/org/fnives/test/showcase/ui/home/MainActivityTest.kt b/app/src/sharedTest/java/org/fnives/test/showcase/ui/home/MainActivityTest.kt
index 8534fb1..e4ff3a2 100644
--- a/app/src/sharedTest/java/org/fnives/test/showcase/ui/home/MainActivityTest.kt
+++ b/app/src/sharedTest/java/org/fnives/test/showcase/ui/home/MainActivityTest.kt
@@ -1,7 +1,6 @@
 package org.fnives.test.showcase.ui.home
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
-import androidx.lifecycle.Lifecycle
 import androidx.test.core.app.ActivityScenario
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.fnives.test.showcase.model.content.FavouriteContent
@@ -73,7 +72,7 @@ class MainActivityTest : KoinTest {
 
     @After
     fun tearDown() {
-        activityScenario.moveToState(Lifecycle.State.DESTROYED)
+        activityScenario.close()
         disposable.dispose()
     }
 
@@ -130,7 +129,7 @@ class MainActivityTest : KoinTest {
 
         val expectedItem = FavouriteContent(ContentData.contentSuccess.first(), true)
 
-        activityScenario.moveToState(Lifecycle.State.DESTROYED)
+        activityScenario.close()
         activityScenario = ActivityScenario.launch(MainActivity::class.java)
         mainDispatcherTestRule.advanceUntilIdleWithIdlingResources()
 
diff --git a/app/src/sharedTest/java/org/fnives/test/showcase/ui/login/AuthActivityTest.kt b/app/src/sharedTest/java/org/fnives/test/showcase/ui/login/AuthActivityTest.kt
index 74e0d91..f725e74 100644
--- a/app/src/sharedTest/java/org/fnives/test/showcase/ui/login/AuthActivityTest.kt
+++ b/app/src/sharedTest/java/org/fnives/test/showcase/ui/login/AuthActivityTest.kt
@@ -1,7 +1,6 @@
 package org.fnives.test.showcase.ui.login
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
-import androidx.lifecycle.Lifecycle
 import androidx.test.core.app.ActivityScenario
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.fnives.test.showcase.R
@@ -63,7 +62,7 @@ class AuthActivityTest : KoinTest {
 
     @After
     fun tearDown() {
-        activityScenario.moveToState(Lifecycle.State.DESTROYED)
+        activityScenario.close()
         disposable.dispose()
     }
 
diff --git a/app/src/sharedTest/java/org/fnives/test/showcase/ui/splash/SplashActivityTest.kt b/app/src/sharedTest/java/org/fnives/test/showcase/ui/splash/SplashActivityTest.kt
index 9d865c9..cb811b0 100644
--- a/app/src/sharedTest/java/org/fnives/test/showcase/ui/splash/SplashActivityTest.kt
+++ b/app/src/sharedTest/java/org/fnives/test/showcase/ui/splash/SplashActivityTest.kt
@@ -51,7 +51,7 @@ class SplashActivityTest : KoinTest {
 
     @After
     fun tearDown() {
-        activityScenario.moveToState(Lifecycle.State.DESTROYED)
+        activityScenario.close()
         disposable.dispose()
     }