Improve history view

Author: gjsjohnmurray

src/debugTracker.ts

@@ -1,9 +1,12 @@
 import * as vscode from 'vscode';
 import { allTestRuns, loadedTestController, localTestController } from './extension';
+import { refreshHistoryRootItem } from './historyExplorer';
 
 export class DebugTracker implements vscode.DebugAdapterTracker {
 
   private session: vscode.DebugSession;
+  private serverName: string;
+  private namespace: string;
   private testController: vscode.TestController
   private run?: vscode.TestRun;
   private testIdBase: string;
@@ -17,7 +20,9 @@ export class DebugTracker implements vscode.DebugAdapterTracker {
 
   constructor(session: vscode.DebugSession) {
     this.session = session;
-    this.testController = this.session.configuration.name.startsWith('ServerTests:') ? loadedTestController : localTestController;
+    let runType: string;
+    [ runType, this.serverName, this.namespace ] = this.session.configuration.name.split(':');
+    this.testController = runType === 'ServerTests' ? loadedTestController : localTestController;
     this.run = allTestRuns[this.session.configuration.testRunIndex];
     this.testIdBase = this.session.configuration.testIdBase;
     this.classTestCollection = this.testController.items.get(this.testIdBase)?.children;
@@ -118,6 +123,7 @@ export class DebugTracker implements vscode.DebugAdapterTracker {
     console.log(`**Stopping session ${this.session.name}`);
     if (this.run) {
       this.run.end();
+      refreshHistoryRootItem(this.serverName, this.namespace);
     }
 
     // Clear reference to run (not known if this is necessary)

src/historyExplorer.ts

@@ -37,7 +37,15 @@ export async function setupHistoryExplorerController() {
             replaceRootItems(historyBrowserController);
         }
     }
-    historyBrowserController.items.replace([historyBrowserController.createTestItem('-', 'loading...')]);
+
+    const refresh = (token?: vscode.CancellationToken) => {
+      historyBrowserController.items.replace([historyBrowserController.createTestItem('-', 'loading...')]);
+      replaceRootItems(historyBrowserController);
+    }
+    refresh();
+
+    // Add a manual Refresh button
+    historyBrowserController.refreshHandler = refresh;
 
 }
 
@@ -54,7 +62,7 @@ async function addTestInstances(item: vscode.TestItem, controller: vscode.TestCo
             "POST",
             spec,
             { apiVersion: 1, namespace, path: "/action/query" },
-            { query: "SELECT InstanceIndex, DateTime, Duration FROM %UnitTest_Result.TestInstance" },
+            { query: "SELECT TOP 10 InstanceIndex, DateTime, Duration FROM %UnitTest_Result.TestInstance ORDER BY DateTime DESC" },
         );
         if (response) {
             const portalUri = vscode.Uri.from({
@@ -68,6 +76,7 @@ async function addTestInstances(item: vscode.TestItem, controller: vscode.TestCo
                     `${element.DateTime}`,
                     portalUri.with({ query: `Index=${element.InstanceIndex}&$NAMESPACE=${namespace}` })
                 );
+                child.sortText = (1e12 - element.InstanceIndex).toString().padStart(12, "0");
                 child.description = `run ${element.InstanceIndex}`;
                 child.canResolveChildren = true;
                 item.children.add(child);
@@ -209,8 +218,8 @@ async function addTestAsserts(item: vscode.TestItem, controller: vscode.TestCont
             }
 
             response?.data?.result?.content?.forEach(element => {
-                // Prefix the label with an underscore-padded integer to preserve order
-                const child = controller.createTestItem(`${item.id}:${element.ID}`, `${element.Counter.toString().padStart(element.MaxCounter.toString().length, "_")}. ${element.Action}`);
+                const child = controller.createTestItem(`${item.id}:${element.ID}`, `${element.Action}`);
+                child.sortText = `${element.Counter.toString().padStart(element.MaxCounter.toString().length, "0")}`;
                 child.description = element.Description;
                 child.canResolveChildren = false;
                 item.children.add(child);
@@ -246,3 +255,11 @@ export function replaceRootItems(controller: vscode.TestController) {
     rootMap.forEach(item => rootItems.push(item));
     controller.items.replace(rootItems);
 }
+
+export function refreshHistoryRootItem(serverName: string, namespace: string) {
+  const item = historyBrowserController.items.get(serverName + ":" + namespace);
+  if (item) {
+    item.children.replace([]);
+    addTestInstances(item, historyBrowserController);
+  }
+}

src/serverTests.ts

@@ -182,13 +182,14 @@ export async function runTestsHandler(request: vscode.TestRunRequest, cancellati
             scheme: server.scheme
           }
         }
+        const namespace: string = server.namespace.toUpperCase();
         const response = await makeRESTRequest(
             "POST",
             serverSpec,
-            { apiVersion: 1, namespace: server.namespace, path: "/action/query" },
+            { apiVersion: 1, namespace, path: "/action/query" },
             {
                 query: "SELECT TOP 1 ID, TestInstance, Name, Duration, Status, ErrorDescription FROM %UnitTest_Result.TestSuite WHERE Name %STARTSWITH ? ORDER BY TestInstance DESC",
-                parameters: [`${server.username}\\`]
+                parameters: [`${serverSpec.username}\\`]
             },
         );
         if (response) {
@@ -201,8 +202,8 @@ export async function runTestsHandler(request: vscode.TestRunRequest, cancellati
         const configuration: vscode.DebugConfiguration = {
           "type": "objectscript",
           "request": "launch",
-          "name": `ServerTests:${server.username}`,
-          "program": `##class(%UnitTest.Manager).RunTest("${server.username}","/noload/nodelete")`,
+          "name": `ServerTests:${serverSpec.name}:${namespace}:${serverSpec.username}`,
+          "program": `##class(%UnitTest.Manager).RunTest("${serverSpec.username}","/noload/nodelete")`,
           "testRunIndex": runIndex,
           "testIdBase": firstClassTestItem.id.split(":", 2).join(":")
         };