android: e2e refactor

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

@@ -1,42 +1,13 @@
 package com.reactnativenavigation.e2e.androide2e;
 
-import android.support.test.runner.AndroidJUnit4;
 import android.support.test.uiautomator.By;
-import android.support.test.uiautomator.BySelector;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject;
-import android.support.test.uiautomator.UiObjectNotFoundException;
-import android.support.test.uiautomator.UiScrollable;
-import android.support.test.uiautomator.UiSelector;
-import android.support.test.uiautomator.Until;
-
-import org.junit.After;
-import org.junit.Before;
+
 import org.junit.FixMethodOrder;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 import org.junit.runners.MethodSorters;
 
-import static android.support.test.InstrumentationRegistry.getInstrumentation;
-import static org.assertj.core.api.Java6Assertions.assertThat;
-
-@RunWith(AndroidJUnit4.class)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class ApplicationLifecycleTest {
-
-	private static final String PACKAGE_NAME = "com.reactnativenavigation.playground";
-	private static final long TIMEOUT = 3000;
-
-	@Before
-	public void beforeEach() throws Exception {
-		uiDevice().wakeUp();
-		uiDevice().setOrientationNatural();
-	}
-
-	@After
-	public void afterEach() throws Exception {
-		uiDevice().executeShellCommand("am force-stop " + PACKAGE_NAME);
-	}
+public class ApplicationLifecycleTest extends BaseTest {
 
 	@Test
 	public void _1_acceptsOverlayPermissions_ShowsWelcomeScreen() throws Exception {
@@ -48,23 +19,23 @@ public class ApplicationLifecycleTest {
 	public void _2_relaunchFromBackground() throws Exception {
 		launchTheApp();
 		assertMainShown();
-		push();
-		assertPushedScreenShown();
+		elementByText("PUSH").click();
+		assertExists(By.text("Pushed Screen"));
 
-		uiDevice().pressHome();
-		uiDevice().pressRecentApps();
+		device().pressHome();
+		device().pressRecentApps();
 		elementByText("Playground").click();
 
-		assertPushedScreenShown();
+		assertExists(By.text("Pushed Screen"));
 	}
 
 	@Test
 	public void _3_relaunchAfterClose() throws Exception {
 		launchTheApp();
-		push();
-		assertPushedScreenShown();
+		elementByText("PUSH").click();
+		assertExists(By.text("Pushed Screen"));
 
-		uiDevice().pressBack();
+		device().pressBack();
 
 		launchTheApp();
 		assertMainShown();
@@ -73,74 +44,31 @@ public class ApplicationLifecycleTest {
 	@Test
 	public void _4_deviceOrientationDoesNotDestroyActivity() throws Exception {
 		launchTheApp();
-		push();
-		assertPushedScreenShown();
+		elementByText("PUSH").click();
+		assertExists(By.text("Pushed Screen"));
 
-		uiDevice().setOrientationLeft();
+		device().setOrientationLeft();
 		Thread.sleep(100);
 
-		assertPushedScreenShown();
+		assertExists(By.text("Pushed Screen"));
 	}
 
 	@Test
 	public void _5_relaunchAfterActivityKilledBySystem() throws Exception {
 		launchTheApp();
-		push();
-		assertPushedScreenShown();
+		elementByText("PUSH").click();
+		assertExists(By.text("Pushed Screen"));
 
-		uiDevice().pressHome();
-		uiDevice().waitForIdle();
-		uiDevice().executeShellCommand("am kill " + PACKAGE_NAME);
+		device().pressHome();
+		device().waitForIdle();
+		device().executeShellCommand("am kill " + PACKAGE_NAME);
 
-		uiDevice().pressRecentApps();
+		device().pressRecentApps();
 		elementByText("Playground").click();
 		assertMainShown();
 	}
 
-	private void push() throws UiObjectNotFoundException {
-		elementByText("PUSH").click();
-	}
-
 	private void assertMainShown() {
 		assertExists(By.text("React Native Navigation!"));
 	}
-
-	private void launchTheApp() throws Exception {
-		uiDevice().executeShellCommand("am start -n " + PACKAGE_NAME + "/.MainActivity");
-		uiDevice().waitForIdle();
-		acceptOverlayPermissionIfNeeded();
-		uiDevice().wait(Until.gone(By.textContains("Please wait")), 1000 * 60 * 3);
-	}
-
-	private void acceptOverlayPermissionIfNeeded() throws Exception {
-		if (elementByText("Draw over other apps").exists()) {
-			if (!elementByText("Playground").exists()) {
-				scrollToText("Playground");
-			}
-			elementByText("Playground").click();
-			elementByText("Permit drawing over other apps").click();
-			uiDevice().pressBack();
-			uiDevice().pressBack();
-		}
-	}
-
-	private UiDevice uiDevice() {
-		return UiDevice.getInstance(getInstrumentation());
-	}
-
-	private UiObject elementByText(String text) {
-		return uiDevice().findObject(new UiSelector().text(text));
-	}
-
-	private void scrollToText(String txt) throws Exception {
-		new UiScrollable(new UiSelector().scrollable(true)).scrollTextIntoView(txt);
-	}
-
-	private void assertExists(BySelector selector) {
-		assertThat(uiDevice().wait(Until.hasObject(selector), TIMEOUT)).isTrue();
-	}
-
-	private void assertPushedScreenShown() {
-		assertExists(By.text("Pushed Screen"));
-	}
 }

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

@@ -0,0 +1,69 @@
+package com.reactnativenavigation.e2e.androide2e;
+
+import android.support.test.runner.AndroidJUnit4;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.BySelector;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject;
+import android.support.test.uiautomator.UiScrollable;
+import android.support.test.uiautomator.UiSelector;
+import android.support.test.uiautomator.Until;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.runner.RunWith;
+
+import static android.support.test.InstrumentationRegistry.getInstrumentation;
+import static org.assertj.core.api.Java6Assertions.assertThat;
+
+@RunWith(AndroidJUnit4.class)
+public abstract class BaseTest {
+	public static final String PACKAGE_NAME = "com.reactnativenavigation.playground";
+	public static final long TIMEOUT = 3000;
+
+	@Before
+	public void beforeEach() throws Exception {
+		device().wakeUp();
+		device().setOrientationNatural();
+	}
+
+	@After
+	public void afterEach() throws Exception {
+		device().executeShellCommand("am force-stop " + 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 acceptOverlayPermissionIfNeeded() throws Exception {
+		if (elementByText("Draw over other apps").exists()) {
+			if (!elementByText("Playground").exists()) {
+				scrollToText("Playground");
+			}
+			elementByText("Playground").click();
+			elementByText("Permit drawing over other apps").click();
+			device().pressBack();
+			device().pressBack();
+		}
+	}
+
+	public UiObject elementByText(String text) {
+		return device().findObject(new UiSelector().text(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)).isTrue();
+	}
+}

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

@@ -0,0 +1,13 @@
+package com.reactnativenavigation.e2e.androide2e;
+
+import org.junit.Test;
+
+import static org.assertj.core.api.Java6Assertions.assertThat;
+
+public class TopLevelApiTest extends BaseTest {
+
+	@Test
+	public void switchToTabBasedApp() throws Exception {
+		assertThat(1 + 1).isPositive();
+	}
+}

android/app/src/main/java/com/reactnativenavigation/react/NavigationEventEmitter.java

@@ -7,6 +7,9 @@ import com.facebook.react.bridge.WritableMap;
 import static com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter;
 
 public class NavigationEventEmitter {
+	private static String onAppLaunched = "RNN.appLaunched";
+	private static String containerStart = "RNN.containerStart";
+	private static String containerStop = "RNN.containerStop";
 
 	public static NavigationEventEmitter emit(ReactContext context) {
 		return new NavigationEventEmitter(context);
@@ -19,7 +22,7 @@ public class NavigationEventEmitter {
 	}
 
 	public void appLaunched() {
-		emit("RNN.appLaunched");
+		emit(onAppLaunched);
 	}
 
 	private void emit(String eventName) {