@git.zone/tstest 1.11.4 → 2.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist_ts/00_commitinfo_data.js +2 -2
- package/dist_ts/index.js +24 -2
- package/dist_ts/tstest.classes.tap.parser.d.ts +10 -5
- package/dist_ts/tstest.classes.tap.parser.js +239 -99
- package/dist_ts/tstest.classes.tap.parser.old.d.ts +50 -0
- package/dist_ts/tstest.classes.tap.parser.old.js +332 -0
- package/dist_ts/tstest.classes.tstest.d.ts +1 -0
- package/dist_ts/tstest.classes.tstest.js +94 -4
- package/dist_ts/tstest.logging.d.ts +4 -0
- package/dist_ts/tstest.logging.js +36 -1
- package/dist_ts/tstest.plugins.d.ts +2 -1
- package/dist_ts/tstest.plugins.js +3 -2
- package/dist_ts_tapbundle/index.d.ts +1 -3
- package/dist_ts_tapbundle/index.js +3 -5
- package/dist_ts_tapbundle/tapbundle.classes.settingsmanager.d.ts +36 -0
- package/dist_ts_tapbundle/tapbundle.classes.settingsmanager.js +114 -0
- package/dist_ts_tapbundle/tapbundle.classes.tap.d.ts +26 -3
- package/dist_ts_tapbundle/tapbundle.classes.tap.js +218 -22
- package/dist_ts_tapbundle/tapbundle.classes.taptest.d.ts +5 -0
- package/dist_ts_tapbundle/tapbundle.classes.taptest.js +161 -7
- package/dist_ts_tapbundle/tapbundle.classes.taptools.d.ts +14 -0
- package/dist_ts_tapbundle/tapbundle.classes.taptools.js +24 -1
- package/dist_ts_tapbundle/tapbundle.expect.wrapper.d.ts +11 -0
- package/dist_ts_tapbundle/tapbundle.expect.wrapper.js +71 -0
- package/dist_ts_tapbundle/tapbundle.interfaces.d.ts +27 -0
- package/dist_ts_tapbundle/tapbundle.interfaces.js +2 -0
- package/dist_ts_tapbundle/tapbundle.utilities.diff.d.ts +5 -0
- package/dist_ts_tapbundle/tapbundle.utilities.diff.js +179 -0
- package/dist_ts_tapbundle_protocol/index.d.ts +6 -0
- package/dist_ts_tapbundle_protocol/index.js +11 -0
- package/dist_ts_tapbundle_protocol/protocol.emitter.d.ts +55 -0
- package/dist_ts_tapbundle_protocol/protocol.emitter.js +155 -0
- package/dist_ts_tapbundle_protocol/protocol.parser.d.ts +79 -0
- package/dist_ts_tapbundle_protocol/protocol.parser.js +359 -0
- package/dist_ts_tapbundle_protocol/protocol.types.d.ts +111 -0
- package/dist_ts_tapbundle_protocol/protocol.types.js +19 -0
- package/package.json +2 -1
- package/readme.hints.md +166 -5
- package/readme.md +134 -3
- package/readme.plan.md +145 -56
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/index.ts +22 -1
- package/ts/tspublish.json +1 -1
- package/ts/tstest.classes.tap.parser.ts +271 -110
- package/ts/tstest.classes.tstest.ts +113 -5
- package/ts/tstest.logging.ts +43 -0
- package/ts/tstest.plugins.ts +2 -0
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@git.zone/tstest',
|
|
6
|
-
version: '
|
|
6
|
+
version: '2.2.0',
|
|
7
7
|
description: 'a test utility to run tests that match test/**/*.ts'
|
|
8
8
|
};
|
|
9
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
9
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxrQkFBa0I7SUFDeEIsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLHFEQUFxRDtDQUNuRSxDQUFBIn0=
|
package/dist_ts/index.js
CHANGED
|
@@ -14,6 +14,8 @@ export const runCli = async () => {
|
|
|
14
14
|
let startFromFile = null;
|
|
15
15
|
let stopAtFile = null;
|
|
16
16
|
let timeoutSeconds = null;
|
|
17
|
+
let watchMode = false;
|
|
18
|
+
let watchIgnorePatterns = [];
|
|
17
19
|
// Parse options
|
|
18
20
|
for (let i = 0; i < args.length; i++) {
|
|
19
21
|
const arg = args[i];
|
|
@@ -83,6 +85,19 @@ export const runCli = async () => {
|
|
|
83
85
|
process.exit(1);
|
|
84
86
|
}
|
|
85
87
|
break;
|
|
88
|
+
case '--watch':
|
|
89
|
+
case '-w':
|
|
90
|
+
watchMode = true;
|
|
91
|
+
break;
|
|
92
|
+
case '--watch-ignore':
|
|
93
|
+
if (i + 1 < args.length) {
|
|
94
|
+
watchIgnorePatterns = args[++i].split(',');
|
|
95
|
+
}
|
|
96
|
+
else {
|
|
97
|
+
console.error('Error: --watch-ignore requires a comma-separated list of patterns');
|
|
98
|
+
process.exit(1);
|
|
99
|
+
}
|
|
100
|
+
break;
|
|
86
101
|
default:
|
|
87
102
|
if (!arg.startsWith('-')) {
|
|
88
103
|
testPath = arg;
|
|
@@ -107,6 +122,8 @@ export const runCli = async () => {
|
|
|
107
122
|
console.error(' --startFrom <n> Start running from test file number n');
|
|
108
123
|
console.error(' --stopAt <n> Stop running at test file number n');
|
|
109
124
|
console.error(' --timeout <s> Timeout test files after s seconds');
|
|
125
|
+
console.error(' --watch, -w Watch for file changes and re-run tests');
|
|
126
|
+
console.error(' --watch-ignore Patterns to ignore in watch mode (comma-separated)');
|
|
110
127
|
process.exit(1);
|
|
111
128
|
}
|
|
112
129
|
let executionMode;
|
|
@@ -121,10 +138,15 @@ export const runCli = async () => {
|
|
|
121
138
|
executionMode = TestExecutionMode.DIRECTORY;
|
|
122
139
|
}
|
|
123
140
|
const tsTestInstance = new TsTest(process.cwd(), testPath, executionMode, logOptions, tags, startFromFile, stopAtFile, timeoutSeconds);
|
|
124
|
-
|
|
141
|
+
if (watchMode) {
|
|
142
|
+
await tsTestInstance.runWatch(watchIgnorePatterns);
|
|
143
|
+
}
|
|
144
|
+
else {
|
|
145
|
+
await tsTestInstance.run();
|
|
146
|
+
}
|
|
125
147
|
};
|
|
126
148
|
// Execute CLI when this file is run directly
|
|
127
149
|
if (import.meta.url === `file://${process.argv[1]}`) {
|
|
128
150
|
runCli();
|
|
129
151
|
}
|
|
130
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
152
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFHcEQsTUFBTSxDQUFOLElBQVksaUJBSVg7QUFKRCxXQUFZLGlCQUFpQjtJQUMzQiw0Q0FBdUIsQ0FBQTtJQUN2QixrQ0FBYSxDQUFBO0lBQ2Isa0NBQWEsQ0FBQTtBQUNmLENBQUMsRUFKVyxpQkFBaUIsS0FBakIsaUJBQWlCLFFBSTVCO0FBRUQsTUFBTSxDQUFDLE1BQU0sTUFBTSxHQUFHLEtBQUssSUFBSSxFQUFFO0lBQy9CLCtCQUErQjtJQUMvQixNQUFNLElBQUksR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNuQyxNQUFNLFVBQVUsR0FBZSxFQUFFLENBQUM7SUFDbEMsSUFBSSxRQUFRLEdBQWtCLElBQUksQ0FBQztJQUNuQyxJQUFJLElBQUksR0FBYSxFQUFFLENBQUM7SUFDeEIsSUFBSSxhQUFhLEdBQWtCLElBQUksQ0FBQztJQUN4QyxJQUFJLFVBQVUsR0FBa0IsSUFBSSxDQUFDO0lBQ3JDLElBQUksY0FBYyxHQUFrQixJQUFJLENBQUM7SUFDekMsSUFBSSxTQUFTLEdBQVksS0FBSyxDQUFDO0lBQy9CLElBQUksbUJBQW1CLEdBQWEsRUFBRSxDQUFDO0lBRXZDLGdCQUFnQjtJQUNoQixLQUFLLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDO1FBQ3JDLE1BQU0sR0FBRyxHQUFHLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUVwQixRQUFRLEdBQUcsRUFBRSxDQUFDO1lBQ1osS0FBSyxTQUFTLENBQUM7WUFDZixLQUFLLElBQUk7Z0JBQ1AsVUFBVSxDQUFDLEtBQUssR0FBRyxJQUFJLENBQUM7Z0JB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
|
|
@@ -4,15 +4,12 @@ import { TsTestLogger } from './tstest.logging.js';
|
|
|
4
4
|
export declare class TapParser {
|
|
5
5
|
fileName: string;
|
|
6
6
|
testStore: TapTestResult[];
|
|
7
|
-
expectedTestsRegex: RegExp;
|
|
8
7
|
expectedTests: number;
|
|
9
8
|
receivedTests: number;
|
|
10
|
-
testStatusRegex: RegExp;
|
|
11
9
|
activeTapTestResult: TapTestResult;
|
|
12
|
-
collectingErrorDetails: boolean;
|
|
13
|
-
currentTestError: string[];
|
|
14
|
-
pretaskRegex: RegExp;
|
|
15
10
|
private logger;
|
|
11
|
+
private protocolParser;
|
|
12
|
+
private protocolVersion;
|
|
16
13
|
/**
|
|
17
14
|
* the constructor for TapParser
|
|
18
15
|
*/
|
|
@@ -23,6 +20,14 @@ export declare class TapParser {
|
|
|
23
20
|
handleTimeout(timeoutSeconds: number): void;
|
|
24
21
|
private _getNewTapTestResult;
|
|
25
22
|
private _processLog;
|
|
23
|
+
private _handleProtocolMessage;
|
|
24
|
+
private _handleTestEvent;
|
|
25
|
+
private _displayAssertionError;
|
|
26
|
+
private _displayDiff;
|
|
27
|
+
private _displayStringDiff;
|
|
28
|
+
private _displayObjectDiff;
|
|
29
|
+
private _displayArrayDiff;
|
|
30
|
+
private _displayPrimitiveDiff;
|
|
26
31
|
/**
|
|
27
32
|
* returns all tests that are not completed
|
|
28
33
|
*/
|
|
@@ -7,6 +7,7 @@ import * as plugins from './tstest.plugins.js';
|
|
|
7
7
|
import { TapTestResult } from './tstest.classes.tap.testresult.js';
|
|
8
8
|
import * as logPrefixes from './tstest.logprefixes.js';
|
|
9
9
|
import { TsTestLogger } from './tstest.logging.js';
|
|
10
|
+
import { ProtocolParser } from '../dist_ts_tapbundle_protocol/index.js';
|
|
10
11
|
export class TapParser {
|
|
11
12
|
/**
|
|
12
13
|
* the constructor for TapParser
|
|
@@ -14,12 +15,11 @@ export class TapParser {
|
|
|
14
15
|
constructor(fileName, logger) {
|
|
15
16
|
this.fileName = fileName;
|
|
16
17
|
this.testStore = [];
|
|
17
|
-
this.
|
|
18
|
-
this.
|
|
19
|
-
this.
|
|
20
|
-
this.currentTestError = [];
|
|
21
|
-
this.pretaskRegex = /^::__PRETASK:(.*)$/;
|
|
18
|
+
this.expectedTests = 0;
|
|
19
|
+
this.receivedTests = 0;
|
|
20
|
+
this.protocolVersion = null;
|
|
22
21
|
this.logger = logger;
|
|
22
|
+
this.protocolParser = new ProtocolParser();
|
|
23
23
|
}
|
|
24
24
|
/**
|
|
25
25
|
* Handle test file timeout
|
|
@@ -53,77 +53,21 @@ export class TapParser {
|
|
|
53
53
|
if (logLineArray[logLineArray.length - 1] === '') {
|
|
54
54
|
logLineArray.pop();
|
|
55
55
|
}
|
|
56
|
-
//
|
|
56
|
+
// Process each line through the protocol parser
|
|
57
57
|
for (const logLine of logLineArray) {
|
|
58
|
-
|
|
59
|
-
if (
|
|
60
|
-
|
|
61
|
-
const
|
|
62
|
-
|
|
63
|
-
if (this.logger) {
|
|
64
|
-
this.logger.tapOutput(`Expecting ${this.expectedTests} tests!`);
|
|
65
|
-
}
|
|
66
|
-
// initiating first TapResult
|
|
67
|
-
this._getNewTapTestResult();
|
|
68
|
-
}
|
|
69
|
-
else if (this.pretaskRegex.test(logLine)) {
|
|
70
|
-
logLineIsTapProtocol = true;
|
|
71
|
-
const pretaskContentMatch = this.pretaskRegex.exec(logLine);
|
|
72
|
-
if (pretaskContentMatch && pretaskContentMatch[1]) {
|
|
73
|
-
if (this.logger) {
|
|
74
|
-
this.logger.tapOutput(`Pretask -> ${pretaskContentMatch[1]}: Success.`);
|
|
75
|
-
}
|
|
58
|
+
const messages = this.protocolParser.parseLine(logLine);
|
|
59
|
+
if (messages.length > 0) {
|
|
60
|
+
// Handle protocol messages
|
|
61
|
+
for (const message of messages) {
|
|
62
|
+
this._handleProtocolMessage(message, logLine);
|
|
76
63
|
}
|
|
77
64
|
}
|
|
78
|
-
else
|
|
79
|
-
|
|
80
|
-
const regexResult = this.testStatusRegex.exec(logLine);
|
|
81
|
-
// const testId = parseInt(regexResult[2]); // Currently unused
|
|
82
|
-
const testOk = (() => {
|
|
83
|
-
if (regexResult[1] === 'ok') {
|
|
84
|
-
return true;
|
|
85
|
-
}
|
|
86
|
-
return false;
|
|
87
|
-
})();
|
|
88
|
-
const testSubject = regexResult[3].trim();
|
|
89
|
-
const testMetadata = regexResult[5]; // This will be either "time=XXXms" or "SKIP reason" or "TODO reason"
|
|
90
|
-
let testDuration = 0;
|
|
91
|
-
if (testMetadata) {
|
|
92
|
-
const timeMatch = testMetadata.match(/time=(\d+)ms/);
|
|
93
|
-
// const skipMatch = testMetadata.match(/SKIP\s*(.*)/); // Currently unused
|
|
94
|
-
// const todoMatch = testMetadata.match(/TODO\s*(.*)/); // Currently unused
|
|
95
|
-
if (timeMatch) {
|
|
96
|
-
testDuration = parseInt(timeMatch[1]);
|
|
97
|
-
}
|
|
98
|
-
// Skip/todo handling could be added here in the future
|
|
99
|
-
}
|
|
100
|
-
// test for protocol error - disabled as it's not critical
|
|
101
|
-
// The test ID mismatch can occur when tests are filtered, skipped, or use todo
|
|
102
|
-
// if (testId !== this.activeTapTestResult.id) {
|
|
103
|
-
// if (this.logger) {
|
|
104
|
-
// this.logger.error('Something is strange! Test Ids are not equal!');
|
|
105
|
-
// }
|
|
106
|
-
// }
|
|
107
|
-
this.activeTapTestResult.setTestResult(testOk);
|
|
108
|
-
if (testOk) {
|
|
109
|
-
if (this.logger) {
|
|
110
|
-
this.logger.testResult(testSubject, true, testDuration);
|
|
111
|
-
}
|
|
112
|
-
}
|
|
113
|
-
else {
|
|
114
|
-
// Start collecting error details for failed test
|
|
115
|
-
this.collectingErrorDetails = true;
|
|
116
|
-
this.currentTestError = [];
|
|
117
|
-
if (this.logger) {
|
|
118
|
-
this.logger.testResult(testSubject, false, testDuration);
|
|
119
|
-
}
|
|
120
|
-
}
|
|
121
|
-
}
|
|
122
|
-
if (!logLineIsTapProtocol) {
|
|
65
|
+
else {
|
|
66
|
+
// Not a protocol message, handle as console output
|
|
123
67
|
if (this.activeTapTestResult) {
|
|
124
68
|
this.activeTapTestResult.addLogLine(logLine);
|
|
125
69
|
}
|
|
126
|
-
// Check for snapshot communication
|
|
70
|
+
// Check for snapshot communication (legacy)
|
|
127
71
|
const snapshotMatch = logLine.match(/###SNAPSHOT###(.+)###SNAPSHOT###/);
|
|
128
72
|
if (snapshotMatch) {
|
|
129
73
|
const base64Data = snapshotMatch[1];
|
|
@@ -137,45 +81,241 @@ export class TapParser {
|
|
|
137
81
|
}
|
|
138
82
|
}
|
|
139
83
|
}
|
|
84
|
+
else if (this.logger) {
|
|
85
|
+
// This is console output from the test file
|
|
86
|
+
this.logger.testConsoleOutput(logLine);
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
_handleProtocolMessage(message, originalLine) {
|
|
92
|
+
switch (message.type) {
|
|
93
|
+
case 'protocol':
|
|
94
|
+
this.protocolVersion = message.content.version;
|
|
95
|
+
if (this.logger) {
|
|
96
|
+
this.logger.tapOutput(`Protocol version: ${this.protocolVersion}`);
|
|
97
|
+
}
|
|
98
|
+
break;
|
|
99
|
+
case 'version':
|
|
100
|
+
// TAP version, we can ignore this
|
|
101
|
+
break;
|
|
102
|
+
case 'plan':
|
|
103
|
+
const plan = message.content;
|
|
104
|
+
this.expectedTests = plan.end - plan.start + 1;
|
|
105
|
+
if (plan.skipAll) {
|
|
106
|
+
if (this.logger) {
|
|
107
|
+
this.logger.tapOutput(`Skipping all tests: ${plan.skipAll}`);
|
|
108
|
+
}
|
|
109
|
+
}
|
|
140
110
|
else {
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
// Check if this line is an error detail (starts with Error: or has stack trace characteristics)
|
|
144
|
-
if (logLine.trim().startsWith('Error:') || logLine.trim().match(/^\s*at\s/)) {
|
|
145
|
-
this.currentTestError.push(logLine);
|
|
146
|
-
}
|
|
147
|
-
else if (this.currentTestError.length > 0) {
|
|
148
|
-
// End of error details, show the error
|
|
149
|
-
const errorMessage = this.currentTestError.join('\n');
|
|
150
|
-
if (this.logger) {
|
|
151
|
-
this.logger.testErrorDetails(errorMessage);
|
|
152
|
-
}
|
|
153
|
-
this.collectingErrorDetails = false;
|
|
154
|
-
this.currentTestError = [];
|
|
155
|
-
}
|
|
111
|
+
if (this.logger) {
|
|
112
|
+
this.logger.tapOutput(`Expecting ${this.expectedTests} tests!`);
|
|
156
113
|
}
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
114
|
+
}
|
|
115
|
+
// Initialize first TapResult
|
|
116
|
+
this._getNewTapTestResult();
|
|
117
|
+
break;
|
|
118
|
+
case 'test':
|
|
119
|
+
const testResult = message.content;
|
|
120
|
+
// Update active test result
|
|
121
|
+
this.activeTapTestResult.setTestResult(testResult.ok);
|
|
122
|
+
// Extract test duration from metadata
|
|
123
|
+
let testDuration = 0;
|
|
124
|
+
if (testResult.metadata?.time) {
|
|
125
|
+
testDuration = testResult.metadata.time;
|
|
126
|
+
}
|
|
127
|
+
// Log test result
|
|
128
|
+
if (this.logger) {
|
|
129
|
+
if (testResult.ok) {
|
|
130
|
+
this.logger.testResult(testResult.description, true, testDuration);
|
|
131
|
+
}
|
|
132
|
+
else {
|
|
133
|
+
this.logger.testResult(testResult.description, false, testDuration);
|
|
134
|
+
// If there's error metadata, show it
|
|
135
|
+
if (testResult.metadata?.error) {
|
|
136
|
+
const error = testResult.metadata.error;
|
|
137
|
+
let errorDetails = error.message;
|
|
138
|
+
if (error.stack) {
|
|
139
|
+
errorDetails = error.stack;
|
|
140
|
+
}
|
|
141
|
+
this.logger.testErrorDetails(errorDetails);
|
|
162
142
|
}
|
|
163
143
|
}
|
|
164
144
|
}
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
// Ensure any pending error is shown before settling the test
|
|
168
|
-
if (this.collectingErrorDetails && this.currentTestError.length > 0) {
|
|
169
|
-
const errorMessage = this.currentTestError.join('\n');
|
|
145
|
+
// Handle directives (skip/todo)
|
|
146
|
+
if (testResult.directive) {
|
|
170
147
|
if (this.logger) {
|
|
171
|
-
|
|
148
|
+
if (testResult.directive.type === 'skip') {
|
|
149
|
+
this.logger.testConsoleOutput(`Test skipped: ${testResult.directive.reason || 'No reason given'}`);
|
|
150
|
+
}
|
|
151
|
+
else if (testResult.directive.type === 'todo') {
|
|
152
|
+
this.logger.testConsoleOutput(`Test todo: ${testResult.directive.reason || 'No reason given'}`);
|
|
153
|
+
}
|
|
172
154
|
}
|
|
173
|
-
this.collectingErrorDetails = false;
|
|
174
|
-
this.currentTestError = [];
|
|
175
155
|
}
|
|
156
|
+
// Mark test as settled and move to next
|
|
157
|
+
this.activeTapTestResult.testSettled = true;
|
|
176
158
|
this.testStore.push(this.activeTapTestResult);
|
|
177
159
|
this._getNewTapTestResult();
|
|
160
|
+
break;
|
|
161
|
+
case 'comment':
|
|
162
|
+
if (this.logger) {
|
|
163
|
+
// Check if it's a pretask comment
|
|
164
|
+
const pretaskMatch = message.content.match(/^Pretask -> (.+): Success\.$/);
|
|
165
|
+
if (pretaskMatch) {
|
|
166
|
+
this.logger.tapOutput(message.content);
|
|
167
|
+
}
|
|
168
|
+
else {
|
|
169
|
+
this.logger.testConsoleOutput(message.content);
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
break;
|
|
173
|
+
case 'bailout':
|
|
174
|
+
if (this.logger) {
|
|
175
|
+
this.logger.error(`Bail out! ${message.content}`);
|
|
176
|
+
}
|
|
177
|
+
break;
|
|
178
|
+
case 'error':
|
|
179
|
+
const errorBlock = message.content;
|
|
180
|
+
if (this.logger && errorBlock.error) {
|
|
181
|
+
let errorDetails = errorBlock.error.message;
|
|
182
|
+
if (errorBlock.error.stack) {
|
|
183
|
+
errorDetails = errorBlock.error.stack;
|
|
184
|
+
}
|
|
185
|
+
this.logger.testErrorDetails(errorDetails);
|
|
186
|
+
}
|
|
187
|
+
break;
|
|
188
|
+
case 'snapshot':
|
|
189
|
+
// Handle new protocol snapshot format
|
|
190
|
+
const snapshot = message.content;
|
|
191
|
+
this.handleSnapshot({
|
|
192
|
+
path: snapshot.name,
|
|
193
|
+
content: typeof snapshot.content === 'string' ? snapshot.content : JSON.stringify(snapshot.content),
|
|
194
|
+
action: 'compare' // Default action
|
|
195
|
+
});
|
|
196
|
+
break;
|
|
197
|
+
case 'event':
|
|
198
|
+
const event = message.content;
|
|
199
|
+
this._handleTestEvent(event);
|
|
200
|
+
break;
|
|
201
|
+
}
|
|
202
|
+
}
|
|
203
|
+
_handleTestEvent(event) {
|
|
204
|
+
if (!this.logger)
|
|
205
|
+
return;
|
|
206
|
+
switch (event.eventType) {
|
|
207
|
+
case 'test:queued':
|
|
208
|
+
// We can track queued tests if needed
|
|
209
|
+
break;
|
|
210
|
+
case 'test:started':
|
|
211
|
+
this.logger.testConsoleOutput(cs(`Test starting: ${event.data.description}`, 'cyan'));
|
|
212
|
+
if (event.data.retry) {
|
|
213
|
+
this.logger.testConsoleOutput(cs(` Retry attempt ${event.data.retry}`, 'orange'));
|
|
214
|
+
}
|
|
215
|
+
break;
|
|
216
|
+
case 'test:progress':
|
|
217
|
+
if (event.data.progress !== undefined) {
|
|
218
|
+
this.logger.testConsoleOutput(cs(` Progress: ${event.data.progress}%`, 'cyan'));
|
|
219
|
+
}
|
|
220
|
+
break;
|
|
221
|
+
case 'test:completed':
|
|
222
|
+
// Test completion is already handled by the test result
|
|
223
|
+
// This event provides additional timing info if needed
|
|
224
|
+
break;
|
|
225
|
+
case 'suite:started':
|
|
226
|
+
this.logger.testConsoleOutput(cs(`\nSuite: ${event.data.suiteName}`, 'blue'));
|
|
227
|
+
break;
|
|
228
|
+
case 'suite:completed':
|
|
229
|
+
this.logger.testConsoleOutput(cs(`Suite completed: ${event.data.suiteName}\n`, 'blue'));
|
|
230
|
+
break;
|
|
231
|
+
case 'hook:started':
|
|
232
|
+
this.logger.testConsoleOutput(cs(` Hook: ${event.data.hookName}`, 'cyan'));
|
|
233
|
+
break;
|
|
234
|
+
case 'hook:completed':
|
|
235
|
+
// Silent unless there's an error
|
|
236
|
+
if (event.data.error) {
|
|
237
|
+
this.logger.testConsoleOutput(cs(` Hook failed: ${event.data.hookName}`, 'red'));
|
|
238
|
+
}
|
|
239
|
+
break;
|
|
240
|
+
case 'assertion:failed':
|
|
241
|
+
// Enhanced assertion failure with diff
|
|
242
|
+
if (event.data.error) {
|
|
243
|
+
this._displayAssertionError(event.data.error);
|
|
244
|
+
}
|
|
245
|
+
break;
|
|
246
|
+
}
|
|
247
|
+
}
|
|
248
|
+
_displayAssertionError(error) {
|
|
249
|
+
if (!this.logger)
|
|
250
|
+
return;
|
|
251
|
+
// Display error message
|
|
252
|
+
if (error.message) {
|
|
253
|
+
this.logger.testErrorDetails(error.message);
|
|
254
|
+
}
|
|
255
|
+
// Display visual diff if available
|
|
256
|
+
if (error.diff) {
|
|
257
|
+
this._displayDiff(error.diff, error.expected, error.actual);
|
|
258
|
+
}
|
|
259
|
+
}
|
|
260
|
+
_displayDiff(diff, expected, actual) {
|
|
261
|
+
if (!this.logger)
|
|
262
|
+
return;
|
|
263
|
+
this.logger.testConsoleOutput(cs('\n Diff:', 'cyan'));
|
|
264
|
+
switch (diff.type) {
|
|
265
|
+
case 'string':
|
|
266
|
+
this._displayStringDiff(diff.changes);
|
|
267
|
+
break;
|
|
268
|
+
case 'object':
|
|
269
|
+
this._displayObjectDiff(diff.changes, expected, actual);
|
|
270
|
+
break;
|
|
271
|
+
case 'array':
|
|
272
|
+
this._displayArrayDiff(diff.changes, expected, actual);
|
|
273
|
+
break;
|
|
274
|
+
case 'primitive':
|
|
275
|
+
this._displayPrimitiveDiff(diff.changes);
|
|
276
|
+
break;
|
|
277
|
+
}
|
|
278
|
+
}
|
|
279
|
+
_displayStringDiff(changes) {
|
|
280
|
+
for (const change of changes) {
|
|
281
|
+
const linePrefix = ` Line ${change.line + 1}: `;
|
|
282
|
+
if (change.type === 'add') {
|
|
283
|
+
this.logger.testConsoleOutput(cs(`${linePrefix}+ ${change.content}`, 'green'));
|
|
178
284
|
}
|
|
285
|
+
else if (change.type === 'remove') {
|
|
286
|
+
this.logger.testConsoleOutput(cs(`${linePrefix}- ${change.content}`, 'red'));
|
|
287
|
+
}
|
|
288
|
+
}
|
|
289
|
+
}
|
|
290
|
+
_displayObjectDiff(changes, expected, actual) {
|
|
291
|
+
this.logger.testConsoleOutput(cs(' Expected:', 'red'));
|
|
292
|
+
this.logger.testConsoleOutput(` ${JSON.stringify(expected, null, 2)}`);
|
|
293
|
+
this.logger.testConsoleOutput(cs(' Actual:', 'green'));
|
|
294
|
+
this.logger.testConsoleOutput(` ${JSON.stringify(actual, null, 2)}`);
|
|
295
|
+
this.logger.testConsoleOutput(cs('\n Changes:', 'cyan'));
|
|
296
|
+
for (const change of changes) {
|
|
297
|
+
const path = change.path.join('.');
|
|
298
|
+
if (change.type === 'add') {
|
|
299
|
+
this.logger.testConsoleOutput(cs(` + ${path}: ${JSON.stringify(change.newValue)}`, 'green'));
|
|
300
|
+
}
|
|
301
|
+
else if (change.type === 'remove') {
|
|
302
|
+
this.logger.testConsoleOutput(cs(` - ${path}: ${JSON.stringify(change.oldValue)}`, 'red'));
|
|
303
|
+
}
|
|
304
|
+
else if (change.type === 'modify') {
|
|
305
|
+
this.logger.testConsoleOutput(cs(` ~ ${path}:`, 'cyan'));
|
|
306
|
+
this.logger.testConsoleOutput(cs(` - ${JSON.stringify(change.oldValue)}`, 'red'));
|
|
307
|
+
this.logger.testConsoleOutput(cs(` + ${JSON.stringify(change.newValue)}`, 'green'));
|
|
308
|
+
}
|
|
309
|
+
}
|
|
310
|
+
}
|
|
311
|
+
_displayArrayDiff(changes, expected, actual) {
|
|
312
|
+
this._displayObjectDiff(changes, expected, actual);
|
|
313
|
+
}
|
|
314
|
+
_displayPrimitiveDiff(changes) {
|
|
315
|
+
const change = changes[0];
|
|
316
|
+
if (change) {
|
|
317
|
+
this.logger.testConsoleOutput(cs(` Expected: ${JSON.stringify(change.oldValue)}`, 'red'));
|
|
318
|
+
this.logger.testConsoleOutput(cs(` Actual: ${JSON.stringify(change.newValue)}`, 'green'));
|
|
179
319
|
}
|
|
180
320
|
}
|
|
181
321
|
/**
|
|
@@ -327,4 +467,4 @@ export class TapParser {
|
|
|
327
467
|
}
|
|
328
468
|
}
|
|
329
469
|
}
|
|
330
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tstest.classes.tap.parser.js","sourceRoot":"","sources":["../ts/tstest.classes.tap.parser.ts"],"names":[],"mappings":"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"}
|
|
470
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tstest.classes.tap.parser.js","sourceRoot":"","sources":["../ts/tstest.classes.tap.parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
import { ChildProcess } from 'child_process';
|
|
2
|
+
import { TapTestResult } from './tstest.classes.tap.testresult.js';
|
|
3
|
+
import { TsTestLogger } from './tstest.logging.js';
|
|
4
|
+
export declare class TapParser {
|
|
5
|
+
fileName: string;
|
|
6
|
+
testStore: TapTestResult[];
|
|
7
|
+
expectedTestsRegex: RegExp;
|
|
8
|
+
expectedTests: number;
|
|
9
|
+
receivedTests: number;
|
|
10
|
+
testStatusRegex: RegExp;
|
|
11
|
+
activeTapTestResult: TapTestResult;
|
|
12
|
+
collectingErrorDetails: boolean;
|
|
13
|
+
currentTestError: string[];
|
|
14
|
+
pretaskRegex: RegExp;
|
|
15
|
+
private logger;
|
|
16
|
+
private protocolParser;
|
|
17
|
+
/**
|
|
18
|
+
* the constructor for TapParser
|
|
19
|
+
*/
|
|
20
|
+
constructor(fileName: string, logger?: TsTestLogger);
|
|
21
|
+
/**
|
|
22
|
+
* Handle test file timeout
|
|
23
|
+
*/
|
|
24
|
+
handleTimeout(timeoutSeconds: number): void;
|
|
25
|
+
private _getNewTapTestResult;
|
|
26
|
+
private _processLog;
|
|
27
|
+
/**
|
|
28
|
+
* returns all tests that are not completed
|
|
29
|
+
*/
|
|
30
|
+
getUncompletedTests(): void;
|
|
31
|
+
/**
|
|
32
|
+
* returns all tests that threw an error
|
|
33
|
+
*/
|
|
34
|
+
getErrorTests(): TapTestResult[];
|
|
35
|
+
/**
|
|
36
|
+
* returns a test overview as string
|
|
37
|
+
*/
|
|
38
|
+
getTestOverviewAsString(): string;
|
|
39
|
+
/**
|
|
40
|
+
* handles a tap process
|
|
41
|
+
* @param childProcessArg
|
|
42
|
+
*/
|
|
43
|
+
handleTapProcess(childProcessArg: ChildProcess): Promise<void>;
|
|
44
|
+
handleTapLog(tapLog: string): Promise<void>;
|
|
45
|
+
/**
|
|
46
|
+
* Handle snapshot data from the test
|
|
47
|
+
*/
|
|
48
|
+
private handleSnapshot;
|
|
49
|
+
evaluateFinalResult(): Promise<void>;
|
|
50
|
+
}
|