fix(android): stabilize runtime test harness

Author: DjDeveloperr

platforms/android/test-app/app/build.gradle

@@ -225,6 +225,7 @@ android {
 
     compileSdk computeCompileSdkVersion()
     buildToolsVersion = computeBuildToolsVersion()
+    ndkVersion = project.findProperty("ndkVersion") ?: "27.1.12297006"
 
     defaultConfig {
         def manifest = new XmlSlurper().parse(file(android.sourceSets.main.manifest.srcFile))

platforms/android/test-app/app/src/main/assets/app/Infrastructure/Jasmine/jasmine-2.0.1/boot.js

@@ -137,7 +137,7 @@ var TerminalReporter = require('../jasmine-reporters/terminal_reporter').Termina
     verbosity: 5
   }));
 
-  // env.addReporter(new JUnitXmlReporter());
+  env.addReporter(new JUnitXmlReporter());
 
   env.specFilter = function(spec) {
     return true;

platforms/android/test-app/app/src/main/assets/app/Infrastructure/Jasmine/jasmine-reporters/junit_reporter.js

@@ -206,6 +206,12 @@
 
             // Attempt writing with each possible environment.
             // Track errors in case no write succeeds
+            try {
+                if (typeof __JUnitSaveResults === "function") {
+                    __JUnitSaveResults(text);
+                    return;
+                }
+            } catch (f) { errors.push('  tns-android attempt: ' + f.message); }
             try {
                 phantomWrite(path, filename, text);
                 return;
@@ -214,10 +220,6 @@
                 nodeWrite(path, filename, text);
                 return;
             } catch (f) { errors.push('  NodeJS attempt: ' + f.message); }
-            try {
-                __JUnitSaveResults(text);
-                return;
-            } catch (f) { errors.push('  tns-android attempt: ' + f.message); }
 
             // If made it here, no write succeeded.  Let user know.
             log("Warning: writing junit report failed for '" + path + "', '" +

platforms/android/test-app/app/src/main/assets/app/MyActivity.js

@@ -31,7 +31,7 @@ var MyActivity = (function (_super) {
     _super.prototype.onCreate.call(this, bundle);
     require('./tests/testsWithContext').run(this);
     //run jasmine
-//    execute();
+    execute();
     var layout = new android.widget.LinearLayout(this);
     layout.setOrientation(1);
     this.setContentView(layout);

platforms/android/test-app/runtests.gradle

@@ -31,6 +31,21 @@ def getBuildArguments = { ->
         arguments.add("./gradlew")
     }
     arguments.add(":app:installDebug")
+    if (project.hasProperty("engine")) {
+        arguments.add("-Pengine=${engine}")
+        if (!project.hasProperty("ns_engine")) {
+            arguments.add("-Pns_engine=${engine}")
+        }
+    }
+    if (project.hasProperty("ns_engine")) {
+        arguments.add("-Pns_engine=${ns_engine}")
+    }
+    if (project.hasProperty("ndkDirectory")) {
+        arguments.add("-PndkDirectory=${ndkDirectory}")
+    }
+    if (project.hasProperty("ndkVersion")) {
+        arguments.add("-PndkVersion=${ndkVersion}")
+    }
     if (onlyX86) {
         arguments.add("-PonlyX86")
     }
@@ -50,14 +65,26 @@ task installApk(type: Exec) {
     }
 }
 
+task clearInstalledAppData(type: Exec) {
+    doFirst {
+        println "Clearing test application data"
+
+        if (isWinOs) {
+            commandLine "cmd", "/c", "adb", runOnDeviceOrEmulator, "shell", "pm", "clear", "com.tns.testapplication"
+        } else {
+            commandLine "adb", runOnDeviceOrEmulator, "shell", "pm", "clear", "com.tns.testapplication"
+        }
+    }
+}
+
 task runAdbAsRoot(type: Exec) {
     doFirst {
         println "Running adb as root"
 
         if (isWinOs) {
-            commandLine "cmd", "/c", "adb", "-e", "root"
+            commandLine "cmd", "/c", "adb", runOnDeviceOrEmulator, "root"
         } else {
-            commandLine "adb", "-e", "root"
+            commandLine "adb", runOnDeviceOrEmulator, "root"
         }
         sleep(10 * 1000) // wait 10s to make sure adb properly restarts, otherwise error: closed might happen on next command
     }
@@ -68,9 +95,9 @@ task deletePreviousResultXml(type: Exec) {
         println "Removing previous android_unit_test_results.xml"
 
         if (isWinOs) {
-            commandLine "cmd", "/c", "adb", runOnDeviceOrEmulator, "-e", "shell", "rm", "-rf", "/data/data/com.tns.testapplication/android_unit_test_results.xml"
+            commandLine "cmd", "/c", "adb", runOnDeviceOrEmulator, "shell", "rm", "-rf", "/data/data/com.tns.testapplication/android_unit_test_results.xml"
         } else {
-            commandLine "adb", runOnDeviceOrEmulator, "-e", "shell", "rm", "-rf", "/data/data/com.tns.testapplication/android_unit_test_results.xml"
+            commandLine "adb", runOnDeviceOrEmulator, "shell", "rm", "-rf", "/data/data/com.tns.testapplication/android_unit_test_results.xml"
         }
     }
 }
@@ -80,9 +107,9 @@ task startInstalledApk(type: Exec) {
         println "Starting test application"
 
         if (isWinOs) {
-            commandLine "cmd", "/c", "adb", runOnDeviceOrEmulator, "-e", "shell", "am", "start", "-n", "com.tns.testapplication/com.tns.NativeScriptActivity", "-a", "android.intent.action.MAIN", "-c", "android.intent.category.LAUNCHER"
+            commandLine "cmd", "/c", "adb", runOnDeviceOrEmulator, "shell", "am", "start", "-n", "com.tns.testapplication/com.tns.NativeScriptActivity", "-a", "android.intent.action.MAIN", "-c", "android.intent.category.LAUNCHER"
         } else {
-            commandLine "adb", runOnDeviceOrEmulator, "-e", "shell", "am", "start", "-n", "com.tns.testapplication/com.tns.NativeScriptActivity", "-a", "android.intent.action.MAIN", "-c", "android.intent.category.LAUNCHER"
+            commandLine "adb", runOnDeviceOrEmulator, "shell", "am", "start", "-n", "com.tns.testapplication/com.tns.NativeScriptActivity", "-a", "android.intent.action.MAIN", "-c", "android.intent.category.LAUNCHER"
         }
     }
 }
@@ -133,7 +160,8 @@ task runtests {
 runAdbAsRoot.dependsOn(waitForEmulatorToStart)
 deletePreviousResultXml.dependsOn(runAdbAsRoot)
 installApk.dependsOn(deletePreviousResultXml)
-startInstalledApk.dependsOn(installApk)
+clearInstalledAppData.dependsOn(installApk)
+startInstalledApk.dependsOn(clearInstalledAppData)
 createDistFolder.dependsOn(startInstalledApk)
 waitForUnitTestResultFile.dependsOn(createDistFolder)
 copyResultToDist.dependsOn(waitForUnitTestResultFile)
@@ -142,4 +170,4 @@ verifyResults.dependsOn(runtests)
 
 task runtestsAndVerifyResults {
     dependsOn verifyResults
-}
+}

platforms/android/test-app/runtime/build.gradle

@@ -101,11 +101,7 @@ android {
         }
     }
 
-    if (hasNdkVersion) {
-        ndkVersion ndkVersion
-    } else {
-        ndkVersion defaultNdkVersion
-    }
+    ndkVersion = project.findProperty("ndkVersion") ?: defaultNdkVersion
 
     defaultConfig {
         minSdkVersion NS_DEFAULT_MIN_SDK_VERSION as int

platforms/android/test-app/tools/try_to_find_test_result_file.js

@@ -25,8 +25,10 @@ function closeProcessAfter(timeout) {
 }
 
 function tryToGetFile() {
-	var checkApp = checkIfAppIsRunning("adb " + runOnDeviceOrEmulator + " -e shell \"ps | grep com.tns.testapplication\"", checkIfProcessIsRunning);
-	pullfile = execFindFile("adb " + runOnDeviceOrEmulator + " -e pull /data/data/com.tns.testapplication/android_unit_test_results.xml", checkIfFileExists);
+	var adbTarget = "adb " + runOnDeviceOrEmulator;
+	pullfile = execFindFile(adbTarget + " pull /data/data/com.tns.testapplication/android_unit_test_results.xml", function (err, stout, stderr) {
+		checkIfFileExists(err, stout, stderr, adbTarget);
+	});
 	pullfile.stdout.pipe(process.stdout, { end: false });
 	pullfile.stderr.pipe(process.stderr, { end: false });
 }
@@ -42,7 +44,7 @@ function checkIfProcessIsRunning(err, stdout, stderr) {
 
 }
 
-function checkIfFileExists(err, stout, stderr) {
+function checkIfFileExists(err, stout, stderr, adbTarget) {
 
 	//if you find file in /data/data/com.tns.testapplication exit process
 	if (!err) {
@@ -56,5 +58,7 @@ function checkIfFileExists(err, stout, stderr) {
 			console.log('Tests results file not found!');
 			process.exit(1);
 		}
+
+		checkIfAppIsRunning(adbTarget + " shell \"pidof com.tns.testapplication || ps -A | grep com.tns.testapplication\"", checkIfProcessIsRunning);
 	}
 }