@git.zone/tstest 1.9.4 → 1.10.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 +49 -8
- package/dist_ts/tstest.classes.tstest.d.ts +3 -1
- package/dist_ts/tstest.classes.tstest.js +20 -3
- package/package.json +1 -1
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/index.ts +48 -7
- package/ts/tstest.classes.tstest.ts +23 -2
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@git.zone/tstest',
|
|
6
|
-
version: '1.
|
|
6
|
+
version: '1.10.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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxrQkFBa0I7SUFDeEIsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLHFEQUFxRDtDQUNuRSxDQUFBIn0=
|
package/dist_ts/index.js
CHANGED
|
@@ -11,6 +11,8 @@ export const runCli = async () => {
|
|
|
11
11
|
const logOptions = {};
|
|
12
12
|
let testPath = null;
|
|
13
13
|
let tags = [];
|
|
14
|
+
let startFromFile = null;
|
|
15
|
+
let stopAtFile = null;
|
|
14
16
|
// Parse options
|
|
15
17
|
for (let i = 0; i < args.length; i++) {
|
|
16
18
|
const arg = args[i];
|
|
@@ -38,22 +40,57 @@ export const runCli = async () => {
|
|
|
38
40
|
tags = args[++i].split(',');
|
|
39
41
|
}
|
|
40
42
|
break;
|
|
43
|
+
case '--startFrom':
|
|
44
|
+
if (i + 1 < args.length) {
|
|
45
|
+
const value = parseInt(args[++i], 10);
|
|
46
|
+
if (isNaN(value) || value < 1) {
|
|
47
|
+
console.error('Error: --startFrom must be a positive integer');
|
|
48
|
+
process.exit(1);
|
|
49
|
+
}
|
|
50
|
+
startFromFile = value;
|
|
51
|
+
}
|
|
52
|
+
else {
|
|
53
|
+
console.error('Error: --startFrom requires a number argument');
|
|
54
|
+
process.exit(1);
|
|
55
|
+
}
|
|
56
|
+
break;
|
|
57
|
+
case '--stopAt':
|
|
58
|
+
if (i + 1 < args.length) {
|
|
59
|
+
const value = parseInt(args[++i], 10);
|
|
60
|
+
if (isNaN(value) || value < 1) {
|
|
61
|
+
console.error('Error: --stopAt must be a positive integer');
|
|
62
|
+
process.exit(1);
|
|
63
|
+
}
|
|
64
|
+
stopAtFile = value;
|
|
65
|
+
}
|
|
66
|
+
else {
|
|
67
|
+
console.error('Error: --stopAt requires a number argument');
|
|
68
|
+
process.exit(1);
|
|
69
|
+
}
|
|
70
|
+
break;
|
|
41
71
|
default:
|
|
42
72
|
if (!arg.startsWith('-')) {
|
|
43
73
|
testPath = arg;
|
|
44
74
|
}
|
|
45
75
|
}
|
|
46
76
|
}
|
|
77
|
+
// Validate test file range options
|
|
78
|
+
if (startFromFile !== null && stopAtFile !== null && startFromFile > stopAtFile) {
|
|
79
|
+
console.error('Error: --startFrom cannot be greater than --stopAt');
|
|
80
|
+
process.exit(1);
|
|
81
|
+
}
|
|
47
82
|
if (!testPath) {
|
|
48
83
|
console.error('You must specify a test directory/file/pattern as argument. Please try again.');
|
|
49
84
|
console.error('\nUsage: tstest <path> [options]');
|
|
50
85
|
console.error('\nOptions:');
|
|
51
|
-
console.error(' --quiet, -q
|
|
52
|
-
console.error(' --verbose, -v
|
|
53
|
-
console.error(' --no-color
|
|
54
|
-
console.error(' --json
|
|
55
|
-
console.error(' --logfile
|
|
56
|
-
console.error(' --tags
|
|
86
|
+
console.error(' --quiet, -q Minimal output');
|
|
87
|
+
console.error(' --verbose, -v Verbose output');
|
|
88
|
+
console.error(' --no-color Disable colored output');
|
|
89
|
+
console.error(' --json Output results as JSON');
|
|
90
|
+
console.error(' --logfile Write logs to .nogit/testlogs/[testfile].log');
|
|
91
|
+
console.error(' --tags <tags> Run only tests with specified tags (comma-separated)');
|
|
92
|
+
console.error(' --startFrom <n> Start running from test file number n');
|
|
93
|
+
console.error(' --stopAt <n> Stop running at test file number n');
|
|
57
94
|
process.exit(1);
|
|
58
95
|
}
|
|
59
96
|
let executionMode;
|
|
@@ -67,7 +104,11 @@ export const runCli = async () => {
|
|
|
67
104
|
else {
|
|
68
105
|
executionMode = TestExecutionMode.DIRECTORY;
|
|
69
106
|
}
|
|
70
|
-
const tsTestInstance = new TsTest(process.cwd(), testPath, executionMode, logOptions, tags);
|
|
107
|
+
const tsTestInstance = new TsTest(process.cwd(), testPath, executionMode, logOptions, tags, startFromFile, stopAtFile);
|
|
71
108
|
await tsTestInstance.run();
|
|
72
109
|
};
|
|
73
|
-
|
|
110
|
+
// Execute CLI when this file is run directly
|
|
111
|
+
if (import.meta.url === `file://${process.argv[1]}`) {
|
|
112
|
+
runCli();
|
|
113
|
+
}
|
|
114
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFHcEQsTUFBTSxDQUFOLElBQVksaUJBSVg7QUFKRCxXQUFZLGlCQUFpQjtJQUMzQiw0Q0FBdUIsQ0FBQTtJQUN2QixrQ0FBYSxDQUFBO0lBQ2Isa0NBQWEsQ0FBQTtBQUNmLENBQUMsRUFKVyxpQkFBaUIsS0FBakIsaUJBQWlCLFFBSTVCO0FBRUQsTUFBTSxDQUFDLE1BQU0sTUFBTSxHQUFHLEtBQUssSUFBSSxFQUFFO0lBQy9CLCtCQUErQjtJQUMvQixNQUFNLElBQUksR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNuQyxNQUFNLFVBQVUsR0FBZSxFQUFFLENBQUM7SUFDbEMsSUFBSSxRQUFRLEdBQWtCLElBQUksQ0FBQztJQUNuQyxJQUFJLElBQUksR0FBYSxFQUFFLENBQUM7SUFDeEIsSUFBSSxhQUFhLEdBQWtCLElBQUksQ0FBQztJQUN4QyxJQUFJLFVBQVUsR0FBa0IsSUFBSSxDQUFDO0lBRXJDLGdCQUFnQjtJQUNoQixLQUFLLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDO1FBQ3JDLE1BQU0sR0FBRyxHQUFHLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUVwQixRQUFRLEdBQUcsRUFBRSxDQUFDO1lBQ1osS0FBSyxTQUFTLENBQUM7WUFDZixLQUFLLElBQUk7Z0JBQ1AsVUFBVSxDQUFDLEtBQUssR0FBRyxJQUFJLENBQUM7Z0JBQ3hCLE1BQU07WUFDUixLQUFLLFdBQVcsQ0FBQztZQUNqQixLQUFLLElBQUk7Z0JBQ1AsVUFBVSxDQUFDLE9BQU8sR0FBRyxJQUFJLENBQUM7Z0JBQzFCLE1BQU07WUFD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
|
|
@@ -9,10 +9,12 @@ export declare class TsTest {
|
|
|
9
9
|
executionMode: TestExecutionMode;
|
|
10
10
|
logger: TsTestLogger;
|
|
11
11
|
filterTags: string[];
|
|
12
|
+
startFromFile: number | null;
|
|
13
|
+
stopAtFile: number | null;
|
|
12
14
|
smartshellInstance: plugins.smartshell.Smartshell;
|
|
13
15
|
smartbrowserInstance: plugins.smartbrowser.SmartBrowser;
|
|
14
16
|
tsbundleInstance: plugins.tsbundle.TsBundle;
|
|
15
|
-
constructor(cwdArg: string, testPathArg: string, executionModeArg: TestExecutionMode, logOptions?: LogOptions, tags?: string[]);
|
|
17
|
+
constructor(cwdArg: string, testPathArg: string, executionModeArg: TestExecutionMode, logOptions?: LogOptions, tags?: string[], startFromFile?: number | null, stopAtFile?: number | null);
|
|
16
18
|
run(): Promise<void>;
|
|
17
19
|
private runSingleTest;
|
|
18
20
|
runInNode(fileNameArg: string, index: number, total: number): Promise<TapParser>;
|
|
@@ -8,7 +8,7 @@ import { TapParser } from './tstest.classes.tap.parser.js';
|
|
|
8
8
|
import { TestExecutionMode } from './index.js';
|
|
9
9
|
import { TsTestLogger } from './tstest.logging.js';
|
|
10
10
|
export class TsTest {
|
|
11
|
-
constructor(cwdArg, testPathArg, executionModeArg, logOptions = {}, tags = []) {
|
|
11
|
+
constructor(cwdArg, testPathArg, executionModeArg, logOptions = {}, tags = [], startFromFile = null, stopAtFile = null) {
|
|
12
12
|
this.smartshellInstance = new plugins.smartshell.Smartshell({
|
|
13
13
|
executor: 'bash',
|
|
14
14
|
pathDirectories: [paths.binDirectory],
|
|
@@ -20,10 +20,27 @@ export class TsTest {
|
|
|
20
20
|
this.testDir = new TestDirectory(cwdArg, testPathArg, executionModeArg);
|
|
21
21
|
this.logger = new TsTestLogger(logOptions);
|
|
22
22
|
this.filterTags = tags;
|
|
23
|
+
this.startFromFile = startFromFile;
|
|
24
|
+
this.stopAtFile = stopAtFile;
|
|
23
25
|
}
|
|
24
26
|
async run() {
|
|
25
27
|
const testGroups = await this.testDir.getTestFileGroups();
|
|
26
|
-
|
|
28
|
+
let allFiles = [...testGroups.serial, ...Object.values(testGroups.parallelGroups).flat()];
|
|
29
|
+
// Apply file range filtering if specified
|
|
30
|
+
if (this.startFromFile !== null || this.stopAtFile !== null) {
|
|
31
|
+
const startIndex = this.startFromFile ? this.startFromFile - 1 : 0; // Convert to 0-based index
|
|
32
|
+
const endIndex = this.stopAtFile ? this.stopAtFile : allFiles.length;
|
|
33
|
+
allFiles = allFiles.slice(startIndex, endIndex);
|
|
34
|
+
// Filter the serial and parallel groups based on remaining files
|
|
35
|
+
testGroups.serial = testGroups.serial.filter(file => allFiles.includes(file));
|
|
36
|
+
Object.keys(testGroups.parallelGroups).forEach(groupName => {
|
|
37
|
+
testGroups.parallelGroups[groupName] = testGroups.parallelGroups[groupName].filter(file => allFiles.includes(file));
|
|
38
|
+
// Remove empty groups
|
|
39
|
+
if (testGroups.parallelGroups[groupName].length === 0) {
|
|
40
|
+
delete testGroups.parallelGroups[groupName];
|
|
41
|
+
}
|
|
42
|
+
});
|
|
43
|
+
}
|
|
27
44
|
// Log test discovery
|
|
28
45
|
this.logger.testDiscovery(allFiles.length, this.testDir.testPath, this.executionMode);
|
|
29
46
|
const tapCombinator = new TapCombinator(this.logger); // lets create the TapCombinator
|
|
@@ -202,4 +219,4 @@ export class TsTest {
|
|
|
202
219
|
}
|
|
203
220
|
async runInDeno() { }
|
|
204
221
|
}
|
|
205
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tstest.classes.tstest.js","sourceRoot":"","sources":["../ts/tstest.classes.tstest.ts"],"names":[],"mappings":"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"}
|
|
222
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tstest.classes.tstest.js","sourceRoot":"","sources":["../ts/tstest.classes.tstest.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/ts/00_commitinfo_data.ts
CHANGED
package/ts/index.ts
CHANGED
|
@@ -13,6 +13,8 @@ export const runCli = async () => {
|
|
|
13
13
|
const logOptions: LogOptions = {};
|
|
14
14
|
let testPath: string | null = null;
|
|
15
15
|
let tags: string[] = [];
|
|
16
|
+
let startFromFile: number | null = null;
|
|
17
|
+
let stopAtFile: number | null = null;
|
|
16
18
|
|
|
17
19
|
// Parse options
|
|
18
20
|
for (let i = 0; i < args.length; i++) {
|
|
@@ -42,6 +44,32 @@ export const runCli = async () => {
|
|
|
42
44
|
tags = args[++i].split(',');
|
|
43
45
|
}
|
|
44
46
|
break;
|
|
47
|
+
case '--startFrom':
|
|
48
|
+
if (i + 1 < args.length) {
|
|
49
|
+
const value = parseInt(args[++i], 10);
|
|
50
|
+
if (isNaN(value) || value < 1) {
|
|
51
|
+
console.error('Error: --startFrom must be a positive integer');
|
|
52
|
+
process.exit(1);
|
|
53
|
+
}
|
|
54
|
+
startFromFile = value;
|
|
55
|
+
} else {
|
|
56
|
+
console.error('Error: --startFrom requires a number argument');
|
|
57
|
+
process.exit(1);
|
|
58
|
+
}
|
|
59
|
+
break;
|
|
60
|
+
case '--stopAt':
|
|
61
|
+
if (i + 1 < args.length) {
|
|
62
|
+
const value = parseInt(args[++i], 10);
|
|
63
|
+
if (isNaN(value) || value < 1) {
|
|
64
|
+
console.error('Error: --stopAt must be a positive integer');
|
|
65
|
+
process.exit(1);
|
|
66
|
+
}
|
|
67
|
+
stopAtFile = value;
|
|
68
|
+
} else {
|
|
69
|
+
console.error('Error: --stopAt requires a number argument');
|
|
70
|
+
process.exit(1);
|
|
71
|
+
}
|
|
72
|
+
break;
|
|
45
73
|
default:
|
|
46
74
|
if (!arg.startsWith('-')) {
|
|
47
75
|
testPath = arg;
|
|
@@ -49,16 +77,24 @@ export const runCli = async () => {
|
|
|
49
77
|
}
|
|
50
78
|
}
|
|
51
79
|
|
|
80
|
+
// Validate test file range options
|
|
81
|
+
if (startFromFile !== null && stopAtFile !== null && startFromFile > stopAtFile) {
|
|
82
|
+
console.error('Error: --startFrom cannot be greater than --stopAt');
|
|
83
|
+
process.exit(1);
|
|
84
|
+
}
|
|
85
|
+
|
|
52
86
|
if (!testPath) {
|
|
53
87
|
console.error('You must specify a test directory/file/pattern as argument. Please try again.');
|
|
54
88
|
console.error('\nUsage: tstest <path> [options]');
|
|
55
89
|
console.error('\nOptions:');
|
|
56
|
-
console.error(' --quiet, -q
|
|
57
|
-
console.error(' --verbose, -v
|
|
58
|
-
console.error(' --no-color
|
|
59
|
-
console.error(' --json
|
|
60
|
-
console.error(' --logfile
|
|
61
|
-
console.error(' --tags
|
|
90
|
+
console.error(' --quiet, -q Minimal output');
|
|
91
|
+
console.error(' --verbose, -v Verbose output');
|
|
92
|
+
console.error(' --no-color Disable colored output');
|
|
93
|
+
console.error(' --json Output results as JSON');
|
|
94
|
+
console.error(' --logfile Write logs to .nogit/testlogs/[testfile].log');
|
|
95
|
+
console.error(' --tags <tags> Run only tests with specified tags (comma-separated)');
|
|
96
|
+
console.error(' --startFrom <n> Start running from test file number n');
|
|
97
|
+
console.error(' --stopAt <n> Stop running at test file number n');
|
|
62
98
|
process.exit(1);
|
|
63
99
|
}
|
|
64
100
|
|
|
@@ -73,6 +109,11 @@ export const runCli = async () => {
|
|
|
73
109
|
executionMode = TestExecutionMode.DIRECTORY;
|
|
74
110
|
}
|
|
75
111
|
|
|
76
|
-
const tsTestInstance = new TsTest(process.cwd(), testPath, executionMode, logOptions, tags);
|
|
112
|
+
const tsTestInstance = new TsTest(process.cwd(), testPath, executionMode, logOptions, tags, startFromFile, stopAtFile);
|
|
77
113
|
await tsTestInstance.run();
|
|
78
114
|
};
|
|
115
|
+
|
|
116
|
+
// Execute CLI when this file is run directly
|
|
117
|
+
if (import.meta.url === `file://${process.argv[1]}`) {
|
|
118
|
+
runCli();
|
|
119
|
+
}
|
|
@@ -16,6 +16,8 @@ export class TsTest {
|
|
|
16
16
|
public executionMode: TestExecutionMode;
|
|
17
17
|
public logger: TsTestLogger;
|
|
18
18
|
public filterTags: string[];
|
|
19
|
+
public startFromFile: number | null;
|
|
20
|
+
public stopAtFile: number | null;
|
|
19
21
|
|
|
20
22
|
public smartshellInstance = new plugins.smartshell.Smartshell({
|
|
21
23
|
executor: 'bash',
|
|
@@ -26,16 +28,35 @@ export class TsTest {
|
|
|
26
28
|
|
|
27
29
|
public tsbundleInstance = new plugins.tsbundle.TsBundle();
|
|
28
30
|
|
|
29
|
-
constructor(cwdArg: string, testPathArg: string, executionModeArg: TestExecutionMode, logOptions: LogOptions = {}, tags: string[] = []) {
|
|
31
|
+
constructor(cwdArg: string, testPathArg: string, executionModeArg: TestExecutionMode, logOptions: LogOptions = {}, tags: string[] = [], startFromFile: number | null = null, stopAtFile: number | null = null) {
|
|
30
32
|
this.executionMode = executionModeArg;
|
|
31
33
|
this.testDir = new TestDirectory(cwdArg, testPathArg, executionModeArg);
|
|
32
34
|
this.logger = new TsTestLogger(logOptions);
|
|
33
35
|
this.filterTags = tags;
|
|
36
|
+
this.startFromFile = startFromFile;
|
|
37
|
+
this.stopAtFile = stopAtFile;
|
|
34
38
|
}
|
|
35
39
|
|
|
36
40
|
async run() {
|
|
37
41
|
const testGroups = await this.testDir.getTestFileGroups();
|
|
38
|
-
|
|
42
|
+
let allFiles = [...testGroups.serial, ...Object.values(testGroups.parallelGroups).flat()];
|
|
43
|
+
|
|
44
|
+
// Apply file range filtering if specified
|
|
45
|
+
if (this.startFromFile !== null || this.stopAtFile !== null) {
|
|
46
|
+
const startIndex = this.startFromFile ? this.startFromFile - 1 : 0; // Convert to 0-based index
|
|
47
|
+
const endIndex = this.stopAtFile ? this.stopAtFile : allFiles.length;
|
|
48
|
+
allFiles = allFiles.slice(startIndex, endIndex);
|
|
49
|
+
|
|
50
|
+
// Filter the serial and parallel groups based on remaining files
|
|
51
|
+
testGroups.serial = testGroups.serial.filter(file => allFiles.includes(file));
|
|
52
|
+
Object.keys(testGroups.parallelGroups).forEach(groupName => {
|
|
53
|
+
testGroups.parallelGroups[groupName] = testGroups.parallelGroups[groupName].filter(file => allFiles.includes(file));
|
|
54
|
+
// Remove empty groups
|
|
55
|
+
if (testGroups.parallelGroups[groupName].length === 0) {
|
|
56
|
+
delete testGroups.parallelGroups[groupName];
|
|
57
|
+
}
|
|
58
|
+
});
|
|
59
|
+
}
|
|
39
60
|
|
|
40
61
|
// Log test discovery
|
|
41
62
|
this.logger.testDiscovery(
|