diff --git a/build.gradle b/build.gradle index 0e683b553e..2aa0b827ec 100644 --- a/build.gradle +++ b/build.gradle @@ -2033,6 +2033,10 @@ project(":base") { testCompile sourceSets.shims.output } + test { + jvmArgs "-Duser.country=US" + } + commonModuleSetup(project, [ 'base' ]) project.ext.moduleSourcePath = defaultModuleSourcePath @@ -2553,7 +2557,7 @@ project(":controls") { test { def cssDir = file("$buildDir/classes/java/main/${moduleName}/javafx") - jvmArgs "-Djavafx.toolkit=test.com.sun.javafx.pgstub.StubToolkit", + jvmArgs "-Duser.country=US", "-Djavafx.toolkit=test.com.sun.javafx.pgstub.StubToolkit", "-DCSS_META_DATA_TEST_DIR=$cssDir" } diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/SpinnerTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/SpinnerTest.java index 438a9a971a..eb3426fd87 100644 --- a/modules/javafx.controls/src/test/java/test/javafx/scene/control/SpinnerTest.java +++ b/modules/javafx.controls/src/test/java/test/javafx/scene/control/SpinnerTest.java @@ -29,8 +29,12 @@ import static junit.framework.Assert.*; import javafx.collections.FXCollections; import javafx.collections.ObservableList; import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.AfterClass; + import org.junit.Ignore; import org.junit.Test; +import java.util.Locale; import java.time.LocalDate; import java.time.LocalTime; @@ -82,6 +86,17 @@ public class SpinnerTest { // used in tests for counting events, reset to zero in setup() private int eventCount; + private static Locale defaultLocale; + + @BeforeClass public static void setOnce() { + defaultLocale = Locale.getDefault(); + Locale.setDefault(Locale.US); + + } + + @AfterClass public static void tearDownOnce() { + Locale.setDefault(defaultLocale); + } @Before public void setup() { eventCount = 0;