From 3186f5eca1e9abe03502aea8531df724eac430df Mon Sep 17 00:00:00 2001 From: Patrick Mooney Date: Tue, 8 Jul 2014 14:31:57 -0500 Subject: [PATCH] Convert tests to use tape/istanbul/faucet --- .gitignore | 1 + Makefile | 11 ++++---- package.json | 9 ++++-- test/attribute.test.js | 2 +- test/change.test.js | 2 +- test/client.test.js | 2 +- test/controls/control.test.js | 2 +- .../persistent_search_control.test.js | 2 +- ...erver_side_sorting_control_request.test.js | 2 +- ...rver_side_sorting_control_response.test.js | 2 +- test/dn.test.js | 2 +- test/filters/and.test.js | 2 +- test/filters/approx.test.js | 2 +- test/filters/eq.test.js | 2 +- test/filters/ext.test.js | 2 +- test/filters/filter.test.js | 2 +- test/filters/ge.test.js | 2 +- test/filters/le.test.js | 2 +- test/filters/not.test.js | 2 +- test/filters/or.test.js | 2 +- test/filters/parse.test.js | 2 +- test/filters/presence.test.js | 2 +- test/filters/substr.test.js | 2 +- test/laundry.test.js | 2 +- test/messages/add_request.test.js | 2 +- test/messages/add_response.test.js | 2 +- test/messages/bind_request.test.js | 2 +- test/messages/bind_response.test.js | 2 +- test/messages/compare_request.test.js | 2 +- test/messages/compare_response.test.js | 2 +- test/messages/del_request.test.js | 2 +- test/messages/del_response.test.js | 2 +- test/messages/ext_request.test.js | 2 +- test/messages/ext_response.test.js | 2 +- test/messages/moddn_request.test.js | 2 +- test/messages/moddn_response.test.js | 2 +- test/messages/modify_request.test.js | 2 +- test/messages/modify_response.test.js | 2 +- test/messages/search_entry.test.js | 2 +- test/messages/search_request.test.js | 2 +- test/messages/search_response.test.js | 2 +- test/messages/unbind_request.test.js | 2 +- test/server.test.js | 2 +- test/test.js | 28 +++++++++++++++++++ test/url.test.js | 2 +- 45 files changed, 82 insertions(+), 49 deletions(-) create mode 100644 test/test.js diff --git a/.gitignore b/.gitignore index ca24b2e..8790ff7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ build node_modules +coverage *.log *.ldif *.tar.* diff --git a/Makefile b/Makefile index d5a346f..453525d 100644 --- a/Makefile +++ b/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 - $(TAP) test/filters/*.test.js - $(TAP) test/controls/*.test.js - $(TAP) test/messages/*.test.js + $(NPM) test + +.PHONY: cover +cover: test + $(NPM) run report include ./tools/mk/Makefile.deps include ./tools/mk/Makefile.targ diff --git a/package.json b/package.json index 8b3cf80..8233fac 100644 --- a/package.json +++ b/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" } } diff --git a/test/attribute.test.js b/test/attribute.test.js index c97e8e7..a9af85b 100644 --- a/test/attribute.test.js +++ b/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'); diff --git a/test/change.test.js b/test/change.test.js index b9b3b81..4fecf51 100644 --- a/test/change.test.js +++ b/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'); diff --git a/test/client.test.js b/test/client.test.js index 5f0a2a7..4c5c8d7 100644 --- a/test/client.test.js +++ b/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'); diff --git a/test/controls/control.test.js b/test/controls/control.test.js index 0943f15..c0c71d1 100644 --- a/test/controls/control.test.js +++ b/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'); diff --git a/test/controls/persistent_search_control.test.js b/test/controls/persistent_search_control.test.js index 37a7667..11962e0 100644 --- a/test/controls/persistent_search_control.test.js +++ b/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'); diff --git a/test/controls/server_side_sorting_control_request.test.js b/test/controls/server_side_sorting_control_request.test.js index e2787dd..1830c0c 100644 --- a/test/controls/server_side_sorting_control_request.test.js +++ b/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'); diff --git a/test/controls/server_side_sorting_control_response.test.js b/test/controls/server_side_sorting_control_response.test.js index 432edb7..1c38f77 100644 --- a/test/controls/server_side_sorting_control_response.test.js +++ b/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'); diff --git a/test/dn.test.js b/test/dn.test.js index 6b8b470..96bbb51 100644 --- a/test/dn.test.js +++ b/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; diff --git a/test/filters/and.test.js b/test/filters/and.test.js index c7b22c3..12fe4d2 100644 --- a/test/filters/and.test.js +++ b/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'); diff --git a/test/filters/approx.test.js b/test/filters/approx.test.js index c9041e5..77e936d 100644 --- a/test/filters/approx.test.js +++ b/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'); diff --git a/test/filters/eq.test.js b/test/filters/eq.test.js index c038ccc..d14b457 100644 --- a/test/filters/eq.test.js +++ b/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'); diff --git a/test/filters/ext.test.js b/test/filters/ext.test.js index 09f3f96..ddb3327 100644 --- a/test/filters/ext.test.js +++ b/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'); diff --git a/test/filters/filter.test.js b/test/filters/filter.test.js index 9d17224..71e7f42 100644 --- a/test/filters/filter.test.js +++ b/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 diff --git a/test/filters/ge.test.js b/test/filters/ge.test.js index e67780e..9f400f6 100644 --- a/test/filters/ge.test.js +++ b/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'); diff --git a/test/filters/le.test.js b/test/filters/le.test.js index d4c41d7..c709680 100644 --- a/test/filters/le.test.js +++ b/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'); diff --git a/test/filters/not.test.js b/test/filters/not.test.js index 5fc9566..782138d 100644 --- a/test/filters/not.test.js +++ b/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'); diff --git a/test/filters/or.test.js b/test/filters/or.test.js index 8622f78..21f91cd 100644 --- a/test/filters/or.test.js +++ b/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'); diff --git a/test/filters/parse.test.js b/test/filters/parse.test.js index af2e02f..d564c07 100644 --- a/test/filters/parse.test.js +++ b/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; diff --git a/test/filters/presence.test.js b/test/filters/presence.test.js index 3ed6f99..ff40483 100644 --- a/test/filters/presence.test.js +++ b/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'); diff --git a/test/filters/substr.test.js b/test/filters/substr.test.js index e8bc9f8..1c0a5b8 100644 --- a/test/filters/substr.test.js +++ b/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'); diff --git a/test/laundry.test.js b/test/laundry.test.js index 0bdc47e..d39abfc 100644 --- a/test/laundry.test.js +++ b/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'); diff --git a/test/messages/add_request.test.js b/test/messages/add_request.test.js index 37043f9..0361ddc 100644 --- a/test/messages/add_request.test.js +++ b/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'); diff --git a/test/messages/add_response.test.js b/test/messages/add_response.test.js index 4b362e1..18ba114 100644 --- a/test/messages/add_response.test.js +++ b/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'); diff --git a/test/messages/bind_request.test.js b/test/messages/bind_request.test.js index 0acbb6e..423471e 100644 --- a/test/messages/bind_request.test.js +++ b/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'); diff --git a/test/messages/bind_response.test.js b/test/messages/bind_response.test.js index fd8caf7..bc7ea03 100644 --- a/test/messages/bind_response.test.js +++ b/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'); diff --git a/test/messages/compare_request.test.js b/test/messages/compare_request.test.js index e5efc9c..ec3c971 100644 --- a/test/messages/compare_request.test.js +++ b/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'); diff --git a/test/messages/compare_response.test.js b/test/messages/compare_response.test.js index fd4594c..535536a 100644 --- a/test/messages/compare_response.test.js +++ b/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'); diff --git a/test/messages/del_request.test.js b/test/messages/del_request.test.js index 9b7d527..f8502ad 100644 --- a/test/messages/del_request.test.js +++ b/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 diff --git a/test/messages/del_response.test.js b/test/messages/del_response.test.js index ebecb5c..72f8641 100644 --- a/test/messages/del_response.test.js +++ b/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'); diff --git a/test/messages/ext_request.test.js b/test/messages/ext_request.test.js index 656dbf3..5056a71 100644 --- a/test/messages/ext_request.test.js +++ b/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'); diff --git a/test/messages/ext_response.test.js b/test/messages/ext_response.test.js index b31559a..369793a 100644 --- a/test/messages/ext_response.test.js +++ b/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'); diff --git a/test/messages/moddn_request.test.js b/test/messages/moddn_request.test.js index 6b55ea7..f3d2f1b 100644 --- a/test/messages/moddn_request.test.js +++ b/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'); diff --git a/test/messages/moddn_response.test.js b/test/messages/moddn_response.test.js index e257c8d..8804490 100644 --- a/test/messages/moddn_response.test.js +++ b/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'); diff --git a/test/messages/modify_request.test.js b/test/messages/modify_request.test.js index 046e216..81609ba 100644 --- a/test/messages/modify_request.test.js +++ b/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'); diff --git a/test/messages/modify_response.test.js b/test/messages/modify_response.test.js index f63993e..c35ae5c 100644 --- a/test/messages/modify_response.test.js +++ b/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'); diff --git a/test/messages/search_entry.test.js b/test/messages/search_entry.test.js index 7b41d53..f22ebf7 100644 --- a/test/messages/search_entry.test.js +++ b/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'); diff --git a/test/messages/search_request.test.js b/test/messages/search_request.test.js index 30ec9c4..fdf684d 100644 --- a/test/messages/search_request.test.js +++ b/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'); diff --git a/test/messages/search_response.test.js b/test/messages/search_response.test.js index 83ffeb7..d5fe111 100644 --- a/test/messages/search_response.test.js +++ b/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'); diff --git a/test/messages/unbind_request.test.js b/test/messages/unbind_request.test.js index 058a124..83603b2 100644 --- a/test/messages/unbind_request.test.js +++ b/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'); diff --git a/test/server.test.js b/test/server.test.js index f0de5a2..fa12fcb 100644 --- a/test/server.test.js +++ b/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'); diff --git a/test/test.js b/test/test.js new file mode 100644 index 0000000..5030dd0 --- /dev/null +++ b/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')); +})(); diff --git a/test/url.test.js b/test/url.test.js index 47882c78..cc6ad19 100644 --- a/test/url.test.js +++ b/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;