Polish

Author: eddumelendez

modules/gcloud/src/test/java/org/testcontainers/containers/BigQueryEmulatorContainerTest.java

@@ -35,17 +35,6 @@
 
 class BigQueryEmulatorContainerTest {
 
-    private BigQuery getBigQuery(BigQueryEmulatorContainer container) {
-        String url = container.getEmulatorHttpEndpoint();
-        return BigQueryOptions
-            .newBuilder()
-            .setProjectId(container.getProjectId())
-            .setHost(url)
-            .setLocation(url)
-            .setCredentials(NoCredentials.getInstance())
-            .build().getService();
-    }
-
     @Test
     void testHttpEndpoint() throws Exception {
         try (
@@ -56,7 +45,15 @@ void testHttpEndpoint() throws Exception {
             container.start();
 
             // bigQueryClient {
-            BigQuery bigQuery = getBigQuery(container);
+            String url = container.getEmulatorHttpEndpoint();
+            BigQueryOptions options = BigQueryOptions
+                .newBuilder()
+                .setProjectId(container.getProjectId())
+                .setHost(url)
+                .setLocation(url)
+                .setCredentials(NoCredentials.getInstance())
+                .build();
+            BigQuery bigQuery = options.getService();
             // }
 
             String fn =
@@ -80,8 +77,6 @@ void testGrcpEndpoint() throws IOException {
         try (BigQueryEmulatorContainer container = new BigQueryEmulatorContainer("ghcr.io/goccy/bigquery-emulator:0.6.5")) {
             container.start();
 
-            // Test setup.
-            // Create a table the "regular" way. We need this to verify we can connect a writestream
             BigQuery bigQuery =  getBigQuery(container);
             String tableName = "test-table";
             String datasetName = "test-dataset";
@@ -98,8 +93,6 @@ void testGrcpEndpoint() throws IOException {
 
             bigQuery.create(tableInfo);
 
-            // Actual test.
-            // BigQueryWriteSettings requires a HTTP/2 connection, not provided by the originally exposed endpoint.
             BigQueryWriteSettings.Builder bigQueryWriteSettingsBuilder = BigQueryWriteSettings.newBuilder();
 
             bigQueryWriteSettingsBuilder.createWriteStreamSettings()
@@ -109,7 +102,6 @@ void testGrcpEndpoint() throws IOException {
                     .setTotalTimeout(Duration.ofSeconds(60))
                     .build());
 
-            // Use the now exposed grpcPort to get a working connection.
             BigQueryWriteClient bigQueryWriteClient = BigQueryWriteClient.create(
                 bigQueryWriteSettingsBuilder.setTransportChannelProvider(FixedTransportChannelProvider.create(GrpcTransportChannel.create(
                         ManagedChannelBuilder.forAddress(container.getHost(), container.getEmulatorGrpcPort()).usePlaintext().build())))
@@ -123,12 +115,22 @@ void testGrcpEndpoint() throws IOException {
                 .setWriteStream(WriteStream.newBuilder().setType(WriteStream.Type.PENDING))
                 .build();
 
-            // Validate that we can successfully create a write stream. This would not work with http endpoint
             bigQueryWriteClient.createWriteStream(createWriteStreamRequest);
 
             bigQueryWriteClient.shutdown();
             bigQueryWriteClient.close();
         }
     }
 
+    private BigQuery getBigQuery(BigQueryEmulatorContainer container) {
+        String url = container.getEmulatorHttpEndpoint();
+        return BigQueryOptions
+            .newBuilder()
+            .setProjectId(container.getProjectId())
+            .setHost(url)
+            .setLocation(url)
+            .setCredentials(NoCredentials.getInstance())
+            .build().getService();
+    }
+
 }