Fix TaskDetailScreenTest

Author: grepx

todoapp/app/src/androidTestMock/java/com/example/android/architecture/blueprints/todoapp/taskdetail/TaskDetailScreenTest.java

@@ -34,6 +34,7 @@
 import org.junit.runner.RunWith;
 
 import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.action.ViewActions.click;
 import static android.support.test.espresso.assertion.ViewAssertions.matches;
 import static android.support.test.espresso.matcher.ViewMatchers.isChecked;
 import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
@@ -77,34 +78,33 @@ public class TaskDetailScreenTest {
     @Rule
     public ActivityTestRule<MainActivity> mMainActivityTestRule =
             new ActivityTestRule<>(MainActivity.class, true /* Initial touch mode  */,
-                    false /* Lazily launch activity */);
+                                          false /* Lazily launch activity */);
 
     private void loadActiveTask() {
-        startActivityWithWithStubbedTask(ACTIVE_TASK);
+        startWithStubbedTask(ACTIVE_TASK);
     }
 
     private void loadCompletedTask() {
-        startActivityWithWithStubbedTask(COMPLETED_TASK);
+        startWithStubbedTask(COMPLETED_TASK);
+        // click the task to navigate to it
+        onView(withText(COMPLETED_TASK.getTitle())).perform(click());
     }
 
     /**
-     * Setup your test fixture with a fake task id. The {@link MainActivity} is started with
-     * a particular task id, which is then loaded from the service API.
-     *
-     * <p>
-     * Note that this test runs hermetically and is fully isolated using a fake implementation of
-     * the service API. This is a great way to make your tests more reliable and faster at the same
-     * time, since they are isolated from any outside dependencies.
+     * Setup your test fixture with a fake task already initialised.
+     * The {@link MainActivity} is started after the fake service API has been configured.
      */
-    private void startActivityWithWithStubbedTask(Task task) {
+    private void startWithStubbedTask(Task task) {
         // Add a task stub to the fake service api layer.
         TasksRepository.destroyInstance();
+        FakeTasksRemoteDataSource.getInstance().deleteAllTasks();
         FakeTasksRemoteDataSource.getInstance().addTasks(task);
 
-        // Lazily start the Activity from the ActivityTestRule this time to inject the start Intent
-        Intent startIntent = new Intent();
-//        startIntent.putExtra(MainActivity.EXTRA_TASK_ID, task.getId());
-        mMainActivityTestRule.launchActivity(startIntent);
+        // Lazily start the Activity from the ActivityTestRule
+        mMainActivityTestRule.launchActivity(new Intent());
+
+        // click the task in the Tasks screen to navigate to it
+        onView(withText(task.getTitle())).perform(click());
     }
 
     @Test
@@ -143,5 +143,4 @@ public void orientationChange_menuAndTaskPersist() {
         // Check delete menu item is displayed and is unique
         onView(withId(R.id.menu_delete)).check(matches(isDisplayed()));
     }
-
 }