diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-04-16 12:56:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-04-16 12:56:49 +0000 |
| commit | 115ff8faca311753ebf4e23cc0f19e8bb83e423f (patch) | |
| tree | f5c5d545ce48982674f33a63b3a4d0e170bb5895 | |
| parent | cb73f86c14d438e11f7c0988f019d9e8adb0288c (diff) | |
| parent | c5fc884ec268862fff828d8c276736a39eab3d27 (diff) | |
| download | cts-oreo-mr1-dev.tar.gz | |
Merge "DO NOT MERGE: Remove test that depends on tz data" into oreo-mr1-devoreo-mr1-dev
| -rw-r--r-- | tests/tests/text/src/android/text/format/cts/TimeTest.java | 48 |
1 files changed, 25 insertions, 23 deletions
diff --git a/tests/tests/text/src/android/text/format/cts/TimeTest.java b/tests/tests/text/src/android/text/format/cts/TimeTest.java index e085a2983b3..f43ad122085 100644 --- a/tests/tests/text/src/android/text/format/cts/TimeTest.java +++ b/tests/tests/text/src/android/text/format/cts/TimeTest.java @@ -2760,29 +2760,31 @@ public class TimeTest { verifyNormalizeResult(false, t, expected, 57724200000L); } - @Test - public void testNormalize_stdToStdSkip() { - // In Kiritimati, 1st Jan 1995 10:00 - 10:40 was a skip from STD -> STD (plus they do not - // observe DST). - String timezone = "Pacific/Kiritimati"; - Time t = new Time(timezone); - Time expected = new Time(timezone); - - // isDst = 0, normalize(false) - Fields.set(t, 1995, 0, 1, 10, 20, 0, 0 /* isDst */, 9, 9, 9); - Fields.set(expected, 1995, 0, 1, 10, 20, 0, 0 /* isDst */, 9, 9, 9); - verifyNormalizeResult(false, t, expected, -1); - - // isDst = 1, normalize(false) - Fields.set(t, 1995, 0, 1, 10, 20, 0, 1 /* isDst */, 9, 9, 9); - Fields.set(expected, 1995, 0, 1, 10, 20, 0, 1 /* isDst */, 9, 9, 9); - verifyNormalizeResult(false, t, expected, -1); - - // isDst = -1, normalize(false) - Fields.set(t, 1995, 0, 1, 10, 20, 0, -1 /* isDst */, 9, 9, 9); - Fields.set(expected, 1995, 0, 1, 10, 20, 0, -1 /* isDst */, 9, 9, 9); - verifyNormalizeResult(false, t, expected, -1); - } + // Removal of test for CTS that is dependent on IANA rules data version. Fails >= 2018d + // http://b/76362687 + // @Test + // public void testNormalize_stdToStdSkip() { + // // In Kiritimati, 1st Jan 1995 10:00 - 10:40 was a skip from STD -> STD (plus they do not + // // observe DST). + // String timezone = "Pacific/Kiritimati"; + // Time t = new Time(timezone); + // Time expected = new Time(timezone); + // + // // isDst = 0, normalize(false) + // Fields.set(t, 1995, 0, 1, 10, 20, 0, 0 /* isDst */, 9, 9, 9); + // Fields.set(expected, 1995, 0, 1, 10, 20, 0, 0 /* isDst */, 9, 9, 9); + // verifyNormalizeResult(false, t, expected, -1); + // + // // isDst = 1, normalize(false) + // Fields.set(t, 1995, 0, 1, 10, 20, 0, 1 /* isDst */, 9, 9, 9); + // Fields.set(expected, 1995, 0, 1, 10, 20, 0, 1 /* isDst */, 9, 9, 9); + // verifyNormalizeResult(false, t, expected, -1); + // + // // isDst = -1, normalize(false) + // Fields.set(t, 1995, 0, 1, 10, 20, 0, -1 /* isDst */, 9, 9, 9); + // Fields.set(expected, 1995, 0, 1, 10, 20, 0, -1 /* isDst */, 9, 9, 9); + // verifyNormalizeResult(false, t, expected, -1); + // } @Test public void testNormalize_utcWithDst() { |