Initial updates

Author: gjsjohnmurray

src/extension.ts

@@ -9,8 +9,8 @@ export const extensionId = "intersystems-community.testingmanager";
 export let localTestController: vscode.TestController;
 export let loadedTestController: vscode.TestController;
 export let historyBrowserController: vscode.TestController;
-export let osAPI;
-export let smAPI;
+export let osAPI: any;
+export let smAPI: any;
 
 export interface IWebServerSpec {
     scheme?: string;
@@ -43,7 +43,7 @@ async function getServerManagerAPI(): Promise<any> {
       await targetExtension.activate();
     }
     const api = targetExtension.exports;
-  
+
     if (!api) {
       return undefined;
     }
@@ -59,7 +59,7 @@ async function getObjectScriptAPI(): Promise<any> {
       await targetExtension.activate();
     }
     const api = targetExtension.exports;
-  
+
     if (!api) {
       return undefined;
     }
@@ -73,22 +73,22 @@ export async function activate(context: vscode.ExtensionContext) {
     // TODO notify user if either of these returned undefined (extensionDependencies setting should prevent that, but better to be safe)
 
     // Other parts of this extension will use the test controllers
-    localTestController = vscode.tests.createTestController(`${extensionId}-Local`, 'LOCAL TESTS');
+    localTestController = vscode.tests.createTestController(`${extensionId}-Local`, '$(folder-library) Local Tests');
     context.subscriptions.push(localTestController);
     await setupLocalTestsController();
 
-    loadedTestController = vscode.tests.createTestController(`${extensionId}-Loaded`, 'SERVER TESTS');
+    loadedTestController = vscode.tests.createTestController(`${extensionId}-Loaded`, '$(server-environment) Server Tests');
     context.subscriptions.push(loadedTestController);
     await setupServerTestsController();
 
-    historyBrowserController = vscode.tests.createTestController(`${extensionId}-History`, 'TESTING HISTORY');
+    historyBrowserController = vscode.tests.createTestController(`${extensionId}-History`, '$(history) Testing History');
     context.subscriptions.push(historyBrowserController);
     await setupHistoryExplorerController();
 
     // Register the commands
     context.subscriptions.push(
-        //DUMMY example
-        vscode.commands.registerCommand(`${extensionId}.templateCommand`, () => {}),
+        //DUMMY example (remember to add entries to `contributes.commands` in package.json)
+        //vscode.commands.registerCommand(`${extensionId}.templateCommand`, () => {}),
     );
 
     // Listen for relevant configuration changes

src/localTests.ts

@@ -88,7 +88,7 @@ export async function runTestsHandler(request: vscode.TestRunRequest, cancellati
         'Fake Test Results',
         true
     );
-    run.appendOutput('Fake output from fake run of fake local tests.\r\nTODO');
+    run.appendOutput('Fake output from fake run of local tests.\r\nTODO');
     const queue: vscode.TestItem[] = [];
 
     // Loop through all included tests, or all known tests, and add them to our queue
@@ -123,17 +123,17 @@ export async function runTestsHandler(request: vscode.TestRunRequest, cancellati
                     break;
 
                 case '2':
-                    run.failed(test, new vscode.TestMessage('fake failure'), 1230);                           
+                    run.failed(test, new vscode.TestMessage('fake failure'), 1230);
                     break;
-            
+
                 case '3':
                     run.errored(test, new vscode.TestMessage('fake error'), 900);
                     break;
 
                 case '4':
                     run.enqueued(test);
                     break;
-                    
+
                 default:
                     run.passed(test, 4560);
                     break;
@@ -160,7 +160,7 @@ function replaceLocalRootItems(controller: vscode.TestController) {
             if (server?.serverName && server.namespace) {
                 const key = folder.index.toString();
                 if (!rootMap.has(key)) {
-                    const relativeTestRoot = 'internal/testing/unit_tests';
+                    const relativeTestRoot = vscode.workspace.getConfiguration('intersystems.testingManager', folder.uri).get<string>('relativeTestRoot') || 'internal/testing/unit_tests';
                     const item = controller.createTestItem(key, folder.name, folder.uri.with({path: `${folder.uri.path}/${relativeTestRoot}`}));
                     item.description = relativeTestRoot;
                     item.canResolveChildren = true;

src/makeRESTRequest.ts

@@ -145,7 +145,7 @@ export async function resolveCredentials(serverSpec: IServerSpec) {
             );
         }
         if (session) {
-            serverSpec.username = session.scopes[1] === "UnknownUser" ? "" : session.scopes[1];
+            serverSpec.username = session.scopes[1] === "unknownuser" ? "" : session.scopes[1];
             serverSpec.password = session.accessToken;
         }
     }