|
23 | 23 | import static org.mockito.ArgumentMatchers.eq; |
24 | 24 | import static org.mockito.ArgumentMatchers.isNull; |
25 | 25 | import static org.mockito.Mockito.mock; |
| 26 | +import static org.mockito.Mockito.mockStatic; |
26 | 27 | import static org.mockito.Mockito.never; |
| 28 | +import static org.mockito.Mockito.when; |
27 | 29 |
|
28 | 30 | import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider; |
29 | 31 | import com.google.api.gax.rpc.HeaderProvider; |
|
55 | 57 | import org.junit.jupiter.params.ParameterizedTest; |
56 | 58 | import org.junit.jupiter.params.provider.CsvSource; |
57 | 59 | import org.mockito.MockedStatic; |
58 | | -import org.mockito.Mockito; |
59 | 60 |
|
60 | 61 | public class BigQueryConnectionTest extends BigQueryJdbcLoggingBaseTest { |
61 | 62 |
|
@@ -567,20 +568,19 @@ public void testOpenTelemetryPrecedenceHierarchy( |
567 | 568 | OpenTelemetry mockGlobalOtel = mock(OpenTelemetry.class); |
568 | 569 | OpenTelemetry mockDriverManagedOtel = mock(OpenTelemetry.class); |
569 | 570 | Logging mockLogging = mock(Logging.class); |
570 | | - org.mockito.Mockito.when(mockCustomOtel.getTracer(anyString())).thenReturn(mock(Tracer.class)); |
571 | | - org.mockito.Mockito.when(mockGlobalOtel.getTracer(anyString())).thenReturn(mock(Tracer.class)); |
572 | | - org.mockito.Mockito.when(mockDriverManagedOtel.getTracer(anyString())) |
573 | | - .thenReturn(mock(Tracer.class)); |
| 571 | + when(mockCustomOtel.getTracer(anyString())).thenReturn(mock(Tracer.class)); |
| 572 | + when(mockGlobalOtel.getTracer(anyString())).thenReturn(mock(Tracer.class)); |
| 573 | + when(mockDriverManagedOtel.getTracer(anyString())).thenReturn(mock(Tracer.class)); |
574 | 574 |
|
575 | 575 | if (hasCustom) { |
576 | 576 | ds.setCustomOpenTelemetry(mockCustomOtel); |
577 | 577 | } |
578 | 578 |
|
579 | 579 | try (MockedStatic<BigQueryJdbcOpenTelemetry> mockedOtel = |
580 | | - Mockito.mockStatic(BigQueryJdbcOpenTelemetry.class); |
| 580 | + mockStatic(BigQueryJdbcOpenTelemetry.class); |
581 | 581 | MockedStatic<BigQueryJdbcOAuthUtility> mockedAuth = |
582 | | - Mockito.mockStatic(BigQueryJdbcOAuthUtility.class); |
583 | | - MockedStatic<GoogleCredentials> mockedCreds = Mockito.mockStatic(GoogleCredentials.class)) { |
| 582 | + mockStatic(BigQueryJdbcOAuthUtility.class); |
| 583 | + MockedStatic<GoogleCredentials> mockedCreds = mockStatic(GoogleCredentials.class)) { |
584 | 584 |
|
585 | 585 | mockedCreds |
586 | 586 | .when(GoogleCredentials::getApplicationDefault) |
|
0 commit comments