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

ICU-1540 add -e option, changed RoundTripTest to use abbreviated test for double characters

Browse Source 
X-SVN-Rev: 6953
This commit is contained in:
Mark Davis 2001-11-16 21:37:47 +00:00
parent 06970fb71e
commit 7490ab5a56
4 changed files with 84 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
icu4j/src/com/ibm/icu/dev/test/translit/RoundTripTest.java
View File

@ -77,7 +77,6 @@ public class RoundTripTest extends TestFmwk {
public void TestHangul() throws IOException, ParseException {
Test t = new Test("Latin-Hangul");
t.setDoublePercentage(0.02);
t.test("[a-zA-Z]", "[\uAC00-\uD7A4]", "", this, new Legal());
}
@ -606,9 +605,7 @@ public class RoundTripTest extends TestFmwk {
UnicodeSet toTarget;
UnicodeSet roundtripExclusions;
double doublePercentage = 1.0;
TestLog log;
RoundTripTest log;
Legal legalSource;
UnicodeSet badCharacters;
@ -627,10 +624,6 @@ public class RoundTripTest extends TestFmwk {
pairLimit = limit;
}
public void setDoublePercentage(double newval) {
doublePercentage = newval;
}
// Added to do better equality check.
public static boolean isSame(String a, String b) {
@ -683,7 +676,7 @@ public class RoundTripTest extends TestFmwk {
static final UnicodeSet neverOk = new UnicodeSet("[:Other:]");
public void test(String sourceRange, String targetRange, String roundtripExclusions,
TestLog log, Legal legalSource)
RoundTripTest log, Legal legalSource)
throws java.io.IOException, java.text.ParseException {
this.legalSource = legalSource;
@ -710,7 +703,7 @@ public class RoundTripTest extends TestFmwk {
log.logln(Utility.escape("Source: " + this.sourceRange));
log.logln(Utility.escape("Target: " + this.targetRange));
log.logln(Utility.escape("Exclude: " + this.roundtripExclusions));
if (doublePercentage < 1.0) log.logln("Double Percentage: " + doublePercentage);
if (log.isQuick()) log.logln("Abbreviated Test");
badCharacters = new UnicodeSet("[:other:]");
@ -879,7 +872,7 @@ public class RoundTripTest extends TestFmwk {
UnicodeSet sourceRangeMinusFailures = new UnicodeSet(sourceRange);
sourceRangeMinusFailures.removeAll(failSourceTarg);
usi.reset(sourceRangeMinusFailures);
usi.reset(sourceRangeMinusFailures, log.isQuick());
while (true) {
int c = usi.next();
if (c < 0) break;
@ -890,7 +883,7 @@ public class RoundTripTest extends TestFmwk {
!sourceRange.contains(d)) continue;
if (failSourceTarg.get(d)) continue;
*/
usi2.reset(sourceRangeMinusFailures);
usi2.reset(sourceRangeMinusFailures, log.isQuick());
while (true) {
int d = usi2.next();
if (d < 0) break;
@ -969,19 +962,12 @@ public class RoundTripTest extends TestFmwk {
!targetRange.contains(c)) continue;
*/
usi.reset(targetRangeMinusFailures);
usi.reset(targetRangeMinusFailures, log.isQuick());
while (true) {
int c = usi.next();
if (c < 0) break;
if (doublePercentage != 1.0) {
double rand = Math.random();
if (rand > doublePercentage) {
//log.log(".");
continue;
}
}
if (++count > pairLimit) {
throw new TestTruncated("Test truncated at " + pairLimit + " x 64k pairs");
}
@ -992,15 +978,11 @@ public class RoundTripTest extends TestFmwk {
if (TestUtility.isUnassigned(d) ||
!targetRange.contains(d)) continue;
*/
usi2.reset(targetRangeMinusFailures);
usi2.reset(targetRangeMinusFailures, log.isQuick());
while (true) {
int d = usi2.next();
if (d < 0) break;
if (doublePercentage != 1.0) {
if (Math.random() > doublePercentage) continue;
}
String cs = UTF16.valueOf(c) + UTF16.valueOf(d);
String targ = targetToSource.transliterate(cs);
String reverse = sourceToTarget.transliterate(targ);

38
icu4j/src/com/ibm/icu/dev/test/translit/UnicodeSetIterator.java
View File

@ -10,43 +10,73 @@ public final class UnicodeSetIterator {
public UnicodeSet set;
int endRange = 0;
int range = 0;
int startElement = 0;
int endElement;
int element;
boolean abbreviated = false;
public UnicodeSetIterator(UnicodeSet set, boolean abb) {
reset(set, abb);
}
public UnicodeSetIterator(UnicodeSet set) {
reset(set);
reset(set, false);
}
public UnicodeSetIterator() {
reset(new UnicodeSet());
reset(new UnicodeSet(), false);
}
public void setAbbreviated(boolean value) {
abbreviated = value;
}
public boolean getAbbreviated() {
return abbreviated;
}
/* returns -1 when done */
public int next() {
if (abbreviated) {
if (element >= startElement + 50 && element <= endElement - 50) {
element = endElement - 50;
}
}
if (element < endElement) {
return ++element;
}
if (range >= endRange) return -1;
++range;
endElement = set.getRangeEnd(range);
startElement = set.getRangeStart(range);
element = set.getRangeStart(range);
return element;
}
public void reset(UnicodeSet set) {
public void reset(UnicodeSet set, boolean abb) {
abbreviated = abb;
this.set = set;
endRange = set.getRangeCount() - 1;
reset();
resetInternal();
}
public void reset(UnicodeSet set) {
reset(set, false);
}
public void reset() {
reset(new UnicodeSet(), false);
}
void resetInternal() {
range = 0;
endElement = 0;
element = 0;
if (endRange >= 0) {
element = set.getRangeStart(range);
endElement = set.getRangeEnd(range);
startElement = set.getRangeStart(range);
}
}

34
icu4j/src/com/ibm/test/translit/RoundTripTest.java
View File

@ -77,7 +77,6 @@ public class RoundTripTest extends TestFmwk {
public void TestHangul() throws IOException, ParseException {
Test t = new Test("Latin-Hangul");
t.setDoublePercentage(0.02);
t.test("[a-zA-Z]", "[\uAC00-\uD7A4]", "", this, new Legal());
}
@ -606,9 +605,7 @@ public class RoundTripTest extends TestFmwk {
UnicodeSet toTarget;
UnicodeSet roundtripExclusions;
double doublePercentage = 1.0;
TestLog log;
RoundTripTest log;
Legal legalSource;
UnicodeSet badCharacters;
@ -627,10 +624,6 @@ public class RoundTripTest extends TestFmwk {
pairLimit = limit;
}
public void setDoublePercentage(double newval) {
doublePercentage = newval;
}
// Added to do better equality check.
public static boolean isSame(String a, String b) {
@ -683,7 +676,7 @@ public class RoundTripTest extends TestFmwk {
static final UnicodeSet neverOk = new UnicodeSet("[:Other:]");
public void test(String sourceRange, String targetRange, String roundtripExclusions,
TestLog log, Legal legalSource)
RoundTripTest log, Legal legalSource)
throws java.io.IOException, java.text.ParseException {
this.legalSource = legalSource;
@ -710,7 +703,7 @@ public class RoundTripTest extends TestFmwk {
log.logln(Utility.escape("Source: " + this.sourceRange));
log.logln(Utility.escape("Target: " + this.targetRange));
log.logln(Utility.escape("Exclude: " + this.roundtripExclusions));
if (doublePercentage < 1.0) log.logln("Double Percentage: " + doublePercentage);
if (log.isQuick()) log.logln("Abbreviated Test");
badCharacters = new UnicodeSet("[:other:]");
@ -879,7 +872,7 @@ public class RoundTripTest extends TestFmwk {
UnicodeSet sourceRangeMinusFailures = new UnicodeSet(sourceRange);
sourceRangeMinusFailures.removeAll(failSourceTarg);
usi.reset(sourceRangeMinusFailures);
usi.reset(sourceRangeMinusFailures, log.isQuick());
while (true) {
int c = usi.next();
if (c < 0) break;
@ -890,7 +883,7 @@ public class RoundTripTest extends TestFmwk {
!sourceRange.contains(d)) continue;
if (failSourceTarg.get(d)) continue;
*/
usi2.reset(sourceRangeMinusFailures);
usi2.reset(sourceRangeMinusFailures, log.isQuick());
while (true) {
int d = usi2.next();
if (d < 0) break;
@ -969,19 +962,12 @@ public class RoundTripTest extends TestFmwk {
!targetRange.contains(c)) continue;
*/
usi.reset(targetRangeMinusFailures);
usi.reset(targetRangeMinusFailures, log.isQuick());
while (true) {
int c = usi.next();
if (c < 0) break;
if (doublePercentage != 1.0) {
double rand = Math.random();
if (rand > doublePercentage) {
//log.log(".");
continue;
}
}
if (++count > pairLimit) {
throw new TestTruncated("Test truncated at " + pairLimit + " x 64k pairs");
}
@ -992,15 +978,11 @@ public class RoundTripTest extends TestFmwk {
if (TestUtility.isUnassigned(d) ||
!targetRange.contains(d)) continue;
*/
usi2.reset(targetRangeMinusFailures);
usi2.reset(targetRangeMinusFailures, log.isQuick());
while (true) {
int d = usi2.next();
if (d < 0) break;
if (doublePercentage != 1.0) {
if (Math.random() > doublePercentage) continue;
}
String cs = UTF16.valueOf(c) + UTF16.valueOf(d);
String targ = targetToSource.transliterate(cs);
String reverse = sourceToTarget.transliterate(targ);

38
icu4j/src/com/ibm/test/translit/UnicodeSetIterator.java
View File

@ -10,43 +10,73 @@ public final class UnicodeSetIterator {
public UnicodeSet set;
int endRange = 0;
int range = 0;
int startElement = 0;
int endElement;
int element;
boolean abbreviated = false;
public UnicodeSetIterator(UnicodeSet set, boolean abb) {
reset(set, abb);
}
public UnicodeSetIterator(UnicodeSet set) {
reset(set);
reset(set, false);
}
public UnicodeSetIterator() {
reset(new UnicodeSet());
reset(new UnicodeSet(), false);
}
public void setAbbreviated(boolean value) {
abbreviated = value;
}
public boolean getAbbreviated() {
return abbreviated;
}
/* returns -1 when done */
public int next() {
if (abbreviated) {
if (element >= startElement + 50 && element <= endElement - 50) {
element = endElement - 50;
}
}
if (element < endElement) {
return ++element;
}
if (range >= endRange) return -1;
++range;
endElement = set.getRangeEnd(range);
startElement = set.getRangeStart(range);
element = set.getRangeStart(range);
return element;
}
public void reset(UnicodeSet set) {
public void reset(UnicodeSet set, boolean abb) {
abbreviated = abb;
this.set = set;
endRange = set.getRangeCount() - 1;
reset();
resetInternal();
}
public void reset(UnicodeSet set) {
reset(set, false);
}
public void reset() {
reset(new UnicodeSet(), false);
}
void resetInternal() {
range = 0;
endElement = 0;
element = 0;
if (endRange >= 0) {
element = set.getRangeStart(range);
endElement = set.getRangeEnd(range);
startElement = set.getRangeStart(range);
}
}