Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 3 additions & 4 deletions xds/src/main/java/io/grpc/xds/CsdsService.java
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -83,16 +84,14 @@ 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(
ClientStatusRequest request, StreamObserver<ClientStatusResponse> responseObserver) {
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
Expand Down
17 changes: 17 additions & 0 deletions xds/src/test/java/io/grpc/xds/CsdsServiceTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -133,6 +137,19 @@ public void fetchClientConfig_invalidArgument() {
}
}

@Test
@SuppressWarnings("unchecked")
public void fetchClientConfig_errorDoesNotComplete() {
StreamObserver<ClientStatusResponse> responseObserver = mock(StreamObserver.class);

CSDS_SERVICE_MINIMAL.delegate.fetchClientStatus(REQUEST_INVALID, responseObserver);

ArgumentCaptor<Throwable> 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() {
Expand Down
Loading