From c1d27503e80eaa5ec83bc5adfb9b9e08905f45ee Mon Sep 17 00:00:00 2001
From: Sarah GHP <sarah.groff.palermo@gmail.com>
Date: Tue, 21 Jun 2022 14:56:54 +0200
Subject: [PATCH] Update to use different buffers, return case name

---
 harness/testTypedArray.js                     | 49 ++++++++++++-------
 .../TypedArray/prototype/at/returns-item.js   | 45 +++--------------
 2 files changed, 40 insertions(+), 54 deletions(-)

diff --git a/harness/testTypedArray.js b/harness/testTypedArray.js
index 611b1f89b8..72e734ebf1 100644
--- a/harness/testTypedArray.js
+++ b/harness/testTypedArray.js
@@ -123,28 +123,43 @@ function testTypedArrayConversions(byteConversionValues, fn) {
 }
 
 function createTypedArrayVariations(TA, values) {
-  const rab = new ArrayBuffer(4 * TA.BYTES_PER_ELEMENT, { maxByteLength: 8 * TA.BYTES_PER_ELEMENT });
 
-  let nonresizable = new TA(values);
-  let fixedLength = new TA(rab, 0, values.length);
-  let lengthTracking = new TA(rab, 0);
+  const rab = () => {
+    let buffer = new ArrayBuffer(4 * TA.BYTES_PER_ELEMENT, { maxByteLength: 8 * TA.BYTES_PER_ELEMENT });
+    let ta_write = new TA(buffer);
 
-  let fixedLengthWithOffset = {
-    name: fixedLengthWithOffset,
-    contents: new TA(rab, 2 * TA.BYTES_PER_ELEMENT, (values.length / 2))
-  };
+    for (let i = 0; i < values.length; ++i) {
+      ta_write[i] = values[i];
+    }
 
-  let lengthTrackingWithOffset = {
-    name: lengthTrackingWithOffset,
-    contents: new TA(rab, 2 * TA.BYTES_PER_ELEMENT)
-  };
-
-  // Writes data to the buffer backing all the arrays
-  let ta_write = new TA(rab);
-  for (let i = 0; i < values.length; ++i) {
-    ta_write[i] = values[i];
+    return buffer;
   }
 
+  const nonresizable = {
+    name: 'non-resizable',
+    contents: new TA(values)
+  };
+
+  const fixedLength = {
+    name: 'fixed length',
+    contents: new TA(rab(), 0, values.length)
+  };
+
+  const lengthTracking =   {
+    name: 'length tracking',
+    contents: new TA(rab(), 0)
+  };
+
+  const fixedLengthWithOffset = {
+    name: 'fixed length with offset',
+    contents: new TA(rab(), 2 * TA.BYTES_PER_ELEMENT, (values.length / 2))
+  };
+
+  const lengthTrackingWithOffset = {
+    name: 'length tracking with offset',
+    contents: new TA(rab(), 2 * TA.BYTES_PER_ELEMENT)
+  };
+
   return {
     nonresizable,
     fixedLength,
diff --git a/test/built-ins/TypedArray/prototype/at/returns-item.js b/test/built-ins/TypedArray/prototype/at/returns-item.js
index 68363fd816..fa003851b6 100644
--- a/test/built-ins/TypedArray/prototype/at/returns-item.js
+++ b/test/built-ins/TypedArray/prototype/at/returns-item.js
@@ -42,48 +42,19 @@ testWithTypedArrayConstructors(TA => {
     nonresizable,
     fixedLength,
     lengthTracking,
-  ].forEach((a) => {
-    assert.sameValue(a.at(0), 1, 'a.at(0) must return 1')
-    assert.sameValue(a.at(1), 2, 'a.at(1) must return 2')
-    assert.sameValue(a.at(2), 3, 'a.at(2) must return 3')
-    assert.sameValue(a.at(3), 4, 'a.at(3) must return 4')
+  ].forEach(({ name, contents }) => {
+    assert.sameValue(contents.at(0), 1, `contents.at(0) must return 1 in ${name}`)
+    assert.sameValue(contents.at(1), 2, `contents.at(1) must return 2 in ${name}`)
+    assert.sameValue(contents.at(2), 3, `contents.at(2) must return 3 in ${name}`)
+    assert.sameValue(contents.at(3), 4, `contents.at(3) must return 4 in ${name}`)
   });
 
   [
     fixedLengthWithOffset,
     lengthTrackingWithOffset
-  ].forEach((a) => {
-    assert.sameValue(a.at(0), 3, 'a.at(2) must return 3')
-    assert.sameValue(a.at(1), 4, 'a.at(3) must return 4')
+  ].forEach(({ name, contents }) => {
+    assert.sameValue(contents.at(0), 3, `contents.at(0) must return 3 in ${name}`)
+    assert.sameValue(contents.at(1), 4, `contents.at(1) must return 4 in ${name}`)
   })
 
 });
-
-
-
-testWithTypedArrayVariants(TA => {
-  assert.sameValue(typeof TA.prototype.at, 'function', 'The value of `typeof TA.prototype.at` is "function"');
-
-  const values = [1, 2, 3, 4];
-
-  /*
-    Works for non-offset ...
-  */
-
-  testWithTypedArrayVariants(TA, values, (case) => {
-    /*
-      I updated this to refer to the values array instead of the
-      explicit value because really they should have both been
-      written this way — it makes the connection clear.
-    */
-    assert.sameValue(a.at(0), values[0], 'a.at(0) must return 1');
-    assert.sameValue(a.at(1), values[1], 'a.at(1) must return 2');
-    assert.sameValue(a.at(2), values[2], 'a.at(2) must return 3');
-    assert.sameValue(a.at(3), values[3], 'a.at(3) must return 4');
-  });
-
-  /*
-    ... and then what  do we do for the offsets?
-  */
-
-});