Skip to content

Commit 25462a8

Browse files
committed
fix tests
1 parent ec0c417 commit 25462a8

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,7 @@ public void testExecSlowQueryPath() throws SQLException, InterruptedException {
229229
Job job = getJobMock(tableResult, queryJobConfiguration, StatementType.SELECT);
230230

231231
doReturn(job).when(bigquery).queryWithTimeout(any(), any(), any());
232+
doReturn(job).when(bigquery).create(any(JobInfo.class));
232233

233234
doReturn(jobIdWrapper)
234235
.when(bigQueryStatementSpy)
@@ -314,19 +315,16 @@ public void setQueryTimeoutTest() throws Exception {
314315

315316
Job job = getJobMock(result, jobConfiguration, StatementType.SELECT);
316317
doReturn(job).when(bigquery).queryWithTimeout(any(), any(), any());
318+
doReturn(job).when(bigquery).create(any(JobInfo.class));
317319

318320
doReturn(jsonResultSet).when(bigQueryStatementSpy).processJsonResultSet(result);
319-
ArgumentCaptor<QueryJobConfiguration> captor =
321+
ArgumentCaptor<QueryJobConfiguration> queryCaptor =
320322
ArgumentCaptor.forClass(QueryJobConfiguration.class);
321323

322324
bigQueryStatementSpy.runQuery(query, jobConfiguration);
323-
verify(bigquery, Mockito.times(2)).create(captor.capture());
324-
QueryJobConfiguration jobConfig =
325-
captor.getAllValues().stream()
326-
.map(jobInfo -> (QueryJobConfiguration) jobInfo.getConfiguration())
327-
.filter(config -> config.dryRun() == null || !config.dryRun())
328-
.findFirst()
329-
.get();
325+
verify(bigquery, Mockito.times(1)).create(any(JobInfo.class));
326+
verify(bigquery, Mockito.times(1)).queryWithTimeout(queryCaptor.capture(), any(), any());
327+
QueryJobConfiguration jobConfig = queryCaptor.getValue();
330328
assertEquals(3000L, jobConfig.getJobTimeoutMs().longValue());
331329
}
332330

@@ -418,20 +416,22 @@ public void testJoblessQuery() throws SQLException, InterruptedException {
418416
doReturn(jobMock)
419417
.when(bigquery)
420418
.queryWithTimeout(any(QueryJobConfiguration.class), any(), any());
419+
doReturn(jobMock).when(bigquery).create(any(JobInfo.class));
421420
doReturn(mock(BigQueryJsonResultSet.class))
422421
.when(jobfulStatementSpy)
423422
.processJsonResultSet(tableResultJobfulMock);
424423

425424
jobfulStatementSpy.executeQuery("SELECT 1");
426425

427-
verify(bigquery, Mockito.times(2)).create(any(JobInfo.class));
426+
ArgumentCaptor<JobInfo> jobfulCaptor = ArgumentCaptor.forClass(JobInfo.class);
427+
verify(bigquery, Mockito.times(1)).create(jobfulCaptor.capture());
428428
assertTrue(
429429
jobfulCaptor.getAllValues().stream()
430430
.anyMatch(
431431
jobInfo ->
432432
Boolean.TRUE.equals(
433433
((QueryJobConfiguration) jobInfo.getConfiguration()).dryRun())));
434-
verify(bigquery, Mockito.never())
434+
verify(bigquery, Mockito.times(1))
435435
.queryWithTimeout(any(QueryJobConfiguration.class), any(), any());
436436
}
437437

0 commit comments

Comments
 (0)