Merge pull request #14 from lifedemons/feature/2/android_orchestrator…

…_integration

Introduced CucumberJUnitRunner - a bridge between Cucumber Features and Android Test Orchestrator

build.gradle

@@ -18,7 +18,7 @@ apply plugin: 'io.codearte.nexus-staging'
 
 
 ext {
-    targetSdkVersion = 27
+    targetSdkVersion = 28
     buildToolsVersion = '28.0.3'
     minSdkVersion = '14'
 

cucumber-android/build.gradle

@@ -13,7 +13,9 @@ configurations.all {
 
 dependencies {
     api "io.cucumber:cucumber-java:$cucumber_javaVersion"
-    testImplementation 'junit:junit:4.12'
+    api "io.cucumber:cucumber-junit:$cucumber_javaVersion"
+    api 'junit:junit:4.12'
+    api "androidx.test:runner:1.1.1"
     testImplementation "org.robolectric:robolectric:4.1"
     testImplementation "org.powermock:powermock-api-mockito2:2.0.0"
     testImplementation "org.powermock:powermock-module-junit4:2.0.0"

cucumber-android/src/main/java/cucumber/api/android/CucumberAndroidJUnitRunner.java

@@ -0,0 +1,39 @@
+package cucumber.api.android;
+
+import android.os.Bundle;
+import androidx.test.runner.AndroidJUnitRunner;
+import cucumber.runtime.android.CucumberJUnitRunnerBuilder;
+
+/**
+ * {@link AndroidJUnitRunner} for cucumber tests. It supports running tests from Android Tests Orchestrator
+ */
+public class CucumberAndroidJUnitRunner extends AndroidJUnitRunner {
+
+    public static final String CUCUMBER_ANDROID_TEST_CLASS = "cucumberAndroidTestClass";
+    private static final String ARGUMENT_ORCHESTRATOR_RUNNER_BUILDER = "runnerBuilder";
+    private static final String ARGUMENT_ORCHESTRATOR_CLASS = "class";
+    private Bundle arguments;
+
+    @Override
+    public void onCreate(final Bundle bundle) {
+        bundle.putString(ARGUMENT_ORCHESTRATOR_RUNNER_BUILDER, CucumberJUnitRunnerBuilder.class.getName());
+
+        String testClass = bundle.getString(ARGUMENT_ORCHESTRATOR_CLASS);
+        if (testClass != null && !testClass.isEmpty()){
+            //if this runner is executed for single class (e.g. from orchestrator or spoon), we set
+            //special option to let CucumberJUnitRunner handle this
+             bundle.putString(CUCUMBER_ANDROID_TEST_CLASS, testClass);
+        }
+        //there is no need to scan all classes - we can fake this execution to be for single class
+        //because we delegate test execution to CucumberJUnitRunner
+        bundle.putString(ARGUMENT_ORCHESTRATOR_CLASS, CucumberJUnitRunnerBuilder.class.getName());
+
+        arguments = bundle;
+
+        super.onCreate(bundle);
+    }
+
+    public Bundle getArguments() {
+        return arguments;
+    }
+}

cucumber-android/src/main/java/cucumber/runtime/android/AndroidResourceLoader.java

@@ -57,9 +57,12 @@ private void addResourceRecursive(final List<Resource> resources,
             return;
         }
 
-        for (final String name : assetManager.list(schemeSpecificPart)) {
-            String subPath = String.format(RESOURCE_PATH_FORMAT, schemeSpecificPart, name);
-            addResourceRecursive(resources, assetManager, URI.create(subPath), suffix);
+        String[] list = assetManager.list(schemeSpecificPart);
+        if (list != null) {
+            for (String name : list) {
+                String subPath = String.format(RESOURCE_PATH_FORMAT, path.toString(), name);
+                addResourceRecursive(resources, assetManager, URI.create(subPath), suffix);
+            }
         }
     }
 }

cucumber-android/src/main/java/cucumber/runtime/android/CoverageDumper.java

@@ -92,7 +92,7 @@ public void requestDump(final Bundle bundle) {
     }
 
     private void reportError(final Bundle results, final Exception e) {
-        Log.e(CucumberExecutor.TAG, LOG_ERROR_OUTPUT, e);
+        Log.e(CucumberJUnitRunner.TAG, LOG_ERROR_OUTPUT, e);
         appendNewLineToResultStream(results, RESULT_STREAM_ERROR_OUTPUT);
     }