[mirkoalicastro]

When rerunFailingTestsCount is used with JUnit Platform @Suite, tests from different classes that share a method name are merged under the Suite class name. It causes real failures to be misclassified as flakes. With the changes in the PR, findTopParent() now stops at engine boundaries (parents with no ClassSource), correctly attributing tests to their actual class while preserving @Nested.

• New unit test added
• Verified with the small project shared in the original issue: build correctly fails after fix

---

Following this checklist to help us incorporate your contribution quickly and easily:

• Each commit in the pull request should have a meaningful subject line and body.
• Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
• Run mvn clean install to make sure basic checks pass. A more thorough check will be performed on your pull request automatically.
• You have run the integration tests successfully (mvn -Prun-its clean install).

If your pull request is about ~20 lines of code you don't need to sign an
Individual Contributor License Agreement if you are unsure
please ask on the developers list.

To make clear that you license your contribution under
the Apache License Version 2.0, January 2004
you have to acknowledge this by using the following check-box.

• I hereby declare this contribution to be licenced under the Apache License Version 2.0, January 2004

• In any other case, please file an Apache Individual Contributor License Agreement.

[mirkoalicastro]

Hi @olamy , any chance you could have a look at this? 🙏

[mirkoalicastro]

@olamy it looks that there are some failures - unrelated to the changes. Would it be fine to proceed?

[olamy]

I have the same failure locally using

Apache Maven 3.9.15 (98b2cdbfdb5f1ac8781f537ea9acccaed7922349)
Maven home: /home/olamy/.sdkman/candidates/maven/current
Java version: 21.0.9, vendor: Eclipse Adoptium, runtime: /home/olamy/.sdkman/candidates/java/21.0.9-tem
Default locale: en_AU, platform encoding: UTF-8
OS name: "linux", version: "6.18.7-76061807-generic", arch: "amd64", family: "unix"

Output

[ERROR] Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 11.15 s <<< FAILURE! -- in org.apache.maven.surefire.its.CucumberIT
[ERROR] org.apache.maven.surefire.its.CucumberIT.simpleCucumberUsage -- Time elapsed: 11.11 s <<< ERROR!
java.lang.RuntimeException: Expecting build failure, have got none!
	at org.apache.maven.surefire.its.fixture.MavenLauncher.executeGoal(MavenLauncher.java:250)
	at org.apache.maven.surefire.its.fixture.MavenLauncher.executeTest(MavenLauncher.java:212)
	at org.apache.maven.surefire.its.CucumberIT.simpleCucumberUsage(CucumberIT.java:52)
	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
	at java.base/java.util.ArrayList.forEach(ArrayList.java:1596)
	at java.base/java.util.ArrayList.forEach(ArrayList.java:1596)

[mirkoalicastro]

Thanks @olamy. I guess I initially ran the IT with older version than 17. I fixed it and add a unit test for it.

[mirkoalicastro]

@olamy , any chance you could check now that the pipeline is green?

[Copilot]

Pull request overview

This PR fixes incorrect test attribution when rerunFailingTestsCount is used with JUnit Platform @Suite, where tests from different classes could be merged under the Suite class name (leading to real failures being misclassified as flakes). The change updates RunListenerAdapter.findTopParent() to stop traversal at nested engine boundaries inside Suites so the reported source class remains the real test class (while still falling back to the Suite class for engines that don’t expose class-level sources, e.g., Cucumber).

Changes:

• Update RunListenerAdapter.findTopParent() to stop at nested engine boundaries inside a Suite when a ClassSource is present.
• Add unit coverage simulating Suite → nested engine (Jupiter) and Suite → nested engine (Cucumber-like, no ClassSource) hierarchies.
• Update an integration test expectation to match the new XML report file naming/attribution behavior.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.

File	Description
surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/RunListenerAdapter.java	Adjusts top-parent detection to avoid attributing nested-engine tests to the enclosing Suite class when a real test class is available.
surefire-providers/surefire-junit-platform/src/test/java/org/apache/maven/surefire/junitplatform/RunListenerAdapterTest.java	Adds unit tests covering Suite-with-nested-engine attribution for both Jupiter-style and Cucumber-style hierarchies.
surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1787JUnit45IT.java	Updates the expected Surefire XML report filename/classname attribution for the JUnit 5 Suite integration scenario.

[olamy]

Is there anything less brittle than relying on this?
@sormuras any idea how to identify a node being the engine?

[sormuras]

Mh, there's no direct API like UniqueId::isEngine in https://docs.junit.org/6.1.2/api/org.junit.platform.engine/org/junit/platform/engine/UniqueId.html ... 🤔

@marcphilipp Any idea?

[sormuras]

Does this help?

testIdentifier.getUniqueIdObject().getLastSegment().isEngine()

[marcphilipp]

That should do it

[marcphilipp]

However, that API was introduced in 6.1.1. You can check for "engine".equals(segment.getType()), though, in earlier versions.