Compare commits

...

4 Commits

Author SHA1 Message Date
1e8ab2d7a2 3.2.0 2019-11-16 23:40:38 +01:00
427878763e feat(pretask): introduce new pretask functionality for setting up testing environment 2019-11-16 23:40:36 +01:00
bdcc94e723 3.1.0 2019-11-16 19:22:21 +01:00
3ac46b2363 feat(tools): can now ensure certain directories 2019-11-16 19:22:20 +01:00
8 changed files with 373 additions and 476 deletions

745
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,7 @@
{ {
"name": "@pushrocks/tapbundle", "name": "@pushrocks/tapbundle",
"private": false, "private": false,
"version": "3.0.14", "version": "3.2.0",
"description": "tap bundled for tapbuffer", "description": "tap bundled for tapbuffer",
"main": "dist/index.js", "main": "dist/index.js",
"typings": "dist/index.d.ts", "typings": "dist/index.d.ts",
@ -22,6 +22,7 @@
"dependencies": { "dependencies": {
"@pushrocks/early": "^3.0.3", "@pushrocks/early": "^3.0.3",
"@pushrocks/smartdelay": "^2.0.3", "@pushrocks/smartdelay": "^2.0.3",
"@pushrocks/smartfile": "^7.0.6",
"@pushrocks/smartpromise": "^3.0.2", "@pushrocks/smartpromise": "^3.0.2",
"smartchai": "^2.0.1" "smartchai": "^2.0.1"
}, },

View File

@ -0,0 +1,19 @@
import * as plugins from './tapbundle.plugins';
import { TapTools } from './tapbundle.classes.taptools';
export interface IPreTaskFunction {
(tapTools?: TapTools): Promise<any>;
}
export class PreTask {
public preTaskFunction: IPreTaskFunction;
constructor(preTaskFunctionArg: IPreTaskFunction) {
this.preTaskFunction = preTaskFunctionArg;
}
public async run () {
await this.preTaskFunction(new TapTools(null));
}
}

View File

@ -1,5 +1,6 @@
import * as plugins from './tapbundle.plugins'; import * as plugins from './tapbundle.plugins';
import { IPreTaskFunction, PreTask } from './tapbundle.classes.pretask';
import { TapTest, ITestFunction } from './tapbundle.classes.taptest'; import { TapTest, ITestFunction } from './tapbundle.classes.taptest';
import { TapWrap, ITapWrapFunction } from './tapbundle.classes.tapwrap'; import { TapWrap, ITapWrapFunction } from './tapbundle.classes.tapwrap';
export class Tap { export class Tap {
@ -7,7 +8,7 @@ export class Tap {
* skips a test * skips a test
* tests marked with tap.skip.test() are never executed * tests marked with tap.skip.test() are never executed
*/ */
skip = { public skip = {
test: (descriptionArg: string, functionArg: ITestFunction) => { test: (descriptionArg: string, functionArg: ITestFunction) => {
console.log(`skipped test: ${descriptionArg}`); console.log(`skipped test: ${descriptionArg}`);
}, },
@ -19,12 +20,13 @@ export class Tap {
/** /**
* only executes tests marked as ONLY * only executes tests marked as ONLY
*/ */
only = { public only = {
test: (descriptionArg: string, testFunctionArg: ITestFunction) => { test: (descriptionArg: string, testFunctionArg: ITestFunction) => {
this.test(descriptionArg, testFunctionArg, 'only'); this.test(descriptionArg, testFunctionArg, 'only');
} }
}; };
private _tapPreTasks: PreTask[] = [];
private _tapTests: TapTest[] = []; private _tapTests: TapTest[] = [];
private _tapTestsOnly: TapTest[] = []; private _tapTestsOnly: TapTest[] = [];
@ -33,14 +35,14 @@ export class Tap {
* @param testDescription - A description of what the test does * @param testDescription - A description of what the test does
* @param testFunction - A Function that returns a Promise and resolves or rejects * @param testFunction - A Function that returns a Promise and resolves or rejects
*/ */
async test( public async test(
testDescription: string, testDescription: string,
testFunction: ITestFunction, testFunction: ITestFunction,
modeArg: 'normal' | 'only' | 'skip' = 'normal' modeArg: 'normal' | 'only' | 'skip' = 'normal'
) { ) {
let localTest = new TapTest({ const localTest = new TapTest({
description: testDescription, description: testDescription,
testFunction: testFunction, testFunction,
parallel: false parallel: false
}); });
if (modeArg === 'normal') { if (modeArg === 'normal') {
@ -51,10 +53,14 @@ export class Tap {
return localTest; return localTest;
} }
public preTask (functionArg: IPreTaskFunction) {
this._tapPreTasks.push(new PreTask(functionArg));
}
/** /**
* wraps function * wraps function
*/ */
wrap(functionArg: ITapWrapFunction) { public wrap(functionArg: ITapWrapFunction) {
return new TapWrap(functionArg); return new TapWrap(functionArg);
} }
@ -63,11 +69,11 @@ export class Tap {
* @param testDescription - A description of what the test does * @param testDescription - A description of what the test does
* @param testFunction - A Function that returns a Promise and resolves or rejects * @param testFunction - A Function that returns a Promise and resolves or rejects
*/ */
testParallel(testDescription: string, testFunction: ITestFunction) { public testParallel(testDescription: string, testFunction: ITestFunction) {
this._tapTests.push( this._tapTests.push(
new TapTest({ new TapTest({
description: testDescription, description: testDescription,
testFunction: testFunction, testFunction,
parallel: true parallel: true
}) })
); );
@ -76,12 +82,13 @@ export class Tap {
/** /**
* starts the test evaluation * starts the test evaluation
*/ */
async start(optionsArg?: { throwOnError: boolean }) { public async start(optionsArg?: { throwOnError: boolean }) {
let promiseArray: Promise<any>[] = []; const promiseArray: Array<Promise<any>> = [];
// safeguard against empty test array // safeguard against empty test array
if (this._tapTests.length === 0) { if (this._tapTests.length === 0) {
console.log('no tests specified. Ending here!'); console.log('no tests specified. Ending here!');
// TODO: throw proper error
return; return;
} }
@ -93,10 +100,15 @@ export class Tap {
concerningTests = this._tapTests; concerningTests = this._tapTests;
} }
// lets run the pretasks
for (const preTask of this._tapPreTasks) {
await preTask.run();
}
console.log(`1..${concerningTests.length}`); console.log(`1..${concerningTests.length}`);
for (let testKey = 0; testKey < concerningTests.length; testKey++) { for (let testKey = 0; testKey < concerningTests.length; testKey++) {
let currentTest = concerningTests[testKey]; const currentTest = concerningTests[testKey];
let testPromise = currentTest.run(testKey); const testPromise = currentTest.run(testKey);
if (currentTest.parallel) { if (currentTest.parallel) {
promiseArray.push(testPromise); promiseArray.push(testPromise);
} else { } else {
@ -106,10 +118,10 @@ export class Tap {
await Promise.all(promiseArray); await Promise.all(promiseArray);
// when tests have been run and all promises are fullfilled // when tests have been run and all promises are fullfilled
let failReasons: string[] = []; const failReasons: string[] = [];
let executionNotes: string[] = []; const executionNotes: string[] = [];
// collect failed tests // collect failed tests
for (let tapTest of concerningTests) { for (const tapTest of concerningTests) {
if (tapTest.status !== 'success') { if (tapTest.status !== 'success') {
failReasons.push( failReasons.push(
`Test ${tapTest.testKey + 1} failed with status ${tapTest.status}:\n` + `Test ${tapTest.testKey + 1} failed with status ${tapTest.status}:\n` +
@ -120,7 +132,7 @@ export class Tap {
} }
// render fail Reasons // render fail Reasons
for (let failReason of failReasons) { for (const failReason of failReasons) {
console.log(failReason); console.log(failReason);
} }
@ -132,7 +144,7 @@ export class Tap {
/** /**
* handle errors * handle errors
*/ */
threw(err) { public threw(err) {
console.log(err); console.log(err);
} }
} }

View File

@ -9,21 +9,19 @@ import { Deferred } from '@pushrocks/smartpromise';
// interfaces // interfaces
export type TTestStatus = 'success' | 'error' | 'pending' | 'errorAfterSuccess' | 'timeout'; export type TTestStatus = 'success' | 'error' | 'pending' | 'errorAfterSuccess' | 'timeout';
export interface ITestFunction { export type ITestFunction = (tapTools?: TapTools) => Promise<any>;
(tapTools?: TapTools): Promise<any>;
}
export class TapTest { export class TapTest {
description: string; public description: string;
failureAllowed: boolean; public failureAllowed: boolean;
hrtMeasurement: HrtMeasurement; public hrtMeasurement: HrtMeasurement;
parallel: boolean; public parallel: boolean;
status: TTestStatus; public status: TTestStatus;
tapTools: TapTools; public tapTools: TapTools;
testFunction: ITestFunction; public testFunction: ITestFunction;
testKey: number; // the testKey the position in the test qeue. Set upon calling .run() public testKey: number; // the testKey the position in the test qeue. Set upon calling .run()
testDeferred: Deferred<TapTest> = plugins.smartpromise.defer(); public testDeferred: Deferred<TapTest> = plugins.smartpromise.defer();
testPromise: Promise<TapTest> = this.testDeferred.promise; public testPromise: Promise<TapTest> = this.testDeferred.promise;
/** /**
* constructor * constructor
*/ */
@ -39,10 +37,10 @@ export class TapTest {
/** /**
* run the test * run the test
*/ */
async run(testKeyArg: number) { public async run(testKeyArg: number) {
this.hrtMeasurement.start(); this.hrtMeasurement.start();
this.testKey = testKeyArg; this.testKey = testKeyArg;
let testNumber = testKeyArg + 1; const testNumber = testKeyArg + 1;
try { try {
await this.testFunction(this.tapTools); await this.testFunction(this.tapTools);
if (this.status === 'timeout') { if (this.status === 'timeout') {

View File

@ -42,6 +42,10 @@ export class TapTools {
} }
} }
public async ensureDir(pathArg: string) {
await plugins.smartfile.fs.ensureDir(pathArg);
}
public async checkIterationLeak(iterationfuncArg: IPromiseFunc) { public async checkIterationLeak(iterationfuncArg: IPromiseFunc) {
console.log('iteration leakage checks disabled for now due to incompatibilities with node v12'); console.log('iteration leakage checks disabled for now due to incompatibilities with node v12');
} }

View File

@ -19,6 +19,7 @@ export class TapWrap {
* run the wrapFunction * run the wrapFunction
*/ */
async run() { async run() {
// TODO: make sure it makes sense what we do here.
await this.wrapFunction(); await this.wrapFunction();
} }
} }

View File

@ -1,9 +1,10 @@
// pushrocks // pushrocks
import * as early from '@pushrocks/early'; import * as early from '@pushrocks/early';
import * as smartdelay from '@pushrocks/smartdelay'; import * as smartdelay from '@pushrocks/smartdelay';
import * as smartfile from '@pushrocks/smartfile';
import * as smartpromise from '@pushrocks/smartpromise'; import * as smartpromise from '@pushrocks/smartpromise';
export { early, smartdelay, smartpromise }; export { early, smartfile, smartdelay, smartpromise };
// third party // third party
/* import * as leakage from 'leakage'; /* import * as leakage from 'leakage';