diff options
| author | Narayan Kamath <narayan@google.com> | 2014-02-14 11:30:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-02-14 11:30:00 +0000 |
| commit | d035213a8ddc7bff77a76a0bd6437305e2887f09 (patch) | |
| tree | 88366f121ec09bf81ffab8c41350e111e2d9bf6c /harmony-tests | |
| parent | 4eda4934f01e6dee24ff5e569d55d1155383a64b (diff) | |
| parent | 1326a80ee854ad7df3ac183874734e418194572c (diff) | |
| download | libcore-d035213a8ddc7bff77a76a0bd6437305e2887f09.zip libcore-d035213a8ddc7bff77a76a0bd6437305e2887f09.tar.gz libcore-d035213a8ddc7bff77a76a0bd6437305e2887f09.tar.bz2 | |
Merge "Fix GregorianCalendarTest#test_addII."
Diffstat (limited to 'harmony-tests')
| -rw-r--r-- | harmony-tests/src/test/java/org/apache/harmony/tests/java/util/GregorianCalendarTest.java | 10 |
1 files changed, 5 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 5be7abc..47c76f3 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 @@ -208,23 +208,23 @@ public class GregorianCalendarTest extends junit.framework.TestCase { gc1 = new GregorianCalendar(AMERICA_NEW_YORK); gc1.set(1999, Calendar.APRIL, 3, 16, 0); // day before DST change gc1.add(Calendar.MILLISECOND, 24 * 60 * 60 * 1000); - assertEquals("Wrong time after MILLISECOND change", 16, gc1 + assertEquals("Wrong time after MILLISECOND change", 17, gc1 .get(Calendar.HOUR_OF_DAY)); gc1.set(1999, Calendar.APRIL, 3, 16, 0); // day before DST change gc1.add(Calendar.SECOND, 24 * 60 * 60); - assertEquals("Wrong time after SECOND change", 16, gc1 + assertEquals("Wrong time after SECOND change", 17, gc1 .get(Calendar.HOUR_OF_DAY)); gc1.set(1999, Calendar.APRIL, 3, 16, 0); // day before DST change gc1.add(Calendar.MINUTE, 24 * 60); - assertEquals("Wrong time after MINUTE change", 16, gc1 + assertEquals("Wrong time after MINUTE change", 17, gc1 .get(Calendar.HOUR_OF_DAY)); gc1.set(1999, Calendar.APRIL, 3, 16, 0); // day before DST change gc1.add(Calendar.HOUR, 24); - assertEquals("Wrong time after HOUR change", 16, gc1 + assertEquals("Wrong time after HOUR change", 17, gc1 .get(Calendar.HOUR_OF_DAY)); gc1.set(1999, Calendar.APRIL, 3, 16, 0); // day before DST change gc1.add(Calendar.HOUR_OF_DAY, 24); - assertEquals("Wrong time after HOUR_OF_DAY change", 16, gc1 + assertEquals("Wrong time after HOUR_OF_DAY change", 17, gc1 .get(Calendar.HOUR_OF_DAY)); gc1.set(1999, Calendar.APRIL, 3, 16, 0); // day before DST change |