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

test,util: add missing tests and conditions

Browse Source 
1) Add missing unit tests by `ucs-2` in different kinds of cases.
2) Add missing unit tests by `usc-2` in different kinds of cases.
3) Fix a bug：We cannot find `ucs-2` in `case 5`'s `if` condition after
`toLowerCase()`

PR-URL: https://github.com/nodejs/node/pull/21455
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
This commit is contained in:
MaleDong 2018-06-22 19:08:58 +08:00 committed by Rich Trott
parent c18a9d1cb8
commit a478259af7
3 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
benchmark/util/normalize-encoding.js
View File

@ -4,18 +4,25 @@ const common = require('../common.js');
const assert = require('assert'); const assert = require('assert');
const groupedInputs = { const groupedInputs = {
group_common: ['undefined', 'utf8', 'utf-8', 'base64', 'binary', 'latin1'], group_common: ['undefined', 'utf8', 'utf-8', 'base64',
group_upper: ['UTF-8', 'UTF8', 'UCS2', 'UTF-16LE', 'UTF16LE', 'BASE64'], 'binary', 'latin1', 'ucs-2', 'usc-2'],
group_uncommon: [ 'foo', '1', 'false', 'undefined', '[]'], group_upper: ['UTF-8', 'UTF8', 'UCS2', 'UTF-16LE',
'UTF16LE', 'BASE64', 'UCS-2', 'USC-2'],
group_uncommon: ['foo', '1', 'false', 'undefined', '[]', '{}'],
group_misc: ['', 'utf16le', 'usc2', 'hex', 'HEX', 'BINARY'] group_misc: ['', 'utf16le', 'usc2', 'hex', 'HEX', 'BINARY']
}; };
const inputs = [ const inputs = [
'', 'utf8', 'utf-8', 'UTF-8', '',
'UTF8', 'Utf8', 'uTf-8', 'utF-8', 'ucs2', 'utf8', 'utf-8', 'UTF-8',
'UCS2', 'utf16le', 'utf-16le', 'UTF-16LE', 'UTF16LE', 'UTF8', 'Utf8', 'uTf-8', 'utF-8',
'ucs2', 'UCS2', 'UcS2',
'USC2', 'usc2', 'uSc2',
'ucs-2', 'UCS-2', 'UcS-2',
'usc-2', 'USC-2', 'uSc-2',
'utf16le', 'utf-16le', 'UTF-16LE', 'UTF16LE',
'binary', 'BINARY', 'latin1', 'base64', 'BASE64', 'binary', 'BINARY', 'latin1', 'base64', 'BASE64',
'hex', 'HEX', 'foo', '1', 'false', 'undefined', '[]']; 'hex', 'HEX', 'foo', '1', 'false', 'undefined', '[]', '{}'];
const bench = common.createBenchmark(main, { const bench = common.createBenchmark(main, {
input: inputs.concat(Object.keys(groupedInputs)), input: inputs.concat(Object.keys(groupedInputs)),
@ -42,6 +49,8 @@ function getInput(input) {
return [undefined]; return [undefined];
case '[]': case '[]':
return [[]]; return [[]];
case '{}':
return [{}];
default: default:
return [input]; return [input];
} }
@ -53,7 +62,7 @@ function main({ input, n }) {
var noDead = ''; var noDead = '';
bench.start(); bench.start();
for (var i = 0; i < n; i += 1) { for (var i = 0; i < n; ++i) {
for (var j = 0; j < inputs.length; ++j) { for (var j = 0; j < inputs.length; ++j) {
noDead = normalizeEncoding(inputs[j]); noDead = normalizeEncoding(inputs[j]);
} }

3
lib/internal/util.js
View File

@ -115,7 +115,7 @@ function slowCases(enc) {
if (enc === 'ucs2' || enc === 'UCS2') return 'utf16le'; if (enc === 'ucs2' || enc === 'UCS2') return 'utf16le';
enc = `${enc}`.toLowerCase(); enc = `${enc}`.toLowerCase();
if (enc === 'utf8') return 'utf8'; if (enc === 'utf8') return 'utf8';
if (enc === 'ucs2' || enc === 'UCS2') return 'utf16le'; if (enc === 'ucs2') return 'utf16le';
break; break;
case 3: case 3:
if (enc === 'hex' || enc === 'HEX' || `${enc}`.toLowerCase() === 'hex') if (enc === 'hex' || enc === 'HEX' || `${enc}`.toLowerCase() === 'hex')
@ -131,6 +131,7 @@ function slowCases(enc) {
if (enc === 'utf-8') return 'utf8'; if (enc === 'utf-8') return 'utf8';
if (enc === 'ascii') return 'ascii'; if (enc === 'ascii') return 'ascii';
if (enc === 'usc-2') return 'utf16le'; if (enc === 'usc-2') return 'utf16le';
if (enc === 'ucs-2') return 'utf16le';
break; break;
case 6: case 6:
if (enc === 'base64') return 'base64'; if (enc === 'base64') return 'base64';

7
test/parallel/test-internal-util-normalizeencoding.js
View File

@ -18,10 +18,16 @@ const tests = [
['utF-8', 'utf8'], ['utF-8', 'utf8'],
['ucs2', 'utf16le'], ['ucs2', 'utf16le'],
['UCS2', 'utf16le'], ['UCS2', 'utf16le'],
['ucs-2', 'utf16le'],
['UCS-2', 'utf16le'],
['UcS-2', 'utf16le'],
['utf16le', 'utf16le'], ['utf16le', 'utf16le'],
['utf-16le', 'utf16le'], ['utf-16le', 'utf16le'],
['UTF-16LE', 'utf16le'], ['UTF-16LE', 'utf16le'],
['UTF16LE', 'utf16le'], ['UTF16LE', 'utf16le'],
['usc-2', 'utf16le'],
['USC-2', 'utf16le'],
['uSc-2', 'utf16le'],
['binary', 'latin1'], ['binary', 'latin1'],
['BINARY', 'latin1'], ['BINARY', 'latin1'],
['latin1', 'latin1'], ['latin1', 'latin1'],
@ -36,6 +42,7 @@ const tests = [
[NaN, undefined], [NaN, undefined],
[0, undefined], [0, undefined],
[[], undefined], [[], undefined],
[{}, undefined]
]; ];
tests.forEach((e, i) => { tests.forEach((e, i) => {