From bc5db687eed091304c21689d080abbd9ca2cd95b Mon Sep 17 00:00:00 2001 From: Slava Volkov Date: Wed, 12 Apr 2023 13:55:17 +0300 Subject: [PATCH] Since Java SE 17 old language codes not converted --- .../build/bundletool/model/utils/ResourcesUtilsTest.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/test/java/com/android/tools/build/bundletool/model/utils/ResourcesUtilsTest.java b/src/test/java/com/android/tools/build/bundletool/model/utils/ResourcesUtilsTest.java index ee9864db..450a456c 100644 --- a/src/test/java/com/android/tools/build/bundletool/model/utils/ResourcesUtilsTest.java +++ b/src/test/java/com/android/tools/build/bundletool/model/utils/ResourcesUtilsTest.java @@ -246,10 +246,13 @@ public void filter_removesEmptyPackagesTypesAndEntries() throws Exception { public void resourcesLocaleConversions_oldLanguageCodes() { // This documents that our converter will use old ISO-639 language codes for backward // compatibility. + // Since Java SE 17, this is no longer the case. - assertThat(ResourcesUtils.convertLocaleToLanguage("he")).isEqualTo("iw"); - assertThat(ResourcesUtils.convertLocaleToLanguage("yi")).isEqualTo("ji"); - assertThat(ResourcesUtils.convertLocaleToLanguage("id")).isEqualTo("in"); + if (System.getProperty("java.version").compareTo("17") < 0) { + assertThat(ResourcesUtils.convertLocaleToLanguage("he")).isEqualTo("iw"); + assertThat(ResourcesUtils.convertLocaleToLanguage("yi")).isEqualTo("ji"); + assertThat(ResourcesUtils.convertLocaleToLanguage("id")).isEqualTo("in"); + } } @Test