Add RemoveFakeService to BT test interface

This change allows the removal of a service to be simulated by the
Bluetooth test interface. To test the new function the script for
generating service is removed tests is also updated to make use of the
new function.

BUG=569709

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

device/bluetooth/public/interfaces/test/fake_bluetooth.mojom

@@ -163,6 +163,11 @@ interface FakeCentral {
   AddFakeService(string peripheral_address, UUID service_uuid)
       => (string? service_id);
 
+  // Removes a fake GATT Services with |service_id| from the fake peripheral
+  // with |peripheral_address|.
+  RemoveFakeService(string service_id, string peripheral_address)
+      => (bool success);
+
   // Adds a fake GATT Characteristic with |characteristic_uuid| and |properties|
   // to the fake service with |service_id| in |peripheral_address| peripheral.
   // The characteristic will be found when discovering the peripheral's GATT

device/bluetooth/test/fake_central.cc

@@ -118,6 +118,17 @@ void FakeCentral::AddFakeService(const std::string& peripheral_address,
   std::move(callback).Run(fake_peripheral->AddFakeService(service_uuid));
 }
 
+void FakeCentral::RemoveFakeService(const std::string& identifier,
+                                    const std::string& peripheral_address,
+                                    RemoveFakeServiceCallback callback) {
+  FakePeripheral* fake_peripheral = GetFakePeripheral(peripheral_address);
+  if (!fake_peripheral) {
+    std::move(callback).Run(false);
+    return;
+  }
+  std::move(callback).Run(fake_peripheral->RemoveFakeService(identifier));
+}
+
 void FakeCentral::AddFakeCharacteristic(
     const device::BluetoothUUID& characteristic_uuid,
     mojom::CharacteristicPropertiesPtr properties,

device/bluetooth/test/fake_central.h

@@ -54,6 +54,9 @@ class FakeCentral : public mojom::FakeCentral, public device::BluetoothAdapter {
   void AddFakeService(const std::string& peripheral_address,
                       const device::BluetoothUUID& service_uuid,
                       AddFakeServiceCallback callback) override;
+  void RemoveFakeService(const std::string& identifier,
+                         const std::string& peripheral_address,
+                         RemoveFakeServiceCallback callback) override;
   void AddFakeCharacteristic(const device::BluetoothUUID& characteristic_uuid,
                              mojom::CharacteristicPropertiesPtr properties,
                              const std::string& service_id,

device/bluetooth/test/fake_peripheral.cc

@@ -88,6 +88,16 @@ std::string FakePeripheral::AddFakeService(
   return it->second->GetIdentifier();
 }
 
+bool FakePeripheral::RemoveFakeService(const std::string& identifier) {
+  auto it = gatt_services_.find(identifier);
+  if (it == gatt_services_.end()) {
+    return false;
+  }
+
+  gatt_services_.erase(it);
+  return true;
+}
+
 uint32_t FakePeripheral::GetBluetoothClass() const {
   NOTREACHED();
   return 0;

device/bluetooth/test/fake_peripheral.h

@@ -59,6 +59,9 @@ class FakePeripheral : public device::BluetoothDevice {
   // Returns the service's Id.
   std::string AddFakeService(const device::BluetoothUUID& service_uuid);
 
+  // Remove a fake service with |identifier| from this peripheral.
+  bool RemoveFakeService(const std::string& identifier);
+
   // BluetoothDevice overrides:
   uint32_t GetBluetoothClass() const override;
 #if defined(OS_CHROMEOS) || defined(OS_LINUX)

third_party/WebKit/LayoutTests/bluetooth/script-tests/service/service-is-removed.js

 'use strict';
-bluetooth_test(() => {
-  return setBluetoothFakeAdapter('HeartRateAdapter')
-    .then(() => requestDeviceWithTrustedClick({
-      filters: [{services: ['heart_rate']}],
-      optionalServices: ['generic_access']}))
-    .then(device => device.gatt.connect())
-    .then(gatt => gatt.getPrimaryService('generic_access'))
-    .then(service => {
-      return setBluetoothFakeAdapter('MissingServiceHeartRateAdapter')
-        .then(() => assert_promise_rejects_with_message(
-          service.CALLS([
-            getCharacteristic('gap.device_name')|
-            getCharacteristics()|
-            getCharacteristics('gap.device_name')[UUID]
-          ]),
-          new DOMException('GATT Service no longer exists.',
-                           'InvalidStateError'),
-          'Service got removed.'));
-    });
-}, 'Service is removed before FUNCTION_NAME call. Reject with InvalidStateError.');
+const test_desc = 'Service is removed before FUNCTION_NAME call. ' +
+    'Reject with InvalidStateError.';
+const expected = new DOMException('GATT Service no longer exists.',
+    'InvalidStateError');
+let service, fake_service, fake_peripheral;
+
+bluetooth_test(() => getHealthThermometerService()
+    .then(_ => ({service, fake_service, fake_peripheral} = _))
+    .then(() => fake_service.remove())
+    .then(() => fake_peripheral.simulateGATTServicesChanged())
+    .then(() => assert_promise_rejects_with_message(
+        service.CALLS([
+          getCharacteristic('measurement_interval')|
+          getCharacteristics()|
+          getCharacteristics('measurement_interval')[UUID]
+        ]),
+        expected,
+        'Service got removed.')),
+    test_desc);

third_party/WebKit/LayoutTests/bluetooth/service/getCharacteristic/gen-service-is-removed.html

@@ -7,21 +7,20 @@
 <script src="../../../external/wpt/bluetooth/resources/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
-  return setBluetoothFakeAdapter('HeartRateAdapter')
-    .then(() => requestDeviceWithTrustedClick({
-      filters: [{services: ['heart_rate']}],
-      optionalServices: ['generic_access']}))
-    .then(device => device.gatt.connect())
-    .then(gatt => gatt.getPrimaryService('generic_access'))
-    .then(service => {
-      return setBluetoothFakeAdapter('MissingServiceHeartRateAdapter')
-        .then(() => assert_promise_rejects_with_message(
-          service.getCharacteristic('gap.device_name'),
-          new DOMException('GATT Service no longer exists.',
-                           'InvalidStateError'),
-          'Service got removed.'));
-    });
-}, 'Service is removed before getCharacteristic call. Reject with InvalidStateError.');
+const test_desc = 'Service is removed before getCharacteristic call. ' +
+    'Reject with InvalidStateError.';
+const expected = new DOMException('GATT Service no longer exists.',
+    'InvalidStateError');
+let service, fake_service, fake_peripheral;
+
+bluetooth_test(() => getHealthThermometerService()
+    .then(_ => ({service, fake_service, fake_peripheral} = _))
+    .then(() => fake_service.remove())
+    .then(() => fake_peripheral.simulateGATTServicesChanged())
+    .then(() => assert_promise_rejects_with_message(
+        service.getCharacteristic('measurement_interval'),
+        expected,
+        'Service got removed.')),
+    test_desc);
 
 </script>

third_party/WebKit/LayoutTests/bluetooth/service/getCharacteristics/gen-service-is-removed-with-uuid.html

@@ -7,21 +7,20 @@
 <script src="../../../external/wpt/bluetooth/resources/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
-  return setBluetoothFakeAdapter('HeartRateAdapter')
-    .then(() => requestDeviceWithTrustedClick({
-      filters: [{services: ['heart_rate']}],
-      optionalServices: ['generic_access']}))
-    .then(device => device.gatt.connect())
-    .then(gatt => gatt.getPrimaryService('generic_access'))
-    .then(service => {
-      return setBluetoothFakeAdapter('MissingServiceHeartRateAdapter')
-        .then(() => assert_promise_rejects_with_message(
-          service.getCharacteristics('gap.device_name'),
-          new DOMException('GATT Service no longer exists.',
-                           'InvalidStateError'),
-          'Service got removed.'));
-    });
-}, 'Service is removed before getCharacteristics call. Reject with InvalidStateError.');
+const test_desc = 'Service is removed before getCharacteristics call. ' +
+    'Reject with InvalidStateError.';
+const expected = new DOMException('GATT Service no longer exists.',
+    'InvalidStateError');
+let service, fake_service, fake_peripheral;
+
+bluetooth_test(() => getHealthThermometerService()
+    .then(_ => ({service, fake_service, fake_peripheral} = _))
+    .then(() => fake_service.remove())
+    .then(() => fake_peripheral.simulateGATTServicesChanged())
+    .then(() => assert_promise_rejects_with_message(
+        service.getCharacteristics('measurement_interval'),
+        expected,
+        'Service got removed.')),
+    test_desc);
 
 </script>

third_party/WebKit/LayoutTests/bluetooth/service/getCharacteristics/gen-service-is-removed.html

@@ -7,21 +7,20 @@
 <script src="../../../external/wpt/bluetooth/resources/bluetooth-helpers.js"></script>
 <script>
 'use strict';
-bluetooth_test(() => {
-  return setBluetoothFakeAdapter('HeartRateAdapter')
-    .then(() => requestDeviceWithTrustedClick({
-      filters: [{services: ['heart_rate']}],
-      optionalServices: ['generic_access']}))
-    .then(device => device.gatt.connect())
-    .then(gatt => gatt.getPrimaryService('generic_access'))
-    .then(service => {
-      return setBluetoothFakeAdapter('MissingServiceHeartRateAdapter')
-        .then(() => assert_promise_rejects_with_message(
-          service.getCharacteristics(),
-          new DOMException('GATT Service no longer exists.',
-                           'InvalidStateError'),
-          'Service got removed.'));
-    });
-}, 'Service is removed before getCharacteristics call. Reject with InvalidStateError.');
+const test_desc = 'Service is removed before getCharacteristics call. ' +
+    'Reject with InvalidStateError.';
+const expected = new DOMException('GATT Service no longer exists.',
+    'InvalidStateError');
+let service, fake_service, fake_peripheral;
+
+bluetooth_test(() => getHealthThermometerService()
+    .then(_ => ({service, fake_service, fake_peripheral} = _))
+    .then(() => fake_service.remove())
+    .then(() => fake_peripheral.simulateGATTServicesChanged())
+    .then(() => assert_promise_rejects_with_message(
+        service.getCharacteristics(),
+        expected,
+        'Service got removed.')),
+    test_desc);
 
 </script>

third_party/WebKit/LayoutTests/external/wpt/resources/chromium/web-bluetooth-test.js

@@ -236,6 +236,16 @@ class FakeRemoteGATTService {
       characteristic_id, this.service_id_,
       this.peripheral_address_, this.fake_central_ptr_);
   }
+
+  // Removes the fake GATT service from its fake peripheral.
+  async remove() {
+    let {success} =
+        await this.fake_central_ptr_.removeFakeService(
+            this.service_id_,
+            this.peripheral_address_);
+
+    if (!success) throw 'remove failed';
+  }
 }
 
 class FakeRemoteGATTCharacteristic {