@travetto/test 8.0.0-alpha.6 → 8.0.0-alpha.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/test",
-  "version": "8.0.0-alpha.6",
+  "version": "8.0.0-alpha.8",
   "type": "module",
   "description": "Declarative test framework",
   "keywords": [
@@ -28,14 +28,14 @@
     "directory": "module/test"
   },
   "dependencies": {
-    "@travetto/registry": "^8.0.0-alpha.6",
-    "@travetto/runtime": "^8.0.0-alpha.6",
-    "@travetto/terminal": "^8.0.0-alpha.6",
-    "@travetto/worker": "^8.0.0-alpha.6",
+    "@travetto/registry": "^8.0.0-alpha.8",
+    "@travetto/runtime": "^8.0.0-alpha.8",
+    "@travetto/terminal": "^8.0.0-alpha.8",
+    "@travetto/worker": "^8.0.0-alpha.8",
     "yaml": "^2.8.2"
   },
   "peerDependencies": {
-    "@travetto/cli": "^8.0.0-alpha.11",
+    "@travetto/cli": "^8.0.0-alpha.13",
     "@travetto/transformer": "^8.0.0-alpha.4"
   },
   "peerDependenciesMeta": {

package/src/consumer/types/tap.ts

@@ -1,5 +1,4 @@
 import path from 'node:path';
-import { AssertionError } from 'node:assert';
 import { stringify } from 'yaml';
 
 import { Terminal, StyleUtil } from '@travetto/terminal';
@@ -9,6 +8,7 @@ import type { TestEvent } from '../../model/event.ts';
 import type { SuitesSummary, TestConsumerShape } from '../types.ts';
 import { TestConsumer } from '../decorator.ts';
 import { type TestResultsEnhancer, CONSOLE_ENHANCER } from '../enhancer.ts';
+import { TestConsumerUtil } from './util.ts';
 
 const SPACE = ' ';
 
@@ -57,22 +57,6 @@ export class TapEmitter implements TestConsumerShape {
     this.log(`---\n${this.#enhancer.objectInspect(body)}\n...`);
   }
 
-  /**
-   * Error to string
-   * @param error
-   */
-  errorToString(error?: Error): string | undefined {
-    if (error instanceof AssertionError) {
-      return;
-    } else if (error instanceof Error) {
-      return error.stack ?
-        error.stack.split(/\n/).slice(0, this.#options?.verbose ? -1 : 5).join('\n') :
-        error.message;
-    } else {
-      return `${error}`;
-    }
-  }
-
   /**
    * Listen for each event
    */
@@ -140,7 +124,7 @@ export class TapEmitter implements TestConsumerShape {
         case 'errored':
         case 'failed': {
           if (test.error) {
-            const message = this.errorToString(test.error);
+            const message = TestConsumerUtil.errorToString(test.error, !!this.#options?.verbose);
             if (message) {
               this.logMeta({ error: message });
             }

package/src/consumer/types/util.ts

@@ -0,0 +1,28 @@
+import util from 'node:util';
+import { AssertionError } from 'node:assert';
+
+import { TypedObject } from '@travetto/runtime';
+
+export class TestConsumerUtil {
+  /**
+   * Convert error to string
+   */
+  static errorToString(error?: Error, verbose?: boolean): string | undefined {
+    if (error instanceof AssertionError) {
+      return;
+    } else if (error instanceof Error) {
+      const stack = error.stack ?
+        error.stack.split(/\n/).slice(0, verbose ? -1 : 5).join('\n') :
+        error.message;
+      const subObject: Record<string, unknown> = {};
+      for (const key of TypedObject.keys(error)) {
+        if (key !== 'stack' && key !== 'message' && key !== 'name') {
+          subObject[key] = error[key];
+        }
+      }
+      return `${stack}${Object.keys(subObject).length ? `\n${util.inspect(subObject)}` : ''}`;
+    } else {
+      return `${error}`;
+    }
+  }
+}

package/src/consumer/types/xunit.ts

@@ -7,6 +7,7 @@ import { RuntimeIndex } from '@travetto/runtime';
 import type { TestEvent } from '../../model/event.ts';
 import type { SuitesSummary, TestConsumerShape } from '../types.ts';
 import { TestConsumer } from '../decorator.ts';
+import { TestConsumerUtil } from './util.ts';
 
 /**
  * Xunit consumer, compatible with JUnit formatters
@@ -59,9 +60,9 @@ export class XunitEmitter implements TestConsumerShape {
       let body = '';
 
       if (test.error) {
-        const assertion = test.assertions.find(item => !!item.error)!;
+        const errorMessage = TestConsumerUtil.errorToString(test.error);
         const node = test.status === 'failed' ? 'failure' : 'error';
-        body = `<${node} type="${assertion.text}" message="${encodeURIComponent(assertion.message!)}"><![CDATA[${assertion.error!.stack}]]></${node}>`;
+        body = `<${node} type="${test.error.constructor.name}" message="${encodeURIComponent(test.error.message)}"><![CDATA[${errorMessage}]]></${node}>`;
       }
 
       const groupedByLevel: Record<string, string[]> = {};

package/src/execute/executor.ts

@@ -31,15 +31,13 @@ export class TestExecutor {
    *
    * This method should never throw under any circumstances.
    */
-  async #executeTestMethod(test: TestConfig): Promise<Error | undefined> {
-    const suite = SuiteRegistryIndex.getConfig(test.class);
-
+  async #executeTestMethod(instance: unknown, test: TestConfig): Promise<Error | undefined> {
     // Ensure all the criteria below are satisfied before moving forward
     return Barrier.awaitOperation(test.timeout || TEST_TIMEOUT, async () => {
       const env = process.env;
       process.env = { ...env }; // Created an isolated environment
       try {
-        await castTo<Record<string, Function>>(suite.instance)[test.methodName]();
+        await castTo<Record<string, Function>>(instance)[test.methodName]();
       } finally {
         process.env = env; // Restore
       }
@@ -58,7 +56,7 @@ export class TestExecutor {
   /**
    * Execute the test, capture output, assertions and promises
    */
-  async executeTest(test: TestConfig, suite: SuiteConfig, override?: Partial<TestResult>): Promise<TestResult> {
+  async executeTest(instance: unknown, test: TestConfig, suite: SuiteConfig, override?: Partial<TestResult>): Promise<TestResult> {
 
     const result = TestModelUtil.createTestResult(suite, test, override);
 
@@ -81,7 +79,7 @@ export class TestExecutor {
     } else {
       // Run method and get result
       const startTime = Date.now();
-      const error = await this.#executeTestMethod(test);
+      const error = await this.#executeTestMethod(instance, test);
       const [status, finalError] = AssertCheck.validateTestResultError(test, error);
       result.status = status;
       result.selfDuration = Date.now() - startTime;
@@ -104,9 +102,9 @@ export class TestExecutor {
    */
   async executeSuite(suite: SuiteConfig, tests: TestConfig[]): Promise<void> {
 
-    suite.instance = classConstruct(suite.class);
+    const instance = classConstruct(suite.class);
 
-    const shouldSkip = await this.#shouldSkip(suite, suite.instance);
+    const shouldSkip = await this.#shouldSkip(suite, instance);
 
     const result: SuiteResult = TestModelUtil.createSuiteResult(suite);
 
@@ -126,7 +124,7 @@ export class TestExecutor {
       return;
     }
 
-    const manager = new TestPhaseManager(suite);
+    const manager = new TestPhaseManager(suite, instance);
     const originalEnv = { ...process.env };
     const startTime = Date.now();
     const testResultOverrides: Record<string, Partial<TestResult>> = {};
@@ -158,7 +156,7 @@ export class TestExecutor {
       const testStart = Date.now();
       const testResultOverride = (testResultOverrides[test.methodName] ??= {});
 
-      if (await this.#shouldSkip(test, suite.instance)) {
+      if (await this.#shouldSkip(test, instance)) {
         testResultOverride.status = 'skipped';
       }
 
@@ -172,7 +170,7 @@ export class TestExecutor {
       }
 
       // Run test
-      const testResult = await this.executeTest(test, suite, testResultOverride);
+      const testResult = await this.executeTest(instance, test, suite, testResultOverride);
 
       // Handle after each
       try {

package/src/execute/phase.ts

@@ -13,9 +13,11 @@ const TEST_PHASE_TIMEOUT = TimeUtil.duration(Env.TRV_TEST_PHASE_TIMEOUT.value ??
 export class TestPhaseManager {
   #progress: ('all' | 'each')[] = [];
   #suite: SuiteConfig;
+  #instance: unknown;
 
-  constructor(suite: SuiteConfig) {
+  constructor(suite: SuiteConfig, instance: unknown) {
     this.#suite = suite;
+    this.#instance = instance;
   }
 
   /**
@@ -29,7 +31,7 @@ export class TestPhaseManager {
       }
 
       // Ensure all the criteria below are satisfied before moving forward
-      error = await Barrier.awaitOperation(TEST_PHASE_TIMEOUT, async () => handler[phase]?.(this.#suite.instance));
+      error = await Barrier.awaitOperation(TEST_PHASE_TIMEOUT, async () => handler[phase]?.(this.#instance));
 
       if (error) {
         throw error;

package/src/execute/run.ts

@@ -3,7 +3,7 @@ import fs from 'node:fs/promises';
 import readline from 'node:readline/promises';
 import path from 'node:path';
 
-import { Env, ExecUtil, Util, RuntimeIndex, Runtime, TimeUtil, JSONUtil } from '@travetto/runtime';
+import { Env, ExecUtil, Util, RuntimeIndex, Runtime, TimeUtil, JSONUtil, describeFunction } from '@travetto/runtime';
 import { WorkPool } from '@travetto/worker';
 import { Registry } from '@travetto/registry';
 
@@ -126,6 +126,7 @@ export class RunUtil {
     const imported = await Registry.manualInit([importPath]);
     const classes = Object.fromEntries(
       imported
+        .filter(cls => !describeFunction(cls).abstract)
         .filter(cls => SuiteRegistryIndex.hasConfig(cls))
         .map(cls => [cls.Ⲑid, SuiteRegistryIndex.getConfig(cls)])
     );

package/src/model/suite.ts

@@ -19,10 +19,6 @@ export interface SuiteConfig extends SuiteCore {
    * Should this be skipped
    */
   skip: Skip;
-  /**
-   * Actual class instance
-   */
-  instance?: unknown;
   /**
    * Tests to run
    */