diff --git a/xds/src/main/java/io/grpc/xds/CsdsService.java b/xds/src/main/java/io/grpc/xds/CsdsService.java index 8c2fe333c15..5dac1d30ded 100644 --- a/xds/src/main/java/io/grpc/xds/CsdsService.java +++ b/xds/src/main/java/io/grpc/xds/CsdsService.java @@ -61,7 +61,8 @@ public final class CsdsService implements BindableService { private static final Logger logger = Logger.getLogger(CsdsService.class.getName()); private final XdsClientPoolFactory xdsClientPoolFactory; - private final CsdsServiceInternal delegate = new CsdsServiceInternal(); + @VisibleForTesting + final CsdsServiceInternal delegate = new CsdsServiceInternal(); @VisibleForTesting CsdsService(XdsClientPoolFactory xdsClientPoolFactory) { @@ -83,7 +84,7 @@ public ServerServiceDefinition bindService() { } /** Hide protobuf from being exposed via the API. */ - private final class CsdsServiceInternal + final class CsdsServiceInternal extends ClientStatusDiscoveryServiceGrpc.ClientStatusDiscoveryServiceImplBase { @Override public void fetchClientStatus( @@ -91,8 +92,6 @@ public void fetchClientStatus( if (handleRequest(request, responseObserver)) { responseObserver.onCompleted(); } - // TODO(sergiitk): Add a case covering mutating handleRequest return false to true - to verify - // that responseObserver.onCompleted() isn't erroneously called on error. } @Override diff --git a/xds/src/test/java/io/grpc/xds/CsdsServiceTest.java b/xds/src/test/java/io/grpc/xds/CsdsServiceTest.java index 98853804421..1d0545a9738 100644 --- a/xds/src/test/java/io/grpc/xds/CsdsServiceTest.java +++ b/xds/src/test/java/io/grpc/xds/CsdsServiceTest.java @@ -18,6 +18,9 @@ import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.fail; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -69,6 +72,7 @@ import org.junit.experimental.runners.Enclosed; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import org.mockito.ArgumentCaptor; /** Unit tests for {@link CsdsService}. */ @RunWith(Enclosed.class) @@ -133,6 +137,19 @@ public void fetchClientConfig_invalidArgument() { } } + @Test + @SuppressWarnings("unchecked") + public void fetchClientConfig_errorDoesNotComplete() { + StreamObserver responseObserver = mock(StreamObserver.class); + + CSDS_SERVICE_MINIMAL.delegate.fetchClientStatus(REQUEST_INVALID, responseObserver); + + ArgumentCaptor error = ArgumentCaptor.forClass(Throwable.class); + verify(responseObserver).onError(error.capture()); + assertThat(Status.fromThrowable(error.getValue()).getCode()).isEqualTo(Code.INVALID_ARGUMENT); + verify(responseObserver, never()).onCompleted(); + } + /** Unexpected exceptions translated to Status.Code.INTERNAL. */ @Test public void fetchClientConfig_unexpectedException() {