fixup! test only error code & simplify tests

Author: jakecastelli

Diff for: test/pummel/test-buffer-large-size-buffer-alloc-unsafe-slow.js

@@ -4,27 +4,15 @@ const common = require('../common');
 // Buffer with size > INT32_MAX
 common.skipIf32Bits();
 
-// Test Buffer size larger than integer range
-const { test } = require('node:test');
-const assert = require('assert');
-const kStringMaxLength = require('buffer').constants.MAX_STRING_LENGTH;
-
-const stringTooLongError = {
-  message: `Cannot create a string longer than 0x${kStringMaxLength.toString(16)}` +
-    ' characters',
-  code: 'ERR_STRING_TOO_LONG',
-  name: 'Error',
-};
-
+const assert = require('node:assert');
 const size = 2 ** 31;
 
-test('Buffer.allocUnsafeSlow with too long size', () => {
-  try {
-    assert.throws(() => Buffer.allocUnsafeSlow(size).toString('utf8'), stringTooLongError);
-  } catch (e) {
-    if (e.code !== 'ERR_MEMORY_ALLOCATION_FAILED') {
-      throw e;
-    }
-    common.skip('insufficient space for Buffer.allocUnsafeSlow');
+// Test Buffer.allocUnsafe with size larger than integer range
+try {
+  assert.throws(() => Buffer.allocUnsafeSlow(size).toString('utf8'), { code: 'ERR_STRING_TOO_LONG' });
+} catch (e) {
+  if (e.code !== 'ERR_MEMORY_ALLOCATION_FAILED') {
+    throw e;
   }
-});
+  common.skip('insufficient space for Buffer.allocUnsafeSlow');
+}

Diff for: test/pummel/test-buffer-large-size-buffer-alloc-unsafe.js

@@ -4,27 +4,15 @@ const common = require('../common');
 // Buffer with size > INT32_MAX
 common.skipIf32Bits();
 
-// Test Buffer size larger than integer range
-const { test } = require('node:test');
-const assert = require('assert');
-const kStringMaxLength = require('buffer').constants.MAX_STRING_LENGTH;
-
-const stringTooLongError = {
-  message: `Cannot create a string longer than 0x${kStringMaxLength.toString(16)}` +
-    ' characters',
-  code: 'ERR_STRING_TOO_LONG',
-  name: 'Error',
-};
-
+const assert = require('node:assert');
 const size = 2 ** 31;
 
-test('Buffer.allocUnsafe with too long size', () => {
-  try {
-    assert.throws(() => Buffer.allocUnsafe(size).toString('utf8'), stringTooLongError);
-  } catch (e) {
-    if (e.code !== 'ERR_MEMORY_ALLOCATION_FAILED') {
-      throw e;
-    }
-    common.skip('insufficient space for Buffer.allocUnsafe');
+try {
+  // Test Buffer.allocUnsafe with size larger than integer range
+  assert.throws(() => Buffer.allocUnsafe(size).toString('utf8'), { code: 'ERR_STRING_TOO_LONG' });
+} catch (e) {
+  if (e.code !== 'ERR_MEMORY_ALLOCATION_FAILED') {
+    throw e;
   }
-});
+  common.skip('insufficient space for Buffer.allocUnsafe');
+}

Diff for: test/pummel/test-buffer-large-size-buffer-alloc.js

@@ -4,27 +4,15 @@ const common = require('../common');
 // Buffer with size > INT32_MAX
 common.skipIf32Bits();
 
-// Test Buffer size larger than integer range
-const { test } = require('node:test');
-const assert = require('assert');
-const kStringMaxLength = require('buffer').constants.MAX_STRING_LENGTH;
-
-const stringTooLongError = {
-  message: `Cannot create a string longer than 0x${kStringMaxLength.toString(16)}` +
-    ' characters',
-  code: 'ERR_STRING_TOO_LONG',
-  name: 'Error',
-};
-
+const assert = require('node:assert');
 const size = 2 ** 31;
 
-test('Buffer.alloc too long size', () => {
-  try {
-    assert.throws(() => Buffer.alloc(size).toString('utf8'), stringTooLongError);
-  } catch (e) {
-    if (e.code !== 'ERR_MEMORY_ALLOCATION_FAILED') {
-      throw e;
-    }
-    common.skip('insufficient space for Buffer.alloc');
+// Test Buffer.alloc with size larger than integer range
+try {
+  assert.throws(() => Buffer.alloc(size).toString('utf8'), { code: 'ERR_STRING_TOO_LONG' });
+} catch (e) {
+  if (e.code !== 'ERR_MEMORY_ALLOCATION_FAILED') {
+    throw e;
   }
-});
+  common.skip('insufficient space for Buffer.alloc');
+}

Diff for: test/pummel/test-buffer-large-size-buffer-write.js

@@ -4,22 +4,19 @@ const common = require('../common');
 // Buffer with size > INT32_MAX
 common.skipIf32Bits();
 
-// Test Buffer size larger than integer range
-const { test } = require('node:test');
-const assert = require('assert');
+const assert = require('node:assert');
 const kStringMaxLength = require('buffer').constants.MAX_STRING_LENGTH;
 
 const size = 2 ** 31;
 
-test('Buffer.write with too long size', () => {
-  try {
-    const buf = Buffer.alloc(size);
-    assert.strictEqual(buf.write('a', 2, kStringMaxLength), 1);
-    assert.strictEqual(buf.write('a', 2, size), 1);
-  } catch (e) {
-    if (e.code !== 'ERR_MEMORY_ALLOCATION_FAILED') {
-      throw e;
-    }
-    common.skip('insufficient space for Buffer.alloc');
+// Test Buffer.write with size larger than integer range
+try {
+  const buf = Buffer.alloc(size);
+  assert.strictEqual(buf.write('a', 2, kStringMaxLength), 1);
+  assert.strictEqual(buf.write('a', 2, size), 1);
+} catch (e) {
+  if (e.code !== 'ERR_MEMORY_ALLOCATION_FAILED') {
+    throw e;
   }
-});
+  common.skip('insufficient space for Buffer.alloc');
+}

Diff for: test/pummel/test-buffer-large-size-slowbuffer.js

@@ -4,30 +4,19 @@ const common = require('../common');
 // Buffer with size > INT32_MAX
 common.skipIf32Bits();
 
-// Test Buffer size larger than integer range
-const { test } = require('node:test');
-const assert = require('assert');
+const assert = require('node:assert');
 const {
   SlowBuffer,
-} = require('buffer');
-const kStringMaxLength = require('buffer').constants.MAX_STRING_LENGTH;
-
-const stringTooLongError = {
-  message: `Cannot create a string longer than 0x${kStringMaxLength.toString(16)}` +
-    ' characters',
-  code: 'ERR_STRING_TOO_LONG',
-  name: 'Error',
-};
+} = require('node:buffer');
 
 const size = 2 ** 31;
 
-test('SlowBuffer.toString with too long size', () => {
-  try {
-    assert.throws(() => SlowBuffer(size).toString('utf8'), stringTooLongError);
-  } catch (e) {
-    if (e.code !== 'ERR_MEMORY_ALLOCATION_FAILED') {
-      throw e;
-    }
-    common.skip('insufficient space for SlowBuffer');
+// Test SlowBuffer with size larger than integer range
+try {
+  assert.throws(() => SlowBuffer(size).toString('utf8'), { code: 'ERR_STRING_TOO_LONG' });
+} catch (e) {
+  if (e.code !== 'ERR_MEMORY_ALLOCATION_FAILED') {
+    throw e;
   }
-});
+  common.skip('insufficient space for SlowBuffer');
+}