Use proper AssertJ assertions

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

@@ -179,9 +179,9 @@ void sourceUriIsReturnedWhenSupplied() {
 		URI containerSourceUri = URI.create("other://container");
 		DynamicContainer container = dynamicContainer("bar", containerSourceUri, Stream.of(test));
 
-		assertThat(test.getTestSourceUri().get()).isSameAs(testSourceUri);
+		assertThat(test.getTestSourceUri()).containsSame(testSourceUri);
 		assertThat(test.toString()).isEqualTo("DynamicTest [displayName = 'foo', testSourceUri = any://test]");
-		assertThat(container.getTestSourceUri().get()).isSameAs(containerSourceUri);
+		assertThat(container.getTestSourceUri()).containsSame(containerSourceUri);
 		assertThat(container.toString()).isEqualTo(
 			"DynamicContainer [displayName = 'bar', testSourceUri = other://container]");
 	}

junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolverTests.java

@@ -450,9 +450,9 @@ void packageResolutionUsingDefaultPackage() throws Exception {
 		resolve(request().selectors(selectPackage("")));
 
 		// 150 is completely arbitrary. The actual number is likely much higher.
-		assertThat(engineDescriptor.getDescendants().size())//
+		assertThat(engineDescriptor.getDescendants())//
 				.describedAs("Too few test descriptors in classpath")//
-				.isGreaterThan(150);
+				.hasSizeGreaterThan(150);
 
 		List<UniqueId> uniqueIds = uniqueIds();
 		assertThat(uniqueIds)//
@@ -474,9 +474,9 @@ void classpathResolution() throws Exception {
 		resolve(request().selectors(selectors));
 
 		// 150 is completely arbitrary. The actual number is likely much higher.
-		assertThat(engineDescriptor.getDescendants().size())//
+		assertThat(engineDescriptor.getDescendants())//
 				.describedAs("Too few test descriptors in classpath")//
-				.isGreaterThan(150);
+				.hasSizeGreaterThan(150);
 
 		List<UniqueId> uniqueIds = uniqueIds();
 		assertThat(uniqueIds)//

junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TempDirectoryPerDeclarationTests.java

@@ -111,19 +111,19 @@ Stream<DynamicTest> resolvesSeparateTempDirsForEachAnnotationDeclaration() {
 					"instanceField2", "beforeEach1", "beforeEach2", "test1", "test2", "afterEach1", "afterEach2");
 				assertThat(testBTempDirs.values()).hasSize(10).doesNotHaveDuplicates();
 
-				assertThat(testATempDirs.get("staticField1")).isEqualTo(classTempDirs.get("staticField1"));
-				assertThat(testBTempDirs.get("staticField1")).isEqualTo(classTempDirs.get("staticField1"));
-				assertThat(testATempDirs.get("staticField2")).isEqualTo(classTempDirs.get("staticField2"));
-				assertThat(testBTempDirs.get("staticField2")).isEqualTo(classTempDirs.get("staticField2"));
-
-				assertThat(testATempDirs.get("instanceField1")).isNotEqualTo(testBTempDirs.get("instanceField1"));
-				assertThat(testATempDirs.get("instanceField2")).isNotEqualTo(testBTempDirs.get("instanceField2"));
-				assertThat(testATempDirs.get("beforeEach1")).isNotEqualTo(testBTempDirs.get("beforeEach1"));
-				assertThat(testATempDirs.get("beforeEach2")).isNotEqualTo(testBTempDirs.get("beforeEach2"));
-				assertThat(testATempDirs.get("test1")).isNotEqualTo(testBTempDirs.get("test1"));
-				assertThat(testATempDirs.get("test2")).isNotEqualTo(testBTempDirs.get("test2"));
-				assertThat(testATempDirs.get("afterEach1")).isNotEqualTo(testBTempDirs.get("afterEach1"));
-				assertThat(testATempDirs.get("afterEach2")).isNotEqualTo(testBTempDirs.get("afterEach2"));
+				assertThat(testATempDirs).containsEntry("staticField1", classTempDirs.get("staticField1"));
+				assertThat(testBTempDirs).containsEntry("staticField1", classTempDirs.get("staticField1"));
+				assertThat(testATempDirs).containsEntry("staticField2", classTempDirs.get("staticField2"));
+				assertThat(testBTempDirs).containsEntry("staticField2", classTempDirs.get("staticField2"));
+
+				assertThat(testATempDirs).doesNotContainEntry("instanceField1", testBTempDirs.get("instanceField1"));
+				assertThat(testATempDirs).doesNotContainEntry("instanceField2", testBTempDirs.get("instanceField2"));
+				assertThat(testATempDirs).doesNotContainEntry("beforeEach1", testBTempDirs.get("beforeEach1"));
+				assertThat(testATempDirs).doesNotContainEntry("beforeEach2", testBTempDirs.get("beforeEach2"));
+				assertThat(testATempDirs).doesNotContainEntry("test1", testBTempDirs.get("test1"));
+				assertThat(testATempDirs).doesNotContainEntry("test2", testBTempDirs.get("test2"));
+				assertThat(testATempDirs).doesNotContainEntry("afterEach1", testBTempDirs.get("afterEach1"));
+				assertThat(testATempDirs).doesNotContainEntry("afterEach2", testBTempDirs.get("afterEach2"));
 			}));
 	}
 

junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/TimeoutConfigurationTests.java

@@ -139,7 +139,7 @@ void logsInvalidValues(LogRecordListener logRecordListener) {
 	void specificThreadModeIsUsed() {
 		when(extensionContext.getConfigurationParameter(DEFAULT_TIMEOUT_THREAD_MODE_PROPERTY_NAME)).thenReturn(
 			Optional.of("SEPARATE_THREAD"));
-		assertThat(config.getDefaultTimeoutThreadMode()).isEqualTo(Optional.of(SEPARATE_THREAD));
+		assertThat(config.getDefaultTimeoutThreadMode()).contains(SEPARATE_THREAD);
 	}
 
 	@Test
@@ -148,7 +148,7 @@ void logsInvalidThreadModeValueAndReturnEmpty(LogRecordListener logRecordListene
 		when(extensionContext.getConfigurationParameter(DEFAULT_TIMEOUT_THREAD_MODE_PROPERTY_NAME)).thenReturn(
 			Optional.of("invalid"));
 
-		assertThat(config.getDefaultTimeoutThreadMode()).isEqualTo(Optional.empty());
+		assertThat(config.getDefaultTimeoutThreadMode()).isNotPresent();
 		assertThat(logRecordListener.stream(Level.WARNING).map(LogRecord::getMessage)) //
 				.containsExactly(
 					"Invalid timeout thread mode 'invalid' set via the 'junit.jupiter.execution.timeout.thread.mode.default' configuration parameter.");

platform-tests/src/test/java/org/junit/platform/AbstractEqualsAndHashCodeTests.java

@@ -26,7 +26,7 @@ protected final <T> void assertEqualsAndHashCode(T equal1, T equal2, T different
 		assertThat(different).isNotNull();
 
 		assertThat(equal1).isNotSameAs(equal2);
-		assertThat(equal1).isNotEqualTo(null);
+		assertThat(equal1).isNotNull();
 		assertThat(equal1).isNotEqualTo(new Object());
 		assertThat(equal1).isNotEqualTo(different);
 		assertThat(different).isNotEqualTo(equal1);

platform-tests/src/test/java/org/junit/platform/commons/util/ClasspathScannerTests.java

@@ -123,7 +123,7 @@ void scanForClassesInClasspathRootWhenGenericRuntimeExceptionOccurs(LogRecordLis
 	private void assertClassesScannedWhenExceptionIsThrown(Predicate<Class<?>> filter) throws Exception {
 		var classFilter = ClassFilter.of(filter);
 		var classes = this.classpathScanner.scanForClassesInClasspathRoot(getTestClasspathRoot(), classFilter);
-		assertThat(classes.size()).isGreaterThanOrEqualTo(150);
+		assertThat(classes).hasSizeGreaterThanOrEqualTo(150);
 	}
 
 	private void assertDebugMessageLogged(LogRecordListener listener, String regex) {
@@ -177,7 +177,7 @@ private void scanForClassesInClasspathRootWithinJarFile(String resourceName) thr
 	@Test
 	void scanForClassesInPackage() {
 		var classes = classpathScanner.scanForClassesInPackage("org.junit.platform.commons", allClasses);
-		assertThat(classes.size()).isGreaterThanOrEqualTo(20);
+		assertThat(classes).hasSizeGreaterThanOrEqualTo(20);
 		assertTrue(classes.contains(NestedClassToBeFound.class));
 		assertTrue(classes.contains(MemberClassToBeFound.class));
 	}
@@ -253,7 +253,7 @@ void scanForClassesInDefaultPackage() {
 		var classFilter = ClassFilter.of(this::inDefaultPackage);
 		var classes = classpathScanner.scanForClassesInPackage("", classFilter);
 
-		assertThat(classes.size()).as("number of classes found in default package").isGreaterThanOrEqualTo(1);
+		assertThat(classes).as("number of classes found in default package").isNotEmpty();
 		assertTrue(classes.stream().allMatch(this::inDefaultPackage));
 		assertTrue(classes.stream().anyMatch(clazz -> "DefaultPackageTestCase".equals(clazz.getName())));
 	}
@@ -345,7 +345,7 @@ void findAllClassesInClasspathRootWithFilter() throws Exception {
 		var root = getTestClasspathRoot();
 		var classes = classpathScanner.scanForClassesInClasspathRoot(root, allClasses);
 
-		assertThat(classes.size()).isGreaterThanOrEqualTo(20);
+		assertThat(classes).hasSizeGreaterThanOrEqualTo(20);
 		assertTrue(classes.contains(ClasspathScannerTests.class));
 	}
 

platform-tests/src/test/java/org/junit/platform/console/tasks/DiscoveryRequestCreatorTests.java

@@ -269,7 +269,7 @@ void propagatesMethodSelectors() {
 		assertThat(methodSelectors).hasSize(2);
 		assertThat(methodSelectors.get(0).getClassName()).isEqualTo("com.acme.Foo");
 		assertThat(methodSelectors.get(0).getMethodName()).isEqualTo("m");
-		assertThat(methodSelectors.get(0).getMethodParameterTypes()).isEqualTo("");
+		assertThat(methodSelectors.get(0).getMethodParameterTypes()).isEmpty();
 		assertThat(methodSelectors.get(1).getClassName()).isEqualTo("com.example.Bar");
 		assertThat(methodSelectors.get(1).getMethodName()).isEqualTo("method");
 		assertThat(methodSelectors.get(1).getMethodParameterTypes()).isEqualTo("java.lang.Object");

platform-tests/src/test/java/org/junit/platform/console/tasks/TreeNodeTests.java

@@ -51,7 +51,7 @@ void childrenCanBeAddedConcurrently() throws Exception {
 			}
 		});
 
-		assertThat(treeNode.children.size()).isEqualTo(NUM_THREADS * ITEMS_PER_THREAD);
+		assertThat(treeNode.children).hasSize(NUM_THREADS * ITEMS_PER_THREAD);
 	}
 
 	@Test
@@ -64,7 +64,7 @@ void reportEntriesCanBeAddedConcurrently() throws Exception {
 			}
 		});
 
-		assertThat(treeNode.reports.size()).isEqualTo(NUM_THREADS * ITEMS_PER_THREAD);
+		assertThat(treeNode.reports).hasSize(NUM_THREADS * ITEMS_PER_THREAD);
 	}
 
 	private void runConcurrently(Runnable action) throws InterruptedException {

platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/CompositeTestSourceTests.java

@@ -53,12 +53,12 @@ void createCompositeTestSourceFromClassAndFileSources() {
 		var sources = new ArrayList<>(List.of(fileSource, classSource));
 		var compositeTestSource = CompositeTestSource.from(sources);
 
-		assertThat(compositeTestSource.getSources().size()).isEqualTo(2);
+		assertThat(compositeTestSource.getSources()).hasSize(2);
 		assertThat(compositeTestSource.getSources()).contains(fileSource, classSource);
 
 		// Ensure the supplied sources list was defensively copied.
 		sources.remove(1);
-		assertThat(compositeTestSource.getSources().size()).isEqualTo(2);
+		assertThat(compositeTestSource.getSources()).hasSize(2);
 
 		// Ensure the returned sources list is immutable.
 		assertThrows(UnsupportedOperationException.class, () -> compositeTestSource.getSources().add(fileSource));

platform-tests/src/test/java/org/junit/platform/launcher/TagFilterTests.java

@@ -172,12 +172,12 @@ private void excludeSingleTag(PostDiscoveryFilter filter) {
 
 	private void assertIncluded(FilterResult filterResult, String expectedReason) {
 		assertTrue(filterResult.included());
-		assertThat(filterResult.getReason()).isPresent().contains(expectedReason);
+		assertThat(filterResult.getReason()).contains(expectedReason);
 	}
 
 	private void assertExcluded(FilterResult filterResult, String expectedReason) {
 		assertTrue(filterResult.excluded());
-		assertThat(filterResult.getReason()).isPresent().contains(expectedReason);
+		assertThat(filterResult.getReason()).contains(expectedReason);
 	}
 
 	// -------------------------------------------------------------------------

platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherTests.java

@@ -403,7 +403,7 @@ void withoutConfigurationParameters_LauncherPassesEmptyConfigurationParametersIn
 		launcher.execute(request().build());
 
 		var configurationParameters = engine.requestForExecution.getConfigurationParameters();
-		assertThat(configurationParameters.get("key").isPresent()).isFalse();
+		assertThat(configurationParameters.get("key")).isNotPresent();
 		assertThat(configurationParameters.size()).isEqualTo(0);
 	}
 
@@ -417,8 +417,8 @@ void withConfigurationParameters_LauncherPassesPopulatedConfigurationParametersI
 
 		var configurationParameters = engine.requestForExecution.getConfigurationParameters();
 		assertThat(configurationParameters.size()).isEqualTo(1);
-		assertThat(configurationParameters.get("key").isPresent()).isTrue();
-		assertThat(configurationParameters.get("key").get()).isEqualTo("value");
+		assertThat(configurationParameters.get("key")).isPresent();
+		assertThat(configurationParameters.get("key")).contains("value");
 	}
 
 	@Test