You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ps...@apache.org on 2019/09/19 17:30:38 UTC
[hbase] branch branch-2.1 updated: HBASE-23051 Remove unneeded
Mockito.mock invocations (#641)
This is an automated email from the ASF dual-hosted git repository.
psomogyi pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new e1bce48 HBASE-23051 Remove unneeded Mockito.mock invocations (#641)
e1bce48 is described below
commit e1bce4896549d8a4bb86859f85d868f6e2396388
Author: Peter Somogyi <ps...@apache.org>
AuthorDate: Thu Sep 19 19:28:58 2019 +0200
HBASE-23051 Remove unneeded Mockito.mock invocations (#641)
Signed-off-by: Duo Zhang <zh...@apache.org>
Signed-off-by: Michael Stack <st...@apache.org>
---
.../org/apache/hadoop/hbase/master/assignment/MockMasterServices.java | 2 --
.../org/apache/hadoop/hbase/procedure/TestZKProcedureControllers.java | 1 -
2 files changed, 3 deletions(-)
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 ec6b82e..eae2ade 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
@@ -69,7 +69,6 @@ import org.mockito.stubbing.Answer;
import org.apache.hbase.thirdparty.com.google.protobuf.ServiceException;
import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
-import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos;
import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos;
import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.MultiRequest;
import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.MultiResponse;
@@ -173,7 +172,6 @@ public class MockMasterServices extends MockNoopMasterServices {
// Set hbase.rootdir into test dir.
Path rootdir = FSUtils.getRootDir(getConfiguration());
FSUtils.setRootDir(getConfiguration(), rootdir);
- Mockito.mock(AdminProtos.AdminService.BlockingInterface.class);
}
public void start(final int numServes, final RSProcedureDispatcher remoteDispatcher)
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 143f30d..27a685b 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
@@ -327,7 +327,6 @@ public class TestZKProcedureControllers {
final ArrayList<byte[]> dataFromMembers) {
ProcedureCoordinator coordinator = Mockito
.mock(ProcedureCoordinator.class);
- Mockito.mock(ProcedureCoordinator.class);
Mockito.doAnswer(new Answer<Void>() {
@Override
public Void answer(InvocationOnMock invocation) throws Throwable {