Polishing

(cherry picked from commit 757e2f4)

Author: sbrannen

junit-platform-suite-engine/src/main/java/org/junit/platform/suite/engine/SuiteTestDescriptor.java

@@ -70,14 +70,14 @@ private static Boolean getFailIfNoTests(Class<?> suiteClass) {
 
 	SuiteTestDescriptor addDiscoveryRequestFrom(Class<?> suiteClass) {
 		Preconditions.condition(launcherDiscoveryResult == null,
-			"discovery request can not be modified after discovery");
+			"discovery request cannot be modified after discovery");
 		discoveryRequestBuilder.applySelectorsAndFiltersFromSuite(suiteClass);
 		return this;
 	}
 
 	SuiteTestDescriptor addDiscoveryRequestFrom(UniqueId uniqueId) {
 		Preconditions.condition(launcherDiscoveryResult == null,
-			"discovery request can not be modified after discovery");
+			"discovery request cannot be modified after discovery");
 		discoveryRequestBuilder.selectors(DiscoverySelectors.selectUniqueId(uniqueId));
 		return this;
 	}
@@ -123,7 +123,7 @@ void execute(EngineExecutionListener parentEngineExecutionListener) {
 		parentEngineExecutionListener.executionStarted(this);
 		// #2838: The discovery result from a suite may have been filtered by
 		// post discovery filters from the launcher. The discovery result should
-		// be pruned accordingly
+		// be pruned accordingly.
 		LauncherDiscoveryResult discoveryResult = this.launcherDiscoveryResult.withRetainedEngines(
 			getChildren()::contains);
 		TestExecutionSummary summary = launcher.execute(discoveryResult, parentEngineExecutionListener);
@@ -140,8 +140,8 @@ private TestExecutionResult computeTestExecutionResult(TestExecutionSummary summ
 	@Override
 	public boolean mayRegisterTests() {
 		// While a suite will not register new tests after discovery, we pretend
-		// it does. This allows the suite to fail if not tests were discovered.
-		// If not, the empty suite would be pruned.
+		// it does. This allows the suite to fail if no tests were discovered.
+		// Otherwise, the empty suite would be pruned.
 		return true;
 	}
 

platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteEngineTests.java

@@ -126,12 +126,6 @@ void privateSuiteIsNotExecuted() {
 		// @formatter:on
 	}
 
-	@Suite
-	@SelectClasses(SingleTestTestCase.class)
-	private static class PrivateSuite {
-
-	}
-
 	@Test
 	void innerSuiteIsNotExecuted() {
 		// @formatter:off
@@ -144,13 +138,6 @@ void innerSuiteIsNotExecuted() {
 		// @formatter:on
 	}
 
-	@SuppressWarnings("InnerClassMayBeStatic")
-	@Suite
-	@SelectClasses(names = "org.junit.platform.suite.engine.testcases.SingleTestTestCase")
-	private class InnerSuite {
-
-	}
-
 	@Test
 	void nestedSuiteIsNotExecuted() {
 		// @formatter:off
@@ -436,4 +423,14 @@ void threePartCyclicSuite() {
 		// @formatter:on
 	}
 
+	@Suite
+	@SelectClasses(SingleTestTestCase.class)
+	private static class PrivateSuite {
+	}
+
+	@Suite
+	@SelectClasses(names = "org.junit.platform.suite.engine.testcases.SingleTestTestCase")
+	private class InnerSuite {
+	}
+
 }

platform-tests/src/test/java/org/junit/platform/suite/engine/SuiteTestDescriptorTests.java

@@ -10,12 +10,9 @@
 
 package org.junit.platform.suite.engine;
 
-import static java.util.Collections.emptySet;
-import static java.util.stream.Collectors.toSet;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.junit.jupiter.api.Assertions.assertAll;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Collections;
 import java.util.Optional;
@@ -37,60 +34,63 @@
  * @since 1.8
  */
 class SuiteTestDescriptorTests {
-	@Suite
-	static class TestSuite {
 
-	}
-	UniqueId engineId = UniqueId.forEngine(SuiteEngineDescriptor.ENGINE_ID);
-	UniqueId suiteId = engineId.append(SuiteTestDescriptor.SEGMENT_TYPE, "test");
-	UniqueId jupiterEngineId = suiteId.append("engine", JupiterEngineDescriptor.ENGINE_ID);
-	UniqueId testClassId = jupiterEngineId.append(ClassTestDescriptor.SEGMENT_TYPE, SingleTestTestCase.class.getName());
-	UniqueId methodId = testClassId.append(TestMethodTestDescriptor.SEGMENT_TYPE, "test()");
+	final UniqueId engineId = UniqueId.forEngine(SuiteEngineDescriptor.ENGINE_ID);
+	final UniqueId suiteId = engineId.append(SuiteTestDescriptor.SEGMENT_TYPE, "test");
+	final UniqueId jupiterEngineId = suiteId.append("engine", JupiterEngineDescriptor.ENGINE_ID);
+	final UniqueId testClassId = jupiterEngineId.append(ClassTestDescriptor.SEGMENT_TYPE,
+		SingleTestTestCase.class.getName());
+	final UniqueId methodId = testClassId.append(TestMethodTestDescriptor.SEGMENT_TYPE, "test()");
 
-	ConfigurationParameters configurationParameters = new EmptyConfigurationParameters();
-	SuiteTestDescriptor suite = new SuiteTestDescriptor(suiteId, TestSuite.class, configurationParameters);
+	final ConfigurationParameters configurationParameters = new EmptyConfigurationParameters();
+	final SuiteTestDescriptor suite = new SuiteTestDescriptor(suiteId, TestSuite.class, configurationParameters);
 
 	@Test
 	void suiteIsEmptyBeforeDiscovery() {
 		suite.addDiscoveryRequestFrom(SelectClassesSuite.class);
-		assertEquals(emptySet(), suite.getChildren());
+
+		assertThat(suite.getChildren()).isEmpty();
 	}
 
 	@Test
 	void suiteDiscoversTestsFromClass() {
 		suite.addDiscoveryRequestFrom(SelectClassesSuite.class);
 		suite.discover();
-		assertEquals(Set.of(jupiterEngineId, testClassId, methodId),
-			suite.getDescendants().stream().map(TestDescriptor::getUniqueId).collect(toSet()));
+
+		assertThat(suite.getDescendants()).map(TestDescriptor::getUniqueId)//
+				.containsExactly(jupiterEngineId, testClassId, methodId);
 	}
 
 	@Test
 	void suitDiscoversTestsFromUniqueId() {
 		suite.addDiscoveryRequestFrom(methodId);
 		suite.discover();
-		assertEquals(Set.of(jupiterEngineId, testClassId, methodId),
-			suite.getDescendants().stream().map(TestDescriptor::getUniqueId).collect(toSet()));
+
+		assertThat(suite.getDescendants()).map(TestDescriptor::getUniqueId)//
+				.containsExactly(jupiterEngineId, testClassId, methodId);
 	}
 
 	@Test
 	void discoveryPlanCanNotBeModifiedAfterDiscovery() {
 		suite.addDiscoveryRequestFrom(SelectClassesSuite.class);
 		suite.discover();
-		assertAll(() -> {
-			PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
-				() -> suite.addDiscoveryRequestFrom(SelectClassesSuite.class));
-			assertEquals("discovery request can not be modified after discovery", exception.getMessage());
-
-		}, () -> {
-			PreconditionViolationException exception = assertThrows(PreconditionViolationException.class,
-				() -> suite.addDiscoveryRequestFrom(methodId));
-			assertEquals("discovery request can not be modified after discovery", exception.getMessage());
-		});
+
+		assertAll(//
+			() -> assertThatExceptionOfType(PreconditionViolationException.class)//
+					.isThrownBy(() -> suite.addDiscoveryRequestFrom(SelectClassesSuite.class))//
+					.withMessage("discovery request cannot be modified after discovery"),
+			() -> assertThatExceptionOfType(PreconditionViolationException.class)//
+					.isThrownBy(() -> suite.addDiscoveryRequestFrom(methodId))//
+					.withMessage("discovery request cannot be modified after discovery"));
 	}
 
 	@Test
 	void suiteMayRegisterTests() {
-		assertTrue(suite.mayRegisterTests());
+		assertThat(suite.mayRegisterTests()).isTrue();
+	}
+
+	@Suite
+	static class TestSuite {
 	}
 
 	private static class EmptyConfigurationParameters implements ConfigurationParameters {