From 6cc463b89e2ce2e5f1110732851df9f287a2a3d0 Mon Sep 17 00:00:00 2001 From: Apekshit Sharma Date: Mon, 2 Oct 2017 22:53:34 -0700 Subject: [PATCH] HBASE-18925 Update mockito dependency from mockito-all:1.10.19 to mockito-core:2.1.0 for JDK8 support. Last mockito-all release was in Dec'14. Mockito-core has had many releases since then. From mockito's site: - "Mockito does not produce the mockito-all artifact anymore ; this one was primarily aimed at ant users, and contained other dependencies. We felt it was time to move on and remove such artifacts as they cause problems in dependency management system like maven or gradle." - anyX() and any(SomeType.class) matchers now reject nulls and check type. Change-Id: I65a7d02c8dfc3a69db5da3cb1afa33af9ab8a7bf --- hbase-client/pom.xml | 4 +-- .../hadoop/hbase/client/TestClientScanner.java | 35 +++++++++------------ .../client/TestHTableMultiplexerViaMocks.java | 2 +- .../hadoop/hbase/client/TestSnapshotFromAdmin.java | 8 ++--- .../hbase/security/TestHBaseSaslRpcClient.java | 4 +-- hbase-common/pom.xml | 2 +- hbase-endpoint/pom.xml | 2 +- hbase-examples/pom.xml | 2 +- .../hbase/mapreduce/TestMapReduceExamples.java | 16 +++++----- hbase-http/pom.xml | 2 +- .../org/apache/hadoop/hbase/http/HttpServer.java | 8 +++++ .../apache/hadoop/hbase/http/TestHttpServer.java | 6 +--- hbase-mapreduce/pom.xml | 2 +- .../org/apache/hadoop/hbase/mapred/TestDriver.java | 2 +- .../hadoop/hbase/mapred/TestGroupingTableMap.java | 2 +- .../hadoop/hbase/mapred/TestIdentityTableMap.java | 2 +- .../apache/hadoop/hbase/mapred/TestRowCounter.java | 4 +-- .../hbase/mapreduce/TestGroupingTableMapper.java | 2 +- .../hadoop/hbase/mapreduce/TestImportExport.java | 6 ++-- .../TestMultiTableSnapshotInputFormatImpl.java | 6 ++-- .../hadoop/hbase/mapreduce/TestWALPlayer.java | 6 ++-- hbase-metrics-api/pom.xml | 2 +- hbase-metrics/pom.xml | 2 +- hbase-rest/pom.xml | 2 +- .../hbase/rest/client/TestRemoteAdminRetries.java | 18 +++++------ .../hbase/rest/client/TestRemoteHTableRetries.java | 28 ++++++++--------- hbase-rsgroup/pom.xml | 2 +- .../balancer/TestRSGroupBasedLoadBalancer.java | 4 +-- hbase-server/pom.xml | 2 +- .../hadoop/hbase/TestHBaseTestingUtility.java | 20 ++++++------ .../hbase/TestMetaTableAccessorNoCluster.java | 4 +-- .../apache/hadoop/hbase/TestMetaTableLocator.java | 6 ++-- .../example/TestZooKeeperTableArchiveClient.java | 2 +- .../hbase/client/HConnectionTestingUtility.java | 4 +-- .../TestForeignExceptionDispatcher.java | 8 ++--- .../TestTimeoutExceptionInjector.java | 6 ++-- .../hadoop/hbase/ipc/TestSimpleRpcScheduler.java | 36 ++++++---------------- .../hadoop/hbase/master/TestSplitLogManager.java | 2 +- .../master/assignment/MockMasterServices.java | 2 +- .../hbase/master/cleaner/TestCleanerChore.java | 10 +++--- .../normalizer/TestSimpleRegionNormalizer.java | 8 ++--- .../hadoop/hbase/procedure/TestProcedure.java | 4 +-- .../hbase/procedure/TestProcedureCoordinator.java | 16 +++++----- .../hbase/procedure/TestProcedureMember.java | 36 +++++++++++----------- .../hadoop/hbase/procedure/TestZKProcedure.java | 4 +-- .../procedure/TestZKProcedureControllers.java | 6 ++-- .../quotas/TestFileSystemUtilizationChore.java | 16 +++++----- .../TestMasterSpaceQuotaObserverWithMocks.java | 2 +- .../quotas/TestNamespaceQuotaViolationStore.java | 4 +-- ...estSpaceQuotaViolationPolicyRefresherChore.java | 4 +-- .../hbase/quotas/TestTableQuotaViolationStore.java | 4 +-- .../TestTableSpaceQuotaViolationNotifier.java | 4 +-- .../hbase/regionserver/StatefulStoreMockMaker.java | 30 +++++------------- .../hadoop/hbase/regionserver/TestBulkLoad.java | 35 +++++++++++---------- .../hadoop/hbase/regionserver/TestCompaction.java | 11 +++---- .../TestCompactionArchiveIOException.java | 2 +- .../hadoop/hbase/regionserver/TestHRegion.java | 13 ++++---- .../hadoop/hbase/regionserver/TestHStore.java | 2 +- .../TestRegionServerRegionSpaceUseReport.java | 12 ++++---- .../hbase/regionserver/TestStripeStoreEngine.java | 8 ++--- .../regionserver/compactions/TestCompactor.java | 8 ++--- .../compactions/TestDateTieredCompactor.java | 2 +- .../compactions/TestStripeCompactionPolicy.java | 19 ++++++------ .../compactions/TestStripeCompactor.java | 2 +- .../regionserver/wal/AbstractTestWALReplay.java | 2 +- .../apache/hadoop/hbase/tool/TestCanaryTool.java | 36 +++++++++++++--------- .../TestLoadIncrementalHFilesSplitRecovery.java | 2 +- .../org/apache/hadoop/hbase/wal/TestWALSplit.java | 2 +- hbase-shaded/hbase-shaded-check-invariants/pom.xml | 2 +- pom.xml | 22 ++++++------- src/main/asciidoc/_chapters/unit_testing.adoc | 4 +-- 71 files changed, 288 insertions(+), 317 deletions(-) diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml index a8e73c7cb5..675e813816 100644 --- a/hbase-client/pom.xml +++ b/hbase-client/pom.xml @@ -192,7 +192,7 @@ org.mockito - mockito-all + mockito-core test @@ -285,7 +285,7 @@ com.sun.jersey jersey-json - + javax.servlet servlet-api diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientScanner.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientScanner.java index 9d21d1ae9c..3f0c8697d0 100644 --- a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientScanner.java +++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientScanner.java @@ -138,13 +138,12 @@ public class TestClientScanner { RpcRetryingCaller caller = Mockito.mock(RpcRetryingCaller.class); Mockito.when(rpcFactory. newCaller()).thenReturn(caller); - Mockito.when(caller.callWithoutRetries(Mockito.any(RetryingCallable.class), + Mockito.when(caller.callWithoutRetries(Mockito.any(), Mockito.anyInt())).thenAnswer(new Answer() { private int count = 0; @Override public Result[] answer(InvocationOnMock invocation) throws Throwable { - ScannerCallableWithReplicas callable = invocation.getArgumentAt(0, - ScannerCallableWithReplicas.class); + ScannerCallableWithReplicas callable = invocation.getArgument(0); switch (count) { case 0: // initialize count++; @@ -176,7 +175,7 @@ public class TestClientScanner { // One for fetching the results // One for fetching empty results and quit as we do not have moreResults hint. inOrder.verify(caller, Mockito.times(2)).callWithoutRetries( - Mockito.any(RetryingCallable.class), Mockito.anyInt()); + Mockito.any(), Mockito.anyInt()); assertEquals(1, scanner.cache.size()); Result r = scanner.cache.poll(); @@ -199,13 +198,12 @@ public class TestClientScanner { RpcRetryingCaller caller = Mockito.mock(RpcRetryingCaller.class); Mockito.when(rpcFactory. newCaller()).thenReturn(caller); - Mockito.when(caller.callWithoutRetries(Mockito.any(RetryingCallable.class), + Mockito.when(caller.callWithoutRetries(Mockito.any(), Mockito.anyInt())).thenAnswer(new Answer() { private int count = 0; @Override public Result[] answer(InvocationOnMock invocation) throws Throwable { - ScannerCallableWithReplicas callable = invocation.getArgumentAt(0, - ScannerCallableWithReplicas.class); + ScannerCallableWithReplicas callable = invocation.getArgument(0); switch (count) { case 0: // initialize count++; @@ -235,7 +233,7 @@ public class TestClientScanner { scanner.loadCache(); inOrder.verify(caller, Mockito.times(1)).callWithoutRetries( - Mockito.any(RetryingCallable.class), Mockito.anyInt()); + Mockito.any(), Mockito.anyInt()); assertEquals(1, scanner.cache.size()); Result r = scanner.cache.poll(); @@ -260,13 +258,12 @@ public class TestClientScanner { RpcRetryingCaller caller = Mockito.mock(RpcRetryingCaller.class); Mockito.when(rpcFactory. newCaller()).thenReturn(caller); - Mockito.when(caller.callWithoutRetries(Mockito.any(RetryingCallable.class), + Mockito.when(caller.callWithoutRetries(Mockito.any(), Mockito.anyInt())).thenAnswer(new Answer() { private int count = 0; @Override public Result[] answer(InvocationOnMock invocation) throws Throwable { - ScannerCallableWithReplicas callable = invocation.getArgumentAt(0, - ScannerCallableWithReplicas.class); + ScannerCallableWithReplicas callable = invocation.getArgument(0); switch (count) { case 0: // initialize count++; @@ -296,7 +293,7 @@ public class TestClientScanner { scanner.loadCache(); inOrder.verify(caller, Mockito.times(1)).callWithoutRetries( - Mockito.any(RetryingCallable.class), Mockito.anyInt()); + Mockito.any(), Mockito.anyInt()); assertEquals(3, scanner.cache.size()); Result r = scanner.cache.poll(); @@ -333,13 +330,12 @@ public class TestClientScanner { RpcRetryingCaller caller = Mockito.mock(RpcRetryingCaller.class); Mockito.when(rpcFactory. newCaller()).thenReturn(caller); - Mockito.when(caller.callWithoutRetries(Mockito.any(RetryingCallable.class), + Mockito.when(caller.callWithoutRetries(Mockito.any(), Mockito.anyInt())).thenAnswer(new Answer() { private int count = 0; @Override public Result[] answer(InvocationOnMock invocation) throws Throwable { - ScannerCallableWithReplicas callable = invocation.getArgumentAt(0, - ScannerCallableWithReplicas.class); + ScannerCallableWithReplicas callable = invocation.getArgument(0); switch (count) { case 0: // initialize count++; @@ -369,7 +365,7 @@ public class TestClientScanner { scanner.loadCache(); inOrder.verify(caller, Mockito.times(1)).callWithoutRetries( - Mockito.any(RetryingCallable.class), Mockito.anyInt()); + Mockito.any(), Mockito.anyInt()); assertEquals(1, scanner.cache.size()); Result r = scanner.cache.poll(); @@ -398,13 +394,12 @@ public class TestClientScanner { RpcRetryingCaller caller = Mockito.mock(RpcRetryingCaller.class); Mockito.when(rpcFactory. newCaller()).thenReturn(caller); - Mockito.when(caller.callWithoutRetries(Mockito.any(RetryingCallable.class), + Mockito.when(caller.callWithoutRetries(Mockito.any(), Mockito.anyInt())).thenAnswer(new Answer() { private int count = 0; @Override public Result[] answer(InvocationOnMock invocation) throws Throwable { - ScannerCallableWithReplicas callable = invocation.getArgumentAt(0, - ScannerCallableWithReplicas.class); + ScannerCallableWithReplicas callable = invocation.getArgument(0); switch (count) { case 0: // initialize count++; @@ -436,7 +431,7 @@ public class TestClientScanner { scanner.loadCache(); inOrder.verify(caller, Mockito.times(2)).callWithoutRetries( - Mockito.any(RetryingCallable.class), Mockito.anyInt()); + Mockito.any(), Mockito.anyInt()); assertEquals(2, scanner.cache.size()); Result r = scanner.cache.poll(); diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestHTableMultiplexerViaMocks.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestHTableMultiplexerViaMocks.java index 7e68c2147e..0439db46cb 100644 --- a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestHTableMultiplexerViaMocks.java +++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestHTableMultiplexerViaMocks.java @@ -44,7 +44,7 @@ public class TestHTableMultiplexerViaMocks { mockConnection = mock(ClusterConnection.class); // Call the real put(TableName, Put, int) method - when(mockMultiplexer.put(any(TableName.class), any(Put.class), anyInt())).thenCallRealMethod(); + when(mockMultiplexer.put(any(TableName.class), any(), any())).thenCallRealMethod(); // Return the mocked ClusterConnection when(mockMultiplexer.getConnection()).thenReturn(mockConnection); diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromAdmin.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromAdmin.java index 177b614f07..5000778475 100644 --- a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromAdmin.java +++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromAdmin.java @@ -103,14 +103,14 @@ public class TestSnapshotFromAdmin { Mockito .when( mockMaster.snapshot((RpcController) Mockito.any(), - Mockito.any(SnapshotRequest.class))).thenReturn(response); + Mockito.any())).thenReturn(response); // setup the response IsSnapshotDoneResponse.Builder builder = IsSnapshotDoneResponse.newBuilder(); builder.setDone(false); // first five times, we return false, last we get success Mockito.when( mockMaster.isSnapshotDone((RpcController) Mockito.any(), - Mockito.any(IsSnapshotDoneRequest.class))).thenReturn(builder.build(), builder.build(), + Mockito.any())).thenReturn(builder.build(), builder.build(), builder.build(), builder.build(), builder.build(), builder.setDone(true).build()); // setup the admin and run the test @@ -162,12 +162,12 @@ public class TestSnapshotFromAdmin { Mockito.when(mockConnection.getKeepAliveMasterService()).thenReturn(master); SnapshotResponse response = SnapshotResponse.newBuilder().setExpectedTimeout(0).build(); Mockito.when( - master.snapshot((RpcController) Mockito.any(), Mockito.any(SnapshotRequest.class))) + master.snapshot((RpcController) Mockito.any(), Mockito.any())) .thenReturn(response); IsSnapshotDoneResponse doneResponse = IsSnapshotDoneResponse.newBuilder().setDone(true).build(); Mockito.when( master.isSnapshotDone((RpcController) Mockito.any(), - Mockito.any(IsSnapshotDoneRequest.class))).thenReturn(doneResponse); + Mockito.any())).thenReturn(doneResponse); // make sure that we can use valid names admin.snapshot(new SnapshotDescription("snapshot", TableName.valueOf(name.getMethodName()))); diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/security/TestHBaseSaslRpcClient.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/security/TestHBaseSaslRpcClient.java index 33f7872e8c..282dc28e28 100644 --- a/hbase-client/src/test/java/org/apache/hadoop/hbase/security/TestHBaseSaslRpcClient.java +++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/security/TestHBaseSaslRpcClient.java @@ -113,8 +113,8 @@ public class TestHBaseSaslRpcClient { final SaslClientCallbackHandler saslClCallbackHandler = new SaslClientCallbackHandler(token); saslClCallbackHandler.handle(callbackArray); verify(nameCallback).setName(anyString()); - verify(realmCallback).setText(anyString()); - verify(passwordCallback).setPassword(any(char[].class)); + verify(realmCallback).setText(any()); + verify(passwordCallback).setPassword(any()); } @Test diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml index 135e720557..b732bbe893 100644 --- a/hbase-common/pom.xml +++ b/hbase-common/pom.xml @@ -269,7 +269,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/hbase-endpoint/pom.xml b/hbase-endpoint/pom.xml index a127763130..101bfdb3fb 100644 --- a/hbase-endpoint/pom.xml +++ b/hbase-endpoint/pom.xml @@ -213,7 +213,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/hbase-examples/pom.xml b/hbase-examples/pom.xml index 9f32fec1de..e7062832b6 100644 --- a/hbase-examples/pom.xml +++ b/hbase-examples/pom.xml @@ -206,7 +206,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/hbase-examples/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMapReduceExamples.java b/hbase-examples/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMapReduceExamples.java index 1f10cb91a3..089dafdbe5 100644 --- a/hbase-examples/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMapReduceExamples.java +++ b/hbase-examples/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMapReduceExamples.java @@ -4,9 +4,9 @@ * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with the License. You may * obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, * either express or implied. See the License for the specific language governing permissions and @@ -63,13 +63,13 @@ public class TestMapReduceExamples { @Override public Void answer(InvocationOnMock invocation) throws Throwable { - ImmutableBytesWritable writer = (ImmutableBytesWritable) invocation.getArguments()[0]; - Put put = (Put) invocation.getArguments()[1]; + ImmutableBytesWritable writer = (ImmutableBytesWritable) invocation.getArgument(0); + Put put = (Put) invocation.getArgument(1); assertEquals("row", Bytes.toString(writer.get())); assertEquals("row", Bytes.toString(put.getRow())); return null; } - }).when(ctx).write(any(ImmutableBytesWritable.class), any(Put.class)); + }).when(ctx).write(any(), any()); uploader.map(null, new Text("row,family,qualifier,value"), ctx); @@ -134,13 +134,13 @@ public class TestMapReduceExamples { @Override public Void answer(InvocationOnMock invocation) throws Throwable { - ImmutableBytesWritable writer = (ImmutableBytesWritable) invocation.getArguments()[0]; - Put put = (Put) invocation.getArguments()[1]; + ImmutableBytesWritable writer = (ImmutableBytesWritable) invocation.getArgument(0); + Put put = (Put) invocation.getArgument(1); assertEquals("tableName-column1", Bytes.toString(writer.get())); assertEquals("test", Bytes.toString(put.getRow())); return null; } - }).when(ctx).write(any(ImmutableBytesWritable.class), any(Put.class)); + }).when(ctx).write(any(), any()); Result result = mock(Result.class); when(result.getValue(Bytes.toBytes("columnFamily"), Bytes.toBytes("column1"))).thenReturn( Bytes.toBytes("test")); diff --git a/hbase-http/pom.xml b/hbase-http/pom.xml index d876f193eb..9bd6fcd80f 100644 --- a/hbase-http/pom.xml +++ b/hbase-http/pom.xml @@ -311,7 +311,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java index 726595bd11..29be0da94c 100644 --- a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java +++ b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java @@ -32,6 +32,7 @@ import java.util.Enumeration; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import javax.servlet.Filter; import javax.servlet.FilterChain; @@ -45,6 +46,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; import javax.servlet.http.HttpServletResponse; +import com.google.common.annotations.VisibleForTesting; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.HadoopIllegalArgumentException; @@ -161,6 +163,11 @@ public class HttpServer implements FilterContainer { private final List listeners = Lists.newArrayList(); + @VisibleForTesting + public List getServerConnectors() { + return listeners.stream().map(info -> info.listener).collect(Collectors.toList()); + } + protected final WebAppContext webAppContext; protected final boolean findPort; protected final Map defaultContexts = new HashMap<>(); @@ -1011,6 +1018,7 @@ public class HttpServer implements FilterContainer { * Open the main listener for the server * @throws Exception */ + @VisibleForTesting void openListeners() throws Exception { for (ListenerInfo li : listeners) { ServerConnector listener = li.listener; diff --git a/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestHttpServer.java b/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestHttpServer.java index 2eb6a2117b..fddb2a4842 100644 --- a/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestHttpServer.java +++ b/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestHttpServer.java @@ -67,7 +67,6 @@ import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; import org.mockito.Mockito; -import org.mockito.internal.util.reflection.Whitebox; @Category({MiscTests.class, SmallTests.class}) public class TestHttpServer extends HttpServerFunctionalTest { @@ -557,10 +556,7 @@ public class TestHttpServer extends HttpServerFunctionalTest { HttpServer server = createServer(host, port); try { // not bound, ephemeral should return requested port (0 for ephemeral) - List listeners = (List) Whitebox.getInternalState(server, - "listeners"); - ServerConnector listener = (ServerConnector) Whitebox.getInternalState( - listeners.get(0), "listener"); + ServerConnector listener = server.getServerConnectors().get(0); assertEquals(port, listener.getPort()); // verify hostname is what was given diff --git a/hbase-mapreduce/pom.xml b/hbase-mapreduce/pom.xml index 4a63f41b91..607b43bf7a 100644 --- a/hbase-mapreduce/pom.xml +++ b/hbase-mapreduce/pom.xml @@ -262,7 +262,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapred/TestDriver.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapred/TestDriver.java index d085c21a39..fa03a171f4 100644 --- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapred/TestDriver.java +++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapred/TestDriver.java @@ -36,6 +36,6 @@ public class TestDriver { ProgramDriver programDriverMock = mock(ProgramDriver.class); Driver.setProgramDriver(programDriverMock); Driver.main(new String[]{}); - verify(programDriverMock).driver(Mockito.any(String[].class)); + verify(programDriverMock).driver(Mockito.any()); } } diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapred/TestGroupingTableMap.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapred/TestGroupingTableMap.java index 7131cf91dd..5c4b6a9380 100644 --- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapred/TestGroupingTableMap.java +++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapred/TestGroupingTableMap.java @@ -107,7 +107,7 @@ public class TestGroupingTableMap { gTableMap.map(null, result, outputCollectorMock, reporter); verify(result).listCells(); verify(outputCollectorMock, times(1)) - .collect(any(ImmutableBytesWritable.class), any(Result.class)); + .collect(any(), any()); verifyNoMoreInteractions(outputCollectorMock); } finally { if (gTableMap != null) diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapred/TestIdentityTableMap.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapred/TestIdentityTableMap.java index e222d0b95f..be65d84d38 100644 --- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapred/TestIdentityTableMap.java +++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapred/TestIdentityTableMap.java @@ -55,7 +55,7 @@ public class TestIdentityTableMap { reporterMock); verify(outputCollectorMock, times(recordNumber)).collect( - Mockito.any(ImmutableBytesWritable.class), Mockito.any(Result.class)); + Mockito.any(), Mockito.any()); } finally { if (identityTableMap != null) identityTableMap.close(); diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapred/TestRowCounter.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapred/TestRowCounter.java index 4ebd8bf4ab..bc9ebb75e2 100644 --- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapred/TestRowCounter.java +++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapred/TestRowCounter.java @@ -21,8 +21,8 @@ package org.apache.hadoop.hbase.mapred; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; @@ -89,7 +89,7 @@ public class TestRowCounter { mock(OutputCollector.class), reporter); Mockito.verify(reporter, times(iterationNumber)).incrCounter( - any(Enum.class), anyInt()); + any(), anyLong()); } @Test diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestGroupingTableMapper.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestGroupingTableMapper.java index 7e366028ad..ec7ddee180 100644 --- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestGroupingTableMapper.java +++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestGroupingTableMapper.java @@ -50,7 +50,7 @@ public class TestGroupingTableMapper { @SuppressWarnings("unchecked") Mapper.Context context = mock(Mapper.Context.class); - context.write(any(ImmutableBytesWritable.class), any(Result.class)); + context.write(any(), any()); List keyValue = new ArrayList<>(); byte[] row = {}; keyValue.add(new KeyValue(row, Bytes.toBytes("family2"), Bytes.toBytes("clm"), Bytes diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java index 861f18044e..801de95735 100644 --- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java +++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java @@ -674,13 +674,13 @@ public class TestImportExport { @Override public Void answer(InvocationOnMock invocation) throws Throwable { - ImmutableBytesWritable writer = (ImmutableBytesWritable) invocation.getArguments()[0]; - MapReduceCell key = (MapReduceCell) invocation.getArguments()[1]; + ImmutableBytesWritable writer = (ImmutableBytesWritable) invocation.getArgument(0); + MapReduceCell key = (MapReduceCell) invocation.getArgument(1); assertEquals("Key", Bytes.toString(writer.get())); assertEquals("row", Bytes.toString(CellUtil.cloneRow(key))); return null; } - }).when(ctx).write(any(ImmutableBytesWritable.class), any(MapReduceCell.class)); + }).when(ctx).write(any(), any()); importer.setup(ctx); Result value = mock(Result.class); diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMultiTableSnapshotInputFormatImpl.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMultiTableSnapshotInputFormatImpl.java index 1c33848666..c8a910105f 100644 --- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMultiTableSnapshotInputFormatImpl.java +++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMultiTableSnapshotInputFormatImpl.java @@ -68,8 +68,8 @@ public class TestMultiTableSnapshotInputFormatImpl { // probably be the more "pure" // way of doing things. This is the lesser of two evils, perhaps? doNothing().when(this.subject). - restoreSnapshot(any(Configuration.class), any(String.class), any(Path.class), - any(Path.class), any(FileSystem.class)); + restoreSnapshot(any(), any(), any(), + any(), any()); this.conf = new Configuration(); this.rootDir = new Path("file:///test-root-dir"); @@ -180,7 +180,7 @@ public class TestMultiTableSnapshotInputFormatImpl { for (Map.Entry entry : snapshotDirs.entrySet()) { verify(this.subject).restoreSnapshot(eq(this.conf), eq(entry.getKey()), eq(this.rootDir), - eq(entry.getValue()), any(FileSystem.class)); + eq(entry.getValue()), any()); } } } diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestWALPlayer.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestWALPlayer.java index 97b975084c..23b3c04a1a 100644 --- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestWALPlayer.java +++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestWALPlayer.java @@ -184,13 +184,13 @@ public class TestWALPlayer { @Override public Void answer(InvocationOnMock invocation) throws Throwable { - ImmutableBytesWritable writer = (ImmutableBytesWritable) invocation.getArguments()[0]; - MapReduceCell key = (MapReduceCell) invocation.getArguments()[1]; + ImmutableBytesWritable writer = (ImmutableBytesWritable) invocation.getArgument(0); + MapReduceCell key = (MapReduceCell) invocation.getArgument(1); assertEquals("row", Bytes.toString(writer.get())); assertEquals("row", Bytes.toString(CellUtil.cloneRow(key))); return null; } - }).when(context).write(any(ImmutableBytesWritable.class), any(MapReduceCell.class)); + }).when(context).write(any(), any()); mapper.map(key, value, context); diff --git a/hbase-metrics-api/pom.xml b/hbase-metrics-api/pom.xml index 1313d198b8..3baa33034f 100644 --- a/hbase-metrics-api/pom.xml +++ b/hbase-metrics-api/pom.xml @@ -98,7 +98,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/hbase-metrics/pom.xml b/hbase-metrics/pom.xml index 70653dd523..f82ad54eac 100644 --- a/hbase-metrics/pom.xml +++ b/hbase-metrics/pom.xml @@ -111,7 +111,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml index 2d5d701780..78855df0ea 100644 --- a/hbase-rest/pom.xml +++ b/hbase-rest/pom.xml @@ -331,7 +331,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteAdminRetries.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteAdminRetries.java index b926d828a3..706402c0d1 100644 --- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteAdminRetries.java +++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteAdminRetries.java @@ -49,9 +49,9 @@ public class TestRemoteAdminRetries { private static final int SLEEP_TIME = 50; private static final int RETRIES = 3; private static final long MAX_TIME = SLEEP_TIME * (RETRIES - 1); - + private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); - + private RemoteAdmin remoteAdmin; private Client client; @@ -61,8 +61,8 @@ public class TestRemoteAdminRetries { Response response = new Response(509); when(client.get(anyString(), anyString())).thenReturn(response); when(client.delete(anyString())).thenReturn(response); - when(client.put(anyString(), anyString(), any(byte[].class))).thenReturn(response); - when(client.post(anyString(), anyString(), any(byte[].class))).thenReturn(response); + when(client.put(anyString(), anyString(), any())).thenReturn(response); + when(client.post(anyString(), anyString(), any())).thenReturn(response); Configuration configuration = TEST_UTIL.getConfiguration(); configuration.setInt("hbase.rest.client.max.retries", RETRIES); @@ -80,7 +80,7 @@ public class TestRemoteAdminRetries { } }); } - + @Test public void testFailingGetClusterStatus() throws Exception { testTimedOutGetCall(new CallExecutor() { @@ -120,7 +120,7 @@ public class TestRemoteAdminRetries { remoteAdmin.createTable(new HTableDescriptor(TableName.valueOf("TestTable"))); } }); - verify(client, times(RETRIES)).put(anyString(), anyString(), any(byte[].class)); + verify(client, times(RETRIES)).put(anyString(), anyString(), any()); } @Test @@ -143,12 +143,12 @@ public class TestRemoteAdminRetries { } }); } - + private void testTimedOutGetCall(CallExecutor callExecutor) throws Exception { testTimedOutCall(callExecutor); verify(client, times(RETRIES)).get(anyString(), anyString()); } - + private void testTimedOutCall(CallExecutor callExecutor) throws Exception { long start = System.currentTimeMillis(); try { @@ -163,5 +163,5 @@ public class TestRemoteAdminRetries { private static interface CallExecutor { void run() throws Exception; } - + } diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteHTableRetries.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteHTableRetries.java index 4a595f32d3..b25b63c861 100644 --- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteHTableRetries.java +++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteHTableRetries.java @@ -55,7 +55,7 @@ public class TestRemoteHTableRetries { private static final long MAX_TIME = SLEEP_TIME * (RETRIES - 1); private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); - + private static final byte[] ROW_1 = Bytes.toBytes("testrow1"); private static final byte[] COLUMN_1 = Bytes.toBytes("a"); private static final byte[] QUALIFIER_1 = Bytes.toBytes("1"); @@ -63,16 +63,16 @@ public class TestRemoteHTableRetries { private Client client; private RemoteHTable remoteTable; - + @Before public void setup() throws Exception { client = mock(Client.class); Response response = new Response(509); when(client.get(anyString(), anyString())).thenReturn(response); when(client.delete(anyString())).thenReturn(response); - when(client.put(anyString(), anyString(), any(byte[].class))).thenReturn( + when(client.put(anyString(), anyString(), any())).thenReturn( response); - when(client.post(anyString(), anyString(), any(byte[].class))).thenReturn( + when(client.post(anyString(), anyString(), any())).thenReturn( response); Configuration configuration = TEST_UTIL.getConfiguration(); @@ -87,7 +87,7 @@ public class TestRemoteHTableRetries { public void tearDownAfterClass() throws Exception { remoteTable.close(); } - + @Test public void testDelete() throws Exception { testTimedOutCall(new CallExecutor() { @@ -99,7 +99,7 @@ public class TestRemoteHTableRetries { }); verify(client, times(RETRIES)).delete(anyString()); } - + @Test public void testGet() throws Exception { testTimedOutGetCall(new CallExecutor() { @@ -118,9 +118,9 @@ public class TestRemoteHTableRetries { remoteTable.put(new Put(Bytes.toBytes("Row"))); } }); - verify(client, times(RETRIES)).put(anyString(), anyString(), any(byte[].class)); + verify(client, times(RETRIES)).put(anyString(), anyString(), any()); } - + @Test public void testMultiRowPut() throws Exception { testTimedOutCall(new CallExecutor() { @@ -131,7 +131,7 @@ public class TestRemoteHTableRetries { remoteTable.put(Arrays.asList(puts)); } }); - verify(client, times(RETRIES)).put(anyString(), anyString(), any(byte[].class)); + verify(client, times(RETRIES)).put(anyString(), anyString(), any()); } @Test @@ -142,9 +142,9 @@ public class TestRemoteHTableRetries { remoteTable.getScanner(new Scan()); } }); - verify(client, times(RETRIES)).post(anyString(), anyString(), any(byte[].class)); + verify(client, times(RETRIES)).post(anyString(), anyString(), any()); } - + @Test public void testCheckAndPut() throws Exception { testTimedOutCall(new CallExecutor() { @@ -155,7 +155,7 @@ public class TestRemoteHTableRetries { remoteTable.checkAndPut(ROW_1, COLUMN_1, QUALIFIER_1, VALUE_1, put ); } }); - verify(client, times(RETRIES)).put(anyString(), anyString(), any(byte[].class)); + verify(client, times(RETRIES)).put(anyString(), anyString(), any()); } @Test @@ -170,12 +170,12 @@ public class TestRemoteHTableRetries { } }); } - + private void testTimedOutGetCall(CallExecutor callExecutor) throws Exception { testTimedOutCall(callExecutor); verify(client, times(RETRIES)).get(anyString(), anyString()); } - + private void testTimedOutCall(CallExecutor callExecutor) throws Exception { long start = System.currentTimeMillis(); try { diff --git a/hbase-rsgroup/pom.xml b/hbase-rsgroup/pom.xml index 8a26ead8a9..ee75ef92e6 100644 --- a/hbase-rsgroup/pom.xml +++ b/hbase-rsgroup/pom.xml @@ -164,7 +164,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/master/balancer/TestRSGroupBasedLoadBalancer.java b/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/master/balancer/TestRSGroupBasedLoadBalancer.java index db7cf4d649..5ce0c09f67 100644 --- a/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/master/balancer/TestRSGroupBasedLoadBalancer.java +++ b/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/master/balancer/TestRSGroupBasedLoadBalancer.java @@ -582,11 +582,11 @@ public class TestRSGroupBasedLoadBalancer { Mockito.when(gm.listRSGroups()).thenReturn( Lists.newLinkedList(groupMap.values())); Mockito.when(gm.isOnline()).thenReturn(true); - Mockito.when(gm.getRSGroupOfTable(Mockito.any(TableName.class))) + Mockito.when(gm.getRSGroupOfTable(Mockito.any())) .thenAnswer(new Answer() { @Override public String answer(InvocationOnMock invocation) throws Throwable { - return tableMap.get(invocation.getArguments()[0]); + return tableMap.get(invocation.getArgument(0)); } }); return gm; diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index ea02f26efc..d66553870e 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -605,7 +605,7 @@ org.mockito - mockito-all + mockito-core test diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java index be1307e995..8f508ae8aa 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java @@ -403,7 +403,7 @@ public class TestHBaseTestingUtility { @Test public void testResolvePortConflict() throws Exception { // raises port conflict between 1st call and 2nd call of randomPort() by mocking Random object Random random = Mockito.mock(Random.class); - Mockito.when(random.nextInt(Mockito.any(Integer.class))) + Mockito.when(random.nextInt(Mockito.any())) .thenAnswer(new Answer() { int[] numbers = { 1, 1, 2 }; int count = 0; @@ -418,7 +418,7 @@ public class TestHBaseTestingUtility { HBaseTestingUtility.PortAllocator.AvailablePortChecker portChecker = Mockito.mock(HBaseTestingUtility.PortAllocator.AvailablePortChecker.class); - Mockito.when(portChecker.available(Mockito.any(Integer.class))).thenReturn(true); + Mockito.when(portChecker.available(Mockito.any())).thenReturn(true); HBaseTestingUtility.PortAllocator portAllocator = new HBaseTestingUtility.PortAllocator(random, portChecker); @@ -426,7 +426,7 @@ public class TestHBaseTestingUtility { int port1 = portAllocator.randomFreePort(); int port2 = portAllocator.randomFreePort(); assertNotEquals(port1, port2); - Mockito.verify(random, Mockito.times(3)).nextInt(Mockito.any(Integer.class)); + Mockito.verify(random, Mockito.times(3)).nextInt(Mockito.any()); } @Test @@ -452,7 +452,7 @@ public class TestHBaseTestingUtility { assertEquals(nonDefaultRegionServerPort , htu.getConfiguration().getInt(HConstants.REGIONSERVER_PORT, 0)); } - + @Test public void testMRYarnConfigsPopulation() throws IOException { Map dummyProps = new HashMap<>(); dummyProps.put("mapreduce.jobtracker.address", "dummyhost:11234"); @@ -461,27 +461,27 @@ public class TestHBaseTestingUtility { dummyProps.put("yarn.resourcemanager.scheduler.address", "dummyhost:11237"); dummyProps.put("mapreduce.jobhistory.webapp.address", "dummyhost:11238"); dummyProps.put("yarn.resourcemanager.webapp.address", "dummyhost:11239"); - + HBaseTestingUtility hbt = new HBaseTestingUtility(); - + // populate the mr props to the Configuration instance for (Entry entry : dummyProps.entrySet()) { hbt.getConfiguration().set(entry.getKey(), entry.getValue()); } - + for (Entry entry : dummyProps.entrySet()) { assertTrue("The Configuration for key " + entry.getKey() +" and value: " + entry.getValue() + " is not populated correctly", hbt.getConfiguration().get(entry.getKey()).equals(entry.getValue())); } hbt.startMiniMapReduceCluster(); - - // Confirm that MiniMapReduceCluster overwrites the mr properties and updates the Configuration + + // Confirm that MiniMapReduceCluster overwrites the mr properties and updates the Configuration for (Entry entry : dummyProps.entrySet()) { assertFalse("The MR prop: " + entry.getValue() + " is not overwritten when map reduce mini"+ "cluster is started", hbt.getConfiguration().get(entry.getKey()).equals(entry.getValue())); } - + hbt.shutdownMiniMapReduceCluster(); } } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableAccessorNoCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableAccessorNoCluster.java index cec2c20758..fb1c1e2f0d 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableAccessorNoCluster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableAccessorNoCluster.java @@ -165,7 +165,7 @@ public class TestMetaTableAccessorNoCluster { .thenThrow(new ServiceException("Server not running (3 of 3)")) .thenAnswer(new Answer() { public ScanResponse answer(InvocationOnMock invocation) throws Throwable { - ((HBaseRpcController) invocation.getArguments()[0]).setCellScanner(CellUtil + ((HBaseRpcController) invocation.getArgument(0)).setCellScanner(CellUtil .createCellScanner(cellScannables)); return builder.setScannerId(1234567890L).setMoreResults(false).build(); } @@ -189,7 +189,7 @@ public class TestMetaTableAccessorNoCluster { // Now shove our HRI implementation into the spied-upon connection. Mockito.doReturn(implementation). - when(connection).getClient(Mockito.any(ServerName.class)); + when(connection).getClient(Mockito.any()); // Scan meta for user tables and verify we got back expected answer. NavigableMap hris = diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableLocator.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableLocator.java index 8bebd8d7d7..6a904a7a90 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableLocator.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableLocator.java @@ -250,7 +250,7 @@ public class TestMetaTableLocator { Mockito.mock(AdminProtos.AdminService.BlockingInterface.class); Mockito.when(implementation.getRegionInfo((RpcController)Mockito.any(), (GetRegionInfoRequest)Mockito.any())).thenThrow(connectException); - Mockito.when(connection.getAdmin(Mockito.any(ServerName.class))). + Mockito.when(connection.getAdmin(Mockito.any())). thenReturn(implementation); RpcControllerFactory controllerFactory = Mockito.mock(RpcControllerFactory.class); Mockito.when(controllerFactory.newController()).thenReturn( @@ -325,12 +325,12 @@ public class TestMetaTableLocator { thenReturn(anyLocation); if (admin != null) { // If a call to getHRegionConnection, return this implementation. - Mockito.when(connection.getAdmin(Mockito.any(ServerName.class))). + Mockito.when(connection.getAdmin(Mockito.any())). thenReturn(admin); } if (client != null) { // If a call to getClient, return this implementation. - Mockito.when(connection.getClient(Mockito.any(ServerName.class))). + Mockito.when(connection.getClient(Mockito.any())). thenReturn(client); } return connection; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/example/TestZooKeeperTableArchiveClient.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/example/TestZooKeeperTableArchiveClient.java index 20cb5133bf..aa246c2874 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/example/TestZooKeeperTableArchiveClient.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/example/TestZooKeeperTableArchiveClient.java @@ -362,7 +362,7 @@ public class TestZooKeeperTableArchiveClient { public Iterable answer(InvocationOnMock invocation) throws Throwable { counter[0]++; LOG.debug(counter[0] + "/ " + expected + ") Wrapping call to getDeletableFiles for files: " - + invocation.getArguments()[0]); + + invocation.getArgument(0)); @SuppressWarnings("unchecked") Iterable ret = (Iterable) invocation.callRealMethod(); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/HConnectionTestingUtility.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/HConnectionTestingUtility.java index d7d1b3ac6e..8ef784c772 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/HConnectionTestingUtility.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/HConnectionTestingUtility.java @@ -116,12 +116,12 @@ public class HConnectionTestingUtility { .thenReturn(new RegionLocations(loc)); if (admin != null) { // If a call to getAdmin, return this implementation. - Mockito.when(c.getAdmin(Mockito.any(ServerName.class))). + Mockito.when(c.getAdmin(Mockito.any())). thenReturn(admin); } if (client != null) { // If a call to getClient, return this client. - Mockito.when(c.getClient(Mockito.any(ServerName.class))). + Mockito.when(c.getClient(Mockito.any())). thenReturn(client); } NonceGenerator ng = Mockito.mock(NonceGenerator.class); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/errorhandling/TestForeignExceptionDispatcher.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/errorhandling/TestForeignExceptionDispatcher.java index 3e3aa45528..650e4d6212 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/errorhandling/TestForeignExceptionDispatcher.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/errorhandling/TestForeignExceptionDispatcher.java @@ -96,8 +96,8 @@ public class TestForeignExceptionDispatcher { assertTrue("Monitor didn't get timeout", monitor.hasException()); // verify that that we propagated the error - Mockito.verify(listener1).receive(Mockito.any(ForeignException.class)); - Mockito.verify(listener2).receive(Mockito.any(ForeignException.class)); + Mockito.verify(listener1).receive(Mockito.any()); + Mockito.verify(listener2).receive(Mockito.any()); } /** @@ -118,7 +118,7 @@ public class TestForeignExceptionDispatcher { timer.start(); timer.trigger(); // make sure that we got the timer error - Mockito.verify(listener1, Mockito.times(1)).receive(Mockito.any(ForeignException.class)); - Mockito.verify(listener2, Mockito.times(1)).receive(Mockito.any(ForeignException.class)); + Mockito.verify(listener1, Mockito.times(1)).receive(Mockito.any()); + Mockito.verify(listener2, Mockito.times(1)).receive(Mockito.any()); } } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/errorhandling/TestTimeoutExceptionInjector.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/errorhandling/TestTimeoutExceptionInjector.java index 49f61648b1..37af804cb6 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/errorhandling/TestTimeoutExceptionInjector.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/errorhandling/TestTimeoutExceptionInjector.java @@ -45,7 +45,7 @@ public class TestTimeoutExceptionInjector { TimeoutExceptionInjector timer = new TimeoutExceptionInjector(listener, time); timer.start(); timer.trigger(); - Mockito.verify(listener, Mockito.times(1)).receive(Mockito.any(ForeignException.class)); + Mockito.verify(listener, Mockito.times(1)).receive(Mockito.any()); } /** @@ -58,7 +58,7 @@ public class TestTimeoutExceptionInjector { TimeoutExceptionInjector timer = new TimeoutExceptionInjector(listener, time); timer.start(); timer.trigger(); - Mockito.verify(listener).receive(Mockito.any(ForeignException.class)); + Mockito.verify(listener).receive(Mockito.any()); } /** @@ -98,7 +98,7 @@ public class TestTimeoutExceptionInjector { LOG.debug("Correctly failed timer: " + e.getMessage()); } Thread.sleep(time * 2); - Mockito.verify(listener, Mockito.times(1)).receive(Mockito.any(ForeignException.class)); + Mockito.verify(listener, Mockito.times(1)).receive(Mockito.any()); Mockito.verifyNoMoreInteractions(listener); } } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.java index 8364b22f1f..ee538ecc3d 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.java @@ -182,7 +182,6 @@ public class TestSimpleRpcScheduler { @Test public void testHandlerIsolation() throws IOException, InterruptedException { - CallRunner generalTask = createMockTask(); CallRunner priorityTask = createMockTask(); CallRunner replicationTask = createMockTask(); @@ -219,9 +218,7 @@ public class TestSimpleRpcScheduler { scheduler.init(CONTEXT); scheduler.start(); for (CallRunner task : tasks) { - when(qosFunction.getPriority((RPCProtos.RequestHeader) anyObject(), - (Message) anyObject(), (User) anyObject())) - .thenReturn(qos.get(task)); + when(qosFunction.getPriority(any(), any(), any())).thenReturn(qos.get(task)); scheduler.dispatch(task); } for (CallRunner task : tasks) { @@ -238,13 +235,11 @@ public class TestSimpleRpcScheduler { ServerCall call = mock(ServerCall.class); CallRunner task = mock(CallRunner.class); when(task.getRpcCall()).thenReturn(call); - when(call.getRequestUser()).thenReturn(Optional.empty()); return task; } @Test public void testRpcScheduler() throws Exception { - testRpcScheduler(RpcExecutor.CALL_QUEUE_TYPE_DEADLINE_CONF_VALUE); testRpcScheduler(RpcExecutor.CALL_QUEUE_TYPE_FIFO_CONF_VALUE); } @@ -254,9 +249,7 @@ public class TestSimpleRpcScheduler { schedConf.set(RpcExecutor.CALL_QUEUE_TYPE_CONF_KEY, queueType); PriorityFunction priority = mock(PriorityFunction.class); - when(priority.getPriority(any(RequestHeader.class), - any(Message.class), any(User.class))) - .thenReturn(HConstants.NORMAL_QOS); + when(priority.getPriority(any(), any(), any())).thenReturn(HConstants.NORMAL_QOS); RpcScheduler scheduler = new SimpleRpcScheduler(schedConf, 1, 1, 1, priority, HConstants.QOS_THRESHOLD); @@ -268,25 +261,22 @@ public class TestSimpleRpcScheduler { RequestHeader smallHead = RequestHeader.newBuilder().setCallId(1).build(); when(smallCallTask.getRpcCall()).thenReturn(smallCall); when(smallCall.getHeader()).thenReturn(smallHead); - when(smallCall.getRequestUser()).thenReturn(Optional.empty()); CallRunner largeCallTask = mock(CallRunner.class); ServerCall largeCall = mock(ServerCall.class); RequestHeader largeHead = RequestHeader.newBuilder().setCallId(50).build(); when(largeCallTask.getRpcCall()).thenReturn(largeCall); when(largeCall.getHeader()).thenReturn(largeHead); - when(largeCall.getRequestUser()).thenReturn(Optional.empty()); CallRunner hugeCallTask = mock(CallRunner.class); ServerCall hugeCall = mock(ServerCall.class); RequestHeader hugeHead = RequestHeader.newBuilder().setCallId(100).build(); when(hugeCallTask.getRpcCall()).thenReturn(hugeCall); when(hugeCall.getHeader()).thenReturn(hugeHead); - when(hugeCall.getRequestUser()).thenReturn(Optional.empty()); - when(priority.getDeadline(eq(smallHead), any(Message.class))).thenReturn(0L); - when(priority.getDeadline(eq(largeHead), any(Message.class))).thenReturn(50L); - when(priority.getDeadline(eq(hugeHead), any(Message.class))).thenReturn(100L); + when(priority.getDeadline(eq(smallHead), any())).thenReturn(0L); + when(priority.getDeadline(eq(largeHead), any())).thenReturn(50L); + when(priority.getDeadline(eq(hugeHead), any())).thenReturn(100L); final ArrayList work = new ArrayList<>(); doAnswerTaskExecution(smallCallTask, work, 10, 250); @@ -337,8 +327,7 @@ public class TestSimpleRpcScheduler { schedConf.setFloat(RWQueueRpcExecutor.CALL_QUEUE_SCAN_SHARE_CONF_KEY, 0f); PriorityFunction priority = mock(PriorityFunction.class); - when(priority.getPriority(any(RequestHeader.class), any(Message.class), - any(User.class))).thenReturn(HConstants.NORMAL_QOS); + when(priority.getPriority(any(), any(), any())).thenReturn(HConstants.NORMAL_QOS); RpcScheduler scheduler = new SimpleRpcScheduler(schedConf, 2, 1, 1, priority, HConstants.QOS_THRESHOLD); @@ -353,8 +342,7 @@ public class TestSimpleRpcScheduler { schedConf.setFloat(RWQueueRpcExecutor.CALL_QUEUE_SCAN_SHARE_CONF_KEY, 0.5f); PriorityFunction priority = mock(PriorityFunction.class); - when(priority.getPriority(any(RPCProtos.RequestHeader.class), any(Message.class), - any(User.class))).thenReturn(HConstants.NORMAL_QOS); + when(priority.getPriority(any(), any(), any())).thenReturn(HConstants.NORMAL_QOS); RpcScheduler scheduler = new SimpleRpcScheduler(schedConf, 3, 1, 1, priority, HConstants.QOS_THRESHOLD); @@ -369,14 +357,12 @@ public class TestSimpleRpcScheduler { when(putCallTask.getRpcCall()).thenReturn(putCall); when(putCall.getHeader()).thenReturn(putHead); when(putCall.getParam()).thenReturn(putCall.param); - when(putCall.getRequestUser()).thenReturn(Optional.empty()); CallRunner getCallTask = mock(CallRunner.class); ServerCall getCall = mock(ServerCall.class); RequestHeader getHead = RequestHeader.newBuilder().setMethodName("get").build(); when(getCallTask.getRpcCall()).thenReturn(getCall); when(getCall.getHeader()).thenReturn(getHead); - when(getCall.getRequestUser()).thenReturn(Optional.empty()); CallRunner scanCallTask = mock(CallRunner.class); ServerCall scanCall = mock(ServerCall.class); @@ -385,7 +371,6 @@ public class TestSimpleRpcScheduler { when(scanCallTask.getRpcCall()).thenReturn(scanCall); when(scanCall.getHeader()).thenReturn(scanHead); when(scanCall.getParam()).thenReturn(scanCall.param); - when(scanCall.getRequestUser()).thenReturn(Optional.empty()); ArrayList work = new ArrayList<>(); doAnswerTaskExecution(putCallTask, work, 1, 1000); @@ -449,8 +434,7 @@ public class TestSimpleRpcScheduler { schedConf.setInt("hbase.ipc.server.max.callqueue.length", 5); PriorityFunction priority = mock(PriorityFunction.class); - when(priority.getPriority(any(RequestHeader.class), any(Message.class), - any(User.class))).thenReturn(HConstants.NORMAL_QOS); + when(priority.getPriority(any(), any(), any())).thenReturn(HConstants.NORMAL_QOS); SimpleRpcScheduler scheduler = new SimpleRpcScheduler(schedConf, 0, 0, 0, priority, HConstants.QOS_THRESHOLD); try { @@ -463,7 +447,6 @@ public class TestSimpleRpcScheduler { RequestHeader putHead = RequestHeader.newBuilder().setMethodName("mutate").build(); when(putCallTask.getRpcCall()).thenReturn(putCall); when(putCall.getHeader()).thenReturn(putHead); - when(putCall.getRequestUser()).thenReturn(Optional.empty()); assertTrue(scheduler.dispatch(putCallTask)); @@ -516,8 +499,7 @@ public class TestSimpleRpcScheduler { schedConf.set(RpcExecutor.CALL_QUEUE_TYPE_CONF_KEY, RpcExecutor.CALL_QUEUE_TYPE_CODEL_CONF_VALUE); PriorityFunction priority = mock(PriorityFunction.class); - when(priority.getPriority(any(RPCProtos.RequestHeader.class), any(Message.class), - any(User.class))).thenReturn(HConstants.NORMAL_QOS); + when(priority.getPriority(any(), any(), any())).thenReturn(HConstants.NORMAL_QOS); SimpleRpcScheduler scheduler = new SimpleRpcScheduler(schedConf, 1, 1, 1, priority, HConstants.QOS_THRESHOLD); try { diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java index 62157907e0..3dcd849a5e 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java @@ -145,7 +145,7 @@ public class TestSplitLogManager { // By default, we let the test manage the error as before, so the server // does not appear as dead from the master point of view, only from the split log pov. - Mockito.when(sm.isServerOnline(Mockito.any(ServerName.class))).thenReturn(true); + Mockito.when(sm.isServerOnline(Mockito.any())).thenReturn(true); to = 12000; conf.setInt(HConstants.HBASE_SPLITLOG_MANAGER_TIMEOUT, to); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/MockMasterServices.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/MockMasterServices.java index 073216c88f..11df52eec2 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/MockMasterServices.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/MockMasterServices.java @@ -146,7 +146,7 @@ public class MockMasterServices extends MockNoopMasterServices { thenAnswer(new Answer() { @Override public MultiResponse answer(InvocationOnMock invocation) throws Throwable { - return buildMultiResponse( (MultiRequest)invocation.getArguments()[1]); + return buildMultiResponse( (MultiRequest)invocation.getArgument(1)); } }); } catch (ServiceException se) { diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestCleanerChore.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestCleanerChore.java index 5c76643059..566479a6de 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestCleanerChore.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestCleanerChore.java @@ -145,7 +145,7 @@ public class TestCleanerChore { // touch a new file fs.create(file).close(); assertTrue("Test file didn't get created.", fs.exists(file)); - + FileStatus fStat = fs.getFileStatus(parent); chore.chore(); // make sure we never checked the directory @@ -216,7 +216,7 @@ public class TestCleanerChore { FSUtils.logFileSystemState(fs, testDir, LOG); return (Boolean) invocation.callRealMethod(); } - }).when(spy).isFileDeletable(Mockito.any(FileStatus.class)); + }).when(spy).isFileDeletable(Mockito.any()); // run the chore chore.chore(); @@ -225,7 +225,7 @@ public class TestCleanerChore { assertTrue("Added file unexpectedly deleted", fs.exists(addedFile)); assertTrue("Parent directory deleted unexpectedly", fs.exists(parent)); assertFalse("Original file unexpectedly retained", fs.exists(file)); - Mockito.verify(spy, Mockito.times(1)).isFileDeletable(Mockito.any(FileStatus.class)); + Mockito.verify(spy, Mockito.times(1)).isFileDeletable(Mockito.any()); Mockito.reset(spy); } @@ -274,7 +274,7 @@ public class TestCleanerChore { FSUtils.logFileSystemState(fs, testDir, LOG); return (Boolean) invocation.callRealMethod(); } - }).when(spy).isFileDeletable(Mockito.any(FileStatus.class)); + }).when(spy).isFileDeletable(Mockito.any()); // attempt to delete the directory, which if (chore.checkAndDeleteDirectory(parent)) { @@ -286,7 +286,7 @@ public class TestCleanerChore { assertTrue("Added file unexpectedly deleted", fs.exists(racyFile)); assertTrue("Parent directory deleted unexpectedly", fs.exists(parent)); assertFalse("Original file unexpectedly retained", fs.exists(file)); - Mockito.verify(spy, Mockito.times(1)).isFileDeletable(Mockito.any(FileStatus.class)); + Mockito.verify(spy, Mockito.times(1)).isFileDeletable(Mockito.any()); } @Test diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.java index ab6d7d0ffb..e3e85a6dcb 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.java @@ -353,9 +353,9 @@ public class TestSimpleRegionNormalizer { // for simplicity all regions are assumed to be on one server; doesn't matter to us ServerName sn = ServerName.valueOf("localhost", 0, 1L); when(masterServices.getAssignmentManager().getRegionStates(). - getRegionsOfTable(any(TableName.class))).thenReturn(RegionInfo); + getRegionsOfTable(any())).thenReturn(RegionInfo); when(masterServices.getAssignmentManager().getRegionStates(). - getRegionServerOfRegion(any(RegionInfo.class))).thenReturn(sn); + getRegionServerOfRegion(any())).thenReturn(sn); for (Map.Entry region : regionSizes.entrySet()) { RegionLoad regionLoad = Mockito.mock(RegionLoad.class); @@ -366,8 +366,8 @@ public class TestSimpleRegionNormalizer { getRegionsLoad().get(region.getKey())).thenReturn(regionLoad); } try { - when(masterRpcServices.isSplitOrMergeEnabled(any(RpcController.class), - any(IsSplitOrMergeEnabledRequest.class))).thenReturn( + when(masterRpcServices.isSplitOrMergeEnabled(any(), + any())).thenReturn( IsSplitOrMergeEnabledResponse.newBuilder().setEnabled(true).build()); } catch (ServiceException se) { LOG.debug("error setting isSplitOrMergeEnabled switch", se); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestProcedure.java index fa934d9082..0603b21446 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestProcedure.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestProcedure.java @@ -124,7 +124,7 @@ public class TestProcedure { proc.completedProcedure.await(); verify(procspy).sendGlobalBarrierReached(); verify(procspy).sendGlobalBarrierComplete(); - verify(procspy, never()).receive(any(ForeignException.class)); + verify(procspy, never()).receive(any()); } @Test(timeout = 60000) @@ -176,7 +176,7 @@ public class TestProcedure { procspy.completedProcedure.await(); verify(procspy).sendGlobalBarrierReached(); verify(procspy).sendGlobalBarrierComplete(); - verify(procspy, never()).receive(any(ForeignException.class)); + verify(procspy, never()).receive(any()); } @Test(timeout = 60000) diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestProcedureCoordinator.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestProcedureCoordinator.java index b5a9f29a44..4fee82cbf6 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestProcedureCoordinator.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestProcedureCoordinator.java @@ -106,7 +106,7 @@ public class TestProcedureCoordinator { Procedure proc2 = new Procedure(coordinator, monitor, WAKE_FREQUENCY, TIMEOUT, procName +"2", procData, expected); Procedure procSpy2 = spy(proc2); - when(coordinator.createProcedure(any(ForeignExceptionDispatcher.class), eq(procName), eq(procData), anyListOf(String.class))) + when(coordinator.createProcedure(any(), eq(procName), eq(procData), anyListOf(String.class))) .thenReturn(procSpy, procSpy2); coordinator.startProcedure(procSpy.getErrorMonitor(), procName, procData, expected); @@ -127,7 +127,7 @@ public class TestProcedureCoordinator { TIMEOUT, procName, procData, expected); final Procedure procSpy = spy(proc); - when(coordinator.createProcedure(any(ForeignExceptionDispatcher.class), eq(procName), eq(procData), anyListOf(String.class))) + when(coordinator.createProcedure(any(), eq(procName), eq(procData), anyListOf(String.class))) .thenReturn(procSpy); // use the passed controller responses @@ -139,10 +139,10 @@ public class TestProcedureCoordinator { proc = coordinator.startProcedure(proc.getErrorMonitor(), procName, procData, expected); // and wait for it to finish while(!proc.completedLatch.await(WAKE_FREQUENCY, TimeUnit.MILLISECONDS)); - verify(procSpy, atLeastOnce()).receive(any(ForeignException.class)); + verify(procSpy, atLeastOnce()).receive(any()); verify(coordinator, times(1)).rpcConnectionFailure(anyString(), eq(cause)); verify(controller, times(1)).sendGlobalBarrierAcquire(procSpy, procData, expected); - verify(controller, never()).sendGlobalBarrierReached(any(Procedure.class), + verify(controller, never()).sendGlobalBarrierReached(any(), anyListOf(String.class)); } @@ -158,7 +158,7 @@ public class TestProcedureCoordinator { final Procedure spy = spy(new Procedure(coordinator, WAKE_FREQUENCY, TIMEOUT, procName, procData, expected)); - when(coordinator.createProcedure(any(ForeignExceptionDispatcher.class), eq(procName), eq(procData), anyListOf(String.class))) + when(coordinator.createProcedure(any(), eq(procName), eq(procData), anyListOf(String.class))) .thenReturn(spy); // use the passed controller responses @@ -171,11 +171,11 @@ public class TestProcedureCoordinator { Procedure task = coordinator.startProcedure(spy.getErrorMonitor(), procName, procData, expected); // and wait for it to finish while(!task.completedLatch.await(WAKE_FREQUENCY, TimeUnit.MILLISECONDS)); - verify(spy, atLeastOnce()).receive(any(ForeignException.class)); + verify(spy, atLeastOnce()).receive(any()); verify(coordinator, times(1)).rpcConnectionFailure(anyString(), eq(cause)); verify(controller, times(1)).sendGlobalBarrierAcquire(eq(spy), eq(procData), anyListOf(String.class)); - verify(controller, times(1)).sendGlobalBarrierReached(any(Procedure.class), + verify(controller, times(1)).sendGlobalBarrierReached(any(), anyListOf(String.class)); } @@ -267,7 +267,7 @@ public class TestProcedureCoordinator { public void runCoordinatedOperation(Procedure spy, AcquireBarrierAnswer prepareOperation, BarrierAnswer commitOperation, String... cohort) throws Exception { List expected = Arrays.asList(cohort); - when(coordinator.createProcedure(any(ForeignExceptionDispatcher.class), eq(procName), eq(procData), anyListOf(String.class))) + when(coordinator.createProcedure(any(), eq(procName), eq(procData), anyListOf(String.class))) .thenReturn(spy); // use the passed controller responses diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestProcedureMember.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestProcedureMember.java index e2e641ea59..ea86b400ff 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestProcedureMember.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestProcedureMember.java @@ -117,7 +117,7 @@ public class TestProcedureMember { member.receivedReachedGlobalBarrier(op); return null; } - }).when(mockMemberComms).sendMemberAcquired(any(Subprocedure.class)); + }).when(mockMemberComms).sendMemberAcquired(any()); } /** @@ -147,7 +147,7 @@ public class TestProcedureMember { order.verify(spy).insideBarrier(); order.verify(mockMemberComms).sendMemberCompleted(eq(spy), eq(data)); order.verify(mockMemberComms, never()).sendMemberAborted(eq(spy), - any(ForeignException.class)); + any()); } /** @@ -182,8 +182,8 @@ public class TestProcedureMember { order.verify(spySub, never()).insideBarrier(); order.verify(mockMemberComms, never()).sendMemberCompleted(eq(spySub), eq(data)); // error recovery path exercised - order.verify(spySub).cancel(anyString(), any(Exception.class)); - order.verify(spySub).cleanup(any(Exception.class)); + order.verify(spySub).cancel(anyString(), any()); + order.verify(spySub).cleanup(any()); } /** @@ -200,7 +200,7 @@ public class TestProcedureMember { public Void answer(InvocationOnMock invocation) throws Throwable { throw new IOException("Forced IOException in memeber prepare"); } - }).when(mockMemberComms).sendMemberAcquired(any(Subprocedure.class)); + }).when(mockMemberComms).sendMemberAcquired(any()); // run the operation // build a new operation @@ -218,8 +218,8 @@ public class TestProcedureMember { order.verify(spySub, never()).insideBarrier(); order.verify(mockMemberComms, never()).sendMemberCompleted(eq(spySub), eq(data)); // error recovery path exercised - order.verify(spySub).cancel(anyString(), any(Exception.class)); - order.verify(spySub).cleanup(any(Exception.class)); + order.verify(spySub).cancel(anyString(), any()); + order.verify(spySub).cleanup(any()); } /** @@ -261,8 +261,8 @@ public class TestProcedureMember { order.verify(spySub, never()).insideBarrier(); order.verify(mockMemberComms, never()).sendMemberCompleted(eq(spySub), eq(data)); // error recovery path exercised - order.verify(spySub).cancel(anyString(), any(Exception.class)); - order.verify(spySub).cleanup(any(Exception.class)); + order.verify(spySub).cancel(anyString(), any()); + order.verify(spySub).cleanup(any()); } /** @@ -302,8 +302,8 @@ public class TestProcedureMember { // Later phases not run order.verify(mockMemberComms, never()).sendMemberCompleted(eq(spySub), eq(data)); // error recovery path exercised - order.verify(spySub).cancel(anyString(), any(Exception.class)); - order.verify(spySub).cleanup(any(Exception.class)); + order.verify(spySub).cancel(anyString(), any()); + order.verify(spySub).cleanup(any()); } /** @@ -328,7 +328,7 @@ public class TestProcedureMember { Thread.sleep(WAKE_FREQUENCY); return null; } - }).when(mockMemberComms).sendMemberCompleted(any(Subprocedure.class), eq(data)); + }).when(mockMemberComms).sendMemberCompleted(any(), eq(data)); // run the operation // build a new operation @@ -344,8 +344,8 @@ public class TestProcedureMember { order.verify(spySub).insideBarrier(); order.verify(mockMemberComms).sendMemberCompleted(eq(spySub), eq(data)); // error recovery path exercised - order.verify(spySub).cancel(anyString(), any(Exception.class)); - order.verify(spySub).cleanup(any(Exception.class)); + order.verify(spySub).cancel(anyString(), any()); + order.verify(spySub).cleanup(any()); } /** @@ -369,7 +369,7 @@ public class TestProcedureMember { doThrow(new ForeignException("SRC", "prepare exception")).when(spy).acquireBarrier(); // and throw a connection error when we try to tell the controller about it doThrow(new IOException("Controller is down!")).when(mockMemberComms) - .sendMemberAborted(eq(spy), any(ForeignException.class)); + .sendMemberAborted(eq(spy), any()); // run the operation @@ -388,9 +388,9 @@ public class TestProcedureMember { // TODO Need to do another refactor to get this to propagate to the coordinator. // make sure we pass a remote exception back the controller // order.verify(mockMemberComms).sendMemberAborted(eq(spy), -// any(ExternalException.class)); +// any()); // order.verify(dispSpy).receiveError(anyString(), -// any(ExternalException.class), any()); +// any(), any()); } /** @@ -427,7 +427,7 @@ public class TestProcedureMember { verifyZeroInteractions(pool); // get two abort requests // TODO Need to do another refactor to get this to propagate to the coordinator. - // verify(mockMemberComms, times(2)).sendMemberAborted(any(Subprocedure.class), any(ExternalException.class)); + // verify(mockMemberComms, times(2)).sendMemberAborted(any(), any()); } /** diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestZKProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestZKProcedure.java index 856e449dfd..14d7eab060 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestZKProcedure.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestZKProcedure.java @@ -284,7 +284,7 @@ public class TestZKProcedure { Procedure coordinatorTask = Mockito.spy(new Procedure(coordinator, coordinatorTaskErrorMonitor, WAKE_FREQUENCY, TIMEOUT, opName, data, expected)); - when(coordinator.createProcedure(any(ForeignExceptionDispatcher.class), eq(opName), eq(data), anyListOf(String.class))) + when(coordinator.createProcedure(any(), eq(opName), eq(data), anyListOf(String.class))) .thenReturn(coordinatorTask); // count down the error latch when we get the remote error Mockito.doAnswer(new Answer() { @@ -296,7 +296,7 @@ public class TestZKProcedure { coordinatorReceivedErrorLatch.countDown(); return null; } - }).when(coordinatorTask).receive(Mockito.any(ForeignException.class)); + }).when(coordinatorTask).receive(Mockito.any()); // ---------------------------- // start running the operation diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestZKProcedureControllers.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestZKProcedureControllers.java index 8b947ee234..7a56ec9baf 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestZKProcedureControllers.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestZKProcedureControllers.java @@ -131,10 +131,10 @@ public class TestZKProcedureControllers { LOG.debug("Commit node:" + commit + ", exists:" + ZKUtil.checkExists(watcher, commit)); committed.await(); - verify(monitor, never()).receive(Mockito.any(ForeignException.class)); + verify(monitor, never()).receive(Mockito.any()); // XXX: broken due to composition. // verify(member, never()).getManager().controllerConnectionFailure(Mockito.anyString(), -// Mockito.any(IOException.class)); +// Mockito.any()); // cleanup after the test ZKUtil.deleteNodeRecursively(watcher, controller.getZkController().getBaseZnode()); assertEquals("Didn't delete prepare node", -1, ZKUtil.checkExists(watcher, prepare)); @@ -363,7 +363,7 @@ public class TestZKProcedureControllers { // verify(member, Mockito.times(cohortSize)).submitSubprocedure(Mockito.eq(operationName), // (byte[]) Mockito.argThat(new ArrayEquals(data))); Mockito.verify(member, - Mockito.atLeast(cohortSize)).submitSubprocedure(Mockito.any(Subprocedure.class)); + Mockito.atLeast(cohortSize)).submitSubprocedure(Mockito.any()); } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestFileSystemUtilizationChore.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestFileSystemUtilizationChore.java index ebd24361a6..f1e41cdb90 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestFileSystemUtilizationChore.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestFileSystemUtilizationChore.java @@ -61,7 +61,7 @@ public class TestFileSystemUtilizationChore { final FileSystemUtilizationChore chore = new FileSystemUtilizationChore(rs); doAnswer(new ExpectedRegionSizeSummationAnswer(sum(regionSizes))) .when(rs) - .reportRegionSizesForQuotas((Map) any(Map.class)); + .reportRegionSizesForQuotas((Map) any()); final Region region = mockRegionWithSize(regionSizes); Mockito.doReturn(Arrays.asList(region)).when(rs).getRegions(); @@ -78,7 +78,7 @@ public class TestFileSystemUtilizationChore { final FileSystemUtilizationChore chore = new FileSystemUtilizationChore(rs); doAnswer(new ExpectedRegionSizeSummationAnswer(sum(regionSizes))) .when(rs) - .reportRegionSizesForQuotas((Map) any(Map.class)); + .reportRegionSizesForQuotas((Map) any()); final Region region = mockRegionWithSize(regionSizes); Mockito.doReturn(Arrays.asList(region)).when(rs).getRegions(); @@ -102,7 +102,7 @@ public class TestFileSystemUtilizationChore { final FileSystemUtilizationChore chore = new FileSystemUtilizationChore(rs); doAnswer(new ExpectedRegionSizeSummationAnswer(sum(Arrays.asList(r1Sum, r2Sum, r3Sum)))) .when(rs) - .reportRegionSizesForQuotas((Map) any(Map.class)); + .reportRegionSizesForQuotas((Map) any()); final Region r1 = mockRegionWithSize(r1Sizes); final Region r2 = mockRegionWithSize(r2Sizes); @@ -167,7 +167,7 @@ public class TestFileSystemUtilizationChore { }; doAnswer(new ExpectedRegionSizeSummationAnswer(sum(Arrays.asList(leftover1Sum, leftover2Sum)))) .when(rs) - .reportRegionSizesForQuotas((Map) any(Map.class)); + .reportRegionSizesForQuotas((Map) any()); // We shouldn't compute all of these region sizes, just the leftovers final Region r1 = mockRegionWithSize(Arrays.asList(1024L, 2048L)); @@ -199,7 +199,7 @@ public class TestFileSystemUtilizationChore { }; doAnswer(new ExpectedRegionSizeSummationAnswer(sum(Arrays.asList(leftover1Sum)))) .when(rs) - .reportRegionSizesForQuotas((Map) any(Map.class)); + .reportRegionSizesForQuotas((Map) any()); // We shouldn't compute all of these region sizes, just the leftovers final Region r1 = mockRegionWithSize(Arrays.asList(1024L, 2048L)); @@ -225,7 +225,7 @@ public class TestFileSystemUtilizationChore { final FileSystemUtilizationChore chore = new FileSystemUtilizationChore(rs); doAnswer(new ExpectedRegionSizeSummationAnswer(sum(Arrays.asList(r1Sum)))) .when(rs) - .reportRegionSizesForQuotas((Map) any(Map.class)); + .reportRegionSizesForQuotas((Map) any()); final Region r1 = mockRegionWithSize(r1Sizes); final Region r2 = mockSplitParentRegionWithSize(r2Sizes); @@ -247,7 +247,7 @@ public class TestFileSystemUtilizationChore { final FileSystemUtilizationChore chore = new FileSystemUtilizationChore(rs); doAnswer(new ExpectedRegionSizeSummationAnswer(r1Sum)) .when(rs) - .reportRegionSizesForQuotas((Map) any(Map.class)); + .reportRegionSizesForQuotas((Map) any()); final Region r1 = mockRegionWithSize(r1Sizes); final Region r2 = mockRegionReplicaWithSize(r2Sizes); @@ -274,7 +274,7 @@ public class TestFileSystemUtilizationChore { final FileSystemUtilizationChore chore = new FileSystemUtilizationChore(rs); doAnswer(new ExpectedRegionSizeSummationAnswer( sum(Arrays.asList(r1HFileSizeSum, r2HFileSizeSum)))) - .when(rs).reportRegionSizesForQuotas((Map) any(Map.class)); + .when(rs).reportRegionSizesForQuotas((Map) any()); final Region r1 = mockRegionWithHFileLinks(r1StoreFileSizes, r1HFileSizes); final Region r2 = mockRegionWithHFileLinks(r2StoreFileSizes, r2HFileSizes); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestMasterSpaceQuotaObserverWithMocks.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestMasterSpaceQuotaObserverWithMocks.java index 271e5bbbf1..36b5ae17b4 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestMasterSpaceQuotaObserverWithMocks.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestMasterSpaceQuotaObserverWithMocks.java @@ -51,7 +51,7 @@ public class TestMasterSpaceQuotaObserverWithMocks { conf = HBaseConfiguration.create(); master = mock(HMaster.class); doCallRealMethod().when(master).updateConfigurationForSpaceQuotaObserver( - any(Configuration.class)); + any()); } @Test diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestNamespaceQuotaViolationStore.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestNamespaceQuotaViolationStore.java index 303dad07da..5ce2ec4a32 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestNamespaceQuotaViolationStore.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestNamespaceQuotaViolationStore.java @@ -73,7 +73,7 @@ public class TestNamespaceQuotaViolationStore { @Test public void testGetSpaceQuota() throws Exception { NamespaceQuotaSnapshotStore mockStore = mock(NamespaceQuotaSnapshotStore.class); - when(mockStore.getSpaceQuota(any(String.class))).thenCallRealMethod(); + when(mockStore.getSpaceQuota(any())).thenCallRealMethod(); Quotas quotaWithSpace = Quotas.newBuilder().setSpace( SpaceQuota.newBuilder() @@ -84,7 +84,7 @@ public class TestNamespaceQuotaViolationStore { Quotas quotaWithoutSpace = Quotas.newBuilder().build(); AtomicReference quotaRef = new AtomicReference<>(); - when(mockStore.getQuotaForNamespace(any(String.class))).then(new Answer() { + when(mockStore.getQuotaForNamespace(any())).then(new Answer() { @Override public Quotas answer(InvocationOnMock invocation) throws Throwable { return quotaRef.get(); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestSpaceQuotaViolationPolicyRefresherChore.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestSpaceQuotaViolationPolicyRefresherChore.java index 7f0f9adbe0..2ddb5a31ea 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestSpaceQuotaViolationPolicyRefresherChore.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestSpaceQuotaViolationPolicyRefresherChore.java @@ -77,8 +77,8 @@ public class TestSpaceQuotaViolationPolicyRefresherChore { when(chore.getConnection()).thenReturn(conn); when(chore.getManager()).thenReturn(manager); doCallRealMethod().when(chore).chore(); - when(chore.isInViolation(any(SpaceQuotaSnapshot.class))).thenCallRealMethod(); - doCallRealMethod().when(chore).extractQuotaSnapshot(any(Result.class), any(Map.class)); + when(chore.isInViolation(any())).thenCallRealMethod(); + doCallRealMethod().when(chore).extractQuotaSnapshot(any(), any()); } @Test diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestTableQuotaViolationStore.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestTableQuotaViolationStore.java index 5ba830d106..64b2442070 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestTableQuotaViolationStore.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestTableQuotaViolationStore.java @@ -165,7 +165,7 @@ public class TestTableQuotaViolationStore { @Test public void testGetSpaceQuota() throws Exception { TableQuotaSnapshotStore mockStore = mock(TableQuotaSnapshotStore.class); - when(mockStore.getSpaceQuota(any(TableName.class))).thenCallRealMethod(); + when(mockStore.getSpaceQuota(any())).thenCallRealMethod(); Quotas quotaWithSpace = Quotas.newBuilder().setSpace( SpaceQuota.newBuilder() @@ -176,7 +176,7 @@ public class TestTableQuotaViolationStore { Quotas quotaWithoutSpace = Quotas.newBuilder().build(); AtomicReference quotaRef = new AtomicReference<>(); - when(mockStore.getQuotaForTable(any(TableName.class))).then(new Answer() { + when(mockStore.getQuotaForTable(any())).then(new Answer() { @Override public Quotas answer(InvocationOnMock invocation) throws Throwable { return quotaRef.get(); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestTableSpaceQuotaViolationNotifier.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestTableSpaceQuotaViolationNotifier.java index 6626ab5c4c..c062319d7e 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestTableSpaceQuotaViolationNotifier.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestTableSpaceQuotaViolationNotifier.java @@ -92,7 +92,7 @@ public class TestTableSpaceQuotaViolationNotifier { /** * Quick hack to verify a Mutation with one column. */ - private static class SingleCellMutationMatcher extends ArgumentMatcher { + private static class SingleCellMutationMatcher implements ArgumentMatcher { private final Mutation expected; private SingleCellMutationMatcher(Mutation expected) { @@ -100,7 +100,7 @@ public class TestTableSpaceQuotaViolationNotifier { } @Override - public boolean matches(Object argument) { + public boolean matches(T argument) { if (!expected.getClass().isAssignableFrom(argument.getClass())) { return false; } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/StatefulStoreMockMaker.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/StatefulStoreMockMaker.java index a1fe87b2a7..5af7d9657e 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/StatefulStoreMockMaker.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/StatefulStoreMockMaker.java @@ -18,8 +18,8 @@ */ package org.apache.hadoop.hbase.regionserver; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -27,8 +27,6 @@ import static org.mockito.Mockito.when; import java.util.Optional; import org.apache.hadoop.hbase.regionserver.compactions.CompactionContext; -import org.apache.hadoop.hbase.regionserver.compactions.CompactionLifeCycleTracker; -import org.apache.hadoop.hbase.security.User; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -42,37 +40,23 @@ public class StatefulStoreMockMaker { return Optional.empty(); } - public void cancelCompaction(Object originalContext) { - } + public void cancelCompaction(Object originalContext) {} public int getPriority() { return 0; } - - private class SelectAnswer implements Answer> { - public Optional answer(InvocationOnMock invocation) throws Throwable { - return selectCompaction(); - } - } - - private class PriorityAnswer implements Answer { - public Integer answer(InvocationOnMock invocation) throws Throwable { - return getPriority(); - } - } private class CancelAnswer implements Answer { public CompactionContext answer(InvocationOnMock invocation) throws Throwable { - cancelCompaction(invocation.getArguments()[0]); return null; + cancelCompaction(invocation.getArgument(0)); + return null; } } public HStore createStoreMock(String name) throws Exception { HStore store = mock(HStore.class, name); - when(store.requestCompaction(anyInt(), any(CompactionLifeCycleTracker.class), any(User.class))) - .then(new SelectAnswer()); - when(store.getCompactPriority()).then(new PriorityAnswer()); - doAnswer(new CancelAnswer()).when(store) - .cancelRequestedCompaction(any(CompactionContext.class)); + when(store.requestCompaction(anyInt(), any(), any())).then(inv -> selectCompaction()); + when(store.getCompactPriority()).then(inv -> getPriority()); + doAnswer(new CancelAnswer()).when(store).cancelRequestedCompaction(any()); return store; } } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestBulkLoad.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestBulkLoad.java index 32c5e13a10..86df4c294e 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestBulkLoad.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestBulkLoad.java @@ -59,10 +59,13 @@ import org.hamcrest.Description; import org.hamcrest.Matcher; import org.hamcrest.TypeSafeMatcher; -import static org.mockito.Matchers.*; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; 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; + import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -108,12 +111,12 @@ public class TestBulkLoad { storeFileName = (new Path(storeFileName)).getName(); List storeFileNames = new ArrayList<>(); storeFileNames.add(storeFileName); - when(log.append(any(HRegionInfo.class), any(WALKey.class), + when(log.append(any(), any(), argThat(bulkLogWalEdit(WALEdit.BULK_LOAD, tableName.toBytes(), familyName, storeFileNames)), - any(boolean.class))).thenAnswer(new Answer() { + any())).thenAnswer(new Answer() { public Object answer(InvocationOnMock invocation) { - WALKey walKey = invocation.getArgumentAt(1, WALKey.class); + WALKey walKey = invocation.getArgument(1); MultiVersionConcurrencyControl mvcc = walKey.getMvcc(); if (mvcc != null) { MultiVersionConcurrencyControl.WriteEntry we = mvcc.begin(); @@ -134,11 +137,11 @@ public class TestBulkLoad { @Test public void shouldBulkLoadSingleFamilyHLog() throws IOException { - when(log.append(any(HRegionInfo.class), - any(WALKey.class), argThat(bulkLogWalEditType(WALEdit.BULK_LOAD)), - any(boolean.class))).thenAnswer(new Answer() { + when(log.append(any(), + any(), argThat(bulkLogWalEditType(WALEdit.BULK_LOAD)), + any())).thenAnswer(new Answer() { public Object answer(InvocationOnMock invocation) { - WALKey walKey = invocation.getArgumentAt(1, WALKey.class); + WALKey walKey = invocation.getArgument(1); MultiVersionConcurrencyControl mvcc = walKey.getMvcc(); if (mvcc != null) { MultiVersionConcurrencyControl.WriteEntry we = mvcc.begin(); @@ -153,11 +156,11 @@ public class TestBulkLoad { @Test public void shouldBulkLoadManyFamilyHLog() throws IOException { - when(log.append(any(HRegionInfo.class), - any(WALKey.class), argThat(bulkLogWalEditType(WALEdit.BULK_LOAD)), - any(boolean.class))).thenAnswer(new Answer() { + when(log.append(any(), + any(), argThat(bulkLogWalEditType(WALEdit.BULK_LOAD)), + any())).thenAnswer(new Answer() { public Object answer(InvocationOnMock invocation) { - WALKey walKey = invocation.getArgumentAt(1, WALKey.class); + WALKey walKey = invocation.getArgument(1); MultiVersionConcurrencyControl mvcc = walKey.getMvcc(); if (mvcc != null) { MultiVersionConcurrencyControl.WriteEntry we = mvcc.begin(); @@ -173,11 +176,11 @@ public class TestBulkLoad { @Test public void shouldBulkLoadManyFamilyHLogEvenWhenTableNameNamespaceSpecified() throws IOException { - when(log.append(any(HRegionInfo.class), - any(WALKey.class), argThat(bulkLogWalEditType(WALEdit.BULK_LOAD)), - any(boolean.class))).thenAnswer(new Answer() { + when(log.append(any(), + any(), argThat(bulkLogWalEditType(WALEdit.BULK_LOAD)), + any())).thenAnswer(new Answer() { public Object answer(InvocationOnMock invocation) { - WALKey walKey = invocation.getArgumentAt(1, WALKey.class); + WALKey walKey = invocation.getArgument(1); MultiVersionConcurrencyControl mvcc = walKey.getMvcc(); if (mvcc != null) { MultiVersionConcurrencyControl.WriteEntry we = mvcc.begin(); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java index 6316809925..ccbfb275a2 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java @@ -389,7 +389,7 @@ public class TestCompaction { thread.interruptIfNecessary(); } - private class StoreMockMaker extends StatefulStoreMockMaker { + class StoreMockMaker extends StatefulStoreMockMaker { public ArrayList compacting = new ArrayList<>(); public ArrayList notCompacting = new ArrayList<>(); private ArrayList results; @@ -558,12 +558,10 @@ public class TestCompaction { // Set up the region mock that redirects compactions. HRegion r = mock(HRegion.class); when( - r.compact(any(CompactionContext.class), any(HStore.class), - any(ThroughputController.class), any(User.class))).then(new Answer() { + r.compact(any(), any(), any(), any())).then(new Answer() { @Override public Boolean answer(InvocationOnMock invocation) throws Throwable { - invocation.getArgumentAt(0, CompactionContext.class).compact( - invocation.getArgumentAt(2, ThroughputController.class), null); + invocation.getArgument(0).compact(invocation.getArgument(2), null); return true; } }); @@ -571,7 +569,8 @@ public class TestCompaction { // Set up store mocks for 2 "real" stores and the one we use for blocking CST. ArrayList results = new ArrayList<>(); StoreMockMaker sm = new StoreMockMaker(results), sm2 = new StoreMockMaker(results); - HStore store = sm.createStoreMock("store1"), store2 = sm2.createStoreMock("store2"); + HStore store = sm.createStoreMock("store1"); + HStore store2 = sm2.createStoreMock("store2"); BlockingStoreMockMaker blocker = new BlockingStoreMockMaker(); // First, block the compaction thread so that we could muck with queue. diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionArchiveIOException.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionArchiveIOException.java index 0a47762fa9..9a9c6c0fdf 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionArchiveIOException.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionArchiveIOException.java @@ -186,7 +186,7 @@ public class TestCompactionArchiveIOException { // none of the other files are cleared from the compactedfiles list. // Simulate this condition with a dummy file doThrow(new IOException("Error for test")) - .when(errFS).rename(eq(new Path(storeDir, ERROR_FILE)), any(Path.class)); + .when(errFS).rename(eq(new Path(storeDir, ERROR_FILE)), any()); HRegionFileSystem fs = new HRegionFileSystem(conf, errFS, tableDir, info); final Configuration walConf = new Configuration(conf); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java index 41bd99780b..09369c3ec1 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java @@ -1101,19 +1101,19 @@ public class TestHRegion { } } - class IsFlushWALMarker extends ArgumentMatcher { + class IsFlushWALMarker implements ArgumentMatcher { volatile FlushAction[] actions; public IsFlushWALMarker(FlushAction... actions) { this.actions = actions; } @Override - public boolean matches(Object edit) { - List cells = ((WALEdit)edit).getCells(); + public boolean matches(WALEdit edit) { + List cells = edit.getCells(); if (cells.isEmpty()) { return false; } if (WALEdit.isMetaEditFamily(cells.get(0))) { - FlushDescriptor desc = null; + FlushDescriptor desc; try { desc = WALEdit.getFlushDescriptor(cells.get(0)); } catch (IOException e) { @@ -2433,8 +2433,7 @@ public class TestHRegion { Answer answer = new Answer() { @Override public Boolean answer(InvocationOnMock invocation) throws Throwable { - MiniBatchOperationInProgress mb = invocation.getArgumentAt(0, - MiniBatchOperationInProgress.class); + MiniBatchOperationInProgress mb = invocation.getArgument(0); mb.addOperationsFromCP(0, new Mutation[]{addPut}); return false; } @@ -5954,7 +5953,7 @@ public class TestHRegion { thenAnswer(new Answer() { @Override public Long answer(InvocationOnMock invocation) throws Throwable { - WALKey key = invocation.getArgumentAt(1, WALKey.class); + WALKey key = invocation.getArgument(1); MultiVersionConcurrencyControl.WriteEntry we = key.getMvcc().begin(); key.setWriteEntry(we); return 1L; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java index 138260358e..408a98dbf1 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java @@ -1024,7 +1024,7 @@ public class TestHStore { // call first time after files changed spiedStore.refreshStoreFiles(); assertEquals(2, this.store.getStorefilesCount()); - verify(spiedStore, times(1)).replaceStoreFiles(any(Collection.class), any(Collection.class)); + verify(spiedStore, times(1)).replaceStoreFiles(any(), any()); // call second time spiedStore.refreshStoreFiles(); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerRegionSpaceUseReport.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerRegionSpaceUseReport.java index 44ab24ec2a..5043f59744 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerRegionSpaceUseReport.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerRegionSpaceUseReport.java @@ -69,8 +69,8 @@ public class TestRegionServerRegionSpaceUseReport { // Call the real method to convert the map into a protobuf HRegionServer rs = mock(HRegionServer.class); - doCallRealMethod().when(rs).buildRegionSpaceUseReportRequest(any(Map.class)); - doCallRealMethod().when(rs).convertRegionSize(any(RegionInfo.class), anyLong()); + doCallRealMethod().when(rs).buildRegionSpaceUseReportRequest(any()); + doCallRealMethod().when(rs).convertRegionSize(any(), anyLong()); RegionSpaceUseReportRequest requests = rs.buildRegionSpaceUseReportRequest(sizes); assertEquals(sizes.size(), requests.getSpaceUseCount()); @@ -87,8 +87,8 @@ public class TestRegionServerRegionSpaceUseReport { public void testNullMap() { // Call the real method to convert the map into a protobuf HRegionServer rs = mock(HRegionServer.class); - doCallRealMethod().when(rs).buildRegionSpaceUseReportRequest(any(Map.class)); - doCallRealMethod().when(rs).convertRegionSize(any(RegionInfo.class), anyLong()); + doCallRealMethod().when(rs).buildRegionSpaceUseReportRequest(any()); + doCallRealMethod().when(rs).convertRegionSize(any(), anyLong()); rs.buildRegionSpaceUseReportRequest(null); } @@ -105,8 +105,8 @@ public class TestRegionServerRegionSpaceUseReport { // Call the real method to convert the map into a protobuf HRegionServer rs = mock(HRegionServer.class); - doCallRealMethod().when(rs).buildRegionSpaceUseReportRequest(any(Map.class)); - doCallRealMethod().when(rs).convertRegionSize(any(RegionInfo.class), anyLong()); + doCallRealMethod().when(rs).buildRegionSpaceUseReportRequest(any()); + doCallRealMethod().when(rs).convertRegionSize(any(), anyLong()); rs.buildRegionSpaceUseReportRequest(sizes); } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStripeStoreEngine.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStripeStoreEngine.java index e2925ed698..8543d07fd1 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStripeStoreEngine.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStripeStoreEngine.java @@ -76,9 +76,9 @@ public class TestStripeStoreEngine { StripeCompactor mockCompactor = mock(StripeCompactor.class); se.setCompactorOverride(mockCompactor); when( - mockCompactor.compact(any(CompactionRequestImpl.class), anyInt(), anyLong(), any(byte[].class), - any(byte[].class), any(byte[].class), any(byte[].class), - any(ThroughputController.class), any(User.class))) + mockCompactor.compact(any(), anyInt(), anyLong(), any(), + any(), any(), any(), + any(), any())) .thenReturn(new ArrayList<>()); // Produce 3 L0 files. @@ -105,7 +105,7 @@ public class TestStripeStoreEngine { private static HStoreFile createFile() throws Exception { HStoreFile sf = mock(HStoreFile.class); - when(sf.getMetadataValue(any(byte[].class))) + when(sf.getMetadataValue(any())) .thenReturn(StripeStoreFileManager.INVALID_KEY); when(sf.getReader()).thenReturn(mock(StoreFileReader.class)); when(sf.getPath()).thenReturn(new Path("moo")); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestCompactor.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestCompactor.java index 67a7519b6b..339e9107f7 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestCompactor.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestCompactor.java @@ -93,22 +93,22 @@ public class TestCompactor { StoreFileWriter writer = mock(StoreFileWriter.class); doAnswer(new Answer() { public Object answer(InvocationOnMock invocation) { - return realWriter.kvs.add((KeyValue) invocation.getArguments()[0]); + return realWriter.kvs.add((KeyValue) invocation.getArgument(0)); } - }).when(writer).append(any(KeyValue.class)); + }).when(writer).append(any()); doAnswer(new Answer() { public Object answer(InvocationOnMock invocation) { Object[] args = invocation.getArguments(); return realWriter.data.put((byte[]) args[0], (byte[]) args[1]); } - }).when(writer).appendFileInfo(any(byte[].class), any(byte[].class)); + }).when(writer).appendFileInfo(any(), any()); doAnswer(new Answer() { @Override public Void answer(InvocationOnMock invocation) throws Throwable { realWriter.hasMetadata = true; return null; } - }).when(writer).appendMetadata(any(long.class), any(boolean.class)); + }).when(writer).appendMetadata(any(), any()); doAnswer(new Answer() { @Override public Path answer(InvocationOnMock invocation) throws Throwable { diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestDateTieredCompactor.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestDateTieredCompactor.java index a5a0e7830b..9434929da2 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestDateTieredCompactor.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestDateTieredCompactor.java @@ -102,7 +102,7 @@ public class TestDateTieredCompactor { when(store.areWritesEnabled()).thenReturn(true); when(store.getFileSystem()).thenReturn(mock(FileSystem.class)); when(store.getRegionInfo()).thenReturn(new HRegionInfo(TABLE_NAME)); - when(store.createWriterInTmp(anyLong(), any(Compression.Algorithm.class), anyBoolean(), + when(store.createWriterInTmp(anyLong(), any(), anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean())).thenAnswer(writers); when(store.getComparator()).thenReturn(CellComparatorImpl.COMPARATOR); OptionalLong maxSequenceId = StoreUtils.getMaxSequenceIdInList(storefiles); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestStripeCompactionPolicy.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestStripeCompactionPolicy.java index af30b7caf4..ebcd370936 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestStripeCompactionPolicy.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestStripeCompactionPolicy.java @@ -196,7 +196,7 @@ public class TestStripeCompactionPolicy { si = createStripesWithSizes(0, 0, new Long[] { 5L }, new Long[] { 3L, 2L, 2L, 1L }, new Long[] { 3L, 2L, 2L }); verifySingleStripeCompaction(policy, si, 1, null); - // Or with smallest files, if the count is the same + // Or with smallest files, if the count is the same si = createStripesWithSizes(0, 0, new Long[] { 3L, 3L, 3L }, new Long[] { 3L, 1L, 2L }, new Long[] { 3L, 2L, 2L }); verifySingleStripeCompaction(policy, si, 1, null); @@ -236,7 +236,7 @@ public class TestStripeCompactionPolicy { scr.execute(sc, NoLimitThroughputController.INSTANCE, null); verify(sc, only()).compact(eq(scr.getRequest()), anyInt(), anyLong(), aryEq(OPEN_KEY), aryEq(OPEN_KEY), aryEq(OPEN_KEY), aryEq(OPEN_KEY), - any(NoLimitThroughputController.class), any(User.class)); + any(), any()); } @Test @@ -550,9 +550,8 @@ public class TestStripeCompactionPolicy { scr.execute(sc, NoLimitThroughputController.INSTANCE, null); verify(sc, times(1)).compact(eq(scr.getRequest()), argThat(new ArgumentMatcher>() { @Override - public boolean matches(Object argument) { - @SuppressWarnings("unchecked") - List other = (List) argument; + public boolean matches(List argument) { + List other = argument; if (other.size() != boundaries.size()) return false; for (int i = 0; i < other.size(); ++i) { if (!Bytes.equals(other.get(i), boundaries.get(i))) return false; @@ -561,7 +560,7 @@ public class TestStripeCompactionPolicy { } }), dropDeletesFrom == null ? isNull(byte[].class) : aryEq(dropDeletesFrom), dropDeletesTo == null ? isNull(byte[].class) : aryEq(dropDeletesTo), - any(NoLimitThroughputController.class), any(User.class)); + any(), any()); } /** @@ -573,7 +572,7 @@ public class TestStripeCompactionPolicy { * @param count Expected # of resulting stripes, null if not checked. * @param size Expected target stripe size, null if not checked. * @param start Left boundary of the compaction. - * @param righr Right boundary of the compaction. + * @param end Right boundary of the compaction. */ private void verifyCompaction(StripeCompactionPolicy policy, StripeInformationProvider si, Collection sfs, Boolean dropDeletes, Integer count, Long size, @@ -587,7 +586,7 @@ public class TestStripeCompactionPolicy { count == null ? anyInt() : eq(count.intValue()), size == null ? anyLong() : eq(size.longValue()), aryEq(start), aryEq(end), dropDeletesMatcher(dropDeletes, start), dropDeletesMatcher(dropDeletes, end), - any(NoLimitThroughputController.class), any(User.class)); + any(), any()); } /** Verify arbitrary flush. */ @@ -611,7 +610,7 @@ public class TestStripeCompactionPolicy { private byte[] dropDeletesMatcher(Boolean dropDeletes, byte[] value) { - return dropDeletes == null ? any(byte[].class) + return dropDeletes == null ? any() : (dropDeletes.booleanValue() ? aryEq(value) : isNull(byte[].class)); } @@ -779,7 +778,7 @@ public class TestStripeCompactionPolicy { when(store.getColumnFamilyDescriptor()).thenReturn(col); when(store.getRegionInfo()).thenReturn(info); when( - store.createWriterInTmp(anyLong(), any(Compression.Algorithm.class), anyBoolean(), + store.createWriterInTmp(anyLong(), any(), anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean())).thenAnswer(writers); Configuration conf = HBaseConfiguration.create(); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestStripeCompactor.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestStripeCompactor.java index dbf95f3b08..3654c54a89 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestStripeCompactor.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestStripeCompactor.java @@ -201,7 +201,7 @@ public class TestStripeCompactor { when(store.areWritesEnabled()).thenReturn(true); when(store.getFileSystem()).thenReturn(mock(FileSystem.class)); when(store.getRegionInfo()).thenReturn(new HRegionInfo(TABLE_NAME)); - when(store.createWriterInTmp(anyLong(), any(Compression.Algorithm.class), anyBoolean(), + when(store.createWriterInTmp(anyLong(), any(), anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean())).thenAnswer(writers); when(store.getComparator()).thenReturn(CellComparatorImpl.COMPARATOR); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestWALReplay.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestWALReplay.java index 3f6fa3bb01..51e32c42b8 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestWALReplay.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestWALReplay.java @@ -997,7 +997,7 @@ public abstract class AbstractTestWALReplay { } return b; } - }).when(spyIn).read(any(byte[].class), any(int.class), any(int.class)); + }).when(spyIn).read(any(byte[].class), any(), any()); doAnswer(new Answer() { @Override diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java index ae34d1b74b..a083af5cf9 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java @@ -39,18 +39,23 @@ import org.junit.rules.TestName; import org.junit.runner.RunWith; import org.mockito.ArgumentMatcher; import org.mockito.Mock; +import org.mockito.hamcrest.MockitoHamcrest; import org.mockito.runners.MockitoJUnitRunner; import java.util.concurrent.ExecutorService; import java.util.concurrent.ScheduledThreadPoolExecutor; import static org.junit.Assert.assertNotEquals; +import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Matchers.anyLong; import static org.mockito.Matchers.eq; import static org.mockito.Matchers.isA; -import static org.mockito.Matchers.argThat; import static org.junit.Assert.assertEquals; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.atLeastOnce; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; @RunWith(MockitoJUnitRunner.class) @Category({MediumTests.class}) @@ -151,14 +156,14 @@ public class TestCanaryTool { // One table's timeout is set for 0 ms and thus, should lead to an error. verify(mockAppender, times(1)).doAppend(argThat(new ArgumentMatcher() { @Override - public boolean matches(Object argument) { + public boolean matches(LoggingEvent argument) { return ((LoggingEvent) argument).getRenderedMessage().contains("exceeded the configured read timeout."); } })); verify(mockAppender, times(2)).doAppend(argThat(new ArgumentMatcher() { @Override - public boolean matches(Object argument) { - return ((LoggingEvent) argument).getRenderedMessage().contains("The configured read timeout was"); + public boolean matches(LoggingEvent argument) { + return argument.getRenderedMessage().contains("The configured read timeout was"); } })); } @@ -173,12 +178,13 @@ public class TestCanaryTool { assertEquals(0, ToolRunner.run(testingUtility.getConfiguration(), canary, args)); assertNotEquals("verify non-null write latency", null, sink.getWriteLatency()); assertNotEquals("verify non-zero write latency", 0L, sink.getWriteLatency()); - verify(mockAppender, times(1)).doAppend(argThat(new ArgumentMatcher() { - @Override - public boolean matches(Object argument) { - return ((LoggingEvent) argument).getRenderedMessage().contains("The configured write timeout was"); - } - })); + verify(mockAppender, times(1)).doAppend(argThat( + new ArgumentMatcher() { + @Override + public boolean matches(LoggingEvent argument) { + return argument.getRenderedMessage().contains("The configured write timeout was"); + } + })); } //no table created, so there should be no regions @@ -187,8 +193,8 @@ public class TestCanaryTool { runRegionserverCanary(); verify(mockAppender).doAppend(argThat(new ArgumentMatcher() { @Override - public boolean matches(Object argument) { - return ((LoggingEvent) argument).getRenderedMessage().contains("Regionserver not serving any regions"); + public boolean matches(LoggingEvent argument) { + return argument.getRenderedMessage().contains("Regionserver not serving any regions"); } })); } @@ -201,8 +207,8 @@ public class TestCanaryTool { runRegionserverCanary(); verify(mockAppender, never()).doAppend(argThat(new ArgumentMatcher() { @Override - public boolean matches(Object argument) { - return ((LoggingEvent) argument).getRenderedMessage().contains("Regionserver not serving any regions"); + public boolean matches(LoggingEvent argument) { + return argument.getRenderedMessage().contains("Regionserver not serving any regions"); } })); } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestLoadIncrementalHFilesSplitRecovery.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestLoadIncrementalHFilesSplitRecovery.java index 40f87c6563..bf43982f7d 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestLoadIncrementalHFilesSplitRecovery.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestLoadIncrementalHFilesSplitRecovery.java @@ -374,7 +374,7 @@ public class TestLoadIncrementalHFilesSplitRecovery { .when( hri.bulkLoadHFile((RpcController) Mockito.any(), (BulkLoadHFileRequest) Mockito.any())) .thenThrow(new ServiceException(new IOException("injecting bulk load error"))); - Mockito.when(c.getClient(Mockito.any(ServerName.class))).thenReturn(hri); + Mockito.when(c.getClient(Mockito.any())).thenReturn(hri); return c; } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALSplit.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALSplit.java index b3fd3083e8..c4bffd0c2b 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALSplit.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALSplit.java @@ -1008,7 +1008,7 @@ public class TestWALSplit { Thread.currentThread().interrupt(); } } - Entry entry = (Entry) invocation.getArguments()[0]; + Entry entry = (Entry) invocation.getArgument(0); WALEdit edit = entry.getEdit(); List cells = edit.getCells(); assertEquals(1, cells.size()); diff --git a/hbase-shaded/hbase-shaded-check-invariants/pom.xml b/hbase-shaded/hbase-shaded-check-invariants/pom.xml index 8592d710b2..d8bf7d2a29 100644 --- a/hbase-shaded/hbase-shaded-check-invariants/pom.xml +++ b/hbase-shaded/hbase-shaded-check-invariants/pom.xml @@ -63,7 +63,7 @@ org.mockito - mockito-all + mockito-core provided diff --git a/pom.xml b/pom.xml index 6e3bfb3296..f652a692bf 100755 --- a/pom.xml +++ b/pom.xml @@ -1421,7 +1421,7 @@ 1.3 3.2.0-incubating 1.2.17 - 1.10.19 + 2.1.0 2.5.0 0.5.0 @@ -2026,8 +2026,8 @@ org.mockito - mockito-all - ${mockito-all.version} + mockito-core + ${mockito-core.version} test @@ -3352,8 +3352,8 @@ org.mockito - mockito-all - ${mockito-all.version} + mockito-core + ${mockito-core.version} org.hamcrest @@ -3395,8 +3395,8 @@ org.mockito - mockito-all - ${mockito-all.version} + mockito-core + ${mockito-core.version} org.hamcrest @@ -3449,8 +3449,8 @@ org.mockito - mockito-all - ${mockito-all.version} + mockito-core + ${mockito-core.version} org.hamcrest @@ -3502,8 +3502,8 @@ org.mockito - mockito-all - ${mockito-all.version} + mockito-core + ${mockito-core.version} org.hamcrest diff --git a/src/main/asciidoc/_chapters/unit_testing.adoc b/src/main/asciidoc/_chapters/unit_testing.adoc index 6131d5a9c6..c1d5be57cc 100644 --- a/src/main/asciidoc/_chapters/unit_testing.adoc +++ b/src/main/asciidoc/_chapters/unit_testing.adoc @@ -117,8 +117,8 @@ First, add a dependency for Mockito to your Maven POM file. org.mockito - mockito-all - 1.9.5 + mockito-core + 2.1.0 test ---- -- 2.14.1