test_runner: fix t.assert methods

The node:assert module contains several top level APIs that do not make sense to expose as methods on t.assert. Examples include AssertionError and CallTracker. This commit removes such APIs from t.assert. Refs: nodejs#52860 PR-URL: nodejs#53049 Reviewed-By: Benjamin Gruenbaum <[email protected]> Reviewed-By: Chemi Atlow <[email protected]> Reviewed-By: Moshe Atlow <[email protected]> Reviewed-By: Antoine du Hamel <[email protected]>
bmeck · Jun 22, 2024 · eebc9b3 · eebc9b3
1 parent fb92a69
commit eebc9b3
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 8 deletions.
diff --git a/lib/internal/test_runner/test.js b/lib/internal/test_runner/test.js
@@ -12,7 +12,6 @@ const {
   MathMax,
   Number,
   ObjectDefineProperty,
-  ObjectEntries,
   ObjectSeal,
   PromisePrototypeThen,
   PromiseResolve,
@@ -107,10 +106,28 @@ function lazyAssertObject() {
   if (assertObj === undefined) {
     assertObj = new SafeMap();
     const assert = require('assert');
-    for (const { 0: key, 1: value } of ObjectEntries(assert)) {
-      if (typeof value === 'function') {
-        assertObj.set(value, key);
-      }
+
+    const methodsToCopy = [
+      'deepEqual',
+      'deepStrictEqual',
+      'doesNotMatch',
+      'doesNotReject',
+      'doesNotThrow',
+      'equal',
+      'fail',
+      'ifError',
+      'match',
+      'notDeepEqual',
+      'notDeepStrictEqual',
+      'notEqual',
+      'notStrictEqual',
+      'ok',
+      'rejects',
+      'strictEqual',
+      'throws',
+    ];
+    for (let i = 0; i < methodsToCopy.length; i++) {
+      assertObj.set(methodsToCopy[i], assert[methodsToCopy[i]]);
     }
   }
   return assertObj;
@@ -227,18 +244,18 @@ class TestContext {
   get assert() {
     if (this.#assert === undefined) {
       const { plan } = this.#test;
-      const assertions = lazyAssertObject();
+      const map = lazyAssertObject();
       const assert = { __proto__: null };
 
       this.#assert = assert;
-      for (const { 0: method, 1: name } of assertions.entries()) {
+      map.forEach((method, name) => {
         assert[name] = (...args) => {
           if (plan !== null) {
             plan.actual++;
           }
           return ReflectApply(method, assert, args);
         };
-      }
+      });
     }
     return this.#assert;
   }

diff --git a/test/parallel/test-runner-assert.js b/test/parallel/test-runner-assert.js
@@ -0,0 +1,26 @@
+'use strict';
+require('../common');
+const { deepStrictEqual } = require('node:assert');
+const test = require('node:test');
+
+test('only methods from node:assert are on t.assert', (t) => {
+  deepStrictEqual(Object.keys(t.assert).sort(), [
+    'deepEqual',
+    'deepStrictEqual',
+    'doesNotMatch',
+    'doesNotReject',
+    'doesNotThrow',
+    'equal',
+    'fail',
+    'ifError',
+    'match',
+    'notDeepEqual',
+    'notDeepStrictEqual',
+    'notEqual',
+    'notStrictEqual',
+    'ok',
+    'rejects',
+    'strictEqual',
+    'throws',
+  ]);
+});