organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-14 17:24:01 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-6475 Reduced test coverage in TestTimeRoundTrip in non-exhaustive mode. Updated the test framework to take custom properties and use it in TestTimeRoundTrip to support all possible cases.

Browse source 
X-SVN-Rev: 24499
This commit is contained in:
Yoshito Umaoka 2008-08-14 22:06:13 +00:00
parent 2e78ff98b0
commit a82cc85ac3
2 changed files with 41 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
icu4j/src/com/ibm/icu/dev/test/TestFmwk.java
View file

@ -24,6 +24,7 @@ import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.Random;
@ -809,6 +810,14 @@ public class TestFmwk extends AbstractTestLog {
return params.errorCount;
}
public String getProperty(String key) {
String val = null;
if (key != null && key.length() > 0 && params.props != null) {
val = (String)params.props.get(key.toLowerCase());
}
return val;
}
protected TimeZone safeGetTimeZone(String id) {
TimeZone tz = TimeZone.getTimeZone(id);
if (tz == null) {
@ -832,7 +841,7 @@ public class TestFmwk extends AbstractTestLog {
pw.println("Usage: " + className + " option* target*");
pw.println();
pw.println("Options:");
pw.println(" -describe Print a short descriptive string for this test and all");
pw.println(" -d[escribe] Print a short descriptive string for this test and all");
pw.println(" listed targets.");
pw.println(" -e<n> Set exhaustiveness from 0..10. Default is 0, fewest tests.\n"
+ " To run all tests, specify -e10. Giving -e with no <n> is\n"
@ -859,7 +868,8 @@ public class TestFmwk extends AbstractTestLog {
// pw.println(" -m[emory] print memory usage and force gc for
// each test");
pw.println(" -n[othrow] Message on test failure rather than exception");
pw.println(" -prompt Prompt before exiting");
pw.println(" -p[rompt] Prompt before exiting");
pw.println(" -prop:<key>=<value> Set optional property used by this test");
pw.println(" -q[uiet] Do not show warnings");
pw.println(" -r[andom][:<n>] If present, randomize targets. If n is present,\n"
+ " use it as the seed. If random is not set, targets will\n"
@ -1087,6 +1097,7 @@ public class TestFmwk extends AbstractTestLog {
private NumberFormat tformat;
public Random random;
public int maxTargetSec = 10;
public HashMap props;
private TestParams() {
}
@ -1223,6 +1234,18 @@ public class TestFmwk extends AbstractTestLog {
if (params.log instanceof ASCIIWriter) {
params.log = log;
}
} else if (arg.startsWith("-prop:")) {
String temp = arg.substring(6);
int eql = temp.indexOf('=');
if (eql <= 0) {
log.println("*** Error: could not parse custom property '" + arg + "'");
usageError = true;
break;
}
if (params.props == null) {
params.props = new HashMap();
}
params.props.put(temp.substring(0, eql), temp.substring(eql+1));
} else {
log.println("*** Error: unrecognized argument: "
+ args[i]);

23
icu4j/src/com/ibm/icu/dev/test/format/TimeZoneFormatTest.java
View file

@ -162,12 +162,24 @@ public class TimeZoneFormatTest extends com.ibm.icu.dev.test.TestFmwk {
* round trip as expected.
*/
public void TestTimeRoundTrip() {
Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
cal.set(1900, Calendar.JANUARY, 1);
boolean TEST_ALL = "true".equalsIgnoreCase(getProperty("TimeZoneRoundTripAll"));
int startYear, endYear;
if (TEST_ALL || getInclusion() > 5) {
startYear = 1900;
} else {
startYear = 1990;
}
Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
endYear = cal.get(Calendar.YEAR) + 3;
cal.set(startYear, Calendar.JANUARY, 1);
final long START_TIME = cal.getTimeInMillis();
cal.set(2020, Calendar.JANUARY, 1);
cal.set(endYear, Calendar.JANUARY, 1);
final long END_TIME = cal.getTimeInMillis();
// Whether each pattern is ambiguous at DST->STD local time overlap
@ -178,14 +190,13 @@ public class TimeZoneFormatTest extends com.ibm.icu.dev.test.TestFmwk {
final String BASEPATTERN = "yyyy-MM-dd'T'HH:mm:ss.SSS";
ULocale[] LOCALES = null;
boolean DEBUG_ALL = false;
boolean REALLY_VERBOSE = false;
// timer for performance analysis
long[] times = new long[PATTERNS.length];
long timer;
if (DEBUG_ALL) {
if (TEST_ALL) {
// It may take about an hour for testing all locales
LOCALES = ULocale.getAvailableLocales();
} else if (getInclusion() > 5) {
@ -203,8 +214,6 @@ public class TimeZoneFormatTest extends com.ibm.icu.dev.test.TestFmwk {
} else {
LOCALES = new ULocale[] {
new ULocale("en"),
new ULocale("en_CA"),
new ULocale("fr")
};
}