Fix ModalStack.findControllerById

* Extract Modal to separate class
* Test ModalStack

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ModalStack.java

@@ -1,27 +1,26 @@
 package com.reactnativenavigation.viewcontrollers;
 
-import android.app.Dialog;
-import android.content.DialogInterface;
 import android.support.annotation.Nullable;
-import android.view.KeyEvent;
-import android.view.View;
 
 import com.facebook.react.bridge.Promise;
-import com.reactnativenavigation.R;
+import com.reactnativenavigation.viewcontrollers.modal.Modal;
+import com.reactnativenavigation.viewcontrollers.modal.ModalCreator;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static android.view.View.MeasureSpec.EXACTLY;
-import static android.view.View.MeasureSpec.makeMeasureSpec;
-
 public class ModalStack {
 
 	private List<Modal> modals = new ArrayList<>();
+    private ModalCreator creator;
+
+    public ModalStack(ModalCreator creator) {
+        this.creator = creator;
+    }
 
-	public void showModal(final ViewController viewController, Promise promise) {
-		Modal modal = new Modal(viewController);
-		modals.add(modal);
+    public void showModal(final ViewController viewController, Promise promise) {
+        Modal modal = creator.create(viewController);
+        modals.add(modal);
 		modal.show();
 		if (promise != null) {
 			promise.resolve(viewController.getId());
@@ -52,7 +51,7 @@ public class ModalStack {
 	}
 
 	@Nullable
-	private Modal findModalByComponentId(String componentId) {
+	public Modal findModalByComponentId(String componentId) {
 		for (Modal modal : modals) {
 			if (modal.containsDeepComponentId(componentId)) {
 				return modal;
@@ -64,49 +63,6 @@ public class ModalStack {
 	@Nullable
     ViewController findControllerById(String id) {
         Modal modal = findModalByComponentId(id);
-        return modal != null ? modal.viewController : null;
-    }
-
-    private static class Modal implements DialogInterface.OnKeyListener {
-		public final ViewController viewController;
-		private final Dialog dialog;
-
-		Modal(final ViewController viewController) {
-			this.viewController = viewController;
-			dialog = new Dialog(viewController.getActivity(), R.style.Modal);
-			dialog.setOnKeyListener(this);
-		}
-
-		void show() {
-			preMeasureView();
-			dialog.setContentView(viewController.getView());
-			dialog.show();
-		}
-
-		void dismiss() {
-			dialog.dismiss();
-		}
-
-		boolean containsDeepComponentId(String componentId) {
-			return viewController.findControllerById(componentId) != null;
-		}
-
-		private void preMeasureView() {
-			View decorView = viewController.getActivity().getWindow().getDecorView();
-			viewController.getView().measure(makeMeasureSpec(decorView.getMeasuredWidth(), EXACTLY), makeMeasureSpec(decorView.getMeasuredHeight(), EXACTLY));
-		}
-
-        @Override
-        public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
-            if (keyCode == KeyEvent.KEYCODE_BACK) {
-                if (event.getAction() == KeyEvent.ACTION_UP) {
-                    if (viewController.handleBack()) {
-                        return true;
-                    }
-                    dialog.dismiss();
-                }
-            }
-            return false;
-        }
+        return modal != null ? modal.viewController.findControllerById(id) : null;
     }
 }

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/modal/Modal.java

@@ -0,0 +1,55 @@
+package com.reactnativenavigation.viewcontrollers.modal;
+
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.view.KeyEvent;
+import android.view.View;
+
+import com.reactnativenavigation.R;
+import com.reactnativenavigation.viewcontrollers.ViewController;
+
+import static android.view.View.MeasureSpec.EXACTLY;
+import static android.view.View.MeasureSpec.makeMeasureSpec;
+
+public class Modal implements DialogInterface.OnKeyListener {
+    public final ViewController viewController;
+    private final Dialog dialog;
+
+    public Modal(final ViewController viewController) {
+        this.viewController = viewController;
+        dialog = new Dialog(viewController.getActivity(), R.style.Modal);
+        dialog.setOnKeyListener(this);
+    }
+
+    public void show() {
+        preMeasureView();
+        dialog.setContentView(viewController.getView());
+        dialog.show();
+    }
+
+    public void dismiss() {
+        dialog.dismiss();
+    }
+
+    public boolean containsDeepComponentId(String componentId) {
+        return viewController.findControllerById(componentId) != null;
+    }
+
+    private void preMeasureView() {
+        View decorView = viewController.getActivity().getWindow().getDecorView();
+        viewController.getView().measure(makeMeasureSpec(decorView.getMeasuredWidth(), EXACTLY), makeMeasureSpec(decorView.getMeasuredHeight(), EXACTLY));
+    }
+
+    @Override
+    public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_BACK) {
+            if (event.getAction() == KeyEvent.ACTION_UP) {
+                if (viewController.handleBack()) {
+                    return true;
+                }
+                dialog.dismiss();
+            }
+        }
+        return false;
+    }
+}

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/modal/ModalCreator.java

@@ -0,0 +1,9 @@
+package com.reactnativenavigation.viewcontrollers.modal;
+
+import com.reactnativenavigation.viewcontrollers.ViewController;
+
+public class ModalCreator {
+    public Modal create(ViewController viewController) {
+        return new Modal(viewController);
+    }
+}

lib/android/app/src/test/java/com/reactnativenavigation/mocks/ModalCreatorMock.java

@@ -0,0 +1,14 @@
+package com.reactnativenavigation.mocks;
+
+import com.reactnativenavigation.viewcontrollers.ViewController;
+import com.reactnativenavigation.viewcontrollers.modal.Modal;
+import com.reactnativenavigation.viewcontrollers.modal.ModalCreator;
+
+import static org.mockito.Mockito.spy;
+
+public class ModalCreatorMock extends ModalCreator {
+    @Override
+    public Modal create(ViewController viewController) {
+        return spy(new Modal(viewController));
+    }
+}

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/ModalStackTest.java

@@ -0,0 +1,57 @@
+package com.reactnativenavigation.viewcontrollers;
+
+import com.reactnativenavigation.BaseTest;
+import com.reactnativenavigation.mocks.MockPromise;
+import com.reactnativenavigation.mocks.ModalCreatorMock;
+import com.reactnativenavigation.mocks.SimpleViewController;
+import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.viewcontrollers.modal.Modal;
+
+import org.junit.Test;
+
+import javax.annotation.Nullable;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+public class ModalStackTest extends BaseTest {
+    private static final String CONTROLLER_ID = "simpleController";
+    private ModalStack uut;
+    private SimpleViewController viewController;
+
+    @Override
+    public void beforeEach() {
+        uut = spy(new ModalStack(new ModalCreatorMock()));
+        viewController = new SimpleViewController(newActivity(), CONTROLLER_ID, new Options());
+    }
+
+    @Test
+    public void modalRefIsSaved() throws Exception {
+        uut.showModal(viewController, new MockPromise());
+        assertThat(findModal()).isNotNull();
+    }
+
+    @Test
+    public void modalIsShown() throws Exception {
+        uut.showModal(viewController, new MockPromise() {
+            @Override
+            public void resolve(@Nullable Object value) {
+                verify(findModal(), times(1)).show();
+            }
+        });
+    }
+
+    @Test
+    public void modalIsDismissed() throws Exception {
+        uut.showModal(viewController, new MockPromise());
+        assertThat(findModal()).isNotNull();
+        uut.dismissModal(CONTROLLER_ID, new MockPromise());
+        assertThat(findModal()).isNull();
+    }
+
+    private Modal findModal() {
+        return uut.findModalByComponentId("simpleController");
+    }
+}

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/NavigatorTest.java

@@ -29,7 +29,7 @@ import static org.mockito.Mockito.when;
 public class NavigatorTest extends BaseTest {
     private Activity activity;
     private Navigator uut;
-    private ParentController parentController;
+    private StackController parentController;
     private SimpleViewController child1;
     private ViewController child2;
     private ViewController child3;
@@ -44,7 +44,7 @@ public class NavigatorTest extends BaseTest {
         imageLoaderMock = ImageLoaderMock.mock();
         activity = newActivity();
         uut = new Navigator(activity);
-        parentController = new StackController(activity, "stack", new Options());
+        parentController = spy(new StackController(activity, "stack", new Options()));
         parentController.ensureViewIsCreated();
         child1 = new SimpleViewController(activity, "child1", tabOptions);
         child2 = new SimpleViewController(activity, "child2", tabOptions);
@@ -312,4 +312,27 @@ public class NavigatorTest extends BaseTest {
         uut.push(stackController.getId(), child2, new MockPromise());
         assertIsChildById(stackController.getView(), child2.getView());
     }
+
+    @Test
+    public void pushedStackCanBePopped() throws Exception {
+        StackController parent = new StackController(activity, "someStack", new Options());
+        parent.ensureViewIsCreated();
+        uut.setRoot(parent, new MockPromise());
+        parent.push(parentController, new MockPromise());
+
+        parentController.push(child1, new MockPromise());
+        parentController.push(child2, new MockPromise());
+        assertThat(parentController.getChildControllers().size()).isEqualTo(2);
+        child1.ensureViewIsCreated();
+        child2.ensureViewIsCreated();
+
+        MockPromise promise = new MockPromise() {
+            @Override
+            public void resolve(@Nullable Object value) {
+                assertThat(parentController.getChildControllers().size()).isEqualTo(1);
+            }
+        };
+        uut.popSpecific("child2", promise);
+        verify(parentController, times(1)).popSpecific(child2, promise);
+    }
 }

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/StackControllerTest.java

@@ -1,19 +1,22 @@
 package com.reactnativenavigation.viewcontrollers;
 
-import android.app.*;
+import android.app.Activity;
 import android.view.View;
 
-import com.reactnativenavigation.*;
-import com.reactnativenavigation.mocks.*;
+import com.reactnativenavigation.BaseTest;
+import com.reactnativenavigation.mocks.MockPromise;
+import com.reactnativenavigation.mocks.SimpleViewController;
 import com.reactnativenavigation.parse.Options;
 
-import org.assertj.core.api.iterable.*;
-import org.junit.*;
+import org.assertj.core.api.iterable.Extractor;
+import org.junit.Test;
 
 import javax.annotation.Nullable;
 
-import static org.assertj.core.api.Java6Assertions.*;
-import static org.mockito.Mockito.*;
+import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 public class StackControllerTest extends BaseTest {
 

playground/src/screens/TextScreen.js

@@ -20,6 +20,7 @@ class TextScreen extends Component {
   constructor(props) {
     super(props);
     globalFirstComponentID = (props.text === 'This is tab 1') ? props.componentId : globalFirstComponentID;
+    this.onClickPop = this.onClickPop.bind(this);
   }
 
   render() {
@@ -35,10 +36,15 @@ class TextScreen extends Component {
         <Button title='Show Tab Bar' testID={testIDs.SHOW_BOTTOM_TABS_BUTTON} onPress={() => this.hideTabBar(false)} />
         <Button title='Show Left Side Menu' testID={testIDs.SHOW_LEFT_SIDE_MENU_BUTTON} onPress={() => this.showSideMenu('left')} />
         <Button title='Show Right Side Menu' testID={testIDs.SHOW_RIGHT_SIDE_MENU_BUTTON} onPress={() => this.showSideMenu('right')} />
+        <Button title='Pop' testID={testIDs.POP_BUTTON} onPress={this.onClickPop} />
       </View>
     );
   }
 
+  async onClickPop() {
+    await Navigation.pop(this.props.componentId);
+  }
+
   renderTextFromFunctionInProps() {
     if (!this.props.myFunction) {
       return undefined;