f

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

@@ -12,7 +12,7 @@ import org.junit.Test;
 
 import javax.annotation.Nullable;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;

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

@@ -22,6 +22,7 @@ import com.reactnativenavigation.views.StackLayout;
 
 import org.assertj.core.api.iterable.Extractor;
 import org.json.JSONObject;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
@@ -55,12 +56,12 @@ public class StackControllerTest extends BaseTest {
     }
 
     @Test
-    public void isAViewController() throws Exception {
+    public void isAViewController() {
         assertThat(uut).isInstanceOf(ViewController.class);
     }
 
     @Test
-    public void holdsAStackOfViewControllers() throws Exception {
+    public void holdsAStackOfViewControllers() {
         assertThat(uut.isEmpty()).isTrue();
         uut.animatePush(child1, new MockPromise());
         uut.animatePush(child2, new MockPromise());
@@ -70,14 +71,14 @@ public class StackControllerTest extends BaseTest {
     }
 
     @Test
-    public void push() throws Exception {
+    public void push() {
         assertThat(uut.isEmpty()).isTrue();
         uut.animatePush(child1, new MockPromise());
         assertContainsOnlyId(child1.getId());
     }
 
     @Test
-    public void pop() throws Exception {
+    public void pop() {
         uut.animatePush(child1, new MockPromise());
         uut.animatePush(child2, new MockPromise() {
             @Override
@@ -90,7 +91,7 @@ public class StackControllerTest extends BaseTest {
     }
 
     @Test
-    public void pop_appliesOptionsAfterPop() throws Exception {
+    public void pop_appliesOptionsAfterPop() {
         uut.animatePush(child1, new MockPromise());
         uut.animatePush(child2, new MockPromise() {
             @Override
@@ -102,7 +103,7 @@ public class StackControllerTest extends BaseTest {
     }
 
     @Test
-    public void pop_layoutHandlesChildWillDisappear() throws Exception {
+    public void pop_layoutHandlesChildWillDisappear() {
         final StackLayout[] stackLayout = new StackLayout[1];
         uut = new StackController(activity, new TopBarButtonCreatorMock(), new TitleBarReactViewCreatorMock(), new TopBarBackgroundViewCreatorMock(), "uut", new Options()) {
             @NonNull
@@ -128,7 +129,7 @@ public class StackControllerTest extends BaseTest {
     }
 
     @Test
-    public void stackOperations() throws Exception {
+    public void stackOperations() {
         assertThat(uut.peek()).isNull();
         assertThat(uut.size()).isZero();
         assertThat(uut.isEmpty()).isTrue();
@@ -139,7 +140,7 @@ public class StackControllerTest extends BaseTest {
     }
 
     @Test
-    public void pushAssignsRefToSelfOnPushedController() throws Exception {
+    public void pushAssignsRefToSelfOnPushedController() {
         assertThat(child1.getParentController()).isNull();
         uut.animatePush(child1, new MockPromise());
         assertThat(child1.getParentController()).isEqualTo(uut);
@@ -150,7 +151,7 @@ public class StackControllerTest extends BaseTest {
     }
 
     @Test
-    public void handleBack_PopsUnlessSingleChild() throws Exception {
+    public void handleBack_PopsUnlessSingleChild() {
         assertThat(uut.isEmpty()).isTrue();
         assertThat(uut.handleBack()).isFalse();
 
@@ -171,7 +172,7 @@ public class StackControllerTest extends BaseTest {
     }
 
     @Test
-    public void popDoesNothingWhenZeroOrOneChild() throws Exception {
+    public void popDoesNothingWhenZeroOrOneChild() {
         assertThat(uut.isEmpty()).isTrue();
         uut.pop(new MockPromise());
         assertThat(uut.isEmpty()).isTrue();
@@ -182,7 +183,7 @@ public class StackControllerTest extends BaseTest {
     }
 
     @Test
-    public void canPopWhenSizeIsMoreThanOne() throws Exception {
+    public void canPopWhenSizeIsMoreThanOne() {
         assertThat(uut.isEmpty()).isTrue();
         assertThat(uut.canPop()).isFalse();
         uut.animatePush(child1, new MockPromise());
@@ -194,14 +195,14 @@ public class StackControllerTest extends BaseTest {
     }
 
     @Test
-    public void pushAddsToViewTree() throws Exception {
+    public void pushAddsToViewTree() {
         assertThat(uut.getView().findViewById(child1.getView().getId())).isNull();
         uut.animatePush(child1, new MockPromise());
         assertThat(uut.getView().findViewById(child1.getView().getId())).isNotNull();
     }
 
     @Test
-    public void pushRemovesPreviousFromTree() throws Exception {
+    public void pushRemovesPreviousFromTree() {
         assertThat(uut.getView().findViewById(child1.getView().getId())).isNull();
         uut.animatePush(child1, new MockPromise());
         assertThat(uut.getView().findViewById(child1.getView().getId())).isNotNull();
@@ -215,7 +216,7 @@ public class StackControllerTest extends BaseTest {
     }
 
     @Test
-    public void popReplacesViewWithPrevious() throws Exception {
+    public void popReplacesViewWithPrevious() {
         final View child2View = child2.getView();
         final View child1View = child1.getView();
 
@@ -233,7 +234,7 @@ public class StackControllerTest extends BaseTest {
     }
 
     @Test
-    public void popSpecificWhenTopIsRegularPop() throws Exception {
+    public void popSpecificWhenTopIsRegularPop() {
         uut.animatePush(child1, new MockPromise());
         uut.animatePush(child2, new MockPromise() {
             @Override
@@ -250,7 +251,7 @@ public class StackControllerTest extends BaseTest {
     }
 
     @Test
-    public void popSpecificDeepInStack() throws Exception {
+    public void popSpecificDeepInStack() {
         uut.animatePush(child1, new MockPromise());
         uut.animatePush(child2, new MockPromise());
         assertIsChildById(uut.getView(), child2.getView());
@@ -260,7 +261,7 @@ public class StackControllerTest extends BaseTest {
     }
 
     @Test
-    public void popTo_PopsTopUntilControllerIsNewTop() throws Exception {
+    public void popTo_PopsTopUntilControllerIsNewTop() {
         uut.animatePush(child1, new MockPromise());
         uut.animatePush(child2, new MockPromise());
         uut.animatePush(child3, new MockPromise() {
@@ -278,7 +279,7 @@ public class StackControllerTest extends BaseTest {
     }
 
     @Test
-    public void popTo_NotAChildOfThisStack_DoesNothing() throws Exception {
+    public void popTo_NotAChildOfThisStack_DoesNothing() {
         uut.animatePush(child1, new MockPromise());
         uut.animatePush(child3, new MockPromise());
         assertThat(uut.size()).isEqualTo(2);
@@ -287,7 +288,7 @@ public class StackControllerTest extends BaseTest {
     }
 
     @Test
-    public void popToRoot_PopsEverythingAboveFirstController() throws Exception {
+    public void popToRoot_PopsEverythingAboveFirstController() {
         uut.animatePush(child1, new MockPromise());
         uut.animatePush(child2, new MockPromise());
         uut.animatePush(child3, new MockPromise() {
@@ -308,14 +309,14 @@ public class StackControllerTest extends BaseTest {
     }
 
     @Test
-    public void popToRoot_EmptyStackDoesNothing() throws Exception {
+    public void popToRoot_EmptyStackDoesNothing() {
         assertThat(uut.isEmpty()).isTrue();
         uut.popToRoot(new MockPromise());
         assertThat(uut.isEmpty()).isTrue();
     }
 
     @Test
-    public void findControllerById_ReturnsSelfOrChildrenById() throws Exception {
+    public void findControllerById_ReturnsSelfOrChildrenById() {
         assertThat(uut.findControllerById("123")).isNull();
         assertThat(uut.findControllerById(uut.getId())).isEqualTo(uut);
         uut.animatePush(child1, new MockPromise());
@@ -323,7 +324,7 @@ public class StackControllerTest extends BaseTest {
     }
 
     @Test
-    public void findControllerById_Deeply() throws Exception {
+    public void findControllerById_Deeply() {
         StackController stack = createStackController("another");
         stack.animatePush(child2, new MockPromise());
         uut.animatePush(stack, new MockPromise());
@@ -331,7 +332,7 @@ public class StackControllerTest extends BaseTest {
     }
 
     @Test
-    public void pop_CallsDestroyOnPoppedChild() throws Exception {
+    public void pop_CallsDestroyOnPoppedChild() {
         child1 = spy(child1);
         child2 = spy(child2);
         child3 = spy(child3);
@@ -348,7 +349,7 @@ public class StackControllerTest extends BaseTest {
     }
 
     @Test
-    public void pop_callWillAppearWillDisappear() throws Exception {
+    public void pop_callWillAppearWillDisappear() {
         child1 = spy(child1);
         child2 = spy(child2);
         uut.push(child1, new MockPromise());
@@ -359,7 +360,7 @@ public class StackControllerTest extends BaseTest {
     }
 
     @Test
-    public void pop_animatesTopBarIfNeeded() throws Exception {
+    public void pop_animatesTopBarIfNeeded() {
         uut.ensureViewIsCreated();
 
         child1.options.topBarOptions.visible = new Bool(false);
@@ -379,7 +380,7 @@ public class StackControllerTest extends BaseTest {
     }
 
     @Test
-    public void popSpecific_CallsDestroyOnPoppedChild() throws Exception {
+    public void popSpecific_CallsDestroyOnPoppedChild() {
         child1 = spy(child1);
         child2 = spy(child2);
         child3 = spy(child3);
@@ -393,7 +394,7 @@ public class StackControllerTest extends BaseTest {
     }
 
     @Test
-    public void popTo_CallsDestroyOnPoppedChild() throws Exception {
+    public void popTo_CallsDestroyOnPoppedChild() {
         child1 = spy(child1);
         child2 = spy(child2);
         child3 = spy(child3);
@@ -417,7 +418,7 @@ public class StackControllerTest extends BaseTest {
     }
 
     @Test
-    public void stackCanBePushed() throws Exception {
+    public void stackCanBePushed() {
         StackController parent = createStackController("someStack");
         parent.ensureViewIsCreated();
         parent.push(uut, new MockPromise());
@@ -426,7 +427,7 @@ public class StackControllerTest extends BaseTest {
     }
 
     @Test
-    public void applyOptions_applyOnlyOnFirstStack() throws Exception {
+    public void applyOptions_applyOnlyOnFirstStack() {
         StackController parent = spy(createStackController("someStack"));
         parent.ensureViewIsCreated();
         parent.push(uut, new MockPromise());
@@ -445,7 +446,7 @@ public class StackControllerTest extends BaseTest {
     }
 
     @Test
-    public void applyOptions_topTabsAreNotVisibleIfNoTabsAreDefined() throws Exception {
+    public void applyOptions_topTabsAreNotVisibleIfNoTabsAreDefined() {
         uut.ensureViewIsCreated();
         uut.push(child1, new MockPromise());
         child1.ensureViewIsCreated();
@@ -454,7 +455,7 @@ public class StackControllerTest extends BaseTest {
     }
 
     @Test
-    public void buttonPressInvokedOnCurrentStack() throws Exception {
+    public void buttonPressInvokedOnCurrentStack() {
         uut.ensureViewIsCreated();
         uut.push(child1, new MockPromise());
         uut.sendOnNavigationButtonPressed("btn1");
@@ -462,7 +463,7 @@ public class StackControllerTest extends BaseTest {
     }
 
     @Test
-    public void mergeChildOptions_updatesViewWithNewOptions() throws Exception {
+    public void mergeChildOptions_updatesViewWithNewOptions() {
         final StackLayout[] stackLayout = new StackLayout[1];
         StackController uut = new StackController(activity, new TopBarButtonCreatorMock(), new TitleBarReactViewCreatorMock(), new TopBarBackgroundViewCreatorMock(), "stack", new Options()) {
             @NonNull
@@ -479,7 +480,7 @@ public class StackControllerTest extends BaseTest {
     }
 
     @Test
-    public void mergeChildOptions_updatesParentControllerWithNewOptions() throws Exception {
+    public void mergeChildOptions_updatesParentControllerWithNewOptions() {
         final StackLayout[] stackLayout = new StackLayout[1];
         StackController uut = new StackController(activity, new TopBarButtonCreatorMock(), new TitleBarReactViewCreatorMock(), new TopBarBackgroundViewCreatorMock(), "stack", new Options()) {
             @NonNull
@@ -504,7 +505,7 @@ public class StackControllerTest extends BaseTest {
     }
 
     @Test
-    public void mergeChildOptions_mergeAnimationOptions() throws Exception {
+    public void mergeChildOptions_mergeAnimationOptions() {
         Options options = new Options();
         Component component = mock(Component.class);
 
@@ -514,7 +515,7 @@ public class StackControllerTest extends BaseTest {
     }
 
     @Test
-    public void mergeChildOptions_StackRelatedOptionsAreCleared() throws Exception {
+    public void mergeChildOptions_StackRelatedOptionsAreCleared() {
         ParentController parentController = Mockito.mock(ParentController.class);
         uut.setParentController(parentController);
         Options options = new Options();

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

@@ -87,7 +87,7 @@ public class TitleBarTest extends BaseTest {
     }
 
     @Test
-    public void destroy_destroysButtonControllers() throws Exception {
+    public void destroy_destroysButtonControllers() {
         uut.setLeftButtons(leftButton(leftButton));
         uut.setRightButtons(rightButtons(customButton, textButton));
         uut.clear();
@@ -97,7 +97,7 @@ public class TitleBarTest extends BaseTest {
     }
 
     @Test
-    public void setRightButtons_destroysRightButtons() throws Exception {
+    public void setRightButtons_destroysRightButtons() {
         uut.setLeftButtons(leftButton(leftButton));
         uut.setRightButtons(rightButtons(customButton));
         uut.setLeftButtons(leftButton(leftButton));
@@ -106,7 +106,7 @@ public class TitleBarTest extends BaseTest {
     }
 
     @Test
-    public void setRightButtons_onlyDestroysRightButtons() throws Exception {
+    public void setRightButtons_onlyDestroysRightButtons() {
         uut.setLeftButtons(leftButton(leftButton));
         uut.setRightButtons(rightButtons(customButton));
         uut.setLeftButtons(null);
@@ -115,7 +115,7 @@ public class TitleBarTest extends BaseTest {
     }
 
     @Test
-    public void setRightButtons_emptyButtonsListClearsRightButtons() throws Exception {
+    public void setRightButtons_emptyButtonsListClearsRightButtons() {
         uut.setLeftButtons(new ArrayList<>());
         uut.setRightButtons(rightButtons(customButton, textButton));
         uut.setLeftButtons(new ArrayList<>());
@@ -127,7 +127,7 @@ public class TitleBarTest extends BaseTest {
     }
 
     @Test
-    public void setLeftButtons_emptyButtonsListClearsLeftButton() throws Exception {
+    public void setLeftButtons_emptyButtonsListClearsLeftButton() {
         uut.setLeftButtons(leftButton(leftButton));
         uut.setRightButtons(rightButtons(customButton));
         uut.setLeftButtons(new ArrayList<>());
@@ -136,20 +136,20 @@ public class TitleBarTest extends BaseTest {
     }
 
     @Test
-    public void setRightButtons_buttonsAreAddedInReverseOrderToMatchOrderOnIOs() throws Exception {
+    public void setRightButtons_buttonsAreAddedInReverseOrderToMatchOrderOnIOs() {
         uut.setLeftButtons(new ArrayList<>());
         uut.setRightButtons(rightButtons(textButton, customButton));
         assertThat(uut.getMenu().getItem(1).getTitle()).isEqualTo(textButton.title.get());
     }
 
     @Test
-    public void setComponent_addsComponentToTitleBar() throws Exception {
+    public void setComponent_addsComponentToTitleBar() {
         uut.setComponent("com.rnn.CustomView", TitleOptions.Alignment.Center);
         verify(uut, times(1)).addView(any(TitleBarReactView.class), any(Toolbar.LayoutParams.class));
     }
 
     @Test
-    public void setComponent_alignFill() throws Exception {
+    public void setComponent_alignFill() {
         uut.setComponent("com.rnn.CustomView", TitleOptions.Alignment.Fill);
         verify(uut, times(1)).getComponentLayoutParams(TitleOptions.Alignment.Fill);
         ArgumentCaptor<Toolbar.LayoutParams> lpCaptor = ArgumentCaptor.forClass(Toolbar.LayoutParams.class);
@@ -158,7 +158,7 @@ public class TitleBarTest extends BaseTest {
     }
 
     @Test
-    public void setComponent_alignCenter() throws Exception {
+    public void setComponent_alignCenter() {
         uut.setComponent("com.rnn.CustomView", TitleOptions.Alignment.Center);
         verify(uut, times(1)).getComponentLayoutParams(TitleOptions.Alignment.Center);
         ArgumentCaptor<Toolbar.LayoutParams> lpCaptor = ArgumentCaptor.forClass(Toolbar.LayoutParams.class);
@@ -168,7 +168,7 @@ public class TitleBarTest extends BaseTest {
     }
 
     @Test
-    public void clear() throws Exception {
+    public void clear() {
         uut.setComponent("someComponent", TitleOptions.Alignment.Center);
         uut.clear();
         assertThat(uut.getTitle()).isNullOrEmpty();

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

@@ -29,7 +29,7 @@ import java.util.List;
 
 import javax.annotation.Nullable;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.spy;

lib/android/app/src/test/java/com/reactnativenavigation/views/TouchDelegateTest.java

@@ -8,7 +8,7 @@ import com.reactnativenavigation.views.touch.OverlayTouchDelegate;
 
 import org.junit.Test;
 
-import static org.assertj.core.api.Assertions.assertThat;
+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;