From ab2e048f1343e2ba5dbd1fff3013c265ecc0911c Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Thu, 25 Apr 2019 07:25:44 -0700 Subject: [PATCH] Lint fixes for unused and Truth and Queue --- .../grpc/grpclb/CachedSubchannelPoolTest.java | 15 +----------- .../java/io/grpc/xds/XdsLrsClientTest.java | 24 +++++++++---------- 2 files changed, 13 insertions(+), 26 deletions(-) diff --git a/grpclb/src/test/java/io/grpc/grpclb/CachedSubchannelPoolTest.java b/grpclb/src/test/java/io/grpc/grpclb/CachedSubchannelPoolTest.java index 2ca73ca903..beb17c0701 100644 --- a/grpclb/src/test/java/io/grpc/grpclb/CachedSubchannelPoolTest.java +++ b/grpclb/src/test/java/io/grpc/grpclb/CachedSubchannelPoolTest.java @@ -32,7 +32,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import io.grpc.Attributes; -import io.grpc.ConnectivityState; import io.grpc.ConnectivityStateInfo; import io.grpc.EquivalentAddressGroup; import io.grpc.LoadBalancer.CreateSubchannelArgs; @@ -41,7 +40,6 @@ import io.grpc.LoadBalancer.Subchannel; import io.grpc.LoadBalancer.SubchannelStateListener; import io.grpc.Status; import io.grpc.SynchronizationContext; -import io.grpc.grpclb.CachedSubchannelPool.ShutdownSubchannelTask; import io.grpc.internal.FakeClock; import java.util.ArrayList; import java.util.Collections; @@ -67,19 +65,8 @@ public class CachedSubchannelPoolTest { private static final Attributes.Key ATTR_KEY = Attributes.Key.create("test-attr"); 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 ConnectivityStateInfo READY_STATE = - ConnectivityStateInfo.forNonError(ConnectivityState.READY); private static final ConnectivityStateInfo TRANSIENT_FAILURE_STATE = 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 SubchannelStateListener mockListener = mock(SubchannelStateListener.class); @@ -238,7 +225,7 @@ public class CachedSubchannelPoolTest { @Test public void takeTwice_willThrow() { - Subchannel subchannel1 = pool.takeOrCreateSubchannel(EAG1, ATTRS1, mockListener); + Subchannel unused = pool.takeOrCreateSubchannel(EAG1, ATTRS1, mockListener); try { pool.takeOrCreateSubchannel(EAG1, ATTRS1, mockListener); fail("Should throw"); diff --git a/xds/src/test/java/io/grpc/xds/XdsLrsClientTest.java b/xds/src/test/java/io/grpc/xds/XdsLrsClientTest.java index e19d0639bc..7610da4546 100644 --- a/xds/src/test/java/io/grpc/xds/XdsLrsClientTest.java +++ b/xds/src/test/java/io/grpc/xds/XdsLrsClientTest.java @@ -55,8 +55,8 @@ import io.grpc.stub.StreamObserver; import io.grpc.testing.GrpcCleanupRule; import io.grpc.xds.XdsClientLoadRecorder.ClientLoadCounter; import java.text.MessageFormat; +import java.util.ArrayDeque; import java.util.HashSet; -import java.util.LinkedList; import java.util.Random; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; @@ -104,7 +104,7 @@ public class XdsLrsClientTest { throw new AssertionError(e); } }); - private final LinkedList logs = new LinkedList<>(); + private final ArrayDeque logs = new ArrayDeque<>(); private final ChannelLogger channelLogger = new ChannelLogger() { @Override public void log(ChannelLogLevel level, String msg) { @@ -117,9 +117,9 @@ public class XdsLrsClientTest { } }; private LoadReportingServiceGrpc.LoadReportingServiceImplBase mockLoadReportingService; - private FakeClock fakeClock = new FakeClock(); - private final LinkedList> lrsRequestObservers = - new LinkedList<>(); + private final FakeClock fakeClock = new FakeClock(); + private final ArrayDeque> lrsRequestObservers = + new ArrayDeque<>(); @Captor private ArgumentCaptor> lrsResponseObserverCaptor; @@ -370,7 +370,7 @@ public class XdsLrsClientTest { backoffPolicy2); inOrder.verify(mockLoadReportingService).streamLoadStats(lrsResponseObserverCaptor.capture()); StreamObserver responseObserver = lrsResponseObserverCaptor.getValue(); - assertEquals(1, lrsRequestObservers.size()); + assertThat(lrsRequestObservers).hasSize(1); StreamObserver requestObserver = lrsRequestObservers.poll(); // First balancer RPC @@ -396,7 +396,7 @@ public class XdsLrsClientTest { fakeClock.forwardNanos(1); inOrder.verify(mockLoadReportingService).streamLoadStats(lrsResponseObserverCaptor.capture()); responseObserver = lrsResponseObserverCaptor.getValue(); - assertEquals(1, lrsRequestObservers.size()); + assertThat(lrsRequestObservers).hasSize(1); requestObserver = lrsRequestObservers.poll(); verify(requestObserver).onNext(eq(EXPECTED_INITIAL_REQ)); assertThat(logs).containsExactly("DEBUG: Initial LRS request sent: " + EXPECTED_INITIAL_REQ); @@ -419,7 +419,7 @@ public class XdsLrsClientTest { fakeClock.forwardNanos(1); inOrder.verify(mockLoadReportingService).streamLoadStats(lrsResponseObserverCaptor.capture()); responseObserver = lrsResponseObserverCaptor.getValue(); - assertEquals(1, lrsRequestObservers.size()); + assertThat(lrsRequestObservers).hasSize(1); requestObserver = lrsRequestObservers.poll(); verify(requestObserver).onNext(eq(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); logs.clear(); responseObserver = lrsResponseObserverCaptor.getValue(); - assertEquals(1, lrsRequestObservers.size()); + assertThat(lrsRequestObservers).hasSize(1); requestObserver = lrsRequestObservers.poll(); verify(requestObserver).onNext(eq(EXPECTED_INITIAL_REQ)); @@ -463,7 +463,7 @@ public class XdsLrsClientTest { // Then time for retry fakeClock.forwardNanos(1); inOrder.verify(mockLoadReportingService).streamLoadStats(lrsResponseObserverCaptor.capture()); - assertEquals(1, lrsRequestObservers.size()); + assertThat(lrsRequestObservers).hasSize(1); requestObserver = lrsRequestObservers.poll(); verify(requestObserver).onNext(eq(EXPECTED_INITIAL_REQ)); assertThat(logs).containsExactly("DEBUG: Initial LRS request sent: " + EXPECTED_INITIAL_REQ); @@ -479,7 +479,7 @@ public class XdsLrsClientTest { public void raceBetweenLoadReportingAndLbStreamClosure() { verify(mockLoadReportingService).streamLoadStats(lrsResponseObserverCaptor.capture()); StreamObserver responseObserver = lrsResponseObserverCaptor.getValue(); - assertEquals(1, lrsRequestObservers.size()); + assertThat(lrsRequestObservers).hasSize(1); StreamObserver requestObserver = lrsRequestObservers.poll(); InOrder inOrder = inOrder(requestObserver); @@ -509,4 +509,4 @@ public class XdsLrsClientTest { inOrder.verify(requestObserver, never()).onNext(any(LoadStatsRequest.class)); assertEquals(0, fakeClock.numPendingTasks(LOAD_REPORTING_TASK_FILTER)); } -} \ No newline at end of file +}