AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update test for new API

Browse Source 
X-SVN-Rev: 700
This commit is contained in:
Alan Liu 2000-01-27 18:58:35 +00:00
parent eddd8b6f4c
commit 920e879c4a
2 changed files with 26 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
icu4j/src/com/ibm/icu/dev/test/translit/TransliteratorTest.java
View File

@ -1,6 +1,7 @@
package test.translit; package test.translit;
import test.IntlTest; import test.IntlTest;
import com.ibm.text.*; import com.ibm.text.*;
import com.ibm.Utility;
import java.text.*; import java.text.*;
import java.util.*; import java.util.*;
@ -265,7 +266,7 @@ public class TransliteratorTest extends IntlTest {
} }
private void keyboardAux(Transliterator t, String[] DATA) { private void keyboardAux(Transliterator t, String[] DATA) {
int[] index = {0, 0, 0}; Transliterator.Position index = new Transliterator.Position();
ReplaceableString s = new ReplaceableString(); ReplaceableString s = new ReplaceableString();
for (int i=0; i<DATA.length; i+=2) { for (int i=0; i<DATA.length; i+=2) {
StringBuffer log; StringBuffer log;
@ -280,12 +281,12 @@ public class TransliteratorTest extends IntlTest {
} }
String str = s.toString(); String str = s.toString();
// Show the start index '{' and the cursor '|' // Show the start index '{' and the cursor '|'
log.append(str.substring(0, index[Transliterator.START])). log.append(str.substring(0, index.start)).
append('{'). append('{').
append(str.substring(index[Transliterator.START], append(str.substring(index.start,
index[Transliterator.CURSOR])). index.cursor)).
append('|'). append('|').
append(str.substring(index[Transliterator.CURSOR])); append(str.substring(index.cursor));
if (str.equals(DATA[i+1])) { if (str.equals(DATA[i+1])) {
logln(log.toString()); logln(log.toString());
} else { } else {
@ -373,7 +374,7 @@ public class TransliteratorTest extends IntlTest {
}; };
for (int i=0; i<DATA.length; i+=3) { for (int i=0; i<DATA.length; i+=3) {
logln("Pattern: " + escape(DATA[i])); logln("Pattern: " + Utility.escape(DATA[i]));
Transliterator t = new RuleBasedTransliterator("<ID>", DATA[i]); Transliterator t = new RuleBasedTransliterator("<ID>", DATA[i]);
expect(t, DATA[i+1], DATA[i+2]); expect(t, DATA[i+1], DATA[i+2]);
} }
@ -407,7 +408,7 @@ public class TransliteratorTest extends IntlTest {
// Test keyboard (incremental) transliteration -- this result // Test keyboard (incremental) transliteration -- this result
// must be the same after we finalize (see below). // must be the same after we finalize (see below).
rsource.getStringBuffer().setLength(0); rsource.getStringBuffer().setLength(0);
int[] index = { 0, 0, 0 }; Transliterator.Position index = new Transliterator.Position();
StringBuffer log = new StringBuffer(); StringBuffer log = new StringBuffer();
for (int i=0; i<source.length(); ++i) { for (int i=0; i<source.length(); ++i) {
@ -420,9 +421,9 @@ public class TransliteratorTest extends IntlTest {
// Append the string buffer with a vertical bar '|' where // Append the string buffer with a vertical bar '|' where
// the committed index is. // the committed index is.
String s = rsource.toString(); String s = rsource.toString();
log.append(s.substring(0, index[Transliterator.CURSOR])). log.append(s.substring(0, index.cursor)).
append('|'). append('|').
append(s.substring(index[Transliterator.CURSOR])); append(s.substring(index.cursor));
} }
// As a final step in keyboard transliteration, we must call // As a final step in keyboard transliteration, we must call
@ -447,37 +448,11 @@ public class TransliteratorTest extends IntlTest {
void expectAux(String tag, String summary, boolean pass, void expectAux(String tag, String summary, boolean pass,
String expectedResult) { String expectedResult) {
if (pass) { if (pass) {
logln("("+tag+") " + escape(summary)); logln("("+tag+") " + Utility.escape(summary));
} else { } else {
errln("FAIL: ("+tag+") " errln("FAIL: ("+tag+") "
+ escape(summary) + Utility.escape(summary)
+ ", expected " + escape(expectedResult)); + ", expected " + Utility.escape(expectedResult));
} }
} }
/**
* Escape non-ASCII characters as Unicode.
*/
public static final String escape(String s) {
StringBuffer buf = new StringBuffer();
for (int i=0; i<s.length(); ++i) {
char c = s.charAt(i);
if (c >= ' ' && c <= 0x007F) {
buf.append(c);
} else {
buf.append("\\u");
if (c < 0x1000) {
buf.append('0');
if (c < 0x100) {
buf.append('0');
if (c < 0x10) {
buf.append('0');
}
}
}
buf.append(Integer.toHexString(c));
}
}
return buf.toString();
}
} }

51
icu4j/src/com/ibm/test/translit/TransliteratorTest.java
View File

@ -1,6 +1,7 @@
package test.translit; package test.translit;
import test.IntlTest; import test.IntlTest;
import com.ibm.text.*; import com.ibm.text.*;
import com.ibm.Utility;
import java.text.*; import java.text.*;
import java.util.*; import java.util.*;
@ -265,7 +266,7 @@ public class TransliteratorTest extends IntlTest {
} }
private void keyboardAux(Transliterator t, String[] DATA) { private void keyboardAux(Transliterator t, String[] DATA) {
int[] index = {0, 0, 0}; Transliterator.Position index = new Transliterator.Position();
ReplaceableString s = new ReplaceableString(); ReplaceableString s = new ReplaceableString();
for (int i=0; i<DATA.length; i+=2) { for (int i=0; i<DATA.length; i+=2) {
StringBuffer log; StringBuffer log;
@ -280,12 +281,12 @@ public class TransliteratorTest extends IntlTest {
} }
String str = s.toString(); String str = s.toString();
// Show the start index '{' and the cursor '|' // Show the start index '{' and the cursor '|'
log.append(str.substring(0, index[Transliterator.START])). log.append(str.substring(0, index.start)).
append('{'). append('{').
append(str.substring(index[Transliterator.START], append(str.substring(index.start,
index[Transliterator.CURSOR])). index.cursor)).
append('|'). append('|').
append(str.substring(index[Transliterator.CURSOR])); append(str.substring(index.cursor));
if (str.equals(DATA[i+1])) { if (str.equals(DATA[i+1])) {
logln(log.toString()); logln(log.toString());
} else { } else {
@ -373,7 +374,7 @@ public class TransliteratorTest extends IntlTest {
}; };
for (int i=0; i<DATA.length; i+=3) { for (int i=0; i<DATA.length; i+=3) {
logln("Pattern: " + escape(DATA[i])); logln("Pattern: " + Utility.escape(DATA[i]));
Transliterator t = new RuleBasedTransliterator("<ID>", DATA[i]); Transliterator t = new RuleBasedTransliterator("<ID>", DATA[i]);
expect(t, DATA[i+1], DATA[i+2]); expect(t, DATA[i+1], DATA[i+2]);
} }
@ -407,7 +408,7 @@ public class TransliteratorTest extends IntlTest {
// Test keyboard (incremental) transliteration -- this result // Test keyboard (incremental) transliteration -- this result
// must be the same after we finalize (see below). // must be the same after we finalize (see below).
rsource.getStringBuffer().setLength(0); rsource.getStringBuffer().setLength(0);
int[] index = { 0, 0, 0 }; Transliterator.Position index = new Transliterator.Position();
StringBuffer log = new StringBuffer(); StringBuffer log = new StringBuffer();
for (int i=0; i<source.length(); ++i) { for (int i=0; i<source.length(); ++i) {
@ -420,9 +421,9 @@ public class TransliteratorTest extends IntlTest {
// Append the string buffer with a vertical bar '|' where // Append the string buffer with a vertical bar '|' where
// the committed index is. // the committed index is.
String s = rsource.toString(); String s = rsource.toString();
log.append(s.substring(0, index[Transliterator.CURSOR])). log.append(s.substring(0, index.cursor)).
append('|'). append('|').
append(s.substring(index[Transliterator.CURSOR])); append(s.substring(index.cursor));
} }
// As a final step in keyboard transliteration, we must call // As a final step in keyboard transliteration, we must call
@ -447,37 +448,11 @@ public class TransliteratorTest extends IntlTest {
void expectAux(String tag, String summary, boolean pass, void expectAux(String tag, String summary, boolean pass,
String expectedResult) { String expectedResult) {
if (pass) { if (pass) {
logln("("+tag+") " + escape(summary)); logln("("+tag+") " + Utility.escape(summary));
} else { } else {
errln("FAIL: ("+tag+") " errln("FAIL: ("+tag+") "
+ escape(summary) + Utility.escape(summary)
+ ", expected " + escape(expectedResult)); + ", expected " + Utility.escape(expectedResult));
} }
} }
/**
* Escape non-ASCII characters as Unicode.
*/
public static final String escape(String s) {
StringBuffer buf = new StringBuffer();
for (int i=0; i<s.length(); ++i) {
char c = s.charAt(i);
if (c >= ' ' && c <= 0x007F) {
buf.append(c);
} else {
buf.append("\\u");
if (c < 0x1000) {
buf.append('0');
if (c < 0x100) {
buf.append('0');
if (c < 0x10) {
buf.append('0');
}
}
}
buf.append(Integer.toHexString(c));
}
}
return buf.toString();
}
} }