From 984d551bd681fedf5b2f443b0e1eab333b49c248 Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Sat, 11 Jul 2020 15:52:31 +0000 Subject: [PATCH] fix(core): update --- ts/tstest.classes.tap.combinator.ts | 12 ++++++++++-- ts/tstest.classes.tap.parser.ts | 6 +++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ts/tstest.classes.tap.combinator.ts b/ts/tstest.classes.tap.combinator.ts index f45ab7c..4c21217 100644 --- a/ts/tstest.classes.tap.combinator.ts +++ b/ts/tstest.classes.tap.combinator.ts @@ -20,7 +20,15 @@ export class TapCombinator { let failGlobal = false; // determine wether tstest should fail for (const tapParser of this.tapParserStore) { - if (tapParser.getErrorTests().length === 0) { + if (!tapParser.expectedTests) { + failGlobal = true; + let overviewString = + logPrefixes.TsTestPrefix + + cs(` ${tapParser.fileName} ${plugins.figures.cross}`, 'red') + + ` ${plugins.figures.pointer} ` + + `does not specify tests!`; + console.log(overviewString); + } else if (tapParser.getErrorTests().length === 0) { let overviewString = logPrefixes.TsTestPrefix + cs(` ${tapParser.fileName} ${plugins.figures.tick}`, 'green') + @@ -28,13 +36,13 @@ export class TapCombinator { tapParser.getTestOverviewAsString(); console.log(overviewString); } else { + failGlobal = true; let overviewString = logPrefixes.TsTestPrefix + cs(` ${tapParser.fileName} ${plugins.figures.cross}`, 'red') + ` ${plugins.figures.pointer} ` + tapParser.getTestOverviewAsString(); console.log(overviewString); - failGlobal = true; } } console.log(cs(plugins.figures.hamburger.repeat(48), 'cyan')); diff --git a/ts/tstest.classes.tap.parser.ts b/ts/tstest.classes.tap.parser.ts index ae5aee5..a02d742 100644 --- a/ts/tstest.classes.tap.parser.ts +++ b/ts/tstest.classes.tap.parser.ts @@ -179,7 +179,11 @@ export class TapParser { )}` ); } - if (this.getErrorTests().length === 0) { + if (!this.expectedTests) { + console.log(cs('Error: No tests were defined. Therefore the testfile failed!', 'red')); + } else if (this.expectedTests !== this.receivedTests) { + console.log(cs('Error: The amount of received tests and expectedTests is unequal! Therefore the testfile failed', 'red')); + } else if (this.getErrorTests().length === 0) { console.log(`${logPrefixes.TapPrefix} ${cs(`All tests are successfull!!!`, 'green')}`); } else { console.log(