removed android e2e with uiautomator, replaced by detox tests

AndroidE2E/.gitignore

@@ -1,9 +0,0 @@
-*.iml
-.gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
-.DS_Store
-/build
-/captures
-.externalNativeBuild

AndroidE2E/app/.gitignore

@@ -1 +0,0 @@
-/build

AndroidE2E/app/build.gradle

@@ -1,31 +0,0 @@
-apply plugin: 'com.android.application'
-
-android {
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    compileSdkVersion 27
-    buildToolsVersion "27.0.3"
-    defaultConfig {
-        applicationId "com.reactnativenavigation.e2e.androide2e"
-        minSdkVersion 24
-        targetSdkVersion 27
-        versionCode 1
-        versionName "1.0"
-
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-    }
-}
-
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:27.0.2'
-
-    androidTestImplementation 'org.assertj:assertj-core:3.8.0'
-    androidTestImplementation 'com.android.support:support-annotations:27.0.2'
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation 'com.android.support.test:rules:1.0.1'
-    androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.3'
-}

AndroidE2E/app/proguard-rules.pro

@@ -1,17 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /Users/danielzl/Library/Android/sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}

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

@@ -1,132 +0,0 @@
-package com.reactnativenavigation.e2e.androide2e;
-
-import android.content.*;
-import android.net.*;
-import android.provider.*;
-import android.support.test.uiautomator.*;
-import android.view.*;
-
-import org.junit.*;
-
-import static android.support.test.InstrumentationRegistry.*;
-
-public class ApplicationLifecycleTest extends BaseTest {
-
-    @Test
-    public void relaunchFromBackground() throws Exception {
-        elementByText("PUSH").click();
-        assertExists(By.text("Pushed Screen"));
-
-        device().pressHome();
-        device().pressRecentApps();
-        elementByText("Playground").click();
-
-        assertExists(By.text("Pushed Screen"));
-    }
-
-    @Test
-    public void relaunchAfterClose() throws Exception {
-        elementByText("PUSH").click();
-        assertExists(By.text("Pushed Screen"));
-
-        device().pressBack();
-
-        launchTheApp();
-        assertMainShown();
-    }
-
-    @Test
-    public void deviceOrientationDoesNotDestroyActivity() throws Exception {
-        elementByText("PUSH").click();
-        assertExists(By.text("Pushed Screen"));
-
-        device().setOrientationLeft();
-        Thread.sleep(100);
-
-        assertExists(By.text("Pushed Screen"));
-    }
-
-    @Test
-    public void relaunchAfterActivityKilledBySystem() throws Exception {
-        elementByText("PUSH").click();
-        assertExists(By.text("Pushed Screen"));
-
-        killAppSaveInstanceState_ByTogglingPermissions();
-
-        device().pressRecentApps();
-        elementByText("Playground").click();
-        assertMainShown();
-    }
-
-    @Test
-    public void pressingMenuOpensDevMenu() throws Exception {
-        Assume.assumeTrue(isDebug());
-        device().pressKeyCode(KeyEvent.KEYCODE_MENU);
-        assertExists(By.text("Debug JS Remotely"));
-    }
-
-    @Test
-    public void pressingRTwiceInSuccessionReloadsReactNative() throws Exception {
-        Assume.assumeTrue(isDebug());
-
-        elementByText("PUSH").click();
-        assertExists(By.text("Pushed Screen"));
-
-        device().pressKeyCode(KeyEvent.KEYCODE_R);
-        device().pressKeyCode(KeyEvent.KEYCODE_R);
-        device().waitForIdle();
-        assertMainShown();
-    }
-
-    @Test
-    public void pressingRTwiceWithDelayDoesNothing() throws Exception {
-        Assume.assumeTrue(isDebug());
-
-        elementByText("PUSH").click();
-        assertExists(By.text("Pushed Screen"));
-
-        device().pressKeyCode(KeyEvent.KEYCODE_R);
-        Thread.sleep(1500);
-        device().pressKeyCode(KeyEvent.KEYCODE_R);
-        assertExists(By.text("Pushed Screen"));
-    }
-
-    @Test
-    public void sendingReloadBroadcastReloadsReactNative() throws Exception {
-        Assume.assumeTrue(isDebug());
-
-        elementByText("PUSH").click();
-        assertExists(By.text("Pushed Screen"));
-
-        device().executeShellCommand("am broadcast -a com.reactnativenavigation.broadcast.RELOAD");
-        device().waitForIdle();
-        assertMainShown();
-    }
-
-    private void killAppSaveInstanceState_ByTogglingPermissions() throws Exception {
-        device().pressHome();
-
-        device().waitForIdle();
-        launchAppInfoSettings();
-        device().waitForIdle();
-
-        elementByText("Permissions").click();
-        elementByText("Storage").click();
-        elementByText("Storage").click();
-        device().pressBack();
-        device().pressBack();
-        device().pressHome();
-        device().waitForIdle();
-    }
-
-    private void launchAppInfoSettings() {
-        Intent intent = new Intent();
-        intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
-        Uri uri = Uri.fromParts("package", PACKAGE_NAME, null);
-        intent.setData(uri);
-        getInstrumentation().getTargetContext().startActivity(intent);
-    }
-}

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

@@ -1,22 +0,0 @@
-package com.reactnativenavigation.e2e.androide2e;
-
-import android.support.test.uiautomator.*;
-
-import org.junit.*;
-
-public class BackHandlerTest extends BaseTest {
-    @Test
-    public void overrideHardwareBackButton() throws Exception {
-        elementByText("BACK HANDLER").click();
-        assertExists(By.text("Back Handler Screen"));
-
-        elementByText("ADD BACK HANDLER").click();
-        device().pressBack();
-        assertExists(By.text("Back Handler Screen"));
-
-
-        elementByText("REMOVE BACK HANDLER").click();
-        device().pressBack();
-        assertMainShown();
-    }
-}

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

@@ -1,114 +0,0 @@
-package com.reactnativenavigation.e2e.androide2e;
-
-import android.content.pm.*;
-import android.graphics.*;
-import android.support.test.runner.*;
-import android.support.test.uiautomator.*;
-
-import org.junit.*;
-import org.junit.runner.*;
-
-import java.io.*;
-
-import static android.support.test.InstrumentationRegistry.*;
-import static org.assertj.core.api.Java6Assertions.*;
-
-@RunWith(AndroidJUnit4.class)
-public abstract class BaseTest {
-    static final String PACKAGE_NAME = "com.reactnativenavigation.playground";
-    private static final long TIMEOUT = 60000;
-
-    @Before
-    public void beforeEach() throws Exception {
-        device().wakeUp();
-        device().setOrientationNatural();
-        launchTheApp();
-        assertMainShown();
-    }
-
-    @After
-    public void afterEach() throws Exception {
-        device().executeShellCommand("am force-stop " + PACKAGE_NAME);
-        device().executeShellCommand("am kill " + PACKAGE_NAME);
-    }
-
-    public UiDevice device() {
-        return UiDevice.getInstance(getInstrumentation());
-    }
-
-    public void launchTheApp() throws Exception {
-        device().executeShellCommand("am start -n " + PACKAGE_NAME + "/.MainActivity");
-        device().waitForIdle();
-        acceptOverlayPermissionIfNeeded();
-        device().wait(Until.gone(By.textContains("Please wait")), 1000 * 60 * 3);
-    }
-
-    public void assertMainShown() {
-        assertExists(By.text("React Native Navigation!"));
-    }
-
-    public void acceptOverlayPermissionIfNeeded() throws Exception {
-        if (isRequestingOverlayPermission()) {
-            if (!elementByText("Playground").exists()) {
-                scrollToText("Playground");
-            }
-            elementByText("Playground").click();
-            device().findObject(new UiSelector().checkable(true).checked(false)).click();
-            device().pressBack();
-            device().pressBack();
-        }
-    }
-
-    private boolean isRequestingOverlayPermission() {
-        return device().wait(Until.hasObject(By.pkg("com.android.settings").depth(0)), 300);
-    }
-
-    public UiObject elementByText(String text) {
-        return device().findObject(new UiSelector().text(text));
-    }
-
-    public UiObject elementByTextContains(String text) {
-        return device().findObject(new UiSelector().textContains(text));
-    }
-
-    public void scrollToText(String txt) throws Exception {
-        new UiScrollable(new UiSelector().scrollable(true)).scrollTextIntoView(txt);
-    }
-
-    public void assertExists(BySelector selector) {
-        assertThat(device().wait(Until.hasObject(selector), TIMEOUT)).withFailMessage("expected %1$s to be visible", selector).isTrue();
-        assertThat(device().findObject(selector).getVisibleCenter().x).isPositive().isLessThan(device().getDisplayWidth());
-        assertThat(device().findObject(selector).getVisibleCenter().y).isPositive().isLessThan(device().getDisplayHeight());
-    }
-
-    public Bitmap captureScreenshot() throws Exception {
-        File file = File.createTempFile("tmpE2E", "png");
-        device().takeScreenshot(file);
-        Bitmap bitmap = BitmapFactory.decodeFile(file.getAbsolutePath());
-        file.delete();
-        return bitmap;
-    }
-
-    public void swipeOpenFromLeft() {
-        int w = device().getDisplayWidth();
-        int h = device().getDisplayHeight();
-        device().swipe(5, h / 2, w / 2, h / 2, 20);
-    }
-
-    public void swipeOpenFromRight() {
-        int w = device().getDisplayWidth();
-        int h = device().getDisplayHeight();
-        device().swipe(w - 5, h / 2, w / 2, h / 2, 20);
-    }
-
-    public void swipeUp() {
-        int w = device().getDisplayWidth();
-        int h = device().getDisplayHeight();
-        device().drag(w / 2, h / 2 + 100, w / 2, h / 2 - 100, 10);
-    }
-
-    public boolean isDebug() throws Exception {
-        PackageInfo packageInfo = getInstrumentation().getTargetContext().getPackageManager().getPackageInfo("com.reactnativenavigation.playground", 0);
-        return (packageInfo.applicationInfo.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0;
-    }
-}

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

@@ -1,17 +0,0 @@
-package com.reactnativenavigation.e2e.androide2e;
-
-import android.support.test.runner.*;
-
-import org.junit.*;
-import org.junit.runner.*;
-
-import static android.support.test.InstrumentationRegistry.*;
-import static org.assertj.core.api.Java6Assertions.*;
-
-@RunWith(AndroidJUnit4.class)
-public class EnvironmentTest {
-    @Test
-    public void instrumentationAndAssertJ() throws Exception {
-        assertThat(getInstrumentation().getTargetContext().getPackageName()).isEqualTo("com.reactnativenavigation.e2e.androide2e");
-    }
-}

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

@@ -1,128 +0,0 @@
-package com.reactnativenavigation.e2e.androide2e;
-
-import android.support.test.uiautomator.*;
-
-import org.junit.*;
-
-public class ModalsTest extends BaseTest {
-
-    @Test
-    public void showModal() throws Exception {
-        elementByText("SHOW MODAL").click();
-        assertExists(By.text("Modal Screen"));
-    }
-
-    @Test
-    public void dismissModal() throws Exception {
-        elementByText("SHOW MODAL").click();
-        assertExists(By.text("Modal Screen"));
-
-        elementByText("DISMISS MODAL").click();
-        assertMainShown();
-
-    }
-
-    @Test
-    public void showMultipleModals() throws Exception {
-        elementByText("SHOW MODAL").click();
-        assertExists(By.text("Modal Stack Position: 1"));
-
-        elementByText("SHOW MODAL").click();
-        assertExists(By.text("Modal Stack Position: 2"));
-
-        elementByText("DISMISS MODAL").click();
-        assertExists(By.text("Modal Stack Position: 1"));
-
-        elementByText("DISMISS MODAL").click();
-        assertMainShown();
-    }
-
-    @Test
-    public void dismissUnknownContainerId() throws Exception {
-        elementByText("SHOW MODAL").click();
-        assertExists(By.text("Modal Stack Position: 1"));
-
-        elementByText("DISMISS UNKNOWN MODAL").click();
-        assertExists(By.text("Modal Stack Position: 1"));
-
-        elementByText("DISMISS MODAL").click();
-        assertMainShown();
-    }
-
-    @Test
-    public void dismissModalByContainerIdWhenNotOnTop() throws Exception {
-        elementByText("SHOW MODAL").click();
-        assertExists(By.text("Modal Stack Position: 1"));
-
-        elementByText("SHOW MODAL").click();
-        assertExists(By.text("Modal Stack Position: 2"));
-
-        elementByText("DISMISS PREVIOUS MODAL").click();
-        assertExists(By.text("Modal Stack Position: 2"));
-
-        elementByText("DISMISS MODAL").click();
-        assertMainShown();
-    }
-
-    @Test
-    public void dismissAllPreviousModalsByIdWhenTheyAreBelowTopPresented() throws Exception {
-        elementByText("SHOW MODAL").click();
-        assertExists(By.text("Modal Stack Position: 1"));
-        elementByText("SHOW MODAL").click();
-        assertExists(By.text("Modal Stack Position: 2"));
-        elementByText("SHOW MODAL").click();
-        assertExists(By.text("Modal Stack Position: 3"));
-
-        elementByText("DISMISS ALL PREVIOUS MODALS").click();
-        assertExists(By.text("Modal Stack Position: 3"));
-
-        elementByText("DISMISS MODAL").click();
-        assertMainShown();
-    }
-
-    @Test
-    public void dismissSomeModalByIdDeepInTheStack() throws Exception {
-        elementByText("SHOW MODAL").click();
-        assertExists(By.text("Modal Stack Position: 1"));
-        elementByText("SHOW MODAL").click();
-        assertExists(By.text("Modal Stack Position: 2"));
-        elementByText("SHOW MODAL").click();
-        assertExists(By.text("Modal Stack Position: 3"));
-
-        elementByText("DISMISS FIRST IN STACK").click();
-        assertExists(By.text("Modal Stack Position: 3"));
-
-        elementByText("DISMISS MODAL").click();
-        assertExists(By.text("Modal Stack Position: 2"));
-
-        elementByText("DISMISS MODAL").click();
-        assertMainShown();
-    }
-
-    @Test
-    public void dismissAllModals() throws Exception {
-        elementByText("SHOW MODAL").click();
-        assertExists(By.text("Modal Stack Position: 1"));
-        elementByText("SHOW MODAL").click();
-        assertExists(By.text("Modal Stack Position: 2"));
-
-        elementByText("DISMISS ALL MODALS").click();
-        assertMainShown();
-    }
-
-    @Test
-    public void pushIntoModal() throws Exception {
-        elementByText("SHOW MODAL").click();
-        elementByText("PUSH SCREEN").click();
-        assertExists(By.text("Pushed Screen"));
-    }
-
-    @Test
-    public void backPopsModalStack() throws Exception {
-        elementByText("SHOW MODAL").click();
-        elementByText("PUSH SCREEN").click();
-        elementByText("PUSH").click();
-        device().pressBack();
-        assertExists(By.text("Pushed Screen"));
-    }
-}

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

@@ -1,50 +0,0 @@
-package com.reactnativenavigation.e2e.androide2e;
-
-import android.support.test.uiautomator.*;
-
-import org.junit.*;
-
-import static org.assertj.core.api.Java6Assertions.*;
-
-public class NavigationOptionsTest extends BaseTest {
-
-    @Test
-    public void declareNavigationStyleOnContainerComponent() throws Exception {
-        elementByText("PUSH OPTIONS SCREEN").click();
-        assertExists(By.text("Static Title"));
-    }
-
-    @Test
-    public void setTitleDynamically() throws Exception {
-        elementByText("PUSH OPTIONS SCREEN").click();
-        assertExists(By.text("Static Title"));
-        elementByText("DYNAMIC OPTIONS").click();
-        assertExists(By.text("Dynamic Title"));
-    }
-
-    @Test
-    public void testTopBarHidden() throws Exception {
-        elementByText("PUSH OPTIONS SCREEN").click();
-        elementByText("HIDE TOP BAR").click();
-        assertThat(elementByText("Static Title").exists()).isFalse();
-        elementByText("SHOW TOP BAR").click();
-        assertExists(By.text("Static Title"));
-    }
-
-    @Test
-    public void testRightButtons() throws Exception {
-        elementByText("PUSH OPTIONS SCREEN").click();
-        assertExists(By.text("ONE"));
-        elementByText("ONE").click();
-    }
-
-    @Test
-    public void testTopBarCollapse() throws Exception {
-        elementByText("PUSH OPTIONS SCREEN").click();
-        elementByText("SCROLLVIEW SCREEN").click();
-        assertExists(By.text("Collapse"));
-        elementByText("TOGGLE TOP BAR HIDE ON SCROLL").click();
-        swipeUp();
-        assertThat(device().hasObject(By.text("Collapse"))).isFalse();
-    }
-}

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

@@ -1,33 +0,0 @@
-package com.reactnativenavigation.e2e.androide2e;
-
-import android.support.test.uiautomator.By;
-import android.support.test.uiautomator.UiObjectNotFoundException;
-
-import org.junit.Test;
-
-public class OverlayTest extends BaseTest {
-
-	@Test
-	public void testOverlayAlertAppear() throws Exception {
-		elementByText("PUSH OPTIONS SCREEN").click();
-        elementByText("SHOW OVERLAY").click();
-		assertExists(By.text("Test view"));
-        assertDismissed();
-	}
-
-    @Test
-	public void testOverlayNotInterceptingTouchEvents() throws Exception {
-		elementByText("PUSH OPTIONS SCREEN").click();
-        elementByText("SHOW TOUCH THROUGH OVERLAY").click();
-		assertExists(By.text("Test view"));
-        elementByText("DYNAMIC OPTIONS").click();
-        assertExists(By.text("Dynamic Title"));
-        assertDismissed();
-	}
-
-    private void assertDismissed() throws UiObjectNotFoundException {
-        elementByText("OK").click();
-        assertExists(By.text("Overlay disappeared"));
-        elementByText("OK").click();
-    }
-}

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

@@ -1,30 +0,0 @@
-package com.reactnativenavigation.e2e.androide2e;
-
-import android.support.test.uiautomator.*;
-
-import org.junit.*;
-
-public class ScreenLifecycleTest extends BaseTest {
-
-    @Test
-    public void didAppearDidDisappear() throws Exception {
-        elementByText("PUSH LIFECYCLE SCREEN").click();
-        assertExists(By.text("didAppear"));
-        elementByText("PUSH TO TEST DIDDISAPPEAR").click();
-        assertExists(By.text("didDisappear"));
-    }
-
-    @Test
-    public void unmountIsCalledWhenPopped() throws Exception {
-        elementByText("PUSH LIFECYCLE SCREEN").click();
-        assertExists(By.text("didAppear"));
-
-        device().pressBack();
-
-        assertExists(By.text("componentWillUnmount"));
-        elementByText("OK").click();
-        assertExists(By.text("didDisappear"));
-        elementByText("OK").click();
-        assertMainShown();
-    }
-}

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

@@ -1,57 +0,0 @@
-package com.reactnativenavigation.e2e.androide2e;
-
-import android.support.test.uiautomator.*;
-
-import org.junit.*;
-
-public class ScreenStackTest extends BaseTest {
-
-    @Test
-    public void pushAndPopScreen() throws Exception {
-        elementByText("PUSH").click();
-        assertExists(By.text("Pushed Screen"));
-        elementByText("POP").click();
-        assertMainShown();
-    }
-
-    @Test
-    public void popScreenDeepInTheStack() throws Exception {
-        elementByText("PUSH").click();
-        assertExists(By.text("Pushed Screen"));
-        assertExists(By.text("Stack Position: 1"));
-        elementByText("PUSH").click();
-        assertExists(By.text("Stack Position: 2"));
-        elementByText("POP PREVIOUS").click();
-        assertExists(By.text("Stack Position: 2"));
-        elementByText("POP").click();
-        assertMainShown();
-    }
-
-    @Test
-    public void popToId() throws Exception {
-        elementByText("PUSH").click();
-        elementByText("PUSH").click();
-        elementByText("PUSH").click();
-        assertExists(By.text("Stack Position: 3"));
-        elementByText("POP TO STACK POSITION 1").click();
-        assertExists(By.text("Stack Position: 1"));
-    }
-
-    @Test
-    public void popToRoot() throws Exception {
-        elementByText("PUSH").click();
-        elementByText("PUSH").click();
-        elementByText("PUSH").click();
-        elementByText("POP TO ROOT").click();
-        assertMainShown();
-    }
-
-    @Test
-    public void pushStackWithMultipleChildren() throws Exception {
-        elementByText("SHOW MODAL").click();
-        elementByText("SHOW MODAL WITH STACK").click();
-        assertExists(By.text("Screen 2"));
-        device().pressBack();
-        assertExists(By.text("Screen 1"));
-    }
-}

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

@@ -1,17 +0,0 @@
-package com.reactnativenavigation.e2e.androide2e;
-
-import android.support.test.uiautomator.By;
-
-import org.junit.Test;
-
-public class StaticLifecycleEvents extends BaseTest {
-    @Test
-    public void didAppearDidDisappear() throws Exception {
-        elementByText("STATIC LIFECYCLE EVENTS").click();
-        assertExists(By.text("Static Lifecycle Events"));
-        assertExists(By.text("didAppear | navigation.playground.StaticLifecycleOverlay"));
-        elementByText("PUSH").click();
-        assertExists(By.text("didAppear | navigation.playground.PushedScreen"));
-        assertExists(By.text("didDisappear | navigation.playground.WelcomeScreen"));
-    }
-}

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

@@ -1,31 +0,0 @@
-package com.reactnativenavigation.e2e.androide2e;
-
-import android.support.test.uiautomator.*;
-
-import org.junit.*;
-
-public class TopLevelApiTest extends BaseTest {
-
-    @Test
-    public void switchToTabBasedApp_PassPropsFunction() throws Exception {
-        elementByText("SWITCH TO TAB BASED APP").click();
-        assertExists(By.text("This is tab 1"));
-        assertExists(By.text("Hello from a function!"));
-    }
-
-    @Test
-    public void switchToTabBasedApp_SwitchTab() throws Exception {
-        elementByText("SWITCH TO TAB BASED APP").click();
-        assertExists(By.text("This is tab 1"));
-        elementByText("SWITCH TO TAB 2").click();
-        assertExists(By.text("This is tab 2"));
-    }
-
-    @Test
-    public void switchToTabsWithSideMenu() throws Exception {
-        elementByText("SWITCH TO APP WITH SIDE MENUS").click();
-        assertExists(By.textStartsWith("This is a side menu center screen tab 1"));
-        swipeOpenFromLeft();
-        assertExists(By.text("This is a left side menu screen"));
-    }
-}

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

@@ -1,12 +0,0 @@
-package com.reactnativenavigation.e2e.androide2e;
-
-public class TopTabsTest {//extends BaseTest {
-
-//    @Test
-//    public void tabsCanBeSwiped() throws Exception {
-//        elementByText("PUSH TOP TABS SCREEN").click();
-//        assertExists(By.text("This is top tab 1"));
-//        swipeOpenFromRight();
-//        assertExists(By.text("This is top tab 2"));
-//    }
-}

AndroidE2E/app/src/main/AndroidManifest.xml

@@ -1,17 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools"
-          package="com.reactnativenavigation.e2e.androide2e">
-
-    <uses-sdk
-        android:minSdkVersion="18"
-        tools:overrideLibrary="android.support.test.uiautomator.v18"/>
-
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-    </application>
-
-</manifest>

AndroidE2E/app/src/main/res/values/colors.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#3F51B5</color>
-    <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
-</resources>

AndroidE2E/app/src/main/res/values/strings.xml

@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">AndroidE2E</string>
-</resources>

AndroidE2E/app/src/main/res/values/styles.xml

@@ -1,11 +0,0 @@
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-    </style>
-
-</resources>

AndroidE2E/build.gradle

@@ -1,23 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
-buildscript {
-    repositories {
-        jcenter()
-        google()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        mavenLocal()
-        jcenter()
-        mavenCentral()
-    }
-}

AndroidE2E/gradle.properties

@@ -1,17 +0,0 @@
-# Project-wide Gradle settings.
-
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
-
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true

AndroidE2E/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +0,0 @@
-#Mon Jan 01 12:06:42 IST 2018
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip

AndroidE2E/gradlew

@@ -1,160 +0,0 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

AndroidE2E/gradlew.bat

@@ -1,90 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega

AndroidE2E/settings.gradle

@@ -1 +0,0 @@
-include ':app'

docs/docs/WorkingLocally.md

@@ -42,8 +42,7 @@ No PR will be accepted without adequate test coverage.
 | `lib/src` | TypeScript sources and unit tests |
 | `lib/dist` | compiled javascript sources and unit tests |
 | `lib/dist/index.js` | the entry point for `import Navigation from 'react-native-navigation'` |
-| `e2e` | [detox](https://github.com/wix/detox) iOS e2e tests (in the future, once detox supports it, we will have android e2e here as well) |
-| `AndroidE2E` | Android e2e tests using native uiautomator (until detox for android is ready) |
+| `e2e` | [detox](https://github.com/wix/detox) e2e tests on both Android and iOS |
 | `playground` | The end-user project all e2e tests run against. Contains its own `src`, `android` and `ios`. Does not have its own package.json, depends on the local `<root>/lib` for faster local development (no need to `npm install` locally). |
 | `integration` | misc javascript integration tests, proving integration with other libraries like redux |
 | `scripts` | all scripts |
@@ -62,8 +61,8 @@ No PR will be accepted without adequate test coverage.
 | `npm run test-js` | runs javascript tests and coverage report |
 | `npm run test-unit-ios` | runs ios unit tests in debug/release <br> **Options:** `-- --release` |
 | `npm run test-unit-android` | runs android unit tests in debug/release <br> **Options:** `-- --release` |
-| `npm run test-e2e-ios` | runs the ios e2e suite (with detox) in debug/release <br> **Options:** `-- --release`|
-| `npm run test-e2e-android` | runs the android e2e suite (with uiautomator) in debug/release on running devices/emulators <br> **Options:** `-- [--release] [--just com.TestClass#testMethod]` |
+| `npm run test-e2e-ios` | runs the ios e2e tests using [detox](https://github.com/wix/detox) in debug/release <br> **Options:** `-- --release`|
+| `npm run test-e2e-android` | runs the android e2e tests using [detox](https://github.com/wix/detox) in debug/release <br> **Options:** `-- --release` |
 | `npm run test-all` | runs all tests in parallel |
 | `npm run gen-docs` | generates api docs |
 | `npm run local-docs` | serve the docs locally for `http://localhost:3000/` |

e2e/OverlayTest.test.js

@@ -32,4 +32,4 @@ describe('Overlay', () => {
     await elementById(testIDs.HIDE_TOP_BAR_BUTTON).tap();
     await expect(elementById(testIDs.TOP_BAR_ELEMENT)).toBeVisible();
   });
-});
+});

package.json

@@ -37,10 +37,9 @@
     "test-unit-android": "node ./scripts/test-unit-android",
     "test-unit-ios": "node ./scripts/test-unit-ios",
     "pretest-e2e-android": "npm run build",
-    "test-e2e-android": "node ./scripts/test-e2e-android",
-    "test-e2e-android-detox": "node ./scripts/test-e2e-android-detox",
+    "test-e2e-android": "node ./scripts/test-e2e --android",
     "pretest-e2e-ios": "npm run build",
-    "test-e2e-ios": "node ./scripts/test-e2e-ios",
+    "test-e2e-ios": "node ./scripts/test-e2e",
     "test-all": "node ./scripts/test-all",
     "prerelease": "npm run build",
     "release": "node ./scripts/release",

scripts/clean.js

@@ -12,7 +12,5 @@ function run() {
   exec.execSync(`rm -rf lib/android/app/build`);
   exec.execSync(`rm -rf playground/android/build`);
   exec.execSync(`rm -rf playground/android/app/build`);
-  exec.execSync(`rm -rf AndroidE2E/android/build`);
-  exec.execSync(`rm -rf AndroidE2E/android/app/build`);
   exec.execSync(`rm -rf lib/dist`);
 }

scripts/local-docs.js

@@ -1,3 +1,4 @@
+/* tslint:disable: no-console */
 const http = require('http');
 const fs = require('fs');
 

scripts/test-e2e-android-detox.js

@@ -1,12 +0,0 @@
-const _ = require('lodash');
-const exec = require('shell-utils').exec;
-
-const release = _.includes(process.argv, '--release');
-
-run();
-
-function run() {
-  const conf = release ? `release` : `debug`;
-  exec.execSync(`detox build --configuration android.emu.${conf}`);
-  exec.execSync(`detox test --configuration android.emu.${conf} ${process.env.CI ? '--cleanup' : ''}  --platform android`);
-}

scripts/test-e2e-android.js

@@ -1,56 +0,0 @@
-/* tslint:disable: no-console */
-const _ = require('lodash');
-const exec = require('shell-utils').exec;
-
-const release = _.includes(process.argv, '--release');
-
-// Run just a single test, e.g. npm test-e2e-android -- --just com.MyClass#myMethod
-const filter = _.chain(process.argv).dropWhile((a) => a !== '--just').take(2).last().value();
-
-run();
-
-function run() {
-  if (process.env.CI) {
-    console.log(`android e2e is disabled on CI until Travis will support x86 emulators or we migrate to our own solution`);
-  } else {
-    assertEnv();
-    if (!isDeviceRunning()) {
-      startEmulator();
-    }
-    runTests();
-  }
-}
-
-function assertEnv() {
-  if (_.isEmpty(process.env.ANDROID_HOME)) {
-    throw new Error(`$ANDROID_HOME is not defined`);
-  }
-}
-
-function isDeviceRunning() {
-  try {
-    const response = exec.execSyncRead(`adb -e shell getprop init.svc.bootanim 2>&1`);
-    return _.isEqual(response, `stopped`);
-  } catch (err) {
-    return false;
-  }
-}
-
-function startEmulator() {
-  console.log(`Looking for avd...`);
-  const avdsRaw = exec.execSyncRead(`${process.env.ANDROID_HOME}/tools/bin/avdmanager list avd -c`);
-  const avdName = _.get(/^.*package\.xml(\S+)$/m.exec(avdsRaw), '1');
-  if (_.isEmpty(avdName)) {
-    throw new Error(`\n\n\nCan't find avd to launch. Please create an avd first.\n\n\n`);
-  }
-  console.log(`found avd name: ${avdName}, Launching...`);
-  exec.execAsyncSilent(`${process.env.ANDROID_HOME}/tools/emulator -gpu host -no-audio @${avdName}`);
-  exec.execSync(`./scripts/waitForAndroidEmulator.sh`);
-}
-
-function runTests() {
-  exec.execSync(`npm run uninstall-android`);
-  exec.execSync(`npm run install-android ${release ? '-- --release' : ''}`);
-  const filterParam = filter ? '-Pandroid.testInstrumentationRunnerArguments.class=' + filter : '';
-  exec.execSync(`cd AndroidE2E && ./gradlew ${filterParam} connectedDebugAndroidTest`);
-}

scripts/test-e2e-ios.js

@@ -1,12 +0,0 @@
-const _ = require('lodash');
-const exec = require('shell-utils').exec;
-
-const release = _.includes(process.argv, '--release');
-
-run();
-
-function run() {
-  const conf = release ? `release` : `debug`;
-  exec.execSync(`detox build --configuration ios.sim.${conf}`);
-  exec.execSync(`detox test --configuration ios.sim.${conf} ${process.env.CI ? '--cleanup' : ''}`);
-}

scripts/test-e2e.js

@@ -0,0 +1,18 @@
+const _ = require('lodash');
+const exec = require('shell-utils').exec;
+
+const android = _.includes(process.argv, '--android');
+const release = _.includes(process.argv, '--release');
+
+run();
+
+function run() {
+  const platform = android ? `android` : `ios`;
+  const prefix = android ? `android.emu` : `ios.sim`;
+  const suffix = release ? `release` : `debug`;
+  const configuration = `${prefix}.${suffix}`;
+  const cleanup = process.env.CI ? `--cleanup` : ``;
+
+  exec.execSync(`detox build --configuration ${configuration}`);
+  exec.execSync(`detox test --configuration ${configuration} --platform ${platform} ${cleanup}`);
+}

scripts/waitForAndroidEmulator.sh

@@ -1,21 +0,0 @@
-#!/bin/bash -e
-
-bootanim=""
-failcounter=0
-timeout_in_sec=360
-
-until [[ "$bootanim" =~ "stopped" ]]; do
-  bootanim=`adb -e shell getprop init.svc.bootanim 2>&1 &`
-  if [[ "$bootanim" =~ "device not found" || "$bootanim" =~ "device offline"
-    || "$bootanim" =~ "running" ]]; then
-    let "failcounter += 1"
-    echo "Waiting for emulator to start"
-    if [[ $failcounter -gt timeout_in_sec ]]; then
-      echo "Timeout ($timeout_in_sec seconds) reached; failed to start emulator"
-      exit 1
-    fi
-  fi
-  sleep 1
-done
-
-echo "Emulator is ready"