assert: fix .throws operator

BridgeAR · MylesBorins · commit 84948cf14fa3 · 2018-10-31T13:44:57.000-04:00
assert.throws and assert.doesNotThrow set the operator to a internal function. That was by accident and originally the operator was undefined. This changes it to show "throws" or "doesNotThrow". Backport-PR-URL: #23223 PR-URL: #17575 Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
diff --git a/lib/assert.js b/lib/assert.js
@@ -643,15 +643,18 @@ function innerThrows(shouldThrow, block, expected, message) {
         details += ` (${expected.name})`;
       }
       details += message ? `: ${message}` : '.';
-      fail(actual, expected, `Missing expected exception${details}`, fail);
+      fail(actual, expected, `Missing expected exception${details}`, 'throws');
     }
     if (expected && expectedException(actual, expected) === false) {
       throw actual;
     }
   } else if (actual !== undefined) {
     if (!expected || expectedException(actual, expected)) {
       details = message ? `: ${message}` : '.';
-      fail(actual, expected, `Got unwanted exception${details}`, fail);
+      fail(actual,
+           expected,
+           `Got unwanted exception${details}`,
+           'doesNotThrow');
     }
     throw actual;
   }
diff --git a/test/parallel/test-assert.js b/test/parallel/test-assert.js
@@ -463,10 +463,15 @@ assert.throws(() => { assert.ifError(new Error('test error')); },
 assert.doesNotThrow(() => { assert.ifError(null); });
 assert.doesNotThrow(() => { assert.ifError(); });
 
-assert.throws(() => {
-  assert.doesNotThrow(makeBlock(thrower, Error), 'user message');
-}, /Got unwanted exception: user message/,
-              'a.doesNotThrow ignores user message');
+common.expectsError(
+  () => assert.doesNotThrow(makeBlock(thrower, Error), 'user message'),
+  {
+    type: a.AssertionError,
+    code: 'ERR_ASSERTION',
+    operator: 'doesNotThrow',
+    message: 'Got unwanted exception: user message\n[object Object]'
+  }
+);
 
 // make sure that validating using constructor really works
 {
@@ -525,7 +530,8 @@ a.throws(makeBlock(thrower, TypeError), (err) => {
     () => { a.throws((noop)); },
     common.expectsError({
       code: 'ERR_ASSERTION',
-      message: /^Missing expected exception\.$/
+      message: /^Missing expected exception\.$/,
+      operator: 'throws'
     }));
 
   assert.throws(

Original file line number	Diff line number	Diff line change
`@@ -643,15 +643,18 @@ function innerThrows(shouldThrow, block, expected, message) {`
`643`	`643`	details += ` (${expected.name})`;
`644`	`644`	`}`
`645`	`645`	details += message ? `: ${message}` : '.';
`646`		- fail(actual, expected, `Missing expected exception${details}`, fail);
	`646`	+ fail(actual, expected, `Missing expected exception${details}`, 'throws');
`647`	`647`	`}`
`648`	`648`	`if (expected && expectedException(actual, expected) === false) {`
`649`	`649`	`throw actual;`
`650`	`650`	`}`
`651`	`651`	`} else if (actual !== undefined) {`
`652`	`652`	`if (!expected \|\| expectedException(actual, expected)) {`
`653`	`653`	details = message ? `: ${message}` : '.';
`654`		- fail(actual, expected, `Got unwanted exception${details}`, fail);
	`654`	`+ fail(actual,`
	`655`	`+ expected,`
	`656`	+ `Got unwanted exception${details}`,
	`657`	`+ 'doesNotThrow');`
`655`	`658`	`}`
`656`	`659`	`throw actual;`
`657`	`660`	`}`