Skip to content

Commit 0918142

Browse files
trasktrask
authored
Add Mockito static imports to spotless (#16246)
1 parent 7f8e5ec commit 0918142

7 files changed

Lines changed: 32 additions & 19 deletions

File tree

‎conventions/src/main/kotlin/io/opentelemetry/instrumentation/gradle/StaticImportFormatter.kt‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,16 @@ class StaticImportFormatter : FormatterFunc, Serializable {
3535
"java.nio.charset.StandardCharsets",
3636
"[A-Z][A-Z_0-9]*"
3737
),
38+
Triple(
39+
"ArgumentMatchers",
40+
"org.mockito.ArgumentMatchers",
41+
"[a-z][a-zA-Z0-9]*"
42+
),
43+
Triple(
44+
"Mockito",
45+
"org.mockito.Mockito",
46+
"mock|mockStatic|spy|when|verify|verifyNoInteractions|verifyNoMoreInteractions|doAnswer|doReturn|doThrow|lenient|never|times|atLeastOnce|withSettings"
47+
),
3848
)
3949

4050
var content = input

‎declarative-config-bridge/src/test/java/io/opentelemetry/instrumentation/config/bridge/DeclarativeConfigPropertiesBridgeBuilderTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import static org.assertj.core.api.Assertions.assertThat;
99
import static org.mockito.ArgumentMatchers.eq;
1010
import static org.mockito.Mockito.mock;
11+
import static org.mockito.Mockito.mockStatic;
1112
import static org.mockito.Mockito.when;
1213

1314
import io.opentelemetry.api.incubator.config.ConfigProvider;
@@ -18,7 +19,6 @@
1819
import io.opentelemetry.sdk.internal.ExtendedOpenTelemetrySdk;
1920
import org.junit.jupiter.api.Test;
2021
import org.mockito.MockedStatic;
21-
import org.mockito.Mockito;
2222

2323
@SuppressWarnings("DoNotMockAutoValue")
2424
class DeclarativeConfigPropertiesBridgeBuilderTest {
@@ -27,7 +27,7 @@ void shouldUseConfigPropertiesForAutoConfiguration() {
2727
ConfigProperties configPropertiesMock = mock(ConfigProperties.class);
2828
AutoConfiguredOpenTelemetrySdk sdkMock = mock(AutoConfiguredOpenTelemetrySdk.class);
2929
try (MockedStatic<AutoConfigureUtil> autoConfigureUtilMock =
30-
Mockito.mockStatic(AutoConfigureUtil.class)) {
30+
mockStatic(AutoConfigureUtil.class)) {
3131
autoConfigureUtilMock
3232
.when(() -> AutoConfigureUtil.getConfig(sdkMock))
3333
.thenReturn(configPropertiesMock);
@@ -58,7 +58,7 @@ void shouldUseConfigProviderForDeclarativeConfiguration() {
5858
when(extendedOpenTelemetrySdk.getConfigProvider()).thenReturn(configProviderMock);
5959

6060
try (MockedStatic<AutoConfigureUtil> autoConfigureUtilMock =
61-
Mockito.mockStatic(AutoConfigureUtil.class)) {
61+
mockStatic(AutoConfigureUtil.class)) {
6262
autoConfigureUtilMock.when(() -> AutoConfigureUtil.getConfig(sdkMock)).thenReturn(null);
6363

6464
ConfigProperties configProperties =
@@ -78,7 +78,7 @@ void shouldUseConfigProviderForDeclarativeConfiguration_noInstrumentationConfig(
7878
when(configProviderMock.getInstrumentationConfig()).thenReturn(null);
7979

8080
try (MockedStatic<AutoConfigureUtil> autoConfigureUtilMock =
81-
Mockito.mockStatic(AutoConfigureUtil.class)) {
81+
mockStatic(AutoConfigureUtil.class)) {
8282
autoConfigureUtilMock.when(() -> AutoConfigureUtil.getConfig(sdkMock)).thenReturn(null);
8383

8484
ConfigProperties configProperties =

‎instrumentation-docs/src/test/java/io/opentelemetry/instrumentation/docs/auditors/SupportedLibrariesAuditorTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import static org.mockito.ArgumentMatchers.any;
1010
import static org.mockito.ArgumentMatchers.eq;
1111
import static org.mockito.Mockito.mock;
12+
import static org.mockito.Mockito.mockStatic;
1213
import static org.mockito.Mockito.when;
1314

1415
import io.opentelemetry.instrumentation.docs.utils.FileManager;
@@ -20,7 +21,6 @@
2021
import org.junit.jupiter.api.Test;
2122
import org.junit.jupiter.api.extension.ExtendWith;
2223
import org.mockito.MockedStatic;
23-
import org.mockito.Mockito;
2424
import org.mockito.junit.jupiter.MockitoExtension;
2525

2626
@ExtendWith(MockitoExtension.class)
@@ -36,7 +36,7 @@ void testPerformAuditWithNoMissingItems() throws IOException, InterruptedExcepti
3636
when(mockResponse.statusCode()).thenReturn(200);
3737
when(mockResponse.body()).thenReturn(createRemoteSupportedLibrariesContent());
3838

39-
try (MockedStatic<FileManager> fileManagerMock = Mockito.mockStatic(FileManager.class)) {
39+
try (MockedStatic<FileManager> fileManagerMock = mockStatic(FileManager.class)) {
4040
fileManagerMock
4141
.when(() -> FileManager.readFileToString(any()))
4242
.thenReturn(createLocalSupportedLibrariesContent());
@@ -57,7 +57,7 @@ void testPerformAuditWithMissingItems() throws IOException, InterruptedException
5757
when(mockResponse.statusCode()).thenReturn(200);
5858
when(mockResponse.body()).thenReturn(createRemoteSupportedLibrariesContentMissing());
5959

60-
try (MockedStatic<FileManager> fileManagerMock = Mockito.mockStatic(FileManager.class)) {
60+
try (MockedStatic<FileManager> fileManagerMock = mockStatic(FileManager.class)) {
6161
fileManagerMock
6262
.when(() -> FileManager.readFileToString(any()))
6363
.thenReturn(createLocalSupportedLibrariesContent());

‎instrumentation-docs/src/test/java/io/opentelemetry/instrumentation/docs/auditors/SuppressionListAuditorTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import static org.mockito.ArgumentMatchers.any;
1010
import static org.mockito.ArgumentMatchers.eq;
1111
import static org.mockito.Mockito.mock;
12+
import static org.mockito.Mockito.mockStatic;
1213
import static org.mockito.Mockito.when;
1314

1415
import io.opentelemetry.instrumentation.docs.utils.FileManager;
@@ -21,7 +22,6 @@
2122
import org.junit.jupiter.api.Test;
2223
import org.junit.jupiter.api.extension.ExtendWith;
2324
import org.mockito.MockedStatic;
24-
import org.mockito.Mockito;
2525
import org.mockito.junit.jupiter.MockitoExtension;
2626

2727
@ExtendWith(MockitoExtension.class)
@@ -37,7 +37,7 @@ void testPerformAuditWithNoMissingItems() throws IOException, InterruptedExcepti
3737
when(mockResponse.statusCode()).thenReturn(200);
3838
when(mockResponse.body()).thenReturn(createDisableListContent());
3939

40-
try (MockedStatic<FileManager> fileManagerMock = Mockito.mockStatic(FileManager.class)) {
40+
try (MockedStatic<FileManager> fileManagerMock = mockStatic(FileManager.class)) {
4141
fileManagerMock
4242
.when(() -> FileManager.readFileToString(any()))
4343
.thenReturn(createInstrumentationListContent());
@@ -58,7 +58,7 @@ void testPerformAuditWithMissingItems() throws IOException, InterruptedException
5858
when(mockResponse.statusCode()).thenReturn(200);
5959
when(mockResponse.body()).thenReturn(createDisableListContentMissing());
6060

61-
try (MockedStatic<FileManager> fileManagerMock = Mockito.mockStatic(FileManager.class)) {
61+
try (MockedStatic<FileManager> fileManagerMock = mockStatic(FileManager.class)) {
6262
fileManagerMock
6363
.when(() -> FileManager.readFileToString(any()))
6464
.thenReturn(createInstrumentationListContent());

‎instrumentation/internal/internal-class-loader/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/internal/classloader/DefineClassInstrumentationTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import static org.mockito.ArgumentMatchers.eq;
99
import static org.mockito.ArgumentMatchers.same;
10+
import static org.mockito.Mockito.mock;
1011
import static org.mockito.Mockito.verify;
1112

1213
import io.opentelemetry.javaagent.bootstrap.DefineClassHelper;
@@ -57,7 +58,7 @@ void ensureDefineClassInstrumented(int argCount) throws IOException {
5758

5859
DefiningClassLoader cl = new DefiningClassLoader();
5960

60-
DefineClassHelper.Handler mockHandler = Mockito.mock(DefineClassHelper.Handler.class);
61+
DefineClassHelper.Handler mockHandler = mock(DefineClassHelper.Handler.class);
6162
// We need to initialize mockHandler by invoking it early, otherwise this leads to problems
6263
mockHandler.beforeDefineClass(cl, className, bytecode, 0, bytecode.length);
6364
Mockito.reset(mockHandler);

‎instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfigurationTest.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77

88
import static org.assertj.core.api.Assertions.assertThat;
99
import static org.mockito.ArgumentMatchers.any;
10+
import static org.mockito.Mockito.mock;
11+
import static org.mockito.Mockito.verify;
12+
import static org.mockito.Mockito.when;
1013
import static org.mockito.Mockito.withSettings;
1114

1215
import io.opentelemetry.api.OpenTelemetry;
@@ -17,7 +20,6 @@
1720
import io.opentelemetry.sdk.trace.export.SpanExporter;
1821
import org.junit.jupiter.api.DisplayName;
1922
import org.junit.jupiter.api.Test;
20-
import org.mockito.Mockito;
2123
import org.springframework.boot.autoconfigure.AutoConfigurations;
2224
import org.springframework.boot.test.context.TestConfiguration;
2325
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
@@ -126,12 +128,11 @@ void enabledProviders() {
126128
"when Application Context DOES NOT contain OpenTelemetry bean but SpanExporter should initialize openTelemetry")
127129
void initializeOpenTelemetryWithCustomProviders() {
128130
OtlpSpanExporterProvider spanExporterProvider =
129-
Mockito.mock(
131+
mock(
130132
OtlpSpanExporterProvider.class,
131133
withSettings().extraInterfaces(AutoConfigureListener.class));
132-
Mockito.when(spanExporterProvider.getName()).thenReturn("custom");
133-
Mockito.when(spanExporterProvider.createExporter(any()))
134-
.thenReturn(Mockito.mock(SpanExporter.class));
134+
when(spanExporterProvider.getName()).thenReturn("custom");
135+
when(spanExporterProvider.createExporter(any())).thenReturn(mock(SpanExporter.class));
135136

136137
this.contextRunner
137138
.withBean(
@@ -143,7 +144,7 @@ void initializeOpenTelemetryWithCustomProviders() {
143144
.withPropertyValues("otel.traces.exporter=custom")
144145
.run(context -> assertThat(context).hasBean("openTelemetry"));
145146

146-
Mockito.verify(spanExporterProvider).afterAutoConfigure(any());
147+
verify(spanExporterProvider).afterAutoConfigure(any());
147148
}
148149

149150
@Test

‎testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/db/MockDriver.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
package io.opentelemetry.instrumentation.testing.junit.db;
77

8+
import static org.mockito.Mockito.mock;
9+
810
import java.sql.Connection;
911
import java.sql.Driver;
1012
import java.sql.DriverManager;
@@ -13,7 +15,6 @@
1315
import java.sql.SQLFeatureNotSupportedException;
1416
import java.util.Properties;
1517
import java.util.logging.Logger;
16-
import org.mockito.Mockito;
1718

1819
public final class MockDriver implements Driver {
1920
private static final MockDriver INSTANCE = new MockDriver();
@@ -24,7 +25,7 @@ public static void register() throws SQLException {
2425

2526
@Override
2627
public Connection connect(String url, Properties info) {
27-
return Mockito.mock(Connection.class);
28+
return mock(Connection.class);
2829
}
2930

3031
@Override

0 commit comments

Comments
 (0)