organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-08 15:05:53 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-12582 DateFormatRoundTripTest requires one more roundtrip when 1) with time zone display name and 2) 2 digit year. Updated the test case to handle this case.

Browse source 
X-SVN-Rev: 39283
This commit is contained in:
Yoshito Umaoka 2016-09-19 19:26:16 +00:00
parent a2ee3b1f28
commit fd7c2a1f01
1 changed files with 38 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateFormatRoundTripTest.java
View file

@ -7,7 +7,7 @@
*******************************************************************************
*/
/**
/**
* Port From: ICU4C v1.8.1 : format : DateFormatRoundTripTest
* Source File: $ICU4CRoot/source/test/intltest/dtfmtrtts.cpp
**/
@ -20,7 +20,6 @@ import java.util.Date;
import java.util.Locale;
import java.util.Random;
import org.junit.Ignore;
import org.junit.Test;
import com.ibm.icu.text.DateFormat;
@ -29,7 +28,7 @@ import com.ibm.icu.util.Calendar;
import com.ibm.icu.util.GregorianCalendar;
import com.ibm.icu.util.TimeZone;
/**
/**
* Performs round-trip tests for DateFormat
**/
public class DateFormatRoundTripTest extends com.ibm.icu.dev.test.TestFmwk {
@ -43,7 +42,6 @@ public class DateFormatRoundTripTest extends com.ibm.icu.dev.test.TestFmwk {
private Random ran;
// TODO: test is randomly failing depending on the randomly generated date
@Ignore
@Test
public void TestDateFormatRoundTrip() {
dateFormat = new SimpleDateFormat("EEE MMM dd HH:mm:ss.SSS zzz yyyy G");
@ -60,7 +58,7 @@ public class DateFormatRoundTripTest extends com.ibm.icu.dev.test.TestFmwk {
}
TimeZone tz = TimeZone.getDefault();
logln("Default TimeZone: " + tz.getID());
if (INFINITE) {
// Special infinite loop test mode for finding hard to reproduce errors
Locale loc = Locale.getDefault();
@ -68,14 +66,14 @@ public class DateFormatRoundTripTest extends com.ibm.icu.dev.test.TestFmwk {
for (;;) {
_test(loc);
}
} else {
} else {
_test(Locale.getDefault());
for (int i = 0; i < locCount; ++i) {
_test(avail[i]);
}
}
}
private String styleName(int s) {
switch (s) {
case DateFormat.SHORT :
@ -90,7 +88,7 @@ public class DateFormatRoundTripTest extends com.ibm.icu.dev.test.TestFmwk {
return "Unknown";
}
}
private void _test(Locale loc) {
if (!INFINITE) {
logln("Locale: " + loc.getDisplayName());
@ -103,7 +101,7 @@ public class DateFormatRoundTripTest extends com.ibm.icu.dev.test.TestFmwk {
int i = 0;
for (i = 0; i < 24; ++i)
TEST_TABLE[i] = true;
// If we have some sparseness, implement it here. Sparseness decreases
// test time by eliminating some tests, up to 23.
for (i = 0; i < SPARSENESS; i++) {
@ -111,55 +109,56 @@ public class DateFormatRoundTripTest extends com.ibm.icu.dev.test.TestFmwk {
if (random >= 0 && random < 24 && TEST_TABLE[i]) {
TEST_TABLE[random] = false;
}
}
}
int itable = 0;
int style = 0;
for (style = DateFormat.FULL; style <= DateFormat.SHORT; ++style) {
if (TEST_TABLE[itable++]) {
logln("Testing style " + styleName(style));
DateFormat df = DateFormat.getDateInstance(style, loc);
logln("Testing style " + styleName(style));
DateFormat df = DateFormat.getDateInstance(style, loc);
_test(df, false);
}
}
for (style = DateFormat.FULL; style <= DateFormat.SHORT; ++style) {
if (TEST_TABLE[itable++]) {
logln("Testing style " + styleName(style));
DateFormat df = DateFormat.getTimeInstance(style, loc);
DateFormat df = DateFormat.getTimeInstance(style, loc);
_test(df, true);
}
}
for (int dstyle = DateFormat.FULL; dstyle <= DateFormat.SHORT; ++dstyle) {
for (int tstyle = DateFormat.FULL; tstyle <= DateFormat.SHORT; ++tstyle) {
if (TEST_TABLE[itable++]) {
logln("Testing dstyle " + styleName(dstyle) + ", tstyle " + styleName(tstyle));
DateFormat df = DateFormat.getDateTimeInstance(dstyle, tstyle, loc);
logln("Testing dstyle " + styleName(dstyle) + ", tstyle " + styleName(tstyle));
DateFormat df = DateFormat.getDateTimeInstance(dstyle, tstyle, loc);
_test(df, false);
}
}
}
}
private void _test(DateFormat fmt, boolean timeOnly) {
if (!(fmt instanceof SimpleDateFormat)) {
errln("DateFormat wasn't a SimpleDateFormat");
return;
}
String pat = ((SimpleDateFormat) fmt).toPattern();
logln(pat);
// NOTE TO MAINTAINER
// This indexOf check into the pattern needs to be refined to ignore
// quoted characters. Currently, this isn't a problem with the locale
// patterns we have, but it may be a problem later.
boolean hasEra = (pat.indexOf("G") != -1);
boolean hasZoneDisplayName = (pat.indexOf("z") != -1) || (pat.indexOf("v") != -1) || (pat.indexOf("V") != -1);
boolean hasTwoDigitYear = pat.indexOf("yy") >= 0 && pat.indexOf("yyy") < 0;
// Because patterns contain incomplete data representing the Date,
// we must be careful of how we do the roundtrip. We start with
// a randomly generated Date because they're easier to generate.
@ -168,14 +167,14 @@ public class DateFormatRoundTripTest extends com.ibm.icu.dev.test.TestFmwk {
// that it will not necessarily parse back to the original date because
// of incompleteness in patterns. For example, a time-only pattern won't
// parse back to the same date.
try {
for (int i = 0; i < TRIALS; ++i) {
Date[] d = new Date[DEPTH];
String[] s = new String[DEPTH];
d[0] = generateDate();
// We go through this loop until we achieve a match or until
// the maximum loop count is reached. We record the points at
// which the date and the string starts to match. Once matching
@ -187,9 +186,9 @@ public class DateFormatRoundTripTest extends com.ibm.icu.dev.test.TestFmwk {
if (loop > 0) {
d[loop] = fmt.parse(s[loop - 1]);
}
s[loop] = fmt.format(d[loop]);
if (loop > 0) {
if (smatch == 0) {
boolean match = s[loop].equals(s[loop - 1]);
@ -200,7 +199,7 @@ public class DateFormatRoundTripTest extends com.ibm.icu.dev.test.TestFmwk {
if (!match)
errln("FAIL: String mismatch after match");
}
if (dmatch == 0) {
// {sfb} watch out here, this might not work
boolean match = d[loop].getTime() == d[loop - 1].getTime();
@ -211,7 +210,7 @@ public class DateFormatRoundTripTest extends com.ibm.icu.dev.test.TestFmwk {
if (!match)
errln("FAIL: Date mismatch after match");
}
if (smatch != 0 && dmatch != 0)
break;
}
@ -219,7 +218,7 @@ public class DateFormatRoundTripTest extends com.ibm.icu.dev.test.TestFmwk {
// At this point loop == DEPTH if we've failed, otherwise loop is the
// max(smatch, dmatch), that is, the index at which we have string and
// date matching.
// Date usually matches in 2. Exceptions handled below.
int maxDmatch = 2;
int maxSmatch = 1;
@ -232,14 +231,16 @@ public class DateFormatRoundTripTest extends com.ibm.icu.dev.test.TestFmwk {
if (hasZoneDisplayName &&
(fmt.getTimeZone().inDaylightTime(d[0])
|| fmt.getTimeZone().inDaylightTime(d[1])
|| d[0].getTime() < 0L /* before 1970 */)) {
|| d[0].getTime() < 0L /* before 1970 */
|| hasTwoDigitYear && d[1].getTime() < 0L
/* before 1970 as the result of 2-digit year parse */)) {
maxSmatch = 2;
if (timeOnly) {
maxDmatch = 3;
}
}
}
if (dmatch > maxDmatch || smatch > maxSmatch) {
SimpleDateFormat sdf = new SimpleDateFormat("EEEE, MMMM d, yyyy HH:mm:ss, z G", Locale.US);
logln("Date = " + sdf.format(d[0]) + "; ms = " + d[0].getTime());
@ -247,7 +248,7 @@ public class DateFormatRoundTripTest extends com.ibm.icu.dev.test.TestFmwk {
for (int j = 0; j <= loop && j < DEPTH; ++j) {
StringBuffer temp = new StringBuffer("");
FieldPosition pos = new FieldPosition(0);
logln((j > 0 ? " P> " : " ") + dateFormat.format(d[j], temp, pos)
logln((j > 0 ? " P> " : " ") + dateFormat.format(d[j], temp, pos)
+ " F> " + s[j] + (j > 0 && d[j].getTime() == d[j - 1].getTime() ? " d==" : "")
+ (j > 0 && s[j].equals(s[j - 1]) ? " s==" : ""));
}
@ -259,13 +260,13 @@ public class DateFormatRoundTripTest extends com.ibm.icu.dev.test.TestFmwk {
logln(e.toString());
}
}
private int getField(Date d, int f) {
getFieldCal.setTime(d);
int ret = getFieldCal.get(f);
return ret;
}
private Date generateDate() {
double a = ran.nextDouble();
// Now 'a' ranges from 0..1; scale it to range from 0 to 8000 years