Remove promise_rejects in serial/

Replaced with promise_rejects_js and promise_rejects_dom.

Bug: 1051932
Change-Id: I9018db17d0a64e72b5234b631da5c1937364ffdb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2116552
Commit-Queue: Stephen McGruer <smcgruer@chromium.org>
Reviewed-by: Reilly Grant <reillyg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#752687}

third_party/blink/web_tests/serial/serialPort_close.html

@@ -10,7 +10,7 @@
 serial_test(async (t, fake) => {
   const { port, fakePort } = await getFakeSerialPort(fake);
 
-  await promise_rejects(t, 'InvalidStateError', port.close());
+  await promise_rejects_dom(t, 'InvalidStateError', port.close());
 }, 'A SerialPort cannot be closed if it was never opened.');
 
 serial_test(async (t, fake) => {
@@ -18,7 +18,7 @@ serial_test(async (t, fake) => {
 
   await port.open({ baudrate: 9600 });
   await port.close();
-  await promise_rejects(t, 'InvalidStateError', port.close());
+  await promise_rejects_dom(t, 'InvalidStateError', port.close());
 }, 'A SerialPort cannot be closed if it is already closed.');
 
 serial_test(async (t, fake) => {
@@ -26,7 +26,7 @@ serial_test(async (t, fake) => {
 
   await port.open({ baudrate: 9600 });
   const closePromise = port.close();
-  await promise_rejects(t, 'InvalidStateError', port.close());
+  await promise_rejects_dom(t, 'InvalidStateError', port.close());
   await closePromise;
 }, 'A SerialPort cannot be closed if it is being closed.');
 

third_party/blink/web_tests/serial/serialPort_getSignals.html

@@ -8,7 +8,7 @@
 <script>
 serial_test(async (t, fake) => {
   const { port, fakePort } = await getFakeSerialPort(fake);
-  await promise_rejects(t, 'InvalidStateError', port.getSignals());
+  await promise_rejects_dom(t, 'InvalidStateError', port.getSignals());
 }, 'getSignals() rejects if the port is not open');
 
 serial_test(async (t, fake) => {

third_party/blink/web_tests/serial/serialPort_open.html

@@ -11,24 +11,24 @@ serial_test(async (t, fake) => {
   const { port, fakePort } = await getFakeSerialPort(fake);
 
   await port.open({ baudrate: 9600 });
-  return promise_rejects(t, 'InvalidStateError', port.open({ baudrate: 9600 }));
+  return promise_rejects_dom(t, 'InvalidStateError', port.open({ baudrate: 9600 }));
 }, 'A SerialPort cannot be opened if it is already open.');
 
 serial_test(async (t, fake) => {
   const { port, fakePort } = await getFakeSerialPort(fake);
 
   const firstRequest = port.open({ baudrate: 9600 });
-  await promise_rejects(t, 'InvalidStateError', port.open({ baudrate: 9600 }));
+  await promise_rejects_dom(t, 'InvalidStateError', port.open({ baudrate: 9600 }));
   await firstRequest;
 }, 'Simultaneous calls to open() are disallowed.');
 
 serial_test(async (t, fake) => {
   const { port, fakePort } = await getFakeSerialPort(fake);
 
-  await promise_rejects(t, new TypeError(), port.open({}));
+  await promise_rejects_js(t, TypeError, port.open({}));
 
   await Promise.all([-1, 0].map(baudrate => {
-      return promise_rejects(t, new TypeError(), port.open({ baudrate }))
+      return promise_rejects_js(t, TypeError, port.open({ baudrate }))
   }));
 }, 'Baud rate is required and must be greater than zero.');
 
@@ -36,8 +36,8 @@ serial_test(async (t, fake) => {
   const { port, fakePort } = await getFakeSerialPort(fake);
 
   await Promise.all([-1, 0, 6, 9].map(databits => {
-    return promise_rejects(
-        t, new TypeError(), port.open({ baudrate: 9600, databits }));
+    return promise_rejects_js(
+        t, TypeError, port.open({ baudrate: 9600, databits }));
   }));
 
   await [undefined, 7, 8].reduce(async (previousTest, databits) => {
@@ -51,8 +51,8 @@ serial_test(async (t, fake) => {
   const { port, fakePort } = await getFakeSerialPort(fake);
 
   await Promise.all([0, null, "cats"].map(parity => {
-    return promise_rejects(
-        t, new TypeError(), port.open({ baudrate: 9600, parity }),
+    return promise_rejects_js(
+        t, TypeError, port.open({ baudrate: 9600, parity }),
         `Should reject parity option "${parity}"`);
   }));
 
@@ -68,8 +68,8 @@ serial_test(async (t, fake) => {
   const { port, fakePort } = await getFakeSerialPort(fake);
 
   await Promise.all([-1, 0, 3, 4].map(stopbits => {
-    return promise_rejects(
-        t, new TypeError(), port.open({ baudrate: 9600, stopbits }));
+    return promise_rejects_js(
+        t, TypeError, port.open({ baudrate: 9600, stopbits }));
   }));
 
   await [undefined, 1, 2].reduce(async (previousTest, stopbits) => {
@@ -82,18 +82,18 @@ serial_test(async (t, fake) => {
 serial_test(async (t, fake) => {
   const { port, fakePort } = await getFakeSerialPort(fake);
 
-  await promise_rejects(
-      t, new TypeError(), port.open({ baudrate: 9600, buffersize: -1 }));
-  await promise_rejects(
-      t, new TypeError(), port.open({ baudrate: 9600, buffersize: 0 }));
+  await promise_rejects_js(
+      t, TypeError, port.open({ baudrate: 9600, buffersize: -1 }));
+  await promise_rejects_js(
+      t, TypeError, port.open({ baudrate: 9600, buffersize: 0 }));
 }, 'Buffer size must be greater than zero.');
 
 serial_test(async (t, fake) => {
   const { port, fakePort } = await getFakeSerialPort(fake);
 
   const buffersize = 1 * 1024 * 1024 * 1024 /* 1 GiB */;
-  return promise_rejects(
-      t, new TypeError(), port.open({ baudrate: 9600, buffersize }));
+  return promise_rejects_js(
+      t, TypeError, port.open({ baudrate: 9600, buffersize }));
 }, 'Unreasonably large buffer sizes are rejected.');
 
 </script>

third_party/blink/web_tests/serial/serialPort_readable.html

@@ -32,7 +32,7 @@ serial_test(async (t, fake) => {
   assert_true(port.readable instanceof ReadableStream);
 
   const reader = port.readable.getReader();
-  await promise_rejects(t, new TypeError(), port.close());
+  await promise_rejects_js(t, TypeError, port.close());
 
   reader.releaseLock();
   await port.close();
@@ -56,6 +56,17 @@ serial_test(async (t, fake) => {
   await port.close();
 }, 'Can read a small amount of data');
 
+// ParityError is not (as of 2020/03/23) a valid DOMException, so cannot use
+// promise_rejects_dom for it.
+async function promise_rejects_with_parity_error(t, promise) {
+  return promise.then(() => {
+    assert_false('Should have rejected');
+  }).catch(e => {
+    assert_equals(e.constructor, DOMException);
+    assert_equals(e.name, "ParityError");
+  });
+}
+
 serial_test(async (t, fake) => {
   const { port, fakePort } = await getFakeSerialPort(fake);
   // Select a buffer size smaller than the amount of data transferred.
@@ -89,7 +100,7 @@ serial_test(async (t, fake) => {
   assert_false(done);
   compareArrays(data, value);
 
-  await promise_rejects(t, new DOMException('', 'ParityError'), reader.read());
+  await promise_rejects_with_parity_error(t, reader.read());
   assert_not_equals(port.readable, readable);
 
   readable = port.readable;
@@ -122,7 +133,7 @@ serial_test(async (t, fake) => {
   assert_false(done);
   compareArrays(data, value);
 
-  await promise_rejects(t, 'NetworkError', reader.read());
+  await promise_rejects_dom(t, 'NetworkError', reader.read());
   assert_equals(port.readable, null);
 
   await port.close();

third_party/blink/web_tests/serial/serialPort_setSignals.html

@@ -8,7 +8,7 @@
 <script>
 serial_test(async (t, fake) => {
   const { port, fakePort } = await getFakeSerialPort(fake);
-  await promise_rejects(t, 'InvalidStateError', port.setSignals({}));
+  await promise_rejects_dom(t, 'InvalidStateError', port.setSignals({}));
 }, 'setSignals() rejects if the port is not open');
 
 serial_test(async (t, fake) => {

third_party/blink/web_tests/serial/serialPort_writable.html

@@ -21,7 +21,7 @@ serial_test(async (t, fake) => {
 
   const writer = writable.getWriter();
   const data = new Uint8Array([1, 2, 3, 4, 5, 6, 7, 8]);
-  await promise_rejects(t, 'InvalidStateError', writer.write(data));
+  await promise_rejects_dom(t, 'InvalidStateError', writer.write(data));
 }, 'open() and close() set and unset SerialPort.writable');
 
 serial_test(async (t, fake) => {
@@ -31,7 +31,7 @@ serial_test(async (t, fake) => {
   assert_true(port.writable instanceof WritableStream);
 
   const writer = port.writable.getWriter();
-  await promise_rejects(t, new TypeError(), port.close());
+  await promise_rejects_js(t, TypeError, port.close());
 
   writer.releaseLock();
   await port.close();
@@ -86,7 +86,7 @@ serial_test(async (t, fake) => {
 
   fakePort.simulateSystemErrorOnWrite();
   const data = new Uint8Array([1, 2, 3, 4, 5, 6, 7, 8]);
-  await promise_rejects(t, 'UnknownError', writer.write(data));
+  await promise_rejects_dom(t, 'UnknownError', writer.write(data));
 
   assert_true(port.writable instanceof WritableStream);
   assert_not_equals(port.writable, writable);
@@ -112,7 +112,7 @@ serial_test(async (t, fake) => {
 
   fakePort.simulateDisconnectOnWrite();
   const data = new Uint8Array([1, 2, 3, 4, 5, 6, 7, 8]);
-  await promise_rejects(t, 'NetworkError', writer.write(data));
+  await promise_rejects_dom(t, 'NetworkError', writer.write(data));
   assert_equals(port.writable, null);
 
   await port.close();

third_party/blink/web_tests/serial/serial_requestPort.html

@@ -11,7 +11,7 @@
 <script>
 
 promise_test((t) => {
-  return promise_rejects(t, 'SecurityError', navigator.serial.requestPort());
+  return promise_rejects_dom(t, 'SecurityError', navigator.serial.requestPort());
 }, 'requestPort() rejects without a user gesture');
 
 promise_test(async (t) => {
@@ -22,7 +22,7 @@ promise_test(async (t) => {
 
   await trustedClick();
   try {
-    await promise_rejects(t, 'NotFoundError', navigator.serial.requestPort());
+    await promise_rejects_dom(t, 'NotFoundError', navigator.serial.requestPort());
   } finally {
     interceptor.stop();
   }
@@ -30,7 +30,7 @@ promise_test(async (t) => {
 
 serial_test(async (t, fake) => {
   await trustedClick();
-  return promise_rejects(t, 'NotFoundError', navigator.serial.requestPort());
+  return promise_rejects_dom(t, 'NotFoundError', navigator.serial.requestPort());
 }, 'requestPort() rejects if no port has been selected');
 
 serial_test(async (t, fake) => {
@@ -69,7 +69,7 @@ serial_test(async (t, fake) => {
   fake.setSelectedPort(guid);
 
   await trustedClick();
-  return promise_rejects(t, new TypeError(), navigator.serial.requestPort({
+  return promise_rejects_js(t, TypeError, navigator.serial.requestPort({
     filters: [{}],
   }));
 }, 'An empty filter is not valid');
@@ -79,7 +79,7 @@ serial_test(async (t, fake) => {
   fake.setSelectedPort(guid);
 
   await trustedClick();
-  return promise_rejects(t, new TypeError(), navigator.serial.requestPort({
+  return promise_rejects_js(t, TypeError, navigator.serial.requestPort({
     filters: [{ usbProductId: 0x0001 }],
   }));
 }, 'requestPort() requires a USB vendor ID if a product ID specified');