add tests for issue #72

Author: Mihail Slavchev

src/jni/FieldAccessor.cpp

@@ -109,8 +109,8 @@ Handle<Value> FieldAccessor::GetJavaField(const Handle<Object>& target, FieldCal
 				JniLocalRef str(env.NewString(&result, 1));
 				jboolean bol = true;
 				const char* resP = env.GetStringUTFChars(str, &bol);
-				env.ReleaseStringUTFChars(str, resP);
 				fieldResult = handleScope.Escape(ConvertToV8String(resP, 1));
+				env.ReleaseStringUTFChars(str, resP);
 				break;
 			}
 			case 'S': //short

src/jni/JsArgToArrayConverter.cpp

@@ -293,8 +293,8 @@ bool JsArgToArrayConverter::ConvertArg(const Handle<Value>& arg, int index)
 			jchar value = '\0';
 			if (hidden->IsString())
 			{
-				string value = ConvertToString(hidden->ToString());
-				value = (jchar)value[0];
+				string str = ConvertToString(hidden->ToString());
+				value = (jchar)str[0];
 			}
 
 			jclass clazz = env.FindClass("java/lang/Character");

src/jni/NativeScriptRuntime.cpp

@@ -297,8 +297,8 @@ void NativeScriptRuntime::CallJavaMethod(const Handle<Object>& caller, const str
 			JniLocalRef str(env.NewString(&result, 1));
 			jboolean bol = true;
 			const char* resP = env.GetStringUTFChars(str, &bol);
-			env.ReleaseStringUTFChars(str, resP);
 			args.GetReturnValue().Set(ConvertToV8String(resP, 1));
+			env.ReleaseStringUTFChars(str, resP);
 			break;
 		}
 		case 'S': //short

test-app/assets/app/mainpage.js

@@ -16,6 +16,7 @@ require("./tests/testIfAbleToRunExternalFile");
 require("./tests/finalFieldsSetTests");
 require("./tests/extendedClassesTests");
 require("./tests/extendClassNameTests");
+require("./tests/testJniReferenceLeak");
 
 
 var MainActivity = {
@@ -54,11 +55,14 @@ app.init({
 	getActivity: function(activity) {
 		var intent = activity.getIntent();
 		__log("intent=" + intent)
-		if (intent.getAction() == android.content.Intent.ACTION_MAIN) {
+		var action = intent.getAction();
+		__log("action=" + action)
+		return MainActivity;
+		if (action == android.content.Intent.ACTION_MAIN) {
 			return MainActivity;
 		}
 		else {
-			fail("Unknown action");
+			__exit("Unknown action");
 		}
 	},
 

test-app/assets/app/tests/testJniReferenceLeak.js

@@ -0,0 +1,99 @@
+describe("Tests JNI reference leak", function () {
+	
+//	var myCustomEquality = function(first, second) {
+//		return first == second;
+//	};
+//	
+//	beforeEach(function() {
+//		jasmine.addCustomEqualityTester(myCustomEquality);
+//	});
+	
+	it("test_if_method_param_marshalling_leaks", function () {
+		
+		var test = new com.tns.tests.JniReferenceLeakTest(null);
+		
+		var N = 10000;
+		
+		for (var n=0; n<N; n++)
+		{
+			var c = 'x';
+			expect(test.echoChar(char(c))).toBe(c);
+			
+			var i = 5;
+			expect(test.echoInt(i)).toBe(i);
+	
+			var s = "hello";
+			expect(test.echoString(s)).toBe(s);
+			
+			var o = new java.lang.Object();
+			expect(test.echoObject(o)).toBe(o);
+		}
+		
+		expect(n).toBe(N);
+	});
+	
+	it("test_if_field_access_marshalling_leaks", function () {
+		
+		var test = new com.tns.tests.JniReferenceLeakTest(null);
+		
+		var N = 10000;
+		
+		for (var n=0; n<N; n++)
+		{
+			var c = 'x';
+			test.charField = c;
+			expect(test.charField).toBe(c);
+			
+			test.intField = n;
+			expect(test.intField).toBe(n);
+	
+			var s = "hello" + n;
+			test.stringField = s;
+			expect(test.stringField).toBe(s);
+			
+			var o = new java.lang.Object();
+			test.objectField = o;
+			expect(test.objectField).toBe(o);
+		}
+		
+		expect(n).toBe(N);
+	});
+	
+	it("test_if_callback_parameter_marshalling_leaks", function () {
+		
+		var p = new com.tns.tests.JniReferenceLeakTest.Processor({
+			echoChar: function(c) { return char(c); },
+			echoInt: function(i) { return i; },
+			echoString: function(s) { return s; },
+			echoObject: function(o) { return o; },
+			echoCharArray: function(arr) { return arr; },
+			echoIntArray: function(arr) { return arr; },
+			echoStringArray: function(arr) { return arr; },
+			echoObjectArray: function(arr) { return arr; }
+		});
+		
+		
+		var test = new com.tns.tests.JniReferenceLeakTest(p);
+		
+		var N = 10000;
+		
+		for (var n=0; n<N; n++)
+		{
+			var c = 'x';
+			expect(test.triggerEchoChar(char(c))).toBe(c);
+			
+			var i = 5;
+			expect(test.triggerEchoInt(i)).toBe(i);
+	
+			var s = "hello";
+			expect(test.triggerEchoString(s)).toBe(s);
+			
+			var o = new java.lang.Object();
+			expect(test.triggerEchoObject(o)).toBe(o);
+		}
+		
+		expect(n).toBe(N);
+	});
+
+
+});

test-app/assets/metadata/treeNodeStream.dat

@@ -0,0 +1,126 @@
+package com.tns.tests;
+
+public class JniReferenceLeakTest {
+	
+	public static interface Processor
+	{
+		char echoChar(char c);
+		int echoInt(int i);
+		String echoString(String s);
+		Object echoObject(Object o);
+		char[] echoCharArray(char[] arr);
+		int[] echoIntArray(int[] arr);
+		String[] echoStringArray(String[] arr);
+		Object[] echoObjectArray(Object[] arr);
+	}
+	
+	private final Processor processor;
+	
+	public JniReferenceLeakTest(Processor processor)
+	{
+		this.processor = processor;
+	}
+	
+	public byte byteField;
+	public short shortField;
+	public int intField;
+	public long longField;
+	public float floatField;
+	public double doubleField;
+	public char charField;
+	public boolean booleanField;
+	public String stringField;
+	public Object objectField;
+	
+	public char[] charArray;
+	public int[] intArray;
+	public String[] stringArray;
+	public Object[] objectArray;
+	
+	public char[][] charArray2;
+	public int[][] intArray2;
+	public String[][] stringArray2;
+	public Object[][] objectArray2;
+	
+	public char echoChar(char c)
+	{
+		return c;
+	}
+	
+	public int echoInt(int i)
+	{
+		return i;
+	}
+	
+	public String echoString(String s)
+	{
+		return s;
+	}
+	
+	public Object echoObject(Object o)
+	{
+		return o;
+	}
+	
+	public char[] echoCharArray(char[] arr)
+	{
+		return arr;
+	}
+	
+	public int[] echoIntArray(int[] arr)
+	{
+		return arr;
+	}
+	
+	public String[] echoStringArray(String[] arr)
+	{
+		return arr;
+	}
+	
+	public Object[] echoObjectArray(Object[] arr)
+	{
+		return arr;
+	}
+	
+	//
+	
+	public char triggerEchoChar(char c)
+	{
+		return processor.echoChar(c);
+	}
+	
+	public int triggerEchoInt(int i)
+	{
+		return processor.echoInt(i);
+	}
+	
+	public String triggerEchoString(String s)
+	{
+		return processor.echoString(s);
+	}
+	
+	public Object triggerEchoObject(Object o)
+	{
+		return processor.echoObject(o);
+	}
+	
+	public char[] triggerEchoCharArray(char[] arr)
+	{
+		return processor.echoCharArray(arr);
+	}
+	
+	public int[] triggerEchoIntArray(int[] arr)
+	{
+		return processor.echoIntArray(arr);
+	}
+	
+	public String[] triggerEchoStringArray(String[] arr)
+	{
+		return processor.echoStringArray(arr);
+	}
+	
+	public Object[] triggerEchoObjectArray(Object[] arr)
+	{
+		return processor.echoObjectArray(arr);
+	}
+}