errors: migrate lib/console

mskec · fhinkel · commit 0ecdf2934039 · 2017-05-27T09:28:07.000+02:00
Migrate console.js to use internal/errors.js. PR-URL: #11340 Ref: #11273 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
diff --git a/doc/api/errors.md b/doc/api/errors.md
@@ -570,6 +570,13 @@ The `'ERR_ARG_NOT_ITERABLE'` error code is used generically to identify that an
 iterable argument (i.e. a value that works with `for...of` loops) is required,
 but not provided to a Node.js API.
 
+<a id="ERR_CONSOLE_WRITABLE_STREAM"></a>
+### ERR_CONSOLE_WRITABLE_STREAM
+
+The `ERR_CONSOLE_WRITABLE_STREAM` error code is thrown when `Console` is
+instantiated without `stdout` stream or when `stdout` or `stderr` streams
+are not writable.
+
 <a id="ERR_INVALID_ARG_TYPE"></a>
 ### ERR_INVALID_ARG_TYPE
 
diff --git a/lib/console.js b/lib/console.js
@@ -21,19 +21,20 @@
 
 'use strict';
 
+const errors = require('internal/errors');
 const util = require('util');
 
 function Console(stdout, stderr, ignoreErrors = true) {
   if (!(this instanceof Console)) {
     return new Console(stdout, stderr, ignoreErrors);
   }
   if (!stdout || typeof stdout.write !== 'function') {
-    throw new TypeError('Console expects a writable stream instance');
+    throw new errors.TypeError('ERR_CONSOLE_WRITABLE_STREAM', 'stdout');
   }
   if (!stderr) {
     stderr = stdout;
   } else if (typeof stderr.write !== 'function') {
-    throw new TypeError('Console expects writable stream instances');
+    throw new errors.TypeError('ERR_CONSOLE_WRITABLE_STREAM', 'stderr');
   }
 
   var prop = {
diff --git a/lib/internal/errors.js b/lib/internal/errors.js
@@ -112,6 +112,8 @@ module.exports = exports = {
 // Note: Please try to keep these in alphabetical order
 E('ERR_ARG_NOT_ITERABLE', '%s must be iterable');
 E('ERR_ASSERTION', (msg) => msg);
+E('ERR_CONSOLE_WRITABLE_STREAM',
+  (name) => `Console expects a writable stream instance for ${name}`);
 E('ERR_INVALID_ARG_TYPE', invalidArgType);
 E('ERR_INVALID_CALLBACK', 'callback must be a function');
 E('ERR_INVALID_FILE_URL_HOST', 'File URL host %s');
diff --git a/test/parallel/test-console-instance.js b/test/parallel/test-console-instance.js
@@ -37,16 +37,28 @@ assert.strictEqual('function', typeof Console);
 
 // make sure that the Console constructor throws
 // when not given a writable stream instance
-assert.throws(() => {
-  new Console();
-}, /^TypeError: Console expects a writable stream instance$/);
+assert.throws(
+  () => { new Console(); },
+  common.expectsError({
+    code: 'ERR_CONSOLE_WRITABLE_STREAM',
+    type: TypeError,
+    message: /stdout/
+  })
+);
 
 // Console constructor should throw if stderr exists but is not writable
-assert.throws(() => {
-  out.write = common.noop;
-  err.write = undefined;
-  new Console(out, err);
-}, /^TypeError: Console expects writable stream instances$/);
+assert.throws(
+  () => {
+    out.write = common.noop;
+    err.write = undefined;
+    new Console(out, err);
+  },
+  common.expectsError({
+    code: 'ERR_CONSOLE_WRITABLE_STREAM',
+    type: TypeError,
+    message: /stderr/
+  })
+);
 
 out.write = err.write = (d) => {};
 

Original file line number	Diff line number	Diff line change
`@@ -21,19 +21,20 @@`
`21`	`21`
`22`	`22`	`'use strict';`
`23`	`23`
	`24`	`+const errors = require('internal/errors');`
`24`	`25`	`const util = require('util');`
`25`	`26`
`26`	`27`	`function Console(stdout, stderr, ignoreErrors = true) {`
`27`	`28`	`if (!(this instanceof Console)) {`
`28`	`29`	`return new Console(stdout, stderr, ignoreErrors);`
`29`	`30`	`}`
`30`	`31`	`if (!stdout \|\| typeof stdout.write !== 'function') {`
`31`		`- throw new TypeError('Console expects a writable stream instance');`
	`32`	`+ throw new errors.TypeError('ERR_CONSOLE_WRITABLE_STREAM', 'stdout');`
`32`	`33`	`}`
`33`	`34`	`if (!stderr) {`
`34`	`35`	`stderr = stdout;`
`35`	`36`	`} else if (typeof stderr.write !== 'function') {`
`36`		`- throw new TypeError('Console expects writable stream instances');`
	`37`	`+ throw new errors.TypeError('ERR_CONSOLE_WRITABLE_STREAM', 'stderr');`
`37`	`38`	`}`
`38`	`39`
`39`	`40`	`var prop = {`