android: tests for utils

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

@@ -8,7 +8,7 @@ import android.view.ViewGroup.LayoutParams;
 
 import com.reactnativenavigation.layout.bottomtabs.BottomTabsCreator;
 import com.reactnativenavigation.layout.bottomtabs.BottomTabsLayout;
-import com.reactnativenavigation.utils.ViewIdGenerator;
+import com.reactnativenavigation.utils.CompatUtils;
 
 import java.util.List;
 
@@ -63,7 +63,7 @@ public class LayoutFactory {
 
 	private View createSideMenuLeft(LayoutNode node) {
 		View view = create(node.children.get(0));
-		view.setId(ViewIdGenerator.generate());
+		view.setId(CompatUtils.generateViewId());
 		DrawerLayout.LayoutParams lp = new DrawerLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
 		lp.gravity = Gravity.LEFT;
 		view.setLayoutParams(lp);
@@ -72,7 +72,7 @@ public class LayoutFactory {
 
 	private View createSideMenuRight(LayoutNode node) {
 		View view = create(node.children.get(0));
-		view.setId(ViewIdGenerator.generate());
+		view.setId(CompatUtils.generateViewId());
 		DrawerLayout.LayoutParams lp = new DrawerLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
 		lp.gravity = Gravity.RIGHT;
 		view.setLayoutParams(lp);
@@ -82,14 +82,14 @@ public class LayoutFactory {
 	private View createContainerView(LayoutNode node) {
 		final String name = (String) node.data.get("name");
 		Container container = new Container(activity, reactRootViewCreator, node.id, name);
-		container.setId(ViewIdGenerator.generate());
+		container.setId(CompatUtils.generateViewId());
 		return container;
 
 	}
 
 	private View createContainerStackView(LayoutNode node) {
 		final ContainerStackLayout containerStack = new ContainerStackLayout(activity);
-		containerStack.setId(ViewIdGenerator.generate());
+		containerStack.setId(CompatUtils.generateViewId());
 		addChildrenNodes(containerStack, node.children);
 		return containerStack;
 	}

android/app/src/main/java/com/reactnativenavigation/utils/CompatUtils.java

@@ -0,0 +1,26 @@
+package com.reactnativenavigation.utils;
+
+import android.os.Build;
+import android.view.View;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class CompatUtils {
+	private static final AtomicInteger viewId = new AtomicInteger(1);
+
+	public static int generateViewId() {
+		if (Build.VERSION.SDK_INT >= 17) {
+			return View.generateViewId();
+		} else {
+			while (true) {
+				final int result = viewId.get();
+				// aapt-generated IDs have the high byte nonzero; clamp to the range under that.
+				int newValue = result + 1;
+				if (newValue > 0x00FFFFFF) newValue = 1; // Roll over to 1, not 0.
+				if (viewId.compareAndSet(result, newValue)) {
+					return result;
+				}
+			}
+		}
+	}
+}

android/app/src/main/java/com/reactnativenavigation/utils/ViewIdGenerator.java

@@ -1,30 +0,0 @@
-package com.reactnativenavigation.utils;
-
-import android.os.Build;
-import android.view.View;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
-public class ViewIdGenerator {
-	private static final AtomicInteger viewId = new AtomicInteger(1);
-
-	public static int generate() {
-		if (Build.VERSION.SDK_INT >= 17) {
-			return View.generateViewId();
-		} else {
-			return compatGenerateViewId();
-		}
-	}
-
-	private static int compatGenerateViewId() {
-		while (true) {
-			final int result = viewId.get();
-			// aapt-generated IDs have the high byte nonzero; clamp to the range under that.
-			int newValue = result + 1;
-			if (newValue > 0x00FFFFFF) newValue = 1; // Roll over to 1, not 0.
-			if (viewId.compareAndSet(result, newValue)) {
-				return result;
-			}
-		}
-	}
-}

android/app/src/test/java/com/reactnativenavigation/utils/CompatUtilsTest.java

@@ -0,0 +1,17 @@
+package com.reactnativenavigation.utils;
+
+import com.reactnativenavigation.BaseTest;
+
+import org.junit.Test;
+
+import static org.assertj.core.api.Java6Assertions.assertThat;
+
+public class CompatUtilsTest extends BaseTest {
+
+	@Test
+	public void generateViewId() throws Exception {
+		assertThat(CompatUtils.generateViewId())
+				.isPositive()
+				.isNotEqualTo(CompatUtils.generateViewId());
+	}
+}

android/app/src/test/java/com/reactnativenavigation/utils/UiThreadTest.java

@@ -0,0 +1,32 @@
+package com.reactnativenavigation.utils;
+
+import com.reactnativenavigation.BaseTest;
+
+import org.junit.Test;
+import org.robolectric.shadows.ShadowLooper;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+
+public class UiThreadTest extends BaseTest {
+	@Test
+	public void postOnUiThread() throws Exception {
+		Runnable task = mock(Runnable.class);
+		ShadowLooper.pauseMainLooper();
+		UiThread.post(task);
+		verifyZeroInteractions(task);
+		ShadowLooper.runUiThreadTasks();
+		verify(task, times(1)).run();
+	}
+
+	@Test
+	public void postDelayedOnUiThread() throws Exception {
+		Runnable task = mock(Runnable.class);
+		UiThread.postDelayed(task, 1000);
+		verifyZeroInteractions(task);
+		ShadowLooper.runUiThreadTasksIncludingDelayedTasks();
+		verify(task, times(1)).run();
+	}
+}

android/prepare-robolectric.gradle

@@ -5,7 +5,6 @@ configurations.create('robolectricRuntime')
 dependencies {
     testCompile "org.khronos:opengl-api:gl1.1-android-2.1_r1"
 
-    // robolectricRuntime "org.robolectric:android-all:6.0.1_r3-robolectric-0"
     robolectricRuntime "org.robolectric:android-all:7.1.0_r7-robolectric-0"
     robolectricRuntime "org.robolectric:shadows-core:3.3"
     robolectricRuntime "org.robolectric:robolectric-utils:3.3"

playground/e2e/app.test.js

@@ -1,4 +1,4 @@
-describe('app', () => {
+describe('top level api', () => {
   beforeEach(async () => {
     await device.relaunchApp();
   });