Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "icu71" am: cbe922a79b am: e73a4dc9ae

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2116805

Change-Id: I0045eb72d4333672a01f57d526561113b9ad5b76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Victor Chang
2022-06-08 13:19:28 +00:00
committed by Automerger Merge Worker
parent b692927cfe e73a4dc9ae
commit f4a0c5d429
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/tests/coretests/src/android/text/format/DateIntervalFormatTest.java
View File

@@ -426,7 +426,7 @@ public class DateIntervalFormatTest {
assertEquals("January 1, 1970, 22:00 – 00:00", assertEquals("January 1, 1970, 22:00 – 00:00",
formatDateRange(l, utc, 22 * HOUR, 24 * HOUR, flags)); formatDateRange(l, utc, 22 * HOUR, 24 * HOUR, flags));
assertEquals("January 1, 1970, 22:00 – January 2, 1970, 00:30", assertEquals("January 1, 1970 at 22:00 – January 2, 1970 at 00:30",
formatDateRange(l, utc, 22 * HOUR, 24 * HOUR + 30 * MINUTE, flags)); formatDateRange(l, utc, 22 * HOUR, 24 * HOUR + 30 * MINUTE, flags));
} }
@@ -445,7 +445,7 @@ public class DateIntervalFormatTest {
long jan_1_1980 = c.getTimeInMillis(); long jan_1_1980 = c.getTimeInMillis();
assertEquals("January 1, 1980, 22:00 – 00:00", assertEquals("January 1, 1980, 22:00 – 00:00",
formatDateRange(l, utc, jan_1_1980 + 22 * HOUR, jan_1_1980 + 24 * HOUR, flags)); formatDateRange(l, utc, jan_1_1980 + 22 * HOUR, jan_1_1980 + 24 * HOUR, flags));
assertEquals("January 1, 1980, 22:00 – January 2, 1980, 00:30", assertEquals("January 1, 1980 at 22:00 – January 2, 1980 at 00:30",
formatDateRange(l, utc, jan_1_1980 + 22 * HOUR, formatDateRange(l, utc, jan_1_1980 + 22 * HOUR,
jan_1_1980 + 24 * HOUR + 30 * MINUTE, flags)); jan_1_1980 + 24 * HOUR + 30 * MINUTE, flags));
} }
@@ -481,22 +481,22 @@ public class DateIntervalFormatTest {
int flags = FORMAT_SHOW_DATE | FORMAT_SHOW_WEEKDAY | FORMAT_SHOW_TIME | FORMAT_24HOUR; int flags = FORMAT_SHOW_DATE | FORMAT_SHOW_WEEKDAY | FORMAT_SHOW_TIME | FORMAT_24HOUR;
assertEquals("Thursday, January 1, 1970, 00:00", formatDateRange(l, utc, 0L, 0L, flags)); assertEquals("Thursday, January 1, 1970 at 00:00", formatDateRange(l, utc, 0L, 0L, flags));
long t1833 = ((long) Integer.MIN_VALUE + Integer.MIN_VALUE) * 1000L; long t1833 = ((long) Integer.MIN_VALUE + Integer.MIN_VALUE) * 1000L;
assertEquals("Sunday, November 24, 1833, 17:31", assertEquals("Sunday, November 24, 1833 at 17:31",
formatDateRange(l, utc, t1833, t1833, flags)); formatDateRange(l, utc, t1833, t1833, flags));
long t1901 = Integer.MIN_VALUE * 1000L; long t1901 = Integer.MIN_VALUE * 1000L;
assertEquals("Friday, December 13, 1901, 20:45", assertEquals("Friday, December 13, 1901 at 20:45",
formatDateRange(l, utc, t1901, t1901, flags)); formatDateRange(l, utc, t1901, t1901, flags));
long t2038 = Integer.MAX_VALUE * 1000L; long t2038 = Integer.MAX_VALUE * 1000L;
assertEquals("Tuesday, January 19, 2038, 03:14", assertEquals("Tuesday, January 19, 2038 at 03:14",
formatDateRange(l, utc, t2038, t2038, flags)); formatDateRange(l, utc, t2038, t2038, flags));
long t2106 = (2L + Integer.MAX_VALUE + Integer.MAX_VALUE) * 1000L; long t2106 = (2L + Integer.MAX_VALUE + Integer.MAX_VALUE) * 1000L;
assertEquals("Sunday, February 7, 2106, 06:28", assertEquals("Sunday, February 7, 2106 at 06:28",
formatDateRange(l, utc, t2106, t2106, flags)); formatDateRange(l, utc, t2106, t2106, flags));
} }
@@ -631,18 +631,18 @@ public class DateIntervalFormatTest {
// behaviour of suppressing the date for the end... // behaviour of suppressing the date for the end...
assertEquals("February 27, 2007, 04:00 – 00:00", fmt.apply(1172548800000L, 1172620800000L)); assertEquals("February 27, 2007, 04:00 – 00:00", fmt.apply(1172548800000L, 1172620800000L));
// ...unless the start-point is also midnight, in which case we need dates to disambiguate. // ...unless the start-point is also midnight, in which case we need dates to disambiguate.
assertEquals("February 27, 2007, 00:00 – February 28, 2007, 00:00", assertEquals("February 27, 2007 at 00:00 – February 28, 2007 at 00:00",
fmt.apply(1172534400000L, 1172620800000L)); fmt.apply(1172534400000L, 1172620800000L));
// We want to show the date if the end-point is a millisecond after midnight the following // We want to show the date if the end-point is a millisecond after midnight the following
// day, or if it is exactly midnight the day after that. // day, or if it is exactly midnight the day after that.
assertEquals("February 27, 2007, 04:00 – February 28, 2007, 00:00", assertEquals("February 27, 2007 at 04:00 – February 28, 2007 at 00:00",
fmt.apply(1172548800000L, 1172620800001L)); fmt.apply(1172548800000L, 1172620800001L));
assertEquals("February 27, 2007, 04:00 – March 1, 2007, 00:00", assertEquals("February 27, 2007 at 04:00 – March 1, 2007 at 00:00",
fmt.apply(1172548800000L, 1172707200000L)); fmt.apply(1172548800000L, 1172707200000L));
// We want to show the date if the start-point is anything less than a minute after // We want to show the date if the start-point is anything less than a minute after
// midnight, // midnight,
// since that gets displayed as midnight... // since that gets displayed as midnight...
assertEquals("February 27, 2007, 00:00 – February 28, 2007, 00:00", assertEquals("February 27, 2007 at 00:00 – February 28, 2007 at 00:00",
fmt.apply(1172534459999L, 1172620800000L)); fmt.apply(1172534459999L, 1172620800000L));
// ...but not if it is exactly one minute after midnight. // ...but not if it is exactly one minute after midnight.
assertEquals("February 27, 2007, 00:01 – 00:00", fmt.apply(1172534460000L, 1172620800000L)); assertEquals("February 27, 2007, 00:01 – 00:00", fmt.apply(1172534460000L, 1172620800000L));