calcite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jh...@apache.org
Subject [1/6] incubator-calcite git commit: Revert "Disable tests that fail under JDK 1.7 due to [CALCITE-687]" (Josh Elser)
Date Sun, 13 Sep 2015 04:30:38 GMT
Repository: incubator-calcite
Updated Branches:
  refs/heads/master 16512edc1 -> 25b286070


Revert "Disable tests that fail under JDK 1.7 due to [CALCITE-687]" (Josh Elser)

This reverts commit 948e45671d04f720a71b79f022e143aa480164d4.


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

Branch: refs/heads/master
Commit: d4e31a1cd2bbd36a0e991edd62c84b705125e61a
Parents: 16512ed
Author: Josh Elser <elserj@apache.org>
Authored: Wed Sep 9 17:45:28 2015 -0400
Committer: Julian Hyde <jhyde@apache.org>
Committed: Thu Sep 10 13:52:31 2015 -0700

----------------------------------------------------------------------
 .../org/apache/calcite/avatica/RemoteDriverTest.java     | 11 -----------
 1 file changed, 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/d4e31a1c/avatica-server/src/test/java/org/apache/calcite/avatica/RemoteDriverTest.java
----------------------------------------------------------------------
diff --git a/avatica-server/src/test/java/org/apache/calcite/avatica/RemoteDriverTest.java
b/avatica-server/src/test/java/org/apache/calcite/avatica/RemoteDriverTest.java
index e022ddc..0097309 100644
--- a/avatica-server/src/test/java/org/apache/calcite/avatica/RemoteDriverTest.java
+++ b/avatica-server/src/test/java/org/apache/calcite/avatica/RemoteDriverTest.java
@@ -74,10 +74,6 @@ public class RemoteDriverTest {
 
   private static final ConnectionSpec CONNECTION_SPEC = ConnectionSpec.HSQLDB;
 
-  // see [CALCITE-687] Make RemoteDriverTest.testStatementLifecycle thread-safe
-  private static final boolean JDK17 =
-      System.getProperty("java.version").startsWith("1.7");
-
   private Connection mjs() throws SQLException {
     return DriverManager.getConnection("jdbc:avatica:remote:factory=" + MJS);
   }
@@ -228,9 +224,6 @@ public class RemoteDriverTest {
   }
 
   @Test public void testStatementExecuteQueryLocal() throws Exception {
-    if (JDK17) {
-      return;
-    }
     checkStatementExecuteQuery(ljs(), false);
   }
 
@@ -613,7 +606,6 @@ public class RemoteDriverTest {
     }
   }
 
-  @Ignore("[CALCITE-687] Make RemoteDriverTest.testStatementLifecycle thread-safe")
   @Test public void testConnectionIsolation() throws Exception {
     final String sql = "select * from (values (1, 'a'))";
     Connection conn1 = ljs();
@@ -644,9 +636,6 @@ public class RemoteDriverTest {
   }
 
   @Test public void testPrepareBindExecuteFetch() throws Exception {
-    if (JDK17) {
-      return;
-    }
     LoggingLocalJsonService.THREAD_LOG.get().enableAndClear();
     checkPrepareBindExecuteFetch(ljs());
     List<String[]> x = LoggingLocalJsonService.THREAD_LOG.get().getAndDisable();


Mime
View raw message