TEIID-5628 upgrading poi

teiid · Jan 25, 2019 · dc17730 · dc17730
1 parent 4d31d89
commit dc17730
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/...rs/file/translator-excel/src/test/java/org/teiid/translator/excel/TestExcelExecution.java b/...rs/file/translator-excel/src/test/java/org/teiid/translator/excel/TestExcelExecution.java
@@ -24,6 +24,7 @@
 import java.util.List;
 import java.util.TimeZone;
 
+import org.apache.poi.util.LocaleUtil;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.teiid.cdk.api.TranslationUtility;
@@ -322,7 +323,7 @@ public void testStartBeyondRows() throws Exception {
         //typed as time
         assertEquals("[]", results.toString());
     }
-	
+    
 	@Test
 	public void testTime() throws Exception {
     	VirtualFileConnection connection = Mockito.mock(VirtualFileConnection.class);
@@ -339,7 +340,10 @@ public void testTime() throws Exception {
         assertEquals("[[10:12:14 AM]]", results.toString());
 
 
-        TimestampWithTimezone.resetCalendar(TimeZone.getTimeZone("America/New_York")); //$NON-NLS-1$
+        TimeZone timeZone = TimeZone.getTimeZone("America/New_York");
+        TimeZone defaultTz = TimeZone.getDefault();
+        TimestampWithTimezone.resetCalendar(timeZone); //$NON-NLS-1$
+        LocaleUtil.setUserTimeZone(timeZone);
         try {
             results = helpExecute(ddl, connection, "select \"time\" from Sheet1", false);
             //typed as string without formatting - SQL / Teiid format
@@ -348,6 +352,7 @@ public void testTime() throws Exception {
             assertEquals("[[1899-12-31 10:12:14.0]]", results.toString());
         } finally {
             TimestampWithTimezone.resetCalendar(null);
+            LocaleUtil.setUserTimeZone(defaultTz);
         }
 	}