From a361a1372e62afe51e5c0482e80233c8b823038a Mon Sep 17 00:00:00 2001 From: Burke Davison Date: Fri, 13 Sep 2024 15:53:11 -0400 Subject: [PATCH 1/2] ci: limit compute pagination check to only look at consistency of named zones --- .../cloud/compute/v1/integration/ITPaginationTest.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/java-compute/google-cloud-compute/src/test/java/com/google/cloud/compute/v1/integration/ITPaginationTest.java b/java-compute/google-cloud-compute/src/test/java/com/google/cloud/compute/v1/integration/ITPaginationTest.java index aa5b856e2080..bf2ad5c67646 100644 --- a/java-compute/google-cloud-compute/src/test/java/com/google/cloud/compute/v1/integration/ITPaginationTest.java +++ b/java-compute/google-cloud-compute/src/test/java/com/google/cloud/compute/v1/integration/ITPaginationTest.java @@ -23,6 +23,7 @@ import com.google.cloud.compute.v1.Zone; import com.google.cloud.compute.v1.ZonesClient; import com.google.cloud.compute.v1.ZonesSettings; +import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import java.io.IOException; import java.util.Map; @@ -103,9 +104,11 @@ public void testPaginationNextToken() { .build(); ZonesClient.ListPagedResponse responseToken = zonesClient.list(listZonesRequestToken); ZonesClient.ListPage nextPageWithToken = responseToken.getPage(); + + // Compare pages by ensuring a consistent list of zone names. Assert.assertEquals( - Lists.newArrayList(nextPage.getValues()), - Lists.newArrayList(nextPageWithToken.getValues())); + Iterables.transform(nextPage.getValues(), Zone::getName), + Iterables.transform(nextPageWithToken.getValues(), Zone::getName)); } @Test From 33f3d9e5d29ca411f65be173e746e91954398b76 Mon Sep 17 00:00:00 2001 From: Burke Davison <40617934+burkedavison@users.noreply.github.com> Date: Mon, 16 Sep 2024 09:37:30 -0400 Subject: [PATCH 2/2] Update ITPaginationTest.java ci: base equality check on List, not Iterable --- .../google/cloud/compute/v1/integration/ITPaginationTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java-compute/google-cloud-compute/src/test/java/com/google/cloud/compute/v1/integration/ITPaginationTest.java b/java-compute/google-cloud-compute/src/test/java/com/google/cloud/compute/v1/integration/ITPaginationTest.java index bf2ad5c67646..7a67d2b8d856 100644 --- a/java-compute/google-cloud-compute/src/test/java/com/google/cloud/compute/v1/integration/ITPaginationTest.java +++ b/java-compute/google-cloud-compute/src/test/java/com/google/cloud/compute/v1/integration/ITPaginationTest.java @@ -107,8 +107,8 @@ public void testPaginationNextToken() { // Compare pages by ensuring a consistent list of zone names. Assert.assertEquals( - Iterables.transform(nextPage.getValues(), Zone::getName), - Iterables.transform(nextPageWithToken.getValues(), Zone::getName)); + Lists.newArrayList(Iterables.transform(nextPage.getValues(), Zone::getName)), + Lists.newArrayList(Iterables.transform(nextPageWithToken.getValues(), Zone::getName))); } @Test