From 2d8ba3e4a48d8672fa58eec2d7f7e56b714ef7b4 Mon Sep 17 00:00:00 2001 From: Foivos Zakkak Date: Fri, 4 Oct 2024 16:48:28 +0300 Subject: [PATCH] Re-enable tests for GraalVM >= 24.2 --- .../test/java/io/quarkus/locales/it/LocalesIT.java | 4 ++-- .../all/src/test/resources/application.properties | 1 + .../test/java/io/quarkus/locales/it/LocalesIT.java | 14 +++++--------- .../some/src/test/resources/application.properties | 3 ++- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/integration-tests/locales/all/src/test/java/io/quarkus/locales/it/LocalesIT.java b/integration-tests/locales/all/src/test/java/io/quarkus/locales/it/LocalesIT.java index c772350d57a6c..b08dd85b66ef4 100644 --- a/integration-tests/locales/all/src/test/java/io/quarkus/locales/it/LocalesIT.java +++ b/integration-tests/locales/all/src/test/java/io/quarkus/locales/it/LocalesIT.java @@ -134,7 +134,7 @@ public void testValidationMessageLocale(String acceptLanguage, String expectedMe // This test works best in a non-english locale. @Test @DisableIfBuiltWithGraalVMNewerThan(value = GraalVMVersion.GRAALVM_24_1_999) - public void testDefaultLocaleBefore24_2() { + public void testDefaultLocalePre24_2() { RestAssured.given().when() .get("/default/de-CH") .then() @@ -147,7 +147,7 @@ public void testDefaultLocaleBefore24_2() { // This test works best in a non-english locale. @Test @DisableIfBuiltWithGraalVMOlderThan(value = GraalVMVersion.GRAALVM_24_2_0) - public void testDefaultLocaleAfter24_1() { + public void testDefaultLocalePost24_1() { RestAssured.given().when() .get("/default/de-CH") .then() diff --git a/integration-tests/locales/all/src/test/resources/application.properties b/integration-tests/locales/all/src/test/resources/application.properties index acc6621c863f2..3344cc17ceb05 100644 --- a/integration-tests/locales/all/src/test/resources/application.properties +++ b/integration-tests/locales/all/src/test/resources/application.properties @@ -1,2 +1,3 @@ quarkus.locales=all quarkus.native.resources.includes=AppMessages_*.properties +quarkus.test.env.LC_ALL=mt_MT.UTF-8 \ No newline at end of file diff --git a/integration-tests/locales/some/src/test/java/io/quarkus/locales/it/LocalesIT.java b/integration-tests/locales/some/src/test/java/io/quarkus/locales/it/LocalesIT.java index 1df4aa0c841cc..3f062fcd844ae 100644 --- a/integration-tests/locales/some/src/test/java/io/quarkus/locales/it/LocalesIT.java +++ b/integration-tests/locales/some/src/test/java/io/quarkus/locales/it/LocalesIT.java @@ -44,9 +44,6 @@ public void testCorrectLocales(String country, String language, String translati .log().all(); } - // Disable test with GraalVM 24.2 for JDK 24 and later till we reach a conclusion in - // https://github.com/quarkusio/quarkus/discussions/43533 - @DisableIfBuiltWithGraalVMNewerThan(value = GraalVMVersion.GRAALVM_24_1_0) @ParameterizedTest @CsvSource(value = { "en-US|en|US Dollar", @@ -66,9 +63,6 @@ public void testCurrencies(String country, String language, String currency) { .log().all(); } - // Disable test with GraalVM 24.2 for JDK 24 and later till we reach a conclusion in - // https://github.com/quarkusio/quarkus/discussions/43533 - @DisableIfBuiltWithGraalVMNewerThan(value = GraalVMVersion.GRAALVM_24_1_0) @ParameterizedTest @CsvSource(value = { "Asia/Tokyo|fr|heure normale du Japon", @@ -90,13 +84,14 @@ public void testTimeZones(String zone, String language, String name) { } @Test - @DisableIfBuiltWithGraalVMNewerThan(value = GraalVMVersion.GRAALVM_24_1_0) - public void testDefaultLocaleBefore24_2() { + @DisableIfBuiltWithGraalVMNewerThan(value = GraalVMVersion.GRAALVM_24_1_999) + public void testDefaultLocalePre24_2() { RestAssured.given().when() .get("/default/de-CH") .then() .statusCode(HttpStatus.SC_OK) /* + * Prior to GraalVM 24.2, the locale could not be changed at runtime. * "Švýcarsko" is the correct name for Switzerland in Czech language. * Czech is the default language as per quarkus.native.user-language=cs. */ @@ -106,12 +101,13 @@ public void testDefaultLocaleBefore24_2() { @Test @DisableIfBuiltWithGraalVMOlderThan(value = GraalVMVersion.GRAALVM_24_2_0) - public void testDefaultLocaleAfter24_1() { + public void testDefaultLocalePost24_1() { RestAssured.given().when() .get("/default/de-CH") .then() .statusCode(HttpStatus.SC_OK) /* + * Starting with GraalVM 24.2, the locale can be set at runtime. * "Schweiz" is the correct name for Switzerland in German. * German is the default language as per the `quarkus.test.arg-line` in application.properties. */ diff --git a/integration-tests/locales/some/src/test/resources/application.properties b/integration-tests/locales/some/src/test/resources/application.properties index 4617c6481b6d1..d5f80d916383d 100644 --- a/integration-tests/locales/some/src/test/resources/application.properties +++ b/integration-tests/locales/some/src/test/resources/application.properties @@ -3,4 +3,5 @@ quarkus.locales=de,fr-FR,ja,uk-UA # used in your application properties. This test uses it only to verify compatibility. quarkus.native.user-language=cs quarkus.default-locale=en-US -quarkus.test.arg-line=-Duser.language=de \ No newline at end of file +quarkus.test.arg-line=-Duser.language=de +quarkus.test.env.LC_ALL=mt_MT.UTF-8 \ No newline at end of file