@travetto/test 6.0.0-rc.2 → 6.0.0

package/README.md

@@ -122,6 +122,7 @@ The equivalences for all of the [assert](https://nodejs.org/api/assert.html) ope
    *  `assert(a instanceof b)` as `assert.instanceOf(a, b)`
    *  `assert(a.includes(b))` as `assert.ok(a.includes(b))`
    *  `assert(/a/.test(b))` as `assert.ok(/a/.test(b))`
+
 In addition to the standard operations, there is support for throwing/rejecting errors (or the inverse).  This is useful for testing error states or ensuring errors do not occur.
 
 ### Throws

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/test",
-  "version": "6.0.0-rc.2",
+  "version": "6.0.0",
   "description": "Declarative test framework",
   "keywords": [
     "unit-testing",
@@ -27,15 +27,15 @@
     "directory": "module/test"
   },
   "dependencies": {
-    "@travetto/registry": "^6.0.0-rc.2",
-    "@travetto/runtime": "^6.0.0-rc.2",
-    "@travetto/terminal": "^6.0.0-rc.2",
-    "@travetto/worker": "^6.0.0-rc.2",
+    "@travetto/registry": "^6.0.0",
+    "@travetto/runtime": "^6.0.0",
+    "@travetto/terminal": "^6.0.0",
+    "@travetto/worker": "^6.0.0",
     "yaml": "^2.7.1"
   },
   "peerDependencies": {
-    "@travetto/cli": "^6.0.0-rc.2",
-    "@travetto/transformer": "^6.0.0-rc.3"
+    "@travetto/cli": "^6.0.0",
+    "@travetto/transformer": "^6.0.0"
   },
   "peerDependenciesMeta": {
     "@travetto/transformer": {

package/src/assert/check.ts

@@ -156,10 +156,11 @@ export class AssertCheck {
         });
       }
     } else if (typeof shouldThrow === 'function') {
+      const target = shouldThrow.name ? `("${shouldThrow.name}")` : '';
       try {
         const res = shouldThrow(err);
         if (res === false) {
-          return new assert.AssertionError({ message: `Checking "${shouldThrow.name}" indicated an invalid error`, actual: err });
+          return new assert.AssertionError({ message: `Checking function ${target} indicated an invalid error`, actual: err });
         } else if (typeof res === 'string') {
           return new assert.AssertionError({ message: res, actual: err });
         }
@@ -167,7 +168,7 @@ export class AssertCheck {
         if (checkErr instanceof assert.AssertionError) {
           return checkErr;
         } else {
-          return new assert.AssertionError({ message: `Checking "${shouldThrow.name}" threw an error`, actual: checkErr });
+          return new assert.AssertionError({ message: `Checking function ${target} threw an error`, actual: checkErr });
         }
       }
     }

package/src/assert/util.ts

@@ -105,7 +105,7 @@ export class AssertUtil {
     };
     const testResult: TestResult = {
       ...coreAll,
-      status: 'failed', error, duration: 0, durationTotal: 0, assertions: [assert], output: {}
+      status: 'failed', error, duration: 0, durationTotal: 0, assertions: [assert], output: []
     };
     const test: TestConfig = {
       ...coreAll,

package/src/consumer/types/tap.ts

@@ -10,7 +10,7 @@ import { TestConsumer } from '../registry.ts';
 import { TestResultsEnhancer, CONSOLE_ENHANCER } from '../enhancer.ts';
 
 /**
-  * TAP Format consumer
+ * TAP Format consumer
  */
 @TestConsumer()
 export class TapEmitter implements TestConsumerShape {
@@ -134,9 +134,13 @@ export class TapEmitter implements TestConsumerShape {
 
       // Track output
       if (test.output) {
+        const groupedByLevel: Record<string, string[]> = {};
+        for (const log of test.output) {
+          (groupedByLevel[log.level] ??= []).push(log.message);
+        }
         for (const key of ['log', 'info', 'error', 'debug', 'warn']) {
-          if (test.output[key]) {
-            this.logMeta({ [key]: test.output[key] });
+          if (groupedByLevel[key]) {
+            this.logMeta({ [key]: groupedByLevel[key].join('\n') });
           }
         }
       }

package/src/consumer/types/xunit.ts

@@ -63,6 +63,11 @@ export class XunitEmitter implements TestConsumerShape {
         body = `<failure type="${assertErr.text}" message="${encodeURIComponent(assertErr.message!)}"><![CDATA[${assertErr.error!.stack}]]></failure>`;
       }
 
+      const groupedByLevel: Record<string, string[]> = {};
+      for (const log of test.output) {
+        (groupedByLevel[log.level] ??= []).push(log.message);
+      }
+
       this.#tests.push(`
     <testcase
       name="${name}"
@@ -70,8 +75,8 @@ export class XunitEmitter implements TestConsumerShape {
       classname="${test.classId}"
     >
       ${body}
-      <system-out>${this.buildMeta({ log: test.output.log, info: test.output.info, debug: test.output.debug })}</system-out>
-      <system-err>${this.buildMeta({ error: test.output.error, warn: test.output.warn })}</system-err>
+      <system-out>${this.buildMeta({ log: groupedByLevel.log, info: groupedByLevel.info, debug: groupedByLevel.debug })}</system-out>
+      <system-err>${this.buildMeta({ error: groupedByLevel.error, warn: groupedByLevel.warn })}</system-err>
     </testcase>`
       );
     } else if (e.type === 'suite' && e.phase === 'after') {

package/src/execute/console.ts

@@ -1,6 +1,7 @@
 import util from 'node:util';
 
 import { ConsoleEvent, ConsoleListener, ConsoleManager } from '@travetto/runtime';
+import { TestLog } from '../model/test';
 
 /**
  * Console capturer.  Hooks into the Console manager, and collects the
@@ -9,26 +10,28 @@ import { ConsoleEvent, ConsoleListener, ConsoleManager } from '@travetto/runtime
 export class ConsoleCapture implements ConsoleListener {
   static #listener: ConsoleListener = ConsoleManager.get();
 
-  out: Record<string, string[]>;
+  out: TestLog[];
 
   start(): this {
-    this.out = {};
+    this.out = [];
     ConsoleManager.set(this);
     return this;
   }
 
-  log({ level, args }: ConsoleEvent): void {
-    (this.out[level] = this.out[level] ?? []).push(
-      args
+  log({ level, line, args }: ConsoleEvent): void {
+    this.out.push({
+      line,
+      level,
+      message: args
         .map((x => typeof x === 'string' ? x : util.inspect(x, false, 5)))
         .join(' ')
-    );
+    });
   }
 
-  end(): Record<string, string> {
-    const result = this.out ?? {};
-    this.out = {};
+  end(): TestLog[] {
+    const result = this.out ?? [];
+    this.out = [];
     ConsoleManager.set(ConsoleCapture.#listener);
-    return Object.fromEntries(Object.entries(result).map(([k, v]) => [k, v.join('\n')]));
+    return result;
   }
 }

package/src/execute/executor.ts

@@ -82,7 +82,7 @@ export class TestExecutor {
     // Mark test start
     this.#consumer.onEvent({ type: 'test', phase: 'before', test });
     result.skipped++;
-    this.#consumer.onEvent({ type: 'test', phase: 'after', test: { ...test, assertions: [], duration: 0, durationTotal: 0, output: {}, status: 'skipped' } });
+    this.#consumer.onEvent({ type: 'test', phase: 'after', test: { ...test, assertions: [], duration: 0, durationTotal: 0, output: [], status: 'skipped' } });
   }
 
   /**
@@ -126,7 +126,7 @@ export class TestExecutor {
       assertions: [],
       duration: 0,
       durationTotal: 0,
-      output: {},
+      output: [],
     };
 
     // Emit every assertion as it occurs

package/src/model/test.ts

@@ -1,7 +1,9 @@
-import type { Class, TimeSpan } from '@travetto/runtime';
+import type { Class, ConsoleEvent, TimeSpan } from '@travetto/runtime';
+
 import { Skip, TestCore } from './common.ts';
 
 export type ThrowableError = string | RegExp | Class<Error> | ((e: Error | string) => boolean | void | undefined);
+export type TestLog = { level: ConsoleEvent['level'], line: number, message: string };
 
 /**
  * Specific configuration for a test
@@ -106,7 +108,7 @@ export interface TestResult extends TestCore {
   /**
    * Logging output
    */
-  output: Record<string, string>;
+  output: TestLog[];
 }
 
 /**