Adding upstream version 124.0.1.upstream/124.0.1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 141 insertions, 0 deletions

diff --git a/testing/web-platform/tests/bluetooth/server/disconnect/connect-disconnect-twice.https.window.js b/testing/web-platform/tests/bluetooth/server/disconnect/connect-disconnect-twice.https.window.js
new file mode 100644
index 0000000000..5d9908df4c
--- /dev/null
+++ b/testing/web-platform/tests/bluetooth/server/disconnect/connect-disconnect-twice.https.window.js
@@ -0,0 +1,23 @@
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+// META: script=/bluetooth/resources/bluetooth-test.js
+// META: script=/bluetooth/resources/bluetooth-fake-devices.js
+'use strict';
+const test_desc = 'Connect + Disconnect twice still results in ' +
+    '\'connected\' being false.';
+let device, fake_peripheral;
+
+// TODO(569716): Test that the disconnect signal was sent to the device.
+bluetooth_test(async () => {
+  let {device, fake_peripheral} = await getDiscoveredHealthThermometerDevice();
+  await fake_peripheral.setNextGATTConnectionResponse({
+    code: HCI_SUCCESS,
+  });
+  let gattServer = await device.gatt.connect();
+  await gattServer.disconnect();
+  assert_false(gattServer.connected);
+
+  gattServer = await device.gatt.connect();
+  await gattServer.disconnect();
+  assert_false(gattServer.connected);
+}, test_desc);
diff --git a/testing/web-platform/tests/bluetooth/server/disconnect/detach-gc.https.window.js b/testing/web-platform/tests/bluetooth/server/disconnect/detach-gc.https.window.js
new file mode 100644
index 0000000000..b934b37973
--- /dev/null
+++ b/testing/web-platform/tests/bluetooth/server/disconnect/detach-gc.https.window.js
@@ -0,0 +1,34 @@
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+// META: script=/common/gc.js
+// META: script=/bluetooth/resources/bluetooth-test.js
+// META: script=/bluetooth/resources/bluetooth-fake-devices.js
+'use strict';
+const test_desc = 'Detach frame then garbage collect. We shouldn\'t crash.';
+let iframe = document.createElement('iframe');
+
+bluetooth_test(async () => {
+  await setUpConnectableHealthThermometerDevice();
+  // 1. Load the iframe.
+  await new Promise(resolve => {
+    iframe.src = '/bluetooth/resources/health-thermometer-iframe.html';
+    document.body.appendChild(iframe);
+    iframe.addEventListener('load', resolve);
+  });
+  // 2. Connect device, detach the iframe, and run garbage collection.
+  await new Promise(resolve => {
+    callWithTrustedClick(() => {
+      iframe.contentWindow.postMessage(
+          {
+            type: 'RequestAndConnect',
+            options: {filters: [{services: ['health_thermometer']}]}
+          },
+          '*');
+    });
+    window.onmessage = messageEvent => {
+      assert_equals(messageEvent.data, 'Connected');
+      iframe.remove();
+      garbageCollect().then(resolve);
+    }
+  })
+}, test_desc)
diff --git a/testing/web-platform/tests/bluetooth/server/disconnect/detachedIframe.https.window.js b/testing/web-platform/tests/bluetooth/server/disconnect/detachedIframe.https.window.js
new file mode 100644
index 0000000000..04e0ca0117
--- /dev/null
+++ b/testing/web-platform/tests/bluetooth/server/disconnect/detachedIframe.https.window.js
@@ -0,0 +1,28 @@
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+// META: script=/common/gc.js
+// META: script=/bluetooth/resources/bluetooth-test.js
+// META: script=/bluetooth/resources/bluetooth-fake-devices.js
+
+bluetooth_test(async () => {
+  let iframe = document.createElement('iframe');
+  let error;
+
+  const {device} = await getHealthThermometerDeviceFromIframe(iframe);
+  await device.gatt.connect();
+
+  iframe.remove();
+  // Set iframe to null to ensure that the GC cleans up as much as possible.
+  iframe = null;
+  await garbageCollect();
+
+  try {
+    await device.gatt.disconnect();
+  } catch (e) {
+    // Cannot use promise_rejects_dom() because |e| is thrown from a different
+    // global.
+    error = e;
+  }
+  assert_not_equals(error, undefined);
+  assert_equals(error.name, 'NetworkError');
+}, 'disconnect() rejects in a detached context');
diff --git a/testing/web-platform/tests/bluetooth/server/disconnect/disconnect-twice-in-a-row.https.window.js b/testing/web-platform/tests/bluetooth/server/disconnect/disconnect-twice-in-a-row.https.window.js
new file mode 100644
index 0000000000..acca9796d5
--- /dev/null
+++ b/testing/web-platform/tests/bluetooth/server/disconnect/disconnect-twice-in-a-row.https.window.js
@@ -0,0 +1,20 @@
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+// META: script=/bluetooth/resources/bluetooth-test.js
+// META: script=/bluetooth/resources/bluetooth-fake-devices.js
+'use strict';
+const test_desc = 'Calling disconnect twice in a row still results in ' +
+    '\'connected\' being false.';
+
+// TODO(569716): Test that the disconnect signal was sent to the device.
+bluetooth_test(async () => {
+  let {device, fake_peripheral} = await getDiscoveredHealthThermometerDevice();
+  await fake_peripheral.setNextGATTConnectionResponse({
+    code: HCI_SUCCESS,
+  });
+  let gattServer = await device.gatt.connect();
+  await gattServer.disconnect();
+  assert_false(gattServer.connected);
+  await gattServer.disconnect();
+  assert_false(gattServer.connected);
+}, test_desc);
diff --git a/testing/web-platform/tests/bluetooth/server/disconnect/gc-detach.https.window.js b/testing/web-platform/tests/bluetooth/server/disconnect/gc-detach.https.window.js
new file mode 100644
index 0000000000..1c062a7759
--- /dev/null
+++ b/testing/web-platform/tests/bluetooth/server/disconnect/gc-detach.https.window.js
@@ -0,0 +1,36 @@
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+// META: script=/common/gc.js
+// META: script=/bluetooth/resources/bluetooth-test.js
+// META: script=/bluetooth/resources/bluetooth-fake-devices.js
+'use strict';
+const test_desc = 'Garbage collect then detach frame. We shouldn\'t crash.';
+let iframe = document.createElement('iframe');
+
+bluetooth_test(async () => {
+  await setUpConnectableHealthThermometerDevice();
+  // 1. Load the iframe.
+  await new Promise(resolve => {
+    iframe.src = '/bluetooth/resources/health-thermometer-iframe.html';
+    document.body.appendChild(iframe);
+    iframe.addEventListener('load', resolve);
+  });
+  // 2. Connect device, run garbage collection, and detach iframe.
+  await new Promise(resolve => {
+    callWithTrustedClick(() => {
+      iframe.contentWindow.postMessage(
+          {
+            type: 'RequestAndConnect',
+            options: {filters: [{services: ['health_thermometer']}]}
+          },
+          '*');
+    });
+    window.onmessage = messageEvent => {
+      assert_equals(messageEvent.data, 'Connected');
+      garbageCollect().then(() => {
+        iframe.remove();
+        resolve();
+      });
+    }
+  })
+}, test_desc)