testing commands

lib/android/app/src/main/java/com/reactnativenavigation/NavigationApplication.java

@@ -5,6 +5,7 @@ import android.app.Application;
 import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactNativeHost;
 import com.reactnativenavigation.controllers.ActivityLifecycleDelegate;
+import com.reactnativenavigation.controllers.CommandsHandler;
 import com.reactnativenavigation.react.DevPermissionRequestImpl;
 import com.reactnativenavigation.react.NavigationReactNativeHost;
 
@@ -14,6 +15,7 @@ public abstract class NavigationApplication extends Application implements React
 	public static class Config {
 		public ReactNativeHost reactNativeHost;
 		public ActivityLifecycleDelegate activityLifecycleDelegate;
+		public CommandsHandler commandsHandler;
 	}
 
 	private Config config;
@@ -45,6 +47,7 @@ public abstract class NavigationApplication extends Application implements React
 		Config config = new Config();
 		config.reactNativeHost = new NavigationReactNativeHost(this, isDebug());
 		config.activityLifecycleDelegate = new ActivityLifecycleDelegate(config.reactNativeHost.getReactInstanceManager(), new DevPermissionRequestImpl());
+		config.commandsHandler = new CommandsHandler();
 		return config;
 	}
 }

lib/android/app/src/main/java/com/reactnativenavigation/controllers/CommandsHandler.java

@@ -1,4 +1,99 @@
 package com.reactnativenavigation.controllers;
 
+import android.os.Bundle;
+import android.view.View;
+
+import com.facebook.react.ReactRootView;
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.ReadableMapKeySetIterator;
+import com.reactnativenavigation.NavigationActivity;
+import com.reactnativenavigation.NavigationApplication;
+import com.reactnativenavigation.layout.LayoutFactory;
+import com.reactnativenavigation.layout.StackLayout;
+import com.reactnativenavigation.layout.bottomtabs.BottomTabsCreator;
+import com.reactnativenavigation.layout.parse.LayoutNode;
+import com.reactnativenavigation.utils.UiThread;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 public class CommandsHandler {
+
+	public void setRoot(final NavigationActivity activity, final ReadableMap layoutTree) {
+		LayoutFactory factory =
+				new LayoutFactory(activity, new LayoutFactory.ReactRootViewCreator() {
+					@Override
+					public View create(String id, String name) {
+						ReactRootView rootView = new ReactRootView(activity);
+						Bundle opts = new Bundle();
+						opts.putString("id", id);
+						rootView.startReactApplication(NavigationApplication.instance.getReactNativeHost().getReactInstanceManager(), name, opts);
+						return rootView;
+					}
+				}, new BottomTabsCreator());
+
+		final LayoutNode layoutTreeRoot = readableMapToLayoutNode(layoutTree);
+		final View rootView = factory.create(layoutTreeRoot);
+		activity.setContentView(rootView);
+	}
+
+	public void push(final NavigationActivity activity, String onContainerId, final ReadableMap layout) {
+		LayoutFactory factory =
+				new LayoutFactory(activity, new LayoutFactory.ReactRootViewCreator() {
+					@Override
+					public View create(String id, String name) {
+						ReactRootView rootView = new ReactRootView(activity);
+						Bundle opts = new Bundle();
+						opts.putString("id", id);
+						rootView.startReactApplication(NavigationApplication.instance.getReactNativeHost().getReactInstanceManager(), name, opts);
+						return rootView;
+					}
+				}, new BottomTabsCreator());
+		final LayoutNode layoutNode = readableMapToLayoutNode(layout);
+		final View rootView = factory.create(layoutNode);
+		((StackLayout) activity.getContentView()).push(rootView);
+	}
+
+	public void pop(final NavigationActivity activity, String onContainerId) {
+		UiThread.post(new Runnable() {
+			@Override
+			public void run() {
+				((StackLayout) activity.getContentView()).pop();
+			}
+		});
+	}
+
+	private LayoutNode readableMapToLayoutNode(ReadableMap readableMap) {
+		String id = readableMap.getString("id");
+		LayoutNode.Type type = LayoutNode.Type.fromString(readableMap.getString("type"));
+		Map<String, Object> data = readableMapToJavaMap(readableMap.getMap("data"));
+
+		ReadableArray childrenNodes = readableMap.getArray("children");
+		List<LayoutNode> children = new ArrayList<>(childrenNodes.size());
+		for (int i = 0; i < childrenNodes.size(); i++) {
+			ReadableMap child = childrenNodes.getMap(i);
+			children.add(readableMapToLayoutNode(child));
+		}
+
+		return new LayoutNode(id, type, data, children);
+	}
+
+	private Map<String, Object> readableMapToJavaMap(ReadableMap readableMap) {
+		final Map<String, Object> map = new HashMap<>();
+		for (ReadableMapKeySetIterator it = readableMap.keySetIterator(); it.hasNextKey(); ) {
+			final String key = it.nextKey();
+			switch (readableMap.getType(key)) {
+				case String:
+					map.put(key, readableMap.getString(key));
+					break;
+				case Map:
+					map.put(key, readableMapToJavaMap(readableMap.getMap(key)));
+					break;
+			}
+		}
+		return map;
+	}
 }

lib/android/app/src/main/java/com/reactnativenavigation/layout/Container.java

@@ -8,13 +8,13 @@ import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.react.NavigationEventEmitter;
 
 public class Container extends FrameLayout {
-    private static final String TAG = "Container";
-    private String id;
+	private static final String TAG = "Container";
+	private String id;
 
-    public Container(Context context, LayoutFactory.ReactRootViewCreator reactRootViewCreator, String id, String name) {
+	public Container(Context context, LayoutFactory.ReactRootViewCreator reactRootViewCreator, String id, String name) {
 		super(context);
-        this.id = id;
-        addView(reactRootViewCreator.create(id, name));
+		this.id = id;
+		addView(reactRootViewCreator.create(id, name));
 
 	}
 
@@ -26,11 +26,11 @@ public class Container extends FrameLayout {
 //                .containerStart(id);
 //    }
 
-    @Override
-    protected void onDetachedFromWindow() {
-        Log.d(TAG, "onDetachedFromWindow: " + id);
-        super.onDetachedFromWindow();
-        NavigationEventEmitter.emit(NavigationApplication.instance.getReactNativeHost().getReactInstanceManager().getCurrentReactContext())
-                .containerStop(id);
-    }
+	@Override
+	protected void onDetachedFromWindow() {
+		Log.d(TAG, "onDetachedFromWindow: " + id);
+		super.onDetachedFromWindow();
+		NavigationEventEmitter.emit(NavigationApplication.instance.getReactNativeHost().getReactInstanceManager().getCurrentReactContext())
+				.containerStop(id);
+	}
 }

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

@@ -26,28 +26,28 @@ public class NavigationEventEmitter {
 	}
 
 	private void emit(String eventName) {
-        emit(eventName, Arguments.createMap());
-    }
+		emit(eventName, Arguments.createMap());
+	}
 
-    private void emit(String eventName, WritableMap data) {
-        emitter.emit(eventName, data);
-    }
+	private void emit(String eventName, WritableMap data) {
+		emitter.emit(eventName, data);
+	}
 
-    private void emit(String eventName, String param) {
-        emitter.emit(eventName, param);
-    }
+	private void emit(String eventName, String param) {
+		emitter.emit(eventName, param);
+	}
 
-    public void containerStop(String id) {
-        WritableMap data = Arguments.createMap();
-        data.putString("id", id);
+	public void containerStop(String id) {
+		WritableMap data = Arguments.createMap();
+		data.putString("id", id);
 //        emit(containerStop, data);
-        emit(containerStop, id);
-    }
+		emit(containerStop, id);
+	}
 
-    public void containerStart(String id) {
-        WritableMap data = Arguments.createMap();
-        data.putString("id", id);
+	public void containerStart(String id) {
+		WritableMap data = Arguments.createMap();
+		data.putString("id", id);
 //        emit(containerStart, data);
-        emit(containerStart, id);
-    }
+		emit(containerStart, id);
+	}
 }

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

@@ -1,28 +1,13 @@
 package com.reactnativenavigation.react;
 
-import android.os.Bundle;
-import android.view.View;
-
-import com.facebook.react.ReactRootView;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.ReadableMapKeySetIterator;
 import com.reactnativenavigation.NavigationActivity;
 import com.reactnativenavigation.NavigationApplication;
-import com.reactnativenavigation.layout.LayoutFactory;
-import com.reactnativenavigation.layout.parse.LayoutNode;
-import com.reactnativenavigation.layout.StackLayout;
-import com.reactnativenavigation.layout.bottomtabs.BottomTabsCreator;
 import com.reactnativenavigation.utils.UiThread;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 public class NavigationModule extends ReactContextBaseJavaModule {
 	private static final String NAME = "RNNBridgeModule";
 
@@ -35,97 +20,42 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 		return NAME;
 	}
 
+	public NavigationActivity activity() {
+		return (NavigationActivity) getCurrentActivity();
+	}
+
 	@ReactMethod
 	public void setRoot(final ReadableMap layoutTree) {
-		if (getCurrentActivity() == null) return;
-
-		UiThread.post(new Runnable() {
+		handle(new Runnable() {
 			@Override
 			public void run() {
-				LayoutFactory factory =
-						new LayoutFactory(getCurrentActivity(), new LayoutFactory.ReactRootViewCreator() {
-							@Override
-							public View create(String id, String name) {
-								ReactRootView rootView = new ReactRootView(getCurrentActivity());
-								Bundle opts = new Bundle();
-								opts.putString("id", id);
-								rootView.startReactApplication(NavigationApplication.instance.getReactNativeHost().getReactInstanceManager(), name, opts);
-								return rootView;
-							}
-						}, new BottomTabsCreator());
-
-				final LayoutNode layoutTreeRoot = readableMapToLayoutNode(layoutTree);
-				final View rootView = factory.create(layoutTreeRoot);
-				getCurrentActivity().setContentView(rootView);
+				NavigationApplication.instance.getConfig().commandsHandler.setRoot(activity(), layoutTree);
 			}
 		});
 	}
 
 	@ReactMethod
-	public void push(String onContainerId, final ReadableMap layout) {
-		if (getCurrentActivity() == null) return;
-
-		UiThread.post(new Runnable() {
+	public void push(final String onContainerId, final ReadableMap layout) {
+		handle(new Runnable() {
 			@Override
 			public void run() {
-				LayoutFactory factory =
-						new LayoutFactory(getCurrentActivity(), new LayoutFactory.ReactRootViewCreator() {
-							@Override
-							public View create(String id, String name) {
-								ReactRootView rootView = new ReactRootView(getCurrentActivity());
-								Bundle opts = new Bundle();
-								opts.putString("id", id);
-								rootView.startReactApplication(NavigationApplication.instance.getReactNativeHost().getReactInstanceManager(), name, opts);
-								return rootView;
-							}
-						}, new BottomTabsCreator());
-				final LayoutNode layoutNode = readableMapToLayoutNode(layout);
-				final View rootView = factory.create(layoutNode);
-				((StackLayout) ((NavigationActivity) getCurrentActivity()).getContentView()).push(rootView);
+				NavigationApplication.instance.getConfig().commandsHandler.push(activity(), onContainerId, layout);
 			}
 		});
 	}
 
 	@ReactMethod
-	public void pop(String onContainerId) {
-		if (getCurrentActivity() == null) return;
-
-		UiThread.post(new Runnable() {
+	public void pop(final String onContainerId) {
+		handle(new Runnable() {
 			@Override
 			public void run() {
-				((StackLayout) ((NavigationActivity) getCurrentActivity()).getContentView()).pop();
+				NavigationApplication.instance.getConfig().commandsHandler.pop(activity(), onContainerId);
 			}
 		});
 	}
 
-	private LayoutNode readableMapToLayoutNode(ReadableMap readableMap) {
-		String id = readableMap.getString("id");
-		LayoutNode.Type type = LayoutNode.Type.fromString(readableMap.getString("type"));
-		Map<String, Object> data = readableMapToJavaMap(readableMap.getMap("data"));
-
-		ReadableArray childrenNodes = readableMap.getArray("children");
-		List<LayoutNode> children = new ArrayList<>(childrenNodes.size());
-		for (int i = 0; i < childrenNodes.size(); i++) {
-			ReadableMap child = childrenNodes.getMap(i);
-			children.add(readableMapToLayoutNode(child));
-		}
-
-		return new LayoutNode(id, type, data, children);
-	}
-
-	private Map<String, Object> readableMapToJavaMap(ReadableMap readableMap) {
-		final Map<String, Object> map = new HashMap<>();
-		for (ReadableMapKeySetIterator it = readableMap.keySetIterator(); it.hasNextKey(); ) {
-			final String key = it.nextKey();
-			switch (readableMap.getType(key)) {
-				case String:
-					map.put(key, readableMap.getString(key));
-					break;
-				case Map:
-					map.put(key, readableMapToJavaMap(readableMap.getMap(key)));
-					break;
-			}
-		}
-		return map;
+	private void handle(Runnable task) {
+		if (activity() == null) return;
+		UiThread.post(task);
 	}
 }

lib/android/app/src/test/java/com/reactnativenavigation/NavigationActivityTest.java

@@ -2,6 +2,7 @@ package com.reactnativenavigation;
 
 import android.view.View;
 
+import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.reactnativenavigation.controllers.ActivityLifecycleDelegate;
 
 import org.junit.Test;
@@ -17,7 +18,6 @@ import static org.mockito.Mockito.verifyZeroInteractions;
 
 public class NavigationActivityTest extends BaseTest {
 
-
 	@Test
 	public void holdsContentView() throws Exception {
 		NavigationActivity activity = Robolectric.setupActivity(NavigationActivity.class);
@@ -51,4 +51,12 @@ public class NavigationActivityTest extends BaseTest {
 		verify(activityLifecycleDelegate, times(1)).onActivityDestroyed(activityController.get());
 		verifyNoMoreInteractions(activityLifecycleDelegate);
 	}
+
+	@Test
+	public void defaultBackBtnHandler() throws Exception {
+		NavigationActivity navigationActivity = Robolectric.setupActivity(NavigationActivity.class);
+		assertThat(navigationActivity).isInstanceOf(DefaultHardwareBackBtnHandler.class);
+		navigationActivity.invokeDefaultOnBackPressed();
+		assertThat(navigationActivity.isFinishing()).isTrue();
+	}
 }

lib/android/app/src/test/java/com/reactnativenavigation/NavigationApplicationTest.java

@@ -1,6 +1,7 @@
 package com.reactnativenavigation;
 
 import com.facebook.react.ReactApplication;
+import com.facebook.react.ReactNativeHost;
 import com.reactnativenavigation.controllers.ActivityLifecycleDelegate;
 
 import org.junit.Test;
@@ -32,7 +33,8 @@ public class NavigationApplicationTest extends BaseTest {
 	}
 
 	@Test
-	public void configProvidesActivityLifecycleDelegate() throws Exception {
+	public void config() throws Exception {
+		assertThat(NavigationApplication.instance.getConfig().reactNativeHost).isInstanceOf(ReactNativeHost.class);
 		assertThat(NavigationApplication.instance.getConfig().activityLifecycleDelegate).isInstanceOf(ActivityLifecycleDelegate.class);
 	}
 }

lib/android/app/src/test/java/com/reactnativenavigation/TestApplication.java

@@ -1,6 +1,7 @@
 package com.reactnativenavigation;
 
 import com.reactnativenavigation.controllers.ActivityLifecycleDelegate;
+import com.reactnativenavigation.controllers.CommandsHandler;
 import com.reactnativenavigation.mocks.TestDevPermissionRequest;
 import com.reactnativenavigation.mocks.TestReactNativeHost;
 
@@ -16,6 +17,7 @@ public class TestApplication extends NavigationApplication {
 		Config config = new Config();
 		config.reactNativeHost = new TestReactNativeHost(this, isDebug());
 		config.activityLifecycleDelegate = new ActivityLifecycleDelegate(config.reactNativeHost.getReactInstanceManager(), new TestDevPermissionRequest());
+		config.commandsHandler = new CommandsHandler();
 		return config;
 	}
 }

lib/android/app/src/test/java/com/reactnativenavigation/react/NavigationModuleTest.java

@@ -0,0 +1,47 @@
+package com.reactnativenavigation.react;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactMethod;
+import com.reactnativenavigation.BaseTest;
+import com.reactnativenavigation.NavigationApplication;
+import com.reactnativenavigation.controllers.CommandsHandler;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.lang.reflect.Method;
+
+import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verifyZeroInteractions;
+
+public class NavigationModuleTest extends BaseTest {
+
+	private NavigationModule uut;
+
+	@Before
+	public void beforeEach() {
+		ReactApplicationContext reactApplicationContext = mock(ReactApplicationContext.class);
+		uut = new NavigationModule(reactApplicationContext);
+	}
+
+	@Test
+	public void bridgeModule() throws Exception {
+		assertThat(uut.getName()).isEqualTo("RNNBridgeModule");
+	}
+
+	@Test
+	public void allReactMethodsProtectAgainstNullActivity() throws Exception {
+		NavigationApplication.instance.getConfig().commandsHandler = mock(CommandsHandler.class);
+
+		assertThat(uut.activity()).isNull();
+
+		for (Method method : NavigationModule.class.getDeclaredMethods()) {
+			if (method.getAnnotation(ReactMethod.class) != null) {
+				Object[] args = new Object[method.getParameterTypes().length];
+				method.invoke(uut, args);
+				verifyZeroInteractions(NavigationApplication.instance.getConfig().commandsHandler);
+			}
+		}
+	}
+}

playground/android/app/src/main/java/com/reactnativenavigation/playground/MainApplication.java

@@ -4,8 +4,8 @@ import com.reactnativenavigation.NavigationApplication;
 
 public class MainApplication extends NavigationApplication {
 
-    @Override
-    public boolean isDebug() {
-        return BuildConfig.DEBUG;
-    }
+	@Override
+	public boolean isDebug() {
+		return BuildConfig.DEBUG;
+	}
 }