Android: More tab switching test coverage using refactor

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

@@ -49,11 +49,13 @@ public class LayoutFactory {
     }
 
     private View createBottomTabs(LayoutNode node) {
-        final BottomTabsContainer tabsContainer = new BottomTabsContainer(activity, bottomTabsCreator);
+        final BottomTabsContainer tabsContainer = new BottomTabsContainer(activity, bottomTabsCreator.create());
 
+        int i = 0;
         for (LayoutNode child : node.children) {
             final View tabContent = create(child);
-            tabsContainer.addTabContent(tabContent);
+            tabsContainer.addTabContent("#" + i, tabContent);
+            i++;
         }
         return tabsContainer;
     }

android/app/src/main/java/com/reactnativenavigation/layout/bottomtabs/BottomTabs.java

@@ -7,95 +7,64 @@ import android.support.design.widget.BottomNavigationView;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.RelativeLayout;
 import android.widget.RelativeLayout.LayoutParams;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import static android.widget.RelativeLayout.ALIGN_PARENT_BOTTOM;
 
 public class BottomTabs implements BottomNavigationView.OnNavigationItemSelectedListener {
 
+    public interface BottomTabsSelectionListener {
+        void onTabSelected(int index);
+    }
+
     private static final AtomicInteger viewId = new AtomicInteger(1);
 
     private BottomNavigationView bottomNavigationView;
-    private List<View> tabsContent;
-    private int currentTabId;
+    private BottomTabsSelectionListener listener;
 
     public void attach(RelativeLayout parentLayout) {
         createBottomNavigation(parentLayout);
         addButtomNavigationToParent(parentLayout);
-        bottomNavigationView.setOnNavigationItemSelectedListener(this);
-        tabsContent = new ArrayList<>(bottomNavigationView.getMaxItemCount());
     }
 
-    public void addTab(String label, View tabContent) {
+    public void setSelectionListener(BottomTabsSelectionListener listener) {
+        this.listener = listener;
+    }
+
+    public void add(String label) {
         int tabId = getTabsCount();
         bottomNavigationView.getMenu().add(0, tabId, Menu.NONE, label);
-
-        attachTabContent(tabContent);
-        tabsContent.add(tabContent);
-
-        if (isFirstTabEver()) {
-            currentTabId = 0;
-            showCurrentTab();
-        } else {
-            hideTab(tabId);
-        }
     }
 
     public int getTabsCount() {
         return bottomNavigationView.getMenu().size();
     }
 
+    public int getViewId() {
+        return bottomNavigationView.getId();
+    }
+
     @Override
     public boolean onNavigationItemSelected(@NonNull MenuItem item) {
-        final int id = item.getItemId();
-
-        hideCurrentTab();
-        currentTabId = id;
-        showCurrentTab();
+        listener.onTabSelected(item.getItemId());
         return true;
     }
 
-    private void addButtomNavigationToParent(RelativeLayout parentLayout) {
-        LayoutParams lp = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
-        lp.addRule(ALIGN_PARENT_BOTTOM);
-        bottomNavigationView.setLayoutParams(lp);
-        parentLayout.addView(bottomNavigationView, lp);
-    }
-
     private void createBottomNavigation(RelativeLayout parentLayout) {
         bottomNavigationView = new BottomNavigationView(parentLayout.getContext());
         bottomNavigationView.setId(generateViewId());
         bottomNavigationView.setBackgroundColor(Color.DKGRAY);
+        bottomNavigationView.setOnNavigationItemSelectedListener(this);
     }
 
-    private boolean isFirstTabEver() {
-        return bottomNavigationView.getMenu().size() == 1;
-    }
-
-    private void attachTabContent(View tabContent) {
-        LayoutParams params = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
-        params.addRule(RelativeLayout.ABOVE, bottomNavigationView.getId());
-
-        ViewGroup parent = (ViewGroup) bottomNavigationView.getParent();
-        parent.addView(tabContent, params);
-    }
-
-    private void showCurrentTab() {
-        tabsContent.get(currentTabId).setVisibility(View.VISIBLE);
-    }
-
-    private void hideCurrentTab() {
-        hideTab(currentTabId);
-    }
-
-    private void hideTab(int tabId) {
-        tabsContent.get(tabId).setVisibility(View.GONE);
+    private void addButtomNavigationToParent(RelativeLayout parentLayout) {
+        LayoutParams lp = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
+        lp.addRule(ALIGN_PARENT_BOTTOM);
+        bottomNavigationView.setLayoutParams(lp);
+        parentLayout.addView(bottomNavigationView, lp);
     }
 
     private int generateViewId() {

android/app/src/main/java/com/reactnativenavigation/layout/bottomtabs/BottomTabsContainer.java

@@ -4,21 +4,58 @@ import android.app.Activity;
 import android.view.View;
 import android.widget.RelativeLayout;
 
-public class BottomTabsContainer extends RelativeLayout {
+import java.util.ArrayList;
+import java.util.List;
 
+public class BottomTabsContainer extends RelativeLayout implements BottomTabs.BottomTabsSelectionListener {
+
+    private List<View> tabsContent;
     private BottomTabs bottomTabs;
+    private int currentTab;
 
-    public BottomTabsContainer(Activity activity, BottomTabsCreator bottomTabsCreator) {
+    public BottomTabsContainer(Activity activity, BottomTabs bottomTabs) {
         super(activity);
-        createBottomTabs(bottomTabsCreator);
+
+        initBottomTabs(bottomTabs);
     }
 
-    public void addTabContent(View tabContent) {
-        bottomTabs.addTab("#" + bottomTabs.getTabsCount(), tabContent);
+    public void addTabContent(String label, View tabContent) {
+        bottomTabs.add(label);
+        attachTabContent(tabContent);
+        tabsContent.add(tabContent);
+
+        if (tabsContent.size() > 1) {
+            tabContent.setVisibility(View.GONE);
+        }
     }
 
-    private void createBottomTabs(BottomTabsCreator bottomTabsCreator) {
-        bottomTabs = bottomTabsCreator.create();
-        bottomTabs.attach(this);
+    @Override
+    public void onTabSelected(int index) {
+        hideTab(currentTab);
+        currentTab = index;
+        showTab(currentTab);
     }
+
+    private void initBottomTabs(BottomTabs bottomTabs) {
+        this.bottomTabs = bottomTabs;
+        this.bottomTabs.attach(this);
+        this.bottomTabs.setSelectionListener(this);
+
+        tabsContent = new ArrayList<>();
+    }
+
+    private void attachTabContent(View tabContent) {
+        LayoutParams tabParams = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
+        tabParams.addRule(ABOVE, bottomTabs.getViewId());
+        addView(tabContent, tabParams);
+    }
+
+    private void showTab(int tabId) {
+        tabsContent.get(tabId).setVisibility(View.VISIBLE);
+    }
+
+    private void hideTab(int tabId) {
+        tabsContent.get(tabId).setVisibility(View.GONE);
+    }
+
 }

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

@@ -0,0 +1,118 @@
+package com.reactnativenavigation;
+
+import android.app.Activity;
+import android.view.View;
+
+import com.reactnativenavigation.layout.bottomtabs.BottomTabs;
+import com.reactnativenavigation.layout.bottomtabs.BottomTabsContainer;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+
+import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+@RunWith(RobolectricTestRunner.class)
+public class BottomTabsContainerTest {
+
+    private static final String TAB_NAME = "myTab";
+    private static final String OTHER_TAB_NAME = "myOtherTab";
+
+    private BottomTabs bottomTabs;
+    private Activity activity;
+
+    @Before
+    public void setUp() throws Exception {
+        bottomTabs = mock(BottomTabs.class);
+        activity = Robolectric.buildActivity(Activity.class).get();
+    }
+
+    @Test
+    public void addsTabToBottomTabs() throws Exception {
+        View tabContent = new View(activity);
+
+        BottomTabsContainer bottomTabsContainer = createBottomTabsContainer();
+        bottomTabsContainer.addTabContent(TAB_NAME, tabContent);
+
+        verify(bottomTabs).add(TAB_NAME);
+    }
+
+    @Test
+    public void addsTabContentToLayout() throws Exception {
+        View tabContent = new View(activity);
+
+        BottomTabsContainer bottomTabsContainer = createBottomTabsContainer();
+        bottomTabsContainer.addTabContent(TAB_NAME, tabContent);
+
+        verify(bottomTabs).attach(bottomTabsContainer);
+        TestUtils.assertViewChildren(bottomTabsContainer, tabContent);
+    }
+
+    @Test
+    public void addsTwoTabsContentToLayout() throws Exception {
+        View tabContent = new View(activity);
+        View otherTabContent = new View(activity);
+
+        BottomTabsContainer bottomTabsContainer = createBottomTabsContainer();
+        bottomTabsContainer.addTabContent(TAB_NAME, tabContent);
+        bottomTabsContainer.addTabContent(OTHER_TAB_NAME, otherTabContent);
+
+        TestUtils.assertViewChildren(bottomTabsContainer, tabContent, otherTabContent);
+    }
+
+    @Test
+    public void onlyFirstTabShouldBeVisible() throws Exception {
+        View tabContent = new View(activity);
+        View otherTabContent = new View(activity);
+
+        BottomTabsContainer bottomTabsContainer = createBottomTabsContainer();
+        bottomTabsContainer.addTabContent(TAB_NAME, tabContent);
+        bottomTabsContainer.addTabContent(OTHER_TAB_NAME, otherTabContent);
+
+        assertThat(tabContent.getVisibility()).isEqualTo(View.VISIBLE);
+        assertThat(otherTabContent.getVisibility()).isEqualTo(View.GONE);
+    }
+
+    @Test
+    public void listensToTabsSwitchingEvents() throws Exception {
+        BottomTabsContainer bottomTabsContainer = createBottomTabsContainer();
+        verify(bottomTabs).setSelectionListener(bottomTabsContainer);
+    }
+
+    @Test
+    public void switchesBetweenFirstAndSecondTabs() throws Exception {
+        View tabContent = new View(activity);
+        View otherTabContent = new View(activity);
+
+        BottomTabsContainer bottomTabsContainer = createBottomTabsContainer();
+        bottomTabsContainer.addTabContent(TAB_NAME, tabContent);
+        bottomTabsContainer.addTabContent(OTHER_TAB_NAME, otherTabContent);
+        bottomTabsContainer.onTabSelected(1);
+
+        assertThat(tabContent.getVisibility()).isEqualTo(View.GONE);
+        assertThat(otherTabContent.getVisibility()).isEqualTo(View.VISIBLE);
+    }
+
+    @Test
+    public void switchesBetweenSecondAndFirstTabs() throws Exception {
+        View tabContent = new View(activity);
+        View otherTabContent = new View(activity);
+
+        BottomTabsContainer bottomTabsContainer = createBottomTabsContainer();
+        bottomTabsContainer.addTabContent(TAB_NAME, tabContent);
+        bottomTabsContainer.addTabContent(OTHER_TAB_NAME, otherTabContent);
+        bottomTabsContainer.onTabSelected(1);
+        bottomTabsContainer.onTabSelected(0);
+
+        assertThat(tabContent.getVisibility()).isEqualTo(View.VISIBLE);
+        assertThat(otherTabContent.getVisibility()).isEqualTo(View.GONE);
+    }
+
+    private BottomTabsContainer createBottomTabsContainer() {
+        return new BottomTabsContainer(activity, bottomTabs);
+    }
+}

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

@@ -16,18 +16,15 @@ import com.reactnativenavigation.layout.bottomtabs.BottomTabsCreator;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 
 import static org.assertj.core.api.Java6Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
@@ -63,7 +60,7 @@ public class LayoutFactoryTest {
         final ViewGroup result = (ViewGroup) createLayoutFactory().create(node);
 
         assertThat(result).isInstanceOf(Container.class);
-        assertViewChildren(result, mockView);
+        TestUtils.assertViewChildren(result, mockView);
     }
 
     @Test
@@ -75,8 +72,8 @@ public class LayoutFactoryTest {
         final ViewGroup result = (ViewGroup) createLayoutFactory().create(stackNode);
 
         assertThat(result).isInstanceOf(ContainerStack.class);
-        ViewGroup container = (ViewGroup) assertViewChildrenCount(result, 1).get(0);
-        assertViewChildren(container, mockView);
+        ViewGroup container = (ViewGroup) TestUtils.assertViewChildrenCount(result, 1).get(0);
+        TestUtils.assertViewChildren(container, mockView);
     }
 
     @Test
@@ -93,11 +90,11 @@ public class LayoutFactoryTest {
         final ViewGroup result = (ViewGroup) createLayoutFactory().create(stackNode);
 
         assertThat(result).isInstanceOf(ContainerStack.class);
-        List<View> containers = assertViewChildrenCount(result, 2);
+        List<View> containers = TestUtils.assertViewChildrenCount(result, 2);
         ViewGroup container1 = (ViewGroup) containers.get(0);
         ViewGroup container2 = (ViewGroup) containers.get(1);
-        assertViewChildren(container1, mockView1);
-        assertViewChildren(container2, mockView2);
+        TestUtils.assertViewChildren(container1, mockView1);
+        TestUtils.assertViewChildren(container2, mockView2);
     }
 
     @Test
@@ -111,12 +108,11 @@ public class LayoutFactoryTest {
 
         final View result = createLayoutFactory(bottomTabsMock).create(tabNode);
 
-        assertThat(result).isInstanceOf(BottomTabsContainer.class);
+        verify(bottomTabsMock).add("#0");
 
-        ArgumentCaptor<Container> containerCaptor = ArgumentCaptor.forClass(Container.class);
-        verify(bottomTabsMock).addTab(eq("#0"), containerCaptor.capture());
-        Container container = containerCaptor.getValue();
-        View view = assertViewChildrenCount(container, 1).get(0);
+        assertThat(result).isInstanceOf(BottomTabsContainer.class);
+        Container container = (Container) TestUtils.assertViewChildrenCount((BottomTabsContainer) result, 1).get(0);
+        View view = TestUtils.assertViewChildrenCount(container, 1).get(0);
         assertThat(view).isEqualTo(mockView);
     }
 
@@ -136,8 +132,8 @@ public class LayoutFactoryTest {
         final View result = createLayoutFactory(bottomTabsMock).create(tabNode);
 
         assertThat(result).isInstanceOf(BottomTabsContainer.class);
-        verify(bottomTabsMock).addTab(eq("#0"), any(Container.class));
-        verify(bottomTabsMock).addTab(eq("#1"), any(ContainerStack.class));
+        verify(bottomTabsMock).add(eq("#0"));
+        verify(bottomTabsMock).add(eq("#1"));
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -183,19 +179,4 @@ public class LayoutFactoryTest {
         node.children = Arrays.asList(children);
         return node;
     }
-
-    private List<View> assertViewChildrenCount(ViewGroup view, int count) {
-        assertThat(view.getChildCount()).isEqualTo(count);
-
-        final List<View> children = new ArrayList<>(count);
-        for (int i = 0; i < count; i++) {
-            children.add(view.getChildAt(i));
-        }
-        return children;
-    }
-
-    private void assertViewChildren(ViewGroup view, View... children) {
-        final List<View> childViews = assertViewChildrenCount(view, children.length);
-        assertThat(childViews).isEqualTo(Arrays.asList(children));
-    }
 }

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

@@ -0,0 +1,27 @@
+package com.reactnativenavigation;
+
+import android.view.View;
+import android.view.ViewGroup;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.assertj.core.api.Java6Assertions.assertThat;
+
+public class TestUtils {
+    public static List<View> assertViewChildrenCount(ViewGroup view, int count) {
+        assertThat(view.getChildCount()).isEqualTo(count);
+
+        final List<View> children = new ArrayList<>(count);
+        for (int i = 0; i < count; i++) {
+            children.add(view.getChildAt(i));
+        }
+        return children;
+    }
+
+    public static void assertViewChildren(ViewGroup view, View... children) {
+        final List<View> childViews = assertViewChildrenCount(view, children.length);
+        assertThat(childViews).isEqualTo(Arrays.asList(children));
+    }
+}