TODO: consider dom sandbox for testing ui (see long desc)

see https://discord.com/channels/1388415325036609617/1458088018232479824/1484195713347879012

cmd/pkgserver/ui/static/test.ts

@@ -34,26 +34,17 @@ function checkDuplicates(parent: string, names: { name: string }[]) {
 
 class FailNowSentinel {}
 
-export type Journal = ({ method: "fail" } | { method: "log", message: string })[];
-function formatJournal(journal: Journal): string {
-    return journal
-        .filter((e) => e.method === "log")
-        .map((e) => e.message)
-        .join("\n");
-}
-
 export class TestController {
-    journal: Journal;
+    #logs: string[];
     #failed: boolean;
 
     constructor() {
-        this.journal = [];
+        this.#logs = [];
         this.#failed = false;
     }
 
     fail() {
         this.#failed = true;
-        this.journal.push({ method: "fail" });
     }
 
     failed(): boolean {
@@ -66,7 +57,7 @@ export class TestController {
     }
 
     log(message: string) {
-        this.journal.push({ method: "log", message });
+        this.#logs.push(message);
     }
 
     error(message: string) {
@@ -78,6 +69,10 @@ export class TestController {
         this.log(message);
         this.failNow();
     }
+
+    getLog(): string[] {
+        return this.#logs;
+    }
 }
 
 // =============================================================================
@@ -85,7 +80,7 @@ export class TestController {
 
 export interface TestResult {
     success: boolean;
-    journal: Journal;
+    logs: string[];
 }
 
 export function run(reporter: Reporter) {
@@ -103,16 +98,14 @@ function runTests(reporter: Reporter, parents: string[], node: TestTree) {
         return;
     }
     let controller = new TestController();
-    let excStr: string;
     try {
         node.test(controller);
     } catch (e) {
         if (!(e instanceof FailNowSentinel)) {
-            excStr = extractExceptionString(e);
+            controller.error(extractExceptionString(e));
         }
     }
-    if (excStr !== undefined) controller.error(excStr);
+    reporter.update(path, { success: !controller.failed(), logs: controller.getLog() });
-    reporter.update(path, { success: !controller.failed(), journal: controller.journal });
 }
 
 function extractExceptionString(e: any): string {
@@ -199,11 +192,13 @@ export class StreamReporter implements Reporter {
 
     #writeOutput(test: { name: string } & TestResult, prefix: string, nested: boolean) {
         let output = "";
-        let logOutput = formatJournal(test.journal);
+        if (test.logs.length) {
-        if (logOutput) {
+            // Individual logs might span multiple lines, so join them together
-            const lines = logOutput.split("\n");
+            // then split it again.
+            const logStr = test.logs.join("\n");
+            const lines = logStr.split("\n");
             if (lines.length <= 1) {
-                output = `: ${logOutput}`;
+                output = `: ${logStr}`;
             } else {
                 const padding = nested ? "      " : "  ";
                 output = ":\n" + lines.map((line) => padding + line).join("\n");
@@ -247,10 +242,9 @@ export class DOMReporter implements Reporter {
         }
         const p = document.createElement("p");
         p.classList.add("test-desc");
-        const logOutput = formatJournal(result.journal);
+        if (result.logs.length) {
-        if (logOutput) {
             const pre = document.createElement("pre");
-            pre.appendChild(document.createTextNode(logOutput));
+            pre.appendChild(document.createTextNode(result.logs.join("\n")));
             p.appendChild(pre);
         } else {
             p.classList.add("italic");
@@ -271,10 +265,9 @@ interface GoNode {
 export class GoTestReporter implements Reporter {
     // Convert a test tree into the one expected by the Go code.
     static serialize(node: TestTree): GoNode {
-        if (!("children" in node)) return { name: node.name, subtests: null };
         return {
             name: node.name,
-            subtests: node.children.map(GoTestReporter.serialize),
+            subtests: "children" in node ? node.children.map(GoTestReporter.serialize) : null,
         };
     }
 
@@ -283,7 +276,7 @@ export class GoTestReporter implements Reporter {
     }
 
     update(path: string[], result: TestResult) {
-        console.log(JSON.stringify({ "path": path, ...result }));
+        console.log(JSON.stringify({ path: path, ...result }));
     }
 
     finalize() {