Get rid of paranodEqual assertion library in the tests

ELLIOTTCABLE · Jul 5, 2014 · 4f0ef1e · 4f0ef1e
1 parent 987adcf
commit 4f0ef1e
Show file tree

Hide file tree

Showing 10 changed files with 77 additions and 283 deletions.
diff --git a/test/functional/dumper.js b/test/functional/dumper.js
@@ -1,12 +1,12 @@
 'use strict';
 
 
+var assert = require('assert');
 var path   = require('path');
 var jsyaml = require('../../lib/js-yaml');
 var helper = require('../support/helper');
 
-var paranoidEqual = require('../support/assert-paranoid-equal').paranoidEqual;
-var TEST_SCHEMA   = require('../support/schema').TEST_SCHEMA;
+var TEST_SCHEMA = require('../support/schema').TEST_SCHEMA;
 
 
 helper.generateTests({
@@ -24,7 +24,7 @@ helper.generateTests({
     if ('function' === typeof object) {
       object.call(this, deserialized);
     } else {
-      paranoidEqual(deserialized, object);
+      assert.deepEqual(deserialized, object);
     }
   }
 });
diff --git a/test/functional/loader.js b/test/functional/loader.js
@@ -1,12 +1,12 @@
 'use strict';
 
 
+var assert = require('assert');
 var path   = require('path');
 var jsyaml = require('../../lib/js-yaml');
 var helper = require('../support/helper');
 
-var paranoidEqual = require('../support/assert-paranoid-equal').paranoidEqual;
-var TEST_SCHEMA   = require('../support/schema').TEST_SCHEMA;
+var TEST_SCHEMA = require('../support/schema').TEST_SCHEMA;
 
 
 helper.generateTests({
@@ -30,7 +30,7 @@ helper.generateTests({
     if ('function' === typeof object2) {
       object2.call(this, object1);
     } else {
-      paranoidEqual(object1, object2);
+      assert.deepEqual(object1, object2);
     }
   }
 });
diff --git a/test/functional/loader/construct-custom.js b/test/functional/loader/construct-custom.js
@@ -1,8 +1,9 @@
 'use strict';
 
+var assert = require('assert');
 var schema = require('../../support/schema');
 
-module.exports = [
+var expected = [
   new schema.Tag1({ x: 1 }),
   new schema.Tag1({ x: 1, y: 2, z: 3 }),
   new schema.Tag2({ x: 10 }),
@@ -11,3 +12,33 @@ module.exports = [
   new schema.Tag3({ x: 1, y: 2, z: 3 }),
   new schema.Foo({ myParameter: 'foo', myAnotherParameter: [1, 2, 3] })
 ];
+
+function testHandler(actual) {
+  assert.strictEqual(Object.prototype.toString.call(actual), '[object Array]');
+  assert.strictEqual(actual.length, 7);
+
+  assert.deepEqual(actual[0], expected[0]);
+  assert.strictEqual(Object.getPrototypeOf(actual[0]), Object.getPrototypeOf(expected[0]));
+
+  assert.deepEqual(actual[1], expected[1]);
+  assert.strictEqual(Object.getPrototypeOf(actual[1]), Object.getPrototypeOf(expected[1]));
+
+  assert.deepEqual(actual[2], expected[2]);
+  assert.strictEqual(Object.getPrototypeOf(actual[2]), Object.getPrototypeOf(expected[2]));
+
+  assert.deepEqual(actual[3], expected[3]);
+  assert.strictEqual(Object.getPrototypeOf(actual[3]), Object.getPrototypeOf(expected[3]));
+
+  assert.deepEqual(actual[4], expected[4]);
+  assert.strictEqual(Object.getPrototypeOf(actual[4]), Object.getPrototypeOf(expected[4]));
+
+  assert.deepEqual(actual[5], expected[5]);
+  assert.strictEqual(Object.getPrototypeOf(actual[5]), Object.getPrototypeOf(expected[5]));
+
+  assert.deepEqual(actual[6], expected[6]);
+  assert.strictEqual(Object.getPrototypeOf(actual[6]), Object.getPrototypeOf(expected[6]));
+}
+
+testHandler.expected = expected;
+
+module.exports = testHandler;
diff --git a/test/functional/loader/construct-float.js b/test/functional/loader/construct-float.js
@@ -1,10 +1,29 @@
 'use strict';
 
-module.exports = {
+var assert = require('assert');
+
+var expected = {
   'canonical': 685230.15,
   'exponential': 685230.15,
   'fixed': 685230.15,
   'sexagesimal': 685230.15,
   'negative infinity': Number.NEGATIVE_INFINITY,
   'not a number': NaN
 };
+
+function testHandler(actual) {
+  assert.strictEqual(Object.prototype.toString.call(actual), '[object Object]');
+  assert.strictEqual(Object.keys(actual).sort().join(','), Object.keys(expected).sort().join(','));
+
+  assert.strictEqual(actual['canonical'],         expected['canonical']);
+  assert.strictEqual(actual['exponential'],       expected['exponential']);
+  assert.strictEqual(actual['fixed'],             expected['fixed']);
+  assert.strictEqual(actual['sexagesimal'],       expected['sexagesimal']);
+  assert.strictEqual(actual['negative infinity'], expected['negative infinity']);
+
+  assert(Number.isNaN(actual['not a number']));
+}
+
+testHandler.expected = expected;
+
+module.exports = testHandler;
diff --git a/test/functional/loader/more-floats.js b/test/functional/loader/more-floats.js
@@ -1,6 +1,8 @@
 'use strict';
 
-module.exports = [
+var assert = require('assert');
+
+var expected = [
   0.0,
   1.0,
   -1.0,
@@ -9,3 +11,19 @@ module.exports = [
   NaN,
   NaN
 ];
+
+function testHandler(actual) {
+  assert.strictEqual(Object.prototype.toString.call(actual), '[object Array]');
+  assert.strictEqual(actual.length, 7);
+  assert.strictEqual(actual[0], expected[0]);
+  assert.strictEqual(actual[1], expected[1]);
+  assert.strictEqual(actual[2], expected[2]);
+  assert.strictEqual(actual[3], expected[3]);
+  assert.strictEqual(actual[4], expected[4]);
+  assert(Number.isNaN(actual[5]));
+  assert(Number.isNaN(actual[6]));
+}
+
+testHandler.expected = expected;
+
+module.exports = testHandler;
diff --git a/test/support/assert-paranoid-equal.js b/test/support/assert-paranoid-equal.js
diff --git a/test/support/assert-paranoid-equal/context.js b/test/support/assert-paranoid-equal/context.js
diff --git a/test/support/assert-paranoid-equal/inspectors.js b/test/support/assert-paranoid-equal/inspectors.js
diff --git a/test/support/assert-paranoid-equal/report.js b/test/support/assert-paranoid-equal/report.js