Skip to content

test: attempt to fix flaky test that throws NPE #2693

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
merged 3 commits into from
Oct 14, 2025
Merged

test: attempt to fix flaky test that throws NPE #2693

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d6d763
test: attempt to fix flaky test that throws NPE
mutianf Oct 13, 2025
74c91a6
Merge branch 'main' into flkay-test
mutianf Oct 14, 2025
67d1bf3
use tree set
mutianf Oct 14, 2025
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
17 changes: 9 additions & 8 deletions ...le/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClientTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@
import com.google.protobuf.FieldMask;
import io.grpc.Status;
import io.grpc.Status.Code;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.TreeSet;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Before;
Expand Down Expand Up @@ -1215,6 +1215,12 @@ public void testCreateAppProfileAddRowAffinityAddSetOfClusterIds() {
// Setup
Mockito.when(mockStub.createAppProfileCallable()).thenReturn(mockCreateAppProfileCallable);

// We want to make sure the expected request has the same ordering as the request we build
// from CreateAppProfileRequest. Use a TreeSet to for stable ordering.
Set<String> clusterIds = new TreeSet<>();
clusterIds.add("cluster-id-1");
clusterIds.add("cluster-id-2");

com.google.bigtable.admin.v2.CreateAppProfileRequest expectedRequest =
com.google.bigtable.admin.v2.CreateAppProfileRequest.newBuilder()
.setParent(NameUtil.formatInstanceName(PROJECT_ID, INSTANCE_ID))
Expand All @@ -1225,8 +1231,7 @@ public void testCreateAppProfileAddRowAffinityAddSetOfClusterIds() {
.setMultiClusterRoutingUseAny(
com.google.bigtable.admin.v2.AppProfile.MultiClusterRoutingUseAny
.newBuilder()
.addClusterIds("cluster-id-1")
.addClusterIds("cluster-id-2")
.addAllClusterIds(clusterIds)
.setRowAffinity(
com.google.bigtable.admin.v2.AppProfile.MultiClusterRoutingUseAny
.RowAffinity.newBuilder()
Expand All @@ -1239,8 +1244,7 @@ public void testCreateAppProfileAddRowAffinityAddSetOfClusterIds() {
.setDescription("my description")
.setMultiClusterRoutingUseAny(
com.google.bigtable.admin.v2.AppProfile.MultiClusterRoutingUseAny.newBuilder()
.addClusterIds("cluster-id-1")
.addClusterIds("cluster-id-2")
.addAllClusterIds(clusterIds)
.setRowAffinity(
com.google.bigtable.admin.v2.AppProfile.MultiClusterRoutingUseAny
.RowAffinity.newBuilder()
Expand All @@ -1251,9 +1255,6 @@ public void testCreateAppProfileAddRowAffinityAddSetOfClusterIds() {
.thenReturn(ApiFutures.immediateFuture(expectedResponse));

// Execute
Set<String> clusterIds = new HashSet<String>();
clusterIds.add("cluster-id-1");
clusterIds.add("cluster-id-2");
AppProfile actualResult =
adminClient.createAppProfile(
CreateAppProfileRequest.of(INSTANCE_ID, APP_PROFILE_ID)
Expand Down
Loading