test: cleanup the test suite of no longer needed workarounds

Signed-off-by: Filip Skokan <panva.ip@gmail.com>

Author: panva

test/buffer-slice.ts

@@ -15,10 +15,16 @@ import * as HPKE from '../index.ts'
 import { supported } from './support.ts'
 
 test.describe('Buffer.prototype.slice() compatibility', () => {
-  const run = supported.KEM_MLKEM768_X25519!() ? it : it.skip
+  const hybridKemOptions = {
+    skip: supported.KEM_MLKEM768_X25519!()
+      ? false
+      : 'KEM_MLKEM768_X25519 is unsupported in this runtime',
+  } satisfies test.TestOptions
+
   test.describe('Hybrid KEM DeserializePrivateKey', () => {
-    run(
+    it(
       'should not be affected by modifications to the original Buffer after deserialization',
+      hybridKemOptions,
       async () => {
         const suite = new HPKE.CipherSuite(
           HPKE.KEM_MLKEM768_X25519,
@@ -55,7 +61,7 @@ test.describe('Buffer.prototype.slice() compatibility', () => {
   })
 
   test.describe('Hybrid KEM Decap (split function)', () => {
-    run('should use copied data, not views that can be corrupted', async () => {
+    it('should use copied data, not views that can be corrupted', hybridKemOptions, async () => {
       const suite = new HPKE.CipherSuite(
         HPKE.KEM_MLKEM768_X25519,
         HPKE.KDF_HKDF_SHA256,
@@ -93,8 +99,9 @@ test.describe('Buffer.prototype.slice() compatibility', () => {
   })
 
   test.describe('Hybrid KEM SerializePrivateKey (getSeed)', () => {
-    run(
+    it(
       'should return independent copies that do not share memory with internal state',
+      hybridKemOptions,
       async () => {
         const suite = new HPKE.CipherSuite(
           HPKE.KEM_MLKEM768_X25519,

test/custom-keys.ts

@@ -30,6 +30,7 @@ function getNobleKEM(): HPKE.KEMFactory | undefined {
 }
 
 const pqKEMFactory = getSupportedPQKEM()!
+// TODO: Use test.describe(..., { skip }) once Bun honors node:test suite skip options.
 if (pqKEMFactory) {
   test.describe('HybridKey internal protection', () => {
     async function getHybridKeyPair() {

test/pummel.ts

@@ -1,4 +1,5 @@
 import it, * as test from 'node:test'
+import { setImmediate } from 'node:timers/promises'
 
 import * as HPKE from '../index.ts'
 import {
@@ -53,9 +54,7 @@ function runPummelTests(
   }
 
   test.describe(`pummel (${name})`, () => {
-    // @ts-ignore
-    if (typeof Deno !== 'object')
-      test.afterEach(() => new Promise((resolve) => setImmediate(resolve)))
+    test.afterEach(() => setImmediate())
 
     test.describe('Algorithm implementation returns', () => {
       for (const Algorithm of [...KEMS.values(), ...KDFS.values(), ...AEADS.values()]) {
@@ -686,20 +685,8 @@ test.describe('Unsupported WebCrypto algorithms', () => {
         await suite.Open(skR, enc, ct)
       },
       (err: Error) => {
-        try {
-          t.assert.strictEqual(err.name, 'NotSupportedError')
-          t.assert.strictEqual(
-            err.message,
-            `${expectedAlgorithmName} is unsupported in this runtime`,
-          )
-        } catch (assertion) {
-          // @ts-ignore Deno doesn't always conform to throwing DOMException with name=NotSupportedError on unsupported algorithms
-          if (typeof Deno === 'object') {
-            if (err.name === 'DeriveKeyPairError') return true
-          }
-
-          throw assertion
-        }
+        t.assert.strictEqual(err.name, 'NotSupportedError')
+        t.assert.strictEqual(err.message, `${expectedAlgorithmName} is unsupported in this runtime`)
 
         return true
       },

test/validations.ts

@@ -25,6 +25,8 @@ const notBoolean = [
   { name: 'object', value: {} },
 ]
 
+// TODO: Replace table-case assertion loops with t.test() subtests once Bun's node:test
+// implementation supports nested tests.
 async function assertRejectsSharedArrayBuffer(
   t: test.TestContext,
   name: string,

test/vectors.ts

@@ -1,5 +1,6 @@
 import it, * as test from 'node:test'
 import * as fs from 'node:fs/promises'
+import { setImmediate } from 'node:timers/promises'
 
 import * as HPKE from '../index.ts'
 import {
@@ -96,9 +97,7 @@ const implementations = [
 
 for (const impl of implementations) {
   test.describe(`vectors ${impl.name}`, () => {
-    // @ts-ignore
-    if (typeof Deno !== 'object')
-      test.afterEach(() => new Promise((resolve) => setImmediate(resolve)))
+    test.afterEach(() => setImmediate())
 
     let total = 0
     for (const vector of vectors) {
@@ -183,14 +182,16 @@ for (const impl of implementations) {
           KDF: KDF ?? { id: vector.kdf_id, name: getSuiteName('KDF', vector.kdf_id) },
           AEAD: AEAD ?? { id: vector.aead_id, name: getSuiteName('AEAD', vector.aead_id) },
         }
-        it.skip(`[${i}][not implemented] ${label(suite as HPKE.CipherSuite, vector.mode)}`)
+        it(`[${i}][not implemented] ${label(suite as HPKE.CipherSuite, vector.mode)}`, {
+          skip: 'not implemented',
+        })
         continue
       }
 
       const suite = new HPKE.CipherSuite(KEM.factory, KDF.factory, AEAD.factory)
 
       if (!KEM.supported || !KDF.supported || !AEAD.supported) {
-        it.skip(`[${i}][not supported] ${label(suite, vector.mode)}`)
+        it(`[${i}][not supported] ${label(suite, vector.mode)}`, { skip: 'not supported' })
         continue
       }