test driven refactoring

lib/android/app/src/main/java/com/reactnativenavigation/parse/LayoutFactory.java

@@ -3,7 +3,7 @@ package com.reactnativenavigation.parse;
 import android.app.Activity;
 
 import com.facebook.react.ReactInstanceManager;
-import com.reactnativenavigation.react.ReactContainerView;
+import com.reactnativenavigation.react.ReactContainerViewCreator;
 import com.reactnativenavigation.viewcontrollers.BottomTabsController;
 import com.reactnativenavigation.viewcontrollers.ContainerViewController;
 import com.reactnativenavigation.viewcontrollers.SideMenuController;
@@ -81,13 +81,7 @@ public class LayoutFactory {
 		String id = node.id;
 		String name = node.data.optString("name");
 		NavigationOptions navigationOptions = NavigationOptions.parse(node.data.optJSONObject("navigationOptions"));
-		ContainerViewController.ContainerViewCreator viewCreator = new ContainerViewController.ContainerViewCreator() {
-			@Override
-			public ContainerViewController.ContainerView create(final Activity activity, final String containerId, final String containerName) {
-				return new ReactContainerView(activity, reactInstanceManager, containerId, containerName);
-			}
-		};
-		return new ContainerViewController(activity, id, name, viewCreator, navigationOptions);
+		return new ContainerViewController(activity, id, name, new ReactContainerViewCreator(reactInstanceManager), navigationOptions);
 	}
 
 	private ViewController createContainerStack(LayoutNode node) {

lib/android/app/src/main/java/com/reactnativenavigation/parse/NavigationOptions.java

@@ -19,4 +19,8 @@ public class NavigationOptions {
 
 	public String title = "";
 	public int topBarBackgroundColor = 0;
+
+	public void mergeWith(final NavigationOptions other) {
+		title = other.title;
+	}
 }

lib/android/app/src/main/java/com/reactnativenavigation/react/ReactContainerView.java

@@ -13,7 +13,7 @@ public class ReactContainerView extends ReactRootView implements ContainerViewCo
 	private final ReactInstanceManager reactInstanceManager;
 	private final String containerId;
 	private final String containerName;
-	private boolean attachedToReactInstance = false;
+	private boolean isAttachedToReactInstance = false;
 
 	public ReactContainerView(final Context context, ReactInstanceManager reactInstanceManager, String containerId, String containerName) {
 		super(context);
@@ -29,7 +29,7 @@ public class ReactContainerView extends ReactRootView implements ContainerViewCo
 			@Override
 			public void onAttachedToReactInstance(final ReactRootView reactRootView) {
 				reactRootView.setEventListener(null);
-				attachedToReactInstance = true;
+				isAttachedToReactInstance = true;
 			}
 		});
 		final Bundle opts = new Bundle();
@@ -39,7 +39,7 @@ public class ReactContainerView extends ReactRootView implements ContainerViewCo
 
 	@Override
 	public boolean isReady() {
-		return attachedToReactInstance;
+		return isAttachedToReactInstance;
 	}
 
 	@Override

lib/android/app/src/main/java/com/reactnativenavigation/react/ReactContainerViewCreator.java

@@ -0,0 +1,20 @@
+package com.reactnativenavigation.react;
+
+import android.app.Activity;
+
+import com.facebook.react.ReactInstanceManager;
+import com.reactnativenavigation.viewcontrollers.ContainerViewController;
+import com.reactnativenavigation.viewcontrollers.ContainerViewController.ContainerViewCreator;
+
+public class ReactContainerViewCreator implements ContainerViewCreator {
+	private ReactInstanceManager reactInstanceManager;
+
+	public ReactContainerViewCreator(final ReactInstanceManager reactInstanceManager) {
+		this.reactInstanceManager = reactInstanceManager;
+	}
+
+	@Override
+	public ContainerViewController.ContainerView create(final Activity activity, final String containerId, final String containerName) {
+		return new ReactContainerView(activity, reactInstanceManager, containerId, containerName);
+	}
+}

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

@@ -9,10 +9,12 @@ import com.reactnativenavigation.parse.NavigationOptions;
 public class ContainerViewController extends ViewController {
 
 	public interface ContainerViewCreator {
+
 		ContainerView create(Activity activity, String containerId, String containerName);
 	}
 
 	public interface ContainerView {
+
 		boolean isReady();
 
 		View asView();
@@ -22,12 +24,13 @@ public class ContainerViewController extends ViewController {
 		void sendContainerStart();
 
 		void sendContainerStop();
+
 	}
 
 	private final String containerName;
-	private final ContainerViewCreator viewCreator;
-	private final NavigationOptions initialNavigationOptions;
 
+	private final ContainerViewCreator viewCreator;
+	private final NavigationOptions navigationOptions;
 	private ContainerView containerView;
 
 	public ContainerViewController(final Activity activity,
@@ -38,7 +41,7 @@ public class ContainerViewController extends ViewController {
 		super(activity, id);
 		this.containerName = containerName;
 		this.viewCreator = viewCreator;
-		this.initialNavigationOptions = initialNavigationOptions;
+		this.navigationOptions = initialNavigationOptions;
 	}
 
 	@Override
@@ -71,4 +74,12 @@ public class ContainerViewController extends ViewController {
 		containerView = viewCreator.create(getActivity(), getId(), containerName);
 		return containerView.asView();
 	}
+
+	public void applyNavigationOptions(final NavigationOptions options) {
+		navigationOptions.mergeWith(options);
+	}
+
+	public NavigationOptions getNavigationOptions() {
+		return navigationOptions;
+	}
 }

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

@@ -57,10 +57,10 @@ public class Navigator extends ParentController {
 	}
 
 	public void setOptions(final String containerId, NavigationOptions options) {
-//		ViewController target = findControllerById(containerId);
-//		if (target != null) {
-//			target.applyNavigationOptions(options);
-//		}
+		ViewController target = findControllerById(containerId);
+		if (target instanceof ContainerViewController) {
+			((ContainerViewController) target).applyNavigationOptions(options);
+		}
 	}
 
 	public void push(final String fromId, final ViewController viewController) {

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

@@ -0,0 +1,37 @@
+package com.reactnativenavigation.mocks;
+
+import android.content.Context;
+import android.view.View;
+
+import com.reactnativenavigation.viewcontrollers.ContainerViewController;
+
+public class TestContainerView extends View implements ContainerViewController.ContainerView {
+	public TestContainerView(final Context context) {
+		super(context);
+	}
+
+	@Override
+	public boolean isReady() {
+		return false;
+	}
+
+	@Override
+	public View asView() {
+		return this;
+	}
+
+	@Override
+	public void destroy() {
+
+	}
+
+	@Override
+	public void sendContainerStart() {
+
+	}
+
+	@Override
+	public void sendContainerStop() {
+
+	}
+}

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

@@ -0,0 +1,13 @@
+package com.reactnativenavigation.mocks;
+
+import android.app.Activity;
+
+import com.reactnativenavigation.viewcontrollers.ContainerViewController;
+import com.reactnativenavigation.viewcontrollers.ContainerViewController.ContainerViewCreator;
+
+public class TestContainerViewCreator implements ContainerViewCreator {
+	@Override
+	public ContainerViewController.ContainerView create(final Activity activity, final String containerId, final String containerName) {
+		return new TestContainerView(activity);
+	}
+}

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

@@ -4,12 +4,12 @@ import android.app.Activity;
 import android.support.annotation.NonNull;
 
 import com.reactnativenavigation.BaseTest;
-import com.reactnativenavigation.parse.NavigationOptions;
 import com.reactnativenavigation.mocks.SimpleViewController;
+import com.reactnativenavigation.mocks.TestContainerViewCreator;
 import com.reactnativenavigation.mocks.TestStackAnimator;
+import com.reactnativenavigation.parse.NavigationOptions;
 import com.reactnativenavigation.utils.CompatUtils;
 
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.Arrays;
@@ -190,12 +190,22 @@ public class NavigatorTest extends BaseTest {
 	}
 
 	@Test
-	@Ignore
 	public void setOptions_CallsApplyNavigationOptions() {
-		uut.setRoot(child1);
+		ContainerViewController containerVc = new ContainerViewController(activity, "theId", "theName", new TestContainerViewCreator(), new NavigationOptions());
+		uut.setRoot(containerVc);
+		assertThat(containerVc.getNavigationOptions().title).isEmpty();
+
 		NavigationOptions options = new NavigationOptions();
-		uut.setOptions(child1.getId(), options);
-//		assertThat(child1.getNavigationOptions()).isEqualTo(options);
+		options.title = "new title";
+
+		uut.setOptions("theId", options);
+		assertThat(containerVc.getNavigationOptions().title).isEqualTo("new title");
+	}
+
+	@Test
+	public void setOptions_AffectsOnlyContainerViewControllers() {
+		uut.setRoot(child1);
+		uut.setOptions(child1.getId(), new NavigationOptions());
 	}
 
 	@NonNull