fixed #180 (calling non existing default constructor)

removed asserts for failed registered instances so runtime does not fail
NativeScript · Oct 1, 2015 · cb69661 · cb69661
1 parent 0a77c8a
commit cb69661
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 20 deletions.
diff --git a/src/jni/MetadataNode.cpp b/src/jni/MetadataNode.cpp
@@ -510,8 +510,6 @@ void MetadataNode::InnerClassConstructorCallback(const v8::FunctionCallbackInfo<
 
 	string fullClassName = CreateFullClassName(className, extendName);
 	bool success = NativeScriptRuntime::RegisterInstance(thiz, fullClassName, argWrapper, outerThis, false);
-
-	assert(success);
 }
 
 void MetadataNode::InnerClassAccessorGetterCallback(Local<String> property, const PropertyCallbackInfo<Value>& info)
@@ -717,8 +715,6 @@ void MetadataNode::ExtendedClassConstructorCallback(const v8::FunctionCallbackIn
 	string fullClassName = extData->fullClassName;
 
 	bool success = NativeScriptRuntime::RegisterInstance(thiz, fullClassName, argWrapper, implementationObject, false);
-
-	assert(success);
 }
 
 
@@ -775,8 +771,6 @@ void MetadataNode::InterfaceConstructorCallback(const v8::FunctionCallbackInfo<v
 	ArgsWrapper argWrapper(info, ArgType::Interface, Local<Object>());
 
 	auto success = NativeScriptRuntime::RegisterInstance(thiz, fullClassName, argWrapper, implementationObject, true);
-
-	assert(success);
 }
 
 void MetadataNode::ClassConstructorCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
@@ -796,8 +790,6 @@ void MetadataNode::ClassConstructorCallback(const v8::FunctionCallbackInfo<v8::V
 
 	string fullClassName = CreateFullClassName(className, extendName);
 	bool success = NativeScriptRuntime::RegisterInstance(thiz, fullClassName, argWrapper, outerThis, false);
-
-	//assert(success);
 }
 
 void MetadataNode::MethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info)

diff --git a/src/src/com/tns/MethodResolver.java b/src/src/com/tns/MethodResolver.java
@@ -481,6 +481,12 @@ else if (assignTo.equals(char.class))
 	public static boolean convertConstructorArgs(Constructor<?> ctor, Object[] args)
 	{
 		boolean success = true;
+
+		if (ctor == null)
+		{
+			success = false;
+			return  success;
+		}
 
 		Class<?>[] paramTypes;
 		if (constructorParamTypeCache.containsKey(ctor))

diff --git a/src/src/com/tns/Platform.java b/src/src/com/tns/Platform.java
@@ -289,15 +289,18 @@ private static Object createInstance(Object[] args, int objectId, int constructo
 		{
 			StringBuilder builder = new StringBuilder();
 			builder.append(constructorId + "(");
-			for (Object arg : args)
+			if (args != null)
 			{
-				if (arg != null)
+				for (Object arg : args)
 				{
-					builder.append(arg.toString() + ", ");
-				}
-				else
-				{
-					builder.append("null, ");
+					if (arg != null)
+					{
+						builder.append(arg.toString() + ", ");
+					}
+					else
+					{
+						builder.append("null, ");
+					}
 				}
 			}
 			builder.append(")");

diff --git a/src/src/com/tns/Util.java b/src/src/com/tns/Util.java
@@ -57,6 +57,7 @@ static boolean runPlugin(Logger logger, Context context)
 		{
 			if (logger.isEnabled()) e.printStackTrace();
 		}
+
 		try
 		{
 			Class<?> liveSyncPluginClass = Class.forName(pluginClassName);

diff --git a/test-app/assets/app/mainpage.js b/test-app/assets/app/mainpage.js
@@ -1,5 +1,5 @@
 __disableVerboseLogging();
-
+__log("starting tests");
 require("./tests/testWeakRef"); 
 require("./tests/tests");
 require("./tests/testMethodResolution");
@@ -26,9 +26,9 @@ var MainActivity = {
     	var k = this.toString();
     	__log("this.toString " + k);
     	this.super.onCreate(bundle);
-    	//this.super.onCreate(null);
 
     	require("./tests/testsWithContext").run(this);
+
     	execute(); //run jasmine
 
     	var layout = new android.widget.LinearLayout(this);

diff --git a/test-app/assets/app/tests/testIfAbleToRunExternalFile.js b/test-app/assets/app/tests/testIfAbleToRunExternalFile.js
@@ -1,9 +1,9 @@
 describe("Tests running external files", function () {
 
 	it("When_file_outside_the_project_folder_is_required_it_should_fail", function () {
-
-		__log("When_file_outside_the_project_folder_is_required_it_should_throw_IllegalAccessException"); 
-
+	
+		__log("TEST: When_file_outside_the_project_folder_is_required_it_should_fail"); 
+	
 		var illegalAccesExceptionCaught = false;
 		var fileSeparator = "/";
 		var nonExistingFileName = "nonExistingFile";
@@ -26,4 +26,5 @@ describe("Tests running external files", function () {
 
 		expect(exceptionCaught).toBe(true);
 	});
+
 });
diff --git a/test-app/assets/app/tests/tests.js b/test-app/assets/app/tests/tests.js
@@ -1863,4 +1863,27 @@ describe("Tests ", function () {
 
 		expect(value123).toBe(123);
 	});
+
+
+	it("When_calling_non_existent_ctor_it_should_fail", function () {
+
+		__log("TEST: When_calling_non_existent_ctor_it_should_fail: Start"); 
+
+		try
+		{
+			var textView = android.widget.TextView;
+			var MyTextView = textView.extend({
+
+			});
+
+			var my = new MyTextView();
+		}
+		catch(e)
+		{
+			exceptionCaught = true;
+		}
+
+		expect(exceptionCaught).toBe(true);
+	});
+
 });