Avoid reporting discovery warnings for abstract inner classes with tests

marcphilipp · marcphilipp · commit deb3e7c6487c · 2025-06-24T10:10:38.000+02:00
While aee7c88 fixed the issue when nested classes were discovered via `NestedClassSelector` or their parent class, passing a `ClassSelector` for them still caused a warning. Fixes #4635. (cherry picked from commit 4305ad8)
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/TestClassPredicates.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/predicates/TestClassPredicates.java
@@ -63,7 +63,7 @@ public TestClassPredicates(DiscoveryIssueReporter issueReporter) {
 				.and(isInner(issueReporter));
 		this.isValidStandaloneTestClass = isNotPrivateUnlessAbstract("Test", issueReporter) //
 				.and(isNotLocal(issueReporter)) //
-				.and(isNotInner(issueReporter)) // or should be annotated with @Nested!
+				.and(isNotInnerUnlessAbstract(issueReporter)) //
 				.and(isNotAnonymous(issueReporter));
 	}
 
@@ -127,8 +127,8 @@ private static Condition<Class<?>> isInner(DiscoveryIssueReporter issueReporter)
 		});
 	}
 
-	private static Condition<Class<?>> isNotInner(DiscoveryIssueReporter issueReporter) {
-		return issueReporter.createReportingCondition(testClass -> !isInnerClass(testClass),
+	private static Condition<Class<?>> isNotInnerUnlessAbstract(DiscoveryIssueReporter issueReporter) {
+		return issueReporter.createReportingCondition(testClass -> !isInnerClass(testClass) || isAbstract(testClass),
 			testClass -> createIssue("Test", testClass, "must not be an inner class unless annotated with @Nested"));
 	}
 
diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/engine/NestedTestClassesTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/engine/NestedTestClassesTests.java
@@ -231,12 +231,20 @@ void individualMethodsWithinRecursiveNestedTestClassHierarchiesAreExecuted() {
 	}
 
 	@Test
-	void doesNotReportDiscoveryIssueForAbstractInnerClass() {
+	void doesNotReportDiscoveryIssueForClassWithAbstractInnerClass() {
 		var discoveryIssues = discoverTestsForClass(ConcreteWithExtendedInnerClassTestCase.class).getDiscoveryIssues();
 
 		assertThat(discoveryIssues).isEmpty();
 	}
 
+	@Test
+	void doesNotReportDiscoveryIssueForAbstractInnerClass() {
+		var discoveryIssues = discoverTestsForClass(
+			AbstractBaseWithInnerClassTestCase.AbstractInnerClass.class).getDiscoveryIssues();
+
+		assertThat(discoveryIssues).isEmpty();
+	}
+
 	private void assertNestedCycle(Class<?> start, Class<?> from, Class<?> to) {
 		var results = executeTestsForClass(start);
 		var expectedMessage = String.format(

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public TestClassPredicates(DiscoveryIssueReporter issueReporter) {`
`63`	`63`	`.and(isInner(issueReporter));`
`64`	`64`	`this.isValidStandaloneTestClass = isNotPrivateUnlessAbstract("Test", issueReporter) //`
`65`	`65`	`.and(isNotLocal(issueReporter)) //`
`66`		`- .and(isNotInner(issueReporter)) // or should be annotated with @Nested!`
	`66`	`+ .and(isNotInnerUnlessAbstract(issueReporter)) //`
`67`	`67`	`.and(isNotAnonymous(issueReporter));`
`68`	`68`	`}`
`69`	`69`
`@@ -127,8 +127,8 @@ private static Condition<Class<?>> isInner(DiscoveryIssueReporter issueReporter)`
`127`	`127`	`});`
`128`	`128`	`}`
`129`	`129`
`130`		`- private static Condition<Class<?>> isNotInner(DiscoveryIssueReporter issueReporter) {`
`131`		`- return issueReporter.createReportingCondition(testClass -> !isInnerClass(testClass),`
	`130`	`+ private static Condition<Class<?>> isNotInnerUnlessAbstract(DiscoveryIssueReporter issueReporter) {`
	`131`	`+ return issueReporter.createReportingCondition(testClass -> !isInnerClass(testClass) \|\| isAbstract(testClass),`
`132`	`132`	`testClass -> createIssue("Test", testClass, "must not be an inner class unless annotated with @Nested"));`
`133`	`133`	`}`
`134`	`134`