From 1fe228726ad65966d3eeeabe0b31f3f550536686 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 30 Jun 2025 16:45:55 +0200 Subject: [PATCH] Fix test regression on API 33. --- .../impl/DefaultDateFormatterFrTest.kt | 8 ++--- .../impl/DefaultDateFormatterTest.kt | 36 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/DefaultDateFormatterFrTest.kt b/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/DefaultDateFormatterFrTest.kt index 355ab6815c..aa78aeba59 100644 --- a/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/DefaultDateFormatterFrTest.kt +++ b/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/DefaultDateFormatterFrTest.kt @@ -34,7 +34,7 @@ class DefaultDateFormatterFrTest { assertThat(formatter.format(ts, DateFormatterMode.Full)).isEqualTo("1 janvier 1970 à 00:00") assertThat(formatter.format(ts, DateFormatterMode.Month)).isEqualTo("Janvier 1970") assertThat(formatter.format(ts, DateFormatterMode.Day)).isEqualTo("1 janvier 1970") - assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate)).isEqualTo("01.01.1970") + assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate)).isEqualTo("01/01/1970") assertThat(formatter.format(ts, DateFormatterMode.TimeOnly)).isEqualTo("00:00") } @@ -46,7 +46,7 @@ class DefaultDateFormatterFrTest { assertThat(formatter.format(ts, DateFormatterMode.Full, true)).isEqualTo("1 janvier 1970 à 00:00") assertThat(formatter.format(ts, DateFormatterMode.Month, true)).isEqualTo("Janvier 1970") assertThat(formatter.format(ts, DateFormatterMode.Day, true)).isEqualTo("1 janvier 1970") - assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate, true)).isEqualTo("01.01.1970") + assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate, true)).isEqualTo("01/01/1970") assertThat(formatter.format(ts, DateFormatterMode.TimeOnly, true)).isEqualTo("00:00") } @@ -241,7 +241,7 @@ class DefaultDateFormatterFrTest { assertThat(formatter.format(ts, DateFormatterMode.Full)).isEqualTo("6 avril 1979 à 18:35") assertThat(formatter.format(ts, DateFormatterMode.Month)).isEqualTo("Avril 1979") assertThat(formatter.format(ts, DateFormatterMode.Day)).isEqualTo("6 avril 1979") - assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate)).isEqualTo("06.04.1979") + assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate)).isEqualTo("06/04/1979") assertThat(formatter.format(ts, DateFormatterMode.TimeOnly)).isEqualTo("18:35") } @@ -254,7 +254,7 @@ class DefaultDateFormatterFrTest { assertThat(formatter.format(ts, DateFormatterMode.Full, true)).isEqualTo("6 avril 1979 à 18:35") assertThat(formatter.format(ts, DateFormatterMode.Month, true)).isEqualTo("Avril 1979") assertThat(formatter.format(ts, DateFormatterMode.Day, true)).isEqualTo("6 avril 1979") - assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate, true)).isEqualTo("06.04.1979") + assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate, true)).isEqualTo("06/04/1979") assertThat(formatter.format(ts, DateFormatterMode.TimeOnly, true)).isEqualTo("18:35") } } diff --git a/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/DefaultDateFormatterTest.kt b/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/DefaultDateFormatterTest.kt index 27ae9c3238..a4d02fc2ab 100644 --- a/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/DefaultDateFormatterTest.kt +++ b/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/DefaultDateFormatterTest.kt @@ -34,7 +34,7 @@ class DefaultDateFormatterTest { assertThat(formatter.format(ts, DateFormatterMode.Full)).isEqualTo("January 1, 1970 at 12:00 AM") assertThat(formatter.format(ts, DateFormatterMode.Month)).isEqualTo("January 1970") assertThat(formatter.format(ts, DateFormatterMode.Day)).isEqualTo("January 1, 1970") - assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate)).isEqualTo("01.01.1970") + assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate)).isEqualTo("01/01/1970") assertThat(formatter.format(ts, DateFormatterMode.TimeOnly)).isEqualTo("12:00 AM") } @@ -46,7 +46,7 @@ class DefaultDateFormatterTest { assertThat(formatter.format(ts, DateFormatterMode.Full, true)).isEqualTo("January 1, 1970 at 12:00 AM") assertThat(formatter.format(ts, DateFormatterMode.Month, true)).isEqualTo("January 1970") assertThat(formatter.format(ts, DateFormatterMode.Day, true)).isEqualTo("January 1, 1970") - assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate, true)).isEqualTo("01.01.1970") + assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate, true)).isEqualTo("01/01/1970") assertThat(formatter.format(ts, DateFormatterMode.TimeOnly, true)).isEqualTo("12:00 AM") } @@ -58,7 +58,7 @@ class DefaultDateFormatterTest { val formatter = createFormatter(now) assertThat(formatter.format(ts, DateFormatterMode.Full)).isEqualTo("April 6, 1980 at 6:35 PM") assertThat(formatter.format(ts, DateFormatterMode.Month)).isEqualTo("April 1980") - assertThat(formatter.format(ts, DateFormatterMode.Day)).isEqualTo("Sunday 6 April") + assertThat(formatter.format(ts, DateFormatterMode.Day)).isEqualTo("Sunday, April 6") assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate)).isEqualTo("6:35 PM") assertThat(formatter.format(ts, DateFormatterMode.TimeOnly)).isEqualTo("6:35 PM") } @@ -84,7 +84,7 @@ class DefaultDateFormatterTest { val formatter = createFormatter(now) assertThat(formatter.format(ts, DateFormatterMode.Full)).isEqualTo("April 6, 1980 at 6:35 PM") assertThat(formatter.format(ts, DateFormatterMode.Month)).isEqualTo("April 1980") - assertThat(formatter.format(ts, DateFormatterMode.Day)).isEqualTo("Sunday 6 April") + assertThat(formatter.format(ts, DateFormatterMode.Day)).isEqualTo("Sunday, April 6") assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate)).isEqualTo("6:35 PM") assertThat(formatter.format(ts, DateFormatterMode.TimeOnly)).isEqualTo("6:35 PM") } @@ -110,7 +110,7 @@ class DefaultDateFormatterTest { val formatter = createFormatter(now) assertThat(formatter.format(ts, DateFormatterMode.Full)).isEqualTo("April 6, 1980 at 6:34 PM") assertThat(formatter.format(ts, DateFormatterMode.Month)).isEqualTo("April 1980") - assertThat(formatter.format(ts, DateFormatterMode.Day)).isEqualTo("Sunday 6 April") + assertThat(formatter.format(ts, DateFormatterMode.Day)).isEqualTo("Sunday, April 6") assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate)).isEqualTo("6:34 PM") assertThat(formatter.format(ts, DateFormatterMode.TimeOnly)).isEqualTo("6:34 PM") } @@ -136,7 +136,7 @@ class DefaultDateFormatterTest { val formatter = createFormatter(now) assertThat(formatter.format(ts, DateFormatterMode.Full)).isEqualTo("April 6, 1980 at 5:35 PM") assertThat(formatter.format(ts, DateFormatterMode.Month)).isEqualTo("April 1980") - assertThat(formatter.format(ts, DateFormatterMode.Day)).isEqualTo("Sunday 6 April") + assertThat(formatter.format(ts, DateFormatterMode.Day)).isEqualTo("Sunday, April 6") assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate)).isEqualTo("5:35 PM") assertThat(formatter.format(ts, DateFormatterMode.TimeOnly)).isEqualTo("5:35 PM") } @@ -162,8 +162,8 @@ class DefaultDateFormatterTest { val formatter = createFormatter(now) assertThat(formatter.format(ts, DateFormatterMode.Full)).isEqualTo("April 5, 1980 at 6:35 PM") assertThat(formatter.format(ts, DateFormatterMode.Month)).isEqualTo("April 1980") - assertThat(formatter.format(ts, DateFormatterMode.Day)).isEqualTo("Saturday 5 April") - assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate)).isEqualTo("5 Apr") + assertThat(formatter.format(ts, DateFormatterMode.Day)).isEqualTo("Saturday, April 5") + assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate)).isEqualTo("Apr 5") assertThat(formatter.format(ts, DateFormatterMode.TimeOnly)).isEqualTo("6:35 PM") } @@ -188,8 +188,8 @@ class DefaultDateFormatterTest { val formatter = createFormatter(now) assertThat(formatter.format(ts, DateFormatterMode.Full)).isEqualTo("April 4, 1980 at 6:35 PM") assertThat(formatter.format(ts, DateFormatterMode.Month)).isEqualTo("April 1980") - assertThat(formatter.format(ts, DateFormatterMode.Day)).isEqualTo("Friday 4 April") - assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate)).isEqualTo("4 Apr") + assertThat(formatter.format(ts, DateFormatterMode.Day)).isEqualTo("Friday, April 4") + assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate)).isEqualTo("Apr 4") assertThat(formatter.format(ts, DateFormatterMode.TimeOnly)).isEqualTo("6:35 PM") } @@ -202,7 +202,7 @@ class DefaultDateFormatterTest { assertThat(formatter.format(ts, DateFormatterMode.Full, true)).isEqualTo("Friday at 6:35 PM") assertThat(formatter.format(ts, DateFormatterMode.Month, true)).isEqualTo("This month") assertThat(formatter.format(ts, DateFormatterMode.Day, true)).isEqualTo("Friday") - assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate, true)).isEqualTo("4 Apr") + assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate, true)).isEqualTo("Apr 4") assertThat(formatter.format(ts, DateFormatterMode.TimeOnly, true)).isEqualTo("6:35 PM") } @@ -214,8 +214,8 @@ class DefaultDateFormatterTest { val formatter = createFormatter(now) assertThat(formatter.format(ts, DateFormatterMode.Full)).isEqualTo("March 6, 1980 at 6:35 PM") assertThat(formatter.format(ts, DateFormatterMode.Month)).isEqualTo("March 1980") - assertThat(formatter.format(ts, DateFormatterMode.Day)).isEqualTo("Thursday 6 March") - assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate)).isEqualTo("6 Mar") + assertThat(formatter.format(ts, DateFormatterMode.Day)).isEqualTo("Thursday, March 6") + assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate)).isEqualTo("Mar 6") assertThat(formatter.format(ts, DateFormatterMode.TimeOnly)).isEqualTo("6:35 PM") } @@ -225,10 +225,10 @@ class DefaultDateFormatterTest { val dat = "1980-03-06T18:35:24.00Z" val ts = Instant.parse(dat).toEpochMilliseconds() val formatter = createFormatter(now) - assertThat(formatter.format(ts, DateFormatterMode.Full, true)).isEqualTo("Thursday 6 March at 6:35 PM") + assertThat(formatter.format(ts, DateFormatterMode.Full, true)).isEqualTo("Thursday, March 6 at 6:35 PM") assertThat(formatter.format(ts, DateFormatterMode.Month, true)).isEqualTo("March 1980") - assertThat(formatter.format(ts, DateFormatterMode.Day, true)).isEqualTo("Thursday 6 March") - assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate, true)).isEqualTo("6 Mar") + assertThat(formatter.format(ts, DateFormatterMode.Day, true)).isEqualTo("Thursday, March 6") + assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate, true)).isEqualTo("Mar 6") assertThat(formatter.format(ts, DateFormatterMode.TimeOnly, true)).isEqualTo("6:35 PM") } @@ -241,7 +241,7 @@ class DefaultDateFormatterTest { assertThat(formatter.format(ts, DateFormatterMode.Full)).isEqualTo("April 6, 1979 at 6:35 PM") assertThat(formatter.format(ts, DateFormatterMode.Month)).isEqualTo("April 1979") assertThat(formatter.format(ts, DateFormatterMode.Day)).isEqualTo("April 6, 1979") - assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate)).isEqualTo("06.04.1979") + assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate)).isEqualTo("04/06/1979") assertThat(formatter.format(ts, DateFormatterMode.TimeOnly)).isEqualTo("6:35 PM") } @@ -254,7 +254,7 @@ class DefaultDateFormatterTest { assertThat(formatter.format(ts, DateFormatterMode.Full, true)).isEqualTo("April 6, 1979 at 6:35 PM") assertThat(formatter.format(ts, DateFormatterMode.Month, true)).isEqualTo("April 1979") assertThat(formatter.format(ts, DateFormatterMode.Day, true)).isEqualTo("April 6, 1979") - assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate, true)).isEqualTo("06.04.1979") + assertThat(formatter.format(ts, DateFormatterMode.TimeOrDate, true)).isEqualTo("04/06/1979") assertThat(formatter.format(ts, DateFormatterMode.TimeOnly, true)).isEqualTo("6:35 PM") } }