use Node.js assert API directly

Author: vmoroz

test/js-native-api/test_general/testV8Instanceof.js

@@ -1,3 +1,6 @@
+// This test is adopted from V8's test suite.
+// See deps/v8/test/mjsunit/instanceof.js in Node.js source repository.
+//
 // Copyright 2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -30,35 +33,11 @@ const common = require('../../common');
 const addon = require(`./build/${common.buildType}/test_general`);
 const assert = require('assert');
 
-// The following assert functions are referenced by v8's unit tests
-// See for instance deps/v8/test/mjsunit/instanceof.js
-
-function assertTrue(assertion) {
-  return assert.strictEqual(assertion, true);
-}
-
-
-function assertFalse(assertion) {
-  assert.strictEqual(assertion, false);
-}
-
-
-function assertEquals(leftHandSide, rightHandSide) {
-  assert.strictEqual(leftHandSide, rightHandSide);
-}
-
-
-function assertThrows(statement) {
-  assert.throws(function() {
-    eval(statement);
-  }, Error);
-}
+assert.ok(addon.doInstanceOf({}, Object));
+assert.ok(addon.doInstanceOf([], Object));
 
-assertTrue(addon.doInstanceOf({}, Object));
-assertTrue(addon.doInstanceOf([], Object));
-
-assertFalse(addon.doInstanceOf({}, Array));
-assertTrue(addon.doInstanceOf([], Array));
+assert.ok(!addon.doInstanceOf({}, Array));
+assert.ok(addon.doInstanceOf([], Array));
 
 function TestChains() {
   const A = {};
@@ -69,24 +48,23 @@ function TestChains() {
 
   function F() { }
   F.prototype = A;
-  assertTrue(addon.doInstanceOf(C, F));
-  assertTrue(addon.doInstanceOf(B, F));
-  assertFalse(addon.doInstanceOf(A, F));
+  assert.ok(addon.doInstanceOf(C, F));
+  assert.ok(addon.doInstanceOf(B, F));
+  assert.ok(!addon.doInstanceOf(A, F));
 
   F.prototype = B;
-  assertTrue(addon.doInstanceOf(C, F));
-  assertFalse(addon.doInstanceOf(B, F));
-  assertFalse(addon.doInstanceOf(A, F));
+  assert.ok(addon.doInstanceOf(C, F));
+  assert.ok(!addon.doInstanceOf(B, F));
+  assert.ok(!addon.doInstanceOf(A, F));
 
   F.prototype = C;
-  assertFalse(addon.doInstanceOf(C, F));
-  assertFalse(addon.doInstanceOf(B, F));
-  assertFalse(addon.doInstanceOf(A, F));
+  assert.ok(!addon.doInstanceOf(C, F));
+  assert.ok(!addon.doInstanceOf(B, F));
+  assert.ok(!addon.doInstanceOf(A, F));
 }
 
 TestChains();
 
-
 function TestExceptions() {
   function F() { }
   const items = [ 1, new Number(42),
@@ -104,19 +82,21 @@ function TestExceptions() {
       try {
         if (addon.doInstanceOf(items[i], items[j])) instanceofs++;
       } catch (e) {
-        assertTrue(addon.doInstanceOf(e, TypeError));
+        assert.ok(addon.doInstanceOf(e, TypeError));
         exceptions++;
       }
     }
   }
-  assertEquals(10, instanceofs);
-  assertEquals(88, exceptions);
+  assert.strictEqual(instanceofs, 10);
+  assert.strictEqual(exceptions, 88);
 
   // Make sure to throw an exception if the function prototype
   // isn't a proper JavaScript object.
   function G() { }
   G.prototype = undefined;
-  assertThrows('addon.doInstanceOf({}, G)');
+  assert.throws(function() {
+    addon.doInstanceOf({}, G);
+  }, Error);
 }
 
 TestExceptions();

test/js-native-api/test_general/testV8Instanceof2.js

@@ -1,3 +1,6 @@
+// This test is adopted from V8's test suite.
+// See deps/v8/test/mjsunit/instanceof-2.js in Node.js source repository.
+//
 // Copyright 2010 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -30,14 +33,6 @@ const common = require('../../common');
 const addon = require(`./build/${common.buildType}/test_general`);
 const assert = require('assert');
 
-function assertTrue(assertion) {
-  return assert.strictEqual(assertion, true);
-}
-
-function assertEquals(leftHandSide, rightHandSide) {
-  assert.strictEqual(leftHandSide, rightHandSide);
-}
-
 const except = 'exception';
 
 let correct_answer_index = 0;
@@ -307,10 +302,10 @@ for (let i = 0; i < 256; i++) {
 function InstanceTest(x, func) {
   try {
     const answer = addon.doInstanceOf(x, func);
-    assertEquals(correct_answers[correct_answer_index], answer);
+    assert.strictEqual(correct_answers[correct_answer_index], answer);
   } catch (e) {
-    assertTrue(/prototype/.test(e));
-    assertEquals(correct_answers[correct_answer_index], except);
+    assert.ok(/prototype/.test(e));
+    assert.strictEqual(correct_answers[correct_answer_index], except);
   }
   correct_answer_index++;
 }