From 84f54958bce748b077777fa5d46a192468d30670 Mon Sep 17 00:00:00 2001 From: Slava Volkov Date: Wed, 12 Apr 2023 13:34:53 +0300 Subject: [PATCH] Since Java SE 17 old language codes not converted --- .../commands/PrintDeviceTargetingConfigCommandTest.java | 3 +++ .../bundletool/model/utils/GetSizeCsvUtilsTest.java | 8 ++++++++ .../build/bundletool/model/utils/SizeFormatterTest.java | 9 +++++++++ 3 files changed, 20 insertions(+) diff --git a/src/test/java/com/android/tools/build/bundletool/commands/PrintDeviceTargetingConfigCommandTest.java b/src/test/java/com/android/tools/build/bundletool/commands/PrintDeviceTargetingConfigCommandTest.java index 31c1c69d..511f6f3b 100644 --- a/src/test/java/com/android/tools/build/bundletool/commands/PrintDeviceTargetingConfigCommandTest.java +++ b/src/test/java/com/android/tools/build/bundletool/commands/PrintDeviceTargetingConfigCommandTest.java @@ -29,6 +29,8 @@ import java.io.PrintStream; import java.io.Reader; import java.nio.file.Path; +import java.util.Locale; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -46,6 +48,7 @@ public class PrintDeviceTargetingConfigCommandTest { @Before public void setUp() { Path tmpDir = tmp.getRoot().toPath(); + Locale.setDefault(Locale.forLanguageTag("en-US")); deviceTargetingConfigPath = tmpDir.resolve("config.json"); } diff --git a/src/test/java/com/android/tools/build/bundletool/model/utils/GetSizeCsvUtilsTest.java b/src/test/java/com/android/tools/build/bundletool/model/utils/GetSizeCsvUtilsTest.java index 3989a9f5..887ce614 100644 --- a/src/test/java/com/android/tools/build/bundletool/model/utils/GetSizeCsvUtilsTest.java +++ b/src/test/java/com/android/tools/build/bundletool/model/utils/GetSizeCsvUtilsTest.java @@ -32,13 +32,21 @@ import com.android.tools.build.bundletool.model.SizeConfiguration; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; +import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import java.util.Locale; + @RunWith(JUnit4.class) public class GetSizeCsvUtilsTest { + @Before + public void setUp() { + Locale.setDefault(Locale.forLanguageTag("en-US")); + } + @Test public void getSizeTotalOutputInCsv_emptyDimensions() { assertThat( diff --git a/src/test/java/com/android/tools/build/bundletool/model/utils/SizeFormatterTest.java b/src/test/java/com/android/tools/build/bundletool/model/utils/SizeFormatterTest.java index 62f488dc..4cd4985a 100644 --- a/src/test/java/com/android/tools/build/bundletool/model/utils/SizeFormatterTest.java +++ b/src/test/java/com/android/tools/build/bundletool/model/utils/SizeFormatterTest.java @@ -17,13 +17,22 @@ import static com.google.common.truth.Truth.assertThat; +import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import java.nio.file.Path; +import java.util.Locale; + @RunWith(JUnit4.class) public class SizeFormatterTest { + @Before + public void setUp() { + Locale.setDefault(Locale.forLanguageTag("en-US")); + } + @Test public void rawFormatter() { SizeFormatter formatter = SizeFormatter.rawFormatter();