Convert tests to use tape/istanbul/faucet

.gitignore

@@ -1,5 +1,6 @@
 build
 node_modules
+coverage
 *.log
 *.ldif
 *.tar.*

Makefile

@@ -39,7 +39,7 @@ JSL_FILES_NODE   = $(JS_FILES)
 JSSTYLE_FILES	 = $(JS_FILES)
 JSSTYLE_FLAGS    = -f tools/jsstyle.conf
 
-CLEAN_FILES	+= node_modules $(SHRINKWRAP) cscope.files
+CLEAN_FILES	+= node_modules coverage $(SHRINKWRAP) cscope.files
 
 include ./tools/mk/Makefile.defs
 
@@ -56,10 +56,11 @@ CLEAN_FILES += $(TAP) ./node_modules/tap
 
 .PHONY: test
 test: $(TAP)
-	$(TAP) test/*.test.js
+	$(NPM) test
-	$(TAP) test/filters/*.test.js
+
-	$(TAP) test/controls/*.test.js
+.PHONY: cover
-	$(TAP) test/messages/*.test.js
+cover: test
+	$(NPM) run report
 
 include ./tools/mk/Makefile.deps
 include ./tools/mk/Makefile.targ

package.json

@@ -39,10 +39,13 @@
     "dtrace-provider": "0.2.8"
   },
   "devDependencies": {
-    "tap": "0.4.1",
+    "node-uuid": "1.4.0",
-    "node-uuid": "1.4.0"
+    "faucet": "0.0.1",
+    "istanbul": "0.3.0",
+    "tape": "2.13.3"
   },
   "scripts": {
-    "test": "./node_modules/.bin/tap ./test"
+        "report": "./node_modules/.bin/istanbul report html && open ./coverage/lcov-report/index.html",
+        "test": "./node_modules/.bin/istanbul cover --print none test/test.js | ./node_modules/.bin/faucet"
   }
 }

test/attribute.test.js

@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tap').test;
+var test = require('tape').test;
 
 var asn1 = require('asn1');
 

test/change.test.js

@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tap').test;
+var test = require('tape').test;
 
 var asn1 = require('asn1');
 

test/client.test.js

@@ -2,7 +2,7 @@
 
 var Logger = require('bunyan');
 
-var test = require('tap').test;
+var test = require('tape').test;
 var uuid = require('node-uuid');
 var vasync = require('vasync');
 

test/controls/control.test.js

@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tap').test;
+var test = require('tape').test;
 
 var asn1 = require('asn1');
 

test/controls/persistent_search_control.test.js

@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tap').test;
+var test = require('tape').test;
 
 var asn1 = require('asn1');
 

test/controls/server_side_sorting_control_request.test.js

@@ -1,5 +1,5 @@
 
-var test = require('tap').test;
+var test = require('tape').test;
 
 var asn1 = require('asn1');
 

test/controls/server_side_sorting_control_response.test.js

@@ -1,4 +1,4 @@
-var test = require('tap').test;
+var test = require('tape').test;
 
 var asn1 = require('asn1');
 

test/dn.test.js

@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tap').test;
+var test = require('tape').test;
 
 
 

test/filters/and.test.js

@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tap').test;
+var test = require('tape').test;
 
 var asn1 = require('asn1');
 

test/filters/approx.test.js

@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tap').test;
+var test = require('tape').test;
 
 var asn1 = require('asn1');
 

test/filters/eq.test.js

@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tap').test;
+var test = require('tape').test;
 
 var asn1 = require('asn1');
 

test/filters/ext.test.js

@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tap').test;
+var test = require('tape').test;
 
 var asn1 = require('asn1');
 

test/filters/filter.test.js

@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tap').test;
+var test = require('tape').test;
 
 
 ///--- Globals

test/filters/ge.test.js

@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tap').test;
+var test = require('tape').test;
 
 var asn1 = require('asn1');
 

test/filters/le.test.js

@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tap').test;
+var test = require('tape').test;
 
 var asn1 = require('asn1');
 

test/filters/not.test.js

@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tap').test;
+var test = require('tape').test;
 
 var asn1 = require('asn1');
 

test/filters/or.test.js

@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tap').test;
+var test = require('tape').test;
 
 var asn1 = require('asn1');
 

test/filters/parse.test.js

@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tap').test;
+var test = require('tape').test;
 
 var parse = require('../../lib/index').parseFilter;
 

test/filters/presence.test.js

@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tap').test;
+var test = require('tape').test;
 
 var asn1 = require('asn1');
 

test/filters/substr.test.js

@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tap').test;
+var test = require('tape').test;
 
 var asn1 = require('asn1');
 

test/laundry.test.js

@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tap').test;
+var test = require('tape').test;
 var uuid = require('node-uuid');
 
 var ldap = require('../lib/index');

test/messages/add_request.test.js

@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tap').test;
+var test = require('tape').test;
 
 var asn1 = require('asn1');
 

test/messages/add_response.test.js

@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tap').test;
+var test = require('tape').test;
 
 var asn1 = require('asn1');
 

test/messages/bind_request.test.js

@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tap').test;
+var test = require('tape').test;
 
 var asn1 = require('asn1');
 

test/messages/bind_response.test.js

@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tap').test;
+var test = require('tape').test;
 
 var asn1 = require('asn1');
 

test/messages/compare_request.test.js

@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tap').test;
+var test = require('tape').test;
 
 var asn1 = require('asn1');
 

test/messages/compare_response.test.js

@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tap').test;
+var test = require('tape').test;
 
 var asn1 = require('asn1');
 

test/messages/del_request.test.js

@@ -3,7 +3,7 @@
 
 var asn1 = require('asn1');
 var Logger = require('bunyan');
-var test = require('tap').test;
+var test = require('tape').test;
 
 
 ///--- Globals

test/messages/del_response.test.js

@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tap').test;
+var test = require('tape').test;
 
 var asn1 = require('asn1');
 

test/messages/ext_request.test.js

@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tap').test;
+var test = require('tape').test;
 
 var asn1 = require('asn1');
 

test/messages/ext_response.test.js

@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tap').test;
+var test = require('tape').test;
 
 var asn1 = require('asn1');
 

test/messages/moddn_request.test.js

@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tap').test;
+var test = require('tape').test;
 
 var asn1 = require('asn1');
 

test/messages/moddn_response.test.js

@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tap').test;
+var test = require('tape').test;
 
 var asn1 = require('asn1');
 

test/messages/modify_request.test.js

@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tap').test;
+var test = require('tape').test;
 
 var asn1 = require('asn1');
 

test/messages/modify_response.test.js

@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tap').test;
+var test = require('tape').test;
 
 var asn1 = require('asn1');
 

test/messages/search_entry.test.js

@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tap').test;
+var test = require('tape').test;
 
 var asn1 = require('asn1');
 

test/messages/search_request.test.js

@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tap').test;
+var test = require('tape').test;
 
 var asn1 = require('asn1');
 

test/messages/search_response.test.js

@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tap').test;
+var test = require('tape').test;
 
 var asn1 = require('asn1');
 

test/messages/unbind_request.test.js

@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tap').test;
+var test = require('tape').test;
 
 var asn1 = require('asn1');
 

test/server.test.js

@@ -2,7 +2,7 @@
 
 var Logger = require('bunyan');
 
-var test = require('tap').test;
+var test = require('tape').test;
 var uuid = require('node-uuid');
 var vasync = require('vasync');
 

test/test.js

@@ -0,0 +1,28 @@
+// Copyright 2014 Mark Cavage.  All rights reserved.
+
+var assert = require('assert');
+var fs = require('fs');
+var path = require('path');
+
+
+function runTests(directory) {
+  fs.readdir(directory, function (err, files) {
+    assert.ifError(err);
+
+    console.dir(files);
+    files.filter(function (f) {
+      return (/\.test\.js$/.test(f));
+    }).map(function (f) {
+      return (path.join(directory, f));
+    }).forEach(require);
+  });
+}
+
+///--- Run All Tests
+
+(function main() {
+  runTests(__dirname);
+  runTests(path.join(__dirname, 'controls'));
+  runTests(path.join(__dirname, 'filters'));
+  runTests(path.join(__dirname, 'messages'));
+})();

test/url.test.js

@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var test = require('tap').test;
+var test = require('tape').test;