Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbe922a7 authored by Victor Chang's avatar Victor Chang Committed by Gerrit Code Review
Browse files

Merge changes from topic "icu71" 

* changes:
  Update DateIntervalFormatTest due to ICU 71 upgrade
  Regenerate LocaleDataTables.cpp due to ICU 71 upgrade
parents 8032074e 16d85876

core/tests/coretests/src/android/text/format/DateIntervalFormatTest.java

+11 −11
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ public class DateIntervalFormatTest { 


        assertEquals("January 1, 1970, 22:00 – 00:00",

                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));

    }
@@ -445,7 +445,7 @@ public class DateIntervalFormatTest { 
        long jan_1_1980 = c.getTimeInMillis();

        assertEquals("January 1, 1980, 22:00 – 00:00",

                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,

                        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;



        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;

        assertEquals("Sunday, November 24, 1833, 17:31",

        assertEquals("Sunday, November 24, 1833 at 17:31",

                formatDateRange(l, utc, t1833, t1833, flags));



        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));



        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));



        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));

    }
@@ -631,18 +631,18 @@ public class DateIntervalFormatTest { 
        // behaviour of suppressing the date for the end...

        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.

        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));

        // 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.

        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));

        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));

        // We want to show the date if the start-point is anything less than a minute after

      // 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));

        // ...but not if it is exactly one minute after midnight.

        assertEquals("February 27, 2007, 00:01 – 00:00", fmt.apply(1172534460000L, 1172620800000L));

libs/androidfw/LocaleDataTables.cpp

+1208 −1183

File changed.

Preview size limit exceeded, changes collapsed.