bluetooth: web: test: Pre-migration formatting

This change ensures that tests that are ready to be migrated into wpt/
will contain consistent formatting. This includes a test_desc constant
describing the test and consistent indentation.

BUG=509038

Change-Id: If04b5cdd796709b8080960550cf216297e8d38f6
Reviewed-on: https://chromium-review.googlesource.com/891989
Commit-Queue: Ovidio Henriquez <odejesush@chromium.org>
Reviewed-by: Reilly Grant <reillyg@chromium.org>
Reviewed-by: Conley Owens <cco3@chromium.org>
Cr-Commit-Position: refs/heads/master@{#533179}

third_party/WebKit/LayoutTests/bluetooth/characteristic/service-same-from-2-characteristics.html

@@ -3,7 +3,6 @@
 <script src="../../resources/testharnessreport.js"></script>
 <script src="../../resources/testdriver.js"></script>
 <script src="../../resources/testdriver-vendor.js"></script>
-<script src="../../resources/bluetooth/bluetooth-helpers.js"></script>
 <script src="../../external/wpt/bluetooth/resources/bluetooth-helpers.js"></script>
 <script>
 'use strict';

third_party/WebKit/LayoutTests/bluetooth/characteristic/service-same-object.html

@@ -3,7 +3,6 @@
 <script src="../../resources/testharnessreport.js"></script>
 <script src="../../resources/testdriver.js"></script>
 <script src="../../resources/testdriver-vendor.js"></script>
-<script src="../../resources/bluetooth/bluetooth-helpers.js"></script>
 <script src="../../external/wpt/bluetooth/resources/bluetooth-helpers.js"></script>
 <script>
 'use strict';

third_party/WebKit/LayoutTests/bluetooth/descriptor/readValue/read-succeeds.html

@@ -6,16 +6,16 @@
 <script src="../../../external/wpt/bluetooth/resources/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
-  const EXPECTED_VALUE = [0, 1, 2];
-  return getUserDescriptionDescriptor()
-    .then(({descriptor, fake_descriptor}) => {
-      return fake_descriptor.setNextReadResponse(GATT_SUCCESS, EXPECTED_VALUE)
-        .then(() => descriptor.readValue())
-        .then(value => {
-          assert_array_equals(Array.from(new Uint8Array(
-            value.buffer)), EXPECTED_VALUE);
-        });
-    });
-}, 'A read request succeeds and returns the descriptor\'s value.');
+const test_desc = 'A read request succeeds and returns the descriptor\'s value.';
+const EXPECTED_VALUE = [0, 1, 2];
+let descriptor, fake_descriptor;
+
+bluetooth_test(() => getUserDescriptionDescriptor()
+    .then(_ => ({descriptor, fake_descriptor} = _))
+    .then(() =>
+        fake_descriptor.setNextReadResponse(GATT_SUCCESS, EXPECTED_VALUE))
+    .then(() => descriptor.readValue())
+    .then(value => assert_array_equals(Array.from(new Uint8Array(
+        value.buffer)), EXPECTED_VALUE)),
+    test_desc);
 </script>

third_party/WebKit/LayoutTests/bluetooth/device/gattserverdisconnected-event/disconnected.html

@@ -6,14 +6,14 @@
 <script src="../../../external/wpt/bluetooth/resources/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-let test_desc = 'A device disconnecting while connected should fire the ' +
+const test_desc = 'A device disconnecting while connected should fire the ' +
     'gattserverdisconnected event.';
-let device, fake_peripheral;
+
 bluetooth_test(() => getHealthThermometerDevice()
-  .then(_ => ({device, fake_peripheral} = _))
-  .then(() => {
+  .then(({device, fake_peripheral}) => {
     fake_peripheral.simulateGATTDisconnection();
     return eventPromise(device, 'gattserverdisconnected');
   })
-  .then(e => assert_true(e.bubbles)), test_desc);
+  .then(e => assert_true(e.bubbles)),
+  test_desc);
 </script>

third_party/WebKit/LayoutTests/bluetooth/device/gattserverdisconnected-event/disconnected_gc.html

@@ -6,12 +6,11 @@
 <script src="../../../external/wpt/bluetooth/resources/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-let test_desc = 'A device disconnecting after the BluetoothDevice object has ' +
-    'been gced should not access freed memory.';
-let fake_peripheral;
+const test_desc = 'A device disconnecting after the BluetoothDevice object ' +
+    'has been GC\'ed should not access freed memory.';
+
 bluetooth_test(() => getHealthThermometerDevice()
-  .then(_ => ({fake_peripheral} = _))
-  .then(() => {
+  .then(({fake_peripheral}) => {
     // 1. Disconnect.
     fake_peripheral.simulateGATTDisconnection();
     // 2. Run garbage collection.
@@ -20,5 +19,6 @@ bluetooth_test(() => getHealthThermometerDevice()
   })
   // 3. Wait 50ms after the GC runs for the disconnection event to come back.
   // There's nothing to assert other than that only valid memory is used.
-  .then(() => new Promise(resolve => step_timeout(resolve, 50))), test_desc);
+  .then(() => new Promise(resolve => step_timeout(resolve, 50))),
+  test_desc);
 </script>

third_party/WebKit/LayoutTests/bluetooth/device/gattserverdisconnected-event/one-event-per-disconnection.html

@@ -6,16 +6,17 @@
 <script src="../../../external/wpt/bluetooth/resources/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-let test_desc = 'If a site disconnects from a device while the platform is ' +
+const test_desc = 'If a site disconnects from a device while the platform is ' +
     'disconnecting that device, only one gattserverdisconnected event should ' +
     'fire.';
 let device, fake_peripheral;
 let num_events = 0;
+
 bluetooth_test(() => getHealthThermometerDevice()
   .then(_ => ({device, fake_peripheral} = _))
   // 1. Listen for disconnections.
   .then(() =>
-    device.addEventListener('gattserverdisconnected', () => num_events++))
+      device.addEventListener('gattserverdisconnected', () => num_events++))
   // 2. Disconnect several times.
   .then(() => Promise.all([
     eventPromise(device, 'gattserverdisconnected'),
@@ -26,5 +27,6 @@ bluetooth_test(() => getHealthThermometerDevice()
   // 3. Wait to catch disconnect events.
   .then(() => new Promise(resolve => step_timeout(resolve, 50)))
   // 4. Ensure there is exactly 1 disconnection recorded.
-  .then(() => assert_equals(num_events, 1)), test_desc);
+  .then(() => assert_equals(num_events, 1)),
+  test_desc);
 </script>

third_party/WebKit/LayoutTests/bluetooth/idl/idl-BluetoothDevice.html

@@ -3,11 +3,11 @@
 <script src="../../resources/testharnessreport.js"></script>
 <script src="../../resources/testdriver.js"></script>
 <script src="../../resources/testdriver-vendor.js"></script>
-<script src="../../resources/bluetooth/bluetooth-helpers.js"></script>
 <script src="../../external/wpt/bluetooth/resources/bluetooth-helpers.js"></script>
 <script>
 'use strict';
 const test_desc_idl = 'BluetoothDevice IDL test.';
+
 test(() => {
   assert_throws(new TypeError(), () => new BluetoothDevice(),
       'the constructor should not be callable with "new"');
@@ -18,15 +18,14 @@ test(() => {
 const test_desc_attr = 'BluetoothDevice attributes.';
 let device;
 bluetooth_test(() => getHealthThermometerDevice()
-  .then(_ => ({device} = _))
-  .then(() => {
+  .then(({device}) => {
     assert_equals(device.constructor.name, 'BluetoothDevice');
     var old_device_id = device.id;
     assert_throws(new TypeError(), () => device.id = 'overwritten',
-      'the device id should not be writable');
+        'the device id should not be writable');
     assert_throws(new TypeError(), () => device.name = 'overwritten',
-      'the device name should not be writable');
+        'the device name should not be writable');
     assert_equals(device.id, old_device_id);
     assert_equals(device.name, 'Health Thermometer');
-  }),  test_desc_attr);
+  }), test_desc_attr);
 </script>

third_party/WebKit/LayoutTests/bluetooth/service/device-same-from-2-services.html

@@ -3,16 +3,16 @@
 <script src="../../resources/testharnessreport.js"></script>
 <script src="../../resources/testdriver.js"></script>
 <script src="../../resources/testdriver-vendor.js"></script>
-<script src="../../resources/bluetooth/bluetooth-helpers.js"></script>
 <script src="../../external/wpt/bluetooth/resources/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
-  return getTwoHealthThermometerServicesDevice({
-     filters: [{services: ['health_thermometer']}]})
+const test_desc = 'Same parent device returned from multiple services.';
+
+bluetooth_test(() => getTwoHealthThermometerServicesDevice({
+  filters: [{services: ['health_thermometer']}]
+})
     .then(({device}) => device.gatt.getPrimaryServices('health_thermometer'))
-    .then(([service1, service2]) => {
-      assert_equals(service1.device, service2.device);
-    });
-}, "Same parent device returned from multiple services.");
+    .then(([service1, service2]) =>
+        assert_equals(service1.device, service2.device)),
+    test_desc);
 </script>

third_party/WebKit/LayoutTests/bluetooth/service/device-same-object.html

@@ -3,16 +3,15 @@
 <script src="../../resources/testharnessreport.js"></script>
 <script src="../../resources/testdriver.js"></script>
 <script src="../../resources/testdriver-vendor.js"></script>
-<script src="../../resources/bluetooth/bluetooth-helpers.js"></script>
 <script src="../../external/wpt/bluetooth/resources/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
-  return getHealthThermometerDevice({
-      filters: [{services: ['health_thermometer']}]})
+const test_desc = '[SameObject] test for BluetoothRemoteGATTService device.';
+
+bluetooth_test(() => getHealthThermometerDevice({
+  filters: [{services: ['health_thermometer']}]
+})
     .then(({device}) => device.gatt.getPrimaryService('health_thermometer'))
-    .then(service => {
-      assert_equals(service.device, service.device);
-    });
-}, "[SameObject] test for BluetoothRemoteGATTService's device.");
+    .then(service => assert_equals(service.device, service.device)),
+    test_desc);
 </script>