From 694e3c782675a937ea1ace1f918e718080e5b86e Mon Sep 17 00:00:00 2001
From: Dominik Stadler <centic@apache.org>
Date: Thu, 8 Feb 2018 19:34:22 +0000
Subject: [PATCH] Bug 62042: Adjust gradle build to properly set the locale

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1823596 13f79535-47bb-0310-9956-ffa450edef68
---
 build.gradle                                         | 12 +++---------
 .../poi/ss/usermodel/BaseTestColumnShifting.java     |  2 +-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index cf32c436f6..5811fe43bc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -101,11 +101,12 @@ subprojects {
 		exclude '**/TestUnfixedBugs.class'
 		exclude '**/TestOneFile.class'
 
-        systemProperties = System.properties
-    
         // set heap size for the test JVM(s)
         minHeapSize = "128m"
         maxHeapSize = "768m"
+
+        // Specifying the local via system properties did not work, so we set them this way
+        jvmArgs '-Duser.language=en -Duser.country=US'
   
         // show standard out and standard error of the test JVM(s) on the console
         //testLogging.showStandardStreams = true
@@ -114,15 +115,8 @@ subprojects {
         systemProperties['user.dir'] = workingDir
         
         systemProperties['POI.testdata.path'] = '../../test-data'
-        //systemProperties['user.language'] = 'en'
-        //systemProperties['user.country'] = 'US'
     }
 
-	test.beforeSuite { TestDescriptor suite ->
-	   System.setProperty('user.language', 'en')
-	   System.setProperty('user.country', 'US')
-	}
-
     jacoco {
         toolVersion = '0.7.9'
     }
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestColumnShifting.java b/src/testcases/org/apache/poi/ss/usermodel/BaseTestColumnShifting.java
index 6184d9405b..0b7aef693e 100644
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestColumnShifting.java
+++ b/src/testcases/org/apache/poi/ss/usermodel/BaseTestColumnShifting.java
@@ -26,7 +26,7 @@ import static org.junit.Assert.assertTrue;
 
 import org.apache.poi.ss.usermodel.helpers.ColumnShifter;
 
-public class BaseTestColumnShifting {
+public abstract class BaseTestColumnShifting {
     protected Workbook wb;
     protected Sheet sheet1;
     protected ColumnShifter columnShifter;
-- 
2.39.5