Polishing

Author: marcphilipp

documentation/src/test/java/example/DynamicTestsDemo.java

@@ -97,7 +97,7 @@ Stream<DynamicTest> dynamicTestsFromStream() {
 	Stream<DynamicTest> dynamicTestsFromIntStream() {
 		// Generates tests for the first 10 even integers.
 		return IntStream.iterate(0, n -> n + 2).limit(10)
-			.mapToObj(n -> dynamicTest("test" + n, () -> assertTrue(n % 2 == 0)));
+			.mapToObj(n -> dynamicTest("test" + n, () -> assertEquals(0, n % 2)));
 	}
 
 	@TestFactory

documentation/src/test/java/example/defaultmethods/EqualsContract.java

@@ -11,7 +11,6 @@
 package example.defaultmethods;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 import org.junit.jupiter.api.Test;
@@ -30,7 +29,7 @@ default void valueEqualsItself() {
 	@Test
 	default void valueDoesNotEqualNull() {
 		T value = createValue();
-		assertFalse(value.equals(null));
+		assertNotEquals(null, value);
 	}
 
 	@Test

junit-jupiter-api/src/main/java/org/junit/jupiter/api/io/CleanupMode.java

@@ -48,6 +48,6 @@ public enum CleanupMode {
 	/**
 	 * Never clean up a temporary directory after the test has completed.
 	 */
-	NEVER;
+	NEVER
 
 }

junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertAllAssertionsTests.java

@@ -19,6 +19,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -102,8 +103,8 @@ void assertAllWithExecutablesThatThrowAssertionErrors() {
 		// @formatter:off
 		MultipleFailuresError multipleFailuresError = assertThrows(MultipleFailuresError.class, () ->
 			assertAll(
-				() -> assertFalse(true),
-				() -> assertFalse(true)
+				() -> fail(),
+				() -> fail()
 			)
 		);
 		// @formatter:on
@@ -116,8 +117,8 @@ void assertAllWithCollectionOfExecutablesThatThrowAssertionErrors() {
 		// @formatter:off
 		MultipleFailuresError multipleFailuresError = assertThrows(MultipleFailuresError.class, () ->
 			assertAll(asList(
-				() -> assertFalse(true),
-				() -> assertFalse(true)
+				() -> fail(),
+				() -> fail()
 			))
 		);
 		// @formatter:on
@@ -130,8 +131,8 @@ void assertAllWithStreamOfExecutablesThatThrowAssertionErrors() {
 		// @formatter:off
 		MultipleFailuresError multipleFailuresError = assertThrows(MultipleFailuresError.class, () ->
 			assertAll(Stream.of(
-				() -> assertFalse(true),
-				() -> assertFalse(true)
+				() -> fail(),
+				() -> fail()
 			))
 		);
 		// @formatter:on

junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertArrayEqualsAssertionsTests.java

@@ -27,14 +27,14 @@ class AssertArrayEqualsAssertionsTests {
 
 	@Test
 	void assertArrayEqualsWithNulls() {
-		assertArrayEquals((boolean[]) null, (boolean[]) null);
-		assertArrayEquals((char[]) null, (char[]) null);
-		assertArrayEquals((byte[]) null, (byte[]) null);
-		assertArrayEquals((int[]) null, (int[]) null);
-		assertArrayEquals((long[]) null, (long[]) null);
-		assertArrayEquals((float[]) null, (float[]) null);
-		assertArrayEquals((double[]) null, (double[]) null);
-		assertArrayEquals((Object[]) null, (Object[]) null);
+		assertArrayEquals(null, (boolean[]) null);
+		assertArrayEquals(null, (char[]) null);
+		assertArrayEquals(null, (byte[]) null);
+		assertArrayEquals(null, (int[]) null);
+		assertArrayEquals(null, (long[]) null);
+		assertArrayEquals(null, (float[]) null);
+		assertArrayEquals(null, (double[]) null);
+		assertArrayEquals(null, (Object[]) null);
 	}
 
 	@Test

junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertDoesNotThrowAssertionsTests.java

@@ -73,7 +73,7 @@ void assertDoesNotThrowWithMethodReferenceForVoidReturnType() {
 		assertDoesNotThrow(foo::normalMethod);
 
 		// Explicitly as an Executable
-		assertDoesNotThrow((Executable) foo::normalMethod);
+		assertDoesNotThrow(foo::normalMethod);
 		assertDoesNotThrow((Executable) foo::overloaded);
 	}
 
@@ -152,7 +152,7 @@ void assertDoesNotThrowWithExecutableThatThrowsARuntimeExceptionWithMessage() {
 	@Test
 	void assertDoesNotThrowWithExecutableThatThrowsAnError() {
 		try {
-			assertDoesNotThrow((Executable) AssertionTestUtils::recurseIndefinitely);
+			assertDoesNotThrow(AssertionTestUtils::recurseIndefinitely);
 			expectAssertionFailedError();
 		}
 		catch (AssertionFailedError ex) {

junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertLinesMatchAssertionsTests.java

@@ -97,7 +97,7 @@ void assertLinesMatchUsingFastForwardMarkerWithLimit3() {
 	@Test
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	void assertLinesMatchWithNullFails() {
-		assertThrows(PreconditionViolationException.class, () -> assertLinesMatch((List) null, (List) null));
+		assertThrows(PreconditionViolationException.class, () -> assertLinesMatch(null, (List) null));
 		assertThrows(PreconditionViolationException.class, () -> assertLinesMatch(null, Collections.emptyList()));
 		assertThrows(PreconditionViolationException.class, () -> assertLinesMatch(Collections.emptyList(), null));
 	}

junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssumptionsTests.java

@@ -11,9 +11,9 @@
 package org.junit.jupiter.api;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assumptions.abort;
 import static org.junit.jupiter.api.Assumptions.assumeFalse;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
@@ -226,7 +226,7 @@ private static void assertTestAbortedException(String expectedMessage, Executabl
 			expectTestAbortedException();
 		}
 		catch (Throwable ex) {
-			assertTrue(ex instanceof TestAbortedException);
+			assertInstanceOf(TestAbortedException.class, ex);
 			assertMessageEquals(ex, expectedMessage);
 		}
 	}

junit-jupiter-engine/src/test/java/org/junit/jupiter/api/FailAssertionsTests.java

@@ -113,7 +113,7 @@ void failWithThrowable() {
 	@Test
 	void failWithStringAndNullThrowable() {
 		try {
-			fail("message", (Throwable) null);
+			fail("message", null);
 			expectAssertionFailedError();
 		}
 		catch (AssertionFailedError ex) {
@@ -127,7 +127,7 @@ void failWithStringAndNullThrowable() {
 	@Test
 	void failWithNullStringAndThrowable() {
 		try {
-			fail((String) null, new Throwable("cause"));
+			fail(null, new Throwable("cause"));
 			expectAssertionFailedError();
 		}
 		catch (AssertionFailedError ex) {

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

@@ -12,6 +12,7 @@
 
 import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.platform.commons.util.ReflectionUtils.findMethod;
 import static org.junit.platform.commons.util.ReflectionUtils.findMethods;
@@ -83,7 +84,7 @@ protected void evaluateCondition() {
 	}
 
 	protected void assertEnabled() {
-		assertTrue(!this.result.isDisabled(), "Should be enabled");
+		assertFalse(this.result.isDisabled(), "Should be enabled");
 	}
 
 	protected void assertDisabled() {