From fb62547b873b6b02d8df1ae742011d808d3be2da Mon Sep 17 00:00:00 2001 From: Jeremiah Harlan Date: Sat, 11 Jun 2016 18:00:35 -0700 Subject: [PATCH 1/4] Move assert function to common.js file in test dir Pass message to assert functions in `test-nucleus-get-set-env.js` --- test/common.js | 8 +++++++ test/parallel/test-nucleus-compile.js | 7 +----- test/parallel/test-nucleus-dofile.js | 7 +----- test/parallel/test-nucleus-get-set-env.js | 27 +++++++++-------------- test/parallel/test-nucleus-pathjoin.js | 6 +---- test/parallel/test-nucleus-readfile.js | 6 +---- test/parallel/test-nucleus-scandir.js | 6 +---- test/parallel/test-nucleus.js | 6 +---- 8 files changed, 25 insertions(+), 48 deletions(-) create mode 100644 test/common.js diff --git a/test/common.js b/test/common.js new file mode 100644 index 0000000..62e0222 --- /dev/null +++ b/test/common.js @@ -0,0 +1,8 @@ +function assert(thing, message) { + if (thing) return; + throw new Error(message); +} + +return { + assert: assert +}; \ No newline at end of file diff --git a/test/parallel/test-nucleus-compile.js b/test/parallel/test-nucleus-compile.js index 339c485..85384ce 100644 --- a/test/parallel/test-nucleus-compile.js +++ b/test/parallel/test-nucleus-compile.js @@ -1,9 +1,4 @@ - -function assert(thing, message) { - if (thing) return - - throw new Error(message) -} +var assert = nucleus.dofile("../common.js").assert var a = nucleus.compile("return 'a'", 'a') assert(a() === 'a', "compile should return 'a'") diff --git a/test/parallel/test-nucleus-dofile.js b/test/parallel/test-nucleus-dofile.js index 3400d9a..65ad557 100644 --- a/test/parallel/test-nucleus-dofile.js +++ b/test/parallel/test-nucleus-dofile.js @@ -1,8 +1,3 @@ - -function assert(thing, message) { - if (thing) return - - throw new Error(message) -} +var assert = nucleus.dofile("../common.js").assert assert(nucleus.dofile("../fixtures/a.js") === 'a', "a.js should expose 'a'") diff --git a/test/parallel/test-nucleus-get-set-env.js b/test/parallel/test-nucleus-get-set-env.js index 40c9712..b8fc18c 100644 --- a/test/parallel/test-nucleus-get-set-env.js +++ b/test/parallel/test-nucleus-get-set-env.js @@ -1,36 +1,31 @@ - -function assert(thing, message) { - if (thing) return - - throw new Error(message) -} +var assert = nucleus.dofile("../common.js").assert // get non-existing -assert(nucleus.getenv('__NUCLEUS_TEST') === null) +assert(nucleus.getenv('__NUCLEUS_TEST') === null, 'nonexisting env var should be `null`') // set new -assert(nucleus.setenv('__NUCLEUS_TEST', 'nice day @nodeconf') === undefined) +assert(nucleus.setenv('__NUCLEUS_TEST', 'nice day @nodeconf') === undefined, 'created env should return `undefined`') // get newly set -assert(nucleus.getenv('__NUCLEUS_TEST') === 'nice day @nodeconf') +assert(nucleus.getenv('__NUCLEUS_TEST') === 'nice day @nodeconf', 'get existing env should return value') // newly set in envkeys -assert(nucleus.envkeys().indexOf('__NUCLEUS_TEST') !== -1) +assert(nucleus.envkeys().indexOf('__NUCLEUS_TEST') !== -1, 'existing key index should not equal -1') // re-set -assert(nucleus.setenv('__NUCLEUS_TEST', 'hi there') === undefined) +assert(nucleus.setenv('__NUCLEUS_TEST', 'hi there') === undefined, 'setting existing env should return `undefined`') // get re-set -assert(nucleus.getenv('__NUCLEUS_TEST') === 'hi there') +assert(nucleus.getenv('__NUCLEUS_TEST') === 'hi there', 'get existing key should return `hi there`') // re-set in envkeys -assert(nucleus.envkeys().indexOf('__NUCLEUS_TEST') !== -1) +assert(nucleus.envkeys().indexOf('__NUCLEUS_TEST') !== -1, 'existing key index should not equal -1') // unset -assert(nucleus.unsetenv('__NUCLEUS_TEST') === undefined) +assert(nucleus.unsetenv('__NUCLEUS_TEST') === undefined, 'unsetting env should return `undefined`') // get now non-existing -assert(nucleus.getenv('__NUCLEUS_TEST') === null) +assert(nucleus.getenv('__NUCLEUS_TEST') === null, 'nonexisting env var should be `null`') // no longer in envkeys -assert(nucleus.envkeys().indexOf('__NUCLEUS_TEST') === -1) +assert(nucleus.envkeys().indexOf('__NUCLEUS_TEST') === -1, 'nonexisting key index should equal -1') diff --git a/test/parallel/test-nucleus-pathjoin.js b/test/parallel/test-nucleus-pathjoin.js index e33ee1f..2b2ec34 100644 --- a/test/parallel/test-nucleus-pathjoin.js +++ b/test/parallel/test-nucleus-pathjoin.js @@ -1,7 +1,3 @@ -function assert(thing, message) { - if (thing) return - - throw new Error(message) -} +var assert = nucleus.dofile("../common.js").assert assert(nucleus.pathjoin('a', 'b', 'c') === 'a/b/c', 'pathjoin must work') diff --git a/test/parallel/test-nucleus-readfile.js b/test/parallel/test-nucleus-readfile.js index 7de40f8..0b87e53 100644 --- a/test/parallel/test-nucleus-readfile.js +++ b/test/parallel/test-nucleus-readfile.js @@ -1,7 +1,3 @@ -function assert(thing, message) { - if (thing) return - - throw new Error(message) -} +var assert = nucleus.dofile("../common.js").assert assert(nucleus.readfile('../fixtures/a.js') === "return 'a'\n", 'a.js must return it\'s raw source') diff --git a/test/parallel/test-nucleus-scandir.js b/test/parallel/test-nucleus-scandir.js index 9bde4e1..52f1a5c 100644 --- a/test/parallel/test-nucleus-scandir.js +++ b/test/parallel/test-nucleus-scandir.js @@ -1,8 +1,4 @@ -function assert(thing, message) { - if (thing) return - - throw new Error(message) -} +var assert = nucleus.dofile("../common.js").assert var directory = nucleus.scandir('../fixtures', dirOnEntry) assert(directory === true, 'scandir must see `fixtures` as a directory') diff --git a/test/parallel/test-nucleus.js b/test/parallel/test-nucleus.js index eb78565..00d8c5b 100644 --- a/test/parallel/test-nucleus.js +++ b/test/parallel/test-nucleus.js @@ -2,11 +2,7 @@ // var p = nucleus.dofile("deps/utils.js").prettyPrint; // p(p); -function assert(thing, message) { - if (thing) return - - throw new Error(message) -} +var assert = nucleus.dofile("../common.js").assert // Make sure nucleus is an object assert(nucleus && typeof nucleus === 'object', '`nucleus` is not an Object') From 316e81a642f367792b02ab4733973cc9e6518189 Mon Sep 17 00:00:00 2001 From: Jeremiah Harlan Date: Sun, 12 Jun 2016 09:58:03 -0700 Subject: [PATCH 2/4] Move `common.js` --> `test/parallel/common/assert.js` --- test/{common.js => parallel/common/assert.js} | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) rename test/{common.js => parallel/common/assert.js} (75%) diff --git a/test/common.js b/test/parallel/common/assert.js similarity index 75% rename from test/common.js rename to test/parallel/common/assert.js index 62e0222..06c57a7 100644 --- a/test/common.js +++ b/test/parallel/common/assert.js @@ -3,6 +3,4 @@ function assert(thing, message) { throw new Error(message); } -return { - assert: assert -}; \ No newline at end of file +return assert \ No newline at end of file From 4c01a98f3de9596a465376c099075769f66f6208 Mon Sep 17 00:00:00 2001 From: Jeremiah Harlan Date: Sun, 12 Jun 2016 09:58:47 -0700 Subject: [PATCH 3/4] Update tests to use new assert file --- test/parallel/test-nucleus-compile.js | 2 +- test/parallel/test-nucleus-dofile.js | 2 +- test/parallel/test-nucleus-get-set-env.js | 2 +- test/parallel/test-nucleus-pathjoin.js | 2 +- test/parallel/test-nucleus-readfile.js | 2 +- test/parallel/test-nucleus-scandir.js | 2 +- test/parallel/test-nucleus.js | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/parallel/test-nucleus-compile.js b/test/parallel/test-nucleus-compile.js index 85384ce..9387eac 100644 --- a/test/parallel/test-nucleus-compile.js +++ b/test/parallel/test-nucleus-compile.js @@ -1,4 +1,4 @@ -var assert = nucleus.dofile("../common.js").assert +var assert = nucleus.dofile("./common/assert.js") var a = nucleus.compile("return 'a'", 'a') assert(a() === 'a', "compile should return 'a'") diff --git a/test/parallel/test-nucleus-dofile.js b/test/parallel/test-nucleus-dofile.js index 65ad557..0fcd0ab 100644 --- a/test/parallel/test-nucleus-dofile.js +++ b/test/parallel/test-nucleus-dofile.js @@ -1,3 +1,3 @@ -var assert = nucleus.dofile("../common.js").assert +var assert = nucleus.dofile("./common/assert.js") assert(nucleus.dofile("../fixtures/a.js") === 'a', "a.js should expose 'a'") diff --git a/test/parallel/test-nucleus-get-set-env.js b/test/parallel/test-nucleus-get-set-env.js index b8fc18c..8a5f98d 100644 --- a/test/parallel/test-nucleus-get-set-env.js +++ b/test/parallel/test-nucleus-get-set-env.js @@ -1,4 +1,4 @@ -var assert = nucleus.dofile("../common.js").assert +var assert = nucleus.dofile("./common/assert.js") // get non-existing assert(nucleus.getenv('__NUCLEUS_TEST') === null, 'nonexisting env var should be `null`') diff --git a/test/parallel/test-nucleus-pathjoin.js b/test/parallel/test-nucleus-pathjoin.js index 2b2ec34..c57ccf6 100644 --- a/test/parallel/test-nucleus-pathjoin.js +++ b/test/parallel/test-nucleus-pathjoin.js @@ -1,3 +1,3 @@ -var assert = nucleus.dofile("../common.js").assert +var assert = nucleus.dofile("./common/assert.js") assert(nucleus.pathjoin('a', 'b', 'c') === 'a/b/c', 'pathjoin must work') diff --git a/test/parallel/test-nucleus-readfile.js b/test/parallel/test-nucleus-readfile.js index 0b87e53..fa1baad 100644 --- a/test/parallel/test-nucleus-readfile.js +++ b/test/parallel/test-nucleus-readfile.js @@ -1,3 +1,3 @@ -var assert = nucleus.dofile("../common.js").assert +var assert = nucleus.dofile("./common/assert.js") assert(nucleus.readfile('../fixtures/a.js') === "return 'a'\n", 'a.js must return it\'s raw source') diff --git a/test/parallel/test-nucleus-scandir.js b/test/parallel/test-nucleus-scandir.js index 52f1a5c..b5fa716 100644 --- a/test/parallel/test-nucleus-scandir.js +++ b/test/parallel/test-nucleus-scandir.js @@ -1,4 +1,4 @@ -var assert = nucleus.dofile("../common.js").assert +var assert = nucleus.dofile("./common/assert.js") var directory = nucleus.scandir('../fixtures', dirOnEntry) assert(directory === true, 'scandir must see `fixtures` as a directory') diff --git a/test/parallel/test-nucleus.js b/test/parallel/test-nucleus.js index 00d8c5b..44d0e98 100644 --- a/test/parallel/test-nucleus.js +++ b/test/parallel/test-nucleus.js @@ -2,7 +2,7 @@ // var p = nucleus.dofile("deps/utils.js").prettyPrint; // p(p); -var assert = nucleus.dofile("../common.js").assert +var assert = nucleus.dofile("./common/assert.js") // Make sure nucleus is an object assert(nucleus && typeof nucleus === 'object', '`nucleus` is not an Object') From 7b276f982ef0e143c4dd302e84d5a22286ddd5fa Mon Sep 17 00:00:00 2001 From: Jeremiah Harlan Date: Wed, 15 Jun 2016 23:58:17 -0400 Subject: [PATCH 4/4] Update assert messages --- test/parallel/common/assert.js | 2 +- test/parallel/test-nucleus-get-set-env.js | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/parallel/common/assert.js b/test/parallel/common/assert.js index 06c57a7..3a3445c 100644 --- a/test/parallel/common/assert.js +++ b/test/parallel/common/assert.js @@ -3,4 +3,4 @@ function assert(thing, message) { throw new Error(message); } -return assert \ No newline at end of file +return assert diff --git a/test/parallel/test-nucleus-get-set-env.js b/test/parallel/test-nucleus-get-set-env.js index 8a5f98d..f0a33a5 100644 --- a/test/parallel/test-nucleus-get-set-env.js +++ b/test/parallel/test-nucleus-get-set-env.js @@ -4,28 +4,28 @@ var assert = nucleus.dofile("./common/assert.js") assert(nucleus.getenv('__NUCLEUS_TEST') === null, 'nonexisting env var should be `null`') // set new -assert(nucleus.setenv('__NUCLEUS_TEST', 'nice day @nodeconf') === undefined, 'created env should return `undefined`') +assert(nucleus.setenv('__NUCLEUS_TEST', 'nice day @nodeconf') === undefined, 'setenv should return `undefined`') // get newly set -assert(nucleus.getenv('__NUCLEUS_TEST') === 'nice day @nodeconf', 'get existing env should return value') +assert(nucleus.getenv('__NUCLEUS_TEST') === 'nice day @nodeconf', 'getenv should return value') // newly set in envkeys -assert(nucleus.envkeys().indexOf('__NUCLEUS_TEST') !== -1, 'existing key index should not equal -1') +assert(nucleus.envkeys().indexOf('__NUCLEUS_TEST') !== -1, 'env variable should be set in envkeys') // re-set -assert(nucleus.setenv('__NUCLEUS_TEST', 'hi there') === undefined, 'setting existing env should return `undefined`') +assert(nucleus.setenv('__NUCLEUS_TEST', 'hi there') === undefined, 'setenv should return `undefined`') // get re-set assert(nucleus.getenv('__NUCLEUS_TEST') === 'hi there', 'get existing key should return `hi there`') // re-set in envkeys -assert(nucleus.envkeys().indexOf('__NUCLEUS_TEST') !== -1, 'existing key index should not equal -1') +assert(nucleus.envkeys().indexOf('__NUCLEUS_TEST') !== -1, 'env variable should be set in envkeys') // unset -assert(nucleus.unsetenv('__NUCLEUS_TEST') === undefined, 'unsetting env should return `undefined`') +assert(nucleus.unsetenv('__NUCLEUS_TEST') === undefined, 'setenv should return `undefined`') // get now non-existing assert(nucleus.getenv('__NUCLEUS_TEST') === null, 'nonexisting env var should be `null`') // no longer in envkeys -assert(nucleus.envkeys().indexOf('__NUCLEUS_TEST') === -1, 'nonexisting key index should equal -1') +assert(nucleus.envkeys().indexOf('__NUCLEUS_TEST') === -1, 'env variable should be set in envkeys')