summaryrefslogtreecommitdiffstats
path: root/harmony-tests
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-05-12 09:17:10 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-05-12 09:17:11 +0000
commit5888feb645bff10b6dc0529e07ce0350cb63f997 (patch)
treed662d3d5406714d75faa0f226b916b95c3f72cec /harmony-tests
parent5c1acb43c314a7048341f1ab36799fb6675505f4 (diff)
parent3f2128b3408255e317f66c10c6dd5edbff53b3ee (diff)
downloadlibcore-5888feb645bff10b6dc0529e07ce0350cb63f997.zip
libcore-5888feb645bff10b6dc0529e07ce0350cb63f997.tar.gz
libcore-5888feb645bff10b6dc0529e07ce0350cb63f997.tar.bz2
Merge "Blacklist a known failure in GregorianCalendarTest."
Diffstat (limited to 'harmony-tests')
-rw-r--r--harmony-tests/src/test/java/org/apache/harmony/tests/java/util/GregorianCalendarTest.java12
1 files changed, 7 insertions, 5 deletions
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
}