Skip to content

Commit 4db5d89

Browse files
author
Vincent Potucek
committed
Add CleanupAssertions junit-team#5193 junit-team#5002
- https://docs.openrewrite.org/recipes/java/testing/junit/jupiterbestpractices Signed-off-by: Vincent Potucek <vpotucek@me.com>
1 parent b4aef17 commit 4db5d89

12 files changed

Lines changed: 147 additions & 147 deletions

‎jupiter-tests/src/test/java/org/junit/jupiter/api/AssertEqualsAssertionsTests.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -508,8 +508,8 @@ void assertEqualsWithNullReferences() {
508508
Object null1 = null;
509509
Object null2 = null;
510510

511-
assertEquals(null1, null);
512-
assertEquals(null, null2);
511+
assertNull(null1);
512+
assertNull(null2);
513513
assertEquals(null1, null2);
514514
}
515515

@@ -529,7 +529,7 @@ void assertEqualsWithEquivalentStrings() {
529529
@Test
530530
void assertEqualsWithNullVsObject() {
531531
try {
532-
assertEquals(null, "foo");
532+
assertNull("foo");
533533
expectAssertionFailedError();
534534
}
535535
catch (AssertionFailedError ex) {
@@ -541,7 +541,7 @@ void assertEqualsWithNullVsObject() {
541541
@Test
542542
void assertEqualsWithObjectVsNull() {
543543
try {
544-
assertEquals("foo", null);
544+
assertNull("foo");
545545
expectAssertionFailedError();
546546
}
547547
catch (AssertionFailedError ex) {
@@ -553,7 +553,7 @@ void assertEqualsWithObjectVsNull() {
553553
@Test
554554
void assertEqualsWithObjectWithNullStringReturnedFromToStringVsNull() {
555555
try {
556-
assertEquals("null", null);
556+
assertNull("null");
557557
expectAssertionFailedError();
558558
}
559559
catch (AssertionFailedError ex) {
@@ -566,7 +566,7 @@ void assertEqualsWithObjectWithNullStringReturnedFromToStringVsNull() {
566566
@Test
567567
void assertEqualsWithNullVsObjectWithNullStringReturnedFromToString() {
568568
try {
569-
assertEquals(null, "null");
569+
assertNull("null");
570570
expectAssertionFailedError();
571571
}
572572
catch (AssertionFailedError ex) {
@@ -579,7 +579,7 @@ void assertEqualsWithNullVsObjectWithNullStringReturnedFromToString() {
579579
@Test
580580
void assertEqualsWithNullVsObjectAndMessageSupplier() {
581581
try {
582-
assertEquals(null, "foo", () -> "test");
582+
assertNull("foo", () -> "test");
583583
expectAssertionFailedError();
584584
}
585585
catch (AssertionFailedError ex) {
@@ -592,7 +592,7 @@ void assertEqualsWithNullVsObjectAndMessageSupplier() {
592592
@Test
593593
void assertEqualsWithObjectVsNullAndMessageSupplier() {
594594
try {
595-
assertEquals("foo", null, () -> "test");
595+
assertNull("foo", () -> "test");
596596
expectAssertionFailedError();
597597
}
598598
catch (AssertionFailedError ex) {
@@ -611,7 +611,7 @@ void assertEqualsInvokesEqualsMethodForIdenticalObjects() {
611611
@Test
612612
void assertEqualsWithUnequalObjectWhoseToStringImplementationThrowsAnException() {
613613
try {
614-
assertEquals(new ToStringThrowsException(), "foo");
614+
assertEquals("foo", new ToStringThrowsException());
615615
}
616616
catch (AssertionFailedError ex) {
617617
assertMessageStartsWith(ex, "expected: <" + ToStringThrowsException.class.getName() + "@");

‎jupiter-tests/src/test/java/org/junit/jupiter/api/AssertIterableEqualsAssertionsTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ void assertIterableEqualsIterableVsNull() {
132132
}
133133

134134
try {
135-
assertIterableEquals(listOf('a', 1, new Object(), 10L), null);
135+
assertIterableEquals(null, listOf('a', 1, new Object(), 10L));
136136
expectAssertionFailedError();
137137
}
138138
catch (AssertionFailedError ex) {
@@ -173,7 +173,7 @@ void assertIterableEqualsIterableVsNullAndMessage() {
173173
}
174174

175175
try {
176-
assertIterableEquals(listOf("hello", 42), null, "message");
176+
assertIterableEquals(null, listOf("hello", 42), "message");
177177
expectAssertionFailedError();
178178
}
179179
catch (AssertionFailedError ex) {
@@ -217,7 +217,7 @@ void assertIterableEqualsIterableVsNullAndMessageSupplier() {
217217
}
218218

219219
try {
220-
assertIterableEquals(listOf(listOf("a"), listOf()), null, () -> "message");
220+
assertIterableEquals(null, listOf(listOf("a"), listOf()), () -> "message");
221221
expectAssertionFailedError();
222222
}
223223
catch (AssertionFailedError ex) {

‎jupiter-tests/src/test/java/org/junit/jupiter/api/AssertNotSameAssertionsTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ void assertNotSameWithDifferentObjectsAndMessageSupplier() {
3939

4040
@Test
4141
void assertNotSameWithObjectVsNull() {
42-
assertNotSame(new Object(), null);
42+
assertNotSame(null, new Object());
4343
}
4444

4545
@Test

‎jupiter-tests/src/test/java/org/junit/jupiter/api/AssertSameAssertionsTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ void assertSameWithSameObject() {
4444
void assertSameWithObjectVsNull() {
4545
Object expected = new Object();
4646
try {
47-
assertSame(expected, null);
47+
assertSame(null, expected);
4848
expectAssertionFailedError();
4949
}
5050
catch (AssertionFailedError ex) {

‎jupiter-tests/src/test/java/org/junit/jupiter/engine/TestClassInheritanceTests.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -116,21 +116,21 @@ void beforeAndAfterMethodsInTestClassHierarchy() {
116116
// @formatter:on
117117

118118
// @formatter:off
119-
assertEquals(asList(
120-
"beforeAll1",
119+
assertEquals(callSequence, asList(
120+
"beforeAll1",
121121
"beforeAll2",
122-
"beforeAll3",
123-
"beforeEach1",
124-
"beforeEach2",
125-
"beforeEach3",
126-
"test3",
127-
"afterEach3",
128-
"afterEach2",
129-
"afterEach1",
130-
"afterAll3",
122+
"beforeAll3",
123+
"beforeEach1",
124+
"beforeEach2",
125+
"beforeEach3",
126+
"test3",
127+
"afterEach3",
128+
"afterEach2",
129+
"afterEach1",
130+
"afterAll3",
131131
"afterAll2",
132-
"afterAll1"
133-
), callSequence, "wrong call sequence");
132+
"afterAll1"
133+
), "wrong call sequence");
134134
// @formatter:on
135135
}
136136

‎jupiter-tests/src/test/java/org/junit/jupiter/engine/TestInstanceLifecycleConfigurationTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ private void performAssertions(Class<?> testClass, Map<String, String> configPar
138138
executionResults.testEvents().assertStatistics(//
139139
stats -> stats.started(numTests).finished(numTests));
140140

141-
assertEquals(Arrays.asList(methods), methodsInvoked);
141+
assertEquals(methodsInvoked, Arrays.asList(methods));
142142
}
143143

144144
// -------------------------------------------------------------------------

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ private void assertBeforeAllAndAfterAllCallbacks(Class<?> testClass, int testsSt
182182
executeTestsForClass(testClass).testEvents()//
183183
.assertStatistics(stats -> stats.started(testsStarted).succeeded(testsSuccessful));
184184

185-
assertEquals(asList(expectedCalls), callSequence, () -> "wrong call sequence for " + testClass.getName());
185+
assertEquals(callSequence, asList(expectedCalls), () -> "wrong call sequence for " + testClass.getName());
186186
}
187187

188188
// -------------------------------------------------------------------------

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

Lines changed: 63 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -64,31 +64,31 @@ void beforeEachAndAfterEachCallbacks() {
6464
assertEquals(0, testEvents.failed().count(), "# tests failed");
6565

6666
// @formatter:off
67-
assertEquals(asList(
67+
assertEquals(callSequence, asList(
6868

69-
// OuterTestCase
70-
"fooBeforeEachCallback",
71-
"barBeforeEachCallback",
69+
// OuterTestCase
70+
"fooBeforeEachCallback",
71+
"barBeforeEachCallback",
7272
"beforeEachMethod",
73-
"testOuter",
73+
"testOuter",
7474
"afterEachMethod",
75-
"barAfterEachCallback",
76-
"fooAfterEachCallback",
75+
"barAfterEachCallback",
76+
"fooAfterEachCallback",
7777

78-
// InnerTestCase
79-
"fooBeforeEachCallback",
80-
"barBeforeEachCallback",
81-
"fizzBeforeEachCallback",
78+
// InnerTestCase
79+
"fooBeforeEachCallback",
80+
"barBeforeEachCallback",
81+
"fizzBeforeEachCallback",
8282
"beforeEachMethod",
83-
"beforeEachInnerMethod",
84-
"testInner",
85-
"afterEachInnerMethod",
83+
"beforeEachInnerMethod",
84+
"testInner",
85+
"afterEachInnerMethod",
8686
"afterEachMethod",
87-
"fizzAfterEachCallback",
88-
"barAfterEachCallback",
89-
"fooAfterEachCallback"
87+
"fizzAfterEachCallback",
88+
"barAfterEachCallback",
89+
"fooAfterEachCallback"
9090

91-
), callSequence, "wrong call sequence");
91+
), "wrong call sequence");
9292
// @formatter:on
9393
}
9494

@@ -103,13 +103,13 @@ void beforeEachAndAfterEachCallbacksDeclaredOnSuperclassAndSubclass() {
103103
assertEquals(0, testEvents.failed().count(), "# tests failed");
104104

105105
// @formatter:off
106-
assertEquals(asList(
107-
"fooBeforeEachCallback",
108-
"barBeforeEachCallback",
106+
assertEquals(callSequence, asList(
107+
"fooBeforeEachCallback",
108+
"barBeforeEachCallback",
109109
"testChild",
110-
"barAfterEachCallback",
111-
"fooAfterEachCallback"
112-
), callSequence, "wrong call sequence");
110+
"barAfterEachCallback",
111+
"fooAfterEachCallback"
112+
), "wrong call sequence");
113113
// @formatter:on
114114
}
115115

@@ -124,23 +124,23 @@ void beforeEachAndAfterEachCallbacksDeclaredOnInterfaceAndClass() {
124124
assertEquals(0, testEvents.failed().count(), "# tests failed");
125125

126126
// @formatter:off
127-
assertEquals(asList(
127+
assertEquals(callSequence, asList(
128128

129-
// Test Interface
130-
"fooBeforeEachCallback",
131-
"barBeforeEachCallback",
129+
// Test Interface
130+
"fooBeforeEachCallback",
131+
"barBeforeEachCallback",
132132
"defaultTestMethod",
133-
"barAfterEachCallback",
134-
"fooAfterEachCallback",
133+
"barAfterEachCallback",
134+
"fooAfterEachCallback",
135135

136-
// Test Class
137-
"fooBeforeEachCallback",
138-
"barBeforeEachCallback",
136+
// Test Class
137+
"fooBeforeEachCallback",
138+
"barBeforeEachCallback",
139139
"localTestMethod",
140-
"barAfterEachCallback",
141-
"fooAfterEachCallback"
140+
"barAfterEachCallback",
141+
"fooAfterEachCallback"
142142

143-
), callSequence, "wrong call sequence");
143+
), "wrong call sequence");
144144
// @formatter:on
145145
}
146146

@@ -155,16 +155,16 @@ void beforeEachCallbackThrowsAnException() {
155155
assertEquals(1, testEvents.failed().count(), "# tests failed");
156156

157157
// @formatter:off
158-
assertEquals(asList(
159-
"fooBeforeEachCallback",
160-
"exceptionThrowingBeforeEachCallback", // throws an exception.
161-
// barBeforeEachCallback should not get invoked.
158+
assertEquals(callSequence, asList(
159+
"fooBeforeEachCallback",
160+
"exceptionThrowingBeforeEachCallback", // throws an exception.
161+
// barBeforeEachCallback should not get invoked.
162162
// beforeEachMethod should not get invoked.
163-
// test should not get invoked.
163+
// test should not get invoked.
164164
// afterEachMethod should not get invoked.
165-
"barAfterEachCallback",
166-
"fooAfterEachCallback"
167-
), callSequence, "wrong call sequence");
165+
"barAfterEachCallback",
166+
"fooAfterEachCallback"
167+
), "wrong call sequence");
168168
// @formatter:on
169169

170170
assertThat(actualExceptionInAfterEachCallback).containsInstanceOf(EnigmaException.class);
@@ -181,16 +181,16 @@ void afterEachCallbackThrowsAnException() {
181181
assertEquals(1, testEvents.failed().count(), "# tests failed");
182182

183183
// @formatter:off
184-
assertEquals(asList(
185-
"fooBeforeEachCallback",
186-
"barBeforeEachCallback",
184+
assertEquals(callSequence, asList(
185+
"fooBeforeEachCallback",
186+
"barBeforeEachCallback",
187187
"beforeEachMethod",
188-
"test",
188+
"test",
189189
"afterEachMethod",
190-
"barAfterEachCallback",
191-
"exceptionThrowingAfterEachCallback", // throws an exception.
192-
"fooAfterEachCallback"
193-
), callSequence, "wrong call sequence");
190+
"barAfterEachCallback",
191+
"exceptionThrowingAfterEachCallback", // throws an exception.
192+
"fooAfterEachCallback"
193+
), "wrong call sequence");
194194
// @formatter:on
195195

196196
assertThat(actualExceptionInAfterEachCallback).containsInstanceOf(EnigmaException.class);
@@ -233,7 +233,7 @@ void beforeEachMethodThrowsAnException() {
233233

234234
List<String> expected = beforeEachMethodCallSequence.getFirst().equals("beforeEachMethod1") ? list1 : list2;
235235

236-
assertEquals(expected, callSequence, "wrong call sequence");
236+
assertEquals(callSequence, expected, "wrong call sequence");
237237

238238
assertThat(actualExceptionInAfterEachCallback).containsInstanceOf(EnigmaException.class);
239239
}
@@ -249,13 +249,13 @@ void afterEachMethodThrowsAnException() {
249249
assertEquals(1, testEvents.failed().count(), "# tests failed");
250250

251251
// @formatter:off
252-
assertEquals(asList(
253-
"fooBeforeEachCallback",
252+
assertEquals(callSequence, asList(
253+
"fooBeforeEachCallback",
254254
"beforeEachMethod",
255-
"test",
255+
"test",
256256
"afterEachMethod", // throws an exception.
257-
"fooAfterEachCallback"
258-
), callSequence, "wrong call sequence");
257+
"fooAfterEachCallback"
258+
), "wrong call sequence");
259259
// @formatter:on
260260

261261
assertThat(actualExceptionInAfterEachCallback).containsInstanceOf(EnigmaException.class);
@@ -272,13 +272,13 @@ void testMethodThrowsAnException() {
272272
assertEquals(1, testEvents.failed().count(), "# tests failed");
273273

274274
// @formatter:off
275-
assertEquals(asList(
276-
"fooBeforeEachCallback",
275+
assertEquals(callSequence, asList(
276+
"fooBeforeEachCallback",
277277
"beforeEachMethod",
278-
"test", // throws an exception.
278+
"test", // throws an exception.
279279
"afterEachMethod",
280-
"fooAfterEachCallback"
281-
), callSequence, "wrong call sequence");
280+
"fooAfterEachCallback"
281+
), "wrong call sequence");
282282
// @formatter:on
283283

284284
assertThat(actualExceptionInAfterEachCallback).containsInstanceOf(EnigmaException.class);

0 commit comments

Comments
 (0)