Skip to content

Commit 8927c9d

Browse files
sbrannensbrannen
committed
Remove obsolete abortedWithReason/finishedWithFailure in EventConditions
This commit removes the obsolete variants of these methods in favor of the new varargs variants. Issue: #1621
1 parent 2d9d8d8 commit 8927c9d

File tree

11 files changed

+70
-122
lines changed

11 files changed

+70
-122
lines changed

‎junit-jupiter-engine/src/test/java/org/junit/jupiter/api/support/io/TempDirectoryTests.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
package org.junit.jupiter.api.support.io;
1212

13-
import static org.assertj.core.api.Assertions.allOf;
1413
import static org.assertj.core.api.Assertions.assertThat;
1514
import static org.junit.jupiter.api.Assertions.assertNotEquals;
1615
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -195,7 +194,7 @@ private void assertSingleFailedTest(EngineExecutionResults results, Class<? exte
195194
String message) {
196195
results.tests().assertStatistics(stats -> stats.started(1).failed(1).succeeded(0));
197196
results.tests().assertThatEvents().haveExactly(1,
198-
finishedWithFailure(allOf(instanceOf(clazz), message(actual -> actual.contains(message)))));
197+
finishedWithFailure(instanceOf(clazz), message(actual -> actual.contains(message))));
199198
}
200199
}
201200

‎junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/ExceptionHandlingTests.java‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ void failureInTestMethodIsRegistered() {
6161

6262
tests.failed().assertEventsMatchExactly( //
6363
event(test("failingTest"),
64-
finishedWithFailure(allOf(instanceOf(AssertionFailedError.class), message("always fails")))));
64+
finishedWithFailure(instanceOf(AssertionFailedError.class), message("always fails"))));
6565
}
6666

6767
@Test
@@ -74,7 +74,7 @@ void uncheckedExceptionInTestMethodIsRegistered() {
7474

7575
tests.failed().assertEventsMatchExactly( //
7676
event(test("testWithUncheckedException"),
77-
finishedWithFailure(allOf(instanceOf(RuntimeException.class), message("unchecked")))));
77+
finishedWithFailure(instanceOf(RuntimeException.class), message("unchecked"))));
7878
}
7979

8080
@Test
@@ -87,7 +87,7 @@ void checkedExceptionInTestMethodIsRegistered() {
8787

8888
tests.failed().assertEventsMatchExactly( //
8989
event(test("testWithCheckedException"),
90-
finishedWithFailure(allOf(instanceOf(IOException.class), message("checked")))));
90+
finishedWithFailure(instanceOf(IOException.class), message("checked"))));
9191
}
9292

9393
@Test
@@ -99,8 +99,8 @@ void checkedExceptionInBeforeEachIsRegistered() {
9999

100100
tests.assertStatistics(stats -> stats.started(1).failed(1));
101101

102-
tests.failed().assertEventsMatchExactly(event(test("succeedingTest"),
103-
finishedWithFailure(allOf(instanceOf(IOException.class), message("checked")))));
102+
tests.failed().assertEventsMatchExactly(
103+
event(test("succeedingTest"), finishedWithFailure(instanceOf(IOException.class), message("checked"))));
104104
}
105105

106106
@Test
@@ -112,8 +112,8 @@ void checkedExceptionInAfterEachIsRegistered() {
112112

113113
tests.assertStatistics(stats -> stats.started(1).failed(1));
114114

115-
tests.failed().assertEventsMatchExactly(event(test("succeedingTest"),
116-
finishedWithFailure(allOf(instanceOf(IOException.class), message("checked")))));
115+
tests.failed().assertEventsMatchExactly(
116+
event(test("succeedingTest"), finishedWithFailure(instanceOf(IOException.class), message("checked"))));
117117
}
118118

119119
@Test
@@ -129,10 +129,10 @@ void checkedExceptionInAfterEachIsSuppressedByExceptionInTest() {
129129
event(container(testClass), started()), //
130130
event(test("testWithUncheckedException"), started()), //
131131
event(test("testWithUncheckedException"), //
132-
finishedWithFailure(allOf( //
132+
finishedWithFailure( //
133133
instanceOf(RuntimeException.class), //
134134
message("unchecked"), //
135-
suppressed(0, allOf(instanceOf(IOException.class), message("checked")))))), //
135+
suppressed(0, allOf(instanceOf(IOException.class), message("checked"))))), //
136136
event(container(testClass), finishedSuccessfully()), //
137137
event(engine(), finishedSuccessfully()));
138138
}
@@ -148,10 +148,8 @@ void exceptionInAfterEachTakesPrecedenceOverFailedAssumptionInTest() {
148148
event(container(FailureTestCase.class), started()), //
149149
event(test("abortedTest"), started()), //
150150
event(test("abortedTest"), //
151-
finishedWithFailure(allOf( //
152-
instanceOf(IOException.class), //
153-
message("checked"), //
154-
suppressed(0, allOf(instanceOf(TestAbortedException.class)))))), //
151+
finishedWithFailure(instanceOf(IOException.class), message("checked"), //
152+
suppressed(0, allOf(instanceOf(TestAbortedException.class))))), //
155153
event(container(FailureTestCase.class), finishedSuccessfully()), //
156154
event(engine(), finishedSuccessfully()));
157155
}
@@ -167,7 +165,7 @@ void checkedExceptionInBeforeAllIsRegistered() {
167165
executionResults.all().assertEventsMatchExactly( //
168166
event(engine(), started()), //
169167
event(container(testClass), started()), //
170-
event(container(testClass), finishedWithFailure(allOf(instanceOf(IOException.class), message("checked")))), //
168+
event(container(testClass), finishedWithFailure(instanceOf(IOException.class), message("checked"))), //
171169
event(engine(), finishedSuccessfully()));
172170
}
173171

@@ -184,7 +182,7 @@ void checkedExceptionInAfterAllIsRegistered() {
184182
event(container(testClass), started()), //
185183
event(test("succeedingTest"), started()), //
186184
event(test("succeedingTest"), finishedSuccessfully()), //
187-
event(container(testClass), finishedWithFailure(allOf(instanceOf(IOException.class), message("checked")))), //
185+
event(container(testClass), finishedWithFailure(instanceOf(IOException.class), message("checked"))), //
188186
event(engine(), finishedSuccessfully()));
189187
}
190188

@@ -236,8 +234,8 @@ void failureInAfterAllTakesPrecedenceOverTestAbortedExceptionInBeforeAll() {
236234
event(engine(), started()), //
237235
event(container(FailureTestCase.class), started()), //
238236
event(container(FailureTestCase.class),
239-
finishedWithFailure(allOf(instanceOf(IOException.class), message("checked"),
240-
suppressed(0, allOf(instanceOf(TestAbortedException.class), message("aborted")))))), //
237+
finishedWithFailure(instanceOf(IOException.class), message("checked"),
238+
suppressed(0, allOf(instanceOf(TestAbortedException.class), message("aborted"))))), //
241239
event(engine(), finishedSuccessfully()));
242240
}
243241

‎junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ParameterResolverTests.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
package org.junit.jupiter.engine.extension;
1212

13-
import static org.assertj.core.api.Assertions.allOf;
1413
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
1514
import static org.junit.jupiter.api.Assertions.assertEquals;
1615
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -114,7 +113,7 @@ void executeTestsForNullValuedMethodInjectionCases() {
114113
tests.failed().assertEventsMatchExactly(
115114
event(
116115
test("injectPrimitive"),
117-
finishedWithFailure(allOf(instanceOf(ParameterResolutionException.class), message(expectations)))
116+
finishedWithFailure(instanceOf(ParameterResolutionException.class), message(expectations))
118117
));
119118
// @formatter:on
120119
}
@@ -156,8 +155,8 @@ void executeTestsForPotentiallyIncompatibleTypeMethodInjectionCases() {
156155
tests.failed().assertEventsMatchExactly(
157156
event(
158157
test("doubleParameterInjection"),
159-
finishedWithFailure(allOf(instanceOf(ParameterResolutionException.class), message(expectations)
160-
))));
158+
finishedWithFailure(instanceOf(ParameterResolutionException.class), message(expectations)
159+
)));
161160
// @formatter:on
162161
}
163162

‎junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/ScriptExecutionConditionTests.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
package org.junit.jupiter.engine.extension;
1212

13-
import static org.assertj.core.api.Assertions.allOf;
1413
import static org.assertj.core.api.Assertions.assertThat;
1514
import static org.junit.jupiter.api.Assertions.assertEquals;
1615
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -53,11 +52,8 @@ void executeSimpleTestCases() {
5352

5453
tests.failed().assertEventsMatchExactly( //
5554
event(test("syntaxError"), //
56-
finishedWithFailure( //
57-
allOf( //
58-
instanceOf(JUnitException.class), //
59-
message(value -> value.contains("syntax error")) //
60-
))));
55+
finishedWithFailure(instanceOf(JUnitException.class),
56+
message(value -> value.contains("syntax error")))));
6157
}
6258

6359
@Test

‎junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestExecutionExceptionHandlerTests.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
package org.junit.jupiter.engine.extension;
1212

13-
import static org.assertj.core.api.Assertions.allOf;
1413
import static org.junit.jupiter.api.Assertions.assertEquals;
1514
import static org.junit.jupiter.api.Assertions.assertFalse;
1615
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -70,7 +69,7 @@ void exceptionHandlerRethrowsException() {
7069
event(engine(), started()), //
7170
event(container(ATestCase.class), started()), //
7271
event(test("testRethrow"), started()), //
73-
event(test("testRethrow"), finishedWithFailure(allOf(instanceOf(IOException.class), message("checked")))), //
72+
event(test("testRethrow"), finishedWithFailure(instanceOf(IOException.class), message("checked"))), //
7473
event(container(ATestCase.class), finishedSuccessfully()), //
7574
event(engine(), finishedSuccessfully()));
7675
}
@@ -104,7 +103,7 @@ void exceptionHandlerConvertsException() {
104103
event(engine(), started()), //
105104
event(container(ATestCase.class), started()), //
106105
event(test("testConvert"), started()), //
107-
event(test("testConvert"), finishedWithFailure(allOf(instanceOf(IOException.class), message("checked")))), //
106+
event(test("testConvert"), finishedWithFailure(instanceOf(IOException.class), message("checked"))), //
108107
event(container(ATestCase.class), finishedSuccessfully()), //
109108
event(engine(), finishedSuccessfully()));
110109
}

‎junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstanceFactoryTests.java‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
package org.junit.jupiter.engine.extension;
1212

13-
import static org.assertj.core.api.Assertions.allOf;
1413
import static org.assertj.core.api.Assertions.assertThat;
1514
import static org.junit.jupiter.api.Assertions.assertEquals;
1615
import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
@@ -75,10 +74,10 @@ void multipleFactoriesRegisteredOnSingleTestClass() {
7574
event(engine(), started()), //
7675
event(container(testClass), started()), //
7776
event(container(testClass),
78-
finishedWithFailure(allOf(instanceOf(ExtensionConfigurationException.class),
77+
finishedWithFailure(instanceOf(ExtensionConfigurationException.class),
7978
message("The following TestInstanceFactory extensions were registered for test class ["
8079
+ testClass.getName() + "], but only one is permitted: "
81-
+ nullSafeToString(FooInstanceFactory.class, BarInstanceFactory.class))))), //
80+
+ nullSafeToString(FooInstanceFactory.class, BarInstanceFactory.class)))), //
8281
event(engine(), finishedSuccessfully()));
8382
}
8483

@@ -94,10 +93,10 @@ void multipleFactoriesRegisteredWithinTestClassHierarchy() {
9493
event(engine(), started()), //
9594
event(container(testClass), started()), //
9695
event(container(testClass),
97-
finishedWithFailure(allOf(instanceOf(ExtensionConfigurationException.class),
96+
finishedWithFailure(instanceOf(ExtensionConfigurationException.class),
9897
message("The following TestInstanceFactory extensions were registered for test class ["
9998
+ testClass.getName() + "], but only one is permitted: "
100-
+ nullSafeToString(FooInstanceFactory.class, BarInstanceFactory.class))))), //
99+
+ nullSafeToString(FooInstanceFactory.class, BarInstanceFactory.class)))), //
101100
event(engine(), finishedSuccessfully()));
102101
}
103102

@@ -117,10 +116,10 @@ void multipleFactoriesRegisteredWithinNestedClassStructure() {
117116
event(test("outerTest()"), finishedSuccessfully()), //
118117
event(nestedContainer(nestedClass), started()), //
119118
event(nestedContainer(nestedClass),
120-
finishedWithFailure(allOf(instanceOf(ExtensionConfigurationException.class),
119+
finishedWithFailure(instanceOf(ExtensionConfigurationException.class),
121120
message("The following TestInstanceFactory extensions were registered for test class ["
122121
+ nestedClass.getName() + "], but only one is permitted: "
123-
+ nullSafeToString(FooInstanceFactory.class, BarInstanceFactory.class))))), //
122+
+ nullSafeToString(FooInstanceFactory.class, BarInstanceFactory.class)))), //
124123
event(container(outerClass), finishedSuccessfully()), //
125124
event(engine(), finishedSuccessfully()));
126125
}
@@ -138,10 +137,10 @@ void nullTestInstanceFactoryWithPerMethodLifecycle() {
138137
event(container(testClass), started()), //
139138
event(test("testShouldNotBeCalled"), started()), //
140139
event(test("testShouldNotBeCalled"),
141-
finishedWithFailure(allOf(instanceOf(TestInstantiationException.class),
140+
finishedWithFailure(instanceOf(TestInstantiationException.class),
142141
message(m -> m.equals("TestInstanceFactory [" + NullTestInstanceFactory.class.getName()
143142
+ "] failed to return an instance of [" + testClass.getName()
144-
+ "] and instead returned an instance of [null]."))))), //
143+
+ "] and instead returned an instance of [null].")))), //
145144
event(container(testClass), finishedSuccessfully()), //
146145
event(engine(), finishedSuccessfully()));
147146
}
@@ -158,10 +157,10 @@ void nullTestInstanceFactoryWithPerClassLifecycle() {
158157
event(engine(), started()), //
159158
event(container(testClass), started()), //
160159
event(container(testClass),
161-
finishedWithFailure(allOf(instanceOf(TestInstantiationException.class),
160+
finishedWithFailure(instanceOf(TestInstantiationException.class),
162161
message(m -> m.equals("TestInstanceFactory [" + NullTestInstanceFactory.class.getName()
163162
+ "] failed to return an instance of [" + testClass.getName()
164-
+ "] and instead returned an instance of [null]."))))), //
163+
+ "] and instead returned an instance of [null].")))), //
165164
event(engine(), finishedSuccessfully()));
166165
}
167166

@@ -178,10 +177,10 @@ void bogusTestInstanceFactoryWithPerMethodLifecycle() {
178177
event(container(testClass), started()), //
179178
event(test("testShouldNotBeCalled"), started()), //
180179
event(test("testShouldNotBeCalled"),
181-
finishedWithFailure(allOf(instanceOf(TestInstantiationException.class),
180+
finishedWithFailure(instanceOf(TestInstantiationException.class),
182181
message(m -> m.equals("TestInstanceFactory [" + BogusTestInstanceFactory.class.getName()
183182
+ "] failed to return an instance of [" + testClass.getName()
184-
+ "] and instead returned an instance of [java.lang.String]."))))), //
183+
+ "] and instead returned an instance of [java.lang.String].")))), //
185184
event(container(testClass), finishedSuccessfully()), //
186185
event(engine(), finishedSuccessfully()));
187186
}
@@ -198,10 +197,10 @@ void bogusTestInstanceFactoryWithPerClassLifecycle() {
198197
event(engine(), started()), //
199198
event(container(testClass), started()), //
200199
event(container(testClass),
201-
finishedWithFailure(allOf(instanceOf(TestInstantiationException.class),
200+
finishedWithFailure(instanceOf(TestInstantiationException.class),
202201
message(m -> m.equals("TestInstanceFactory [" + BogusTestInstanceFactory.class.getName()
203202
+ "] failed to return an instance of [" + testClass.getName()
204-
+ "] and instead returned an instance of [java.lang.String]."))))), //
203+
+ "] and instead returned an instance of [java.lang.String].")))), //
205204
event(engine(), finishedSuccessfully()));
206205
}
207206

@@ -218,9 +217,9 @@ void explosiveTestInstanceFactoryWithPerMethodLifecycle() {
218217
event(container(testClass), started()), //
219218
event(test("testShouldNotBeCalled"), started()), //
220219
event(test("testShouldNotBeCalled"),
221-
finishedWithFailure(allOf(instanceOf(TestInstantiationException.class),
220+
finishedWithFailure(instanceOf(TestInstantiationException.class),
222221
message("TestInstanceFactory [" + ExplosiveTestInstanceFactory.class.getName()
223-
+ "] failed to instantiate test class [" + testClass.getName() + "]: boom!")))), //
222+
+ "] failed to instantiate test class [" + testClass.getName() + "]: boom!"))), //
224223
event(container(testClass), finishedSuccessfully()), //
225224
event(engine(), finishedSuccessfully()));
226225
}
@@ -237,9 +236,9 @@ void explosiveTestInstanceFactoryWithPerClassLifecycle() {
237236
event(engine(), started()), //
238237
event(container(testClass), started()), //
239238
event(container(testClass), //
240-
finishedWithFailure(allOf(instanceOf(TestInstantiationException.class),
239+
finishedWithFailure(instanceOf(TestInstantiationException.class),
241240
message("TestInstanceFactory [" + ExplosiveTestInstanceFactory.class.getName()
242-
+ "] failed to instantiate test class [" + testClass.getName() + "]: boom!")))), //
241+
+ "] failed to instantiate test class [" + testClass.getName() + "]: boom!"))), //
243242
event(engine(), finishedSuccessfully()));
244243
}
245244

@@ -259,12 +258,12 @@ void proxyTestInstanceFactoryFailsDueToUseOfDifferentClassLoader() {
259258
// instantiated using different ClassLoaders. Thus, we check for the
260259
// appended "@" but ignore the actual hash code for the test class
261260
// loaded by the different ClassLoader.
262-
finishedWithFailure(allOf(instanceOf(TestInstantiationException.class),
261+
finishedWithFailure(instanceOf(TestInstantiationException.class),
263262
message(m -> m.startsWith("TestInstanceFactory [" + ProxyTestInstanceFactory.class.getName() + "]")
264263
&& m.contains("failed to return an instance of [" + testClass.getName() + "@"
265264
+ Integer.toHexString(System.identityHashCode(testClass)))
266265
&& m.contains("and instead returned an instance of [" + testClass.getName() + "@")//
267-
)))), //
266+
))), //
268267
event(engine(), finishedSuccessfully()));
269268
}
270269

‎junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExpectedExceptionSupportTests.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
package org.junit.jupiter.migrationsupport.rules;
1212

13-
import static org.assertj.core.api.Assertions.allOf;
1413
import static org.junit.jupiter.api.Assertions.fail;
1514
import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
1615
import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request;
@@ -52,12 +51,12 @@ void expectedExceptionIsProcessedCorrectly() {
5251
finishedWithFailure(message("no exception expected")))) //
5352
.haveExactly(1, //
5453
event(test("exceptionExpectedButNotThrown"), //
55-
finishedWithFailure(allOf(instanceOf(AssertionError.class), //
56-
message("Expected test to throw an instance of java.lang.RuntimeException"))))) //
54+
finishedWithFailure(instanceOf(AssertionError.class), //
55+
message("Expected test to throw an instance of java.lang.RuntimeException")))) //
5756
.haveExactly(1, //
5857
event(test("wrongExceptionExpected"), //
59-
finishedWithFailure(allOf(instanceOf(AssertionError.class), //
60-
message(value -> value.contains("Expected: an instance of java.io.IOException"))))));
58+
finishedWithFailure(instanceOf(AssertionError.class), //
59+
message(value -> value.contains("Expected: an instance of java.io.IOException")))));
6160
}
6261

6362
@Test

‎junit-jupiter-params/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
package org.junit.jupiter.params;
1212

13-
import static org.assertj.core.api.Assertions.allOf;
1413
import static org.assertj.core.api.Assertions.assertThat;
1514
import static org.junit.jupiter.api.Assertions.fail;
1615
import static org.junit.jupiter.params.provider.Arguments.arguments;
@@ -157,8 +156,8 @@ void failsContainerOnEmptyName() {
157156
void reportsExceptionForErroneousConverter() {
158157
var results = execute(selectMethod(TestCase.class, "testWithErroneousConverter", Object.class.getName()));
159158
results.all().assertThatEvents() //
160-
.haveExactly(1, event(test(), finishedWithFailure(allOf(instanceOf(ParameterResolutionException.class), //
161-
message("Error converting parameter at index 0: something went horribly wrong")))));
159+
.haveExactly(1, event(test(), finishedWithFailure(instanceOf(ParameterResolutionException.class), //
160+
message("Error converting parameter at index 0: something went horribly wrong"))));
162161
}
163162

164163
@Nested
@@ -292,8 +291,8 @@ void streamOfTwoDimensionalObjectArrays() {
292291
void reportsContainerWithAssumptionFailureInMethodSourceAsAborted() {
293292
execute("assumptionFailureInMethodSourceFactoryMethod", String.class).all().assertThatEvents() //
294293
.haveExactly(1, event(container("test-template:assumptionFailureInMethodSourceFactoryMethod"), //
295-
abortedWithReason(allOf(instanceOf(TestAbortedException.class),
296-
message("Assumption failed: nothing to test")))));
294+
abortedWithReason(instanceOf(TestAbortedException.class),
295+
message("Assumption failed: nothing to test"))));
297296
}
298297

299298
private EngineExecutionResults execute(String methodName, Class<?>... methodParameterTypes) {

0 commit comments

Comments
 (0)