diff options
author | Joyee Cheung <joyeec9h3@gmail.com> | 2018-04-16 22:58:19 +0800 |
---|---|---|
committer | Joyee Cheung <joyeec9h3@gmail.com> | 2018-04-19 12:09:26 +0800 |
commit | 2c23e31c317025f6064c194f8850a474f4b6bf53 (patch) | |
tree | 8f25f315719122321a912cf1bae35a6f76a51edf /test/parallel/test-stream-base-typechecking.js | |
parent | 7e269f52667104c94dcf65e527b04c2632d701bb (diff) | |
download | android-node-v8-2c23e31c317025f6064c194f8850a474f4b6bf53.tar.gz android-node-v8-2c23e31c317025f6064c194f8850a474f4b6bf53.tar.bz2 android-node-v8-2c23e31c317025f6064c194f8850a474f4b6bf53.zip |
src: throw ERR_INVALID_ARG_TYPE in C++ argument checks
- Moves THROW_AND_RETURN_IF_NOT_BUFFER and
THROW_AND_RETURN_IF_NOT_STRING from node_crypto.cc to
node_errors.h so it can be reused.
- Move THROW_AND_RETURN_UNLESS_BUFFER in util.h to
node_buffer.cc and call THROW_AND_RETURN_IF_NOT_BUFFER
there. The only other reference to THROW_AND_RETURN_UNLESS_BUFFER in
node_i18n.cc can be safely replaced by an assertion since
the argument will be checked in JS land.
- Migrate ERR_INVALID_ARG_TYPE errors in C++. We can move the
checks to JS land if possible later without having to
go semver-major.
PR-URL: https://github.com/nodejs/node/pull/20121
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Diffstat (limited to 'test/parallel/test-stream-base-typechecking.js')
-rw-r--r-- | test/parallel/test-stream-base-typechecking.js | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/test/parallel/test-stream-base-typechecking.js b/test/parallel/test-stream-base-typechecking.js index 8d559a42df..a8652dc063 100644 --- a/test/parallel/test-stream-base-typechecking.js +++ b/test/parallel/test-stream-base-typechecking.js @@ -1,13 +1,16 @@ 'use strict'; const common = require('../common'); -const assert = require('assert'); const net = require('net'); const server = net.createServer().listen(0, common.mustCall(() => { const client = net.connect(server.address().port, common.mustCall(() => { - assert.throws(() => { + common.expectsError(() => { client.write('broken', 'buffer'); - }, /^TypeError: Second argument must be a buffer$/); + }, { + type: TypeError, + code: 'ERR_INVALID_ARG_TYPE', + message: 'Second argument must be a buffer' + }); client.destroy(); server.close(); })); |