diff --git a/icu4j/src/com/ibm/icu/dev/test/TestFmwk.java b/icu4j/src/com/ibm/icu/dev/test/TestFmwk.java index 2b46731085a..9212ad4c7bd 100755 --- a/icu4j/src/com/ibm/icu/dev/test/TestFmwk.java +++ b/icu4j/src/com/ibm/icu/dev/test/TestFmwk.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/TestFmwk.java,v $ - * $Date: 2001/12/03 18:21:57 $ - * $Revision: 1.25 $ + * $Date: 2001/12/03 21:48:07 $ + * $Revision: 1.26 $ * ***************************************************************************************** */ @@ -122,8 +122,8 @@ public class TestFmwk implements TestLog { params.prompt = true; } else if (args[i].equals("-nothrow")) { params.nothrow = true; - } else if (args[i].equals("-e")) { - params.quick = false; + } else if (args[i].startsWith("-e")) { + params.inclusion = (args[i].length() == 2) ? 5 : Integer.parseInt(args[i].substring(2)); } else if (args[i].toLowerCase().startsWith("-filter:")) { params.filter = args[i].substring(8); } else { @@ -170,8 +170,15 @@ public class TestFmwk implements TestLog { return params.verbose; } + /** + * 0 = fewest tests, 5 is normal build, 10 is most tests + */ + public int getInclusion() { + return params.inclusion; + } + public boolean isQuick() { - return params.quick; + return params.inclusion == 0; } public String getFilter() { @@ -381,7 +388,7 @@ public class TestFmwk implements TestLog { public boolean prompt = false; public boolean nothrow = false; public boolean verbose = false; - public boolean quick = true; + public int inclusion = 0; public String filter = null; public PrintWriter log = new ASCIIWriter(System.out, true); diff --git a/icu4j/src/com/ibm/icu/dev/test/translit/RoundTripTest.java b/icu4j/src/com/ibm/icu/dev/test/translit/RoundTripTest.java index 8c6f4547e22..2b561dd66dc 100755 --- a/icu4j/src/com/ibm/icu/dev/test/translit/RoundTripTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/translit/RoundTripTest.java @@ -940,7 +940,9 @@ public class RoundTripTest extends TestFmwk { UnicodeSet sourceRangeMinusFailures = new UnicodeSet(sourceRange); sourceRangeMinusFailures.removeAll(failSourceTarg); - usi.reset(sourceRangeMinusFailures, log.isQuick()); + boolean skipSome = log.getInclusion() < 10; + + usi.reset(sourceRangeMinusFailures, skipSome); while (true) { int c = usi.next(); if (c < 0) break; @@ -951,7 +953,7 @@ public class RoundTripTest extends TestFmwk { !sourceRange.contains(d)) continue; if (failSourceTarg.get(d)) continue; */ - usi2.reset(sourceRangeMinusFailures, log.isQuick()); + usi2.reset(sourceRangeMinusFailures, skipSome); while (true) { int d = usi2.next(); if (d < 0) break; @@ -1030,7 +1032,7 @@ public class RoundTripTest extends TestFmwk { !targetRange.contains(c)) continue; */ - usi.reset(targetRangeMinusFailures, log.isQuick()); + usi.reset(targetRangeMinusFailures, skipSome); while (true) { int c = usi.next(); @@ -1046,7 +1048,7 @@ public class RoundTripTest extends TestFmwk { if (TestUtility.isUnassigned(d) || !targetRange.contains(d)) continue; */ - usi2.reset(targetRangeMinusFailures, log.isQuick()); + usi2.reset(targetRangeMinusFailures, skipSome); while (true) { int d = usi2.next(); if (d < 0) break; diff --git a/icu4j/src/com/ibm/test/TestFmwk.java b/icu4j/src/com/ibm/test/TestFmwk.java index c9be4c545c3..4e09174bd1c 100755 --- a/icu4j/src/com/ibm/test/TestFmwk.java +++ b/icu4j/src/com/ibm/test/TestFmwk.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/test/Attic/TestFmwk.java,v $ - * $Date: 2001/12/03 18:21:57 $ - * $Revision: 1.25 $ + * $Date: 2001/12/03 21:48:07 $ + * $Revision: 1.26 $ * ***************************************************************************************** */ @@ -122,8 +122,8 @@ public class TestFmwk implements TestLog { params.prompt = true; } else if (args[i].equals("-nothrow")) { params.nothrow = true; - } else if (args[i].equals("-e")) { - params.quick = false; + } else if (args[i].startsWith("-e")) { + params.inclusion = (args[i].length() == 2) ? 5 : Integer.parseInt(args[i].substring(2)); } else if (args[i].toLowerCase().startsWith("-filter:")) { params.filter = args[i].substring(8); } else { @@ -170,8 +170,15 @@ public class TestFmwk implements TestLog { return params.verbose; } + /** + * 0 = fewest tests, 5 is normal build, 10 is most tests + */ + public int getInclusion() { + return params.inclusion; + } + public boolean isQuick() { - return params.quick; + return params.inclusion == 0; } public String getFilter() { @@ -381,7 +388,7 @@ public class TestFmwk implements TestLog { public boolean prompt = false; public boolean nothrow = false; public boolean verbose = false; - public boolean quick = true; + public int inclusion = 0; public String filter = null; public PrintWriter log = new ASCIIWriter(System.out, true); diff --git a/icu4j/src/com/ibm/test/translit/RoundTripTest.java b/icu4j/src/com/ibm/test/translit/RoundTripTest.java index 8c6f4547e22..2b561dd66dc 100755 --- a/icu4j/src/com/ibm/test/translit/RoundTripTest.java +++ b/icu4j/src/com/ibm/test/translit/RoundTripTest.java @@ -940,7 +940,9 @@ public class RoundTripTest extends TestFmwk { UnicodeSet sourceRangeMinusFailures = new UnicodeSet(sourceRange); sourceRangeMinusFailures.removeAll(failSourceTarg); - usi.reset(sourceRangeMinusFailures, log.isQuick()); + boolean skipSome = log.getInclusion() < 10; + + usi.reset(sourceRangeMinusFailures, skipSome); while (true) { int c = usi.next(); if (c < 0) break; @@ -951,7 +953,7 @@ public class RoundTripTest extends TestFmwk { !sourceRange.contains(d)) continue; if (failSourceTarg.get(d)) continue; */ - usi2.reset(sourceRangeMinusFailures, log.isQuick()); + usi2.reset(sourceRangeMinusFailures, skipSome); while (true) { int d = usi2.next(); if (d < 0) break; @@ -1030,7 +1032,7 @@ public class RoundTripTest extends TestFmwk { !targetRange.contains(c)) continue; */ - usi.reset(targetRangeMinusFailures, log.isQuick()); + usi.reset(targetRangeMinusFailures, skipSome); while (true) { int c = usi.next(); @@ -1046,7 +1048,7 @@ public class RoundTripTest extends TestFmwk { if (TestUtility.isUnassigned(d) || !targetRange.contains(d)) continue; */ - usi2.reset(targetRangeMinusFailures, log.isQuick()); + usi2.reset(targetRangeMinusFailures, skipSome); while (true) { int d = usi2.next(); if (d < 0) break;