Merge pull request #531 from IBM/lee-master

issue #528 - use UTC in DateTimeHandlerTest and ParameterExtractionTest
LinuxForHealth · Dec 21, 2019 · 03ecee6 · 03ecee6
2 parents d90a288 + 69d39c6
commit 03ecee6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/...e-jdbc/src/test/java/com/ibm/fhir/persistence/jdbc/test/util/ParameterExtractionTest.java b/...e-jdbc/src/test/java/com/ibm/fhir/persistence/jdbc/test/util/ParameterExtractionTest.java
@@ -18,7 +18,9 @@
 import java.time.format.DateTimeFormatterBuilder;
 import java.time.temporal.ChronoField;
 import java.util.List;
+import java.util.TimeZone;
 
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 import com.ibm.fhir.model.resource.SearchParameter;
@@ -99,6 +101,11 @@ public class ParameterExtractionTest {
     private static final SearchParameter stringSearchParam = searchParamBuilder.type(SearchParamType.STRING).build();
     private static final SearchParameter tokenSearchParam = searchParamBuilder.type(SearchParamType.TOKEN).build();
 
+    @BeforeClass
+    public void setSystemTimeZone() {
+        TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+    }
+
     @Test
     public void testBoolean() throws FHIRPersistenceProcessorException {
         JDBCParameterBuildingVisitor parameterBuilder = new JDBCParameterBuildingVisitor(tokenSearchParam);

diff --git a/fhir-search/src/test/java/com/ibm/fhir/search/date/DateTimeHandlerTest.java b/fhir-search/src/test/java/com/ibm/fhir/search/date/DateTimeHandlerTest.java
@@ -14,7 +14,9 @@
 import java.time.Instant;
 import java.time.temporal.ChronoField;
 import java.time.temporal.TemporalAccessor;
+import java.util.TimeZone;
 
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 import com.ibm.fhir.model.type.DateTime;
@@ -23,6 +25,11 @@
 
 public class DateTimeHandlerTest {
 
+    @BeforeClass
+    public void setSystemTimeZone() {
+        TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+    }
+
     @Test
     public void testYearParser() throws FHIRSearchException {
         TemporalAccessor acc = DateTimeHandler.parse("2019");