diff options
| -rw-r--r-- | expectations/knownfailures.txt | 5 | ||||
| -rw-r--r-- | harmony-tests/src/test/java/org/apache/harmony/tests/java/util/GregorianCalendarTest.java | 12 |
2 files changed, 12 insertions, 5 deletions
diff --git a/expectations/knownfailures.txt b/expectations/knownfailures.txt index b0923e5..8bf1306 100644 --- a/expectations/knownfailures.txt +++ b/expectations/knownfailures.txt @@ -1655,5 +1655,10 @@ "org.apache.harmony.tests.java.net.URLTest#test_sameFileLjava_net_URL", "org.apache.harmony.tests.java.net.URLDecoderTest#test_decodeLjava_lang_String_Ljava_lang_String" ] +}, +{ + description: "Known failure in GregorianCalendarTest", + bug: 12778197, + name: "org.apache.harmony.tests.java.util.GregorianCalendarTest#test_computeTime" } ] diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/GregorianCalendarTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/GregorianCalendarTest.java index 47c76f3..058681e 100644 --- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/GregorianCalendarTest.java +++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/GregorianCalendarTest.java @@ -697,20 +697,22 @@ public class GregorianCalendarTest extends junit.framework.TestCase { new Locale("en", "GB") ); g.clear(); - g.set(2006, 02, 26, 01, 50, 00); + g.set(2006, Calendar.MARCH, 26, 01, 50, 00); assertEquals(1143337800000L, g.getTimeInMillis()); GregorianCalendar g1 = new GregorianCalendar( - TimeZone.getTimeZone("Europe/Moscow") - ); + TimeZone.getTimeZone("Europe/Moscow")); g1.clear(); - g1.set(2006, 02, 26, 02, 20, 00); // in the DST transition interval + g1.set(2006, Calendar.MARCH, 26, 02, 20, 00); assertEquals(1143328800000L, g1.getTimeInMillis()); assertEquals(3, g1.get(Calendar.HOUR_OF_DAY)); + assertEquals(20, g1.get(Calendar.MINUTE)); + g1.clear(); - g1.set(2006, 9, 29, 02, 50, 00); // transition from DST + g1.set(2006, Calendar.OCTOBER, 29, 02, 50, 00); assertEquals(1162079400000L, g1.getTimeInMillis()); assertEquals(2, g1.get(Calendar.HOUR_OF_DAY)); + assertEquals(50, g1.get(Calendar.MINUTE)); // End of regression test } |