Skip to content

[Issue-3380] Send sourceQualifiedName to forked clients (#3380) #3381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fabriciorby wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[Issue-3380] Send sourceQualifiedName to forked clients (#3380) #3381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
219c14b
[Issue-3380] Send sourceQualifiedName to forked clients (#3380)
fabriciorby Jun 19, 2026
62c5f5d
[Issue-3380] Add integration tests
fabriciorby Jun 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ public void handle(TestSetReportEntry reportEntry) {
reportEntry.getTestRunId(),
reportEntry.getSourceName(),
reportEntry.getSourceText(),
reportEntry.getSourceQualifiedName(),
reportEntry.getName(),
reportEntry.getNameText(),
reportEntry.getGroup(),
Expand Down
5 changes: 5 additions & 0 deletions ...fire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,11 @@ public String getSourceText() {
return original.getSourceText();
}

@Override
public String getSourceQualifiedName() {
return getSourceQualifiedName(null);
}

@Override
public String getName() {
return original.getName();
Expand Down
37 changes: 21 additions & 16 deletions maven-surefire-common/src/main/java/org/apache/maven/surefire/stream/EventDecoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ public class EventDecoder extends AbstractStreamDecoder<Event, ForkedProcessEven
DATA_STRING,
DATA_STRING,
DATA_STRING,
DATA_STRING,
DATA_INTEGER,
DATA_STRING,
DATA_STRING,
Expand Down Expand Up @@ -272,28 +273,28 @@ protected final Event toMessage(@Nonnull ForkedProcessEventType eventType, @Nonn
return new SystemPropertyEvent(
memento.ofDataAt(0), memento.ofDataAt(1), memento.ofDataAt(2), memento.ofDataAt(3));
case BOOTERCODE_TESTSET_STARTING:
checkArguments(memento, 12);
checkArguments(memento, 13);
return new TestsetStartingEvent(toReportEntry(memento.getData()));
case BOOTERCODE_TESTSET_COMPLETED:
checkArguments(memento, 12);
checkArguments(memento, 13);
return new TestsetCompletedEvent(toReportEntry(memento.getData()));
case BOOTERCODE_TEST_STARTING:
checkArguments(memento, 12);
checkArguments(memento, 13);
return new TestStartingEvent(toReportEntry(memento.getData()));
case BOOTERCODE_TEST_SUCCEEDED:
checkArguments(memento, 12);
checkArguments(memento, 13);
return new TestSucceededEvent(toReportEntry(memento.getData()));
case BOOTERCODE_TEST_FAILED:
checkArguments(memento, 12);
checkArguments(memento, 13);
return new TestFailedEvent(toReportEntry(memento.getData()));
case BOOTERCODE_TEST_SKIPPED:
checkArguments(memento, 12);
checkArguments(memento, 13);
return new TestSkippedEvent(toReportEntry(memento.getData()));
case BOOTERCODE_TEST_ERROR:
checkArguments(memento, 12);
checkArguments(memento, 13);
return new TestErrorEvent(toReportEntry(memento.getData()));
case BOOTERCODE_TEST_ASSUMPTIONFAILURE:
checkArguments(memento, 12);
checkArguments(memento, 13);
return new TestAssumptionFailureEvent(toReportEntry(memento.getData()));
default:
throw new IllegalArgumentException("Missing a branch for the event type " + eventType);
Expand All @@ -307,20 +308,22 @@ private static TestSetReportEntry toReportEntry(List<Object> args) {
// ReportEntry:
String source = (String) args.get(2);
String sourceText = (String) args.get(3);
String name = (String) args.get(4);
String nameText = (String) args.get(5);
String group = (String) args.get(6);
String message = (String) args.get(7);
Integer timeElapsed = (Integer) args.get(8);
String sourceQualifiedName = (String) args.get(4);
String name = (String) args.get(5);
String nameText = (String) args.get(6);
String group = (String) args.get(7);
String message = (String) args.get(8);
Integer timeElapsed = (Integer) args.get(9);
// StackTraceWriter:
String traceMessage = (String) args.get(9);
String smartTrimmedStackTrace = (String) args.get(10);
String stackTrace = (String) args.get(11);
String traceMessage = (String) args.get(10);
String smartTrimmedStackTrace = (String) args.get(11);
String stackTrace = (String) args.get(12);
return newReportEntry(
runMode,
testRunId,
source,
sourceText,
sourceQualifiedName,
name,
nameText,
group,
Expand Down Expand Up @@ -348,6 +351,7 @@ static TestSetReportEntry newReportEntry( // ReportEntry:
long testRunId,
String source,
String sourceText,
String sourceQualifiedName,
String name,
String nameText,
String group,
Expand All @@ -364,6 +368,7 @@ static TestSetReportEntry newReportEntry( // ReportEntry:
testRunId,
source,
sourceText,
sourceQualifiedName,
name,
nameText,
group,
Expand Down
Loading