From 4713760960c671c3b7d98e984f9c7783e0264be9 Mon Sep 17 00:00:00 2001 From: wenyutang-ms Date: Thu, 5 Mar 2026 17:00:16 +0800 Subject: [PATCH 1/2] fix: identify naming in junit --- .../test/plugin/util/TestSearchUtils.java | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/java-extension/com.microsoft.java.test.plugin/src/main/java/com/microsoft/java/test/plugin/util/TestSearchUtils.java b/java-extension/com.microsoft.java.test.plugin/src/main/java/com/microsoft/java/test/plugin/util/TestSearchUtils.java index 6a3ca250..52ceb2fc 100644 --- a/java-extension/com.microsoft.java.test.plugin/src/main/java/com/microsoft/java/test/plugin/util/TestSearchUtils.java +++ b/java-extension/com.microsoft.java.test.plugin/src/main/java/com/microsoft/java/test/plugin/util/TestSearchUtils.java @@ -61,6 +61,7 @@ import java.util.Collections; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.HashSet; import java.util.LinkedList; import java.util.List; @@ -223,14 +224,26 @@ public static List findTestPackagesAndTypes(List arguments } } - final List result = new LinkedList<>(); + // Merge packages that share the same ID (e.g. same package name across different source sets) + final Map 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()); } /** From 52d76182bc7095f308d0661a67f9303048c5b46c Mon Sep 17 00:00:00 2001 From: wenyutang-ms Date: Fri, 6 Mar 2026 09:47:52 +0800 Subject: [PATCH 2/2] fix: update --- .../com/microsoft/java/test/plugin/util/TestSearchUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-extension/com.microsoft.java.test.plugin/src/main/java/com/microsoft/java/test/plugin/util/TestSearchUtils.java b/java-extension/com.microsoft.java.test.plugin/src/main/java/com/microsoft/java/test/plugin/util/TestSearchUtils.java index 52ceb2fc..f8b65861 100644 --- a/java-extension/com.microsoft.java.test.plugin/src/main/java/com/microsoft/java/test/plugin/util/TestSearchUtils.java +++ b/java-extension/com.microsoft.java.test.plugin/src/main/java/com/microsoft/java/test/plugin/util/TestSearchUtils.java @@ -61,8 +61,8 @@ import java.util.Collections; import java.util.HashMap; -import java.util.LinkedHashMap; import java.util.HashSet; +import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; import java.util.Map;