1.1 --- a/vm/src/test/java/org/apidesign/vm4brwsr/StringTest.java Tue Nov 27 22:22:48 2012 +0100
1.2 +++ b/vm/src/test/java/org/apidesign/vm4brwsr/StringTest.java Fri Dec 07 10:09:50 2012 +0100
1.3 @@ -18,7 +18,6 @@
1.4 package org.apidesign.vm4brwsr;
1.5
1.6 import javax.script.Invocable;
1.7 -import javax.script.ScriptException;
1.8 import org.testng.annotations.Test;
1.9 import static org.testng.Assert.*;
1.10 import org.testng.annotations.BeforeClass;
1.11 @@ -31,7 +30,7 @@
1.12 @Test public void firstChar() throws Exception {
1.13 assertExec(
1.14 "First char in Hello is H",
1.15 - StringSample.class, "sayHelloCI",
1.16 + StringSample.class, "sayHello__CI",
1.17 72, 0
1.18 );
1.19 }
1.20 @@ -39,7 +38,7 @@
1.21 @Test public void fromChars() throws Exception {
1.22 assertExec(
1.23 "First char in Hello is ABC",
1.24 - StringSample.class, "fromCharsLjava_lang_StringCCC",
1.25 + StringSample.class, "fromChars__Ljava_lang_String_2CCC",
1.26 "ABC", 'A', 'B', 'C'
1.27 );
1.28 }
1.29 @@ -47,7 +46,7 @@
1.30 @Test public void concatChars() throws Exception {
1.31 assertExec(
1.32 "Composing yields ABC",
1.33 - StringSample.class, "charsLjava_lang_StringCCC",
1.34 + StringSample.class, "chars__Ljava_lang_String_2CCC",
1.35 "ABC", 'A', 'B', 'C'
1.36 );
1.37 }
1.38 @@ -55,7 +54,7 @@
1.39 @Test public void concatCharsFromInts() throws Exception {
1.40 assertExec(
1.41 "Composing yields ABC",
1.42 - StringSample.class, "charsFromNumbersLjava_lang_String",
1.43 + StringSample.class, "charsFromNumbers__Ljava_lang_String_2",
1.44 "ABC"
1.45 );
1.46 }
1.47 @@ -63,7 +62,7 @@
1.48 @Test public void concatCharsFromChars() throws Exception {
1.49 assertExec(
1.50 "Composing yields ABC",
1.51 - StringSample.class, "charsFromCharsLjava_lang_String",
1.52 + StringSample.class, "charsFromChars__Ljava_lang_String_2",
1.53 "ABC"
1.54 );
1.55 }
1.56 @@ -71,7 +70,7 @@
1.57 @Test public void instanceOfWorks() throws Exception {
1.58 assertExec(
1.59 "It is string",
1.60 - StringSample.class, "isStringInstanceZ",
1.61 + StringSample.class, "isStringInstance__Z",
1.62 Double.valueOf(1.0)
1.63 );
1.64 }
1.65 @@ -79,7 +78,7 @@
1.66 @Test(timeOut=10000) public void toStringConcatenation() throws Exception {
1.67 assertExec(
1.68 "Five executions should generate 5Hello World!",
1.69 - StringSample.class, "toStringTestLjava_lang_StringI",
1.70 + StringSample.class, "toStringTest__Ljava_lang_String_2I",
1.71 "Hello World!5", 5
1.72 );
1.73 }
1.74 @@ -90,7 +89,7 @@
1.75 @Test(timeOut=10000) public void stringStringConcat() throws Exception {
1.76 assertExec(
1.77 "Composes strings OK",
1.78 - StringSample.class, "concatStringsLjava_lang_String",
1.79 + StringSample.class, "concatStrings__Ljava_lang_String_2",
1.80 "Hello World!1" + "\\\n\r\t"
1.81 );
1.82 }
1.83 @@ -98,21 +97,21 @@
1.84 @Test public void equalsAndSubstring() throws Exception {
1.85 assertExec(
1.86 "Composes are OK",
1.87 - StringSample.class, "equalToHelloZII",
1.88 + StringSample.class, "equalToHello__ZII",
1.89 true, 0, 5
1.90 );
1.91 }
1.92 @Test public void replaceChars() throws Exception {
1.93 assertExec(
1.94 "Can replace slashes by underscores",
1.95 - StringSample.class, "replaceLjava_lang_StringLjava_lang_StringCC",
1.96 + StringSample.class, "replace__Ljava_lang_String_2Ljava_lang_String_2CC",
1.97 "x_y_z", "x/y/z", '/', '_'
1.98 );
1.99 }
1.100 @Test public void replaceIntChars() throws Exception {
1.101 assertExec(
1.102 "Can replace slashes by underscores",
1.103 - StringSample.class, "replaceLjava_lang_StringLjava_lang_StringCC",
1.104 + StringSample.class, "replace__Ljava_lang_String_2Ljava_lang_String_2CC",
1.105 "x_y_z", "x/y/z", (int)'/', (int)'_'
1.106 );
1.107 }
1.108 @@ -120,7 +119,7 @@
1.109 @Test public void insertBuilder() throws Exception {
1.110 assertExec(
1.111 "Can insert something into a buffer?",
1.112 - StringSample.class, "insertBufferLjava_lang_String",
1.113 + StringSample.class, "insertBuffer__Ljava_lang_String_2",
1.114 "Ahojdo!"
1.115 );
1.116 }
1.117 @@ -130,7 +129,7 @@
1.118 int jh = StringSample.hashCode(j);
1.119 assertExec(
1.120 "Hashcode is the same " +jh,
1.121 - StringSample.class, "hashCodeILjava_lang_String",
1.122 + StringSample.class, "hashCode__ILjava_lang_String_2",
1.123 Double.valueOf(jh), j
1.124 );
1.125 }
1.126 @@ -139,28 +138,28 @@
1.127 int jh = StringSample.hashCode(j);
1.128 assertExec(
1.129 "Hashcode is the same " + jh,
1.130 - StringSample.class, "hashCodeILjava_lang_String",
1.131 + StringSample.class, "hashCode__ILjava_lang_String_2",
1.132 Double.valueOf(jh), j
1.133 );
1.134 }
1.135 @Test public void stringSwitch1() throws Exception {
1.136 assertExec(
1.137 "Get one",
1.138 - StringSample.class, "stringSwitchILjava_lang_String",
1.139 + StringSample.class, "stringSwitch__ILjava_lang_String_2",
1.140 Double.valueOf(1), "jedna"
1.141 );
1.142 }
1.143 @Test public void stringSwitch2() throws Exception {
1.144 assertExec(
1.145 "Get two",
1.146 - StringSample.class, "stringSwitchILjava_lang_String",
1.147 + StringSample.class, "stringSwitch__ILjava_lang_String_2",
1.148 Double.valueOf(2), "dve"
1.149 );
1.150 }
1.151 @Test public void stringSwitchDefault() throws Exception {
1.152 assertExec(
1.153 "Get -1",
1.154 - StringSample.class, "stringSwitchILjava_lang_String",
1.155 + StringSample.class, "stringSwitch__ILjava_lang_String_2",
1.156 Double.valueOf(-1), "none"
1.157 );
1.158 }
1.159 @@ -169,7 +168,7 @@
1.160 assertEquals(StringSample.countAB("Ahoj Bedo!"), 3, "Verify Java code is sane");
1.161 assertExec(
1.162 "One A and one B adds to 3",
1.163 - StringSample.class, "countABILjava_lang_String",
1.164 + StringSample.class, "countAB__ILjava_lang_String_2",
1.165 Double.valueOf(3), "Ahoj Bedo!"
1.166 );
1.167