Skip to content

Commit 379260e

Browse files
Trottaddaleax
authored andcommitted
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: #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>
1 parent 2014eba commit 379260e

9 files changed

+10
-27
lines changed

test/addons/stringbytes-external-exceed-max/test-stringbytes-external-at-max.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
'use strict';
2-
// Flags: --expose-internals
32

43
const common = require('../../common');
5-
const { internalBinding } = require('internal/test/binding');
64
const skipMessage = 'intensive toString tests due to memory confinements';
75
if (!common.enoughTestMem)
86
common.skip(skipMessage);
@@ -12,7 +10,7 @@ const assert = require('assert');
1210

1311
// v8 fails silently if string length > v8::String::kMaxLength
1412
// v8::String::kMaxLength defined in v8.h
15-
const kStringMaxLength = internalBinding('buffer').kStringMaxLength;
13+
const kStringMaxLength = require('buffer').constants.MAX_STRING_LENGTH;
1614

1715
let buf;
1816
try {

test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-ascii.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
'use strict';
2-
// Flags: --expose-internals
32

43
const common = require('../../common');
5-
const { internalBinding } = require('internal/test/binding');
64
const skipMessage = 'intensive toString tests due to memory confinements';
75
if (!common.enoughTestMem)
86
common.skip(skipMessage);
@@ -11,7 +9,7 @@ const binding = require(`./build/${common.buildType}/binding`);
119

1210
// v8 fails silently if string length > v8::String::kMaxLength
1311
// v8::String::kMaxLength defined in v8.h
14-
const kStringMaxLength = internalBinding('buffer').kStringMaxLength;
12+
const kStringMaxLength = require('buffer').constants.MAX_STRING_LENGTH;
1513

1614
let buf;
1715
try {

test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-base64.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
'use strict';
2-
// Flags: --expose-internals
32

43
const common = require('../../common');
5-
const { internalBinding } = require('internal/test/binding');
64
const skipMessage = 'intensive toString tests due to memory confinements';
75
if (!common.enoughTestMem)
86
common.skip(skipMessage);
@@ -11,7 +9,7 @@ const binding = require(`./build/${common.buildType}/binding`);
119

1210
// v8 fails silently if string length > v8::String::kMaxLength
1311
// v8::String::kMaxLength defined in v8.h
14-
const kStringMaxLength = internalBinding('buffer').kStringMaxLength;
12+
const kStringMaxLength = require('buffer').constants.MAX_STRING_LENGTH;
1513

1614
let buf;
1715
try {

test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-binary.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
// Flags: --expose-gc --expose-internals
1+
// Flags: --expose-gc
22
'use strict';
33

44
const common = require('../../common');
5-
const { internalBinding } = require('internal/test/binding');
65
const skipMessage = 'intensive toString tests due to memory confinements';
76
if (!common.enoughTestMem)
87
common.skip(skipMessage);
@@ -12,7 +11,7 @@ const assert = require('assert');
1211

1312
// v8 fails silently if string length > v8::String::kMaxLength
1413
// v8::String::kMaxLength defined in v8.h
15-
const kStringMaxLength = internalBinding('buffer').kStringMaxLength;
14+
const kStringMaxLength = require('buffer').constants.MAX_STRING_LENGTH;
1615

1716
let buf;
1817
try {

test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-hex.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
'use strict';
2-
// Flags: --expose-internals
32

43
const common = require('../../common');
5-
const { internalBinding } = require('internal/test/binding');
64
const skipMessage = 'intensive toString tests due to memory confinements';
75
if (!common.enoughTestMem)
86
common.skip(skipMessage);
@@ -11,7 +9,7 @@ const binding = require(`./build/${common.buildType}/binding`);
119

1210
// v8 fails silently if string length > v8::String::kMaxLength
1311
// v8::String::kMaxLength defined in v8.h
14-
const kStringMaxLength = internalBinding('buffer').kStringMaxLength;
12+
const kStringMaxLength = require('buffer').constants.MAX_STRING_LENGTH;
1513

1614
let buf;
1715
try {

test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-1-utf8.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
'use strict';
2-
// Flags: --expose-internals
32

43
const common = require('../../common');
5-
const { internalBinding } = require('internal/test/binding');
64
const skipMessage = 'intensive toString tests due to memory confinements';
75
if (!common.enoughTestMem)
86
common.skip(skipMessage);
@@ -12,7 +10,7 @@ const assert = require('assert');
1210

1311
// v8 fails silently if string length > v8::String::kMaxLength
1412
// v8::String::kMaxLength defined in v8.h
15-
const kStringMaxLength = internalBinding('buffer').kStringMaxLength;
13+
const kStringMaxLength = require('buffer').constants.MAX_STRING_LENGTH;
1614

1715
let buf;
1816
try {

test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max-by-2.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
'use strict';
2-
// Flags: --expose-internals
32

43
const common = require('../../common');
5-
const { internalBinding } = require('internal/test/binding');
64
const skipMessage = 'intensive toString tests due to memory confinements';
75
if (!common.enoughTestMem)
86
common.skip(skipMessage);
@@ -12,7 +10,7 @@ const assert = require('assert');
1210

1311
// v8 fails silently if string length > v8::String::kMaxLength
1412
// v8::String::kMaxLength defined in v8.h
15-
const kStringMaxLength = internalBinding('buffer').kStringMaxLength;
13+
const kStringMaxLength = require('buffer').constants.MAX_STRING_LENGTH;
1614

1715
let buf;
1816
try {

test/addons/stringbytes-external-exceed-max/test-stringbytes-external-exceed-max.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
'use strict';
2-
// Flags: --expose-internals
32

43
const common = require('../../common');
5-
const { internalBinding } = require('internal/test/binding');
64
const skipMessage = 'intensive toString tests due to memory confinements';
75
if (!common.enoughTestMem)
86
common.skip(skipMessage);
@@ -11,7 +9,7 @@ const binding = require(`./build/${common.buildType}/binding`);
119

1210
// v8 fails silently if string length > v8::String::kMaxLength
1311
// v8::String::kMaxLength defined in v8.h
14-
const kStringMaxLength = internalBinding('buffer').kStringMaxLength;
12+
const kStringMaxLength = require('buffer').constants.MAX_STRING_LENGTH;
1513

1614
let buf;
1715
try {

test/sequential/test-fs-readfile-tostring-fail.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
'use strict';
2-
// Flags: --expose-internals
32

43
const common = require('../common');
5-
const { internalBinding } = require('internal/test/binding');
64

75
if (!common.enoughTestMem)
86
common.skip('intensive toString tests due to memory confinements');
@@ -11,7 +9,7 @@ const assert = require('assert');
119
const fs = require('fs');
1210
const path = require('path');
1311
const cp = require('child_process');
14-
const kStringMaxLength = internalBinding('buffer').kStringMaxLength;
12+
const kStringMaxLength = require('buffer').constants.MAX_STRING_LENGTH;
1513
if (common.isAIX && (Number(cp.execSync('ulimit -f')) * 512) < kStringMaxLength)
1614
common.skip('intensive toString tests due to file size confinements');
1715

0 commit comments

Comments
 (0)