Android: Handle unknown node type use-case

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

@@ -1,6 +1,7 @@
 package com.reactnativenavigation.layout;
 
 import android.app.Activity;
+import android.support.annotation.NonNull;
 import android.view.View;
 
 import java.util.List;
@@ -21,17 +22,26 @@ public class LayoutFactory {
     public View create(LayoutNode node) {
         switch (node.type) {
             case "Container":
-                String name = (String) node.data.get("name");
-                return new Container(activity, rootViewCreator, node.id, name);
-
+                return createContainerView(node);
             case "ContainerStack":
-                ContainerStack containerStack = new ContainerStack(activity);
-                List<LayoutNode> children = node.children;
-                addChildrenNodes(containerStack, children);
-                return containerStack;
+                return createContainerStackView(node);
+            default:
+                throw new IllegalArgumentException("Invalid node type: "+node.type);
         }
+    }
+
+    @NonNull
+    private View createContainerStackView(LayoutNode node) {
+        ContainerStack containerStack = new ContainerStack(activity);
+        List<LayoutNode> children = node.children;
+        addChildrenNodes(containerStack, children);
+        return containerStack;
+    }
 
-        return null;
+    @NonNull
+    private View createContainerView(LayoutNode node) {
+        String name = (String) node.data.get("name");
+        return new Container(activity, rootViewCreator, node.id, name);
     }
 
     private void addChildrenNodes(ContainerStack containerStack, List<LayoutNode> children) {

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

@@ -49,14 +49,6 @@ public class NavigationModule extends ReactContextBaseJavaModule {
                 final LayoutNode layoutTreeRoot = readableMapToLayoutNode(layoutTree);
                 final View rootView = factory.create(layoutTreeRoot);
                 NavigationActivity.instance.setContentView(rootView);
-
-//                Map<String, Object> node = new HashMap<String, Object>();
-//                node.put("id", container.getString("id"));
-//                HashMap<String, Object> data = new HashMap<>();
-//                data.put("name", container.getMap("data").getString("name"));
-//                node.put("data", data);
-//                View rootView = factory.create(node);
-//                NavigationActivity.instance.setContentView(rootView);
             }
         });
     }
@@ -88,8 +80,6 @@ public class NavigationModule extends ReactContextBaseJavaModule {
                 case Map:
                     map.put(key, readableMapToJavaMap(readableMap.getMap(key)));
                     break;
-                default:
-                    throw new IllegalArgumentException("WTF?!");
             }
         }
         return map;

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

@@ -17,6 +17,7 @@ import org.robolectric.RobolectricTestRunner;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 
@@ -89,6 +90,14 @@ public class LayoutFactoryTest {
         assertViewChildren(container2, mockView2);
     }
 
+    @Test(expected = IllegalArgumentException.class)
+    public void throwsExceptionForUnknownType() {
+        when(rootViewCreator.createRootView(eq(VIEW_ID), eq(VIEW_NAME))).thenReturn(mockView);
+        final LayoutNode node = new LayoutNode(VIEW_ID, "***unknownType***", Collections.<String, Object>emptyMap());
+
+        createLayoutFactory().create(node);
+    }
+
     private LayoutFactory createLayoutFactory() {
         return new LayoutFactory(Robolectric.buildActivity(Activity.class).get(), rootViewCreator);
     }