Skip to content

Commit cd59c8c

Browse files
committed
chore: minor refactor
1 parent 45a9f46 commit cd59c8c

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@
2323
import static org.mockito.ArgumentMatchers.eq;
2424
import static org.mockito.ArgumentMatchers.isNull;
2525
import static org.mockito.Mockito.mock;
26+
import static org.mockito.Mockito.mockStatic;
2627
import static org.mockito.Mockito.never;
28+
import static org.mockito.Mockito.when;
2729

2830
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
2931
import com.google.api.gax.rpc.HeaderProvider;
@@ -55,7 +57,6 @@
5557
import org.junit.jupiter.params.ParameterizedTest;
5658
import org.junit.jupiter.params.provider.CsvSource;
5759
import org.mockito.MockedStatic;
58-
import org.mockito.Mockito;
5960

6061
public class BigQueryConnectionTest extends BigQueryJdbcLoggingBaseTest {
6162

@@ -567,20 +568,19 @@ public void testOpenTelemetryPrecedenceHierarchy(
567568
OpenTelemetry mockGlobalOtel = mock(OpenTelemetry.class);
568569
OpenTelemetry mockDriverManagedOtel = mock(OpenTelemetry.class);
569570
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));
574574

575575
if (hasCustom) {
576576
ds.setCustomOpenTelemetry(mockCustomOtel);
577577
}
578578

579579
try (MockedStatic<BigQueryJdbcOpenTelemetry> mockedOtel =
580-
Mockito.mockStatic(BigQueryJdbcOpenTelemetry.class);
580+
mockStatic(BigQueryJdbcOpenTelemetry.class);
581581
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)) {
584584

585585
mockedCreds
586586
.when(GoogleCredentials::getApplicationDefault)

0 commit comments

Comments
 (0)