diff options
| author | 2010-01-15 14:44:58 -0800 | |
|---|---|---|
| committer | 2010-01-15 14:44:58 -0800 | |
| commit | d60e31cbe32edd4d8fde9db5be26eb9ab709ae5e (patch) | |
| tree | b776c6d002e5f636246b4972f502f063777f1e5c | |
| parent | fe86b045311f56e23dd57c4a070323dc9bf1bad9 (diff) | |
| parent | de8aa87016a8dc2c252002ec60f6285b7a839336 (diff) | |
Merge "Update Time.parse3339() unit tests"
| -rw-r--r-- | tests/AndroidTests/src/com/android/unit_tests/TimeTest.java | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/tests/AndroidTests/src/com/android/unit_tests/TimeTest.java b/tests/AndroidTests/src/com/android/unit_tests/TimeTest.java index 3b33a99c0de3..724ef6a56137 100644 --- a/tests/AndroidTests/src/com/android/unit_tests/TimeTest.java +++ b/tests/AndroidTests/src/com/android/unit_tests/TimeTest.java @@ -359,56 +359,58 @@ public class TimeTest extends TestCase { Time t = new Time(Time.TIMEZONE_UTC); t.parse3339("1980-05-23"); - if (!t.allDay || t.year != 1980 || t.month != 05 || t.monthDay != 23) { + if (!t.allDay || t.year != 1980 || t.month != 04 || t.monthDay != 23) { fail("Did not parse all-day date correctly"); } t.parse3339("1980-05-23T09:50:50"); - if (t.allDay || t.year != 1980 || t.month != 05 || t.monthDay != 23 || + if (t.allDay || t.year != 1980 || t.month != 04 || t.monthDay != 23 || t.hour != 9 || t.minute != 50 || t.second != 50 || t.gmtoff != 0) { fail("Did not parse timezone-offset-less date correctly"); } t.parse3339("1980-05-23T09:50:50Z"); - if (t.allDay || t.year != 1980 || t.month != 05 || t.monthDay != 23 || + if (t.allDay || t.year != 1980 || t.month != 04 || t.monthDay != 23 || t.hour != 9 || t.minute != 50 || t.second != 50 || t.gmtoff != 0) { fail("Did not parse UTC date correctly"); } t.parse3339("1980-05-23T09:50:50.0Z"); - if (t.allDay || t.year != 1980 || t.month != 05 || t.monthDay != 23 || + if (t.allDay || t.year != 1980 || t.month != 04 || t.monthDay != 23 || t.hour != 9 || t.minute != 50 || t.second != 50 || t.gmtoff != 0) { fail("Did not parse UTC date correctly"); } t.parse3339("1980-05-23T09:50:50.12Z"); - if (t.allDay || t.year != 1980 || t.month != 05 || t.monthDay != 23 || + if (t.allDay || t.year != 1980 || t.month != 04 || t.monthDay != 23 || t.hour != 9 || t.minute != 50 || t.second != 50 || t.gmtoff != 0) { fail("Did not parse UTC date correctly"); } t.parse3339("1980-05-23T09:50:50.123Z"); - if (t.allDay || t.year != 1980 || t.month != 05 || t.monthDay != 23 || + if (t.allDay || t.year != 1980 || t.month != 04 || t.monthDay != 23 || t.hour != 9 || t.minute != 50 || t.second != 50 || t.gmtoff != 0) { fail("Did not parse UTC date correctly"); } - t.parse3339("1980-05-23T09:50:50-06:00"); - if (t.allDay || t.year != 1980 || t.month != 05 || t.monthDay != 23 || - t.hour != 9 || t.minute != 50 || t.second != 50 || - t.gmtoff != -6*3600) { + // The time should be normalized to UTC + t.parse3339("1980-05-23T09:50:50-01:05"); + if (t.allDay || t.year != 1980 || t.month != 04 || t.monthDay != 23 || + t.hour != 10 || t.minute != 55 || t.second != 50 || + t.gmtoff != 0) { fail("Did not parse timezone-offset date correctly"); } - t.parse3339("1980-05-23T09:50:50.123-06:00"); - if (t.allDay || t.year != 1980 || t.month != 05 || t.monthDay != 23 || - t.hour != 9 || t.minute != 50 || t.second != 50 || - t.gmtoff != -6*3600) { + // The time should be normalized to UTC + t.parse3339("1980-05-23T09:50:50.123-01:05"); + if (t.allDay || t.year != 1980 || t.month != 04 || t.monthDay != 23 || + t.hour != 10 || t.minute != 55 || t.second != 50 || + t.gmtoff != 0) { fail("Did not parse timezone-offset date correctly"); } |