You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by el...@apache.org on 2017/01/14 22:01:23 UTC
calcite git commit: [CALCITE-1568] Upgrade mockito to 2.5.5
Repository: calcite
Updated Branches:
refs/heads/master 5f9c01908 -> b656c0c7a
[CALCITE-1568] Upgrade mockito to 2.5.5
Includes a partial revert of 5c6a94f4beb10fd73adc324ca9f906a9a5970d8c
which undoes the test ignore on jdk9.
Closes #349
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/b656c0c7
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/b656c0c7
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/b656c0c7
Branch: refs/heads/master
Commit: b656c0c7a9d72d16e2c4798b70f7a4d58b4fc10d
Parents: 5f9c019
Author: Josh Elser <el...@apache.org>
Authored: Mon Jan 9 23:10:30 2017 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Sat Jan 14 16:54:39 2017 -0500
----------------------------------------------------------------------
avatica/core/pom.xml | 2 +-
.../org/apache/calcite/avatica/AvaticaConnectionTest.java | 6 +-----
.../org/apache/calcite/avatica/AvaticaStatementTest.java | 4 ----
.../java/org/apache/calcite/avatica/QueryStateTest.java | 4 ----
.../calcite/avatica/remote/AbstractHandlerTest.java | 9 +--------
.../avatica/remote/AvaticaCommonsHttpClientImplTest.java | 7 -------
.../calcite/avatica/remote/AvaticaHttpClientTest.java | 7 -------
.../calcite/avatica/remote/KerberosConnectionTest.java | 10 ++--------
.../calcite/avatica/remote/ProtobufHandlerTest.java | 4 ----
avatica/metrics-dropwizardmetrics3/pom.xml | 2 +-
.../metrics/dropwizard3/DropwizardHistogramTest.java | 4 ----
.../avatica/metrics/dropwizard3/DropwizardMeterTest.java | 4 ----
.../metrics/dropwizard3/DropwizardMetricsSystemTest.java | 4 ----
.../avatica/metrics/dropwizard3/DropwizardTimerTest.java | 4 ----
avatica/metrics/pom.xml | 2 +-
.../calcite/avatica/metrics/MetricsSystemLoaderTest.java | 7 -------
avatica/pom.xml | 6 +++---
avatica/server/pom.xml | 2 +-
.../org/apache/calcite/avatica/jdbc/JdbcMetaTest.java | 7 -------
.../apache/calcite/avatica/jdbc/StatementInfoTest.java | 7 -------
.../avatica/server/AbstractAvaticaHandlerTest.java | 6 +-----
.../apache/calcite/avatica/server/HandlerFactoryTest.java | 4 ----
.../calcite/avatica/server/HttpServerBuilderTest.java | 6 ------
.../org/apache/calcite/avatica/tck/tests/BaseTckTest.java | 4 ----
24 files changed, 12 insertions(+), 110 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/b656c0c7/avatica/core/pom.xml
----------------------------------------------------------------------
diff --git a/avatica/core/pom.xml b/avatica/core/pom.xml
index 8cbee51..c5f60de 100644
--- a/avatica/core/pom.xml
+++ b/avatica/core/pom.xml
@@ -79,7 +79,7 @@ limitations under the License.
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/calcite/blob/b656c0c7/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 781bd89..b1c003f 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,7 +17,6 @@
package org.apache.calcite.avatica;
import org.junit.Assert;
-import org.junit.Assume;
import org.junit.Test;
import org.mockito.Mockito;
@@ -30,12 +29,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)))
+ Mockito.when(statement.getNumStatementRetries(Mockito.nullable(Properties.class)))
.thenCallRealMethod();
// Bad argument should throw an exception
http://git-wip-us.apache.org/repos/asf/calcite/blob/b656c0c7/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 f3f83a5..5f6b56a 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,7 +16,6 @@
*/
package org.apache.calcite.avatica;
-import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
@@ -34,9 +33,6 @@ 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/b656c0c7/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 5ba3037..d97bfa2 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,7 +18,6 @@ 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;
@@ -43,9 +42,6 @@ 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/b656c0c7/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 d5977fb..83bf50f 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,8 +22,6 @@ 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;
@@ -48,11 +46,6 @@ 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);
@@ -111,7 +104,7 @@ public class AbstractHandlerTest {
// Deserialize it back into a POJO
Mockito.when(handler.decode(Mockito.anyString())).thenReturn(request);
// Construct the Response for that Request
- Mockito.when(request.accept(Mockito.any(Service.class))).thenReturn(response);
+ Mockito.when(request.accept(Mockito.nullable(Service.class))).thenReturn(response);
// Throw an IOException when serializing the Response.
Mockito.when(handler.encode(response)).thenThrow(exception);
Mockito.when(handler.convertToErrorResponse(exception)).thenCallRealMethod();
http://git-wip-us.apache.org/repos/asf/calcite/blob/b656c0c7/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 20cd8a2..990ecd2 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,8 +23,6 @@ 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;
@@ -43,11 +41,6 @@ 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/b656c0c7/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 ca8bcba..33369d2 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,8 +16,6 @@
*/
package org.apache.calcite.avatica.remote;
-import org.junit.Assume;
-import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
@@ -40,11 +38,6 @@ 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/b656c0c7/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 615527d..4122afd 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,8 +18,6 @@ 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;
@@ -36,6 +34,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.nullable;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -44,11 +43,6 @@ 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);
}
@@ -75,7 +69,7 @@ public class KerberosConnectionTest {
LoginContext context = mock(LoginContext.class);
// Call the real login(LoginContext, Configuration, Subject) method
- when(krbUtil.login(any(LoginContext.class), any(Configuration.class), any(Subject.class)))
+ when(krbUtil.login(nullable(LoginContext.class), any(Configuration.class), any(Subject.class)))
.thenCallRealMethod();
// Return a fake LoginContext
when(krbUtil.createLoginContext(conf)).thenReturn(context);
http://git-wip-us.apache.org/repos/asf/calcite/blob/b656c0c7/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 9389cd0..afb15c3 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,7 +28,6 @@ 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;
@@ -55,9 +54,6 @@ 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/b656c0c7/avatica/metrics-dropwizardmetrics3/pom.xml
----------------------------------------------------------------------
diff --git a/avatica/metrics-dropwizardmetrics3/pom.xml b/avatica/metrics-dropwizardmetrics3/pom.xml
index fda6b3e..0b9787c 100644
--- a/avatica/metrics-dropwizardmetrics3/pom.xml
+++ b/avatica/metrics-dropwizardmetrics3/pom.xml
@@ -50,7 +50,7 @@ limitations under the License.
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/calcite/blob/b656c0c7/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 811f7ea..25ec5c0 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,7 +18,6 @@ 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;
@@ -31,9 +30,6 @@ 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/b656c0c7/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 b492f6c..c76c7e0 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,7 +18,6 @@ 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;
@@ -31,9 +30,6 @@ 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/b656c0c7/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 d1dcbfc..7eeec3b 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,7 +25,6 @@ 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;
@@ -45,9 +44,6 @@ 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/b656c0c7/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 5990d99..536d935 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,7 +21,6 @@ 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;
@@ -35,9 +34,6 @@ 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/b656c0c7/avatica/metrics/pom.xml
----------------------------------------------------------------------
diff --git a/avatica/metrics/pom.xml b/avatica/metrics/pom.xml
index 5f9bb53..4fc32df 100644
--- a/avatica/metrics/pom.xml
+++ b/avatica/metrics/pom.xml
@@ -44,7 +44,7 @@ limitations under the License.
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/calcite/blob/b656c0c7/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 4adb892..1c405ee 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,8 +19,6 @@ 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;
@@ -35,11 +33,6 @@ 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/b656c0c7/avatica/pom.xml
----------------------------------------------------------------------
diff --git a/avatica/pom.xml b/avatica/pom.xml
index dbe6970..eddd0a6 100644
--- a/avatica/pom.xml
+++ b/avatica/pom.xml
@@ -81,7 +81,7 @@ limitations under the License.
<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>
+ <mockito.version>2.5.5</mockito.version>
<protobuf.version>3.1.0</protobuf.version>
<scott-data-hsqldb.version>0.1</scott-data-hsqldb.version>
<servlet.version>3.0.1</servlet.version>
@@ -249,8 +249,8 @@ limitations under the License.
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>${mockito-all.version}</version>
+ <artifactId>mockito-core</artifactId>
+ <version>${mockito.version}</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
http://git-wip-us.apache.org/repos/asf/calcite/blob/b656c0c7/avatica/server/pom.xml
----------------------------------------------------------------------
diff --git a/avatica/server/pom.xml b/avatica/server/pom.xml
index 80864aa..f2eee25 100644
--- a/avatica/server/pom.xml
+++ b/avatica/server/pom.xml
@@ -119,7 +119,7 @@ limitations under the License.
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/calcite/blob/b656c0c7/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 7b182d6..d84fd29 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,7 +23,6 @@ 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;
@@ -58,9 +57,6 @@ 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;
@@ -93,9 +89,6 @@ 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/b656c0c7/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 dae9d3c..2984692 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,8 +16,6 @@
*/
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;
@@ -38,11 +36,6 @@ 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/b656c0c7/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 4e95600..c5f9441 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,7 +20,6 @@ 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;
@@ -32,10 +31,10 @@ import javax.servlet.http.HttpServletResponse;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.argThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import static org.mockito.hamcrest.MockitoHamcrest.argThat;
/**
* Test class for logic common to all {@link AvaticaHandler}'s.
@@ -48,9 +47,6 @@ 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/b656c0c7/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 f3f6dd6..3504e02 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,7 +20,6 @@ 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;
@@ -37,9 +36,6 @@ 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/b656c0c7/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 d944165..41bb88b 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,8 +19,6 @@ 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;
@@ -31,10 +29,6 @@ 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/b656c0c7/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 8080f21..8799cf1 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,7 +19,6 @@ 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;
@@ -36,9 +35,6 @@ 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();
}