Merge pull request #1224 from HubSpot/allow-jdk21-build

jasmith-hs · web-flow · commit ce3106c84b65 · 2024-12-06T12:08:21.000-05:00
Change tests to accept jdk21 locales for date/time formatting
diff --git a/src/test/java/com/hubspot/jinjava/interpret/JinjavaInterpreterTest.java b/src/test/java/com/hubspot/jinjava/interpret/JinjavaInterpreterTest.java
@@ -380,7 +380,7 @@ public void itInterpretsFormattedDates() {
       )
     );
 
-    assertThat(result).isEqualTo("Oct 20, 2022, 5:09:43 PM");
+    assertThat(result).isIn("Oct 20, 2022, 5:09:43 PM", "Oct 20, 2022, 5:09:43 PM");
   }
 
   @Test
diff --git a/src/test/java/com/hubspot/jinjava/lib/filter/DateTimeFormatFilterTest.java b/src/test/java/com/hubspot/jinjava/lib/filter/DateTimeFormatFilterTest.java
@@ -125,7 +125,10 @@ public void itConvertsToLocaleSpecificDateTimeFormat() {
         "en-US"
       )
     )
-      .isEqualTo("10/11/18 1:09:45 PM - Oct 11, 2018, 1:09:45 PM");
+      .isIn(
+        "10/11/18 1:09:45 PM - Oct 11, 2018, 1:09:45 PM",
+        "10/11/18 1:09:45 PM - Oct 11, 2018, 1:09:45 PM"
+      );
     assertThat(
       filter.filter(
         1539277785000L,
diff --git a/src/test/java/com/hubspot/jinjava/lib/filter/time/FormatDatetimeFilterTest.java b/src/test/java/com/hubspot/jinjava/lib/filter/time/FormatDatetimeFilterTest.java
@@ -37,7 +37,7 @@ public void itFormatsNumbers() {
     assertThat(
       jinjava.render("{{ d | format_datetime }}", ImmutableMap.of("d", 1668120547000L))
     )
-      .isEqualTo("Nov 10, 2022, 10:49:07 PM");
+      .isIn("Nov 10, 2022, 10:49:07 PM", "Nov 10, 2022, 10:49:07 PM");
   }
 
   @Test
@@ -47,15 +47,15 @@ public void itFormatsPyishDates() {
     assertThat(
       jinjava.render("{{ d | format_datetime }}", ImmutableMap.of("d", pyishDate))
     )
-      .isEqualTo("Nov 10, 2022, 10:49:07 PM");
+      .isIn("Nov 10, 2022, 10:49:07 PM", "Nov 10, 2022, 10:49:07 PM");
   }
 
   @Test
   public void itFormatsZonedDateTime() {
     assertThat(
       jinjava.render("{{ d | format_datetime }}", ImmutableMap.of("d", DATE_TIME))
     )
-      .isEqualTo("Nov 10, 2022, 10:49:07 PM");
+      .isIn("Nov 10, 2022, 10:49:07 PM", "Nov 10, 2022, 10:49:07 PM");
   }
 
   @Test
@@ -78,7 +78,7 @@ public void itUsesShortFormat() {
         ImmutableMap.of("d", DATE_TIME)
       )
     )
-      .isEqualTo("11/10/22, 10:49 PM");
+      .isIn("11/10/22, 10:49 PM", "11/10/22, 10:49 PM");
   }
 
   @Test
@@ -89,23 +89,26 @@ public void itUsesMediumFormat() {
         ImmutableMap.of("d", DATE_TIME)
       )
     )
-      .isEqualTo("Nov 10, 2022, 10:49:07 PM");
+      .isIn("Nov 10, 2022, 10:49:07 PM", "Nov 10, 2022, 10:49:07 PM");
   }
 
   @Test
   public void itUsesLongFormat() {
     assertThat(
       jinjava.render("{{ d | format_datetime('long') }}", ImmutableMap.of("d", DATE_TIME))
     )
-      .isEqualTo("November 10, 2022 at 10:49:07 PM Z");
+      .isIn("November 10, 2022 at 10:49:07 PM Z", "November 10, 2022, 10:49:07 PM Z");
   }
 
   @Test
   public void itUsesFullFormat() {
     assertThat(
       jinjava.render("{{ d | format_datetime('full') }}", ImmutableMap.of("d", DATE_TIME))
     )
-      .isEqualTo("Thursday, November 10, 2022 at 10:49:07 PM Z");
+      .isIn(
+        "Thursday, November 10, 2022 at 10:49:07 PM Z",
+        "Thursday, November 10, 2022, 10:49:07 PM Z"
+      );
   }
 
   @Test
@@ -140,7 +143,7 @@ public void itUsesGivenTimeZone() {
         ImmutableMap.of("d", DATE_TIME)
       )
     )
-      .isEqualTo("November 10, 2022 at 5:49:07 PM EST");
+      .isIn("November 10, 2022 at 5:49:07 PM EST", "November 10, 2022, 5:49:07 PM EST");
   }
 
   @Test
@@ -230,6 +233,6 @@ public void itUsesJinjavaConfigIfNullLocalePassed() {
         ImmutableMap.of("d", DATE_TIME)
       )
     )
-      .isEqualTo("11/10/22, 5:49 PM");
+      .isIn("11/10/22, 5:49 PM", "11/10/22, 5:49 PM");
   }
 }
diff --git a/src/test/java/com/hubspot/jinjava/lib/filter/time/FormatTimeFilterTest.java b/src/test/java/com/hubspot/jinjava/lib/filter/time/FormatTimeFilterTest.java
@@ -37,21 +37,21 @@ public void itFormatsNumbers() {
     assertThat(
       jinjava.render("{{ d | format_time }}", ImmutableMap.of("d", 1668120547000L))
     )
-      .isEqualTo("10:49:07 PM");
+      .isIn("10:49:07 PM", "10:49:07 PM");
   }
 
   @Test
   public void itFormatsPyishDates() {
     PyishDate pyishDate = new PyishDate(1668120547000L);
 
     assertThat(jinjava.render("{{ d | format_time }}", ImmutableMap.of("d", pyishDate)))
-      .isEqualTo("10:49:07 PM");
+      .isIn("10:49:07 PM", "10:49:07 PM");
   }
 
   @Test
   public void itFormatsZonedDateTime() {
     assertThat(jinjava.render("{{ d | format_time }}", ImmutableMap.of("d", DATE_TIME)))
-      .isEqualTo("10:49:07 PM");
+      .isIn("10:49:07 PM", "10:49:07 PM");
   }
 
   @Test
@@ -71,31 +71,31 @@ public void itUsesShortFormat() {
     assertThat(
       jinjava.render("{{ d | format_time('short') }}", ImmutableMap.of("d", DATE_TIME))
     )
-      .isEqualTo("10:49 PM");
+      .isIn("10:49 PM", "10:49 PM");
   }
 
   @Test
   public void itUsesMediumFormat() {
     assertThat(
       jinjava.render("{{ d | format_time('medium') }}", ImmutableMap.of("d", DATE_TIME))
     )
-      .isEqualTo("10:49:07 PM");
+      .isIn("10:49:07 PM", "10:49:07 PM");
   }
 
   @Test
   public void itUsesLongFormat() {
     assertThat(
       jinjava.render("{{ d | format_time('long') }}", ImmutableMap.of("d", DATE_TIME))
     )
-      .isEqualTo("10:49:07 PM Z");
+      .isIn("10:49:07 PM Z", "10:49:07 PM Z");
   }
 
   @Test
   public void itUsesFullFormat() {
     assertThat(
       jinjava.render("{{ d | format_time('full') }}", ImmutableMap.of("d", DATE_TIME))
     )
-      .isEqualTo("10:49:07 PM Z");
+      .isIn("10:49:07 PM Z", "10:49:07 PM Z");
   }
 
   @Test
@@ -127,7 +127,7 @@ public void itUsesGivenTimeZone() {
         ImmutableMap.of("d", DATE_TIME)
       )
     )
-      .isEqualTo("5:49:07 PM EST");
+      .isIn("5:49:07 PM EST", "5:49:07 PM EST");
   }
 
   @Test
@@ -195,7 +195,7 @@ public void itUsesMediumIfNullFormatPassed() {
         ImmutableMap.of("d", DATE_TIME)
       )
     )
-      .isEqualTo("17:49:07");
+      .isIn("17:49:07", "5:49 PM");
   }
 
   @Test
@@ -217,6 +217,6 @@ public void itUsesJinjavaConfigIfNullLocalePassed() {
         ImmutableMap.of("d", DATE_TIME)
       )
     )
-      .isEqualTo("5:49 PM");
+      .isIn("5:49 PM", "5:49 PM");
   }
 }
diff --git a/src/test/java/com/hubspot/jinjava/lib/fn/DateFormatFunctionsTest.java b/src/test/java/com/hubspot/jinjava/lib/fn/DateFormatFunctionsTest.java
@@ -37,7 +37,7 @@ public void itFormatsTimes() {
         ImmutableMap.of("d", ZonedDateTime.of(2022, 11, 28, 16, 30, 4, 0, ZoneOffset.UTC))
       )
     )
-      .isEqualTo("4:30:04 PM");
+      .isIn("4:30:04 PM", "4:30:04 PM");
   }
 
   @Test
@@ -48,6 +48,6 @@ public void itFormatsDateTimes() {
         ImmutableMap.of("d", ZonedDateTime.of(2022, 11, 28, 16, 30, 4, 0, ZoneOffset.UTC))
       )
     )
-      .isEqualTo("Nov 28, 2022, 4:30:04 PM");
+      .isIn("Nov 28, 2022, 4:30:04 PM", "Nov 28, 2022, 4:30:04 PM");
   }
 }
diff --git a/src/test/java/com/hubspot/jinjava/objects/date/StrftimeFormatterTest.java b/src/test/java/com/hubspot/jinjava/objects/date/StrftimeFormatterTest.java
@@ -58,7 +58,8 @@ public void testWithNoPcts() {
 
   @Test
   public void testDateTime() {
-    assertThat(StrftimeFormatter.format(d, "%c")).isEqualTo("Nov 6, 2013, 2:22:00 PM");
+    assertThat(StrftimeFormatter.format(d, "%c"))
+      .isIn("Nov 6, 2013, 2:22:00 PM", "Nov 6, 2013, 2:22:00 PM");
   }
 
   @Test
@@ -73,12 +74,13 @@ public void testDayOfWeekNumber() {
 
   @Test
   public void testTime() {
-    assertThat(StrftimeFormatter.format(d, "%X")).isEqualTo("2:22:00 PM");
+    assertThat(StrftimeFormatter.format(d, "%X")).isIn("2:22:00 PM", "2:22:00 PM");
   }
 
   @Test
   public void testMicrosecs() {
-    assertThat(StrftimeFormatter.format(d, "%X %f")).isEqualTo("2:22:00 PM 123000");
+    assertThat(StrftimeFormatter.format(d, "%X %f"))
+      .isIn("2:22:00 PM 123000", "2:22:00 PM 123000");
   }
 
   @Test
@@ -98,7 +100,7 @@ public void testPaddedMinFmt() {
   @Test
   public void testFinnishMonths() {
     assertThat(StrftimeFormatter.format(d, "long", Locale.forLanguageTag("fi")))
-      .startsWith("6. marraskuuta 2013 klo 14.22.00");
+      .isIn("6. marraskuuta 2013 klo 14.22.00 UTC", "6. marraskuuta 2013 14.22.00 UTC");
   }
 
   @Test

Original file line number	Diff line number	Diff line change
`@@ -380,7 +380,7 @@ public void itInterpretsFormattedDates() {`
`380`	`380`	`)`
`381`	`381`	`);`
`382`	`382`
`383`		`- assertThat(result).isEqualTo("Oct 20, 2022, 5:09:43 PM");`
	`383`	`+ assertThat(result).isIn("Oct 20, 2022, 5:09:43 PM", "Oct 20, 2022, 5:09:43 PM");`
`384`	`384`	`}`
`385`	`385`
`386`	`386`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,10 @@ public void itConvertsToLocaleSpecificDateTimeFormat() {`
`125`	`125`	`"en-US"`
`126`	`126`	`)`
`127`	`127`	`)`
`128`		`- .isEqualTo("10/11/18 1:09:45 PM - Oct 11, 2018, 1:09:45 PM");`
	`128`	`+ .isIn(`
	`129`	`+ "10/11/18 1:09:45 PM - Oct 11, 2018, 1:09:45 PM",`
	`130`	`+ "10/11/18 1:09:45 PM - Oct 11, 2018, 1:09:45 PM"`
	`131`	`+ );`
`129`	`132`	`assertThat(`
`130`	`133`	`filter.filter(`
`131`	`134`	`1539277785000L,`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public void itFormatsNumbers() {`
`37`	`37`	`assertThat(`
`38`	`38`	`jinjava.render("{{ d \| format_datetime }}", ImmutableMap.of("d", 1668120547000L))`
`39`	`39`	`)`
`40`		`- .isEqualTo("Nov 10, 2022, 10:49:07 PM");`
	`40`	`+ .isIn("Nov 10, 2022, 10:49:07 PM", "Nov 10, 2022, 10:49:07 PM");`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`@Test`
`@@ -47,15 +47,15 @@ public void itFormatsPyishDates() {`
`47`	`47`	`assertThat(`
`48`	`48`	`jinjava.render("{{ d \| format_datetime }}", ImmutableMap.of("d", pyishDate))`
`49`	`49`	`)`
`50`		`- .isEqualTo("Nov 10, 2022, 10:49:07 PM");`
	`50`	`+ .isIn("Nov 10, 2022, 10:49:07 PM", "Nov 10, 2022, 10:49:07 PM");`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`@Test`
`54`	`54`	`public void itFormatsZonedDateTime() {`
`55`	`55`	`assertThat(`
`56`	`56`	`jinjava.render("{{ d \| format_datetime }}", ImmutableMap.of("d", DATE_TIME))`
`57`	`57`	`)`
`58`		`- .isEqualTo("Nov 10, 2022, 10:49:07 PM");`
	`58`	`+ .isIn("Nov 10, 2022, 10:49:07 PM", "Nov 10, 2022, 10:49:07 PM");`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`@Test`
`@@ -78,7 +78,7 @@ public void itUsesShortFormat() {`
`78`	`78`	`ImmutableMap.of("d", DATE_TIME)`
`79`	`79`	`)`
`80`	`80`	`)`
`81`		`- .isEqualTo("11/10/22, 10:49 PM");`
	`81`	`+ .isIn("11/10/22, 10:49 PM", "11/10/22, 10:49 PM");`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`@Test`
`@@ -89,23 +89,26 @@ public void itUsesMediumFormat() {`
`89`	`89`	`ImmutableMap.of("d", DATE_TIME)`
`90`	`90`	`)`
`91`	`91`	`)`
`92`		`- .isEqualTo("Nov 10, 2022, 10:49:07 PM");`
	`92`	`+ .isIn("Nov 10, 2022, 10:49:07 PM", "Nov 10, 2022, 10:49:07 PM");`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`@Test`
`96`	`96`	`public void itUsesLongFormat() {`
`97`	`97`	`assertThat(`
`98`	`98`	`jinjava.render("{{ d \| format_datetime('long') }}", ImmutableMap.of("d", DATE_TIME))`
`99`	`99`	`)`
`100`		`- .isEqualTo("November 10, 2022 at 10:49:07 PM Z");`
	`100`	`+ .isIn("November 10, 2022 at 10:49:07 PM Z", "November 10, 2022, 10:49:07 PM Z");`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`@Test`
`104`	`104`	`public void itUsesFullFormat() {`
`105`	`105`	`assertThat(`
`106`	`106`	`jinjava.render("{{ d \| format_datetime('full') }}", ImmutableMap.of("d", DATE_TIME))`
`107`	`107`	`)`
`108`		`- .isEqualTo("Thursday, November 10, 2022 at 10:49:07 PM Z");`
	`108`	`+ .isIn(`
	`109`	`+ "Thursday, November 10, 2022 at 10:49:07 PM Z",`
	`110`	`+ "Thursday, November 10, 2022, 10:49:07 PM Z"`
	`111`	`+ );`
`109`	`112`	`}`
`110`	`113`
`111`	`114`	`@Test`
`@@ -140,7 +143,7 @@ public void itUsesGivenTimeZone() {`
`140`	`143`	`ImmutableMap.of("d", DATE_TIME)`
`141`	`144`	`)`
`142`	`145`	`)`
`143`		`- .isEqualTo("November 10, 2022 at 5:49:07 PM EST");`
	`146`	`+ .isIn("November 10, 2022 at 5:49:07 PM EST", "November 10, 2022, 5:49:07 PM EST");`
`144`	`147`	`}`
`145`	`148`
`146`	`149`	`@Test`
`@@ -230,6 +233,6 @@ public void itUsesJinjavaConfigIfNullLocalePassed() {`
`230`	`233`	`ImmutableMap.of("d", DATE_TIME)`
`231`	`234`	`)`
`232`	`235`	`)`
`233`		`- .isEqualTo("11/10/22, 5:49 PM");`
	`236`	`+ .isIn("11/10/22, 5:49 PM", "11/10/22, 5:49 PM");`
`234`	`237`	`}`
`235`	`238`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,21 +37,21 @@ public void itFormatsNumbers() {`
`37`	`37`	`assertThat(`
`38`	`38`	`jinjava.render("{{ d \| format_time }}", ImmutableMap.of("d", 1668120547000L))`
`39`	`39`	`)`
`40`		`- .isEqualTo("10:49:07 PM");`
	`40`	`+ .isIn("10:49:07 PM", "10:49:07 PM");`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`@Test`
`44`	`44`	`public void itFormatsPyishDates() {`
`45`	`45`	`PyishDate pyishDate = new PyishDate(1668120547000L);`
`46`	`46`
`47`	`47`	`assertThat(jinjava.render("{{ d \| format_time }}", ImmutableMap.of("d", pyishDate)))`
`48`		`- .isEqualTo("10:49:07 PM");`
	`48`	`+ .isIn("10:49:07 PM", "10:49:07 PM");`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`@Test`
`52`	`52`	`public void itFormatsZonedDateTime() {`
`53`	`53`	`assertThat(jinjava.render("{{ d \| format_time }}", ImmutableMap.of("d", DATE_TIME)))`
`54`		`- .isEqualTo("10:49:07 PM");`
	`54`	`+ .isIn("10:49:07 PM", "10:49:07 PM");`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`@Test`
`@@ -71,31 +71,31 @@ public void itUsesShortFormat() {`
`71`	`71`	`assertThat(`
`72`	`72`	`jinjava.render("{{ d \| format_time('short') }}", ImmutableMap.of("d", DATE_TIME))`
`73`	`73`	`)`
`74`		`- .isEqualTo("10:49 PM");`
	`74`	`+ .isIn("10:49 PM", "10:49 PM");`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`@Test`
`78`	`78`	`public void itUsesMediumFormat() {`
`79`	`79`	`assertThat(`
`80`	`80`	`jinjava.render("{{ d \| format_time('medium') }}", ImmutableMap.of("d", DATE_TIME))`
`81`	`81`	`)`
`82`		`- .isEqualTo("10:49:07 PM");`
	`82`	`+ .isIn("10:49:07 PM", "10:49:07 PM");`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`@Test`
`86`	`86`	`public void itUsesLongFormat() {`
`87`	`87`	`assertThat(`
`88`	`88`	`jinjava.render("{{ d \| format_time('long') }}", ImmutableMap.of("d", DATE_TIME))`
`89`	`89`	`)`
`90`		`- .isEqualTo("10:49:07 PM Z");`
	`90`	`+ .isIn("10:49:07 PM Z", "10:49:07 PM Z");`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`@Test`
`94`	`94`	`public void itUsesFullFormat() {`
`95`	`95`	`assertThat(`
`96`	`96`	`jinjava.render("{{ d \| format_time('full') }}", ImmutableMap.of("d", DATE_TIME))`
`97`	`97`	`)`
`98`		`- .isEqualTo("10:49:07 PM Z");`
	`98`	`+ .isIn("10:49:07 PM Z", "10:49:07 PM Z");`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`@Test`
`@@ -127,7 +127,7 @@ public void itUsesGivenTimeZone() {`
`127`	`127`	`ImmutableMap.of("d", DATE_TIME)`
`128`	`128`	`)`
`129`	`129`	`)`
`130`		`- .isEqualTo("5:49:07 PM EST");`
	`130`	`+ .isIn("5:49:07 PM EST", "5:49:07 PM EST");`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`@Test`
`@@ -195,7 +195,7 @@ public void itUsesMediumIfNullFormatPassed() {`
`195`	`195`	`ImmutableMap.of("d", DATE_TIME)`
`196`	`196`	`)`
`197`	`197`	`)`
`198`		`- .isEqualTo("17:49:07");`
	`198`	`+ .isIn("17:49:07", "5:49 PM");`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`@Test`
`@@ -217,6 +217,6 @@ public void itUsesJinjavaConfigIfNullLocalePassed() {`
`217`	`217`	`ImmutableMap.of("d", DATE_TIME)`
`218`	`218`	`)`
`219`	`219`	`)`
`220`		`- .isEqualTo("5:49 PM");`
	`220`	`+ .isIn("5:49 PM", "5:49 PM");`
`221`	`221`	`}`
`222`	`222`	`}`