aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMatteo Collina <hello@matteocollina.com>2017-10-29 16:36:32 +0100
committerMatteo Collina <hello@matteocollina.com>2017-10-29 18:57:28 +0100
commit6e86a6651ccd6d6f02bc4a8ccd87b4225357f292 (patch)
tree7332a37ed4468fa6f5939ebad40d0bbbdbcd7118 /test
parent896eaf6820a0194fb2879c44c4dbcece29e616d3 (diff)
downloadandroid-node-v8-6e86a6651ccd6d6f02bc4a8ccd87b4225357f292.tar.gz
android-node-v8-6e86a6651ccd6d6f02bc4a8ccd87b4225357f292.tar.bz2
android-node-v8-6e86a6651ccd6d6f02bc4a8ccd87b4225357f292.zip
stream: complete migration to internal/errors
Complete the migration to the new error system of _stream_readable and _stream_writable. Adds the corresponding documentation. PR-URL: https://github.com/nodejs/node/pull/16589 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Diffstat (limited to 'test')
-rw-r--r--test/parallel/test-file-write-stream.js15
-rw-r--r--test/parallel/test-http2-head-request.js1
-rw-r--r--test/parallel/test-stream-readable-invalid-chunk.js17
-rw-r--r--test/parallel/test-stream-writable-null.js33
4 files changed, 47 insertions, 19 deletions
diff --git a/test/parallel/test-file-write-stream.js b/test/parallel/test-file-write-stream.js
index ed32a7791e..645c4a637b 100644
--- a/test/parallel/test-file-write-stream.js
+++ b/test/parallel/test-file-write-stream.js
@@ -64,10 +64,17 @@ file
assert.strictEqual(file.bytesWritten, EXPECTED.length * 2);
callbacks.close++;
- assert.throws(function() {
- console.error('write after end should not be allowed');
- file.write('should not work anymore');
- }, /^Error: write after end$/);
+ common.expectsError(
+ () => {
+ console.error('write after end should not be allowed');
+ file.write('should not work anymore');
+ },
+ {
+ code: 'ERR_STREAM_WRITE_AFTER_END',
+ type: Error,
+ message: 'write after end'
+ }
+ );
fs.unlinkSync(fn);
});
diff --git a/test/parallel/test-http2-head-request.js b/test/parallel/test-http2-head-request.js
index 8c91132b5f..d15665624a 100644
--- a/test/parallel/test-http2-head-request.js
+++ b/test/parallel/test-http2-head-request.js
@@ -8,6 +8,7 @@ const http2 = require('http2');
const errCheck = common.expectsError({
type: Error,
+ code: 'ERR_STREAM_WRITE_AFTER_END',
message: 'write after end'
}, 2);
diff --git a/test/parallel/test-stream-readable-invalid-chunk.js b/test/parallel/test-stream-readable-invalid-chunk.js
index f528dfe693..fcd7414bb6 100644
--- a/test/parallel/test-stream-readable-invalid-chunk.js
+++ b/test/parallel/test-stream-readable-invalid-chunk.js
@@ -1,14 +1,19 @@
'use strict';
-require('../common');
+const common = require('../common');
const stream = require('stream');
-const assert = require('assert');
const readable = new stream.Readable({
read: () => {}
});
-const errMessage = /Invalid non-string\/buffer chunk/;
-assert.throws(() => readable.push([]), errMessage);
-assert.throws(() => readable.push({}), errMessage);
-assert.throws(() => readable.push(0), errMessage);
+function checkError(fn) {
+ common.expectsError(fn, {
+ code: 'ERR_INVALID_ARG_TYPE',
+ type: TypeError
+ });
+}
+
+checkError(() => readable.push([]));
+checkError(() => readable.push({}));
+checkError(() => readable.push(0));
diff --git a/test/parallel/test-stream-writable-null.js b/test/parallel/test-stream-writable-null.js
index 58b61bfdc1..d8e90e5c4e 100644
--- a/test/parallel/test-stream-writable-null.js
+++ b/test/parallel/test-stream-writable-null.js
@@ -1,5 +1,5 @@
'use strict';
-require('../common');
+const common = require('../common');
const assert = require('assert');
const stream = require('stream');
@@ -16,10 +16,18 @@ MyWritable.prototype._write = function(chunk, encoding, callback) {
callback();
};
-assert.throws(() => {
- const m = new MyWritable({ objectMode: true });
- m.write(null, (err) => assert.ok(err));
-}, /^TypeError: May not write null values to stream$/);
+common.expectsError(
+ () => {
+ const m = new MyWritable({ objectMode: true });
+ m.write(null, (err) => assert.ok(err));
+ },
+ {
+ code: 'ERR_STREAM_NULL_VALUES',
+ type: TypeError,
+ message: 'May not write null values to stream'
+ }
+);
+
assert.doesNotThrow(() => {
const m = new MyWritable({ objectMode: true }).on('error', (e) => {
assert.ok(e);
@@ -29,10 +37,17 @@ assert.doesNotThrow(() => {
});
});
-assert.throws(() => {
- const m = new MyWritable();
- m.write(false, (err) => assert.ok(err));
-}, /^TypeError: Invalid non-string\/buffer chunk$/);
+common.expectsError(
+ () => {
+ const m = new MyWritable();
+ m.write(false, (err) => assert.ok(err));
+ },
+ {
+ code: 'ERR_INVALID_ARG_TYPE',
+ type: TypeError
+ }
+);
+
assert.doesNotThrow(() => {
const m = new MyWritable().on('error', (e) => {
assert.ok(e);