Merge pull request #536 from ldapjs/parallelize-tests

Refactor tests to be independent of each other

Author: jsumners

lib/attribute.js

@@ -71,7 +71,7 @@ Attribute.prototype.addValue = function addValue(val) {
   if (Buffer.isBuffer(val)) {
     this._vals.push(val);
   } else {
-    this._vals.push(new Buffer(val + '', _bufferEncoding(this.type)));
+    this._vals.push(Buffer.from(val + '', _bufferEncoding(this.type)));
   }
 };
 

lib/client/index.js

@@ -1,8 +1,7 @@
 // Copyright 2012 Mark Cavage, Inc.  All rights reserved.
 
-var logger = Object.create(require('abstract-logging'));
-
-var Client = require('./client');
+const logger = require('../logger');
+const Client = require('./client');
 
 
 

lib/controls/paged_results_control.js

@@ -48,7 +48,7 @@ PagedResultsControl.prototype.parse = function parse(buffer) {
     this._value.cookie = ber.readString(asn1.Ber.OctetString, true);
      //readString returns '' instead of a zero-length buffer
     if (!this._value.cookie)
-      this._value.cookie = new Buffer(0);
+      this._value.cookie = Buffer.alloc(0);
 
     return true;
   }

lib/index.js

@@ -1,6 +1,6 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var logger = Object.create(require('abstract-logging'));
+var logger = require('./logger');
 
 var client = require('./client');
 var Attribute = require('./attribute');

lib/logger.js

@@ -0,0 +1,6 @@
+'use strict';
+
+const logger = Object.create(require('abstract-logging'))
+logger.child = function () { return logger }
+
+module.exports = logger

lib/messages/del_request.js

@@ -44,7 +44,7 @@ DeleteRequest.prototype._parse = function (ber, length) {
 DeleteRequest.prototype._toBer = function (ber) {
   assert.ok(ber);
 
-  var buf = new Buffer(this.entry.toString());
+  var buf = Buffer.from(this.entry.toString());
   for (var i = 0; i < buf.length; i++)
     ber.writeByte(buf[i]);
 

lib/messages/ext_request.js

@@ -28,7 +28,7 @@ function ExtendedRequest(options) {
   if(Buffer.isBuffer(this.requestValue)) {
     this.requestValueBuffer = this.requestValue;
   } else {
-    this.requestValueBuffer = new Buffer(this.requestValue || '', 'utf8');
+    this.requestValueBuffer = Buffer.from(this.requestValue || '', 'utf8');
   }
 }
 util.inherits(ExtendedRequest, LDAPMessage);
@@ -58,7 +58,7 @@ Object.defineProperties(ExtendedRequest.prototype, {
       if(Buffer.isBuffer(val)) {
         this.requestValueBuffer = val;
       } else {
-        this.requestValueBuffer = new Buffer(val, 'utf8');
+        this.requestValueBuffer = Buffer.from(val, 'utf8');
       }
 
       this.requestValue = val;

lib/messages/message.js

@@ -5,6 +5,7 @@ var util = require('util');
 
 var asn1 = require('asn1');
 
+var logger = require('../logger')
 var Control = require('../controls').Control;
 var Protocol = require('../protocol');
 
@@ -32,7 +33,7 @@ function LDAPMessage(options) {
   this.protocolOp = options.protocolOp || undefined;
   this.controls = options.controls ? options.controls.slice(0) : [];
 
-  this.log = options.log;
+  this.log = options.log || logger;
 }
 Object.defineProperties(LDAPMessage.prototype, {
   id: {

lib/messages/parser.js

@@ -6,6 +6,7 @@ var util = require('util');
 var assert = require('assert-plus');
 var asn1 = require('asn1');
 var VError = require('verror').VError;
+var logger = require('../logger')
 
 var AbandonRequest = require('./abandon_request');
 var AddRequest = require('./add_request');
@@ -43,14 +44,13 @@ var BerReader = asn1.BerReader;
 
 ///--- API
 
-function Parser(options) {
+function Parser(options = {}) {
   assert.object(options);
-  assert.object(options.log);
 
   EventEmitter.call(this);
 
   this.buffer = null;
-  this.log = options.log;
+  this.log = options.log || logger;
 }
 util.inherits(Parser, EventEmitter);
 

test/attribute.test.js

@@ -1,34 +1,16 @@
-// Copyright 2011 Mark Cavage, Inc.  All rights reserved.
-
-var test = require('tap').test;
-
-var asn1 = require('asn1');
-
-
-///--- Globals
-
-var BerReader = asn1.BerReader;
-var BerWriter = asn1.BerWriter;
-var Attribute;
-
-
-///--- Tests
-
-test('load library', function (t) {
-  Attribute = require('../lib/index').Attribute;
-  t.ok(Attribute);
-  t.end();
-});
+'use strict';
 
+const { test } = require('tap');
+const { BerReader, BerWriter } = require('asn1');
+const { Attribute } = require('../lib');
 
 test('new no args', function (t) {
   t.ok(new Attribute());
   t.end();
 });
 
-
 test('new with args', function (t) {
-  var attr = new Attribute({
+  const attr = new Attribute({
     type: 'cn',
     vals: ['foo', 'bar']
   });
@@ -43,24 +25,23 @@ test('new with args', function (t) {
     attr = new Attribute('not an object');
   });
   t.throws(function () {
-    var typeThatIsNotAString = 1;
+    const typeThatIsNotAString = 1;
     attr = new Attribute({
       type: typeThatIsNotAString
     });
   });
   t.end();
 });
 
-
 test('toBer', function (t) {
-  var attr = new Attribute({
+  const attr = new Attribute({
     type: 'cn',
     vals: ['foo', 'bar']
   });
   t.ok(attr);
-  var ber = new BerWriter();
+  const ber = new BerWriter();
   attr.toBer(ber);
-  var reader = new BerReader(ber.buffer);
+  const reader = new BerReader(ber.buffer);
   t.ok(reader.readSequence());
   t.equal(reader.readString(), 'cn');
   t.equal(reader.readSequence(), 0x31); // lber set
@@ -69,17 +50,16 @@ test('toBer', function (t) {
   t.end();
 });
 
-
 test('parse', function (t) {
-  var ber = new BerWriter();
+  const ber = new BerWriter();
   ber.startSequence();
   ber.writeString('cn');
   ber.startSequence(0x31);
   ber.writeStringArray(['foo', 'bar']);
   ber.endSequence();
   ber.endSequence();
 
-  var attr = new Attribute();
+  const attr = new Attribute();
   t.ok(attr);
   t.ok(attr.parse(new BerReader(ber.buffer)));
 
@@ -91,12 +71,12 @@ test('parse', function (t) {
 });
 
 test('parse - without 0x31', function (t) {
-  var ber = new BerWriter;
+  const ber = new BerWriter;
   ber.startSequence();
   ber.writeString('sn');
   ber.endSequence();
 
-  var attr = new Attribute;
+  const attr = new Attribute;
   t.ok(attr);
   t.ok(attr.parse(new BerReader(ber.buffer)));
 
@@ -107,18 +87,18 @@ test('parse - without 0x31', function (t) {
 });
 
 test('toString', function (t) {
-  var attr = new Attribute({
+  const attr = new Attribute({
     type: 'foobar',
     vals: ['asdf']
   });
-  var expected = attr.toString();
-  var actual = JSON.stringify(attr.json);
+  const expected = attr.toString();
+  const actual = JSON.stringify(attr.json);
   t.equal(actual, expected);
   t.end();
 });
 
 test('isAttribute', function (t) {
-  var isA = Attribute.isAttribute;
+  const isA = Attribute.isAttribute;
   t.notOk(isA(null));
   t.notOk(isA('asdf'));
   t.ok(isA(new Attribute({
@@ -128,7 +108,7 @@ test('isAttribute', function (t) {
 
   t.ok(isA({
     type: 'foo',
-    vals: ['item', new Buffer(5)],
+    vals: ['item', Buffer.alloc(5)],
     toBer: function () { /* placeholder */ }
   }));
 
@@ -142,18 +122,17 @@ test('isAttribute', function (t) {
   t.end();
 });
 
-
 test('compare', function (t) {
-  var comp = Attribute.compare;
-  var a = new Attribute({
+  const comp = Attribute.compare;
+  const a = new Attribute({
     type: 'foo',
     vals: ['bar']
   });
-  var b = new Attribute({
+  const b = new Attribute({
     type: 'foo',
     vals: ['bar']
   });
-  var notAnAttribute = 'this is not an attribute';
+  const notAnAttribute = 'this is not an attribute';
 
   t.throws(function () {
     comp(a, notAnAttribute);