Push and Pop always accept a promise (#2514)

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

 		this.animator = animator;
 	}
 
-	public void push(final ViewController child) {
-		push(child, null);
-	}
-
 	public void push(final ViewController child, final Promise promise) {
 		final ViewController previousTop = peek();
 
 		pop(true, promise);
 	}
 
-	void pop() {
-		pop(true, null);
-	}
-
 	private void pop(boolean animate, final Promise promise) {
 		if (!canPop()) {
 			Navigator.rejectPromise(promise);

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

         List<ViewController> tabs = createTabs();
         uut.setTabs(tabs);
         assertThat(uut.getView().getChildCount()).isEqualTo(6);
-        assertThat(uut.getChildControllers()).extracting(new Extractor<ViewController, Integer>() {
-            @Override
-            public Integer extract(final ViewController input) {
-                return input.getView().getVisibility();
-            }
-        }).containsExactly(View.VISIBLE, View.GONE, View.GONE, View.GONE, View.GONE);
+        assertThat(uut.getChildControllers()).extracting((Extractor<ViewController, Integer>) input -> input.getView().getVisibility()).containsExactly(View.VISIBLE, View.GONE, View.GONE, View.GONE, View.GONE);
     }
 
     @Test
         uut.selectTabAtIndex(3);
 
         assertThat(uut.getSelectedIndex()).isEqualTo(3);
-        assertThat(uut.getChildControllers()).extracting(new Extractor<ViewController, Integer>() {
-            @Override
-            public Integer extract(final ViewController input) {
-                return input.getView().getVisibility();
-            }
-        }).containsExactly(View.GONE, View.GONE, View.GONE, View.VISIBLE, View.GONE);
+        assertThat(uut.getChildControllers()).extracting((Extractor<ViewController, Integer>) input -> input.getView().getVisibility()).containsExactly(View.GONE, View.GONE, View.GONE, View.VISIBLE, View.GONE);
     }
 
     @Test
         assertThat(uut.findControllerById("123")).isNull();
         assertThat(uut.findControllerById(uut.getId())).isEqualTo(uut);
         StackController inner = new StackController(activity, "inner");
-        inner.push(child1);
+        inner.push(child1, new MockPromise());
         assertThat(uut.findControllerById(child1.getId())).isNull();
-        uut.setTabs(Arrays.<ViewController>asList(inner));
+        uut.setTabs(Collections.singletonList(inner));
         assertThat(uut.findControllerById(child1.getId())).isEqualTo(child1);
     }
 

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

     @Test
     public void push() throws Exception {
         StackController stackController = newStack();
-        stackController.push(child1);
+        stackController.push(child1, new MockPromise());
         uut.setRoot(stackController);
 
         assertIsChildById(uut.getView(), stackController.getView());
         BottomTabsController bottomTabsController = newTabs();
         StackController stack1 = newStack();
         StackController stack2 = newStack();
-        stack1.push(child1);
-        stack2.push(child2);
+        stack1.push(child1, new MockPromise());
+        stack2.push(child2, new MockPromise());
         bottomTabsController.setTabs(Arrays.asList(stack1, stack2));
         uut.setRoot(bottomTabsController);
 
         BottomTabsController bottomTabsController = newTabs();
         StackController stack1 = newStack();
         StackController stack2 = newStack();
-        stack1.push(child1);
-        stack2.push(child2);
-        stack2.push(child3);
-        stack2.push(child4);
+        stack1.push(child1, new MockPromise());
+        stack2.push(child2, new MockPromise());
+        stack2.push(child3, new MockPromise());
+        stack2.push(child4, new MockPromise());
         bottomTabsController.setTabs(Arrays.asList(stack1, stack2));
         uut.setRoot(bottomTabsController);
 
         BottomTabsController bottomTabsController = newTabs();
         StackController stack1 = newStack();
         StackController stack2 = newStack();
-        stack1.push(child1);
-        stack2.push(child2);
-        stack2.push(child3);
-        stack2.push(child4);
+        stack1.push(child1, new MockPromise());
+        stack2.push(child2, new MockPromise());
+        stack2.push(child3, new MockPromise());
+        stack2.push(child4, new MockPromise());
         bottomTabsController.setTabs(Arrays.asList(stack1, stack2));
         uut.setRoot(bottomTabsController);
 
         BottomTabsController bottomTabsController = newTabs();
         StackController stack1 = newStack();
         StackController stack2 = newStack();
-        stack1.push(child1);
-        stack2.push(child2);
-        stack2.push(child3);
-        stack2.push(child4);
-        stack2.push(child5);
+        stack1.push(child1, new MockPromise());
+        stack2.push(child2, new MockPromise());
+        stack2.push(child3, new MockPromise());
+        stack2.push(child4, new MockPromise());
+        stack2.push(child5, new MockPromise());
         bottomTabsController.setTabs(Arrays.asList(stack1, stack2));
         uut.setRoot(bottomTabsController);
 
         BottomTabsController bottomTabsController = newTabs();
         StackController stack1 = newStack();
         StackController stack2 = newStack();
-        stack1.push(child1);
-        stack2.push(child2);
-        stack2.push(child3);
-        stack2.push(child4);
-        stack2.push(child5);
+        stack1.push(child1, new MockPromise());
+        stack2.push(child2, new MockPromise());
+        stack2.push(child3, new MockPromise());
+        stack2.push(child4, new MockPromise());
+        stack2.push(child5, new MockPromise());
 
         bottomTabsController.setTabs(Arrays.asList(stack1, stack2));
         uut.setRoot(bottomTabsController);
     @Test
     public void push_Promise() throws Exception {
         final StackController stackController = newStack();
-        stackController.push(child1);
+        stackController.push(child1, new MockPromise());
         uut.setRoot(stackController);
 
         assertIsChildById(uut.getView(), stackController.getView());
         BottomTabsController bottomTabsController = newTabs();
         StackController stack1 = newStack();
         final StackController stack2 = newStack();
-        stack1.push(child1);
-        stack2.push(child2);
-        stack2.push(child3);
-        stack2.push(child4);
+        stack1.push(child1, new MockPromise());
+        stack2.push(child2, new MockPromise());
+        stack2.push(child3, new MockPromise());
+        stack2.push(child4, new MockPromise());
         bottomTabsController.setTabs(Arrays.asList(stack1, stack2));
         uut.setRoot(bottomTabsController);
 
     @Test
     public void pushIntoModal() throws Exception {
         StackController stackController = newStack();
-        stackController.push(child1);
+        stackController.push(child1, new MockPromise());
         uut.showModal(stackController, new MockPromise());
         uut.push(stackController.getId(), child2);
         assertIsChildById(stackController.getView(), child2.getView());

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

         assertThat(uut.getOptions()).isSameAs(initialNavigationOptions);
         initialNavigationOptions.topBarOptions.title = "the title";
         StackController stackController = new StackController(activity, "stackId");
-        stackController.push(uut);
+        stackController.push(uut, new MockPromise());
         assertThat(uut.getTopBar().getTitle()).isEmpty();
 
         uut.onViewAppeared();

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

         StackController stackController = new StackController(activity, "stack", new TestNavigationAnimator());
         SimpleViewController child1 = new SimpleViewController(activity, "child1");
         SimpleViewController child2 = new SimpleViewController(activity, "child2");
-        stackController.push(child1);
-        stackController.push(child2);
+        stackController.push(child1, new MockPromise());
+        stackController.push(child2, new MockPromise());
         children.add(stackController);
 
         assertThat(uut.findControllerById("child2")).isEqualTo(child2);

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

     @Test
     public void holdsAStackOfViewControllers() throws Exception {
         assertThat(uut.isEmpty()).isTrue();
-        uut.push(child1);
-        uut.push(child2);
-        uut.push(child3);
+        uut.push(child1, new MockPromise());
+        uut.push(child2, new MockPromise());
+        uut.push(child3, new MockPromise());
         assertThat(uut.peek()).isEqualTo(child3);
         assertContainsOnlyId(child1.getId(), child2.getId(), child3.getId());
     }
     @Test
     public void push() throws Exception {
         assertThat(uut.isEmpty()).isTrue();
-        uut.push(child1);
+        uut.push(child1, new MockPromise());
         assertContainsOnlyId(child1.getId());
     }
 
     @Test
     public void pop() throws Exception {
-        uut.push(child1);
-        uut.push(child2);
+        uut.push(child1, new MockPromise());
+        uut.push(child2, new MockPromise());
         assertContainsOnlyId(child2.getId(), child1.getId());
-        uut.pop();
+        uut.pop(new MockPromise());
         assertContainsOnlyId(child1.getId());
     }
 
         assertThat(uut.peek()).isNull();
         assertThat(uut.size()).isZero();
         assertThat(uut.isEmpty()).isTrue();
-        uut.push(child1);
+        uut.push(child1, new MockPromise());
         assertThat(uut.peek()).isEqualTo(child1);
         assertThat(uut.size()).isEqualTo(1);
         assertThat(uut.isEmpty()).isFalse();
     @Test
     public void pushAssignsRefToSelfOnPushedController() throws Exception {
         assertThat(child1.getParentStackController()).isNull();
-        uut.push(child1);
+        uut.push(child1, new MockPromise());
         assertThat(child1.getParentStackController()).isEqualTo(uut);
 
         StackController anotherNavController = new StackController(activity, "another", new TestNavigationAnimator());
-        anotherNavController.push(child2);
+        anotherNavController.push(child2, new MockPromise());
         assertThat(child2.getParentStackController()).isEqualTo(anotherNavController);
     }
 
         assertThat(uut.isEmpty()).isTrue();
         assertThat(uut.handleBack()).isFalse();
 
-        uut.push(child1);
+        uut.push(child1, new MockPromise());
         assertThat(uut.size()).isEqualTo(1);
         assertThat(uut.handleBack()).isFalse();
 
-        uut.push(child2);
+        uut.push(child2, new MockPromise());
         assertThat(uut.size()).isEqualTo(2);
         assertThat(uut.handleBack()).isTrue();
         assertThat(uut.size()).isEqualTo(1);
     @Test
     public void popDoesNothingWhenZeroOrOneChild() throws Exception {
         assertThat(uut.isEmpty()).isTrue();
-        uut.pop();
+        uut.pop(new MockPromise());
         assertThat(uut.isEmpty()).isTrue();
 
-        uut.push(child1);
-        uut.pop();
+        uut.push(child1, new MockPromise());
+        uut.pop(new MockPromise());
         assertContainsOnlyId(child1.getId());
     }
 
     public void canPopWhenSizeIsMoreThanOne() throws Exception {
         assertThat(uut.isEmpty()).isTrue();
         assertThat(uut.canPop()).isFalse();
-        uut.push(child1);
+        uut.push(child1, new MockPromise());
         assertContainsOnlyId(child1.getId());
         assertThat(uut.canPop()).isFalse();
-        uut.push(child2);
+        uut.push(child2, new MockPromise());
         assertContainsOnlyId(child1.getId(), child2.getId());
         assertThat(uut.canPop()).isTrue();
     }
     @Test
     public void pushAddsToViewTree() throws Exception {
         assertThat(uut.getView().findViewById(child1.getView().getId())).isNull();
-        uut.push(child1);
+        uut.push(child1, new MockPromise());
         assertThat(uut.getView().findViewById(child1.getView().getId())).isNotNull();
     }
 
     @Test
     public void pushRemovesPreviousFromTree() throws Exception {
         assertThat(uut.getView().findViewById(child1.getView().getId())).isNull();
-        uut.push(child1);
+        uut.push(child1, new MockPromise());
         assertThat(uut.getView().findViewById(child1.getView().getId())).isNotNull();
-        uut.push(child2);
+        uut.push(child2, new MockPromise());
         assertThat(uut.getView().findViewById(child1.getView().getId())).isNull();
         assertThat(uut.getView().findViewById(child2.getView().getId())).isNotNull();
     }
 
     @Test
     public void popReplacesViewWithPrevious() throws Exception {
-        uut.push(child1);
-        uut.push(child2);
+        uut.push(child1, new MockPromise());
+        uut.push(child2, new MockPromise());
         final View child2View = child2.getView();
         final View child1View = child1.getView();
         assertIsChildById(uut.getView(), child2View);
         assertNotChildOf(uut.getView(), child1View);
-        uut.pop();
+        uut.pop(new MockPromise());
         assertNotChildOf(uut.getView(), child2View);
         assertIsChildById(uut.getView(), child1View);
     }
 
     @Test
     public void popSpecificWhenTopIsRegularPop() throws Exception {
-        uut.push(child1);
-        uut.push(child2);
+        uut.push(child1, new MockPromise());
+        uut.push(child2, new MockPromise());
         uut.popSpecific(child2);
         assertContainsOnlyId(child1.getId());
         assertIsChildById(uut.getView(), child1.getView());
 
     @Test
     public void popSpecificDeepInStack() throws Exception {
-        uut.push(child1);
-        uut.push(child2);
+        uut.push(child1, new MockPromise());
+        uut.push(child2, new MockPromise());
         assertIsChildById(uut.getView(), child2.getView());
         uut.popSpecific(child1);
         assertContainsOnlyId(child2.getId());
 
     @Test
     public void popTo_PopsTopUntilControllerIsNewTop() throws Exception {
-        uut.push(child1);
-        uut.push(child2);
-        uut.push(child3);
+        uut.push(child1, new MockPromise());
+        uut.push(child2, new MockPromise());
+        uut.push(child3, new MockPromise());
 
         assertThat(uut.size()).isEqualTo(3);
         assertThat(uut.peek()).isEqualTo(child3);
 
     @Test
     public void popTo_NotAChildOfThisStack_DoesNothing() throws Exception {
-        uut.push(child1);
-        uut.push(child3);
+        uut.push(child1, new MockPromise());
+        uut.push(child3, new MockPromise());
         assertThat(uut.size()).isEqualTo(2);
         uut.popTo(child2);
         assertThat(uut.size()).isEqualTo(2);
 
     @Test
     public void popToRoot_PopsEverythingAboveFirstController() throws Exception {
-        uut.push(child1);
-        uut.push(child2);
-        uut.push(child3);
+        uut.push(child1, new MockPromise());
+        uut.push(child2, new MockPromise());
+        uut.push(child3, new MockPromise());
 
         assertThat(uut.size()).isEqualTo(3);
         assertThat(uut.peek()).isEqualTo(child3);
     public void findControllerById_ReturnsSelfOrChildrenById() throws Exception {
         assertThat(uut.findControllerById("123")).isNull();
         assertThat(uut.findControllerById(uut.getId())).isEqualTo(uut);
-        uut.push(child1);
+        uut.push(child1, new MockPromise());
         assertThat(uut.findControllerById(child1.getId())).isEqualTo(child1);
     }
 
     @Test
     public void findControllerById_Deeply() throws Exception {
         StackController stack = new StackController(activity, "stack2", new TestNavigationAnimator());
-        stack.push(child2);
-        uut.push(stack);
+        stack.push(child2, new MockPromise());
+        uut.push(stack, new MockPromise());
         assertThat(uut.findControllerById(child2.getId())).isEqualTo(child2);
     }
 
         child1 = spy(child1);
         child2 = spy(child2);
         child3 = spy(child3);
-        uut.push(child1);
-        uut.push(child2);
-        uut.push(child3);
+        uut.push(child1, new MockPromise());
+        uut.push(child2, new MockPromise());
+        uut.push(child3, new MockPromise());
 
         verify(child3, times(0)).destroy();
-        uut.pop();
+        uut.pop(new MockPromise());
         verify(child3, times(1)).destroy();
     }
 
         child1 = spy(child1);
         child2 = spy(child2);
         child3 = spy(child3);
-        uut.push(child1);
-        uut.push(child2);
-        uut.push(child3);
+        uut.push(child1, new MockPromise());
+        uut.push(child2, new MockPromise());
+        uut.push(child3, new MockPromise());
 
         verify(child2, times(0)).destroy();
         uut.popSpecific(child2);
         child1 = spy(child1);
         child2 = spy(child2);
         child3 = spy(child3);
-        uut.push(child1);
-        uut.push(child2);
-        uut.push(child3);
+        uut.push(child1, new MockPromise());
+        uut.push(child2, new MockPromise());
+        uut.push(child3, new MockPromise());
 
         verify(child2, times(0)).destroy();
         verify(child3, times(0)).destroy();
 
     private void assertContainsOnlyId(String... ids) {
         assertThat(uut.size()).isEqualTo(ids.length);
-        assertThat(uut.getChildControllers()).extracting(new Extractor<ViewController, String>() {
-            @Override
-            public String extract(final ViewController input) {
-                return input.getId();
-            }
-        }).containsOnly(ids);
+        assertThat(uut.getChildControllers()).extracting((Extractor<ViewController, String>) ViewController::getId).containsOnly(ids);
     }
 }

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

 import android.widget.LinearLayout;
 
 import com.reactnativenavigation.BaseTest;
+import com.reactnativenavigation.mocks.MockPromise;
 import com.reactnativenavigation.mocks.SimpleViewController;
 
 import org.assertj.android.api.Assertions;
     public void holdsAReferenceToStackControllerOrNull() throws Exception {
         assertThat(uut.getParentStackController()).isNull();
         StackController nav = new StackController(activity, "stack");
-        nav.push(uut);
+        nav.push(uut, new MockPromise());
         assertThat(uut.getParentStackController()).isEqualTo(nav);
     }