From 6f5aaf96631ddfefa302234d205d8b3fa1f93e5e Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Thu, 13 Aug 2020 14:08:39 +0300 Subject: [PATCH] tweaking... Signed-off-by: Alex A. Naanou --- test-test.js | 9 ++++----- test.js | 24 +++++++++++++----------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/test-test.js b/test-test.js index 81c3036..a94bea6 100644 --- a/test-test.js +++ b/test-test.js @@ -19,22 +19,21 @@ var tests = require('./test') tests.Setup('setup', function(assert){ - assert(true, 'assert') + assert(true, 'setup: assert') return {} }) tests.Setups({ setup2: function(assert){ - assert(true, 'assert') + assert(true, 'setup2: assert') return {} }, setup3: function(assert){ - assert(true, 'assert') + assert(true, 'setup3: assert') return {} }, }) -// XXX for some reason this is run twice.... tests.Test('dummy', function(assert, setup){ - assert(true, 'assert') + assert(true, 'dummy: assert') }) console.log('>>>>', tests.Tests.members) diff --git a/test.js b/test.js index 1935ffd..5d89ae2 100644 --- a/test.js +++ b/test.js @@ -197,11 +197,9 @@ object.Constructor('Merged', { // of members... // for the number of members use: // .members.length - // XXX for some reason this is shadowed by .length set on the - // constructor.... - // poked around a bit, .length seems to be the number of arguments - // in a function, so we should use something differernt here... - // ...should rename this to something else... + // NOTE: we are using .size and not .length here because .length is + // used to indicate the number of arguments to a callable/function + // in JS... get size(){ return this.keys().length }, @@ -247,17 +245,16 @@ var Modifiers = module.Modifier = module.Modifiers = object.Constructor('Modifiers', Merged, {}) - // a basic default... - // XXX should this be here or should each setup be run alone... - .add({ '-': function(_, s){ return s } }) + // default blank pass-through... + .add({ '-': function(_, s){ return s }) var Tests = module.Test = module.Tests = object.Constructor('Tests', Merged, {}) - // XXX should this be here or should each setup be run alone... - .add({ '-': function(_, s){ return s } }) + // default blank pass-through... + .add({ '-': function(_, s){ return s }) var Cases = @@ -291,6 +288,7 @@ object.Constructor('Cases', Merged, {}) // // NOTE: chaining more than one modifier is not yet supported (XXX) // +// XXX chain N modifiers... // XXX make Assert optional... // XXX is this a good name??? var runner = @@ -351,7 +349,11 @@ function(spec, chain, stats){ return } // run the test... stats.tests += 1 - var _assert = assert.push([s, m, t]) + var _assert = assert.push( + [s, m, t] + // do not print blank pass-through ('-') + // components... + .filter(function(e){ return e != '-' }) ) tests[t](_assert, modifiers[m](_assert, setups[s](_assert))) }) }) })