Skip to content

HBASE-23051 Remove unneeded Mockito.mock invocations #641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
petersomogyi merged 2 commits into from
Sep 19, 2019
Merged

HBASE-23051 Remove unneeded Mockito.mock invocations #641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ef8fae
HBASE-23051 Remove unneeded Mockito.mock invocations
petersomogyi Sep 19, 2019
a482055
Remove unused import
petersomogyi Sep 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/MockMasterServices.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@
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;
Expand Down Expand Up @@ -144,7 +143,6 @@ public MultiResponse answer(InvocationOnMock invocation) throws Throwable {
// 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)
Expand Down
1 change: 0 additions & 1 deletion hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestZKProcedureControllers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,6 @@ private ProcedureCoordinator setupMockCoordinator(String operationName,
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 {
Expand Down