From 12cac0e33d1dd17564d317ff0a87e91a96cd8f1f Mon Sep 17 00:00:00 2001 From: Esteban Ordano Date: Wed, 17 Dec 2014 12:38:56 -0300 Subject: [PATCH] Fix tests on browsers: need to add Buffer exception --- lib/util/buffer.js | 10 +++++----- lib/util/preconditions.js | 10 ++++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/lib/util/buffer.js b/lib/util/buffer.js index 62a3222..f750b5e 100644 --- a/lib/util/buffer.js +++ b/lib/util/buffer.js @@ -28,7 +28,7 @@ module.exports = { * @return {Buffer} */ fill: function fill(buffer, value) { - $.checkArgumentType(buffer, Buffer, 'buffer'); + $.checkArgumentType(buffer, 'Buffer', 'buffer'); $.checkArgumentType(value, 'number', 'value'); var length = buffer.length; for (var i = 0; i < length; i++) { @@ -107,7 +107,7 @@ module.exports = { * @return {number} */ integerFromBuffer: function integerFromBuffer(buffer) { - $.checkArgumentType(buffer, Buffer, 'buffer'); + $.checkArgumentType(buffer, 'Buffer', 'buffer'); return buffer[0] << 24 | buffer[1] << 16 | buffer[2] << 8 | buffer[3]; }, @@ -117,7 +117,7 @@ module.exports = { * @return {number} */ integerFromSingleByteBuffer: function integerFromBuffer(buffer) { - $.checkArgumentType(buffer, Buffer, 'buffer'); + $.checkArgumentType(buffer, 'Buffer', 'buffer'); return buffer[0]; }, @@ -130,7 +130,7 @@ module.exports = { * @return {string} */ bufferToHex: function bufferToHex(buffer) { - $.checkArgumentType(buffer, Buffer, 'buffer'); + $.checkArgumentType(buffer, 'Buffer', 'buffer'); return buffer.toString('hex'); }, @@ -140,7 +140,7 @@ module.exports = { * @return {Buffer} */ reverse: function reverse(param) { - $.checkArgumentType(param, Buffer, 'param'); + $.checkArgumentType(param, 'Buffer', 'param'); var ret = new buffer.Buffer(param.length); for (var i = 0; i < param.length; i++) { ret[i] = param[param.length - i - 1]; diff --git a/lib/util/preconditions.js b/lib/util/preconditions.js index 9e87b5d..1b80eee 100644 --- a/lib/util/preconditions.js +++ b/lib/util/preconditions.js @@ -17,10 +17,12 @@ module.exports = { checkArgumentType: function(argument, type, argumentName) { argumentName = argumentName || '(unknown name)'; if (_.isString(type)) { - if (type === 'number' && !_.isNumber(argument)) { - throw new errors.InvalidArgumentType(argument, type, argumentName); - } - if (typeof argument !== type) { + if (type === 'Buffer') { + var BufferUtil = require('./buffer'); + if (!BufferUtil.isBuffer(argument)) { + throw new errors.InvalidArgumentType(argument, type, argumentName); + } + } else if (typeof argument !== type) { throw new errors.InvalidArgumentType(argument, type, argumentName); } } else {