fix failing tests after recent changes, introduce private API so that we can determine the bitness of the current process

Author: petekanev

runtime/src/main/java/com/tns/Runtime.java

@@ -41,7 +41,10 @@ public class Runtime
 
 	private native void passUncaughtExceptionToJsNative(int runtimeId, Throwable ex, String stackTrace);
 
-	private native void ClearStartupData(int runtimeId);
+	private native void clearStartupData(int runtimeId);
+
+	// Used to determine the bitness of the current process (32 vs 64)
+	public static native int getPointerSize();
 
 	void passUncaughtExceptionToJs(Throwable ex, String stackTrace)
 	{
@@ -231,7 +234,7 @@ private void init(Logger logger, Debugger debugger, String appName, File runtime
 			jsDebugger.start();
 		}
 
-		ClearStartupData(getRuntimeId()); // It's safe to delete the data after the V8 debugger is initialized
+		clearStartupData(getRuntimeId()); // It's safe to delete the data after the V8 debugger is initialized
 
 		if (logger.isEnabled())
 		{

runtime/src/main/jni/com_tns_Runtime.cpp

@@ -301,7 +301,7 @@ extern "C" void Java_com_tns_Runtime_passUncaughtExceptionToJsNative(JNIEnv *env
 	}
 }
 
-extern "C" void Java_com_tns_Runtime_ClearStartupData(JNIEnv *env, jobject obj, jint runtimeId)
+extern "C" void Java_com_tns_Runtime_clearStartupData(JNIEnv *env, jobject obj, jint runtimeId)
 {
 	auto runtime = TryGetRuntime(runtimeId);
 	if (runtime == nullptr)
@@ -311,3 +311,8 @@ extern "C" void Java_com_tns_Runtime_ClearStartupData(JNIEnv *env, jobject obj,
 
 	runtime->ClearStartupData(env, obj);
 }
+
+extern "C" jint Java_com_tns_Runtime_getPointerSize(JNIEnv *env, jobject obj)
+{
+	return sizeof(void*);
+}

test-app/app/src/main/assets/app/tests/exceptionHandlingTests.js

@@ -325,7 +325,6 @@ describe("Tests exception handling ", function () {
 	});
 
 	it("should successfully catch syntax errors", function () {
-
 	    var exceptionCaught = false;
 	    var errMsg;
 	    try {
@@ -336,8 +335,8 @@ describe("Tests exception handling ", function () {
 	    }
 	    expect(exceptionCaught).toBe(true);
 	    expect(errMsg).toContain("Cannot compile /data/data/com.tns.android_runtime_testapp/files/app/tests/syntaxErrors.js");
-	    expect(errMsg).toContain("SyntaxError: Block-scoped declarations (let, const, function, class) not yet supported outside strict mode");
-	    expect(errMsg).toContain("File: \"/data/data/com.tns.android_runtime_testapp/files/app/tests/syntaxErrors.js, line: 4, column: 0");
+	    expect(errMsg).toContain("SyntaxError: Unexpected token =");
+	    expect(errMsg).toContain("File: \"/data/data/com.tns.android_runtime_testapp/files/app/tests/syntaxErrors.js, line: 3, column: 10");
 
 
 

test-app/app/src/main/assets/app/tests/syntaxErrors.js

@@ -1,4 +1,3 @@
 //this file is required
 
-var b = 5;
-let a = 5;
+var class = "JavaScript class"

test-app/app/src/main/assets/app/tests/testNativeModules.js

@@ -1,16 +1,16 @@
 describe("Tests native modules)", function () {
-	
+
 	it("should load native module", function () {
 		var x = 12;
 		var y = 34;
 
 		var arch;
-		var sysArch = java.lang.System.getProperty("os.arch");
+		var sysArch = java.lang.System.getProperty("os.arch"); // ro.product.cpu.abi
 		var lcArch = sysArch.toLowerCase();
 		if (lcArch.indexOf("arm") > -1) {
 			arch = "arm";
 		} else if (lcArch.indexOf("aarch64") > -1) {
-			arch = "arm64";
+		    arch = (com.tns.Runtime.getPointerSize() == 4) ? "arm" : "arm64";
 		} else if (lcArch.indexOf("i686") > -1) {
 			arch = "x86";
 		} else {
@@ -23,5 +23,4 @@ describe("Tests native modules)", function () {
 
 		expect(sum).toBe(46);
 	});
-
 });