Adds ActivityScenario.close() calls to UI tests

Change-Id: I386fe61133cdb91ad273132e768fa896989c101b

Author: JoseAlcerreca

app/src/androidTestMock/java/com/example/android/architecture/blueprints/todoapp/tasks/AppNavigationTest.kt

@@ -51,6 +51,9 @@ import org.junit.runner.RunWith
 /**
  * Tests for the [DrawerLayout] layout component in [TasksActivity] which manages
  * navigation within the app.
+ *
+ * UI tests usually use [ActivityTestRule] but there's no API to perform an action before
+ * each test. The workaround is to use `ActivityScenario.launch()` and `ActivityScenario.close()`.
  */
 @RunWith(AndroidJUnit4::class)
 @LargeTest
@@ -117,6 +120,8 @@ class AppNavigationTest {
 
         // Check that tasks screen was opened.
         onView(withId(R.id.tasks_container_layout)).check(matches(isDisplayed()))
+        // When using ActivityScenario.launch, always call close()
+        activityScenario.close()
     }
 
     @Test
@@ -140,6 +145,8 @@ class AppNavigationTest {
         // Check if drawer is open
         onView(withId(R.id.drawer_layout))
             .check(matches(isOpen(Gravity.START))) // Left drawer is open open.
+        // When using ActivityScenario.launch, always call close()
+        activityScenario.close()
     }
 
     @Test
@@ -168,6 +175,8 @@ class AppNavigationTest {
         // Then check that the drawer is open
         onView(withId(R.id.drawer_layout))
             .check(matches(isOpen(Gravity.START))) // Left drawer is open open.
+        // When using ActivityScenario.launch, always call close()
+        activityScenario.close()
     }
 
     @Test
@@ -201,6 +210,8 @@ class AppNavigationTest {
             )
         ).perform(click())
         onView(withId(R.id.tasks_container_layout)).check(matches(isDisplayed()))
+        // When using ActivityScenario.launch, always call close()
+        activityScenario.close()
     }
 
     @Test
@@ -224,5 +235,7 @@ class AppNavigationTest {
         // Confirm that if we click back a second time, we end up back at the home screen
         pressBack()
         onView(withId(R.id.tasks_container_layout)).check(matches(isDisplayed()))
+        // When using ActivityScenario.launch, always call close()
+        activityScenario.close()
     }
 }

app/src/androidTestMock/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksActivityTest.kt

@@ -52,6 +52,9 @@ import org.junit.runner.RunWith
 
 /**
  * Large End-to-End test for the tasks module.
+ *
+ * UI tests usually use [ActivityTestRule] but there's no API to perform an action before
+ * each test. The workaround is to use `ActivityScenario.launch()` and `ActivityScenario.close()`.
  */
 @RunWith(AndroidJUnit4::class)
 @LargeTest
@@ -116,6 +119,8 @@ class TasksActivityTest {
         onView(withText("NEW TITLE")).check(matches(isDisplayed()))
         // Verify previous task is not displayed
         onView(withText("TITLE1")).check(doesNotExist())
+        // Make sure the activity is closed before resetting the db:
+        activityScenario.close()
     }
 
     @Test
@@ -141,6 +146,8 @@ class TasksActivityTest {
         onView(withId(R.id.menu_filter)).perform(click())
         onView(withText(string.nav_all)).perform(click())
         onView(withText("TITLE1")).check(doesNotExist())
+        // Make sure the activity is closed before resetting the db:
+        activityScenario.close()
     }
 
     @Test
@@ -162,6 +169,8 @@ class TasksActivityTest {
         onView(withText(string.nav_all)).perform(click())
         onView(withText("TITLE1")).check(matches(isDisplayed()))
         onView(withText("TITLE2")).check(doesNotExist())
+        // Make sure the activity is closed before resetting the db:
+        activityScenario.close()
     }
 
     @Test
@@ -190,6 +199,8 @@ class TasksActivityTest {
         // Check that the task is marked as completed
         onView(allOf(withId(R.id.complete_checkbox), hasSibling(withText(taskTitle))))
             .check(matches(isChecked()))
+        // Make sure the activity is closed before resetting the db:
+        activityScenario.close()
     }
 
     @Test
@@ -217,6 +228,8 @@ class TasksActivityTest {
         // Check that the task is marked as active
         onView(allOf(withId(R.id.complete_checkbox), hasSibling(withText(taskTitle))))
             .check(matches(not(isChecked())))
+        // Make sure the activity is closed before resetting the db:
+        activityScenario.close()
     }
 
     @Test
@@ -275,6 +288,8 @@ class TasksActivityTest {
         // Check that the task is marked as active
         onView(allOf(withId(R.id.complete_checkbox), hasSibling(withText(taskTitle))))
             .check(matches(isChecked()))
+        // Make sure the activity is closed before resetting the db:
+        activityScenario.close()
     }
 
     @Test
@@ -292,5 +307,7 @@ class TasksActivityTest {
 
         // Then verify task is displayed on screen
         onView(withText("title")).check(matches(isDisplayed()))
+        // Make sure the activity is closed before resetting the db:
+        activityScenario.close()
     }
 }