diff -r 2adac52f955e -r e41809be6106 vm/src/test/java/org/apidesign/vm4brwsr/ClassTest.java --- a/vm/src/test/java/org/apidesign/vm4brwsr/ClassTest.java Sat Dec 29 19:46:09 2012 +0100 +++ b/vm/src/test/java/org/apidesign/vm4brwsr/ClassTest.java Thu Jan 03 11:20:40 2013 +0100 @@ -48,25 +48,25 @@ assertEquals(Classes.classForInstance(), "java.io.IOException"); } @Test public void jsInstanceName() throws Exception { - assertExec("I/O name", Classes.class, "classForInstance__Ljava_lang_String_2", "java.io.IOException"); + assertExec("I/O name", Classes.class, "classForInstance__s", "java.io.IOException"); } @Test public void javaName() throws Exception { assertEquals(Classes.name(), "java.io.IOException"); } @Test public void jsName() throws Exception { - assertExec("I/O name", Classes.class, "name__Ljava_lang_String_2", "java.io.IOException"); + assertExec("I/O name", Classes.class, "name__s", "java.io.IOException"); } @Test public void javaSimpleName() throws Exception { assertEquals(Classes.simpleName(), "IOException"); } @Test public void jsGetsSimpleName() throws Exception { - assertExec("I/O simple name", Classes.class, "simpleName__Ljava_lang_String_2", "IOException"); + assertExec("I/O simple name", Classes.class, "simpleName__s", "IOException"); } @Test public void javaCanonicalName() { assertEquals(Classes.canonicalName(), "java.io.IOException"); } @Test public void jsCanonicalName() throws Exception { - assertExec("I/O simple name", Classes.class, "canonicalName__Ljava_lang_String_2", "java.io.IOException"); + assertExec("I/O simple name", Classes.class, "canonicalName__s", "java.io.IOException"); } @Test public void javaNewInstance() throws Exception { assertTrue(Classes.newInstance()); @@ -80,7 +80,7 @@ ); } @Test public void jsNoNewInstance() throws Exception { - assertExec("Check problems with new instance", Classes.class, "newInstanceNoPubConstructor__Ljava_lang_String_2", + assertExec("Check problems with new instance", Classes.class, "newInstanceNoPubConstructor__s", "java.lang.InstantiationException:java.lang.Float" ); } @@ -88,17 +88,17 @@ assertExec("Check class annotation", Classes.class, "getMarker__I", Double.valueOf(10)); } @Test public void jsStringAnnotation() throws Exception { - assertExec("Check class annotation", Classes.class, "getNamer__Ljava_lang_String_2Z", "my text", true); + assertExec("Check class annotation", Classes.class, "getNamer__sZ", "my text", true); } @Test public void jsStringAnnotationFromArray() throws Exception { - assertExec("Check class annotation", Classes.class, "getNamer__Ljava_lang_String_2Z", "my text", false); + assertExec("Check class annotation", Classes.class, "getNamer__sZ", "my text", false); } @Test public void javaInvokeMethod() throws Exception { assertEquals(Classes.reflectiveMethodCall(true, "name"), "java.io.IOException", "Calls the name() method via reflection"); } @Test public void jsInvokeMethod() throws Exception { assertExec("Calls the name() method via reflection", Classes.class, - "reflectiveMethodCall__Ljava_lang_Object_2ZLjava_lang_String_2", + "reflectiveMethodCall__Ljava_lang_Object_2Zs", "java.io.IOException", true, "name" ); } @@ -107,19 +107,19 @@ } @Test public void jsFindMethod() throws Exception { assertExec("Calls the name() method via reflection", Classes.class, - "reflectiveMethodCall__Ljava_lang_Object_2ZLjava_lang_String_2", + "reflectiveMethodCall__Ljava_lang_Object_2Zs", "java.io.IOException", false, "name" ); } @Test public void primitiveReturnType() throws Exception { assertExec("Tries to get an integer via reflection", Classes.class, - "primitiveType__Ljava_lang_String_2Ljava_lang_String_2", + "primitiveType__ss", Classes.primitiveType("primitive"), "primitive" ); } @Test public void primitiveBoolReturnType() throws Exception { assertExec("Tries to get an integer via reflection", Classes.class, - "primitiveType__Ljava_lang_String_2Ljava_lang_String_2", + "primitiveType__ss", Classes.primitiveType("primitiveB"), "primitiveB" ); } @@ -128,33 +128,33 @@ } @Test public void jsAnnotatedMethod() throws Exception { assertExec("Calls the name() method via reflection", Classes.class, - "reflectiveMethodCall__Ljava_lang_Object_2ZLjava_lang_String_2", + "reflectiveMethodCall__Ljava_lang_Object_2Zs", "java.io.IOException", false, null ); } @Test public void jsClassParam() throws Exception { assertExec("Calls the nameOfIO()", Classes.class, - "nameOfIO__Ljava_lang_String_2", + "nameOfIO__s", "java.io.IOException" ); } @Test public void noInterface() throws Exception { assertExec("Calls Class.isInterface", Classes.class, - "isInterface__ZLjava_lang_String_2", + "isInterface__Zs", 0.0, "java.lang.String" ); } /* @Test public void isInterface() throws Exception { assertExec("Calls Class.isInterface", Classes.class, - "isInterface__ZLjava_lang_String_2", + "isInterface__Zs", 1.0, "java.lang.Runnable" ); } */ @Test public void integerType() throws Exception { assertExec("Computes the type", Classes.class, - "intType__Ljava_lang_String_2", + "intType__s", Classes.intType() ); }