fix unittests

Author: logachev

java-bigquery/google-cloud-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/BigQueryStatementTest.java

@@ -214,7 +214,7 @@ public void testExecSlowQueryPath() throws SQLException, InterruptedException {
             .build();
     Job job = getJobMock(tableResult, queryJobConfiguration, StatementType.SELECT);
 
-    doReturn(job).when(bigquery).create(any(JobInfo.class));
+    doReturn(job).when(bigquery).queryWithTimeout(any(), any(), any());
 
     doReturn(jobIdWrapper)
         .when(bigQueryStatementSpy)
@@ -299,14 +299,14 @@ public void setQueryTimeoutTest() throws Exception {
         QueryJobConfiguration.newBuilder(query).setJobTimeoutMs(10000L).build();
 
     Job job = getJobMock(result, jobConfiguration, StatementType.SELECT);
-    doReturn(job).when(bigquery).create(any(JobInfo.class));
+    doReturn(job).when(bigquery).queryWithTimeout(any(), any(), any());
 
     doReturn(jsonResultSet).when(bigQueryStatementSpy).processJsonResultSet(result);
-    ArgumentCaptor<JobInfo> captor = ArgumentCaptor.forClass(JobInfo.class);
+    ArgumentCaptor<QueryJobConfiguration> captor = ArgumentCaptor.forClass(QueryJobConfiguration.class);
 
     bigQueryStatementSpy.runQuery(query, jobConfiguration);
-    verify(bigquery).create(captor.capture());
-    QueryJobConfiguration jobConfig = captor.getValue().getConfiguration();
+    verify(bigquery).queryWithTimeout(captor.capture(), any(), any());
+    QueryJobConfiguration jobConfig = captor.getValue();
     assertEquals(3000L, jobConfig.getJobTimeoutMs().longValue());
   }
 
@@ -395,23 +395,16 @@ public void testJoblessQuery() throws SQLException, InterruptedException {
     TableResult tableResultJobfulMock = mock(TableResult.class);
     QueryJobConfiguration jobConf = QueryJobConfiguration.newBuilder("SELECT 1").build();
     Job jobMock = getJobMock(tableResultJobfulMock, jobConf, StatementType.SELECT);
-    ArgumentCaptor<JobInfo> jobfulCaptor = ArgumentCaptor.forClass(JobInfo.class);
-    doReturn(jobMock).when(bigquery).create(jobfulCaptor.capture());
+    doReturn(jobMock)
+        .when(bigquery)
+        .queryWithTimeout(any(QueryJobConfiguration.class), any(), any());
     doReturn(mock(BigQueryJsonResultSet.class))
         .when(jobfulStatementSpy)
         .processJsonResultSet(tableResultJobfulMock);
 
     jobfulStatementSpy.executeQuery("SELECT 1");
 
-    verify(bigquery).create(any(JobInfo.class));
-    assertTrue(
-        jobfulCaptor.getAllValues().stream()
-            .noneMatch(
-                jobInfo ->
-                    Boolean.TRUE.equals(
-                        ((QueryJobConfiguration) jobInfo.getConfiguration()).dryRun())));
-    verify(bigquery, Mockito.never())
-        .queryWithTimeout(any(QueryJobConfiguration.class), any(), any());
+    verify(bigquery).queryWithTimeout(any(QueryJobConfiguration.class), any(), any());
   }
 
   @Test
@@ -424,7 +417,7 @@ public void testCloseCancelsJob() throws SQLException, InterruptedException {
         QueryJobConfiguration.newBuilder(query).setPriority(Priority.BATCH).build();
     Job job = getJobMock(tableResult, queryJobConfiguration, StatementType.SELECT);
 
-    doReturn(job).when(bigquery).create(any(JobInfo.class));
+    doReturn(job).when(bigquery).queryWithTimeout(any(), any(), any());
     doReturn(false).when(bigQueryStatementSpy).useReadAPI(eq(tableResult));
     doReturn(mock(JobId.class)).when(tableResult).getJobId();
     Mockito.when(job.getQueryResults(any(QueryResultsOption.class)))

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

@@ -49,8 +49,7 @@ public class ITAuthTests extends ITBase {
   static final String PROJECT_ID = ServiceOptions.getDefaultProjectId();
 
   private JsonObject getAuthJson() throws IOException {
-    final String secret =
-        "{ \"type\": \"service_account\", \"project_id\": \"bigquery-devtools-drivers\", \"private_key_id\": \"639684ac492aa88005b51c742fe696485b42c283\", \"private_key\": \"-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDCYKmx1Prmdtym\n1nfJxrl7fh5ew9HG17GgnU12Npl4llWwiyZQqr9OKnzyhtQJuYlx4EKti112kzOt\nUUicOhq1wuq0mOsHwJsQaQu4AENN4Xi7qXtxPV9w8lrf73mLQ4wSwIHv2LvDtf7B\nUSP0pwv8hAtEHFCp9TNdXqE+NCuBoGObp7vyv2iN230y6mLRyqgjjPfSgu1mdsfQ\ntqMthVTzn3AxTnAdpaNzWlQrRq8MnMt3eVr53hwRJ1tb7zVq1TfxgiQjgvXK9iEa\nbVSy4c8Sc1qvAGA6CmdHBpQ64iJgIou9FprVRgAzKdQrC1vRbb371nSwmIXL74c+\nQ5Ry+ol/AgMBAAECggEAEUYFzofexBxL/4ePnZ7LXO4YRNOiEMmaP2u7NoYjnVO+\nybGT9hc2aPvdnq/cqACU9km3ozR/Wco7DWvrx/Zh6UUpFmOAf2/eV9b985wSXxlq\nYULudWG+2YqwCLZ/VqDqEcCJy4a3KO1Ddmp/h35Q0l/poGPjxzbDGckPCzgXpa0z\nZNdIcuhcH9muyh+mzGm3UMHtsddv1KDCSkTncJXsI6JR7IWyvro2LOVJp6uGeXRr\nYTdMfNPPrK5rYG+qM3yCnbhil7brSyn+q45rNgkEfvn4vTFfT90YgaXYXj9HQyWH\nqtWJoc6QseDTetYTLq4fioH8xJqs6NmMrP5umccOAQKBgQDyLsPvb3NnjCHyheN6\nk2URTk2D3fT0zakvHuODePokEv3tQh/2lJvqVNBQ/JDvEyQuU8vijLnOngL2zWFq\n6dZ9UuGPV8UhIcSAwH6/9GHzRJjxa2gFurlCzJU+1eaDdvnw9ILKVNl3TdYsbjMx\n0/Q9L5cR/yv0/flfNRlKmTMZwwKBgQDNd6xbiZdMmhW7vUV1x4Rez+sgGOaDUb6F\n7JXcppf+hfkt4uP1HvlU8FIp/1yDRabRo49UYHgmCyNV1oISGgTKWIRvhEpbmjEx\nsJC+vwRRm0h9WD/kSgY5oeZYBxu676EYqFk+mK3U1RWHk6IY5ulnzZZGRX4U3o6H\nZYMY9l2ZlQKBgB4knfSGPanssij6aybNg63UvickkCGMG3um75BklVW6G2rVaR8K\nviE7bzY1SWDIVB+EBINtGo9R8XKAe5iQBEdS8ooh1YJbLpcL3nrL0wkxR4v831Sf\nOgHLbuQEQY2pWFCaTlEaoHqN8JNVIAAarnKTIs11oiX7Gne0JzK2wLp7AoGAVJui\nGvOWnRGaP3vaHXzyMkS2ErqOOacwqF9a+siTMFkk2dNjgW2myGZJv0eLZfcJkawj\nemBbOXc+rrstRpz2OginSHCWWhAtj8OgZxurgJtMB2mOrcgZtiPIAZmzvo+sq8Wv\nMkqW0lyIiBKwHkb/+CG9buRw3dEjqfeQO3g/5N0CgYEAxQKxZxDO/j12coY0Es6a\nd1krdB49TFYUhdS8gAJDTeOQgOCJZqa69jbkKHF1DWKSBLObhpA2QsSEk7yUAdTv\nerZAHnf09FqNWe6kBs+WU/urIF+FREprseIbCYZULCjuGDPUVkmapHIy3irwYFZO\nxHP5FrM7GoTRpY5p9P1BDK0=\n-----END PRIVATE KEY-----\n\", \"client_email\": \"github-actions@bigquery-devtools-drivers.iam.gserviceaccount.com\", \"client_id\": \"114365723126486061952\", \"auth_uri\": \"https://accounts.google.com/o/oauth2/auth\", \"token_uri\": \"https://oauth2.googleapis.com/token\", \"auth_provider_x509_cert_url\": \"https://www.googleapis.com/oauth2/v1/certs\", \"client_x509_cert_url\": \"https://www.googleapis.com/robot/v1/metadata/x509/github-actions%40bigquery-devtools-drivers.iam.gserviceaccount.com\", \"universe_domain\": \"googleapis.com\" }"; // requireEnvVar("SA_SECRET");
+    final String secret = requireEnvVar("SA_SECRET");
     JsonObject authJson;
     // Supporting both formats of SA_SECRET:
     // - Local runs can point to a json file