android:fixed android first e2e using espresso

android/app/src/main/java/com/reactnativenavigation/controllers/NavigationActivity.java

@@ -41,23 +41,22 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
             }
         };
 
-        if (ReactDevPermission.shouldAskPermission()) {
-            ReactDevPermission.askPermission(this);
-            return;
-        }
-
         host.getReactInstanceManager().addReactInstanceEventListener(new ReactInstanceManager.ReactInstanceEventListener() {
             @Override
             public void onReactContextInitialized(ReactContext context) {
                 new NavigationEventEmitter(context).emitAppLaunched();
             }
         });
-        host.getReactInstanceManager().createReactContextInBackground();
     }
 
     @Override
     protected void onResume() {
         super.onResume();
+        if (ReactDevPermission.shouldAskPermission()) {
+            ReactDevPermission.askPermission(this);
+        } else {
+            host.getReactInstanceManager().createReactContextInBackground();
+        }
         host.getReactInstanceManager().onHostResume(this, this);
     }
 

android/app/src/main/java/com/reactnativenavigation/controllers/NavigationApplication.java

@@ -2,23 +2,14 @@ package com.reactnativenavigation.controllers;
 
 import android.app.Application;
 
-import com.facebook.react.bridge.ReactContext;
-import com.reactnativenavigation.react.NavigationEventEmitter;
-
 public abstract class NavigationApplication extends Application {
     public static NavigationApplication instance;
-    public NavigationEventEmitter eventEmitter;
 
     @Override
     public void onCreate() {
         super.onCreate();
         instance = this;
-
     }
 
     public abstract boolean isDebug();
-
-    public void onReactContextInitialized(ReactContext context) {
-        eventEmitter = new NavigationEventEmitter(context);
-    }
 }

playground/android/app/src/androidTest/java/com/reactnativenavigation/playground/ApplicationLifecycleTest.java

@@ -0,0 +1,83 @@
+package com.reactnativenavigation.playground;
+
+import android.support.test.espresso.Espresso;
+import android.support.test.espresso.IdlingResource;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObjectNotFoundException;
+import android.support.test.uiautomator.UiSelector;
+
+import com.facebook.react.ReactNativeHost;
+import com.reactnativenavigation.controllers.NavigationActivity;
+
+import org.junit.FixMethodOrder;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.MethodSorters;
+
+import java.io.IOException;
+
+import static android.support.test.InstrumentationRegistry.getInstrumentation;
+import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.assertion.ViewAssertions.matches;
+import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static android.support.test.espresso.matcher.ViewMatchers.withText;
+
+@RunWith(AndroidJUnit4.class)
+@FixMethodOrder(value = MethodSorters.NAME_ASCENDING)
+public class ApplicationLifecycleTest {
+
+    @Rule
+    public ActivityTestRule<MainActivity> rule = new ActivityTestRule<>(MainActivity.class, false, false);
+
+    private void registerIdlingResource() {
+        Espresso.registerIdlingResources(new IdlingResource() {
+            @Override
+            public String getName() {
+                return "React Bridge";
+            }
+
+            @Override
+            public boolean isIdleNow() {
+                ReactNativeHost host = NavigationActivity.instance.getHost();
+                return host != null
+                        && host.hasInstance()
+                        && host.getReactInstanceManager().hasStartedCreatingInitialContext()
+                        && host.getReactInstanceManager().getCurrentReactContext() != null;
+            }
+
+            @Override
+            public void registerIdleTransitionCallback(final ResourceCallback callback) {
+                new Thread(new Runnable() {
+                    @Override
+                    public void run() {
+                        while (!isIdleNow()) {
+                            try {
+                                Thread.sleep(1000);
+                            } catch (InterruptedException e) {
+                                e.printStackTrace();
+                            }
+                        }
+                        callback.onTransitionToIdle();
+                    }
+                }).start();
+            }
+        });
+    }
+
+    @Test
+    public void startApp_LoadsBridge_ThenShowsWelcomeScreen() throws UiObjectNotFoundException, IOException {
+        rule.launchActivity(null);
+
+        UiDevice.getInstance(getInstrumentation()).findObject(new UiSelector().text("Playground")).click();
+        UiDevice.getInstance(getInstrumentation()).findObject(new UiSelector().text("Permit drawing over other apps")).click();
+        UiDevice.getInstance(getInstrumentation()).pressBack();
+        UiDevice.getInstance(getInstrumentation()).pressBack();
+
+        registerIdlingResource();
+
+        onView(withText("React Native Navigation!")).check(matches(isDisplayed()));
+    }
+}

playground/android/app/src/androidTest/java/com/reactnativenavigation/playground/ApplicationTest.java

@@ -1,52 +0,0 @@
-package com.reactnativenavigation.playground;
-
-import android.app.Activity;
-import android.app.Instrumentation;
-import android.provider.Settings;
-import android.support.test.espresso.intent.Intents;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObjectNotFoundException;
-import android.support.test.uiautomator.UiSelector;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static android.support.test.InstrumentationRegistry.getInstrumentation;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.intent.matcher.IntentMatchers.hasAction;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-
-@RunWith(AndroidJUnit4.class)
-public class ApplicationTest {
-
-    @Rule
-    public ActivityTestRule<MainActivity> rule = new ActivityTestRule<>(MainActivity.class, false, false);
-
-    @Test
-    public void startAppShowsTheSplash() throws InterruptedException {
-        Intents.init();
-        Intents.intending(hasAction(Settings.ACTION_MANAGE_OVERLAY_PERMISSION)).respondWith(new Instrumentation.ActivityResult(Activity.RESULT_OK, null));
-
-        rule.launchActivity(null);
-
-        onView(withText("Splash :)")).check(matches(isDisplayed()));
-        Intents.release();
-    }
-
-    @Test
-    public void startAppLoadsBridgeShowsWelcomeScreen() throws UiObjectNotFoundException {
-        rule.launchActivity(null);
-
-        UiDevice.getInstance(getInstrumentation()).findObject(new UiSelector().text("Playground")).click();
-        UiDevice.getInstance(getInstrumentation()).findObject(new UiSelector().text("Permit drawing over other apps")).click();
-        UiDevice.getInstance(getInstrumentation()).pressBack();
-        UiDevice.getInstance(getInstrumentation()).pressBack();
-
-        onView(withText("React Native Navigation!")).check(matches(isDisplayed()));
-    }
-}

playground/scripts/e2e.android.js

@@ -7,7 +7,7 @@ const release = _.includes(process.argv, 'release');
 function e2e() { //eslint-disable-line
   try {
     shellUtils.exec.execSync(`echo 'travis_fold:start:android-espresso'`);
-    shellUtils.exec.execSync(`cd android && ./gradlew --stop`);
+    shellUtils.exec.execSync(`cd android && ./gradlew uninstallAll`);
     shellUtils.exec.execSync(`cd android && ./gradlew connectedDebugAndroidTest`);
   } finally {
     shellUtils.exec.execSync(`echo 'travis_fold:end:android-espresso'`);