diff options
| author | Neil Fuller <nfuller@google.com> | 2018-04-12 11:13:05 +0100 |
|---|---|---|
| committer | Neil Fuller <nfuller@google.com> | 2019-01-08 10:00:03 +0000 |
| commit | 6d2ffaca4e8aeed90250680fe8f7d4a62862a3b0 (patch) | |
| tree | f8ab0fe8239bfdc5b673ac9d7fbb6b552deee44a | |
| parent | d564eb07cec8b5effda4ceaf76af0eb0de559d54 (diff) | |
| download | cts-6d2ffaca4e8aeed90250680fe8f7d4a62862a3b0.tar.gz | |
DO NOT MERGE: Remove test that depends on tz data
Commenting out a test that will pass with <= 2018c
time zone data but fail on >= 2018d time zone data.
The has been removed for historic CTS releases because
there should be adequate coverage from the other tests
and it would be more complicated to provide a test
that works on a range of devices. We can expect OEMs
to release system images for some old releases with
>= 2018d data.
Bug: 76362687
Bug: 121365628
Bug: 78868503
Test: build only
Change-Id: Idc277ade6aeb4707fb02c3db46a2d12dc653cb40
(cherry picked from commit e9539f02874b9d6f3f55e4d7db5a79960bf363f9)
(cherry picked from commit c5fc884ec268862fff828d8c276736a39eab3d27)
| -rw-r--r-- | tests/tests/text/src/android/text/format/cts/TimeTest.java | 46 |
1 files changed, 24 insertions, 22 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 cc7327241a7..739ff8c0da5 100644 --- a/tests/tests/text/src/android/text/format/cts/TimeTest.java +++ b/tests/tests/text/src/android/text/format/cts/TimeTest.java @@ -2655,28 +2655,30 @@ public class TimeTest extends AndroidTestCase { assertNormalizeResult(false, t, expected, 57724200000L); } - 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); - assertNormalizeResult(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); - assertNormalizeResult(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); - assertNormalizeResult(false, t, expected, -1); - } + // Removal of test for CTS that is dependent on IANA rules data version. Fails >= 2018d + // http://b/76362687 + // 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); + // assertNormalizeResult(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); + // assertNormalizeResult(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); + // assertNormalizeResult(false, t, expected, -1); + // } public void testNormalize_utcWithDst() { // In UTC (or other zone without DST), what happens when a DST time is specified and there |