calcite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jh...@apache.org
Subject [2/2] incubator-calcite git commit: Australian time-zones changed in tzdata2014f, Java 1.8.0_31
Date Wed, 11 Feb 2015 20:58:55 GMT
Australian time-zones changed in tzdata2014f, Java 1.8.0_31


Project: http://git-wip-us.apache.org/repos/asf/incubator-calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-calcite/commit/9ffba4a5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-calcite/tree/9ffba4a5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-calcite/diff/9ffba4a5

Branch: refs/heads/master
Commit: 9ffba4a5f0ba83bac157a2c8ea1f800e3f3fcaa6
Parents: e0b3c4a
Author: Julian Hyde <jhyde@apache.org>
Authored: Wed Feb 11 12:32:05 2015 -0800
Committer: Julian Hyde <jhyde@apache.org>
Committed: Wed Feb 11 12:34:32 2015 -0800

----------------------------------------------------------------------
 core/src/test/java/org/apache/calcite/util/UtilTest.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/9ffba4a5/core/src/test/java/org/apache/calcite/util/UtilTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/util/UtilTest.java b/core/src/test/java/org/apache/calcite/util/UtilTest.java
index c808587..980a5eb 100644
--- a/core/src/test/java/org/apache/calcite/util/UtilTest.java
+++ b/core/src/test/java/org/apache/calcite/util/UtilTest.java
@@ -473,11 +473,14 @@ public class UtilTest {
         Util.toPosix(TimeZone.getTimeZone("Australia/Sydney"), true);
 
     if (posixTime.equals("EST10EST1,M10.5.0/2,M3.5.0/3")) {
-      // older JVMs without the fix
+      // very old JVMs without the fix
       assertEquals("EST10EST1,M10.5.0/2,M3.5.0/3", posixTime);
+    } else if (posixTime.equals("EST10EST1,M10.1.0/2,M4.1.0/3")) {
+      // old JVMs without the fix
+      assertEquals("EST10EST1,M10.1.0/2,M4.1.0/3", posixTime);
     } else {
       // newer JVMs with the fix
-      assertEquals("EST10EST1,M10.1.0/2,M4.1.0/3", posixTime);
+      assertEquals("AEST10AEDT1,M10.1.0/2,M4.1.0/3", posixTime);
     }
 
     // Paris, France. (Uses UTC_TIME time-transition mode.)


Mime
View raw message