refactor

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

 package com.reactnativenavigation.viewcontrollers;
 
 import android.app.Activity;
+import android.support.annotation.NonNull;
 import android.view.ViewGroup;
 
 import com.reactnativenavigation.BaseTest;
 import com.reactnativenavigation.mocks.SimpleViewController;
 import com.reactnativenavigation.mocks.TestStackAnimator;
+import com.reactnativenavigation.utils.CompatUtils;
 
 import org.junit.Test;
 import org.robolectric.Shadows;
 	private ViewController child1;
 	private ViewController child2;
 	private ViewController child3;
+	private ViewController child4;
+	private ViewController child5;
 
 	@Override
 	public void beforeEach() {
 		child1 = new SimpleViewController(activity, "child1");
 		child2 = new SimpleViewController(activity, "child2");
 		child3 = new SimpleViewController(activity, "child3");
+		child4 = new SimpleViewController(activity, "child4");
+		child5 = new SimpleViewController(activity, "child5");
 	}
 
 
 
 	@Test
 	public void push() throws Exception {
-		StackController stackController = new StackController(activity, "stack1", new TestStackAnimator());
+		StackController stackController = newStack();
 		stackController.push(child1);
 		uut.setRoot(stackController);
 
 
 	@Test
 	public void push_OnCorrectStackByFindingChildId() throws Exception {
-		BottomTabsController bottomTabsController = new BottomTabsController(activity, "tabsController");
-		StackController stack1 = new StackController(activity, "stack1", new TestStackAnimator());
-		StackController stack2 = new StackController(activity, "stack2", new TestStackAnimator());
+		BottomTabsController bottomTabsController = newTabs();
+		StackController stack1 = newStack();
+		StackController stack2 = newStack();
 		stack1.push(child1);
 		stack2.push(child2);
 		bottomTabsController.setTabs(Arrays.<ViewController>asList(stack1, stack2));
 		uut.pop("123");
 		uut.setRoot(child1);
 		uut.pop(child1.getId());
+		assertThat(uut.getChildControllers()).hasSize(1);
 	}
 
 	@Test
 	public void pop_FromCorrectStackByFindingChildId() throws Exception {
-		BottomTabsController bottomTabsController = new BottomTabsController(activity, "tabsController");
-		StackController stack1 = new StackController(activity, "stack1", new TestStackAnimator());
-		StackController stack2 = new StackController(activity, "stack2", new TestStackAnimator());
+		BottomTabsController bottomTabsController = newTabs();
+		StackController stack1 = newStack();
+		StackController stack2 = newStack();
 		stack1.push(child1);
 		stack2.push(child2);
 		stack2.push(child3);
-		stack2.push(new SimpleViewController(activity, "child4"));
+		stack2.push(child4);
 		bottomTabsController.setTabs(Arrays.<ViewController>asList(stack1, stack2));
 		uut.setRoot(bottomTabsController);
 
 
 	@Test
 	public void popSpecific() throws Exception {
-		BottomTabsController bottomTabsController = new BottomTabsController(activity, "tabsController");
-		StackController stack1 = new StackController(activity, "stack1", new TestStackAnimator());
-		StackController stack2 = new StackController(activity, "stack2", new TestStackAnimator());
+		BottomTabsController bottomTabsController = newTabs();
+		StackController stack1 = newStack();
+		StackController stack2 = newStack();
 		stack1.push(child1);
 		stack2.push(child2);
 		stack2.push(child3);
-		SimpleViewController child4 = new SimpleViewController(activity, "child4");
 		stack2.push(child4);
 		bottomTabsController.setTabs(Arrays.<ViewController>asList(stack1, stack2));
 		uut.setRoot(bottomTabsController);
 
 	@Test
 	public void popTo_FromCorrectStackUpToChild() throws Exception {
-		BottomTabsController bottomTabsController = new BottomTabsController(activity, "tabsController");
-		StackController stack1 = new StackController(activity, "stack1", new TestStackAnimator());
-		StackController stack2 = new StackController(activity, "stack2", new TestStackAnimator());
+		BottomTabsController bottomTabsController = newTabs();
+		StackController stack1 = newStack();
+		StackController stack2 = newStack();
 		stack1.push(child1);
 		stack2.push(child2);
 		stack2.push(child3);
-		stack2.push(new SimpleViewController(activity, "child4"));
-		stack2.push(new SimpleViewController(activity, "child5"));
+		stack2.push(child4);
+		stack2.push(child5);
 		bottomTabsController.setTabs(Arrays.<ViewController>asList(stack1, stack2));
 		uut.setRoot(bottomTabsController);
 
 
 	@Test
 	public void popToRoot() throws Exception {
-		BottomTabsController bottomTabsController = new BottomTabsController(activity, "tabsController");
-		StackController stack1 = new StackController(activity, "stack1", new TestStackAnimator());
-		StackController stack2 = new StackController(activity, "stack2", new TestStackAnimator());
+		BottomTabsController bottomTabsController = newTabs();
+		StackController stack1 = newStack();
+		StackController stack2 = newStack();
 		stack1.push(child1);
 		stack2.push(child2);
 		stack2.push(child3);
-		stack2.push(new SimpleViewController(activity, "child4"));
-		stack2.push(new SimpleViewController(activity, "child5"));
+		stack2.push(child4);
+		stack2.push(child5);
 
 		bottomTabsController.setTabs(Arrays.<ViewController>asList(stack1, stack2));
 		uut.setRoot(bottomTabsController);
 		assertThat(stack2.getChildControllers()).containsOnly(child2);
 	}
 
+	@NonNull
+	private BottomTabsController newTabs() {
+		return new BottomTabsController(activity, "tabsController");
+	}
+
 	private void assertHasSingleChildViewOf(ViewController parent, ViewController child) {
 		assertThat(((ViewGroup) parent.getView()).getChildCount()).isEqualTo(1);
 		assertThat(((ViewGroup) parent.getView()).getChildAt(0)).isEqualTo(child.getView()).isNotNull();
 	}
+
+	@NonNull
+	private StackController newStack() {
+		return new StackController(activity, "stack" + CompatUtils.generateViewId(), new TestStackAnimator());
+	}
 }