Skip to content

Commit e99921b

Browse files
sbrannenmarcphilipp
sbrannen
authored and
marcphilipp
committed
Migrate to Mockito.mock(T...) where feasible
1 parent ee34052 commit e99921b

File tree

36 files changed

+82
-103
lines changed

36 files changed

+82
-103
lines changed

‎junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/AbstractExecutionConditionTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
@TestInstance(Lifecycle.PER_CLASS)
5151
abstract class AbstractExecutionConditionTests {
5252

53-
private final ExtensionContext context = mock(ExtensionContext.class);
53+
private final ExtensionContext context = mock();
5454

5555
private ConditionEvaluationResult result;
5656

‎junit-jupiter-engine/src/test/java/org/junit/jupiter/api/extension/support/TypeBasedParameterResolverTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import static org.junit.jupiter.api.Assertions.assertFalse;
1515
import static org.junit.jupiter.api.Assertions.assertThrows;
1616
import static org.junit.jupiter.api.Assertions.assertTrue;
17+
import static org.mockito.Mockito.mock;
1718
import static org.mockito.Mockito.when;
1819

1920
import java.lang.annotation.ElementType;
@@ -32,7 +33,6 @@
3233
import org.junit.jupiter.api.extension.ParameterResolver;
3334
import org.junit.platform.commons.PreconditionViolationException;
3435
import org.junit.platform.commons.util.ReflectionUtils;
35-
import org.mockito.Mockito;
3636

3737
/**
3838
* @since 5.6
@@ -86,13 +86,13 @@ void resolve() {
8686
}
8787

8888
private static ParameterContext parameterContext(Parameter parameter) {
89-
ParameterContext parameterContext = Mockito.mock(ParameterContext.class);
89+
ParameterContext parameterContext = mock();
9090
when(parameterContext.getParameter()).thenReturn(parameter);
9191
return parameterContext;
9292
}
9393

9494
private static ExtensionContext extensionContext() {
95-
ExtensionContext extensionContext = Mockito.mock(ExtensionContext.class);
95+
ExtensionContext extensionContext = mock();
9696
when(extensionContext.getDisplayName()).thenReturn("Displaying");
9797
return extensionContext;
9898
}

‎junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/CachingJupiterConfigurationTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
*/
3535
class CachingJupiterConfigurationTests {
3636

37-
private final JupiterConfiguration delegate = mock(JupiterConfiguration.class);
37+
private final JupiterConfiguration delegate = mock();
3838
private final JupiterConfiguration cache = new CachingJupiterConfiguration(delegate);
3939

4040
@Test

‎junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/DefaultJupiterConfigurationTests.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ void getDefaultTestInstanceLifecyclePreconditions() {
4545

4646
@Test
4747
void getDefaultTestInstanceLifecycleWithNoConfigParamSet() {
48-
JupiterConfiguration configuration = new DefaultJupiterConfiguration(mock(ConfigurationParameters.class));
48+
JupiterConfiguration configuration = new DefaultJupiterConfiguration(mock());
4949
Lifecycle lifecycle = configuration.getDefaultTestInstanceLifecycle();
5050
assertThat(lifecycle).isEqualTo(PER_METHOD);
5151
}
5252

5353
@Test
5454
void getDefaultTempDirCleanupModeWithNoConfigParamSet() {
55-
JupiterConfiguration configuration = new DefaultJupiterConfiguration(mock(ConfigurationParameters.class));
55+
JupiterConfiguration configuration = new DefaultJupiterConfiguration(mock());
5656
CleanupMode cleanupMode = configuration.getDefaultTempDirCleanupMode();
5757
assertThat(cleanupMode).isEqualTo(ALWAYS);
5858
}
@@ -74,7 +74,7 @@ void getDefaultTestInstanceLifecycleWithConfigParamSet() {
7474

7575
@Test
7676
void shouldGetDefaultDisplayNameGeneratorWithConfigParamSet() {
77-
ConfigurationParameters parameters = mock(ConfigurationParameters.class);
77+
ConfigurationParameters parameters = mock();
7878
String key = Constants.DEFAULT_DISPLAY_NAME_GENERATOR_PROPERTY_NAME;
7979
when(parameters.get(key)).thenReturn(Optional.of(CustomDisplayNameGenerator.class.getName()));
8080
JupiterConfiguration configuration = new DefaultJupiterConfiguration(parameters);
@@ -86,7 +86,7 @@ void shouldGetDefaultDisplayNameGeneratorWithConfigParamSet() {
8686

8787
@Test
8888
void shouldGetStandardAsDefaultDisplayNameGeneratorWithoutConfigParamSet() {
89-
ConfigurationParameters parameters = mock(ConfigurationParameters.class);
89+
ConfigurationParameters parameters = mock();
9090
String key = Constants.DEFAULT_DISPLAY_NAME_GENERATOR_PROPERTY_NAME;
9191
when(parameters.get(key)).thenReturn(Optional.empty());
9292
JupiterConfiguration configuration = new DefaultJupiterConfiguration(parameters);
@@ -98,7 +98,7 @@ void shouldGetStandardAsDefaultDisplayNameGeneratorWithoutConfigParamSet() {
9898

9999
@Test
100100
void shouldGetNothingAsDefaultTestMethodOrderWithoutConfigParamSet() {
101-
ConfigurationParameters parameters = mock(ConfigurationParameters.class);
101+
ConfigurationParameters parameters = mock();
102102
String key = Constants.DEFAULT_TEST_METHOD_ORDER_PROPERTY_NAME;
103103
when(parameters.get(key)).thenReturn(Optional.empty());
104104
JupiterConfiguration configuration = new DefaultJupiterConfiguration(parameters);
@@ -109,7 +109,7 @@ void shouldGetNothingAsDefaultTestMethodOrderWithoutConfigParamSet() {
109109
}
110110

111111
private void assertDefaultConfigParam(String configValue, Lifecycle expected) {
112-
ConfigurationParameters configParams = mock(ConfigurationParameters.class);
112+
ConfigurationParameters configParams = mock();
113113
when(configParams.get(KEY)).thenReturn(Optional.ofNullable(configValue));
114114
Lifecycle lifecycle = new DefaultJupiterConfiguration(configParams).getDefaultTestInstanceLifecycle();
115115
assertThat(lifecycle).isEqualTo(expected);

‎junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/config/InstantiatingConfigurationParameterConverterTests.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class InstantiatingConfigurationParameterConverterTests {
3838
@Test
3939
void shouldInstantiateConfiguredClass(LogRecordListener listener) {
4040

41-
ConfigurationParameters configurationParameters = mock(ConfigurationParameters.class);
41+
ConfigurationParameters configurationParameters = mock();
4242
when(configurationParameters.get(KEY)).thenReturn(Optional.of(CustomDisplayNameGenerator.class.getName()));
4343

4444
InstantiatingConfigurationParameterConverter<DisplayNameGenerator> converter = new InstantiatingConfigurationParameterConverter<>(
@@ -54,7 +54,7 @@ void shouldInstantiateConfiguredClass(LogRecordListener listener) {
5454

5555
@Test
5656
void shouldReturnEmptyOptionalIfNoConfigurationFound() {
57-
ConfigurationParameters configurationParameters = mock(ConfigurationParameters.class);
57+
ConfigurationParameters configurationParameters = mock();
5858
when(configurationParameters.get(KEY)).thenReturn(Optional.empty());
5959

6060
InstantiatingConfigurationParameterConverter<DisplayNameGenerator> converter = new InstantiatingConfigurationParameterConverter<>(
@@ -66,7 +66,7 @@ void shouldReturnEmptyOptionalIfNoConfigurationFound() {
6666

6767
@Test
6868
void shouldReturnEmptyOptionalIfConfigurationIsBlank() {
69-
ConfigurationParameters configurationParameters = mock(ConfigurationParameters.class);
69+
ConfigurationParameters configurationParameters = mock();
7070
when(configurationParameters.get(KEY)).thenReturn(Optional.of(""));
7171

7272
InstantiatingConfigurationParameterConverter<DisplayNameGenerator> converter = new InstantiatingConfigurationParameterConverter<>(
@@ -78,7 +78,7 @@ void shouldReturnEmptyOptionalIfConfigurationIsBlank() {
7878

7979
@Test
8080
void shouldTrimAndInstantiateConfiguredClass(LogRecordListener listener) {
81-
ConfigurationParameters configurationParameters = mock(ConfigurationParameters.class);
81+
ConfigurationParameters configurationParameters = mock();
8282
String classNameWithSpaces = " " + CustomDisplayNameGenerator.class.getName() + " ";
8383
when(configurationParameters.get(KEY)).thenReturn(Optional.of(classNameWithSpaces));
8484

@@ -95,7 +95,7 @@ void shouldTrimAndInstantiateConfiguredClass(LogRecordListener listener) {
9595

9696
@Test
9797
void shouldReturnEmptyOptionalIfNoClassFound(LogRecordListener listener) {
98-
ConfigurationParameters configurationParameters = mock(ConfigurationParameters.class);
98+
ConfigurationParameters configurationParameters = mock();
9999
when(configurationParameters.get(KEY)).thenReturn(Optional.of("random-string"));
100100

101101
InstantiatingConfigurationParameterConverter<DisplayNameGenerator> converter = new InstantiatingConfigurationParameterConverter<>(
@@ -111,7 +111,7 @@ void shouldReturnEmptyOptionalIfNoClassFound(LogRecordListener listener) {
111111

112112
@Test
113113
void shouldReturnEmptyOptionalIfClassFoundIsNotATypeOfExpectedType(LogRecordListener listener) {
114-
ConfigurationParameters configurationParameters = mock(ConfigurationParameters.class);
114+
ConfigurationParameters configurationParameters = mock();
115115
when(configurationParameters.get(KEY)).thenReturn(Optional.of(Object.class.getName()));
116116

117117
InstantiatingConfigurationParameterConverter<DisplayNameGenerator> converter = new InstantiatingConfigurationParameterConverter<>(
@@ -127,7 +127,7 @@ void shouldReturnEmptyOptionalIfClassFoundIsNotATypeOfExpectedType(LogRecordList
127127

128128
@Test
129129
void shouldReturnEmptyOptionalIfClassNameIsNotFullyQualified(LogRecordListener listener) {
130-
ConfigurationParameters configurationParameters = mock(ConfigurationParameters.class);
130+
ConfigurationParameters configurationParameters = mock();
131131
when(configurationParameters.get(KEY)).thenReturn(
132132
Optional.of(CustomDisplayNameGenerator.class.getSimpleName()));
133133

‎junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/DisplayNameUtilsTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ void shouldGetDisplayNameFromSupplierIfNoDisplayNameAnnotationPresent() {
7171
@Nested
7272
class ClassDisplayNameSupplierTests {
7373

74-
private JupiterConfiguration configuration = mock(JupiterConfiguration.class);
74+
private JupiterConfiguration configuration = mock();
7575

7676
@Test
7777
void shouldGetDisplayNameFromDisplayNameGenerationAnnotation() {
@@ -107,7 +107,7 @@ void shouldGetDisplayNameFromDefaultDisplayNameGenerator() {
107107
@Nested
108108
class NestedClassDisplayNameTests {
109109

110-
private JupiterConfiguration configuration = mock(JupiterConfiguration.class);
110+
private JupiterConfiguration configuration = mock();
111111

112112
@Test
113113
void shouldGetDisplayNameFromDisplayNameGenerationAnnotation() {
@@ -131,7 +131,7 @@ void shouldGetDisplayNameFromDefaultDisplayNameGenerator() {
131131
@Nested
132132
class MethodDisplayNameTests {
133133

134-
private JupiterConfiguration configuration = mock(JupiterConfiguration.class);
134+
private JupiterConfiguration configuration = mock();
135135

136136
@Test
137137
void shouldGetDisplayNameFromDisplayNameGenerationAnnotation() throws Exception {

‎junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/ExtensionContextTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
*/
6060
public class ExtensionContextTests {
6161

62-
private final JupiterConfiguration configuration = mock(JupiterConfiguration.class);
62+
private final JupiterConfiguration configuration = mock();
6363

6464
@BeforeEach
6565
void setUp() {

‎junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptorTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class JupiterTestDescriptorTests {
5353

5454
private static final UniqueId uniqueId = UniqueId.root("enigma", "foo");
5555

56-
private final JupiterConfiguration configuration = mock(JupiterConfiguration.class);
56+
private final JupiterConfiguration configuration = mock();
5757

5858
@BeforeEach
5959
void setUp() {

‎junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestFactoryTestDescriptorTests.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import org.junit.jupiter.api.extension.ExtensionContext;
3131
import org.junit.jupiter.engine.config.JupiterConfiguration;
3232
import org.junit.jupiter.engine.execution.JupiterEngineExecutionContext;
33-
import org.junit.jupiter.engine.extension.MutableExtensionRegistry;
3433
import org.junit.platform.engine.TestSource;
3534
import org.junit.platform.engine.UniqueId;
3635
import org.junit.platform.engine.support.descriptor.ClasspathResourceSource;
@@ -39,7 +38,6 @@
3938
import org.junit.platform.engine.support.descriptor.FileSource;
4039
import org.junit.platform.engine.support.descriptor.MethodSource;
4140
import org.junit.platform.engine.support.descriptor.UriSource;
42-
import org.junit.platform.engine.support.hierarchical.Node;
4341
import org.junit.platform.engine.support.hierarchical.OpenTest4JAwareThrowableCollector;
4442

4543
/**
@@ -134,17 +132,17 @@ class Streams {
134132

135133
@BeforeEach
136134
void before() throws Exception {
137-
jupiterConfiguration = mock(JupiterConfiguration.class);
135+
jupiterConfiguration = mock();
138136
when(jupiterConfiguration.getDefaultDisplayNameGenerator()).thenReturn(new DisplayNameGenerator.Standard());
139137

140-
extensionContext = mock(ExtensionContext.class);
138+
extensionContext = mock();
141139
isClosed = false;
142140

143141
context = new JupiterEngineExecutionContext(null, null) //
144142
.extend() //
145143
.withThrowableCollector(new OpenTest4JAwareThrowableCollector()) //
146144
.withExtensionContext(extensionContext) //
147-
.withExtensionRegistry(mock(MutableExtensionRegistry.class)) //
145+
.withExtensionRegistry(mock()) //
148146
.build();
149147

150148
Method testMethod = CustomStreamTestCase.class.getDeclaredMethod("customStream");
@@ -158,7 +156,7 @@ void streamsFromTestFactoriesShouldBeClosed() {
158156
Stream<DynamicTest> dynamicTestStream = Stream.empty();
159157
prepareMockForTestInstanceWithCustomStream(dynamicTestStream);
160158

161-
descriptor.invokeTestMethod(context, mock(Node.DynamicTestExecutor.class));
159+
descriptor.invokeTestMethod(context, mock());
162160

163161
assertTrue(isClosed);
164162
}
@@ -168,7 +166,7 @@ void streamsFromTestFactoriesShouldBeClosedWhenTheyThrow() {
168166
Stream<Integer> integerStream = Stream.of(1, 2);
169167
prepareMockForTestInstanceWithCustomStream(integerStream);
170168

171-
descriptor.invokeTestMethod(context, mock(Node.DynamicTestExecutor.class));
169+
descriptor.invokeTestMethod(context, mock());
172170

173171
assertTrue(isClosed);
174172
}

‎junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/descriptor/TestInstanceLifecycleUtilsTests.java‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class TestInstanceLifecycleUtilsTests {
5050
@Test
5151
void getTestInstanceLifecyclePreconditions() {
5252
PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
53-
() -> getTestInstanceLifecycle(null, new DefaultJupiterConfiguration(mock(ConfigurationParameters.class))));
53+
() -> getTestInstanceLifecycle(null, new DefaultJupiterConfiguration(mock())));
5454
assertThat(exception).hasMessage("testClass must not be null");
5555

5656
exception = assertThrows(PreconditionViolationException.class,
@@ -60,22 +60,21 @@ void getTestInstanceLifecyclePreconditions() {
6060

6161
@Test
6262
void getTestInstanceLifecycleWithNoConfigParamSet() {
63-
Lifecycle lifecycle = getTestInstanceLifecycle(getClass(),
64-
new DefaultJupiterConfiguration(mock(ConfigurationParameters.class)));
63+
Lifecycle lifecycle = getTestInstanceLifecycle(getClass(), new DefaultJupiterConfiguration(mock()));
6564
assertThat(lifecycle).isEqualTo(PER_METHOD);
6665
}
6766

6867
@Test
6968
void getTestInstanceLifecycleWithConfigParamSet() {
70-
ConfigurationParameters configParams = mock(ConfigurationParameters.class);
69+
ConfigurationParameters configParams = mock();
7170
when(configParams.get(KEY)).thenReturn(Optional.of(PER_CLASS.name().toLowerCase()));
7271
Lifecycle lifecycle = getTestInstanceLifecycle(getClass(), new DefaultJupiterConfiguration(configParams));
7372
assertThat(lifecycle).isEqualTo(PER_CLASS);
7473
}
7574

7675
@Test
7776
void getTestInstanceLifecycleWithLocalConfigThatOverridesCustomDefaultSetViaConfigParam() {
78-
ConfigurationParameters configParams = mock(ConfigurationParameters.class);
77+
ConfigurationParameters configParams = mock();
7978
when(configParams.get(KEY)).thenReturn(Optional.of(PER_CLASS.name().toLowerCase()));
8079
Lifecycle lifecycle = getTestInstanceLifecycle(TestCase.class, new DefaultJupiterConfiguration(configParams));
8180
assertThat(lifecycle).isEqualTo(PER_METHOD);
@@ -84,16 +83,14 @@ void getTestInstanceLifecycleWithLocalConfigThatOverridesCustomDefaultSetViaConf
8483
@Test
8584
void getTestInstanceLifecycleFromMetaAnnotationWithNoConfigParamSet() {
8685
Class<?> testClass = BaseMetaAnnotatedTestCase.class;
87-
Lifecycle lifecycle = getTestInstanceLifecycle(testClass,
88-
new DefaultJupiterConfiguration(mock(ConfigurationParameters.class)));
86+
Lifecycle lifecycle = getTestInstanceLifecycle(testClass, new DefaultJupiterConfiguration(mock()));
8987
assertThat(lifecycle).isEqualTo(PER_CLASS);
9088
}
9189

9290
@Test
9391
void getTestInstanceLifecycleFromSpecializedClassWithNoConfigParamSet() {
9492
Class<?> testClass = SpecializedTestCase.class;
95-
Lifecycle lifecycle = getTestInstanceLifecycle(testClass,
96-
new DefaultJupiterConfiguration(mock(ConfigurationParameters.class)));
93+
Lifecycle lifecycle = getTestInstanceLifecycle(testClass, new DefaultJupiterConfiguration(mock()));
9794
assertThat(lifecycle).isEqualTo(PER_CLASS);
9895
}
9996

0 commit comments

Comments
 (0)