chore(bigquery-jdbc): refactor tests to remove hardcoded base uri

Author: logachev

java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITAuthTests.java

@@ -16,6 +16,7 @@
 
 package com.google.cloud.bigquery.jdbc.it;
 
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -90,7 +91,7 @@ public void testValidServiceAccountAuthentication() throws SQLException, IOExcep
     Files.write(tempFile.toPath(), authJson.toString().getBytes());
 
     String connection_uri =
-        "jdbc:bigquery://https://www.googleapis.com/bigquery/v2:443;"
+        getBaseConnectionUrl() + ""
             + "ProjectId="
             + authJson.get("project_id").getAsString()
             + ";OAuthType=0;"
@@ -105,7 +106,7 @@ public void testValidServiceAccountAuthentication() throws SQLException, IOExcep
   @Test
   public void testServiceAccountAuthenticationMissingOAuthPvtKeyPath() throws SQLException {
     String connection_uri =
-        "jdbc:bigquery://https://www.googleapis.com/bigquery/v2:443;"
+        getBaseConnectionUrl() + ""
             + "ProjectId="
             + PROJECT_ID
             + ";OAuthType=0;";
@@ -127,7 +128,7 @@ public void testValidServiceAccountAuthenticationOAuthPvtKeyAsPath()
     Files.write(tempFile.toPath(), authJson.toString().getBytes());
 
     String connection_uri =
-        "jdbc:bigquery://https://www.googleapis.com/bigquery/v2:443;"
+        getBaseConnectionUrl() + ""
             + "ProjectId="
             + authJson.get("project_id").getAsString()
             + ";OAuthType=0;"
@@ -144,7 +145,7 @@ public void testValidServiceAccountAuthenticationViaEmailAndPkcs8Key()
     final JsonObject authJson = getAuthJson();
 
     String connection_uri =
-        "jdbc:bigquery://https://www.googleapis.com/bigquery/v2:443;"
+        getBaseConnectionUrl() + ""
             + "ProjectId="
             + authJson.get("project_id").getAsString()
             + ";OAuthType=0;"
@@ -162,7 +163,7 @@ public void testValidServiceAccountAuthenticationOAuthPvtKeyAsJson()
     final JsonObject authJson = getAuthJson();
 
     String connection_uri =
-        "jdbc:bigquery://https://www.googleapis.com/bigquery/v2:443;"
+        getBaseConnectionUrl() + ""
             + "ProjectId="
             + authJson.get("project_id").getAsString()
             + ";OAuthType=0;"
@@ -192,7 +193,7 @@ public void testValidServiceAccountAuthenticationP12() throws SQLException, IOEx
   @Disabled
   public void testValidGoogleUserAccountAuthentication() throws SQLException {
     String connection_uri =
-        "jdbc:bigquery://https://www.googleapis.com/bigquery/v2:443;PROJECTID="
+        getBaseConnectionUrl() + "PROJECTID="
             + PROJECT_ID
             + ";OAuthType=1;OAuthClientId=client_id;OAuthClientSecret=client_secret;";
 
@@ -213,7 +214,7 @@ public void testValidGoogleUserAccountAuthentication() throws SQLException {
   @Disabled
   public void testValidExternalAccountAuthentication() throws SQLException {
     String connection_uri =
-        "jdbc:bigquery://https://www.googleapis.com/bigquery/v2:443;PROJECTID="
+        getBaseConnectionUrl() + "PROJECTID="
             + PROJECT_ID
             + ";OAUTHTYPE=4;"
             + "BYOID_AudienceUri=//iam.googleapis.com/projects/<project>/locations/<location>/workloadIdentityPools/<pool>/providers/<provider>;"
@@ -237,7 +238,7 @@ public void testValidExternalAccountAuthentication() throws SQLException {
   @Disabled
   public void testValidExternalAccountAuthenticationFromFile() throws SQLException {
     String connection_uri =
-        "jdbc:bigquery://https://www.googleapis.com/bigquery/v2:443;PROJECTID="
+        getBaseConnectionUrl() + "PROJECTID="
             + PROJECT_ID
             + ";OAUTHTYPE=4;"
             + "OAuthPvtKeyPath=/path/to/file;";
@@ -259,7 +260,7 @@ public void testValidExternalAccountAuthenticationFromFile() throws SQLException
   @Disabled
   public void testValidExternalAccountAuthenticationRawJson() throws SQLException {
     String connection_uri =
-        "jdbc:bigquery://https://www.googleapis.com/bigquery/v2:443;PROJECTID="
+        getBaseConnectionUrl() + "PROJECTID="
             + PROJECT_ID
             + ";OAUTHTYPE=4;OAuthPvtKey={\n"
             + "  \"universe_domain\": \"googleapis.com\",\n"
@@ -303,7 +304,7 @@ public void testValidPreGeneratedAccessTokenAuthentication(String scope, boolean
     String accessToken = credentials.getAccessToken().getTokenValue();
 
     String connectionUri =
-        "jdbc:bigquery://https://www.googleapis.com/bigquery/v2:443;ProjectId="
+        getBaseConnectionUrl() + "ProjectId="
             + authJson.get("project_id").getAsString()
             + ";OAuthType=2"
             + ";OAuthAccessToken="
@@ -319,7 +320,7 @@ public void testValidPreGeneratedAccessTokenAuthentication(String scope, boolean
   @Disabled
   public void testValidRefreshTokenAuthentication() throws SQLException {
     String connection_uri =
-        "jdbc:bigquery://https://www.googleapis.com/bigquery/v2:443;PROJECTID="
+        getBaseConnectionUrl() + "PROJECTID="
             + PROJECT_ID
             + ";OAUTHTYPE=2;OAuthRefreshToken=refresh_token;"
             + ";OAuthClientId=client;OAuthClientSecret=secret;";

java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITBase.java

@@ -17,6 +17,7 @@
 package com.google.cloud.bigquery.jdbc.it;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import com.google.cloud.bigquery.jdbc.utils.TestUtilities;
 
 import com.google.cloud.ServiceOptions;
 import com.google.cloud.bigquery.BigQuery;
@@ -177,10 +178,15 @@ private static void registerShutdownHook(final String dataset) {
   }
 
   public static final String DEFAULT_CATALOG = ServiceOptions.getDefaultProjectId();
-  public static String connectionUrl =
-      "jdbc:bigquery://https://www.googleapis.com/bigquery/v2:443;ProjectId="
-          + DEFAULT_CATALOG
-          + ";OAuthType=3;Timeout=3600;";
+
+  public static String getBaseConnectionUrl() {
+    return TestUtilities.getBaseConnectionUrl();
+  }
+
+  public static String connectionUrl = getBaseConnectionUrl()
+      + "ProjectId="
+      + DEFAULT_CATALOG
+      + ";OAuthType=3;Timeout=3600;";
 
   public static final String createDatasetQuery =
       "CREATE SCHEMA IF NOT EXISTS `%s.%s` OPTIONS(default_table_expiration_days = 5)";