quic: Fix test util function and use custom uint8array comparison

Author: martenrichter

test/common/quic/test-helpers.mjs

@@ -1,7 +1,9 @@
+import assert from "node:assert";
 // start demo data
 // taken from @fails-components/webtransport tests
 // by the original author
 function createBytesChunk(length) {
+  assert(length % 4 === 0);
   const workArray = new Array(length / 2);
   for (let i = 0; i < length / 4; i++) {
     workArray[2 * i + 1] = length % 0xffff;
@@ -30,16 +32,24 @@ export const KNOWN_BYTES_LONG = [
 // end demo data
 
 export function uint8concat(arrays) {
-  const length = arrays.reduce((acc, curr) => acc + curr.length, 0);
+  const length = arrays.reduce((acc, curr) => acc + curr.byteLength, 0);
   const result = new Uint8Array(length);
   let pos = 0;
   let array = 0;
   while (pos < length) {
     const curArr = arrays[array];
     const curLen = curArr.byteLength;
     const dest = new Uint8Array(result.buffer, result.byteOffset + pos, curLen);
-    dest.set(curArr);
+    dest.set(new Uint8Array(curArr));
     array++;
     pos += curArr.byteLength;
   }
+  return result;
+}
+
+export function equalUint8Arrays(arr1, arr2) {
+  assert.ok(arr1.byteLength === arr2.byteLength, "Array content differs in length " + arr1.byteLength + " vs. " + arr2.byteLength);
+  for (let i = 0; i < arr1.byteLength; i++) {
+    assert.ok(arr1[i] === arr2[i], "Array content differs at " + i + " arr1: " + arr1[i] + " arr2: " + arr2[i]);
+  }
 }

test/parallel/test-quic-client-to-server-bidirectional-echo.mjs

@@ -1,9 +1,9 @@
 // Flags: --experimental-quic --no-warnings
 
 import { hasQuic, skip, mustCall } from '../common/index.mjs';
-import { ok, strictEqual, deepStrictEqual } from 'node:assert';
+import { ok, strictEqual } from 'node:assert';
 import { readKey } from '../common/fixtures.mjs';
-import { KNOWN_BYTES_LONG, uint8concat } from '../common/quic/test-helpers.mjs';
+import { KNOWN_BYTES_LONG, uint8concat, equalUint8Arrays } from '../common/quic/test-helpers.mjs';
 import { TransformStream } from 'node:stream/web';
 
 if (!hasQuic) {
@@ -73,7 +73,7 @@ const readFromStream = async () => {
     if (done) break;
   }
   // Now compare what we got
-  deepStrictEqual(uint8concat(KNOWN_BYTES_LONG), uint8concat(readChunks));
+  equalUint8Arrays(uint8concat(KNOWN_BYTES_LONG), uint8concat(readChunks));
 };
 
 await Promise.all([writeToStream(), readFromStream()]);

test/parallel/test-quic-client-to-server-unidirectional.mjs

@@ -1,9 +1,9 @@
 // Flags: --experimental-quic --no-warnings
 
 import { hasQuic, skip, mustCall } from '../common/index.mjs';
-import { ok, strictEqual, deepStrictEqual } from 'node:assert';
+import { ok, strictEqual } from 'node:assert';
 import { readKey } from '../common/fixtures.mjs';
-import { KNOWN_BYTES_LONG, uint8concat } from '../common/quic/test-helpers.mjs';
+import { KNOWN_BYTES_LONG, uint8concat, equalUint8Arrays } from '../common/quic/test-helpers.mjs';
 import { TransformStream } from 'node:stream/web';
 
 if (!hasQuic) {
@@ -39,7 +39,7 @@ const serverEndpoint = await listen(async (serverSession) => {
       // ignore
     });
     // Now compare what we got
-    deepStrictEqual(uint8concat(KNOWN_BYTES_LONG), uint8concat(readChunks));
+    equalUint8Arrays(uint8concat(KNOWN_BYTES_LONG), uint8concat(readChunks));
     serverFinished.resolve();
   }, 1);
 

test/parallel/test-quic-server-to-client-unidirectional.mjs

@@ -1,9 +1,9 @@
 // Flags: --experimental-quic --no-warnings
 
 import { hasQuic, skip, mustCall } from '../common/index.mjs';
-import { ok, strictEqual, deepStrictEqual } from 'node:assert';
+import { ok, strictEqual } from 'node:assert';
 import { readKey } from '../common/fixtures.mjs';
-import { KNOWN_BYTES_LONG, uint8concat } from '../common/quic/test-helpers.mjs';
+import { KNOWN_BYTES_LONG, uint8concat, equalUint8Arrays } from '../common/quic/test-helpers.mjs';
 import { TransformStream } from 'node:stream/web';
 
 if (!hasQuic) {
@@ -64,7 +64,7 @@ clientSession.onstream = mustCall(async (stream) => {
     // ignore
   });
   // Now compare what we got
-  deepStrictEqual(uint8concat(KNOWN_BYTES_LONG), uint8concat(readChunks));
+  equalUint8Arrays(uint8concat(KNOWN_BYTES_LONG), uint8concat(readChunks));
   clientFinished.resolve();
 }, 1);