Skip to content

fix: identify naming in junit #1847

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

Merged
wenytang-ms merged 2 commits into from
Mar 6, 2026
Merged

fix: identify naming in junit #1847

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4713760
fix: identify naming in junit
wenytang-ms Mar 5, 2026
52d7618
fix: update
wenytang-ms Mar 6, 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
19 changes: 16 additions & 3 deletions ...t.java.test.plugin/src/main/java/com/microsoft/java/test/plugin/util/TestSearchUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -223,14 +224,26 @@ public static List<JavaTestItem> findTestPackagesAndTypes(List<Object> arguments
}
}

final List<JavaTestItem> result = new LinkedList<>();
// Merge packages that share the same ID (e.g. same package name across different source sets)
final Map<String, JavaTestItem> mergedPackages = new LinkedHashMap<>();
for (final JavaTestItem item : testItemMapping.values()) {
if (item.getTestLevel() == TestLevel.PACKAGE) {
result.add(item);
final JavaTestItem existing = mergedPackages.get(item.getId());
if (existing != null) {
if (item.getChildren() != null) {
for (final JavaTestItem child : item.getChildren()) {
if (existing.getChildren() == null || !existing.getChildren().contains(child)) {
existing.addChild(child);
}
}
}
} else {
mergedPackages.put(item.getId(), item);
}
}
}

return result;
return new LinkedList<>(mergedPackages.values());
}

/**
Expand Down