Repository: calcite Updated Branches: refs/heads/master 446c2b761 -> 5c6a94f4b
[CALCITE-1567] JDK9 support for Avatica 97 tests are disabled because Mockito doesn't work under JDK9. I have logged [CALCITE-1568] to re-enable them when Mockito is fixed. Project: http://git-wip-us.apache.org/repos/asf/calcite/repo Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/5c6a94f4 Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/5c6a94f4 Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/5c6a94f4 Branch: refs/heads/master Commit: 5c6a94f4beb10fd73adc324ca9f906a9a5970d8c Parents: 446c2b7 Author: Julian Hyde <[email protected]> Authored: Fri Jan 6 18:26:12 2017 -0800 Committer: Julian Hyde <[email protected]> Committed: Sat Jan 7 19:12:27 2017 -0800 ---------------------------------------------------------------------- .../calcite/avatica/AvaticaConnectionTest.java | 4 ++ .../calcite/avatica/AvaticaStatementTest.java | 4 ++ .../apache/calcite/avatica/QueryStateTest.java | 4 ++ .../avatica/remote/AbstractHandlerTest.java | 7 +++ .../AvaticaCommonsHttpClientImplTest.java | 7 +++ .../avatica/remote/AvaticaHttpClientTest.java | 7 +++ .../avatica/remote/KerberosConnectionTest.java | 7 +++ .../avatica/remote/ProtobufHandlerTest.java | 4 ++ .../dropwizard3/DropwizardHistogramTest.java | 4 ++ .../dropwizard3/DropwizardMeterTest.java | 4 ++ .../DropwizardMetricsSystemTest.java | 4 ++ .../dropwizard3/DropwizardTimerTest.java | 4 ++ .../metrics/MetricsSystemLoaderTest.java | 7 +++ avatica/pom.xml | 48 +++----------------- .../calcite/avatica/jdbc/JdbcMetaTest.java | 7 +++ .../calcite/avatica/jdbc/StatementInfoTest.java | 7 +++ .../server/AbstractAvaticaHandlerTest.java | 4 ++ .../avatica/server/HandlerFactoryTest.java | 4 ++ .../avatica/server/HttpServerBuilderTest.java | 6 +++ .../calcite/avatica/tck/tests/BaseTckTest.java | 4 ++ 20 files changed, 106 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/calcite/blob/5c6a94f4/avatica/core/src/test/java/org/apache/calcite/avatica/AvaticaConnectionTest.java ---------------------------------------------------------------------- diff --git a/avatica/core/src/test/java/org/apache/calcite/avatica/AvaticaConnectionTest.java b/avatica/core/src/test/java/org/apache/calcite/avatica/AvaticaConnectionTest.java index a1414c3..781bd89 100644 --- a/avatica/core/src/test/java/org/apache/calcite/avatica/AvaticaConnectionTest.java +++ b/avatica/core/src/test/java/org/apache/calcite/avatica/AvaticaConnectionTest.java @@ -17,6 +17,7 @@ package org.apache.calcite.avatica; import org.junit.Assert; +import org.junit.Assume; import org.junit.Test; import org.mockito.Mockito; @@ -29,6 +30,9 @@ public class AvaticaConnectionTest { @Test public void testNumExecuteRetries() { + // Disabled on JDK9 due to Mockito bug; see [CALCITE-1567]. + Assume.assumeTrue(System.getProperty("java.version").compareTo("9") < 0); + AvaticaConnection statement = Mockito.mock(AvaticaConnection.class); Mockito.when(statement.getNumStatementRetries(Mockito.any(Properties.class))) http://git-wip-us.apache.org/repos/asf/calcite/blob/5c6a94f4/avatica/core/src/test/java/org/apache/calcite/avatica/AvaticaStatementTest.java ---------------------------------------------------------------------- diff --git a/avatica/core/src/test/java/org/apache/calcite/avatica/AvaticaStatementTest.java b/avatica/core/src/test/java/org/apache/calcite/avatica/AvaticaStatementTest.java index 5f6b56a..f3f83a5 100644 --- a/avatica/core/src/test/java/org/apache/calcite/avatica/AvaticaStatementTest.java +++ b/avatica/core/src/test/java/org/apache/calcite/avatica/AvaticaStatementTest.java @@ -16,6 +16,7 @@ */ package org.apache.calcite.avatica; +import org.junit.Assume; import org.junit.Before; import org.junit.Test; @@ -33,6 +34,9 @@ public class AvaticaStatementTest { private AvaticaStatement statement; @Before public void setup() { + // Disabled on JDK9 due to Mockito bug; see [CALCITE-1567]. + Assume.assumeTrue(System.getProperty("java.version").compareTo("9") < 0); + statement = mock(AvaticaStatement.class); } http://git-wip-us.apache.org/repos/asf/calcite/blob/5c6a94f4/avatica/core/src/test/java/org/apache/calcite/avatica/QueryStateTest.java ---------------------------------------------------------------------- diff --git a/avatica/core/src/test/java/org/apache/calcite/avatica/QueryStateTest.java b/avatica/core/src/test/java/org/apache/calcite/avatica/QueryStateTest.java index d97bfa2..5ba3037 100644 --- a/avatica/core/src/test/java/org/apache/calcite/avatica/QueryStateTest.java +++ b/avatica/core/src/test/java/org/apache/calcite/avatica/QueryStateTest.java @@ -18,6 +18,7 @@ package org.apache.calcite.avatica; import org.apache.calcite.avatica.remote.MetaDataOperation; +import org.junit.Assume; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; @@ -42,6 +43,9 @@ public class QueryStateTest { @Before public void setup() throws Exception { + // Disabled on JDK9 due to Mockito bug; see [CALCITE-1567]. + Assume.assumeTrue(System.getProperty("java.version").compareTo("9") < 0); + conn = Mockito.mock(Connection.class); metadata = Mockito.mock(DatabaseMetaData.class); statement = Mockito.mock(Statement.class); http://git-wip-us.apache.org/repos/asf/calcite/blob/5c6a94f4/avatica/core/src/test/java/org/apache/calcite/avatica/remote/AbstractHandlerTest.java ---------------------------------------------------------------------- diff --git a/avatica/core/src/test/java/org/apache/calcite/avatica/remote/AbstractHandlerTest.java b/avatica/core/src/test/java/org/apache/calcite/avatica/remote/AbstractHandlerTest.java index 5460f93..d5977fb 100644 --- a/avatica/core/src/test/java/org/apache/calcite/avatica/remote/AbstractHandlerTest.java +++ b/avatica/core/src/test/java/org/apache/calcite/avatica/remote/AbstractHandlerTest.java @@ -22,6 +22,8 @@ import org.apache.calcite.avatica.remote.Service.ErrorResponse; import org.apache.calcite.avatica.remote.Service.Request; import org.apache.calcite.avatica.remote.Service.Response; +import org.junit.Assume; +import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; @@ -46,6 +48,11 @@ public class AbstractHandlerTest { return sw.toString(); } + @Before public void setup() { + // Disabled on JDK9 due to Mockito bug; see [CALCITE-1567]. + Assume.assumeTrue(System.getProperty("java.version").compareTo("9") < 0); + } + @Test public void testExceptionUnwrappingWithoutContext() { @SuppressWarnings("unchecked") AbstractHandler<String> handler = Mockito.mock(AbstractHandler.class); http://git-wip-us.apache.org/repos/asf/calcite/blob/5c6a94f4/avatica/core/src/test/java/org/apache/calcite/avatica/remote/AvaticaCommonsHttpClientImplTest.java ---------------------------------------------------------------------- diff --git a/avatica/core/src/test/java/org/apache/calcite/avatica/remote/AvaticaCommonsHttpClientImplTest.java b/avatica/core/src/test/java/org/apache/calcite/avatica/remote/AvaticaCommonsHttpClientImplTest.java index 990ecd2..20cd8a2 100644 --- a/avatica/core/src/test/java/org/apache/calcite/avatica/remote/AvaticaCommonsHttpClientImplTest.java +++ b/avatica/core/src/test/java/org/apache/calcite/avatica/remote/AvaticaCommonsHttpClientImplTest.java @@ -23,6 +23,8 @@ import org.apache.http.client.methods.HttpPost; import org.apache.http.client.protocol.HttpClientContext; import org.apache.http.entity.StringEntity; +import org.junit.Assume; +import org.junit.Before; import org.junit.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -41,6 +43,11 @@ import static java.nio.charset.StandardCharsets.UTF_8; */ public class AvaticaCommonsHttpClientImplTest { + @Before public void setup() { + // Disabled on JDK9 due to Mockito bug; see [CALCITE-1567]. + Assume.assumeTrue(System.getProperty("java.version").compareTo("9") < 0); + } + @Test public void testRetryOnHttp503() throws Exception { final byte[] requestBytes = "fake_request".getBytes(UTF_8); final CloseableHttpResponse badResponse = mock(CloseableHttpResponse.class); http://git-wip-us.apache.org/repos/asf/calcite/blob/5c6a94f4/avatica/core/src/test/java/org/apache/calcite/avatica/remote/AvaticaHttpClientTest.java ---------------------------------------------------------------------- diff --git a/avatica/core/src/test/java/org/apache/calcite/avatica/remote/AvaticaHttpClientTest.java b/avatica/core/src/test/java/org/apache/calcite/avatica/remote/AvaticaHttpClientTest.java index 33369d2..ca8bcba 100644 --- a/avatica/core/src/test/java/org/apache/calcite/avatica/remote/AvaticaHttpClientTest.java +++ b/avatica/core/src/test/java/org/apache/calcite/avatica/remote/AvaticaHttpClientTest.java @@ -16,6 +16,8 @@ */ package org.apache.calcite.avatica.remote; +import org.junit.Assume; +import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; @@ -38,6 +40,11 @@ public class AvaticaHttpClientTest { "{\"response\":\"createStatement\",\"connectionId\":" + "\"8f3f28ee-d0bb-4cdb-a4b1-8f6e8476c534\",\"statementId\":1608176856}"; + @Before public void setup() { + // Disabled on JDK9 due to Mockito bug; see [CALCITE-1567]. + Assume.assumeTrue(System.getProperty("java.version").compareTo("9") < 0); + } + @Test public void testRetryOnUnavailable() throws Exception { // HTTP-503, try again http://git-wip-us.apache.org/repos/asf/calcite/blob/5c6a94f4/avatica/core/src/test/java/org/apache/calcite/avatica/remote/KerberosConnectionTest.java ---------------------------------------------------------------------- diff --git a/avatica/core/src/test/java/org/apache/calcite/avatica/remote/KerberosConnectionTest.java b/avatica/core/src/test/java/org/apache/calcite/avatica/remote/KerberosConnectionTest.java index e27676b..615527d 100644 --- a/avatica/core/src/test/java/org/apache/calcite/avatica/remote/KerberosConnectionTest.java +++ b/avatica/core/src/test/java/org/apache/calcite/avatica/remote/KerberosConnectionTest.java @@ -18,6 +18,8 @@ package org.apache.calcite.avatica.remote; import org.apache.calcite.avatica.remote.KerberosConnection.RenewalTask; +import org.junit.Assume; +import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; @@ -42,6 +44,11 @@ import static org.mockito.Mockito.when; */ public class KerberosConnectionTest { + @Before public void setup() { + // Disabled on JDK9 due to Mockito bug; see [CALCITE-1567]. + Assume.assumeTrue(System.getProperty("java.version").compareTo("9") < 0); + } + @Test(expected = NullPointerException.class) public void testNullArgs() { new KerberosConnection(null, null); } http://git-wip-us.apache.org/repos/asf/calcite/blob/5c6a94f4/avatica/core/src/test/java/org/apache/calcite/avatica/remote/ProtobufHandlerTest.java ---------------------------------------------------------------------- diff --git a/avatica/core/src/test/java/org/apache/calcite/avatica/remote/ProtobufHandlerTest.java b/avatica/core/src/test/java/org/apache/calcite/avatica/remote/ProtobufHandlerTest.java index afb15c3..9389cd0 100644 --- a/avatica/core/src/test/java/org/apache/calcite/avatica/remote/ProtobufHandlerTest.java +++ b/avatica/core/src/test/java/org/apache/calcite/avatica/remote/ProtobufHandlerTest.java @@ -28,6 +28,7 @@ import org.apache.calcite.avatica.remote.Service.FetchRequest; import org.apache.calcite.avatica.remote.Service.FetchResponse; import org.apache.calcite.avatica.remote.Service.RpcMetadataResponse; +import org.junit.Assume; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; @@ -54,6 +55,9 @@ public class ProtobufHandlerTest { @Before public void setupMocks() { + // Disabled on JDK9 due to Mockito bug; see [CALCITE-1567]. + Assume.assumeTrue(System.getProperty("java.version").compareTo("9") < 0); + // Mocks service = Mockito.mock(Service.class); translation = Mockito.mock(ProtobufTranslation.class); http://git-wip-us.apache.org/repos/asf/calcite/blob/5c6a94f4/avatica/metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardHistogramTest.java ---------------------------------------------------------------------- diff --git a/avatica/metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardHistogramTest.java b/avatica/metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardHistogramTest.java index 25ec5c0..811f7ea 100644 --- a/avatica/metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardHistogramTest.java +++ b/avatica/metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardHistogramTest.java @@ -18,6 +18,7 @@ package org.apache.calcite.avatica.metrics.dropwizard3; import com.codahale.metrics.Histogram; +import org.junit.Assume; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; @@ -30,6 +31,9 @@ public class DropwizardHistogramTest { private Histogram histogram; @Before public void setup() { + // Disabled on JDK9 due to Mockito bug; see [CALCITE-1567]. + Assume.assumeTrue(System.getProperty("java.version").compareTo("9") < 0); + this.histogram = Mockito.mock(Histogram.class); } http://git-wip-us.apache.org/repos/asf/calcite/blob/5c6a94f4/avatica/metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardMeterTest.java ---------------------------------------------------------------------- diff --git a/avatica/metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardMeterTest.java b/avatica/metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardMeterTest.java index c76c7e0..b492f6c 100644 --- a/avatica/metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardMeterTest.java +++ b/avatica/metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardMeterTest.java @@ -18,6 +18,7 @@ package org.apache.calcite.avatica.metrics.dropwizard3; import com.codahale.metrics.Meter; +import org.junit.Assume; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; @@ -30,6 +31,9 @@ public class DropwizardMeterTest { private Meter meter; @Before public void setup() { + // Disabled on JDK9 due to Mockito bug; see [CALCITE-1567]. + Assume.assumeTrue(System.getProperty("java.version").compareTo("9") < 0); + this.meter = Mockito.mock(Meter.class); } http://git-wip-us.apache.org/repos/asf/calcite/blob/5c6a94f4/avatica/metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardMetricsSystemTest.java ---------------------------------------------------------------------- diff --git a/avatica/metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardMetricsSystemTest.java b/avatica/metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardMetricsSystemTest.java index 7eeec3b..d1dcbfc 100644 --- a/avatica/metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardMetricsSystemTest.java +++ b/avatica/metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardMetricsSystemTest.java @@ -25,6 +25,7 @@ import org.apache.calcite.avatica.metrics.Timer.Context; import com.codahale.metrics.MetricRegistry; +import org.junit.Assume; import org.junit.Before; import org.junit.Test; @@ -44,6 +45,9 @@ public class DropwizardMetricsSystemTest { private DropwizardMetricsSystem metrics; @Before public void setup() { + // Disabled on JDK9 due to Mockito bug; see [CALCITE-1567]. + Assume.assumeTrue(System.getProperty("java.version").compareTo("9") < 0); + mockRegistry = mock(MetricRegistry.class); metrics = new DropwizardMetricsSystem(mockRegistry); } http://git-wip-us.apache.org/repos/asf/calcite/blob/5c6a94f4/avatica/metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardTimerTest.java ---------------------------------------------------------------------- diff --git a/avatica/metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardTimerTest.java b/avatica/metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardTimerTest.java index 536d935..5990d99 100644 --- a/avatica/metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardTimerTest.java +++ b/avatica/metrics-dropwizardmetrics3/src/test/java/org/apache/calcite/avatica/metrics/dropwizard3/DropwizardTimerTest.java @@ -21,6 +21,7 @@ import org.apache.calcite.avatica.metrics.dropwizard3.DropwizardTimer.Dropwizard import com.codahale.metrics.Timer; import com.codahale.metrics.Timer.Context; +import org.junit.Assume; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; @@ -34,6 +35,9 @@ public class DropwizardTimerTest { private Context context; @Before public void setup() { + // Disabled on JDK9 due to Mockito bug; see [CALCITE-1567]. + Assume.assumeTrue(System.getProperty("java.version").compareTo("9") < 0); + this.timer = Mockito.mock(Timer.class); this.context = Mockito.mock(Context.class); } http://git-wip-us.apache.org/repos/asf/calcite/blob/5c6a94f4/avatica/metrics/src/test/java/org/apache/calcite/avatica/metrics/MetricsSystemLoaderTest.java ---------------------------------------------------------------------- diff --git a/avatica/metrics/src/test/java/org/apache/calcite/avatica/metrics/MetricsSystemLoaderTest.java b/avatica/metrics/src/test/java/org/apache/calcite/avatica/metrics/MetricsSystemLoaderTest.java index 1c405ee..4adb892 100644 --- a/avatica/metrics/src/test/java/org/apache/calcite/avatica/metrics/MetricsSystemLoaderTest.java +++ b/avatica/metrics/src/test/java/org/apache/calcite/avatica/metrics/MetricsSystemLoaderTest.java @@ -19,6 +19,8 @@ package org.apache.calcite.avatica.metrics; import org.apache.calcite.avatica.metrics.noop.NoopMetricsSystem; import org.apache.calcite.avatica.metrics.noop.NoopMetricsSystemConfiguration; +import org.junit.Assume; +import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; @@ -33,6 +35,11 @@ import static org.junit.Assert.assertEquals; */ public class MetricsSystemLoaderTest { + @Before public void setup() { + // Disabled on JDK9 due to Mockito bug; see [CALCITE-1567]. + Assume.assumeTrue(System.getProperty("java.version").compareTo("9") < 0); + } + @Test public void testSingleInstance() { final List<MetricsSystemFactory> factories = Collections.<MetricsSystemFactory>singletonList(new MarkedNoopMetricsSystemFactory()); http://git-wip-us.apache.org/repos/asf/calcite/blob/5c6a94f4/avatica/pom.xml ---------------------------------------------------------------------- diff --git a/avatica/pom.xml b/avatica/pom.xml index 1e0639c..dbe6970 100644 --- a/avatica/pom.xml +++ b/avatica/pom.xml @@ -77,6 +77,8 @@ limitations under the License. <kerby.version>1.0.0-RC2</kerby.version> <maven-checkstyle-plugin.version>2.12.1</maven-checkstyle-plugin.version> <maven-dependency-plugin.version>2.10</maven-dependency-plugin.version> + <!-- Apache 18 has 2.10.3, need 2.10.4 for [MJAVADOC-442]. --> + <maven-javadoc-plugin.version>2.10.4</maven-javadoc-plugin.version> <maven-scm-provider.version>1.9.4</maven-scm-provider.version> <maven-shade-plugin.version>2.1</maven-shade-plugin.version> <mockito-all.version>1.10.19</mockito-all.version> @@ -414,29 +416,6 @@ limitations under the License. <links> <link>https://docs.oracle.com/javase/8/docs/api/</link> </links> - <tags> - <tag> - <name>sql.92</name> - <placement>a</placement> - <head>SQL 92 spec:</head> - </tag> - <tag> - <name>sql.99</name> - <placement>a</placement> - <head>SQL 99 spec:</head> - </tag> - <tag> - <name>sql.2003</name> - <placement>a</placement> - <head>SQL 2003 spec:</head> - </tag> - <tag> - <name>pre</name> - </tag> - <tag> - <name>post</name> - </tag> - </tags> <show>private</show> </configuration> </plugin> @@ -548,6 +527,11 @@ limitations under the License. </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>${maven-javadoc-plugin.version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> <version>${maven-shade-plugin.version}</version> </plugin> @@ -590,24 +574,6 @@ limitations under the License. <links> <link>https://docs.oracle.com/javase/8/docs/api/</link> </links> - <tags> - <tag> - <name>sql.92</name> - <placement>a</placement> - <head>SQL 92 spec:</head> - </tag> - <tag> - <name>sql.99</name> - <placement>a</placement> - <head>SQL 99 spec:</head> - </tag> - <tag> - <name>sql.2003</name> - <placement>a</placement> - <head>SQL 2003 spec:</head> - </tag> - </tags> - <additionalparam>-tag sql.2003:a:xxx</additionalparam> <notimestamp>true</notimestamp> <windowtitle>Apache Calcite Avatica API</windowtitle> </configuration> http://git-wip-us.apache.org/repos/asf/calcite/blob/5c6a94f4/avatica/server/src/test/java/org/apache/calcite/avatica/jdbc/JdbcMetaTest.java ---------------------------------------------------------------------- diff --git a/avatica/server/src/test/java/org/apache/calcite/avatica/jdbc/JdbcMetaTest.java b/avatica/server/src/test/java/org/apache/calcite/avatica/jdbc/JdbcMetaTest.java index d84fd29..7b182d6 100644 --- a/avatica/server/src/test/java/org/apache/calcite/avatica/jdbc/JdbcMetaTest.java +++ b/avatica/server/src/test/java/org/apache/calcite/avatica/jdbc/JdbcMetaTest.java @@ -23,6 +23,7 @@ import org.apache.calcite.avatica.Meta.StatementHandle; import com.google.common.cache.Cache; +import org.junit.Assume; import org.junit.Test; import org.mockito.Mockito; @@ -57,6 +58,9 @@ public class JdbcMetaTest { } @Test public void testPrepareSetsMaxRows() throws Exception { + // Disabled on JDK9 due to Mockito bug; see [CALCITE-1567]. + Assume.assumeTrue(System.getProperty("java.version").compareTo("9") < 0); + final String id = UUID.randomUUID().toString(); final String sql = "SELECT * FROM FOO"; final int maxRows = 500; @@ -89,6 +93,9 @@ public class JdbcMetaTest { } @Test public void testPrepareAndExecuteSetsMaxRows() throws Exception { + // Disabled on JDK9 due to Mockito bug; see [CALCITE-1567]. + Assume.assumeTrue(System.getProperty("java.version").compareTo("9") < 0); + final String id = UUID.randomUUID().toString(); final int statementId = 12345; final String sql = "SELECT * FROM FOO"; http://git-wip-us.apache.org/repos/asf/calcite/blob/5c6a94f4/avatica/server/src/test/java/org/apache/calcite/avatica/jdbc/StatementInfoTest.java ---------------------------------------------------------------------- diff --git a/avatica/server/src/test/java/org/apache/calcite/avatica/jdbc/StatementInfoTest.java b/avatica/server/src/test/java/org/apache/calcite/avatica/jdbc/StatementInfoTest.java index 2984692..dae9d3c 100644 --- a/avatica/server/src/test/java/org/apache/calcite/avatica/jdbc/StatementInfoTest.java +++ b/avatica/server/src/test/java/org/apache/calcite/avatica/jdbc/StatementInfoTest.java @@ -16,6 +16,8 @@ */ package org.apache.calcite.avatica.jdbc; +import org.junit.Assume; +import org.junit.Before; import org.junit.Test; import org.mockito.InOrder; import org.mockito.Mockito; @@ -36,6 +38,11 @@ import static org.junit.Assert.assertTrue; */ public class StatementInfoTest { + @Before public void setup() { + // Disabled on JDK9 due to Mockito bug; see [CALCITE-1567]. + Assume.assumeTrue(System.getProperty("java.version").compareTo("9") < 0); + } + @Test public void testLargeOffsets() throws Exception { Statement stmt = Mockito.mock(Statement.class); http://git-wip-us.apache.org/repos/asf/calcite/blob/5c6a94f4/avatica/server/src/test/java/org/apache/calcite/avatica/server/AbstractAvaticaHandlerTest.java ---------------------------------------------------------------------- diff --git a/avatica/server/src/test/java/org/apache/calcite/avatica/server/AbstractAvaticaHandlerTest.java b/avatica/server/src/test/java/org/apache/calcite/avatica/server/AbstractAvaticaHandlerTest.java index d0290c7..4e95600 100644 --- a/avatica/server/src/test/java/org/apache/calcite/avatica/server/AbstractAvaticaHandlerTest.java +++ b/avatica/server/src/test/java/org/apache/calcite/avatica/server/AbstractAvaticaHandlerTest.java @@ -20,6 +20,7 @@ import org.apache.calcite.avatica.remote.AuthenticationType; import org.hamcrest.BaseMatcher; import org.hamcrest.Description; +import org.junit.Assume; import org.junit.Before; import org.junit.Test; @@ -47,6 +48,9 @@ public class AbstractAvaticaHandlerTest { private HttpServletResponse response; @Before public void setup() throws Exception { + // Disabled on JDK9 due to Mockito bug; see [CALCITE-1567]. + Assume.assumeTrue(System.getProperty("java.version").compareTo("9") < 0); + handler = mock(AbstractAvaticaHandler.class); config = mock(AvaticaServerConfiguration.class); request = mock(HttpServletRequest.class); http://git-wip-us.apache.org/repos/asf/calcite/blob/5c6a94f4/avatica/server/src/test/java/org/apache/calcite/avatica/server/HandlerFactoryTest.java ---------------------------------------------------------------------- diff --git a/avatica/server/src/test/java/org/apache/calcite/avatica/server/HandlerFactoryTest.java b/avatica/server/src/test/java/org/apache/calcite/avatica/server/HandlerFactoryTest.java index 3504e02..f3f6dd6 100644 --- a/avatica/server/src/test/java/org/apache/calcite/avatica/server/HandlerFactoryTest.java +++ b/avatica/server/src/test/java/org/apache/calcite/avatica/server/HandlerFactoryTest.java @@ -20,6 +20,7 @@ import org.apache.calcite.avatica.remote.Driver.Serialization; import org.apache.calcite.avatica.remote.Service; import org.eclipse.jetty.server.Handler; +import org.junit.Assume; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; @@ -36,6 +37,9 @@ public class HandlerFactoryTest { @Before public void setup() { + // Disabled on JDK9 due to Mockito bug; see [CALCITE-1567]. + Assume.assumeTrue(System.getProperty("java.version").compareTo("9") < 0); + this.factory = new HandlerFactory(); this.service = Mockito.mock(Service.class); } http://git-wip-us.apache.org/repos/asf/calcite/blob/5c6a94f4/avatica/server/src/test/java/org/apache/calcite/avatica/server/HttpServerBuilderTest.java ---------------------------------------------------------------------- diff --git a/avatica/server/src/test/java/org/apache/calcite/avatica/server/HttpServerBuilderTest.java b/avatica/server/src/test/java/org/apache/calcite/avatica/server/HttpServerBuilderTest.java index 41bb88b..d944165 100644 --- a/avatica/server/src/test/java/org/apache/calcite/avatica/server/HttpServerBuilderTest.java +++ b/avatica/server/src/test/java/org/apache/calcite/avatica/server/HttpServerBuilderTest.java @@ -19,6 +19,8 @@ package org.apache.calcite.avatica.server; import org.apache.calcite.avatica.remote.Driver.Serialization; import org.apache.calcite.avatica.remote.Service; +import org.junit.Assume; +import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; @@ -29,6 +31,10 @@ import static org.junit.Assert.assertNull; * Test class for {@link HttpServer}. */ public class HttpServerBuilderTest { + @Before public void setup() { + // Disabled on JDK9 due to Mockito bug; see [CALCITE-1567]. + Assume.assumeTrue(System.getProperty("java.version").compareTo("9") < 0); + } @Test public void extraAllowedRolesConfigured() { final String[] extraRoles = new String[] {"BAR.COM"}; http://git-wip-us.apache.org/repos/asf/calcite/blob/5c6a94f4/avatica/tck/src/main/java/org/apache/calcite/avatica/tck/tests/BaseTckTest.java ---------------------------------------------------------------------- diff --git a/avatica/tck/src/main/java/org/apache/calcite/avatica/tck/tests/BaseTckTest.java b/avatica/tck/src/main/java/org/apache/calcite/avatica/tck/tests/BaseTckTest.java index 8799cf1..8080f21 100644 --- a/avatica/tck/src/main/java/org/apache/calcite/avatica/tck/tests/BaseTckTest.java +++ b/avatica/tck/src/main/java/org/apache/calcite/avatica/tck/tests/BaseTckTest.java @@ -19,6 +19,7 @@ package org.apache.calcite.avatica.tck.tests; import org.apache.calcite.avatica.tck.TestRunner; import org.junit.After; +import org.junit.Assume; import org.junit.Before; import org.junit.Rule; import org.junit.rules.TestName; @@ -35,6 +36,9 @@ public abstract class BaseTckTest { protected Connection connection; @Before public void initializeConnection() throws Exception { + // Disabled on JDK9 due to Mockito bug; see [CALCITE-1567]. + Assume.assumeTrue(System.getProperty("java.version").compareTo("9") < 0); + connection = TestRunner.getConnection(); }
