Merge pull request #100 from NativeScript/plamen5kov/fix_binding_generator_tests

fixed errors in binding generator tests

Author: Plamen5kov

binding-generator/Tester/src/com/tns/runtimebindinggenerator/tester/RuntimeTests.java

@@ -40,8 +40,8 @@ public class RuntimeTests extends AndroidTestCase
 	private ApplicationWriter aw;
 	private Dump dump;
 	private File optimizedDexOutputPath;
+	public static final char CLASS_NAME_LOCATION_SEPARATOR = '_';
 
-	
 	public RuntimeTests()
 	{
 	}
@@ -120,7 +120,7 @@ private TargetObject loadProxy(File proxyFile, TargetObject implementationObject
 		Platform.implementationObject = implementationObject;	
 
 		DexClassLoader dexClassLoader = new DexClassLoader(proxyFile.getAbsolutePath(), optimizedDexOutputPath.getAbsolutePath(), null, getContext().getClassLoader());
-		Class<?> clazz = dexClassLoader.loadClass("com.tns.gen.com.proxy.TargetObject-0");
+		Class<?> clazz = dexClassLoader.loadClass("com.tns.gen.com.proxy.TargetObject"+ CLASS_NAME_LOCATION_SEPARATOR + "0");
 		assertNotNull("Error loading proxy class com.tns.gen.com.proxy.TargetObject", clazz);
 
 		Constructor<?> ctor = clazz.getConstructor();
@@ -133,7 +133,7 @@ private <T> T loadAnyProxy(File proxyFile, T implementationObject) throws Except
 		Platform.implementationObject = (Object)implementationObject;	
 
 		DexClassLoader dexClassLoader = new DexClassLoader(proxyFile.getAbsolutePath(), optimizedDexOutputPath.getAbsolutePath(), null, getContext().getClassLoader());
-		Class<?> clazz = dexClassLoader.loadClass("com.tns.gen." + implementationObject.getClass().getSuperclass().getCanonicalName() + "-0");
+		Class<?> clazz = dexClassLoader.loadClass("com.tns.gen." + implementationObject.getClass().getSuperclass().getCanonicalName() + CLASS_NAME_LOCATION_SEPARATOR + "0");
 		assertNotNull("Error loading proxy class com.tns.gen.com.proxy.Button1", clazz);
 
 		Constructor<?> ctor = clazz.getConstructor();
@@ -144,7 +144,7 @@ private <T> T loadAnyProxy(File proxyFile, T implementationObject) throws Except
 	private <T> T loadAnyProxyByClass(File proxyFile, Class<?> proxyClass) throws Exception
 	{
 		DexClassLoader dexClassLoader = new DexClassLoader(proxyFile.getAbsolutePath(), optimizedDexOutputPath.getAbsolutePath(), null, getContext().getClassLoader());
-		Class<?> clazz = dexClassLoader.loadClass("com.tns.gen." + proxyClass.getName().replace('$', '_') + "-0");
+		Class<?> clazz = dexClassLoader.loadClass("com.tns.gen." + proxyClass.getName().replace('$', '_')  + CLASS_NAME_LOCATION_SEPARATOR + "0");
 		assertNotNull("Error loading proxy class com.tns.gen.com.proxy.Button1", clazz);
 
 		if (!proxyClass.getName().contains("ViewGroup"))
@@ -168,7 +168,7 @@ private Button1 loadButton1Proxy(File proxyFile, Button1 implementationObject) t
 		Platform.implementationObject = implementationObject;	
 
 		DexClassLoader dexClassLoader = new DexClassLoader(proxyFile.getAbsolutePath(), optimizedDexOutputPath.getAbsolutePath(), null, getContext().getClassLoader());
-		Class<?> clazz = dexClassLoader.loadClass("com.tns.gen.com.proxy.Button1-0");
+		Class<?> clazz = dexClassLoader.loadClass("com.tns.gen.com.proxy.Button1" + CLASS_NAME_LOCATION_SEPARATOR + "0");
 		assertNotNull("Error loading proxy class com.tns.gen.com.proxy.Button1", clazz);
 
 		Constructor<?> ctor = clazz.getConstructor();
@@ -181,7 +181,7 @@ private TargetObject.TargetInterface loadInterfaceProxy(File proxyFile, TargetOb
 		Platform.implementationObject = implementationObject;	
 
 		DexClassLoader dexClassLoader = new DexClassLoader(proxyFile.getAbsolutePath(), optimizedDexOutputPath.getAbsolutePath(), null, getContext().getClassLoader());
-		Class<?> clazz = dexClassLoader.loadClass("com.tns.gen.com.proxy.TargetObject_TargetInterface-0");
+		Class<?> clazz = dexClassLoader.loadClass("com.tns.gen.com.proxy.TargetObject_TargetInterface" + CLASS_NAME_LOCATION_SEPARATOR + "0");
 		assertNotNull("Error loading proxy class com.tns.gen.com.proxy.TargetObject", clazz);
 
 		Constructor<?> ctor = clazz.getConstructor();