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

ICU-13483 Use a real time zone to make tests work in Android.

Browse Source 
When running in Android, java.util.TimeZone.getDefault() will only
return a TimeZone object for a time zone that actually exists, so when
passing a bogus test TimeZone object to setDefault() and afterwards
calling getDefault() it won't return that same time zone.

Changing our tests to instead use a real existing (but otherwise unused)
time zone instead makes the tests work in Android as well.

Neither of these tests was testing the ability to set an arbitrarily
made up time zone as the default, so no test coverage is lost.
This commit is contained in:
Fredrik Roubert 2018-07-05 21:48:13 +02:00 committed by Shane Carr
parent 4dfe25a9a7
commit f71ecc6b18
No known key found for this signature in database
GPG Key ID: FCED3B24AAB18B5C
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateFormatRegressionTest.java
View File

@ -437,7 +437,9 @@ public class DateFormatRegressionTest extends TestFmwk {
public void Test4089106() { public void Test4089106() {
TimeZone def = TimeZone.getDefault(); TimeZone def = TimeZone.getDefault();
try { try {
TimeZone z = new SimpleTimeZone((int) (1.25 * 3600000), "FAKEZONE"); // It's necessary to use a real existing time zone here, some systems (Android) will not
// accept any arbitrary TimeZone object to be used as the default.
TimeZone z = new SimpleTimeZone(-12 * 60 * 60 * 1000, "GMT-12:00");
TimeZone.setDefault(z); TimeZone.setDefault(z);
SimpleDateFormat f = new SimpleDateFormat(); SimpleDateFormat f = new SimpleDateFormat();
if (!f.getTimeZone().equals(z)) if (!f.getTimeZone().equals(z))

6
icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java
View File

@ -495,8 +495,10 @@ public class TimeZoneTest extends TestFmwk
@Test @Test
public void TestGenericAPI() { public void TestGenericAPI() {
String id = "NewGMT"; // It's necessary to use a real existing time zone here, some systems (Android) will not
int offset = 12345; // accept any arbitrary TimeZone object to be used as the default.
String id = "GMT-12:00";
int offset = -12 * 60 * 60 * 1000;
SimpleTimeZone zone = new SimpleTimeZone(offset, id); SimpleTimeZone zone = new SimpleTimeZone(offset, id);
if (zone.useDaylightTime()) errln("FAIL: useDaylightTime should return false"); if (zone.useDaylightTime()) errln("FAIL: useDaylightTime should return false");