breaking e2e

AndroidE2E/app/src/androidTest/java/com/reactnativenavigation/e2e/androide2e/ApplicationLifecycleTest.java

@@ -1,14 +1,9 @@
 package com.reactnativenavigation.e2e.androide2e;
 
-import android.annotation.TargetApi;
-import android.app.Instrumentation;
 import android.content.Intent;
-import android.provider.Settings;
-import android.support.test.filters.SdkSuppress;
 import android.support.test.runner.AndroidJUnit4;
 import android.support.test.uiautomator.By;
 import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiSelector;
 import android.support.test.uiautomator.Until;
 
 import org.junit.After;
@@ -20,53 +15,41 @@ import static android.support.test.InstrumentationRegistry.getInstrumentation;
 import static org.assertj.core.api.Java6Assertions.assertThat;
 
 @RunWith(AndroidJUnit4.class)
-@SdkSuppress(minSdkVersion = 23)
-@TargetApi(23)
 public class ApplicationLifecycleTest {
 
     private static final String PACKAGE_NAME = "com.reactnativenavigation.playground";
     private static final int TIMEOUT = 10000;
-    private Instrumentation.ActivityMonitor activityMonitor;
 
     @Before
     public void beforeEach() {
-        activityMonitor = new Instrumentation.ActivityMonitor("com.reactnativenavigation.playground.MainActivity", null, false);
-        getInstrumentation().addMonitor(activityMonitor);
+        //
     }
 
     @After
     public void afterEach() {
-        getInstrumentation().removeMonitor(activityMonitor);
+        //
     }
 
     @Test
     public void showSplash_AcceptsOverlayPermissions_ShowsWelcomeScreen() throws Exception {
         launchTheApp();
-        assertThat(uiDevice().wait(Until.hasObject(By.desc("NavigationSplashView")), TIMEOUT)).isTrue();
-
-//        UiObject2 o = uiDevice().findObject(By.desc("NavigationSplashView"));
-//        assertThat(uiDevice().wait(Until.hasObject(By.clazz("com.reactnativenavigation.views.NavigationSplashView")), TIMEOUT)).isTrue();
-//        assertThat(activityMonitor.waitForActivity()).isNotNull();
-//        activity = activityMonitor.getLastActivity();
-//        uiDevice().wait(Until.hasObject(By.clazz("com.reactnativenavigation.views.NavigationSplashView")), TIMEOUT);
-//        acceptOverlayPermissionIfNeeded();
+//        assertThat(uiDevice().wait(Until.hasObject(By.desc("NavigationSplashView")), TIMEOUT)).isTrue();
+        acceptOverlayPermissionIfNeeded();
+        assertMainShown();
+    }
 
-//        assertThat(uiDevice().findObject(new UiSelector().className("com.reactnativenavigation.views.NavigationSplashView")).exists()).isTrue();
-//        assertThat(rule.getActivity().getContentView()).isNotNull().isInstanceOf(NavigationSplashView.class);
-//        assertMainShown();
+    private void assertMainShown() {
+        assertThat(uiDevice().findObject(By.text("React Native Navigation!"))).isNotNull();
     }
 
     private void acceptOverlayPermissionIfNeeded() throws Exception {
-        if (Settings.canDrawOverlays(activityMonitor.getLastActivity())) {
-            return;
+        if (uiDevice().findObject(By.text("Draw over other apps")) != null) {
+            uiDevice().findObject(By.text("Playground")).click();
+            uiDevice().findObject(By.text("Permit drawing over other apps")).click();
+            uiDevice().pressBack();
+            uiDevice().pressBack();
         }
-        uiDevice().waitForIdle();
-        uiDevice().findObject(new UiSelector().text("Playground")).click();
-        uiDevice().findObject(new UiSelector().text("Permit drawing over other apps")).click();
-        uiDevice().pressBack();
-        uiDevice().pressBack();
     }
-//        uiDevice().findObject(new UiSelector().description("Apps")).clickAndWaitForNewWindow();
 
     private void launchTheApp() throws Exception {
         uiDevice().wakeUp();

AndroidE2E/app/src/androidTest/java/com/reactnativenavigation/e2e/androide2e/EnvironmentTest.java

@@ -1,7 +1,5 @@
 package com.reactnativenavigation.e2e.androide2e;
 
-import android.annotation.TargetApi;
-import android.support.test.filters.SdkSuppress;
 import android.support.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
@@ -11,8 +9,6 @@ import static android.support.test.InstrumentationRegistry.getInstrumentation;
 import static org.assertj.core.api.Java6Assertions.assertThat;
 
 @RunWith(AndroidJUnit4.class)
-@SdkSuppress(minSdkVersion = 23)
-@TargetApi(23)
 public class EnvironmentTest {
     @Test
     public void instrumentationAndAssertJ() throws Exception {

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

@@ -1,124 +0,0 @@
-package com.reactnativenavigation.playground;
-
-import android.annotation.TargetApi;
-import android.provider.Settings;
-import android.support.test.espresso.Espresso;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiSelector;
-
-import com.reactnativenavigation.views.NavigationSplashView;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.FixMethodOrder;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.MethodSorters;
-
-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;
-import static org.assertj.core.api.Java6Assertions.assertThat;
-
-@RunWith(AndroidJUnit4.class)
-@FixMethodOrder(value = MethodSorters.NAME_ASCENDING)
-@SdkSuppress(minSdkVersion = 23)
-@TargetApi(23)
-public class ApplicationLifecycleTest {
-
-    private ReactIdlingResource reactIdlingResource = new ReactIdlingResource();
-
-    @Rule
-    public ActivityTestRule<MainActivity> rule = new ActivityTestRule<>(MainActivity.class, false, false);
-
-    @Before
-    public void beforeEach() throws Exception {
-        uiDevice().wakeUp();
-        reactIdlingResource.start();
-        Espresso.registerIdlingResources(reactIdlingResource);
-    }
-
-    @After
-    public void afterEach() {
-        reactIdlingResource.stop();
-        Espresso.unregisterIdlingResources(reactIdlingResource);
-        uiDevice().waitForIdle();
-    }
-
-    @Test
-    public void _1_showSplash_AcceptsOverlayPermissions_ShowsWelcomeScreen() throws Exception {
-        rule.launchActivity(null);
-        assertThat(rule.getActivity().getContentView()).isNotNull().isInstanceOf(NavigationSplashView.class);
-        acceptOverlayPermissionIfNeeded();
-        assertMainShown();
-    }
-
-    @Test
-    public void _2_relaunchFromBackground() throws Exception {
-        rule.launchActivity(null);
-        acceptOverlayPermissionIfNeeded();
-        assertMainShown();
-
-        uiDevice().pressHome();
-        uiDevice().pressRecentApps();
-        uiDevice().findObject(new UiSelector().text("Playground")).click();
-        uiDevice().waitForIdle();
-
-        assertMainShown();
-    }
-
-    @Test
-    public void _3_relaunchAfterClose() throws Exception {
-        rule.launchActivity(null);
-        acceptOverlayPermissionIfNeeded();
-        assertMainShown();
-
-        uiDevice().pressBack();
-        uiDevice().waitForIdle();
-
-        rule.launchActivity(null);
-        uiDevice().waitForIdle();
-
-        assertMainShown();
-    }
-
-    @Test
-    public void _4_deviceOrientationDoesNotDestroyActivity() throws Exception {
-        MainActivity mainActivity = rule.launchActivity(null);
-        acceptOverlayPermissionIfNeeded();
-        assertMainShown();
-
-        uiDevice().setOrientationRight();
-        uiDevice().waitForIdle();
-
-        Thread.sleep(5000);
-        assertMainShown();
-        assertThat(rule.getActivity()).isSameAs(mainActivity);
-    }
-
-    private void assertMainShown() {
-        onView(withText("React Native Navigation!")).check(matches(isDisplayed()));
-        uiDevice().waitForIdle();
-    }
-
-    private UiDevice uiDevice() {
-        return UiDevice.getInstance(getInstrumentation());
-    }
-
-    private void acceptOverlayPermissionIfNeeded() throws Exception {
-        if (Settings.canDrawOverlays(getInstrumentation().getContext())) {
-            return;
-        }
-        uiDevice().waitForIdle();
-        uiDevice().findObject(new UiSelector().text("Playground")).click();
-        uiDevice().findObject(new UiSelector().text("Permit drawing over other apps")).click();
-        uiDevice().pressBack();
-        uiDevice().pressBack();
-    }
-}

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

@@ -1,82 +0,0 @@
-package com.reactnativenavigation.playground;
-
-import android.support.test.espresso.IdlingResource;
-
-import com.facebook.react.ReactNativeHost;
-import com.facebook.react.bridge.NotThreadSafeBridgeIdleDebugListener;
-import com.reactnativenavigation.NavigationApplication;
-import com.reactnativenavigation.utils.UiThread;
-
-import java.util.concurrent.atomic.AtomicBoolean;
-
-class ReactIdlingResource implements IdlingResource, NotThreadSafeBridgeIdleDebugListener {
-    private ResourceCallback callback;
-    private AtomicBoolean registered = new AtomicBoolean(false);
-    private AtomicBoolean bridgeIdle = new AtomicBoolean(false);
-    private AtomicBoolean shouldRun = new AtomicBoolean(false);
-
-    ReactIdlingResource() {
-    }
-
-    public void start() {
-        shouldRun.set(true);
-        UiThread.postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                if (shouldRun.get()) {
-                    isIdleNow();
-                    UiThread.postDelayed(this, 100);
-                }
-            }
-        }, 100);
-    }
-
-    public void stop() {
-        shouldRun.set(false);
-        ReactNativeHost host = NavigationApplication.instance.getReactNativeHost();
-        if (host != null && host.getReactInstanceManager().getCurrentReactContext() != null)
-            host.getReactInstanceManager().getCurrentReactContext().getCatalystInstance().removeBridgeIdleDebugListener(this);
-    }
-
-
-    @Override
-    public String getName() {
-        return "ReactIdlingResource";
-    }
-
-    @Override
-    public boolean isIdleNow() {
-        ReactNativeHost host = NavigationApplication.instance.getReactNativeHost();
-        boolean hasContext = host != null
-                && host.getReactInstanceManager() != null
-                && host.getReactInstanceManager().getCurrentReactContext() != null;
-        if (!hasContext) {
-            return false;
-        }
-
-        if (registered.compareAndSet(false, true)) {
-            host.getReactInstanceManager().getCurrentReactContext().getCatalystInstance().addBridgeIdleDebugListener(this);
-        }
-
-        boolean idle = bridgeIdle.get();
-        if (idle && callback != null) {
-            callback.onTransitionToIdle();
-        }
-        return idle;
-    }
-
-    @Override
-    public void registerIdleTransitionCallback(final ResourceCallback callback) {
-        this.callback = callback;
-    }
-
-    @Override
-    public void onTransitionToBridgeIdle() {
-        bridgeIdle.set(true);
-    }
-
-    @Override
-    public void onTransitionToBridgeBusy() {
-        bridgeIdle.set(false);
-    }
-}

scripts/test.android.js

@@ -6,6 +6,10 @@ function run() {
   }
 
   exec.execSync(`cd android && ./gradlew clean testDebugUnitTest`);
+
+  if (!process.env.CI) {
+    exec.execSync(`cd playground && yarn run e2e-android`);
+  }
 }
 
 run();