correct handling execution of tests if multiple paths are specified

Author: d-biehl

CHANGELOG.md

@@ -4,7 +4,9 @@ All notable changes to the "robotcode" extension will be documented in this file
 
 ## [Unreleased]
 
-- none so far
+### added
+- Introduce setting `robotcode.robot.paths` and correspondend launch config property `paths`
+  - Specifies the paths where robot/robotcode should discover test suites. Corresponds to the 'paths' option of robot
 
 ##  0.9.6
 
@@ -45,8 +47,6 @@ All notable changes to the "robotcode" extension will be documented in this file
 
 ### added
 
-- Introduce setting `robotcode.robot.paths` and correspondend launch config property `paths`
-  - Specifies the paths where robot/robotcode should discover test suites. Corresponds to the 'paths' option of robot
 - Introduce setting `robotcode.robot.variableFiles` and correspondend launch config property `variableFiles`
   - Specifies the variable files for robotframework. Corresponds to the '--variablefile' option of robot.
 - Rework debugger termination

vscode-client/debugmanager.ts

@@ -347,12 +347,18 @@ export class DebugManager {
     excluded: string[],
     runId?: string,
     options?: vscode.DebugSessionOptions,
-    dryRun?: boolean
+    dryRun?: boolean,
+    topLevelSuiteName?: string
   ): Promise<void> {
     const config = vscode.workspace.getConfiguration(CONFIG_SECTION, folder);
 
     const args = [];
 
+    if (topLevelSuiteName) {
+      args.push("--name");
+      args.push(topLevelSuiteName);
+    }
+
     for (const s of suites) {
       args.push("--suite");
       args.push(s);

vscode-client/testcontrollermanager.ts

@@ -659,7 +659,12 @@ export class TestControllerManager {
         };
       }
 
-      const workspaceItem = this.findTestItemByUri(workspace.uri.toString());
+      let workspaceItem = this.findTestItemByUri(workspace.uri.toString());
+      const workspaceRobotItem = workspaceItem ? this.findRobotItem(workspaceItem) : undefined;
+
+      if (workspaceRobotItem?.type == "workspace" && workspaceRobotItem.children?.length) {
+        workspaceItem = workspaceItem?.children.get(workspaceRobotItem.children[0].id);
+      }
 
       if (includedItems.length === 1 && includedItems[0] === workspaceItem && excluded.size === 0) {
         await DebugManager.runTests(workspace, [], [], [], runId, options, dryRun);
@@ -686,7 +691,23 @@ export class TestControllerManager {
             if (longname) suites.add(longname);
           }
         }
-        await DebugManager.runTests(workspace, Array.from(suites), includedInWs, excludedInWs, runId, options, dryRun);
+
+        let suiteName: string | undefined = undefined;
+
+        if (workspaceRobotItem?.type == "workspace" && workspaceRobotItem.children?.length) {
+          suiteName = workspaceRobotItem.children[0].longname;
+        }
+
+        await DebugManager.runTests(
+          workspace,
+          Array.from(suites),
+          includedInWs,
+          excludedInWs,
+          runId,
+          options,
+          dryRun,
+          suiteName
+        );
       }
     }
   }