grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Lint fixes for unused and Truth and Queue

This commit is contained in:
Eric Anderson 2019-04-25 07:25:44 -07:00
parent 973885457f
commit ab2e048f13
2 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
grpclb/src/test/java/io/grpc/grpclb/CachedSubchannelPoolTest.java
View File

@ -32,7 +32,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import io.grpc.Attributes; import io.grpc.Attributes;
import io.grpc.ConnectivityState;
import io.grpc.ConnectivityStateInfo; import io.grpc.ConnectivityStateInfo;
import io.grpc.EquivalentAddressGroup; import io.grpc.EquivalentAddressGroup;
import io.grpc.LoadBalancer.CreateSubchannelArgs; import io.grpc.LoadBalancer.CreateSubchannelArgs;
@ -41,7 +40,6 @@ import io.grpc.LoadBalancer.Subchannel;
import io.grpc.LoadBalancer.SubchannelStateListener; import io.grpc.LoadBalancer.SubchannelStateListener;
import io.grpc.Status; import io.grpc.Status;
import io.grpc.SynchronizationContext; import io.grpc.SynchronizationContext;
import io.grpc.grpclb.CachedSubchannelPool.ShutdownSubchannelTask;
import io.grpc.internal.FakeClock; import io.grpc.internal.FakeClock;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@ -67,19 +65,8 @@ public class CachedSubchannelPoolTest {
private static final Attributes.Key<String> ATTR_KEY = Attributes.Key.create("test-attr"); private static final Attributes.Key<String> ATTR_KEY = Attributes.Key.create("test-attr");
private static final Attributes ATTRS1 = Attributes.newBuilder().set(ATTR_KEY, "1").build(); private static final Attributes ATTRS1 = Attributes.newBuilder().set(ATTR_KEY, "1").build();
private static final Attributes ATTRS2 = Attributes.newBuilder().set(ATTR_KEY, "2").build(); private static final Attributes ATTRS2 = Attributes.newBuilder().set(ATTR_KEY, "2").build();
private static final ConnectivityStateInfo READY_STATE =
ConnectivityStateInfo.forNonError(ConnectivityState.READY);
private static final ConnectivityStateInfo TRANSIENT_FAILURE_STATE = private static final ConnectivityStateInfo TRANSIENT_FAILURE_STATE =
ConnectivityStateInfo.forTransientFailure(Status.UNAVAILABLE.withDescription("Simulated")); ConnectivityStateInfo.forTransientFailure(Status.UNAVAILABLE.withDescription("Simulated"));
private static final FakeClock.TaskFilter SHUTDOWN_TASK_FILTER =
new FakeClock.TaskFilter() {
@Override
public boolean shouldAccept(Runnable command) {
// The task is wrapped by SynchronizationContext, so we can't compare the type
// directly.
return command.toString().contains(ShutdownSubchannelTask.class.getSimpleName());
}
};
private final Helper helper = mock(Helper.class); private final Helper helper = mock(Helper.class);
private final SubchannelStateListener mockListener = mock(SubchannelStateListener.class); private final SubchannelStateListener mockListener = mock(SubchannelStateListener.class);
@ -238,7 +225,7 @@ public class CachedSubchannelPoolTest {
@Test @Test
public void takeTwice_willThrow() { public void takeTwice_willThrow() {
Subchannel subchannel1 = pool.takeOrCreateSubchannel(EAG1, ATTRS1, mockListener); Subchannel unused = pool.takeOrCreateSubchannel(EAG1, ATTRS1, mockListener);
try { try {
pool.takeOrCreateSubchannel(EAG1, ATTRS1, mockListener); pool.takeOrCreateSubchannel(EAG1, ATTRS1, mockListener);
fail("Should throw"); fail("Should throw");

24
xds/src/test/java/io/grpc/xds/XdsLrsClientTest.java
View File

@ -55,8 +55,8 @@ import io.grpc.stub.StreamObserver;
import io.grpc.testing.GrpcCleanupRule; import io.grpc.testing.GrpcCleanupRule;
import io.grpc.xds.XdsClientLoadRecorder.ClientLoadCounter; import io.grpc.xds.XdsClientLoadRecorder.ClientLoadCounter;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.util.ArrayDeque;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedList;
import java.util.Random; import java.util.Random;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ConcurrentMap;
@ -104,7 +104,7 @@ public class XdsLrsClientTest {
throw new AssertionError(e); throw new AssertionError(e);
} }
}); });
private final LinkedList<String> logs = new LinkedList<>(); private final ArrayDeque<String> logs = new ArrayDeque<>();
private final ChannelLogger channelLogger = new ChannelLogger() { private final ChannelLogger channelLogger = new ChannelLogger() {
@Override @Override
public void log(ChannelLogLevel level, String msg) { public void log(ChannelLogLevel level, String msg) {
@ -117,9 +117,9 @@ public class XdsLrsClientTest {
} }
}; };
private LoadReportingServiceGrpc.LoadReportingServiceImplBase mockLoadReportingService; private LoadReportingServiceGrpc.LoadReportingServiceImplBase mockLoadReportingService;
private FakeClock fakeClock = new FakeClock(); private final FakeClock fakeClock = new FakeClock();
private final LinkedList<StreamObserver<LoadStatsRequest>> lrsRequestObservers = private final ArrayDeque<StreamObserver<LoadStatsRequest>> lrsRequestObservers =
new LinkedList<>(); new ArrayDeque<>();
@Captor @Captor
private ArgumentCaptor<StreamObserver<LoadStatsResponse>> lrsResponseObserverCaptor; private ArgumentCaptor<StreamObserver<LoadStatsResponse>> lrsResponseObserverCaptor;
@ -370,7 +370,7 @@ public class XdsLrsClientTest {
backoffPolicy2); backoffPolicy2);
inOrder.verify(mockLoadReportingService).streamLoadStats(lrsResponseObserverCaptor.capture()); inOrder.verify(mockLoadReportingService).streamLoadStats(lrsResponseObserverCaptor.capture());
StreamObserver<LoadStatsResponse> responseObserver = lrsResponseObserverCaptor.getValue(); StreamObserver<LoadStatsResponse> responseObserver = lrsResponseObserverCaptor.getValue();
assertEquals(1, lrsRequestObservers.size()); assertThat(lrsRequestObservers).hasSize(1);
StreamObserver<LoadStatsRequest> requestObserver = lrsRequestObservers.poll(); StreamObserver<LoadStatsRequest> requestObserver = lrsRequestObservers.poll();
// First balancer RPC // First balancer RPC
@ -396,7 +396,7 @@ public class XdsLrsClientTest {
fakeClock.forwardNanos(1); fakeClock.forwardNanos(1);
inOrder.verify(mockLoadReportingService).streamLoadStats(lrsResponseObserverCaptor.capture()); inOrder.verify(mockLoadReportingService).streamLoadStats(lrsResponseObserverCaptor.capture());
responseObserver = lrsResponseObserverCaptor.getValue(); responseObserver = lrsResponseObserverCaptor.getValue();
assertEquals(1, lrsRequestObservers.size()); assertThat(lrsRequestObservers).hasSize(1);
requestObserver = lrsRequestObservers.poll(); requestObserver = lrsRequestObservers.poll();
verify(requestObserver).onNext(eq(EXPECTED_INITIAL_REQ)); verify(requestObserver).onNext(eq(EXPECTED_INITIAL_REQ));
assertThat(logs).containsExactly("DEBUG: Initial LRS request sent: " + EXPECTED_INITIAL_REQ); assertThat(logs).containsExactly("DEBUG: Initial LRS request sent: " + EXPECTED_INITIAL_REQ);
@ -419,7 +419,7 @@ public class XdsLrsClientTest {
fakeClock.forwardNanos(1); fakeClock.forwardNanos(1);
inOrder.verify(mockLoadReportingService).streamLoadStats(lrsResponseObserverCaptor.capture()); inOrder.verify(mockLoadReportingService).streamLoadStats(lrsResponseObserverCaptor.capture());
responseObserver = lrsResponseObserverCaptor.getValue(); responseObserver = lrsResponseObserverCaptor.getValue();
assertEquals(1, lrsRequestObservers.size()); assertThat(lrsRequestObservers).hasSize(1);
requestObserver = lrsRequestObservers.poll(); requestObserver = lrsRequestObservers.poll();
verify(requestObserver).onNext(eq(EXPECTED_INITIAL_REQ)); verify(requestObserver).onNext(eq(EXPECTED_INITIAL_REQ));
assertThat(logs).containsExactly("DEBUG: Initial LRS request sent: " + EXPECTED_INITIAL_REQ); assertThat(logs).containsExactly("DEBUG: Initial LRS request sent: " + EXPECTED_INITIAL_REQ);
@ -442,7 +442,7 @@ public class XdsLrsClientTest {
"DEBUG: Initial LRS request sent: " + EXPECTED_INITIAL_REQ); "DEBUG: Initial LRS request sent: " + EXPECTED_INITIAL_REQ);
logs.clear(); logs.clear();
responseObserver = lrsResponseObserverCaptor.getValue(); responseObserver = lrsResponseObserverCaptor.getValue();
assertEquals(1, lrsRequestObservers.size()); assertThat(lrsRequestObservers).hasSize(1);
requestObserver = lrsRequestObservers.poll(); requestObserver = lrsRequestObservers.poll();
verify(requestObserver).onNext(eq(EXPECTED_INITIAL_REQ)); verify(requestObserver).onNext(eq(EXPECTED_INITIAL_REQ));
@ -463,7 +463,7 @@ public class XdsLrsClientTest {
// Then time for retry // Then time for retry
fakeClock.forwardNanos(1); fakeClock.forwardNanos(1);
inOrder.verify(mockLoadReportingService).streamLoadStats(lrsResponseObserverCaptor.capture()); inOrder.verify(mockLoadReportingService).streamLoadStats(lrsResponseObserverCaptor.capture());
assertEquals(1, lrsRequestObservers.size()); assertThat(lrsRequestObservers).hasSize(1);
requestObserver = lrsRequestObservers.poll(); requestObserver = lrsRequestObservers.poll();
verify(requestObserver).onNext(eq(EXPECTED_INITIAL_REQ)); verify(requestObserver).onNext(eq(EXPECTED_INITIAL_REQ));
assertThat(logs).containsExactly("DEBUG: Initial LRS request sent: " + EXPECTED_INITIAL_REQ); assertThat(logs).containsExactly("DEBUG: Initial LRS request sent: " + EXPECTED_INITIAL_REQ);
@ -479,7 +479,7 @@ public class XdsLrsClientTest {
public void raceBetweenLoadReportingAndLbStreamClosure() { public void raceBetweenLoadReportingAndLbStreamClosure() {
verify(mockLoadReportingService).streamLoadStats(lrsResponseObserverCaptor.capture()); verify(mockLoadReportingService).streamLoadStats(lrsResponseObserverCaptor.capture());
StreamObserver<LoadStatsResponse> responseObserver = lrsResponseObserverCaptor.getValue(); StreamObserver<LoadStatsResponse> responseObserver = lrsResponseObserverCaptor.getValue();
assertEquals(1, lrsRequestObservers.size()); assertThat(lrsRequestObservers).hasSize(1);
StreamObserver<LoadStatsRequest> requestObserver = lrsRequestObservers.poll(); StreamObserver<LoadStatsRequest> requestObserver = lrsRequestObservers.poll();
InOrder inOrder = inOrder(requestObserver); InOrder inOrder = inOrder(requestObserver);
@ -509,4 +509,4 @@ public class XdsLrsClientTest {
inOrder.verify(requestObserver, never()).onNext(any(LoadStatsRequest.class)); inOrder.verify(requestObserver, never()).onNext(any(LoadStatsRequest.class));
assertEquals(0, fakeClock.numPendingTasks(LOAD_REPORTING_TASK_FILTER)); assertEquals(0, fakeClock.numPendingTasks(LOAD_REPORTING_TASK_FILTER));
} }
} }