assert: fix deepEqual inconsistencies

BridgeAR · tniessen · commit a8149c47993d · 2017-08-01T13:26:07.000+02:00
PR-URL: #14491 Fixes: #14441 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Khaidi Chu <i@2333.moe> Reviewed-By: Tobias Nießen <tniessen@tnie.de>
diff --git a/lib/assert.js b/lib/assert.js
@@ -271,8 +271,15 @@ function innerDeepEqual(actual, expected, strict, memos) {
       position: 0
     };
   } else {
-    if (memos.actual.has(actual)) {
-      return memos.actual.get(actual) === memos.expected.get(expected);
+    // We prevent up to two map.has(x) calls by directly retrieving the value
+    // and checking for undefined. The map can only contain numbers, so it is
+    // safe to check for undefined only.
+    const expectedMemoA = memos.actual.get(actual);
+    if (expectedMemoA !== undefined) {
+      const expectedMemoB = memos.expected.get(expected);
+      if (expectedMemoB !== undefined) {
+        return expectedMemoA === expectedMemoB;
+      }
     }
     memos.position++;
   }
diff --git a/test/parallel/test-assert-deep.js b/test/parallel/test-assert-deep.js
@@ -303,6 +303,26 @@ assertOnlyDeepEqual(
   new Set([undefined])
 );
 
+// Circular structures
+{
+  const a = {};
+  const b = {};
+  a.a = a;
+  b.a = {};
+  b.a.a = a;
+  assertDeepAndStrictEqual(a, b);
+}
+
+{
+  const a = new Set();
+  const b = new Set();
+  const c = new Set();
+  a.add(a);
+  b.add(b);
+  c.add(a);
+  assertDeepAndStrictEqual(b, c);
+}
+
 {
   const values = [
     123,
diff --git a/test/parallel/test-assert.js b/test/parallel/test-assert.js
@@ -578,8 +578,8 @@ a.throws(makeBlock(thrower, TypeError), function(err) {
 
   const h = { ref: g };
 
-  a.throws(makeBlock(a.deepEqual, f, h), /AssertionError/);
-  a.throws(makeBlock(a.deepStrictEqual, f, h), /AssertionError/);
+  a.doesNotThrow(makeBlock(a.deepEqual, f, h));
+  a.doesNotThrow(makeBlock(a.deepStrictEqual, f, h));
 }
 // GH-7178. Ensure reflexivity of deepEqual with `arguments` objects.
 const args = (function() { return arguments; })();

Original file line number	Diff line number	Diff line change
`@@ -578,8 +578,8 @@ a.throws(makeBlock(thrower, TypeError), function(err) {`
`578`	`578`
`579`	`579`	`const h = { ref: g };`
`580`	`580`
`581`		`- a.throws(makeBlock(a.deepEqual, f, h), /AssertionError/);`
`582`		`- a.throws(makeBlock(a.deepStrictEqual, f, h), /AssertionError/);`
	`581`	`+ a.doesNotThrow(makeBlock(a.deepEqual, f, h));`
	`582`	`+ a.doesNotThrow(makeBlock(a.deepStrictEqual, f, h));`
`583`	`583`	`}`
`584`	`584`	// GH-7178. Ensure reflexivity of deepEqual with `arguments` objects.
`585`	`585`	`const args = (function() { return arguments; })();`