diff options
author | Rich Trott <rtrott@gmail.com> | 2019-01-01 20:51:06 -0800 |
---|---|---|
committer | Rich Trott <rtrott@gmail.com> | 2019-01-03 22:58:26 -0800 |
commit | 7d453ff21294bc9dcf7c9a61b1a07c3a15a021ce (patch) | |
tree | d1c2397811a7eba77c52559665019060a984aa68 /test | |
parent | 1f1a373df0121a9e4a2887f69862169b2f4ed2fd (diff) | |
download | android-node-v8-7d453ff21294bc9dcf7c9a61b1a07c3a15a021ce.tar.gz android-node-v8-7d453ff21294bc9dcf7c9a61b1a07c3a15a021ce.tar.bz2 android-node-v8-7d453ff21294bc9dcf7c9a61b1a07c3a15a021ce.zip |
test: replace internals with public API
Remove instances where `--expose-internals` is used to gain access to
buffer.kStringMaxLength. The property is availalble without a flag. It
is undocumented but the same as the documented
`buffer.constants.MAX_STRING_LENGTH` so use that. (We even have a test
that confirms that they are the same value.)
PR-URL: https://github.com/nodejs/node/pull/25309
Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'test')
9 files changed, 10 insertions, 27 deletions
diff --git a/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-at-max.js b/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-at-max.js index 820f71ec9e..fcf5279dd3 100644 --- a/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-at-max.js +++ b/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-at-max.js @@ -1,8 +1,6 @@ 'use strict'; -// Flags: --expose-internals const common = require('../../common'); -const { internalBinding } = require('internal/test/binding'); const skipMessage = 'intensive toString tests due to memory confinements'; if (!common.enoughTestMem) common.skip(skipMessage); @@ -12,7 +10,7 @@ const assert = require('assert'); // v8 fails silently if string length > v8::String::kMaxLength // v8::String::kMaxLength defined in v8.h -const kStringMaxLength = internalBinding('buffer').kStringMaxLength; +const kStringMaxLength = require('buffer').constants.MAX_STRING_LENGTH; let buf; try { diff --git a/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-ascii.js b/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-ascii.js index 7f5a834795..5e3033db3e 100644 --- a/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-ascii.js +++ b/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-ascii.js @@ -1,8 +1,6 @@ 'use strict'; -// Flags: --expose-internals const common = require('../../common'); -const { internalBinding } = require('internal/test/binding'); const skipMessage = 'intensive toString tests due to memory confinements'; if (!common.enoughTestMem) common.skip(skipMessage); @@ -11,7 +9,7 @@ const binding = require(`./build/${common.buildType}/binding`); // v8 fails silently if string length > v8::String::kMaxLength // v8::String::kMaxLength defined in v8.h -const kStringMaxLength = internalBinding('buffer').kStringMaxLength; +const kStringMaxLength = require('buffer').constants.MAX_STRING_LENGTH; let buf; try { diff --git a/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-base64.js b/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-base64.js index d7fe26814f..400477034d 100644 --- a/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-base64.js +++ b/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-base64.js @@ -1,8 +1,6 @@ 'use strict'; -// Flags: --expose-internals const common = require('../../common'); -const { internalBinding } = require('internal/test/binding'); const skipMessage = 'intensive toString tests due to memory confinements'; if (!common.enoughTestMem) common.skip(skipMessage); @@ -11,7 +9,7 @@ const binding = require(`./build/${common.buildType}/binding`); // v8 fails silently if string length > v8::String::kMaxLength // v8::String::kMaxLength defined in v8.h -const kStringMaxLength = internalBinding('buffer').kStringMaxLength; +const kStringMaxLength = require('buffer').constants.MAX_STRING_LENGTH; let buf; try { diff --git a/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-binary.js b/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-binary.js index 7e75ba1246..ef5d6a21ed 100644 --- a/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-binary.js +++ b/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-binary.js @@ -1,8 +1,7 @@ -// Flags: --expose-gc --expose-internals +// Flags: --expose-gc 'use strict'; const common = require('../../common'); -const { internalBinding } = require('internal/test/binding'); const skipMessage = 'intensive toString tests due to memory confinements'; if (!common.enoughTestMem) common.skip(skipMessage); @@ -12,7 +11,7 @@ const assert = require('assert'); // v8 fails silently if string length > v8::String::kMaxLength // v8::String::kMaxLength defined in v8.h -const kStringMaxLength = internalBinding('buffer').kStringMaxLength; +const kStringMaxLength = require('buffer').constants.MAX_STRING_LENGTH; let buf; try { diff --git a/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-hex.js b/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-hex.js index 57242399bb..844c8bcb33 100644 --- a/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-hex.js +++ b/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-hex.js @@ -1,8 +1,6 @@ 'use strict'; -// Flags: --expose-internals const common = require('../../common'); -const { internalBinding } = require('internal/test/binding'); const skipMessage = 'intensive toString tests due to memory confinements'; if (!common.enoughTestMem) common.skip(skipMessage); @@ -11,7 +9,7 @@ const binding = require(`./build/${common.buildType}/binding`); // v8 fails silently if string length > v8::String::kMaxLength // v8::String::kMaxLength defined in v8.h -const kStringMaxLength = internalBinding('buffer').kStringMaxLength; +const kStringMaxLength = require('buffer').constants.MAX_STRING_LENGTH; let buf; try { diff --git a/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-utf8.js b/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-utf8.js index 4a0908290c..15ec78b6c9 100644 --- a/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-utf8.js +++ b/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-utf8.js @@ -1,8 +1,6 @@ 'use strict'; -// Flags: --expose-internals const common = require('../../common'); -const { internalBinding } = require('internal/test/binding'); const skipMessage = 'intensive toString tests due to memory confinements'; if (!common.enoughTestMem) common.skip(skipMessage); @@ -12,7 +10,7 @@ const assert = require('assert'); // v8 fails silently if string length > v8::String::kMaxLength // v8::String::kMaxLength defined in v8.h -const kStringMaxLength = internalBinding('buffer').kStringMaxLength; +const kStringMaxLength = require('buffer').constants.MAX_STRING_LENGTH; let buf; try { diff --git a/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-2.js b/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-2.js index 3c613a69fd..121ca2d62b 100644 --- a/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-2.js +++ b/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-2.js @@ -1,8 +1,6 @@ 'use strict'; -// Flags: --expose-internals const common = require('../../common'); -const { internalBinding } = require('internal/test/binding'); const skipMessage = 'intensive toString tests due to memory confinements'; if (!common.enoughTestMem) common.skip(skipMessage); @@ -12,7 +10,7 @@ const assert = require('assert'); // v8 fails silently if string length > v8::String::kMaxLength // v8::String::kMaxLength defined in v8.h -const kStringMaxLength = internalBinding('buffer').kStringMaxLength; +const kStringMaxLength = require('buffer').constants.MAX_STRING_LENGTH; let buf; try { diff --git a/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max.js b/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max.js index be571c5059..d65144e04d 100644 --- a/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max.js +++ b/test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max.js @@ -1,8 +1,6 @@ 'use strict'; -// Flags: --expose-internals const common = require('../../common'); -const { internalBinding } = require('internal/test/binding'); const skipMessage = 'intensive toString tests due to memory confinements'; if (!common.enoughTestMem) common.skip(skipMessage); @@ -11,7 +9,7 @@ const binding = require(`./build/${common.buildType}/binding`); // v8 fails silently if string length > v8::String::kMaxLength // v8::String::kMaxLength defined in v8.h -const kStringMaxLength = internalBinding('buffer').kStringMaxLength; +const kStringMaxLength = require('buffer').constants.MAX_STRING_LENGTH; let buf; try { diff --git a/test/sequential/test-fs-readfile-tostring-fail.js b/test/sequential/test-fs-readfile-tostring-fail.js index da8f3930f6..9a443fc71b 100644 --- a/test/sequential/test-fs-readfile-tostring-fail.js +++ b/test/sequential/test-fs-readfile-tostring-fail.js @@ -1,8 +1,6 @@ 'use strict'; -// Flags: --expose-internals const common = require('../common'); -const { internalBinding } = require('internal/test/binding'); if (!common.enoughTestMem) common.skip('intensive toString tests due to memory confinements'); @@ -11,7 +9,7 @@ const assert = require('assert'); const fs = require('fs'); const path = require('path'); const cp = require('child_process'); -const kStringMaxLength = internalBinding('buffer').kStringMaxLength; +const kStringMaxLength = require('buffer').constants.MAX_STRING_LENGTH; if (common.isAIX && (Number(cp.execSync('ulimit -f')) * 512) < kStringMaxLength) common.skip('intensive toString tests due to file size confinements'); |