1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

streams: make setDefaultEncoding() throw

Browse Source 
PR-URL: https://github.com/joyent/node/pull/8529
Fixes: f04f3a0 "streams: set default encoding for writable streams"
[trev.norris@gmail.com: update tests to check if throws]
Signed-off-by: Trevor Norris <trev.norris@gmail.com>
This commit is contained in:
Brian White 2014-10-09 16:07:50 -04:00 committed by Trevor Norris
parent db7df57e03
commit 874dd590cf
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/_stream_writable.js
View File

@ -222,14 +222,12 @@ Writable.prototype.uncork = function() {
}; };
Writable.prototype.setDefaultEncoding = function setDefaultEncoding(encoding) { Writable.prototype.setDefaultEncoding = function setDefaultEncoding(encoding) {
if (typeof encoding !== 'string')
return false;
// node::ParseEncoding() requires lower case. // node::ParseEncoding() requires lower case.
encoding = encoding.toLowerCase(); if (typeof encoding === 'string')
encoding = encoding.toLowerCase();
if (!Buffer.isEncoding(encoding)) if (!Buffer.isEncoding(encoding))
return false; throw new TypeError('Unknown encoding: ' + encoding);
this._writableState.defaultEncoding = encoding; this._writableState.defaultEncoding = encoding;
return true;
}; };
function decodeChunk(state, chunk, encoding) { function decodeChunk(state, chunk, encoding) {

14
test/simple/test-stream-writable-change-default-encoding.js
View File

@ -49,28 +49,24 @@ MyWritable.prototype._write = function (chunk, encoding, callback) {
var m = new MyWritable(function(isBuffer, type, enc) { var m = new MyWritable(function(isBuffer, type, enc) {
assert.equal(enc, 'ascii'); assert.equal(enc, 'ascii');
}, { decodeStrings: false }); }, { decodeStrings: false });
var status = m.setDefaultEncoding('ascii'); m.setDefaultEncoding('ascii');
assert.equal(status, true);
m.write('bar'); m.write('bar');
m.end(); m.end();
}()); }());
(function changeDefaultEncodingToInvalidValue() { assert.throws(function changeDefaultEncodingToInvalidValue() {
var m = new MyWritable(function(isBuffer, type, enc) { var m = new MyWritable(function(isBuffer, type, enc) {
assert.equal(enc, 'utf8');
}, { decodeStrings: false }); }, { decodeStrings: false });
var status = m.setDefaultEncoding({}); m.setDefaultEncoding({});
assert.equal(status, false);
m.write('bar'); m.write('bar');
m.end(); m.end();
}()); }, TypeError);
(function checkVairableCaseEncoding() { (function checkVairableCaseEncoding() {
var m = new MyWritable(function(isBuffer, type, enc) { var m = new MyWritable(function(isBuffer, type, enc) {
assert.equal(enc, 'ascii'); assert.equal(enc, 'ascii');
}, { decodeStrings: false }); }, { decodeStrings: false });
var status = m.setDefaultEncoding('AsCii'); m.setDefaultEncoding('AsCii');
assert.equal(status, true);
m.write('bar'); m.write('bar');
m.end(); m.end();
}()); }());