1.1 --- a/vm/src/test/java/org/apidesign/vm4brwsr/ClassTest.java Sat Dec 29 19:46:09 2012 +0100
1.2 +++ b/vm/src/test/java/org/apidesign/vm4brwsr/ClassTest.java Thu Jan 03 11:20:40 2013 +0100
1.3 @@ -48,25 +48,25 @@
1.4 assertEquals(Classes.classForInstance(), "java.io.IOException");
1.5 }
1.6 @Test public void jsInstanceName() throws Exception {
1.7 - assertExec("I/O name", Classes.class, "classForInstance__Ljava_lang_String_2", "java.io.IOException");
1.8 + assertExec("I/O name", Classes.class, "classForInstance__s", "java.io.IOException");
1.9 }
1.10 @Test public void javaName() throws Exception {
1.11 assertEquals(Classes.name(), "java.io.IOException");
1.12 }
1.13 @Test public void jsName() throws Exception {
1.14 - assertExec("I/O name", Classes.class, "name__Ljava_lang_String_2", "java.io.IOException");
1.15 + assertExec("I/O name", Classes.class, "name__s", "java.io.IOException");
1.16 }
1.17 @Test public void javaSimpleName() throws Exception {
1.18 assertEquals(Classes.simpleName(), "IOException");
1.19 }
1.20 @Test public void jsGetsSimpleName() throws Exception {
1.21 - assertExec("I/O simple name", Classes.class, "simpleName__Ljava_lang_String_2", "IOException");
1.22 + assertExec("I/O simple name", Classes.class, "simpleName__s", "IOException");
1.23 }
1.24 @Test public void javaCanonicalName() {
1.25 assertEquals(Classes.canonicalName(), "java.io.IOException");
1.26 }
1.27 @Test public void jsCanonicalName() throws Exception {
1.28 - assertExec("I/O simple name", Classes.class, "canonicalName__Ljava_lang_String_2", "java.io.IOException");
1.29 + assertExec("I/O simple name", Classes.class, "canonicalName__s", "java.io.IOException");
1.30 }
1.31 @Test public void javaNewInstance() throws Exception {
1.32 assertTrue(Classes.newInstance());
1.33 @@ -80,7 +80,7 @@
1.34 );
1.35 }
1.36 @Test public void jsNoNewInstance() throws Exception {
1.37 - assertExec("Check problems with new instance", Classes.class, "newInstanceNoPubConstructor__Ljava_lang_String_2",
1.38 + assertExec("Check problems with new instance", Classes.class, "newInstanceNoPubConstructor__s",
1.39 "java.lang.InstantiationException:java.lang.Float"
1.40 );
1.41 }
1.42 @@ -88,17 +88,17 @@
1.43 assertExec("Check class annotation", Classes.class, "getMarker__I", Double.valueOf(10));
1.44 }
1.45 @Test public void jsStringAnnotation() throws Exception {
1.46 - assertExec("Check class annotation", Classes.class, "getNamer__Ljava_lang_String_2Z", "my text", true);
1.47 + assertExec("Check class annotation", Classes.class, "getNamer__sZ", "my text", true);
1.48 }
1.49 @Test public void jsStringAnnotationFromArray() throws Exception {
1.50 - assertExec("Check class annotation", Classes.class, "getNamer__Ljava_lang_String_2Z", "my text", false);
1.51 + assertExec("Check class annotation", Classes.class, "getNamer__sZ", "my text", false);
1.52 }
1.53 @Test public void javaInvokeMethod() throws Exception {
1.54 assertEquals(Classes.reflectiveMethodCall(true, "name"), "java.io.IOException", "Calls the name() method via reflection");
1.55 }
1.56 @Test public void jsInvokeMethod() throws Exception {
1.57 assertExec("Calls the name() method via reflection", Classes.class,
1.58 - "reflectiveMethodCall__Ljava_lang_Object_2ZLjava_lang_String_2",
1.59 + "reflectiveMethodCall__Ljava_lang_Object_2Zs",
1.60 "java.io.IOException", true, "name"
1.61 );
1.62 }
1.63 @@ -107,19 +107,19 @@
1.64 }
1.65 @Test public void jsFindMethod() throws Exception {
1.66 assertExec("Calls the name() method via reflection", Classes.class,
1.67 - "reflectiveMethodCall__Ljava_lang_Object_2ZLjava_lang_String_2",
1.68 + "reflectiveMethodCall__Ljava_lang_Object_2Zs",
1.69 "java.io.IOException", false, "name"
1.70 );
1.71 }
1.72 @Test public void primitiveReturnType() throws Exception {
1.73 assertExec("Tries to get an integer via reflection", Classes.class,
1.74 - "primitiveType__Ljava_lang_String_2Ljava_lang_String_2",
1.75 + "primitiveType__ss",
1.76 Classes.primitiveType("primitive"), "primitive"
1.77 );
1.78 }
1.79 @Test public void primitiveBoolReturnType() throws Exception {
1.80 assertExec("Tries to get an integer via reflection", Classes.class,
1.81 - "primitiveType__Ljava_lang_String_2Ljava_lang_String_2",
1.82 + "primitiveType__ss",
1.83 Classes.primitiveType("primitiveB"), "primitiveB"
1.84 );
1.85 }
1.86 @@ -128,33 +128,33 @@
1.87 }
1.88 @Test public void jsAnnotatedMethod() throws Exception {
1.89 assertExec("Calls the name() method via reflection", Classes.class,
1.90 - "reflectiveMethodCall__Ljava_lang_Object_2ZLjava_lang_String_2",
1.91 + "reflectiveMethodCall__Ljava_lang_Object_2Zs",
1.92 "java.io.IOException", false, null
1.93 );
1.94 }
1.95 @Test public void jsClassParam() throws Exception {
1.96 assertExec("Calls the nameOfIO()", Classes.class,
1.97 - "nameOfIO__Ljava_lang_String_2",
1.98 + "nameOfIO__s",
1.99 "java.io.IOException"
1.100 );
1.101 }
1.102 @Test public void noInterface() throws Exception {
1.103 assertExec("Calls Class.isInterface", Classes.class,
1.104 - "isInterface__ZLjava_lang_String_2",
1.105 + "isInterface__Zs",
1.106 0.0, "java.lang.String"
1.107 );
1.108 }
1.109 /*
1.110 @Test public void isInterface() throws Exception {
1.111 assertExec("Calls Class.isInterface", Classes.class,
1.112 - "isInterface__ZLjava_lang_String_2",
1.113 + "isInterface__Zs",
1.114 1.0, "java.lang.Runnable"
1.115 );
1.116 }
1.117 */
1.118 @Test public void integerType() throws Exception {
1.119 assertExec("Computes the type", Classes.class,
1.120 - "intType__Ljava_lang_String_2",
1.121 + "intType__s",
1.122 Classes.intType()
1.123 );
1.124 }