added another testcase

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

@@ -24,123 +24,123 @@ import static org.assertj.core.api.Java6Assertions.assertThat;
 @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);
-    }
-
-    @Test
-    public void _1_acceptsOverlayPermissions_ShowsWelcomeScreen() throws Exception {
-        launchTheApp();
-        assertMainShown();
-    }
-
-    @Test
-    public void _2_relaunchFromBackground() throws Exception {
-        launchTheApp();
-        assertMainShown();
-        push();
-        assertPushedScreenShown();
-
-        uiDevice().pressHome();
-        uiDevice().pressRecentApps();
-        elementByText("Playground").click();
-
-        assertPushedScreenShown();
-    }
-
-    @Test
-    public void _3_relaunchAfterClose() throws Exception {
-        launchTheApp();
-        push();
-        assertPushedScreenShown();
-
-        uiDevice().pressBack();
-
-        launchTheApp();
-        assertMainShown();
-    }
-
-    @Test
-    public void _4_deviceOrientationDoesNotDestroyActivity() throws Exception {
-        launchTheApp();
-        push();
-        assertPushedScreenShown();
-
-        uiDevice().setOrientationLeft();
-        Thread.sleep(100);
-
-        assertPushedScreenShown();
-    }
-
-    @Test
-    public void _5_relaunchAfterActivityKilledBySystem() throws Exception {
-        launchTheApp();
-        push();
-        assertPushedScreenShown();
-
-        uiDevice().pressHome();
-        uiDevice().waitForIdle();
-        uiDevice().executeShellCommand("am kill " + PACKAGE_NAME);
-
-        uiDevice().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"));
-    }
+	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);
+	}
+
+	@Test
+	public void _1_acceptsOverlayPermissions_ShowsWelcomeScreen() throws Exception {
+		launchTheApp();
+		assertMainShown();
+	}
+
+	@Test
+	public void _2_relaunchFromBackground() throws Exception {
+		launchTheApp();
+		assertMainShown();
+		push();
+		assertPushedScreenShown();
+
+		uiDevice().pressHome();
+		uiDevice().pressRecentApps();
+		elementByText("Playground").click();
+
+		assertPushedScreenShown();
+	}
+
+	@Test
+	public void _3_relaunchAfterClose() throws Exception {
+		launchTheApp();
+		push();
+		assertPushedScreenShown();
+
+		uiDevice().pressBack();
+
+		launchTheApp();
+		assertMainShown();
+	}
+
+	@Test
+	public void _4_deviceOrientationDoesNotDestroyActivity() throws Exception {
+		launchTheApp();
+		push();
+		assertPushedScreenShown();
+
+		uiDevice().setOrientationLeft();
+		Thread.sleep(100);
+
+		assertPushedScreenShown();
+	}
+
+	@Test
+	public void _5_relaunchAfterActivityKilledBySystem() throws Exception {
+		launchTheApp();
+		push();
+		assertPushedScreenShown();
+
+		uiDevice().pressHome();
+		uiDevice().waitForIdle();
+		uiDevice().executeShellCommand("am kill " + PACKAGE_NAME);
+
+		uiDevice().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/EnvironmentTest.java

@@ -10,8 +10,8 @@ import static org.assertj.core.api.Java6Assertions.assertThat;
 
 @RunWith(AndroidJUnit4.class)
 public class EnvironmentTest {
-    @Test
-    public void instrumentationAndAssertJ() throws Exception {
-        assertThat(getInstrumentation().getTargetContext().getPackageName()).isEqualTo("com.reactnativenavigation.e2e.androide2e");
-    }
+	@Test
+	public void instrumentationAndAssertJ() throws Exception {
+		assertThat(getInstrumentation().getTargetContext().getPackageName()).isEqualTo("com.reactnativenavigation.e2e.androide2e");
+	}
 }

playground/e2e/app.test.js

@@ -56,6 +56,21 @@ describe('app', () => {
     expect(elementByLabel('Modal Stack Position: 1')).toBeVisible();
     elementByLabel('Show Modal').tap();
     expect(elementByLabel('Modal Stack Position: 2')).toBeVisible();
+    elementByLabel('Dismiss Modal').tap();
+    expect(elementByLabel('Modal Stack Position: 1')).toBeVisible();
+    elementByLabel('Dismiss Modal').tap();
+    expect(elementByLabel('React Native Navigation!')).toBeVisible();
+  });
+
+  xit('dismiss modal by id', () => {
+    elementByLabel('Show Modal').tap();
+    expect(elementByLabel('Modal Stack Position: 1')).toBeVisible();
+    elementByLabel('Show Modal').tap();
+    expect(elementByLabel('Modal Stack Position: 2')).toBeVisible();
+    elementByLabel('Dismiss Previous Modal').tap();
+    expect(elementByLabel('Modal Stack Position: 2')).toBeVisible();
+    elementByLabel('Dismiss Modal').tap();
+    expect(elementByLabel('React Native Navigation!')).toBeVisible();
   });
 });
 

playground/src/containers/ModalScreen.js

@@ -13,6 +13,7 @@ class ModalScreen extends Component {
     super(props);
     this.onClickShowModal = this.onClickShowModal.bind(this);
     this.onClickDismissModal = this.onClickDismissModal.bind(this);
+    this.onClickDismissPreviousModal = this.onClickDismissPreviousModal.bind(this);
   }
   render() {
     return (
@@ -21,6 +22,7 @@ class ModalScreen extends Component {
         <Text style={styles.footer}>{`Modal Stack Position: ${this.getModalPosition()}`}</Text>
         <Button title="Show Modal" onPress={this.onClickShowModal} />
         <Button title="Dismiss Modal" onPress={this.onClickDismissModal} />
+        {this.props.previousModalId ? (<Button title="Dismiss Previous Modal" onPress={this.onClickDismissPreviousModal} />) : undefined}
         <Text style={styles.footer}>{`this.props.id = ${this.props.id}`}</Text>
       </View>
     );
@@ -30,7 +32,8 @@ class ModalScreen extends Component {
     Navigation.showModal({
       name: 'navigation.playground.ModalScreen',
       passProps: {
-        modalPosition: this.getModalPosition() + 1
+        modalPosition: this.getModalPosition() + 1,
+        previousModalId: this.props.id
       }
     });
   }
@@ -39,6 +42,10 @@ class ModalScreen extends Component {
     Navigation.dismissModal(this.props.id);
   }
 
+  onClickDismissPreviousModal() {
+    Navigation.dismissModal(this.props.previousModalId);
+  }
+
   getModalPosition() {
     return (this.props.modalPosition || 1);
   }