chore: Add HttpJson Showcase test for Location Mixins

.github/workflows/ci.yaml

@@ -5,7 +5,7 @@ on:
   pull_request:
 name: ci
 env:
-  SHOWCASE_VERSION: 0.26.1
+  SHOWCASE_VERSION: 0.27.0
 jobs:
   build:
     runs-on: ubuntu-22.04

.github/workflows/sonar.yaml

@@ -1,6 +1,6 @@
 name: SonarCloud Build
 env:
-  SHOWCASE_VERSION: 0.26.1
+  SHOWCASE_VERSION: 0.27.0
 on:
   push:
     branches:

.kokoro/presubmit/downstream-build.sh

@@ -15,7 +15,7 @@
 
 set -eo pipefail
 
-SHOWCASE_VERSION=0.26.1
+SHOWCASE_VERSION=0.27.0
 
 ## Get the directory of the build script
 scriptDir=$(realpath "$(dirname "${BASH_SOURCE[0]}")")

showcase/README.md

@@ -16,7 +16,7 @@ versions is not guaranteed. If changing the version of the server, it may also b
 update to a compatible client version in `./WORKSPACE`.
 
 ```shell
-$ GAPIC_SHOWCASE_VERSION=0.26.1
+$ GAPIC_SHOWCASE_VERSION=0.27.0
 $ go install github.com/googleapis/gapic-showcase/cmd/gapic-showcase@v"$GAPIC_SHOWCASE_VERSION"
 $ PATH=$PATH:`go env GOPATH`/bin
 $ gapic-showcase --help

showcase/gapic-showcase/pom.xml

@@ -19,7 +19,7 @@
   </parent>
 
   <properties>
-    <gapic-showcase.version>0.26.1</gapic-showcase.version>
+    <gapic-showcase.version>0.27.0</gapic-showcase.version>
   </properties>
 
   <profiles>

showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITCommonServiceMixins.java

@@ -18,35 +18,49 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.google.api.gax.core.NoCredentialsProvider;
 import com.google.cloud.location.GetLocationRequest;
 import com.google.cloud.location.ListLocationsRequest;
 import com.google.cloud.location.Location;
 import com.google.common.collect.ImmutableList;
 import com.google.showcase.v1beta1.EchoClient;
-import com.google.showcase.v1beta1.EchoSettings;
-import io.grpc.ManagedChannelBuilder;
-import java.io.IOException;
+import com.google.showcase.v1beta1.it.util.TestClientInitializer;
 import java.util.ArrayList;
+import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 
 public class ITCommonServiceMixins {
 
+  // The showcase server always returns a fixed list of locations. See
+  // https://github.com/googleapis/gapic-showcase/blob/main/server/services/locations_service.go
+  private static final List<Location> EXPECTED_LOCATIONS =
+      ImmutableList.of(
+          Location.newBuilder()
+              .setName("projects/showcase/locations/us-north")
+              .setDisplayName("us-north")
+              .build(),
+          Location.newBuilder()
+              .setName("projects/showcase/locations/us-south")
+              .setDisplayName("us-south")
+              .build(),
+          Location.newBuilder()
+              .setName("projects/showcase/locations/us-east")
+              .setDisplayName("us-east")
+              .build(),
+          Location.newBuilder()
+              .setName("projects/showcase/locations/us-west")
+              .setDisplayName("us-west")
+              .build());
   private EchoClient grpcClient;
+  private EchoClient httpjsonClient;
 
   @Before
-  public void createClients() throws IOException {
+  public void createClients() throws Exception {
     // Create gRPC Echo Client
-    EchoSettings grpcEchoSettings =
-        EchoSettings.newBuilder()
-            .setCredentialsProvider(NoCredentialsProvider.create())
-            .setTransportChannelProvider(
-                EchoSettings.defaultGrpcTransportProviderBuilder()
-                    .setChannelConfigurator(ManagedChannelBuilder::usePlaintext)
-                    .build())
-            .build();
-    grpcClient = EchoClient.create(grpcEchoSettings);
+    grpcClient = TestClientInitializer.createGrpcEchoClient();
+
+    // Create HttpJson Echo Client
+    httpjsonClient = TestClientInitializer.createHttpJsonEchoClient();
   }
 
   @Test
@@ -69,36 +83,39 @@ public void testGrpc_listLocations() {
     EchoClient.ListLocationsPagedResponse locationsPagedResponse =
         grpcClient.listLocations(request);
 
-    // The showcase server always returns a fixed list of locations. See
-    // https://github.com/googleapis/gapic-showcase/blob/main/server/services/locations_service.go
-    ArrayList<Location> actualLocations = new ArrayList<>();
+    List<Location> actualLocations = new ArrayList<>();
+    for (Location location : locationsPagedResponse.iterateAll()) {
+      actualLocations.add(location);
+    }
+
+    assertThat(actualLocations).containsExactlyElementsIn(EXPECTED_LOCATIONS).inOrder();
+  }
+
+  @Test
+  public void testHttpJson_getLocation() {
+    GetLocationRequest request =
+        GetLocationRequest.newBuilder().setName("projects/showcase/locations/us-central1").build();
+    Location location = httpjsonClient.getLocation(request);
+    assertThat(location)
+        .isEqualTo(
+            Location.newBuilder()
+                .setName("projects/showcase/locations/us-central1")
+                .setDisplayName("us-central1")
+                .build());
+  }
+
+  @Test
+  public void testHttpJson_listLocations() {
+    ListLocationsRequest request =
+        ListLocationsRequest.newBuilder().setName("projects/showcase").build();
+    EchoClient.ListLocationsPagedResponse locationsPagedResponse =
+        httpjsonClient.listLocations(request);
+
+    List<Location> actualLocations = new ArrayList<>();
     for (Location location : locationsPagedResponse.iterateAll()) {
       actualLocations.add(location);
     }
-    Location locationUsNorth =
-        Location.newBuilder()
-            .setName("projects/showcase/locations/us-north")
-            .setDisplayName("us-north")
-            .build();
-    Location locationUsSouth =
-        Location.newBuilder()
-            .setName("projects/showcase/locations/us-south")
-            .setDisplayName("us-south")
-            .build();
-    Location locationUsEast =
-        Location.newBuilder()
-            .setName("projects/showcase/locations/us-east")
-            .setDisplayName("us-east")
-            .build();
-    Location locationUsWest =
-        Location.newBuilder()
-            .setName("projects/showcase/locations/us-west")
-            .setDisplayName("us-west")
-            .build();
 
-    assertThat(actualLocations)
-        .containsExactlyElementsIn(
-            ImmutableList.of(locationUsNorth, locationUsSouth, locationUsEast, locationUsWest))
-        .inOrder();
+    assertThat(actualLocations).containsExactlyElementsIn(EXPECTED_LOCATIONS).inOrder();
   }
 }