Fix the bug that run tests from workspace folder will run all the tes…

…ts in the workspace (#542)
microsoft · Dec 26, 2018 · 810605c · 810605c
1 parent 367a422
commit 810605c
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/...t.java.test.plugin/src/main/java/com/microsoft/java/test/plugin/util/TestSearchUtils.java b/...t.java.test.plugin/src/main/java/com/microsoft/java/test/plugin/util/TestSearchUtils.java
@@ -153,9 +153,10 @@ public static List<TestItem> searchTestItems(List<Object> arguments, IProgressMo
      * @throws CoreException
      * @throws OperationCanceledException
      * @throws InterruptedException
+     * @throws URISyntaxException
      */
     public static List<TestItem> searchAllTestItems(List<Object> arguments, IProgressMonitor monitor)
-            throws CoreException, OperationCanceledException, InterruptedException {
+            throws CoreException, OperationCanceledException, InterruptedException, URISyntaxException {
         final List<TestItem> searchResult = new LinkedList<>();
 
         if (arguments == null || arguments.size() == 0) {
@@ -228,17 +229,17 @@ private static boolean isInTestScope(IJavaElement element) throws JavaModelExcep
         return false;
     }
 
-    private static IJavaSearchScope createSearchScope(SearchTestItemParams params) throws JavaModelException {
+    private static IJavaSearchScope createSearchScope(SearchTestItemParams params)
+            throws JavaModelException, URISyntaxException {
         switch (params.getLevel()) {
             case ROOT:
                 final IJavaProject[] projects = JavaCore.create(ResourcesPlugin.getWorkspace().getRoot())
                         .getJavaProjects();
                 return SearchEngine.createJavaSearchScope(projects, IJavaSearchScope.SOURCES);
             case FOLDER:
-
-                final IJavaProject[] javaProjects = JavaCore.create(JDTUtils.findFolder(params.getUri())).getJavaModel()
-                        .getJavaProjects();
-                return SearchEngine.createJavaSearchScope(javaProjects, IJavaSearchScope.SOURCES);
+                final Set<IJavaProject> projectSet = ProjectUtils.parseProjects(new URI(params.getUri()));
+                return SearchEngine.createJavaSearchScope(projectSet.toArray(new IJavaElement[projectSet.size()]),
+                        IJavaSearchScope.SOURCES);
             case PACKAGE:
                 final IJavaElement packageElement = JDTUtils.resolvePackage(params.getUri());
                 return SearchEngine.createJavaSearchScope(new IJavaElement[] { packageElement },