commandsHandler test

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

@@ -7,16 +7,16 @@ import com.facebook.react.ReactRootView;
 import com.reactnativenavigation.NavigationActivity;
 import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.layout.LayoutFactory;
+import com.reactnativenavigation.layout.LayoutNode;
 import com.reactnativenavigation.layout.StackLayout;
 import com.reactnativenavigation.layout.bottomtabs.BottomTabsCreator;
-import com.reactnativenavigation.layout.parse.LayoutNode;
-import com.reactnativenavigation.utils.UiThread;
 
 import org.json.JSONObject;
 
 public class CommandsHandler {
 
 	public void setRoot(final NavigationActivity activity, final JSONObject layoutTree) {
+		final LayoutNode layoutTreeRoot = LayoutNode.parse(layoutTree);
 		LayoutFactory factory =
 				new LayoutFactory(activity, new LayoutFactory.ReactRootViewCreator() {
 					@Override
@@ -29,7 +29,6 @@ public class CommandsHandler {
 					}
 				}, new BottomTabsCreator());
 
-		final LayoutNode layoutTreeRoot = LayoutNode.parse(layoutTree);
 		final View rootView = factory.create(layoutTreeRoot);
 		activity.setContentView(rootView);
 	}
@@ -52,11 +51,6 @@ public class CommandsHandler {
 	}
 
 	public void pop(final NavigationActivity activity, String onContainerId) {
-		UiThread.post(new Runnable() {
-			@Override
-			public void run() {
-				((StackLayout) activity.getContentView()).pop();
-			}
-		});
+		((StackLayout) activity.getContentView()).pop();
 	}
 }

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

@@ -15,10 +15,13 @@ public class Container extends FrameLayout {
 		super(context);
 		this.id = id;
 		addView(reactRootViewCreator.create(id, name));
+	}
 
+	public String getContainerId() {
+		return id;
 	}
 
-//    @Override
+	//    @Override
 //    protected void onAttachedToWindow() {
 //        Log.d(TAG, "onAttachedToWindow: " + id);
 //        super.onAttachedToWindow();

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

@@ -8,7 +8,6 @@ import android.view.ViewGroup.LayoutParams;
 
 import com.reactnativenavigation.layout.bottomtabs.BottomTabsCreator;
 import com.reactnativenavigation.layout.bottomtabs.BottomTabsLayout;
-import com.reactnativenavigation.layout.parse.LayoutNode;
 import com.reactnativenavigation.utils.CompatUtils;
 
 import java.util.List;

lib/android/app/src/main/java/com/reactnativenavigation/layout/parse/LayoutNode.java → lib/android/app/src/main/java/com/reactnativenavigation/layout/LayoutNode.java

@@ -1,4 +1,4 @@
-package com.reactnativenavigation.layout.parse;
+package com.reactnativenavigation.layout;
 
 import android.support.annotation.NonNull;
 

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

@@ -1,5 +1,8 @@
 package com.reactnativenavigation;
 
+import com.facebook.react.uimanager.DisplayMetricsHolder;
+
+import org.junit.Before;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
@@ -7,4 +10,9 @@ import org.robolectric.annotation.Config;
 @RunWith(RobolectricTestRunner.class)
 @Config(sdk = 25, constants = BuildConfig.class, manifest = "/../../../../../src/test/AndroidManifest.xml")
 public abstract class BaseTest {
+
+	@Before
+	public void beforeEach() {
+		DisplayMetricsHolder.initDisplayMetrics(NavigationApplication.instance);
+	}
 }

lib/android/app/src/test/java/com/reactnativenavigation/controllers/CommandsHandlerTest.java

@@ -0,0 +1,28 @@
+package com.reactnativenavigation.controllers;
+
+import com.reactnativenavigation.BaseTest;
+import com.reactnativenavigation.NavigationActivity;
+import com.reactnativenavigation.layout.Container;
+
+import org.json.JSONObject;
+import org.junit.Test;
+import org.robolectric.Robolectric;
+
+import static org.assertj.core.api.Java6Assertions.assertThat;
+
+public class CommandsHandlerTest extends BaseTest {
+
+	@Test
+	public void setRootCreatesTheLayout_SetsOnActivity() throws Exception {
+		CommandsHandler uut = new CommandsHandler();
+		JSONObject json = new JSONObject("{" +
+				"id: containerId123," +
+				"type: Container" +
+				"}");
+		NavigationActivity activity = Robolectric.setupActivity(NavigationActivity.class);
+		uut.setRoot(activity, json);
+
+		assertThat(activity.getContentView()).isInstanceOf(Container.class);
+		assertThat(((Container) activity.getContentView()).getContainerId()).isEqualTo("containerId123");
+	}
+}

lib/android/app/src/test/java/com/reactnativenavigation/layout/LayoutFactoryTest.java

@@ -9,7 +9,6 @@ import com.reactnativenavigation.BaseTest;
 import com.reactnativenavigation.layout.bottomtabs.BottomTabs;
 import com.reactnativenavigation.layout.bottomtabs.BottomTabsCreator;
 import com.reactnativenavigation.layout.bottomtabs.BottomTabsLayout;
-import com.reactnativenavigation.layout.parse.LayoutNode;
 
 import org.json.JSONException;
 import org.json.JSONObject;

lib/android/app/src/test/java/com/reactnativenavigation/layout/parse/LayoutNodeTest.java → lib/android/app/src/test/java/com/reactnativenavigation/layout/LayoutNodeTest.java

@@ -1,6 +1,7 @@
-package com.reactnativenavigation.layout.parse;
+package com.reactnativenavigation.layout;
 
 import com.reactnativenavigation.BaseTest;
+import com.reactnativenavigation.layout.LayoutNode;
 
 import org.json.JSONObject;
 import org.junit.Test;