Skip to content

Commit e8bc87c

Browse files
petersomogyiJenkins
authored andcommitted
HBASE-23051 Remove unneeded Mockito.mock invocations (apache#641)
Signed-off-by: Duo Zhang <zhangduo@apache.org> Signed-off-by: Michael Stack <stack@apache.org> (cherry picked from commit 64a68c5) Change-Id: Ie47bc90556ffd6d1d9fa9e0bf44467056d02b222
1 parent 148c3b9 commit e8bc87c

2 files changed

Lines changed: 0 additions & 3 deletions

File tree

hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/MockMasterServices.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
import org.apache.hbase.thirdparty.com.google.protobuf.ServiceException;
6666

6767
import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
68-
import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos;
6968
import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos;
7069
import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.MultiRequest;
7170
import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.MultiResponse;
@@ -151,7 +150,6 @@ public MultiResponse answer(InvocationOnMock invocation) throws Throwable {
151150
// Set hbase.rootdir into test dir.
152151
Path rootdir = FSUtils.getRootDir(getConfiguration());
153152
FSUtils.setRootDir(getConfiguration(), rootdir);
154-
Mockito.mock(AdminProtos.AdminService.BlockingInterface.class);
155153
}
156154

157155
public void start(final int numServes, final RSProcedureDispatcher remoteDispatcher)

hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestZKProcedureControllers.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,6 @@ private ProcedureCoordinator setupMockCoordinator(String operationName,
327327
final ArrayList<byte[]> dataFromMembers) {
328328
ProcedureCoordinator coordinator = Mockito
329329
.mock(ProcedureCoordinator.class);
330-
Mockito.mock(ProcedureCoordinator.class);
331330
Mockito.doAnswer(new Answer<Void>() {
332331
@Override
333332
public Void answer(InvocationOnMock invocation) throws Throwable {

0 commit comments

Comments
 (0)