bugfix -- now seems to be working...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2022-06-06 00:09:30 +03:00
parent 2b599e0dbe
commit f4c7e9b5e3
3 changed files with 77 additions and 49 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "ig-test", "name": "ig-test",
"version": "1.5.3", "version": "1.5.4",
"description": "experimental test runner....", "description": "experimental test runner....",
"main": "test.js", "main": "test.js",
"bin": { "bin": {

View File

@ -72,6 +72,25 @@ tests.Case('async-completion',
assert(true, 'done') assert(true, 'done')
}) })
tests.Case('async-completion-nested',
tests.TestSet(function(){
this.Setup({
empty: function(){
return true
},
})
// XXX if this is the last test we will not do all the assertions...
this.Test('test', async function(assert){
assert(true, 'start')
await assert(true, '1')
await assert(true, '2')
await assert(true, '3')
await assert(true, '4')
await assert(true, '5')
assert(true, 'done')
})
}))
// a nested test set... // a nested test set...
tests.Case('nested', tests.Case('nested',
tests.TestSet(function(){ tests.TestSet(function(){

45
test.js
View File

@ -400,7 +400,8 @@ object.Constructor('TestSet', {
// XXX nested assert(..) need to report nestedness correctly... // XXX nested assert(..) need to report nestedness correctly...
// XXX should/can this return a meaningfull result for it to be used // XXX should/can this return a meaningfull result for it to be used
// as a setup/mod??? // as a setup/mod???
__call__: function(context, chain, stats){ // XXX this is very similar to runner(..)...
__call__: async function(context, chain, stats){
var assert var assert
// running nested... // running nested...
if(typeof(chain) == 'function'){ if(typeof(chain) == 'function'){
@ -446,8 +447,9 @@ object.Constructor('TestSet', {
// XXX revise nested assert... // XXX revise nested assert...
var assert = assert var assert = assert
|| this.__assert__('[TEST]', stats, module.VERBOSE) || this.__assert__('[TEST]', stats, module.VERBOSE)
chain_length != 1 var queue =
&& object.deepKeys(tests) chain_length != 1 ?
object.deepKeys(tests)
.filter(function(t, i, l){ .filter(function(t, i, l){
return typeof(tests[t]) == 'function' return typeof(tests[t]) == 'function'
// skip blank tests if we have other tests unless // skip blank tests if we have other tests unless
@ -458,41 +460,45 @@ object.Constructor('TestSet', {
false false
: (test == '*' : (test == '*'
|| test == t) ) }) || test == t) ) })
.forEach(function(t){ .map(function(t){
// modifiers... // modifiers...
object.deepKeys(modifiers) return object.deepKeys(modifiers)
.filter(function(m){ .filter(function(m){
return typeof(modifiers[m]) == 'function' return typeof(modifiers[m]) == 'function'
&& (mod == '*' || mod == m) }) && (mod == '*' || mod == m) })
.forEach(function(m){ .map(function(m){
// setups... // setups...
object.deepKeys(setups) return object.deepKeys(setups)
.filter(function(s){ .filter(function(s){
return typeof(setups[s]) == 'function' return typeof(setups[s]) == 'function'
&& (setup == '*' || setup == s) }) && (setup == '*' || setup == s) })
.forEach(function(s){ .map(function(s){
// run the test... return [s, m, t] }) }) })
.flat(2)
: []
for(var [s, m, t] of queue){
stats.tests += 1 stats.tests += 1
var _assert = assert.push( var _assert = assert.push(
[s, m, t] [s, m, t]
// do not print blank pass-through ('-') // do not print blank pass-through ('-')
// components... // components...
.filter(function(e){ return e != '-' }) ) .filter(function(e){ return e != '-' }) )
tests[t](_assert, await tests[t](_assert,
modifiers[m](_assert, await modifiers[m](_assert,
setups[s](_assert))) }) }) }) await setups[s](_assert))) }
// cases... // cases...
// XXX revise nested assert...
assert = assert assert = assert
|| this.__assert__('[CASE]', stats, module.VERBOSE) || this.__assert__('[CASE]', stats, module.VERBOSE)
chain_length <= 1 var queue =
&& Object.keys(cases) chain_length <= 1 ?
Object.keys(cases)
.filter(function(s){ .filter(function(s){
return typeof(cases[s]) == 'function' return typeof(cases[s]) == 'function'
&& (setup == '*' || setup == s) }) && (setup == '*' || setup == s) })
.forEach(function(c){ : []
for(var c of queue){
stats.tests += 1 stats.tests += 1
cases[c]( assert.push(c) ) }) cases[c](assert.push(c)) }
// runtime... // runtime...
stats.time += Date.now() - started stats.time += Date.now() - started
return stats }, return stats },
@ -610,7 +616,7 @@ async function(spec, chain, stats){
e.toObject() e.toObject()
: (e || {}) }) : (e || {}) })
// stats... // setup stats...
stats = stats || {} stats = stats || {}
Object.assign(stats, { Object.assign(stats, {
tests: stats.tests || 0, tests: stats.tests || 0,
@ -995,6 +1001,9 @@ function(default_files, tests){
} else { } else {
await runner(tests, '*', stats) } await runner(tests, '*', stats) }
// XXX BUG for some reason we can get here BEFORE all the
// tests are finished -- forgot to await'ing something???
// print stats... // print stats...
console.log( console.log(
'Tests run:', stats.tests, 'Tests run:', stats.tests,