Merge pull request #15 from harlanj/master

Move assert function to common.js file in test dir

test/parallel/common/assert.js

@@ -0,0 +1,6 @@
+function assert(thing, message) {
+  if (thing) return;
+  throw new Error(message);
+}
+
+return assert

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/assert.js")
 
 var a = nucleus.compile("'a'", 'a')
 assert(a() === 'a', "compile should return 'a'")

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/assert.js")
 
 assert(nucleus.dofile("../fixtures/a.js") === 'a', "a.js should expose 'a'")

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/assert.js")
 
 // 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, 'setenv should return `undefined`')
 
 // get newly set
-assert(nucleus.getenv('__NUCLEUS_TEST') === 'nice day @nodeconf')
+assert(nucleus.getenv('__NUCLEUS_TEST') === 'nice day @nodeconf', 'getenv should return value')
 
 // newly set in envkeys
-assert(nucleus.envkeys().indexOf('__NUCLEUS_TEST') !== -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)
+assert(nucleus.setenv('__NUCLEUS_TEST', 'hi there') === undefined, 'setenv 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, 'env variable should be set in envkeys')
 
 // unset
-assert(nucleus.unsetenv('__NUCLEUS_TEST') === undefined)
+assert(nucleus.unsetenv('__NUCLEUS_TEST') === undefined, 'setenv 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, 'env variable should be set in envkeys')

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/assert.js")
 
 assert(nucleus.pathjoin('a', 'b', 'c') === 'a/b/c', 'pathjoin must work')

test/parallel/test-nucleus-readfile.js

@@ -1,8 +1,4 @@
-function assert(thing, message) {
-  if (thing) return
-
-  throw new Error(message)
-}
+var assert = nucleus.dofile("./common/assert.js")
 
 assert(nucleus.readfile('../fixtures/a.js') === "'a'\n", 'a.js must return it\'s raw source')
 

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/assert.js")
 
 var directory = nucleus.scandir('../fixtures',  dirOnEntry)
 assert(directory === true, 'scandir must see `fixtures` as a directory')

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/assert.js")
 
 // Make sure nucleus is an object
 assert(nucleus && typeof nucleus === 'object', '`nucleus` is not an Object')