Skip to content

test: clean up CookieHolderTest #2361

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
mutianf merged 5 commits into from
Sep 27, 2024
Merged

test: clean up CookieHolderTest #2361

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
67e5899
test: clean up CookieHolderTest
igorbernstein2 Sep 27, 2024
5c3bde3
missing import
igorbernstein2 Sep 27, 2024
79c5eae
one more
igorbernstein2 Sep 27, 2024
be7e931
fix broken test
igorbernstein2 Sep 27, 2024
a08a67b
make it consistent with other tests
igorbernstein2 Sep 27, 2024
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
25 changes: 13 additions & 12 deletions ...loud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/CookiesHolderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
import io.grpc.stub.StreamObserver;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
Expand Down Expand Up @@ -94,9 +95,9 @@ public class CookiesHolderTest {
private final FakeService fakeService = new FakeService();
private BigtableDataSettings.Builder settings;
private BigtableDataClient client;
private final List<Metadata> serverMetadata = new ArrayList<>();
private final List<Metadata> serverMetadata = Collections.synchronizedList(new ArrayList<>());

private final Set<String> methods = new HashSet<>();
private final Set<String> methods = Collections.synchronizedSet(new HashSet<>());

@Before
public void setup() throws Exception {
Expand All @@ -111,13 +112,17 @@ public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(
if (metadata.containsKey(ROUTING_COOKIE_1)) {
methods.add(serverCall.getMethodDescriptor().getBareMethodName());
}

Metadata responseHeaders = new Metadata();
responseHeaders.put(ROUTING_COOKIE_HEADER, testHeaderCookie);
responseHeaders.put(ROUTING_COOKIE_1, routingCookie1Header);
serverCall.sendHeaders(responseHeaders);

return serverCallHandler.startCall(
new ForwardingServerCall.SimpleForwardingServerCall<ReqT, RespT>(serverCall) {
@Override
public void sendHeaders(Metadata responseHeaders) {
responseHeaders.put(ROUTING_COOKIE_HEADER, testHeaderCookie);
responseHeaders.put(ROUTING_COOKIE_1, routingCookie1Header);
super.sendHeaders(responseHeaders);
// headers already sent!
}
},
metadata);
Expand Down Expand Up @@ -450,8 +455,8 @@ public void testNoCookieSucceedGenerateInitialChangeStreamParition() {

Metadata lastMetadata = serverMetadata.get(fakeService.count.get() - 1);

assertThat(lastMetadata)
.doesNotContainKeys(ROUTING_COOKIE_1.name(), ROUTING_COOKIE_2.name(), BAD_KEY.name());
assertThat(lastMetadata).doesNotContainKeys(ROUTING_COOKIE_2.name(), BAD_KEY.name());
assertThat(lastMetadata).containsAtLeast(ROUTING_COOKIE_1.name(), routingCookie1Header);

serverMetadata.clear();
}
Expand Down Expand Up @@ -657,7 +662,7 @@ public void testDisableRoutingCookie() throws IOException {

static class FakeService extends BigtableGrpc.BigtableImplBase {

private boolean returnCookie = true;
private volatile boolean returnCookie = true;
private final AtomicInteger count = new AtomicInteger();

@Override
Expand All @@ -666,7 +671,6 @@ public void readRows(
if (count.getAndIncrement() < 1) {
Metadata trailers = new Metadata();
maybePopulateCookie(trailers, "readRows");
responseObserver.onNext(ReadRowsResponse.getDefaultInstance());
StatusRuntimeException exception = new StatusRuntimeException(Status.UNAVAILABLE, trailers);
responseObserver.onError(exception);
return;
Expand All @@ -681,7 +685,6 @@ public void mutateRow(
if (count.getAndIncrement() < 1) {
Metadata trailers = new Metadata();
maybePopulateCookie(trailers, "mutateRow");
responseObserver.onNext(MutateRowResponse.getDefaultInstance());
StatusRuntimeException exception = new StatusRuntimeException(Status.UNAVAILABLE, trailers);
responseObserver.onError(exception);
return;
Expand All @@ -696,7 +699,6 @@ public void mutateRows(
if (count.getAndIncrement() < 1) {
Metadata trailers = new Metadata();
maybePopulateCookie(trailers, "mutateRows");
responseObserver.onNext(MutateRowsResponse.getDefaultInstance());
StatusRuntimeException exception = new StatusRuntimeException(Status.UNAVAILABLE, trailers);
responseObserver.onError(exception);
return;
Expand All @@ -714,7 +716,6 @@ public void sampleRowKeys(
if (count.getAndIncrement() < 1) {
Metadata trailers = new Metadata();
maybePopulateCookie(trailers, "sampleRowKeys");
responseObserver.onNext(SampleRowKeysResponse.getDefaultInstance());
StatusRuntimeException exception = new StatusRuntimeException(Status.UNAVAILABLE, trailers);
responseObserver.onError(exception);
return;
Expand Down