#1071 Add Android tests (#1489)

* #1071 Test that Navigator forwards NavigationOptions to ViewController

* Add an argument allowing to run a single Android e2e test

* Fix style issue

* #1071 Allow changing navigation title in iOS

* Update readme to document an option for running a single test

* Update ScreenStyleDynamic.test.js

CONTRIBUTING.md

@@ -72,7 +72,7 @@ brew tap facebook/fb && brew install fbsimctl
 | `yarn test-unit-ios` | runs ios unit tests in debug/release <br> **Options:** `-- release` |
 | `yarn test-unit-android` | runs android unit tests in debug/release <br> **Options:** `-- release` |
 | `yarn test-e2e-ios` | runs the ios e2e suite (with detox) in debug/release |
-| `yarn test-e2e-android` | runs the android e2e suite (with uiautomator) in debug/release on running devices/emulators <br> **Options:** `-- release` |
+| `yarn test-e2e-android` | runs the android e2e suite (with uiautomator) in debug/release on running devices/emulators <br> **Options:** `-- [release] [just com.TestClass#testMethod]` |
 | `yarn test-all` | runs all tests in parallel |
 
 ## Workflow

e2e/ScreenStyleDynamic.test.js

@@ -0,0 +1,15 @@
+const Utils = require('./Utils');
+const elementByLabel = Utils.elementByLabel;
+
+describe('screen style - dynamic', () => {
+  beforeEach(async () => {
+    await device.relaunchApp();
+  });
+
+  it('change title on container component', async () => {
+    await elementByLabel('Push Options Screen').tap();
+    await expect(element(by.label('Static Title').and(by.type('UILabel')))).toBeVisible();
+    await elementByLabel('Dynamic Options').tap();
+    await expect(element(by.label('Dynamic Title').and(by.type('UILabel')))).toBeVisible();
+  });
+});

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

@@ -0,0 +1,5 @@
+package com.reactnativenavigation.layout;
+
+public interface NavigationOptionsHolder {
+	void mergeNavigationOptions(NavigationOptions options);
+}

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

@@ -10,7 +10,7 @@ import com.facebook.react.ReactRootView;
 import com.reactnativenavigation.react.NavigationEvent;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 
-public class ReactRootViewController extends ViewController {
+public class ReactRootViewController extends ViewController implements NavigationOptionsHolder {
 
 	private final String name;
 	private final NavigationOptions navigationOptions;
@@ -29,6 +29,11 @@ public class ReactRootViewController extends ViewController {
 		this.reactInstanceManager = reactInstanceManager;
 	}
 
+	public void mergeNavigationOptions(NavigationOptions options) {
+		navigationOptions.title = options.title;
+		applyNavigationOptions();
+	}
+
 	@Override
 	public void destroy() {
 		super.destroy();
@@ -39,8 +44,7 @@ public class ReactRootViewController extends ViewController {
 	@Override
 	public void onViewAppeared() {
 		super.onViewAppeared();
-		if (getParentStackController() != null)
-			getParentStackController().setTitle(navigationOptions.title);
+		applyNavigationOptions();
 		new NavigationEvent(reactInstanceManager.getCurrentReactContext()).containerStart(getId());
 	}
 
@@ -71,4 +75,9 @@ public class ReactRootViewController extends ViewController {
 		reactRootView.startReactApplication(this.reactInstanceManager, this.name, opts);
 		return reactRootView;
 	}
+
+	private void applyNavigationOptions() {
+		if (getParentStackController() != null)
+			getParentStackController().setTitle(navigationOptions.title);
+	}
 }

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/Navigator.java

@@ -6,6 +6,7 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
 import com.reactnativenavigation.layout.NavigationOptions;
+import com.reactnativenavigation.layout.NavigationOptionsHolder;
 import com.reactnativenavigation.utils.CompatUtils;
 
 import java.util.Collection;
@@ -26,6 +27,7 @@ public class Navigator extends ParentController {
 		return new FrameLayout(getActivity());
 	}
 
+	@NonNull
 	@Override
 	public Collection<ViewController> getChildControllers() {
 		return root == null ? Collections.<ViewController>emptyList() : Collections.singletonList(root);
@@ -57,7 +59,9 @@ public class Navigator extends ParentController {
 
 	public void setOptions(final String containerId, NavigationOptions options) {
 		ViewController target = findControllerById(containerId);
-		target.getParentStackController().setTitle(options.title);
+		if (target instanceof NavigationOptionsHolder) {
+			((NavigationOptionsHolder) target).mergeNavigationOptions(options);
+		}
 	}
 
 	public void push(final String fromId, final ViewController viewController) {

lib/android/app/src/test/java/com/reactnativenavigation/mocks/SimpleViewController.java

@@ -3,9 +3,14 @@ package com.reactnativenavigation.mocks;
 import android.app.Activity;
 import android.view.View;
 
+import com.reactnativenavigation.layout.NavigationOptions;
+import com.reactnativenavigation.layout.NavigationOptionsHolder;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 
-public class SimpleViewController extends ViewController {
+public class SimpleViewController extends ViewController implements NavigationOptionsHolder {
+
+	public NavigationOptions lastNavigationOptions;
+
 	public SimpleViewController(final Activity activity, String id) {
 		super(activity, id);
 	}
@@ -19,4 +24,9 @@ public class SimpleViewController extends ViewController {
 	public String toString() {
 		return "SimpleViewController " + getId();
 	}
+
+	@Override
+	public void mergeNavigationOptions(NavigationOptions options) {
+		lastNavigationOptions = options;
+	}
 }

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/NavigatorTest.java

@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.support.annotation.NonNull;
 
 import com.reactnativenavigation.BaseTest;
+import com.reactnativenavigation.layout.NavigationOptions;
 import com.reactnativenavigation.mocks.SimpleViewController;
 import com.reactnativenavigation.mocks.TestStackAnimator;
 import com.reactnativenavigation.utils.CompatUtils;
@@ -21,7 +22,7 @@ import static org.mockito.Mockito.when;
 public class NavigatorTest extends BaseTest {
 	private Activity activity;
 	private Navigator uut;
-	private ViewController child1;
+	private SimpleViewController child1;
 	private ViewController child2;
 	private ViewController child3;
 	private ViewController child4;
@@ -187,6 +188,14 @@ public class NavigatorTest extends BaseTest {
 		verify(spy, times(1)).handleBack();
 	}
 
+	@Test
+	public void setOptions_CallsMergeNavigationOptions() {
+		uut.setRoot(child1);
+		NavigationOptions options = new NavigationOptions();
+		uut.setOptions(child1.getId(), options);
+		assertThat(child1.lastNavigationOptions).isEqualTo(options);
+	}
+
 	@NonNull
 	private BottomTabsController newTabs() {
 		return new BottomTabsController(activity, "tabsController");

lib/ios/RNNBridgeModule.m

@@ -22,6 +22,10 @@ RCT_EXPORT_METHOD(setRoot:(NSDictionary*)layout) {
 	[_commandsHandler setRoot:layout];
 }
 
+RCT_EXPORT_METHOD(setOptions:(NSString*)containerId options:(NSDictionary*)options) {
+	[_commandsHandler setOptions:containerId options:options];
+}
+
 RCT_EXPORT_METHOD(push:(NSString*)containerId layout:(NSDictionary*)layout) {
 	[_commandsHandler push:containerId layout:layout];
 }

lib/ios/RNNCommandsHandler.h

@@ -10,6 +10,8 @@
 
 -(void) setRoot:(NSDictionary*)layout;
 
+-(void) setOptions:(NSString*)containerId options:(NSDictionary*)options;
+
 -(void) push:(NSString*)containerId layout:(NSDictionary*)layout;
 
 -(void) pop:(NSString*)containerId;

lib/ios/RNNCommandsHandler.m

@@ -33,6 +33,11 @@
 	[UIApplication.sharedApplication.delegate.window makeKeyAndVisible];
 }
 
+-(void) setOptions:(NSString*)containerId options:(NSDictionary*)options {
+	[self assertReady];
+	[_store findContainerForId:containerId].navigationItem.title = options[@"title"];
+}
+
 -(void) push:(NSString*)containerId layout:(NSDictionary*)layout {
 	[self assertReady];
 	UIViewController *newVc = [_controllerFactory createLayoutAndSaveToStore:layout];

scripts/test.e2e.android.js

@@ -10,6 +10,9 @@ const packageName = `system-images;${sdk};${apis};${abi}`;
 
 const release = _.includes(process.argv, 'release');
 
+// Run just a single test, e.g. yarn test-e2e-android -- just com.MyClass#myMethod
+const filter = _(process.argv).dropWhile((a) => a !== 'just').take(2).last();
+
 run();
 
 function run() {
@@ -23,7 +26,8 @@ function run() {
 function runTests() {
   exec.execSync(`yarn run uninstall-android`);
   exec.execSync(`yarn run install-android ${release ? '-- release' : ''}`);
-  exec.execSync(`cd AndroidE2E && ./gradlew connectedDebugAndroidTest`);
+  const filterParam = filter ? '-Pandroid.testInstrumentationRunnerArguments.class=' + filter : '';
+  exec.execSync(`cd AndroidE2E && ./gradlew ${filterParam} connectedDebugAndroidTest`);
 }
 
 function installEmulator() {