From 11dbb7120f26c96504fcf42b267d3a8bde4f0283 Mon Sep 17 00:00:00 2001 From: zakorgyula Date: Thu, 6 Oct 2016 14:47:06 +0200 Subject: [PATCH 01/11] Return with InvalidStateError if a Bluetooth id is not cached. --- components/bluetooth/lib.rs | 28 +++++++++++++++++-- components/bluetooth_traits/lib.rs | 1 + components/script/dom/bluetooth.rs | 1 + .../service-is-removed.html.ini | 4 --- .../service-is-removed-with-uuid.html.ini | 4 --- .../service-is-removed.html.ini | 4 --- .../characteristic-is-removed.html.ini | 4 --- ...aracteristic-is-removed-with-uuid.html.ini | 4 --- .../characteristic-is-removed.html.ini | 4 --- .../characteristic-is-removed.html.ini | 4 --- .../service-is-removed.html.ini | 4 --- .../characteristic-is-removed.html.ini | 4 --- .../descriptor/descriptor-is-removed.html.ini | 4 --- .../descriptor/service-is-removed.html.ini | 4 --- .../characteristic-is-removed.html.ini | 4 --- .../service-is-removed.html.ini | 4 --- .../characteristic-is-removed.html.ini | 4 --- .../descriptor/descriptor-is-removed.html.ini | 4 --- .../descriptor/service-is-removed.html.ini | 4 --- 19 files changed, 28 insertions(+), 66 deletions(-) delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/getCharacteristic/service-is-removed.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/getCharacteristics/service-is-removed-with-uuid.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/getCharacteristics/service-is-removed.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/getDescriptor/characteristic-is-removed.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/getDescriptors/characteristic-is-removed-with-uuid.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/getDescriptors/characteristic-is-removed.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/readValue/characteristic/characteristic-is-removed.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/readValue/characteristic/service-is-removed.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/readValue/descriptor/characteristic-is-removed.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/readValue/descriptor/descriptor-is-removed.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/readValue/descriptor/service-is-removed.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/writeValue/characteristic/characteristic-is-removed.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/writeValue/characteristic/service-is-removed.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/writeValue/descriptor/characteristic-is-removed.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/writeValue/descriptor/descriptor-is-removed.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/writeValue/descriptor/service-is-removed.html.ini diff --git a/components/bluetooth/lib.rs b/components/bluetooth/lib.rs index e3d4eba1a24..998053da577 100644 --- a/components/bluetooth/lib.rs +++ b/components/bluetooth/lib.rs @@ -628,6 +628,9 @@ impl BluetoothManager { device_id: String, uuid: String, sender: IpcSender>) { + if !self.cached_devices.contains_key(&device_id) { + return drop(sender.send(Err(BluetoothError::InvalidState))); + } let mut adapter = get_adapter_or_return_error!(self, sender); if !self.allowed_services.get(&device_id).map_or(false, |s| s.contains(&uuid)) { return drop(sender.send(Err(BluetoothError::Security))); @@ -654,6 +657,9 @@ impl BluetoothManager { device_id: String, uuid: Option, sender: IpcSender>) { + if !self.cached_devices.contains_key(&device_id) { + return drop(sender.send(Err(BluetoothError::InvalidState))); + } let mut adapter = get_adapter_or_return_error!(self, sender); let services = match uuid { Some(ref id) => { @@ -690,6 +696,9 @@ impl BluetoothManager { service_id: String, uuid: String, sender: IpcSender>) { + if !self.cached_services.contains_key(&service_id) { + return drop(sender.send(Err(BluetoothError::InvalidState))); + } let mut adapter = match self.get_or_create_adapter() { Some(a) => a, None => return drop(sender.send(Err(BluetoothError::Type(ADAPTER_ERROR.to_string())))), @@ -721,6 +730,9 @@ impl BluetoothManager { service_id: String, uuid: Option, sender: IpcSender>) { + if !self.cached_services.contains_key(&service_id) { + return drop(sender.send(Err(BluetoothError::InvalidState))); + } let mut adapter = match self.get_or_create_adapter() { Some(a) => a, None => return drop(sender.send(Err(BluetoothError::Type(ADAPTER_ERROR.to_string())))), @@ -758,6 +770,9 @@ impl BluetoothManager { service_id: String, uuid: String, sender: IpcSender>) { + if !self.cached_services.contains_key(&service_id) { + return drop(sender.send(Err(BluetoothError::InvalidState))); + } let mut adapter = get_adapter_or_return_error!(self, sender); let characteristics = self.get_gatt_characteristics_by_uuid(&mut adapter, &service_id, &uuid); if characteristics.is_empty() { @@ -789,6 +804,9 @@ impl BluetoothManager { service_id: String, uuid: Option, sender: IpcSender>) { + if !self.cached_services.contains_key(&service_id) { + return drop(sender.send(Err(BluetoothError::InvalidState))); + } let mut adapter = get_adapter_or_return_error!(self, sender); let characteristics = match uuid { Some(id) => self.get_gatt_characteristics_by_uuid(&mut adapter, &service_id, &id), @@ -828,6 +846,9 @@ impl BluetoothManager { characteristic_id: String, uuid: String, sender: IpcSender>) { + if !self.cached_characteristics.contains_key(&characteristic_id) { + return drop(sender.send(Err(BluetoothError::InvalidState))); + } let mut adapter = get_adapter_or_return_error!(self, sender); let descriptors = self.get_gatt_descriptors_by_uuid(&mut adapter, &characteristic_id, &uuid); if descriptors.is_empty() { @@ -848,6 +869,9 @@ impl BluetoothManager { characteristic_id: String, uuid: Option, sender: IpcSender>) { + if !self.cached_characteristics.contains_key(&characteristic_id) { + return drop(sender.send(Err(BluetoothError::InvalidState))); + } let mut adapter = get_adapter_or_return_error!(self, sender); let descriptors = match uuid { Some(id) => self.get_gatt_descriptors_by_uuid(&mut adapter, &characteristic_id, &id), @@ -879,7 +903,7 @@ impl BluetoothManager { value = self.get_gatt_descriptor(&mut adapter, &id) .map(|d| d.read_value().unwrap_or(vec![])); } - let _ = sender.send(value.ok_or(BluetoothError::NotSupported)); + let _ = sender.send(value.ok_or(BluetoothError::InvalidState)); } fn write_value(&mut self, id: String, value: Vec, sender: IpcSender>) { @@ -895,7 +919,7 @@ impl BluetoothManager { Ok(_) => Ok(true), Err(_) => return drop(sender.send(Err(BluetoothError::NotSupported))), }, - None => return drop(sender.send(Err(BluetoothError::NotSupported))), + None => return drop(sender.send(Err(BluetoothError::InvalidState))), }; let _ = sender.send(message); } diff --git a/components/bluetooth_traits/lib.rs b/components/bluetooth_traits/lib.rs index a1b1b41be6e..cea2a7b7a33 100644 --- a/components/bluetooth_traits/lib.rs +++ b/components/bluetooth_traits/lib.rs @@ -20,6 +20,7 @@ pub enum BluetoothError { NotFound, NotSupported, Security, + InvalidState, } #[derive(Deserialize, Serialize)] diff --git a/components/script/dom/bluetooth.rs b/components/script/dom/bluetooth.rs index b6f8544aeab..10809a4fd5d 100644 --- a/components/script/dom/bluetooth.rs +++ b/components/script/dom/bluetooth.rs @@ -289,6 +289,7 @@ impl From for Error { BluetoothError::NotFound => Error::NotFound, BluetoothError::NotSupported => Error::NotSupported, BluetoothError::Security => Error::Security, + BluetoothError::InvalidState => Error::InvalidState, } } } diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/getCharacteristic/service-is-removed.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/getCharacteristic/service-is-removed.html.ini deleted file mode 100644 index a53d4c55402..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/getCharacteristic/service-is-removed.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[service-is-removed.html] - type: testharness - [Service is removed. Reject with InvalidStateError.] - expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/getCharacteristics/service-is-removed-with-uuid.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/getCharacteristics/service-is-removed-with-uuid.html.ini deleted file mode 100644 index 9224f668cff..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/getCharacteristics/service-is-removed-with-uuid.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[service-is-removed-with-uuid.html] - type: testharness - [Service is removed. Reject with InvalidStateError.] - expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/getCharacteristics/service-is-removed.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/getCharacteristics/service-is-removed.html.ini deleted file mode 100644 index a53d4c55402..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/getCharacteristics/service-is-removed.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[service-is-removed.html] - type: testharness - [Service is removed. Reject with InvalidStateError.] - expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/getDescriptor/characteristic-is-removed.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/getDescriptor/characteristic-is-removed.html.ini deleted file mode 100644 index 0eefaf13656..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/getDescriptor/characteristic-is-removed.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[characteristic-is-removed.html] - type: testharness - [Characteristic is removed. Reject with InvalidStateError.] - expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/getDescriptors/characteristic-is-removed-with-uuid.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/getDescriptors/characteristic-is-removed-with-uuid.html.ini deleted file mode 100644 index ac0e362efc1..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/getDescriptors/characteristic-is-removed-with-uuid.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[characteristic-is-removed-with-uuid.html] - type: testharness - [Characteristic is removed. Reject with InvalidStateError.] - expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/getDescriptors/characteristic-is-removed.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/getDescriptors/characteristic-is-removed.html.ini deleted file mode 100644 index 0eefaf13656..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/getDescriptors/characteristic-is-removed.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[characteristic-is-removed.html] - type: testharness - [Characteristic is removed. Reject with InvalidStateError.] - expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/readValue/characteristic/characteristic-is-removed.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/readValue/characteristic/characteristic-is-removed.html.ini deleted file mode 100644 index 5d421d6b8c7..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/readValue/characteristic/characteristic-is-removed.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[characteristic-is-removed.html] - type: testharness - [Characteristic gets removed. Reject with InvalidStateError.] - expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/readValue/characteristic/service-is-removed.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/readValue/characteristic/service-is-removed.html.ini deleted file mode 100644 index d4ab00c8d6f..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/readValue/characteristic/service-is-removed.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[service-is-removed.html] - type: testharness - [Service gets removed. Reject with InvalidStateError.] - expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/readValue/descriptor/characteristic-is-removed.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/readValue/descriptor/characteristic-is-removed.html.ini deleted file mode 100644 index 5d421d6b8c7..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/readValue/descriptor/characteristic-is-removed.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[characteristic-is-removed.html] - type: testharness - [Characteristic gets removed. Reject with InvalidStateError.] - expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/readValue/descriptor/descriptor-is-removed.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/readValue/descriptor/descriptor-is-removed.html.ini deleted file mode 100644 index c59e14a44dc..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/readValue/descriptor/descriptor-is-removed.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[descriptor-is-removed.html] - type: testharness - [Descriptor gets removed. Reject with InvalidStateError.] - expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/readValue/descriptor/service-is-removed.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/readValue/descriptor/service-is-removed.html.ini deleted file mode 100644 index d4ab00c8d6f..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/readValue/descriptor/service-is-removed.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[service-is-removed.html] - type: testharness - [Service gets removed. Reject with InvalidStateError.] - expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/writeValue/characteristic/characteristic-is-removed.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/writeValue/characteristic/characteristic-is-removed.html.ini deleted file mode 100644 index 5d421d6b8c7..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/writeValue/characteristic/characteristic-is-removed.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[characteristic-is-removed.html] - type: testharness - [Characteristic gets removed. Reject with InvalidStateError.] - expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/writeValue/characteristic/service-is-removed.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/writeValue/characteristic/service-is-removed.html.ini deleted file mode 100644 index d4ab00c8d6f..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/writeValue/characteristic/service-is-removed.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[service-is-removed.html] - type: testharness - [Service gets removed. Reject with InvalidStateError.] - expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/writeValue/descriptor/characteristic-is-removed.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/writeValue/descriptor/characteristic-is-removed.html.ini deleted file mode 100644 index 5d421d6b8c7..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/writeValue/descriptor/characteristic-is-removed.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[characteristic-is-removed.html] - type: testharness - [Characteristic gets removed. Reject with InvalidStateError.] - expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/writeValue/descriptor/descriptor-is-removed.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/writeValue/descriptor/descriptor-is-removed.html.ini deleted file mode 100644 index c59e14a44dc..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/writeValue/descriptor/descriptor-is-removed.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[descriptor-is-removed.html] - type: testharness - [Descriptor gets removed. Reject with InvalidStateError.] - expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/writeValue/descriptor/service-is-removed.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/writeValue/descriptor/service-is-removed.html.ini deleted file mode 100644 index d4ab00c8d6f..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/writeValue/descriptor/service-is-removed.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[service-is-removed.html] - type: testharness - [Service gets removed. Reject with InvalidStateError.] - expected: FAIL From b72dcf326baeef621d265fbdef8cebadeef72080 Mon Sep 17 00:00:00 2001 From: zakorgyula Date: Thu, 6 Oct 2016 17:27:00 +0200 Subject: [PATCH 02/11] Check if the BluetoothDevice is connected, when calling getGATT functions. --- .../dom/bluetoothremotegattcharacteristic.rs | 6 ++++++ .../script/dom/bluetoothremotegattserver.rs | 8 +++++++- .../script/dom/bluetoothremotegattservice.rs | 16 +++++++++++++++- .../disconnect-called-before.html.ini | 4 ---- .../disconnect-called-before-with-uuid.html.ini | 4 ---- .../disconnect-called-before.html.ini | 4 ---- .../disconnect-called-before.html.ini | 4 ---- .../disconnect-called-before-with-uuid.html.ini | 4 ---- .../disconnect-called-before.html.ini | 4 ---- .../disconnect-called-before.html.ini | 4 ---- .../disconnected-device.html.ini | 4 ---- .../disconnect-called-before-with-uuid.html.ini | 4 ---- .../disconnect-called-before.html.ini | 4 ---- .../disconnected-device-with-uuid.html.ini | 4 ---- .../disconnected-device.html.ini | 4 ---- 15 files changed, 28 insertions(+), 50 deletions(-) delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/getCharacteristic/disconnect-called-before.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/getCharacteristics/disconnect-called-before-with-uuid.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/getCharacteristics/disconnect-called-before.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/getDescriptor/disconnect-called-before.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/getDescriptors/disconnect-called-before-with-uuid.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/getDescriptors/disconnect-called-before.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/getPrimaryService/disconnect-called-before.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/getPrimaryService/disconnected-device.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/getPrimaryServices/disconnect-called-before-with-uuid.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/getPrimaryServices/disconnect-called-before.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/getPrimaryServices/disconnected-device-with-uuid.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/getPrimaryServices/disconnected-device.html.ini diff --git a/components/script/dom/bluetoothremotegattcharacteristic.rs b/components/script/dom/bluetoothremotegattcharacteristic.rs index 0fae7548ede..16a2bde68f5 100644 --- a/components/script/dom/bluetoothremotegattcharacteristic.rs +++ b/components/script/dom/bluetoothremotegattcharacteristic.rs @@ -87,6 +87,9 @@ impl BluetoothRemoteGATTCharacteristic { if uuid_is_blacklisted(uuid.as_ref(), Blacklist::All) { return Err(Security) } + if !self.Service().Device().Gatt().Connected() { + return Err(Network) + } let (sender, receiver) = ipc::channel().unwrap(); self.get_bluetooth_thread().send( BluetoothMethodMsg::GetDescriptor(self.get_instance_id(), uuid, sender)).unwrap(); @@ -117,6 +120,9 @@ impl BluetoothRemoteGATTCharacteristic { } } }; + if !self.Service().Device().Gatt().Connected() { + return Err(Network) + } let (sender, receiver) = ipc::channel().unwrap(); self.get_bluetooth_thread().send( BluetoothMethodMsg::GetDescriptors(self.get_instance_id(), uuid, sender)).unwrap(); diff --git a/components/script/dom/bluetoothremotegattserver.rs b/components/script/dom/bluetoothremotegattserver.rs index 5e589fe07af..3aafc788710 100644 --- a/components/script/dom/bluetoothremotegattserver.rs +++ b/components/script/dom/bluetoothremotegattserver.rs @@ -8,7 +8,7 @@ use dom::bindings::codegen::Bindings::BluetoothDeviceBinding::BluetoothDeviceMet use dom::bindings::codegen::Bindings::BluetoothRemoteGATTServerBinding; use dom::bindings::codegen::Bindings::BluetoothRemoteGATTServerBinding::BluetoothRemoteGATTServerMethods; use dom::bindings::error::{ErrorResult, Fallible}; -use dom::bindings::error::Error::{self, Security}; +use dom::bindings::error::Error::{self, Network, Security}; use dom::bindings::js::{JS, MutHeap, Root}; use dom::bindings::reflector::{Reflectable, Reflector, reflect_dom_object}; use dom::bindings::str::DOMString; @@ -72,6 +72,9 @@ impl BluetoothRemoteGATTServer { if uuid_is_blacklisted(uuid.as_ref(), Blacklist::All) { return Err(Security) } + if !self.Device().Gatt().Connected() { + return Err(Network) + } let (sender, receiver) = ipc::channel().unwrap(); self.get_bluetooth_thread().send( BluetoothMethodMsg::GetPrimaryService(String::from(self.Device().Id()), uuid, sender)).unwrap(); @@ -103,6 +106,9 @@ impl BluetoothRemoteGATTServer { } } }; + if !self.Device().Gatt().Connected() { + return Err(Network) + } let (sender, receiver) = ipc::channel().unwrap(); self.get_bluetooth_thread().send( BluetoothMethodMsg::GetPrimaryServices(String::from(self.Device().Id()), uuid, sender)).unwrap(); diff --git a/components/script/dom/bluetoothremotegattservice.rs b/components/script/dom/bluetoothremotegattservice.rs index a4fc78c8d93..a8c8265c3fd 100644 --- a/components/script/dom/bluetoothremotegattservice.rs +++ b/components/script/dom/bluetoothremotegattservice.rs @@ -4,9 +4,11 @@ use bluetooth_blacklist::{Blacklist, uuid_is_blacklisted}; use bluetooth_traits::BluetoothMethodMsg; +use dom::bindings::codegen::Bindings::BluetoothDeviceBinding::BluetoothDeviceMethods; +use dom::bindings::codegen::Bindings::BluetoothRemoteGATTServerBinding::BluetoothRemoteGATTServerMethods; use dom::bindings::codegen::Bindings::BluetoothRemoteGATTServiceBinding; use dom::bindings::codegen::Bindings::BluetoothRemoteGATTServiceBinding::BluetoothRemoteGATTServiceMethods; -use dom::bindings::error::Error::{self, Security}; +use dom::bindings::error::Error::{self, Network, Security}; use dom::bindings::error::Fallible; use dom::bindings::js::{JS, MutHeap, Root}; use dom::bindings::reflector::{Reflectable, Reflector, reflect_dom_object}; @@ -76,6 +78,9 @@ impl BluetoothRemoteGATTService { if uuid_is_blacklisted(uuid.as_ref(), Blacklist::All) { return Err(Security) } + if !self.Device().Gatt().Connected() { + return Err(Network) + } let (sender, receiver) = ipc::channel().unwrap(); self.get_bluetooth_thread().send( BluetoothMethodMsg::GetCharacteristic(self.get_instance_id(), uuid, sender)).unwrap(); @@ -118,6 +123,9 @@ impl BluetoothRemoteGATTService { } } }; + if !self.Device().Gatt().Connected() { + return Err(Network) + } let mut characteristics = vec!(); let (sender, receiver) = ipc::channel().unwrap(); self.get_bluetooth_thread().send( @@ -159,6 +167,9 @@ impl BluetoothRemoteGATTService { if uuid_is_blacklisted(uuid.as_ref(), Blacklist::All) { return Err(Security) } + if !self.Device().Gatt().Connected() { + return Err(Network) + } let (sender, receiver) = ipc::channel().unwrap(); self.get_bluetooth_thread().send( BluetoothMethodMsg::GetIncludedService(self.get_instance_id(), @@ -192,6 +203,9 @@ impl BluetoothRemoteGATTService { } } }; + if !self.Device().Gatt().Connected() { + return Err(Network) + } let (sender, receiver) = ipc::channel().unwrap(); self.get_bluetooth_thread().send( BluetoothMethodMsg::GetIncludedServices(self.get_instance_id(), diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/getCharacteristic/disconnect-called-before.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/getCharacteristic/disconnect-called-before.html.ini deleted file mode 100644 index 5530d529555..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/getCharacteristic/disconnect-called-before.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[disconnect-called-before.html] - type: testharness - [disconnect() called before getCharacteristic. Reject with NetworkError.] - expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/getCharacteristics/disconnect-called-before-with-uuid.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/getCharacteristics/disconnect-called-before-with-uuid.html.ini deleted file mode 100644 index 964190d4d88..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/getCharacteristics/disconnect-called-before-with-uuid.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[disconnect-called-before-with-uuid.html] - type: testharness - [disconnect() called before getCharacteristics. Reject with NetworkError.] - expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/getCharacteristics/disconnect-called-before.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/getCharacteristics/disconnect-called-before.html.ini deleted file mode 100644 index 5999c62bbda..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/getCharacteristics/disconnect-called-before.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[disconnect-called-before.html] - type: testharness - [disconnect() called before getCharacteristics. Reject with NetworkError.] - expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/getDescriptor/disconnect-called-before.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/getDescriptor/disconnect-called-before.html.ini deleted file mode 100644 index 6754770f361..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/getDescriptor/disconnect-called-before.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[disconnect-called-before.html] - type: testharness - [disconnect() called before getDescriptor. Reject with NetworkError.] - expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/getDescriptors/disconnect-called-before-with-uuid.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/getDescriptors/disconnect-called-before-with-uuid.html.ini deleted file mode 100644 index 2ef92759456..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/getDescriptors/disconnect-called-before-with-uuid.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[disconnect-called-before-with-uuid.html] - type: testharness - [disconnect() called before getDescriptors. Reject with NetworkError.] - expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/getDescriptors/disconnect-called-before.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/getDescriptors/disconnect-called-before.html.ini deleted file mode 100644 index 85d9bc4fba0..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/getDescriptors/disconnect-called-before.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[disconnect-called-before.html] - type: testharness - [disconnect() called before getDescriptors. Reject with NetworkError.] - expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/getPrimaryService/disconnect-called-before.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/getPrimaryService/disconnect-called-before.html.ini deleted file mode 100644 index 7bffa89c3f4..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/getPrimaryService/disconnect-called-before.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[disconnect-called-before.html] - type: testharness - [disconnect() called before getPrimaryService. Reject with NetworkError.] - expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/getPrimaryService/disconnected-device.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/getPrimaryService/disconnected-device.html.ini deleted file mode 100644 index e8641d4018e..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/getPrimaryService/disconnected-device.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[disconnected-device.html] - type: testharness - [getPrimaryService called before connecting. Reject with NetworkError.] - expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/getPrimaryServices/disconnect-called-before-with-uuid.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/getPrimaryServices/disconnect-called-before-with-uuid.html.ini deleted file mode 100644 index 70c8240fe4e..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/getPrimaryServices/disconnect-called-before-with-uuid.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[disconnect-called-before-with-uuid.html] - type: testharness - [disconnect() called before getPrimaryServices. Reject with NetworkError.] - expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/getPrimaryServices/disconnect-called-before.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/getPrimaryServices/disconnect-called-before.html.ini deleted file mode 100644 index fd52ad11a12..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/getPrimaryServices/disconnect-called-before.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[disconnect-called-before.html] - type: testharness - [disconnect() called before getPrimaryServices. Reject with NetworkError.] - expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/getPrimaryServices/disconnected-device-with-uuid.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/getPrimaryServices/disconnected-device-with-uuid.html.ini deleted file mode 100644 index 8ce91b03bea..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/getPrimaryServices/disconnected-device-with-uuid.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[disconnected-device-with-uuid.html] - type: testharness - [getPrimaryServices called before connecting. Reject with NetworkError.] - expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/getPrimaryServices/disconnected-device.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/getPrimaryServices/disconnected-device.html.ini deleted file mode 100644 index 2916ee4842e..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/getPrimaryServices/disconnected-device.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[disconnected-device.html] - type: testharness - [getPrimaryServices called before connecting. Reject with NetworkError.] - expected: FAIL From 2b4829b89a360bfd7614f46015cb8decae78da7c Mon Sep 17 00:00:00 2001 From: zakorgyula Date: Fri, 7 Oct 2016 10:58:52 +0200 Subject: [PATCH 03/11] Removing uuids field from BluetoothDevice with the related test cases. --- .../script/dom/webidls/BluetoothDevice.webidl | 6 +++++- tests/wpt/mozilla/meta/MANIFEST.json | 6 ------ .../requestDevice/correct-uuids.html.ini | 4 ---- .../requestDevice/correct-uuids.html | 19 ------------------- 4 files changed, 5 insertions(+), 30 deletions(-) delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/correct-uuids.html.ini delete mode 100644 tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/correct-uuids.html diff --git a/components/script/dom/webidls/BluetoothDevice.webidl b/components/script/dom/webidls/BluetoothDevice.webidl index 65bfb9c1a4e..34a77230850 100644 --- a/components/script/dom/webidls/BluetoothDevice.webidl +++ b/components/script/dom/webidls/BluetoothDevice.webidl @@ -8,9 +8,13 @@ interface BluetoothDevice { readonly attribute DOMString id; readonly attribute DOMString? name; + // TODO: remove this after BluetoothAdvertisingEvent implemented. readonly attribute BluetoothAdvertisingData adData; readonly attribute BluetoothRemoteGATTServer gatt; - // readonly attribute FrozenArray[] uuids; + + // Promise watchAdvertisements(); + // void unwatchAdvertisements(); + // readonly attribute boolean watchingAdvertisements; }; // BluetoothDevice implements EventTarget; diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index 626f628c173..3961a0d42eb 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -7436,12 +7436,6 @@ "url": "/_mozilla/mozilla/bluetooth/requestDevice/canonicalizeFilter/wrong-service-in-services-member.html" } ], - "mozilla/bluetooth/requestDevice/correct-uuids.html": [ - { - "path": "mozilla/bluetooth/requestDevice/correct-uuids.html", - "url": "/_mozilla/mozilla/bluetooth/requestDevice/correct-uuids.html" - } - ], "mozilla/bluetooth/requestDevice/discovery-succeeds.html": [ { "path": "mozilla/bluetooth/requestDevice/discovery-succeeds.html", diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/correct-uuids.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/correct-uuids.html.ini deleted file mode 100644 index 722de77f833..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/correct-uuids.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[correct-uuids.html] - type: testharness - [We should only see UUID's that we've been given permission for.] - expected: FAIL diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/correct-uuids.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/correct-uuids.html deleted file mode 100644 index 86eee7f2307..00000000000 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/correct-uuids.html +++ /dev/null @@ -1,19 +0,0 @@ - - - - - From 4ed461c6e5e3349ec92c29c5a449b08b54503d90 Mon Sep 17 00:00:00 2001 From: zakorgyula Date: Fri, 7 Oct 2016 12:42:40 +0200 Subject: [PATCH 04/11] Accepting empty deviceName, when requesting a BluetoothDevice. --- components/bluetooth/lib.rs | 4 ++-- components/bluetooth_traits/scanfilter.rs | 12 ++++++------ components/script/dom/bluetooth.rs | 4 ++-- ...name-empty-device-from-name-empty-filter.html.ini | 4 ---- .../requestDevice/name-empty-filter.html.ini | 4 ---- ...me-missing-device-from-name-empty-filter.html.ini | 4 ---- 6 files changed, 10 insertions(+), 22 deletions(-) delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/name-empty-device-from-name-empty-filter.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/name-empty-filter.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/name-missing-device-from-name-empty-filter.html.ini diff --git a/components/bluetooth/lib.rs b/components/bluetooth/lib.rs index 998053da577..5519d74f408 100644 --- a/components/bluetooth/lib.rs +++ b/components/bluetooth/lib.rs @@ -106,8 +106,8 @@ fn matches_filter(device: &BluetoothDevice, filter: &BluetoothScanfilter) -> boo } // Step 1. - if !filter.get_name().is_empty() { - if device.get_name().ok() != Some(filter.get_name().to_string()) { + if let Some(name) = filter.get_name() { + if device.get_name().ok() != Some(name.to_string()) { return false; } } diff --git a/components/bluetooth_traits/scanfilter.rs b/components/bluetooth_traits/scanfilter.rs index b5017de72ad..4d0da1ccb0d 100644 --- a/components/bluetooth_traits/scanfilter.rs +++ b/components/bluetooth_traits/scanfilter.rs @@ -25,7 +25,7 @@ impl ServiceUUIDSequence { #[derive(Deserialize, Serialize)] pub struct BluetoothScanfilter { - name: String, + name: Option, name_prefix: String, services: ServiceUUIDSequence, manufacturer_id: Option, @@ -33,7 +33,7 @@ pub struct BluetoothScanfilter { } impl BluetoothScanfilter { - pub fn new(name: String, + pub fn new(name: Option, name_prefix: String, services: Vec, manufacturer_id: Option, @@ -48,8 +48,8 @@ impl BluetoothScanfilter { } } - pub fn get_name(&self) -> &str { - &self.name + pub fn get_name(&self) -> Option<&str> { + self.name.as_ref().map(|s| s.as_str()) } pub fn get_name_prefix(&self) -> &str { @@ -69,12 +69,12 @@ impl BluetoothScanfilter { } pub fn is_empty_or_invalid(&self) -> bool { - (self.name.is_empty() && + (self.name.is_none() && self.name_prefix.is_empty() && self.get_services().is_empty() && self.manufacturer_id.is_none() && self.service_data_uuid.is_empty()) || - self.name.len() > MAX_NAME_LENGTH || + self.get_name().unwrap_or("").len() > MAX_NAME_LENGTH || self.name_prefix.len() > MAX_NAME_LENGTH } } diff --git a/components/script/dom/bluetooth.rs b/components/script/dom/bluetooth.rs index 10809a4fd5d..144cf03a4be 100644 --- a/components/script/dom/bluetooth.rs +++ b/components/script/dom/bluetooth.rs @@ -217,9 +217,9 @@ fn canonicalize_filter(filter: &BluetoothRequestDeviceFilter) -> Fallible String::new(), + None => None, }; // Step 2.4.5. diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/name-empty-device-from-name-empty-filter.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/name-empty-device-from-name-empty-filter.html.ini deleted file mode 100644 index 1abfe05362f..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/name-empty-device-from-name-empty-filter.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[name-empty-device-from-name-empty-filter.html] - type: testharness - [An empty name device can be obtained by empty name filter.] - expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/name-empty-filter.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/name-empty-filter.html.ini deleted file mode 100644 index 9d60059908f..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/name-empty-filter.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[name-empty-filter.html] - type: testharness - [A named device is not matched by a filter with an empty name.] - expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/name-missing-device-from-name-empty-filter.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/name-missing-device-from-name-empty-filter.html.ini deleted file mode 100644 index 7737a256495..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/name-missing-device-from-name-empty-filter.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[name-missing-device-from-name-empty-filter.html] - type: testharness - [An unnamed device can not be obtained by empty name filter.] - expected: FAIL From 98f2233f2d232775150bdf0d5348efa167b10018 Mon Sep 17 00:00:00 2001 From: fokinv Date: Thu, 6 Oct 2016 13:01:53 +0200 Subject: [PATCH 05/11] Return with NotFoundError insted of TypeError, when adapter is not found. --- components/bluetooth/lib.rs | 12 ++++-------- .../requestDevice/adapter-not-present.html.ini | 4 ---- .../bluetooth/requestDevice/adapter-off.html.ini | 4 ---- 3 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/adapter-not-present.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/adapter-off.html.ini diff --git a/components/bluetooth/lib.rs b/components/bluetooth/lib.rs index 5519d74f408..69b22b60e11 100644 --- a/components/bluetooth/lib.rs +++ b/components/bluetooth/lib.rs @@ -31,10 +31,6 @@ use std::thread; use std::time::Duration; use util::thread::spawn_named; -const ADAPTER_ERROR: &'static str = "No adapter found"; - -const ADAPTER_NOT_POWERED_ERROR: &'static str = "Bluetooth adapter not powered"; - // A transaction not completed within 30 seconds shall time out. Such a transaction shall be considered to have failed. // https://www.bluetooth.org/DocMan/handlers/DownloadDoc.ashx?doc_id=286439 (Vol. 3, page 480) const MAXIMUM_TRANSACTION_TIME: u8 = 30; @@ -75,11 +71,11 @@ macro_rules! get_adapter_or_return_error( match $bl_manager.get_or_create_adapter() { Some(adapter) => { if !adapter.is_powered().unwrap_or(false) { - return drop($sender.send(Err(BluetoothError::Type(ADAPTER_NOT_POWERED_ERROR.to_string())))) + return drop($sender.send(Err(BluetoothError::NotFound))) } adapter }, - None => return drop($sender.send(Err(BluetoothError::Type(ADAPTER_ERROR.to_string())))), + None => return drop($sender.send(Err(BluetoothError::NotFound))), } ); ); @@ -701,7 +697,7 @@ impl BluetoothManager { } let mut adapter = match self.get_or_create_adapter() { Some(a) => a, - None => return drop(sender.send(Err(BluetoothError::Type(ADAPTER_ERROR.to_string())))), + None => return drop(sender.send(Err(BluetoothError::NotFound))), }; let device = match self.device_from_service_id(&service_id) { Some(device) => device, @@ -735,7 +731,7 @@ impl BluetoothManager { } let mut adapter = match self.get_or_create_adapter() { Some(a) => a, - None => return drop(sender.send(Err(BluetoothError::Type(ADAPTER_ERROR.to_string())))), + None => return drop(sender.send(Err(BluetoothError::NotFound))), }; let device = match self.device_from_service_id(&service_id) { Some(device) => device, diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/adapter-not-present.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/adapter-not-present.html.ini deleted file mode 100644 index e3387360d4a..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/adapter-not-present.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[adapter-not-present.html] - type: testharness - [Reject with NotFoundError if the adapter is not present.] - expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/adapter-off.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/adapter-off.html.ini deleted file mode 100644 index b1efda59017..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/adapter-off.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[adapter-off.html] - type: testharness - [Reject with NotFoundError if the adapter is off.] - expected: FAIL From baa024e3621fc2e8767d594836fa46987779ccfc Mon Sep 17 00:00:00 2001 From: fokinv Date: Fri, 7 Oct 2016 10:42:23 +0200 Subject: [PATCH 06/11] Return with NotFoundError when the requested deviceName/deviceNamePrefix is longer than 29 bytes. --- components/script/dom/bluetooth.rs | 7 +++---- .../max-length-for-name-in-adv-name.html.ini | 4 ---- .../max-length-for-name-in-adv-namePrefix.html.ini | 4 ---- .../unicode-max-length-for-name-in-adv-name.html.ini | 4 ---- .../unicode-max-length-for-name-in-adv-namePrefix.html.ini | 4 ---- 5 files changed, 3 insertions(+), 20 deletions(-) delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-name-in-adv-name.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-name-in-adv-namePrefix.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-name-in-adv-name.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-name-in-adv-namePrefix.html.ini diff --git a/components/script/dom/bluetooth.rs b/components/script/dom/bluetooth.rs index 144cf03a4be..e6eeb35cd2c 100644 --- a/components/script/dom/bluetooth.rs +++ b/components/script/dom/bluetooth.rs @@ -9,7 +9,7 @@ use bluetooth_traits::scanfilter::{RequestDeviceoptions, ServiceUUIDSequence}; use core::clone::Clone; use dom::bindings::codegen::Bindings::BluetoothBinding::{self, BluetoothMethods, BluetoothRequestDeviceFilter}; use dom::bindings::codegen::Bindings::BluetoothBinding::RequestDeviceOptions; -use dom::bindings::error::Error::{self, Security, Type}; +use dom::bindings::error::Error::{self, NotFound, Security, Type}; use dom::bindings::error::Fallible; use dom::bindings::js::Root; use dom::bindings::reflector::{Reflectable, Reflector, reflect_dom_object}; @@ -25,7 +25,6 @@ use std::rc::Rc; const FILTER_EMPTY_ERROR: &'static str = "'filters' member, if present, must be nonempty to find any devices."; const FILTER_ERROR: &'static str = "A filter must restrict the devices in some way."; -const FILTER_NAME_TOO_LONG_ERROR: &'static str = "A 'name' or 'namePrefix' can't be longer then 29 bytes."; // 248 is the maximum number of UTF-8 code units in a Bluetooth Device Name. const MAX_DEVICE_NAME_LENGTH: usize = 248; // A device name can never be longer than 29 bytes. @@ -213,7 +212,7 @@ fn canonicalize_filter(filter: &BluetoothRequestDeviceFilter) -> Fallible MAX_FILTER_NAME_LENGTH { - return Err(Type(FILTER_NAME_TOO_LONG_ERROR.to_owned())); + return Err(NotFound); } // Step 2.4.4.2. @@ -233,7 +232,7 @@ fn canonicalize_filter(filter: &BluetoothRequestDeviceFilter) -> Fallible MAX_FILTER_NAME_LENGTH { - return Err(Type(FILTER_NAME_TOO_LONG_ERROR.to_owned())); + return Err(NotFound); } // Step 2.4.5.2. diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-name-in-adv-name.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-name-in-adv-name.html.ini deleted file mode 100644 index fef1f01d99d..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-name-in-adv-name.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[max-length-for-name-in-adv-name.html] - type: testharness - [A device name longer than 29 must reject.] - expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-name-in-adv-namePrefix.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-name-in-adv-namePrefix.html.ini deleted file mode 100644 index 1edd39d02f3..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-name-in-adv-namePrefix.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[max-length-for-name-in-adv-namePrefix.html] - type: testharness - [A device name prefix longer than 29 must reject.] - expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-name-in-adv-name.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-name-in-adv-name.html.ini deleted file mode 100644 index 983a50d4896..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-name-in-adv-name.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[unicode-max-length-for-name-in-adv-name.html] - type: testharness - [Unicode string with utf8 representation between (29, 248\] bytes in 'name' must throw NotFoundError.] - expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-name-in-adv-namePrefix.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-name-in-adv-namePrefix.html.ini deleted file mode 100644 index b940588a8cd..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-name-in-adv-namePrefix.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[unicode-max-length-for-name-in-adv-namePrefix.html] - type: testharness - [Unicode string with utf8 representation between (29, 248\] bytes in 'namePrefix' must throw NotFoundError.] - expected: FAIL From 0eeb56b5492fb6a3cc422193e7b753bc55f3cff3 Mon Sep 17 00:00:00 2001 From: zakorgyula Date: Fri, 7 Oct 2016 13:10:17 +0200 Subject: [PATCH 07/11] Remove not allowed services when calling getPrimaryServices. --- components/bluetooth/lib.rs | 3 +++ .../getPrimaryServices/blacklisted-services.html.ini | 4 ---- .../getPrimaryServices/no-permission-present-service.html.ini | 4 ---- 3 files changed, 3 insertions(+), 8 deletions(-) delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/getPrimaryServices/blacklisted-services.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/getPrimaryServices/no-permission-present-service.html.ini diff --git a/components/bluetooth/lib.rs b/components/bluetooth/lib.rs index 69b22b60e11..55c883917f6 100644 --- a/components/bluetooth/lib.rs +++ b/components/bluetooth/lib.rs @@ -681,6 +681,9 @@ impl BluetoothManager { } } } + services_vec.retain(|s| self.allowed_services + .get(&device_id) + .map_or(false, |uuids| uuids.contains(&s.uuid))); if services_vec.is_empty() { return drop(sender.send(Err(BluetoothError::NotFound))); } diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/getPrimaryServices/blacklisted-services.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/getPrimaryServices/blacklisted-services.html.ini deleted file mode 100644 index 4cc7d7067e4..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/getPrimaryServices/blacklisted-services.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[blacklisted-services.html] - type: testharness - [Request for services. Does not return blacklisted service.] - expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/getPrimaryServices/no-permission-present-service.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/getPrimaryServices/no-permission-present-service.html.ini deleted file mode 100644 index e7abcfb7c1f..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/getPrimaryServices/no-permission-present-service.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[no-permission-present-service.html] - type: testharness - [Request for present service without permission. Reject with NotFoundError.] - expected: FAIL From dd733f6994e27a91e46fb8f9feb9a7e7179cfcda Mon Sep 17 00:00:00 2001 From: zakorgyula Date: Fri, 7 Oct 2016 14:17:51 +0200 Subject: [PATCH 08/11] Update the value of the Characteristic/Descriptor when calling writeValue. --- components/script/dom/bluetoothremotegattcharacteristic.rs | 4 ++-- components/script/dom/bluetoothremotegattdescriptor.rs | 4 ++-- .../writeValue/characteristic/write-updates-value.html.ini | 4 ---- .../writeValue/descriptor/write-updates-value.html.ini | 4 ---- 4 files changed, 4 insertions(+), 12 deletions(-) delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/writeValue/characteristic/write-updates-value.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/writeValue/descriptor/write-updates-value.html.ini diff --git a/components/script/dom/bluetoothremotegattcharacteristic.rs b/components/script/dom/bluetoothremotegattcharacteristic.rs index 16a2bde68f5..49207d09fbd 100644 --- a/components/script/dom/bluetoothremotegattcharacteristic.rs +++ b/components/script/dom/bluetoothremotegattcharacteristic.rs @@ -188,10 +188,10 @@ impl BluetoothRemoteGATTCharacteristic { } let (sender, receiver) = ipc::channel().unwrap(); self.get_bluetooth_thread().send( - BluetoothMethodMsg::WriteValue(self.get_instance_id(), value, sender)).unwrap(); + BluetoothMethodMsg::WriteValue(self.get_instance_id(), value.clone(), sender)).unwrap(); let result = receiver.recv().unwrap(); match result { - Ok(_) => Ok(()), + Ok(_) => Ok(*self.value.borrow_mut() = Some(ByteString::new(value))), Err(error) => { Err(Error::from(error)) }, diff --git a/components/script/dom/bluetoothremotegattdescriptor.rs b/components/script/dom/bluetoothremotegattdescriptor.rs index 5ca51f45439..c7e64b7305c 100644 --- a/components/script/dom/bluetoothremotegattdescriptor.rs +++ b/components/script/dom/bluetoothremotegattdescriptor.rs @@ -105,10 +105,10 @@ impl BluetoothRemoteGATTDescriptor { } let (sender, receiver) = ipc::channel().unwrap(); self.get_bluetooth_thread().send( - BluetoothMethodMsg::WriteValue(self.get_instance_id(), value, sender)).unwrap(); + BluetoothMethodMsg::WriteValue(self.get_instance_id(), value.clone(), sender)).unwrap(); let result = receiver.recv().unwrap(); match result { - Ok(_) => Ok(()), + Ok(_) => Ok(*self.value.borrow_mut() = Some(ByteString::new(value))), Err(error) => { Err(Error::from(error)) }, diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/writeValue/characteristic/write-updates-value.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/writeValue/characteristic/write-updates-value.html.ini deleted file mode 100644 index a61aadb0883..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/writeValue/characteristic/write-updates-value.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[write-updates-value.html] - type: testharness - [A regular write request to a writable characteristic should update value.] - expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/writeValue/descriptor/write-updates-value.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/writeValue/descriptor/write-updates-value.html.ini deleted file mode 100644 index f96edea6781..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/writeValue/descriptor/write-updates-value.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[write-updates-value.html] - type: testharness - [A regular write request to a writable descriptor should update value.] - expected: FAIL From d30bcbd33948f41fc3389f8105885060fd7541a5 Mon Sep 17 00:00:00 2001 From: fokinv Date: Mon, 10 Oct 2016 09:35:59 +0200 Subject: [PATCH 09/11] Blacklisted items are removed when calling getServices/Characteristics/Descriptors. --- components/bluetooth/lib.rs | 7 ++++++- components/bluetooth_traits/Cargo.toml | 2 ++ .../blacklist.rs} | 0 components/bluetooth_traits/lib.rs | 3 +++ components/script/dom/bluetooth.rs | 2 +- components/script/dom/bluetoothremotegattcharacteristic.rs | 2 +- components/script/dom/bluetoothremotegattdescriptor.rs | 2 +- components/script/dom/bluetoothremotegattserver.rs | 2 +- components/script/dom/bluetoothremotegattservice.rs | 2 +- components/script/lib.rs | 1 - components/servo/Cargo.lock | 2 ++ ports/cef/Cargo.lock | 2 ++ .../blacklisted-characteristics.html.ini | 4 ---- .../getDescriptors/blacklisted-descriptors.html.ini | 4 ---- 14 files changed, 20 insertions(+), 15 deletions(-) rename components/{script/bluetooth_blacklist.rs => bluetooth_traits/blacklist.rs} (100%) delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/getCharacteristics/blacklisted-characteristics.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/getDescriptors/blacklisted-descriptors.html.ini diff --git a/components/bluetooth/lib.rs b/components/bluetooth/lib.rs index 55c883917f6..f01332fe01b 100644 --- a/components/bluetooth/lib.rs +++ b/components/bluetooth/lib.rs @@ -19,6 +19,7 @@ use bluetooth_traits::{BluetoothCharacteristicMsg, BluetoothCharacteristicsMsg}; use bluetooth_traits::{BluetoothDescriptorMsg, BluetoothDescriptorsMsg}; use bluetooth_traits::{BluetoothDeviceMsg, BluetoothError, BluetoothMethodMsg}; use bluetooth_traits::{BluetoothResult, BluetoothServiceMsg, BluetoothServicesMsg}; +use bluetooth_traits::blacklist::{uuid_is_blacklisted, Blacklist}; use bluetooth_traits::scanfilter::{BluetoothScanfilter, BluetoothScanfilterSequence, RequestDeviceoptions}; use device::bluetooth::{BluetoothAdapter, BluetoothDevice, BluetoothGATTCharacteristic}; use device::bluetooth::{BluetoothGATTDescriptor, BluetoothGATTService}; @@ -681,7 +682,8 @@ impl BluetoothManager { } } } - services_vec.retain(|s| self.allowed_services + services_vec.retain(|s| !uuid_is_blacklisted(&s.uuid, Blacklist::All) && + self.allowed_services .get(&device_id) .map_or(false, |uuids| uuids.contains(&s.uuid))); if services_vec.is_empty() { @@ -758,6 +760,7 @@ impl BluetoothManager { if let Some(uuid) = uuid { services_vec.retain(|ref s| s.uuid == uuid); } + services_vec.retain(|s| !uuid_is_blacklisted(&s.uuid, Blacklist::All)); if services_vec.is_empty() { return drop(sender.send(Err(BluetoothError::NotFound))); } @@ -834,6 +837,7 @@ impl BluetoothManager { }); } } + characteristics_vec.retain(|c| !uuid_is_blacklisted(&c.uuid, Blacklist::All)); if characteristics_vec.is_empty() { return drop(sender.send(Err(BluetoothError::NotFound))); } @@ -888,6 +892,7 @@ impl BluetoothManager { }); } } + descriptors_vec.retain(|d| !uuid_is_blacklisted(&d.uuid, Blacklist::All)); if descriptors_vec.is_empty() { return drop(sender.send(Err(BluetoothError::NotFound))); } diff --git a/components/bluetooth_traits/Cargo.toml b/components/bluetooth_traits/Cargo.toml index c562d679a38..5ac8057c2b2 100644 --- a/components/bluetooth_traits/Cargo.toml +++ b/components/bluetooth_traits/Cargo.toml @@ -11,5 +11,7 @@ path = "lib.rs" [dependencies] ipc-channel = "0.5" +regex = "0.1.43" serde = "0.8" serde_derive = "0.8" +util = {path = "../util"} diff --git a/components/script/bluetooth_blacklist.rs b/components/bluetooth_traits/blacklist.rs similarity index 100% rename from components/script/bluetooth_blacklist.rs rename to components/bluetooth_traits/blacklist.rs diff --git a/components/bluetooth_traits/lib.rs b/components/bluetooth_traits/lib.rs index cea2a7b7a33..d93ff4109f7 100644 --- a/components/bluetooth_traits/lib.rs +++ b/components/bluetooth_traits/lib.rs @@ -5,9 +5,12 @@ #![feature(proc_macro)] extern crate ipc_channel; +extern crate regex; #[macro_use] extern crate serde_derive; +extern crate util; +pub mod blacklist; pub mod scanfilter; use ipc_channel::ipc::IpcSender; diff --git a/components/script/dom/bluetooth.rs b/components/script/dom/bluetooth.rs index e6eeb35cd2c..3325ef150fe 100644 --- a/components/script/dom/bluetooth.rs +++ b/components/script/dom/bluetooth.rs @@ -2,8 +2,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use bluetooth_blacklist::{Blacklist, uuid_is_blacklisted}; use bluetooth_traits::{BluetoothError, BluetoothMethodMsg}; +use bluetooth_traits::blacklist::{Blacklist, uuid_is_blacklisted}; use bluetooth_traits::scanfilter::{BluetoothScanfilter, BluetoothScanfilterSequence}; use bluetooth_traits::scanfilter::{RequestDeviceoptions, ServiceUUIDSequence}; use core::clone::Clone; diff --git a/components/script/dom/bluetoothremotegattcharacteristic.rs b/components/script/dom/bluetoothremotegattcharacteristic.rs index 49207d09fbd..299ef921ee6 100644 --- a/components/script/dom/bluetoothremotegattcharacteristic.rs +++ b/components/script/dom/bluetoothremotegattcharacteristic.rs @@ -2,8 +2,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use bluetooth_blacklist::{Blacklist, uuid_is_blacklisted}; use bluetooth_traits::BluetoothMethodMsg; +use bluetooth_traits::blacklist::{Blacklist, uuid_is_blacklisted}; use dom::bindings::cell::DOMRefCell; use dom::bindings::codegen::Bindings::BluetoothCharacteristicPropertiesBinding:: BluetoothCharacteristicPropertiesMethods; diff --git a/components/script/dom/bluetoothremotegattdescriptor.rs b/components/script/dom/bluetoothremotegattdescriptor.rs index c7e64b7305c..30886baf473 100644 --- a/components/script/dom/bluetoothremotegattdescriptor.rs +++ b/components/script/dom/bluetoothremotegattdescriptor.rs @@ -2,8 +2,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use bluetooth_blacklist::{Blacklist, uuid_is_blacklisted}; use bluetooth_traits::BluetoothMethodMsg; +use bluetooth_traits::blacklist::{Blacklist, uuid_is_blacklisted}; use dom::bindings::cell::DOMRefCell; use dom::bindings::codegen::Bindings::BluetoothDeviceBinding::BluetoothDeviceMethods; use dom::bindings::codegen::Bindings::BluetoothRemoteGATTCharacteristicBinding:: diff --git a/components/script/dom/bluetoothremotegattserver.rs b/components/script/dom/bluetoothremotegattserver.rs index 3aafc788710..3499e431f1c 100644 --- a/components/script/dom/bluetoothremotegattserver.rs +++ b/components/script/dom/bluetoothremotegattserver.rs @@ -2,8 +2,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use bluetooth_blacklist::{Blacklist, uuid_is_blacklisted}; use bluetooth_traits::BluetoothMethodMsg; +use bluetooth_traits::blacklist::{Blacklist, uuid_is_blacklisted}; use dom::bindings::codegen::Bindings::BluetoothDeviceBinding::BluetoothDeviceMethods; use dom::bindings::codegen::Bindings::BluetoothRemoteGATTServerBinding; use dom::bindings::codegen::Bindings::BluetoothRemoteGATTServerBinding::BluetoothRemoteGATTServerMethods; diff --git a/components/script/dom/bluetoothremotegattservice.rs b/components/script/dom/bluetoothremotegattservice.rs index a8c8265c3fd..cd7c6ab4366 100644 --- a/components/script/dom/bluetoothremotegattservice.rs +++ b/components/script/dom/bluetoothremotegattservice.rs @@ -2,8 +2,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use bluetooth_blacklist::{Blacklist, uuid_is_blacklisted}; use bluetooth_traits::BluetoothMethodMsg; +use bluetooth_traits::blacklist::{Blacklist, uuid_is_blacklisted}; use dom::bindings::codegen::Bindings::BluetoothDeviceBinding::BluetoothDeviceMethods; use dom::bindings::codegen::Bindings::BluetoothRemoteGATTServerBinding::BluetoothRemoteGATTServerMethods; use dom::bindings::codegen::Bindings::BluetoothRemoteGATTServiceBinding; diff --git a/components/script/lib.rs b/components/script/lib.rs index d847af7b62f..94e9683ffaf 100644 --- a/components/script/lib.rs +++ b/components/script/lib.rs @@ -96,7 +96,6 @@ extern crate webrender_traits; extern crate websocket; extern crate xml5ever; -pub mod bluetooth_blacklist; mod body; pub mod clipboard_provider; mod devtools; diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 3ae065e88eb..3bb4d5205b5 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -207,8 +207,10 @@ name = "bluetooth_traits" version = "0.0.1" dependencies = [ "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 0.1.76 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", + "util 0.0.1", ] [[package]] diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index a0e1dc4b6f7..608fad2789d 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -178,8 +178,10 @@ name = "bluetooth_traits" version = "0.0.1" dependencies = [ "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 0.1.76 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)", + "util 0.0.1", ] [[package]] diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/getCharacteristics/blacklisted-characteristics.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/getCharacteristics/blacklisted-characteristics.html.ini deleted file mode 100644 index 0361a4f320d..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/getCharacteristics/blacklisted-characteristics.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[blacklisted-characteristics.html] - type: testharness - [The Device Information service is composed of blacklisted characteristics so we shouldn't find any.] - expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/getDescriptors/blacklisted-descriptors.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/getDescriptors/blacklisted-descriptors.html.ini deleted file mode 100644 index 45cb3b6e316..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/getDescriptors/blacklisted-descriptors.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[blacklisted-descriptors.html] - type: testharness - [The descriptors are blacklisted.] - expected: FAIL From e8c1c98a77dd64a902a4941a8889b9bd5603ce2d Mon Sep 17 00:00:00 2001 From: zakorgyula Date: Fri, 7 Oct 2016 16:17:11 +0200 Subject: [PATCH 10/11] Return the same JS object for the same Bluetooth item. --- components/script/dom/bluetooth.rs | 46 ++++++-- components/script/dom/bluetoothdevice.rs | 16 ++- .../dom/bluetoothremotegattcharacteristic.rs | 40 +++++-- .../script/dom/bluetoothremotegattserver.rs | 44 +++++-- .../script/dom/bluetoothremotegattservice.rs | 109 ++++++++++++------ .../get-same-characteristic.html.ini | 4 - .../get-same-characteristics.html.ini | 4 - .../get-same-descriptor.html.ini | 4 - .../get-same-descriptors.html.ini | 4 - .../get-same-service.html.ini | 4 - .../get-same-service.html.ini | 4 - .../requestDevice/same-device.html.ini | 4 - 12 files changed, 190 insertions(+), 93 deletions(-) delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/getCharacteristic/get-same-characteristic.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/getCharacteristics/get-same-characteristics.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/getDescriptor/get-same-descriptor.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/getDescriptors/get-same-descriptors.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/getPrimaryService/get-same-service.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/getPrimaryServices/get-same-service.html.ini delete mode 100644 tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/same-device.html.ini diff --git a/components/script/dom/bluetooth.rs b/components/script/dom/bluetooth.rs index 3325ef150fe..7080a38668b 100644 --- a/components/script/dom/bluetooth.rs +++ b/components/script/dom/bluetooth.rs @@ -7,20 +7,25 @@ use bluetooth_traits::blacklist::{Blacklist, uuid_is_blacklisted}; use bluetooth_traits::scanfilter::{BluetoothScanfilter, BluetoothScanfilterSequence}; use bluetooth_traits::scanfilter::{RequestDeviceoptions, ServiceUUIDSequence}; use core::clone::Clone; +use dom::bindings::cell::DOMRefCell; use dom::bindings::codegen::Bindings::BluetoothBinding::{self, BluetoothMethods, BluetoothRequestDeviceFilter}; use dom::bindings::codegen::Bindings::BluetoothBinding::RequestDeviceOptions; use dom::bindings::error::Error::{self, NotFound, Security, Type}; use dom::bindings::error::Fallible; -use dom::bindings::js::Root; +use dom::bindings::js::{JS, MutHeap, Root}; use dom::bindings::reflector::{Reflectable, Reflector, reflect_dom_object}; use dom::bindings::str::DOMString; use dom::bluetoothadvertisingdata::BluetoothAdvertisingData; use dom::bluetoothdevice::BluetoothDevice; +use dom::bluetoothremotegattcharacteristic::BluetoothRemoteGATTCharacteristic; +use dom::bluetoothremotegattdescriptor::BluetoothRemoteGATTDescriptor; +use dom::bluetoothremotegattservice::BluetoothRemoteGATTService; use dom::bluetoothuuid::{BluetoothServiceUUID, BluetoothUUID}; use dom::globalscope::GlobalScope; use dom::promise::Promise; use ipc_channel::ipc::{self, IpcSender}; use js::conversions::ToJSValConvertible; +use std::collections::HashMap; use std::rc::Rc; const FILTER_EMPTY_ERROR: &'static str = "'filters' member, if present, must be nonempty to find any devices."; @@ -42,12 +47,20 @@ const OPTIONS_ERROR: &'static str = "Fields of 'options' conflict with each othe #[dom_struct] pub struct Bluetooth { reflector_: Reflector, + device_instance_map: DOMRefCell>>>, + service_instance_map: DOMRefCell>>>, + characteristic_instance_map: DOMRefCell>>>, + descriptor_instance_map: DOMRefCell>>>, } impl Bluetooth { pub fn new_inherited() -> Bluetooth { Bluetooth { reflector_: Reflector::new(), + device_instance_map: DOMRefCell::new(HashMap::new()), + service_instance_map: DOMRefCell::new(HashMap::new()), + characteristic_instance_map: DOMRefCell::new(HashMap::new()), + descriptor_instance_map: DOMRefCell::new(HashMap::new()), } } @@ -57,6 +70,19 @@ impl Bluetooth { BluetoothBinding::Wrap) } + pub fn get_service_map(&self) -> &DOMRefCell>>> { + &self.service_instance_map + } + + pub fn get_characteristic_map(&self) + -> &DOMRefCell>>> { + &self.characteristic_instance_map + } + + pub fn get_descriptor_map(&self) -> &DOMRefCell>>> { + &self.descriptor_instance_map + } + fn get_bluetooth_thread(&self) -> IpcSender { self.global().as_window().bluetooth_thread() } @@ -102,15 +128,21 @@ impl Bluetooth { // Step 12-13. match device { Ok(device) => { - let global = self.global(); - let ad_data = BluetoothAdvertisingData::new(&global, + let mut device_instance_map = self.device_instance_map.borrow_mut(); + if let Some(existing_device) = device_instance_map.get(&device.id.clone()) { + return Ok(existing_device.get()); + } + let ad_data = BluetoothAdvertisingData::new(&self.global(), device.appearance, device.tx_power, device.rssi); - Ok(BluetoothDevice::new(&global, - DOMString::from(device.id), - device.name.map(DOMString::from), - &ad_data)) + let bt_device = BluetoothDevice::new(&self.global(), + DOMString::from(device.id.clone()), + device.name.map(DOMString::from), + &ad_data, + &self); + device_instance_map.insert(device.id, MutHeap::new(&bt_device)); + Ok(bt_device) }, Err(error) => { Err(Error::from(error)) diff --git a/components/script/dom/bluetoothdevice.rs b/components/script/dom/bluetoothdevice.rs index f4348465108..39706befad6 100644 --- a/components/script/dom/bluetoothdevice.rs +++ b/components/script/dom/bluetoothdevice.rs @@ -7,6 +7,7 @@ use dom::bindings::codegen::Bindings::BluetoothDeviceBinding::BluetoothDeviceMet use dom::bindings::js::{JS, Root, MutHeap, MutNullableHeap}; use dom::bindings::reflector::{Reflectable, Reflector, reflect_dom_object}; use dom::bindings::str::DOMString; +use dom::bluetooth::Bluetooth; use dom::bluetoothadvertisingdata::BluetoothAdvertisingData; use dom::bluetoothremotegattserver::BluetoothRemoteGATTServer; use dom::globalscope::GlobalScope; @@ -19,12 +20,14 @@ pub struct BluetoothDevice { name: Option, ad_data: MutHeap>, gatt: MutNullableHeap>, + context: MutHeap>, } impl BluetoothDevice { pub fn new_inherited(id: DOMString, name: Option, - ad_data: &BluetoothAdvertisingData) + ad_data: &BluetoothAdvertisingData, + context: &Bluetooth) -> BluetoothDevice { BluetoothDevice { reflector_: Reflector::new(), @@ -32,20 +35,27 @@ impl BluetoothDevice { name: name, ad_data: MutHeap::new(ad_data), gatt: Default::default(), + context: MutHeap::new(context), } } pub fn new(global: &GlobalScope, id: DOMString, name: Option, - adData: &BluetoothAdvertisingData) + adData: &BluetoothAdvertisingData, + context: &Bluetooth) -> Root { reflect_dom_object(box BluetoothDevice::new_inherited(id, name, - adData), + adData, + context), global, BluetoothDeviceBinding::Wrap) } + + pub fn get_context(&self) -> Root { + self.context.get() + } } impl BluetoothDeviceMethods for BluetoothDevice { diff --git a/components/script/dom/bluetoothremotegattcharacteristic.rs b/components/script/dom/bluetoothremotegattcharacteristic.rs index 299ef921ee6..1b2a16c1a4b 100644 --- a/components/script/dom/bluetoothremotegattcharacteristic.rs +++ b/components/script/dom/bluetoothremotegattcharacteristic.rs @@ -96,10 +96,17 @@ impl BluetoothRemoteGATTCharacteristic { let descriptor = receiver.recv().unwrap(); match descriptor { Ok(descriptor) => { - Ok(BluetoothRemoteGATTDescriptor::new(&self.global(), - self, - DOMString::from(descriptor.uuid), - descriptor.instance_id)) + let context = self.service.get().get_device().get_context(); + let mut descriptor_map = context.get_descriptor_map().borrow_mut(); + if let Some(existing_descriptor) = descriptor_map.get(&descriptor.instance_id) { + return Ok(existing_descriptor.get()); + } + let bt_descriptor = BluetoothRemoteGATTDescriptor::new(&self.global(), + self, + DOMString::from(descriptor.uuid), + descriptor.instance_id.clone()); + descriptor_map.insert(descriptor.instance_id, MutHeap::new(&bt_descriptor)); + Ok(bt_descriptor) }, Err(error) => { Err(Error::from(error)) @@ -123,18 +130,31 @@ impl BluetoothRemoteGATTCharacteristic { if !self.Service().Device().Gatt().Connected() { return Err(Network) } + let mut descriptors = vec!(); let (sender, receiver) = ipc::channel().unwrap(); self.get_bluetooth_thread().send( BluetoothMethodMsg::GetDescriptors(self.get_instance_id(), uuid, sender)).unwrap(); let descriptors_vec = receiver.recv().unwrap(); match descriptors_vec { Ok(descriptor_vec) => { - Ok(descriptor_vec.into_iter() - .map(|desc| BluetoothRemoteGATTDescriptor::new(&self.global(), - self, - DOMString::from(desc.uuid), - desc.instance_id)) - .collect()) + let context = self.service.get().get_device().get_context(); + let mut descriptor_map = context.get_descriptor_map().borrow_mut(); + for descriptor in descriptor_vec { + let bt_descriptor = match descriptor_map.get(&descriptor.instance_id) { + Some(existing_descriptor) => existing_descriptor.get(), + None => { + BluetoothRemoteGATTDescriptor::new(&self.global(), + self, + DOMString::from(descriptor.uuid), + descriptor.instance_id.clone()) + }, + }; + if !descriptor_map.contains_key(&descriptor.instance_id) { + descriptor_map.insert(descriptor.instance_id, MutHeap::new(&bt_descriptor)); + } + descriptors.push(bt_descriptor); + } + Ok(descriptors) }, Err(error) => { Err(Error::from(error)) diff --git a/components/script/dom/bluetoothremotegattserver.rs b/components/script/dom/bluetoothremotegattserver.rs index 3499e431f1c..9ac1ca4c4f4 100644 --- a/components/script/dom/bluetoothremotegattserver.rs +++ b/components/script/dom/bluetoothremotegattserver.rs @@ -81,11 +81,18 @@ impl BluetoothRemoteGATTServer { let service = receiver.recv().unwrap(); match service { Ok(service) => { - Ok(BluetoothRemoteGATTService::new(&self.global(), - &self.device.get(), - DOMString::from(service.uuid), - service.is_primary, - service.instance_id)) + let context = self.device.get().get_context(); + let mut service_map = context.get_service_map().borrow_mut(); + if let Some(existing_service) = service_map.get(&service.instance_id) { + return Ok(existing_service.get()); + } + let bt_service = BluetoothRemoteGATTService::new(&self.global(), + &self.device.get(), + DOMString::from(service.uuid), + service.is_primary, + service.instance_id.clone()); + service_map.insert(service.instance_id, MutHeap::new(&bt_service)); + Ok(bt_service) }, Err(error) => { Err(Error::from(error)) @@ -109,19 +116,32 @@ impl BluetoothRemoteGATTServer { if !self.Device().Gatt().Connected() { return Err(Network) } + let mut services = vec!(); let (sender, receiver) = ipc::channel().unwrap(); self.get_bluetooth_thread().send( BluetoothMethodMsg::GetPrimaryServices(String::from(self.Device().Id()), uuid, sender)).unwrap(); let services_vec = receiver.recv().unwrap(); match services_vec { Ok(service_vec) => { - Ok(service_vec.into_iter() - .map(|service| BluetoothRemoteGATTService::new(&self.global(), - &self.device.get(), - DOMString::from(service.uuid), - service.is_primary, - service.instance_id)) - .collect()) + let context = self.device.get().get_context(); + let mut service_map = context.get_service_map().borrow_mut(); + for service in service_vec { + let bt_service = match service_map.get(&service.instance_id) { + Some(existing_service) => existing_service.get(), + None => { + BluetoothRemoteGATTService::new(&self.global(), + &self.device.get(), + DOMString::from(service.uuid), + service.is_primary, + service.instance_id.clone()) + }, + }; + if !service_map.contains_key(&service.instance_id) { + service_map.insert(service.instance_id, MutHeap::new(&bt_service)); + } + services.push(bt_service); + } + Ok(services) }, Err(error) => { Err(Error::from(error)) diff --git a/components/script/dom/bluetoothremotegattservice.rs b/components/script/dom/bluetoothremotegattservice.rs index cd7c6ab4366..c597338e1ba 100644 --- a/components/script/dom/bluetoothremotegattservice.rs +++ b/components/script/dom/bluetoothremotegattservice.rs @@ -62,6 +62,10 @@ impl BluetoothRemoteGATTService { BluetoothRemoteGATTServiceBinding::Wrap) } + pub fn get_device(&self) -> Root { + self.device.get() + } + fn get_bluetooth_thread(&self) -> IpcSender { self.global().as_window().bluetooth_thread() } @@ -87,6 +91,11 @@ impl BluetoothRemoteGATTService { let characteristic = receiver.recv().unwrap(); match characteristic { Ok(characteristic) => { + let context = self.device.get().get_context(); + let mut characteristic_map = context.get_characteristic_map().borrow_mut(); + if let Some(existing_characteristic) = characteristic_map.get(&characteristic.instance_id) { + return Ok(existing_characteristic.get()); + } let global = self.global(); let properties = BluetoothCharacteristicProperties::new(&global, characteristic.broadcast, @@ -98,11 +107,13 @@ impl BluetoothRemoteGATTService { characteristic.authenticated_signed_writes, characteristic.reliable_write, characteristic.writable_auxiliaries); - Ok(BluetoothRemoteGATTCharacteristic::new(&global, - self, - DOMString::from(characteristic.uuid), - &properties, - characteristic.instance_id)) + let bt_characteristic = BluetoothRemoteGATTCharacteristic::new(&global, + self, + DOMString::from(characteristic.uuid), + &properties, + characteristic.instance_id.clone()); + characteristic_map.insert(characteristic.instance_id, MutHeap::new(&bt_characteristic)); + Ok(bt_characteristic) }, Err(error) => { Err(Error::from(error)) @@ -133,23 +144,35 @@ impl BluetoothRemoteGATTService { let characteristics_vec = receiver.recv().unwrap(); match characteristics_vec { Ok(characteristic_vec) => { + let context = self.device.get().get_context(); + let mut characteristic_map = context.get_characteristic_map().borrow_mut(); for characteristic in characteristic_vec { - let global = self.global(); - let properties = BluetoothCharacteristicProperties::new(&global, - characteristic.broadcast, - characteristic.read, - characteristic.write_without_response, - characteristic.write, - characteristic.notify, - characteristic.indicate, - characteristic.authenticated_signed_writes, - characteristic.reliable_write, - characteristic.writable_auxiliaries); - characteristics.push(BluetoothRemoteGATTCharacteristic::new(&global, - self, - DOMString::from(characteristic.uuid), - &properties, - characteristic.instance_id)); + let bt_characteristic = match characteristic_map.get(&characteristic.instance_id) { + Some(existing_characteristic) => existing_characteristic.get(), + None => { + let properties = + BluetoothCharacteristicProperties::new(&self.global(), + characteristic.broadcast, + characteristic.read, + characteristic.write_without_response, + characteristic.write, + characteristic.notify, + characteristic.indicate, + characteristic.authenticated_signed_writes, + characteristic.reliable_write, + characteristic.writable_auxiliaries); + + BluetoothRemoteGATTCharacteristic::new(&self.global(), + self, + DOMString::from(characteristic.uuid), + &properties, + characteristic.instance_id.clone()) + }, + }; + if !characteristic_map.contains_key(&characteristic.instance_id) { + characteristic_map.insert(characteristic.instance_id, MutHeap::new(&bt_characteristic)); + } + characteristics.push(bt_characteristic); } Ok(characteristics) }, @@ -178,11 +201,18 @@ impl BluetoothRemoteGATTService { let service = receiver.recv().unwrap(); match service { Ok(service) => { - Ok(BluetoothRemoteGATTService::new(&self.global(), - &self.device.get(), - DOMString::from(service.uuid), - service.is_primary, - service.instance_id)) + let context = self.device.get().get_context(); + let mut service_map = context.get_service_map().borrow_mut(); + if let Some(existing_service) = service_map.get(&service.instance_id) { + return Ok(existing_service.get()); + } + let bt_service = BluetoothRemoteGATTService::new(&self.global(), + &self.device.get(), + DOMString::from(service.uuid), + service.is_primary, + service.instance_id.clone()); + service_map.insert(service.instance_id, MutHeap::new(&bt_service)); + Ok(bt_service) }, Err(error) => { Err(Error::from(error)) @@ -212,15 +242,28 @@ impl BluetoothRemoteGATTService { uuid, sender)).unwrap(); let services_vec = receiver.recv().unwrap(); + let mut services = vec!(); match services_vec { Ok(service_vec) => { - Ok(service_vec.into_iter() - .map(|service| BluetoothRemoteGATTService::new(&self.global(), - &self.device.get(), - DOMString::from(service.uuid), - service.is_primary, - service.instance_id)) - .collect()) + let context = self.device.get().get_context(); + let mut service_map = context.get_service_map().borrow_mut(); + for service in service_vec { + let bt_service = match service_map.get(&service.instance_id) { + Some(existing_service) => existing_service.get(), + None => { + BluetoothRemoteGATTService::new(&self.global(), + &self.device.get(), + DOMString::from(service.uuid), + service.is_primary, + service.instance_id.clone()) + }, + }; + if !service_map.contains_key(&service.instance_id) { + service_map.insert(service.instance_id, MutHeap::new(&bt_service)); + } + services.push(bt_service); + } + Ok(services) }, Err(error) => { Err(Error::from(error)) diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/getCharacteristic/get-same-characteristic.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/getCharacteristic/get-same-characteristic.html.ini deleted file mode 100644 index f8695a4fbd3..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/getCharacteristic/get-same-characteristic.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[get-same-characteristic.html] - type: testharness - [Calls to get the same characteristic should return the same object.] - expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/getCharacteristics/get-same-characteristics.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/getCharacteristics/get-same-characteristics.html.ini deleted file mode 100644 index a18e6fe0a04..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/getCharacteristics/get-same-characteristics.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[get-same-characteristics.html] - type: testharness - [Calls to get the same characteristics should return the same objects.] - expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/getDescriptor/get-same-descriptor.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/getDescriptor/get-same-descriptor.html.ini deleted file mode 100644 index 135888ec1b1..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/getDescriptor/get-same-descriptor.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[get-same-descriptor.html] - type: testharness - [Calls to get the same descriptor should return the same object.] - expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/getDescriptors/get-same-descriptors.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/getDescriptors/get-same-descriptors.html.ini deleted file mode 100644 index 4b1fcfa08bf..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/getDescriptors/get-same-descriptors.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[get-same-descriptors.html] - type: testharness - [Calls to get the same descriptor should return the same object.] - expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/getPrimaryService/get-same-service.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/getPrimaryService/get-same-service.html.ini deleted file mode 100644 index d0a29707776..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/getPrimaryService/get-same-service.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[get-same-service.html] - type: testharness - [Calls to get the same service should return the same object.] - expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/getPrimaryServices/get-same-service.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/getPrimaryServices/get-same-service.html.ini deleted file mode 100644 index d0a29707776..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/getPrimaryServices/get-same-service.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[get-same-service.html] - type: testharness - [Calls to get the same service should return the same object.] - expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/same-device.html.ini b/tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/same-device.html.ini deleted file mode 100644 index cadf49ab858..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/bluetooth/requestDevice/same-device.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[same-device.html] - type: testharness - [Returned device should always be the same.] - expected: FAIL From 91a0c4d50da7df38e2902e29fbec699e34ee892b Mon Sep 17 00:00:00 2001 From: zakorgyula Date: Mon, 7 Nov 2016 15:06:16 +0100 Subject: [PATCH 11/11] Move bluetooth-helper.js --- .../tests/mozilla}/bluetooth/bluetooth-helpers.js | 0 .../tests/mozilla/bluetooth/connect/connection-succeeds.html | 2 +- .../mozilla/bluetooth/connect/device-goes-out-of-range.html | 2 +- .../tests/mozilla/bluetooth/connect/get-same-gatt-server.html | 2 +- .../mozilla/bluetooth/disconnect/connect-disconnect-twice.html | 2 +- .../tests/mozilla/bluetooth/disconnect/disconnect-once.html | 2 +- .../mozilla/bluetooth/disconnect/disconnect-twice-in-a-row.html | 2 +- .../bluetooth/getCharacteristic/blacklisted-characteristic.html | 2 +- .../bluetooth/getCharacteristic/characteristic-found.html | 2 +- .../bluetooth/getCharacteristic/characteristic-not-found.html | 2 +- .../bluetooth/getCharacteristic/device-goes-out-of-range.html | 2 +- .../bluetooth/getCharacteristic/disconnect-called-before.html | 2 +- .../bluetooth/getCharacteristic/disconnect-called-during.html | 2 +- .../bluetooth/getCharacteristic/get-same-characteristic.html | 2 +- .../getCharacteristic/invalid-characteristic-name.html | 2 +- .../mozilla/bluetooth/getCharacteristic/service-is-removed.html | 2 +- .../blacklisted-characteristics-with-uuid.html | 2 +- .../getCharacteristics/blacklisted-characteristics.html | 2 +- .../getCharacteristics/characteristics-found-with-uuid.html | 2 +- .../bluetooth/getCharacteristics/characteristics-found.html | 2 +- .../getCharacteristics/characteristics-not-found-with-uuid.html | 2 +- .../bluetooth/getCharacteristics/characteristics-not-found.html | 2 +- .../bluetooth/getCharacteristics/correct-characteristics.html | 2 +- .../getCharacteristics/device-goes-out-of-range-with-uuid.html | 2 +- .../bluetooth/getCharacteristics/device-goes-out-of-range.html | 2 +- .../getCharacteristics/disconnect-called-before-with-uuid.html | 2 +- .../bluetooth/getCharacteristics/disconnect-called-before.html | 2 +- .../getCharacteristics/disconnect-called-during-with-uuid.html | 2 +- .../bluetooth/getCharacteristics/disconnect-called-during.html | 2 +- .../bluetooth/getCharacteristics/get-same-characteristics.html | 2 +- .../getCharacteristics/invalid-characteristic-name.html | 2 +- .../getCharacteristics/service-is-removed-with-uuid.html | 2 +- .../bluetooth/getCharacteristics/service-is-removed.html | 2 +- .../mozilla/bluetooth/getDescriptor/blacklisted-descriptor.html | 2 +- .../bluetooth/getDescriptor/characteristic-is-removed.html | 2 +- .../tests/mozilla/bluetooth/getDescriptor/descriptor-found.html | 2 +- .../mozilla/bluetooth/getDescriptor/descriptor-not-found.html | 2 +- .../bluetooth/getDescriptor/device-goes-out-of-range.html | 2 +- .../bluetooth/getDescriptor/disconnect-called-before.html | 2 +- .../bluetooth/getDescriptor/disconnect-called-during.html | 2 +- .../mozilla/bluetooth/getDescriptor/get-same-descriptor.html | 2 +- .../bluetooth/getDescriptor/invalid-descriptor-name.html | 2 +- .../getDescriptors/blacklisted-descriptors-with-uuid.html | 2 +- .../bluetooth/getDescriptors/blacklisted-descriptors.html | 2 +- .../getDescriptors/characteristic-is-removed-with-uuid.html | 2 +- .../bluetooth/getDescriptors/characteristic-is-removed.html | 2 +- .../mozilla/bluetooth/getDescriptors/correct-descriptors.html | 2 +- .../bluetooth/getDescriptors/descriptors-found-with-uuid.html | 2 +- .../mozilla/bluetooth/getDescriptors/descriptors-found.html | 2 +- .../getDescriptors/descriptors-not-found-with-uuid.html | 2 +- .../mozilla/bluetooth/getDescriptors/descriptors-not-found.html | 2 +- .../getDescriptors/device-goes-out-of-range-with-uuid.html | 2 +- .../bluetooth/getDescriptors/device-goes-out-of-range.html | 2 +- .../getDescriptors/disconnect-called-before-with-uuid.html | 2 +- .../bluetooth/getDescriptors/disconnect-called-before.html | 2 +- .../getDescriptors/disconnect-called-during-with-uuid.html | 2 +- .../bluetooth/getDescriptors/disconnect-called-during.html | 2 +- .../mozilla/bluetooth/getDescriptors/get-same-descriptors.html | 2 +- .../bluetooth/getDescriptors/invalid-descriptor-name.html | 2 +- .../bluetooth/getPrimaryService/device-goes-out-of-range.html | 2 +- .../bluetooth/getPrimaryService/disconnect-called-before.html | 2 +- .../bluetooth/getPrimaryService/disconnect-called-during.html | 2 +- .../bluetooth/getPrimaryService/disconnected-device.html | 2 +- .../mozilla/bluetooth/getPrimaryService/get-same-service.html | 2 +- .../bluetooth/getPrimaryService/invalid-service-name.html | 2 +- .../getPrimaryService/no-permission-absent-service.html | 2 +- .../getPrimaryService/no-permission-present-service.html | 2 +- .../mozilla/bluetooth/getPrimaryService/service-found.html | 2 +- .../mozilla/bluetooth/getPrimaryService/service-not-found.html | 2 +- .../getPrimaryServices/blacklisted-services-with-uuid.html | 2 +- .../bluetooth/getPrimaryServices/blacklisted-services.html | 2 +- .../mozilla/bluetooth/getPrimaryServices/correct-services.html | 2 +- .../getPrimaryServices/device-goes-out-of-range-with-uuid.html | 2 +- .../bluetooth/getPrimaryServices/device-goes-out-of-range.html | 2 +- .../getPrimaryServices/disconnect-called-before-with-uuid.html | 2 +- .../bluetooth/getPrimaryServices/disconnect-called-before.html | 2 +- .../getPrimaryServices/disconnect-called-during-with-uuid.html | 2 +- .../bluetooth/getPrimaryServices/disconnect-called-during.html | 2 +- .../getPrimaryServices/disconnected-device-with-uuid.html | 2 +- .../bluetooth/getPrimaryServices/disconnected-device.html | 2 +- .../mozilla/bluetooth/getPrimaryServices/get-same-service.html | 2 +- .../bluetooth/getPrimaryServices/invalid-service-name.html | 2 +- .../no-permission-absent-service-with-uuid.html | 2 +- .../no-permission-present-service-with-uuid.html | 2 +- .../getPrimaryServices/no-permission-present-service.html | 2 +- .../bluetooth/getPrimaryServices/services-found-with-uuid.html | 2 +- .../mozilla/bluetooth/getPrimaryServices/services-found.html | 2 +- .../getPrimaryServices/services-not-found-with-uuid.html | 2 +- .../bluetooth/getPrimaryServices/services-not-found.html | 2 +- .../readValue/characteristic/blacklisted-characteristic.html | 2 +- .../readValue/characteristic/characteristic-is-removed.html | 2 +- .../readValue/characteristic/device-goes-out-of-range.html | 2 +- .../readValue/characteristic/disconnect-called-before.html | 2 +- .../bluetooth/readValue/characteristic/read-succeeds.html | 2 +- .../bluetooth/readValue/characteristic/read-updates-value.html | 2 +- .../bluetooth/readValue/characteristic/service-is-removed.html | 2 +- .../bluetooth/readValue/descriptor/blacklisted-descriptor.html | 2 +- .../readValue/descriptor/characteristic-is-removed.html | 2 +- .../bluetooth/readValue/descriptor/descriptor-is-removed.html | 2 +- .../readValue/descriptor/device-goes-out-of-range.html | 2 +- .../readValue/descriptor/disconnect-called-before.html | 2 +- .../mozilla/bluetooth/readValue/descriptor/read-succeeds.html | 2 +- .../bluetooth/readValue/descriptor/read-updates-value.html | 2 +- .../bluetooth/readValue/descriptor/service-is-removed.html | 2 +- .../bluetooth/requestDevice/accept-all-devices-with-filter.html | 2 +- .../mozilla/bluetooth/requestDevice/accept-all-devices.html | 2 +- .../mozilla/bluetooth/requestDevice/adapter-not-present.html | 2 +- .../tests/mozilla/bluetooth/requestDevice/adapter-off.html | 2 +- .../bluetooth/requestDevice/blacklisted-service-in-filter.html | 2 +- .../requestDevice/blacklisted-service-in-optionalServices.html | 2 +- .../requestDevice/canonicalizeFilter/empty-filter.html | 2 +- .../requestDevice/canonicalizeFilter/empty-filters-member.html | 2 +- .../requestDevice/canonicalizeFilter/empty-namePrefix.html | 2 +- .../requestDevice/canonicalizeFilter/empty-services-member.html | 2 +- .../canonicalizeFilter/max-length-for-device-name-name.html | 2 +- .../max-length-for-device-name-namePrefix.html | 2 +- .../canonicalizeFilter/max-length-for-name-in-adv-name.html | 2 +- .../max-length-for-name-in-adv-namePrefix.html | 2 +- .../requestDevice/canonicalizeFilter/no-arguments.html | 2 +- .../requestDevice/canonicalizeFilter/no-filters-member.html | 2 +- .../unicode-max-length-for-device-name-name.html | 2 +- .../unicode-max-length-for-device-name-namePrefix.html | 2 +- .../unicode-max-length-for-name-in-adv-name.html | 2 +- .../unicode-max-length-for-name-in-adv-namePrefix.html | 2 +- .../canonicalizeFilter/unicode-valid-length-name-name.html | 2 +- .../unicode-valid-length-name-namePrefix.html | 2 +- .../wrong-service-in-optionalServices-member.html | 2 +- .../canonicalizeFilter/wrong-service-in-services-member.html | 2 +- .../mozilla/bluetooth/requestDevice/discovery-succeeds.html | 2 +- .../mozilla/bluetooth/requestDevice/filter-does-not-match.html | 2 +- .../tests/mozilla/bluetooth/requestDevice/filter-matches.html | 2 +- .../requestDevice/name-empty-device-from-name-empty-filter.html | 2 +- .../name-empty-device-from-name-prefix-filter.html | 2 +- .../requestDevice/name-empty-device-from-name-wrong-filter.html | 2 +- .../requestDevice/name-empty-device-from-service-filter.html | 2 +- .../mozilla/bluetooth/requestDevice/name-empty-filter.html | 2 +- .../name-missing-device-from-name-empty-filter.html | 2 +- .../name-missing-device-from-name-prefix-filter.html | 2 +- .../name-missing-device-from-name-wrong-filter.html | 2 +- .../requestDevice/name-missing-device-from-service-filter.html | 2 +- .../tests/mozilla/bluetooth/requestDevice/no-devices.html | 2 +- .../requestDevice/not-accept-all-devices-without-filter.html | 2 +- .../tests/mozilla/bluetooth/requestDevice/same-device.html | 2 +- .../bluetooth/requestDevice/single-filter-single-service.html | 2 +- .../requestDevice/single-filter-two-services-fails.html | 2 +- .../requestDevice/single-filter-two-services-succeeds.html | 2 +- .../tests/mozilla/bluetooth/requestDevice/two-filters.html | 2 +- .../writeValue/characteristic/blacklisted-characteristic.html | 2 +- .../writeValue/characteristic/characteristic-is-removed.html | 2 +- .../writeValue/characteristic/device-goes-out-of-range.html | 2 +- .../writeValue/characteristic/disconnect-called-before.html | 2 +- .../bluetooth/writeValue/characteristic/service-is-removed.html | 2 +- .../bluetooth/writeValue/characteristic/write-succeeds.html | 2 +- .../writeValue/characteristic/write-updates-value.html | 2 +- .../bluetooth/writeValue/descriptor/blacklisted-descriptor.html | 2 +- .../writeValue/descriptor/characteristic-is-removed.html | 2 +- .../bluetooth/writeValue/descriptor/descriptor-is-removed.html | 2 +- .../writeValue/descriptor/device-goes-out-of-range.html | 2 +- .../writeValue/descriptor/disconnect-called-before.html | 2 +- .../bluetooth/writeValue/descriptor/service-is-removed.html | 2 +- .../mozilla/bluetooth/writeValue/descriptor/write-succeeds.html | 2 +- .../bluetooth/writeValue/descriptor/write-updates-value.html | 2 +- 162 files changed, 161 insertions(+), 161 deletions(-) rename tests/wpt/{web-platform-tests => mozilla/tests/mozilla}/bluetooth/bluetooth-helpers.js (100%) diff --git a/tests/wpt/web-platform-tests/bluetooth/bluetooth-helpers.js b/tests/wpt/mozilla/tests/mozilla/bluetooth/bluetooth-helpers.js similarity index 100% rename from tests/wpt/web-platform-tests/bluetooth/bluetooth-helpers.js rename to tests/wpt/mozilla/tests/mozilla/bluetooth/bluetooth-helpers.js diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/connect/connection-succeeds.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/connect/connection-succeeds.html index 34747ba93a6..3103ca4ff65 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/connect/connection-succeeds.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/connect/connection-succeeds.html @@ -1,7 +1,7 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +