commit 6dcdb9d879882a443a757457e83a110b7cfe5c85
author Elliott Hughes <enh@google.com> Thu Mar 21 10:35:28 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 21 10:35:28 2013 -0700
tree ed849d9e641be6136c34be4e11c5be0112371f88
parent 58008844ecca312f86c62877220fc3b4ee890df9
parent 3e3ded0844ed371b5f00be7c6fa88cc07e51d80a

am 3e3ded08: Merge "Fix CalendarTest.test_clear_45877."

* commit '3e3ded0844ed371b5f00be7c6fa88cc07e51d80a':
  Fix CalendarTest.test_clear_45877.

luni/src/test/java/libcore/java/util/CalendarTest.java

diff --git a/luni/src/test/java/libcore/java/util/CalendarTest.java b/luni/src/test/java/libcore/java/util/CalendarTest.java
index b0e6b6b..dd44789 100644
--- a/luni/src/test/java/libcore/java/util/CalendarTest.java
+++ b/luni/src/test/java/libcore/java/util/CalendarTest.java
@@ -213,13 +213,27 @@
       cal.set(Calendar.MONTH, Calendar.JANUARY);
       cal.set(Calendar.DAY_OF_MONTH, 1);
       cal.clear(Calendar.HOUR_OF_DAY);
+      cal.clear(Calendar.HOUR);
       cal.clear(Calendar.MINUTE);
       cal.clear(Calendar.SECOND);
       cal.clear(Calendar.MILLISECOND);
 
-      assertEquals(75600000, cal.getTimeInMillis());
+      // Now we have a mix of set and unset fields.
+      assertTrue(cal.isSet(Calendar.DAY_OF_MONTH));
+      assertFalse(cal.isSet(Calendar.HOUR_OF_DAY));
 
-      cal.set (Calendar.HOUR_OF_DAY, 0);
+      // When we call get, unset fields are computed.
+      assertEquals(0, cal.get(Calendar.HOUR_OF_DAY));
+      // And set fields stay the same.
+      assertEquals(1, cal.get(Calendar.DAY_OF_MONTH));
+
+      // ...so now everything is set.
+      assertTrue(cal.isSet(Calendar.DAY_OF_MONTH));
+      assertTrue(cal.isSet(Calendar.HOUR_OF_DAY));
+
       assertEquals(28800000, cal.getTimeInMillis());
+
+      cal.set(Calendar.HOUR_OF_DAY, 1);
+      assertEquals(32400000, cal.getTimeInMillis());
     }
 }