diff options
230 files changed, 455 insertions, 492 deletions
diff --git a/components/bluetooth/lib.rs b/components/bluetooth/lib.rs index e3d4eba1a24..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}; @@ -31,10 +32,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 +72,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))), } ); ); @@ -106,8 +103,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; } } @@ -628,6 +625,9 @@ impl BluetoothManager { device_id: String, uuid: String, sender: IpcSender<BluetoothResult<BluetoothServiceMsg>>) { + 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 +654,9 @@ impl BluetoothManager { device_id: String, uuid: Option<String>, sender: IpcSender<BluetoothResult<BluetoothServicesMsg>>) { + 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) => { @@ -679,6 +682,10 @@ impl BluetoothManager { } } } + 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() { return drop(sender.send(Err(BluetoothError::NotFound))); } @@ -690,9 +697,12 @@ impl BluetoothManager { service_id: String, uuid: String, sender: IpcSender<BluetoothResult<BluetoothServiceMsg>>) { + 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())))), + None => return drop(sender.send(Err(BluetoothError::NotFound))), }; let device = match self.device_from_service_id(&service_id) { Some(device) => device, @@ -721,9 +731,12 @@ impl BluetoothManager { service_id: String, uuid: Option<String>, sender: IpcSender<BluetoothResult<BluetoothServicesMsg>>) { + 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())))), + None => return drop(sender.send(Err(BluetoothError::NotFound))), }; let device = match self.device_from_service_id(&service_id) { Some(device) => device, @@ -747,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))); } @@ -758,6 +772,9 @@ impl BluetoothManager { service_id: String, uuid: String, sender: IpcSender<BluetoothResult<BluetoothCharacteristicMsg>>) { + 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 +806,9 @@ impl BluetoothManager { service_id: String, uuid: Option<String>, sender: IpcSender<BluetoothResult<BluetoothCharacteristicsMsg>>) { + 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), @@ -817,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))); } @@ -828,6 +849,9 @@ impl BluetoothManager { characteristic_id: String, uuid: String, sender: IpcSender<BluetoothResult<BluetoothDescriptorMsg>>) { + 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 +872,9 @@ impl BluetoothManager { characteristic_id: String, uuid: Option<String>, sender: IpcSender<BluetoothResult<BluetoothDescriptorsMsg>>) { + 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), @@ -865,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))); } @@ -879,7 +907,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<u8>, sender: IpcSender<BluetoothResult<bool>>) { @@ -895,7 +923,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/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 index f9d1c564692..f9d1c564692 100644 --- a/components/script/bluetooth_blacklist.rs +++ b/components/bluetooth_traits/blacklist.rs diff --git a/components/bluetooth_traits/lib.rs b/components/bluetooth_traits/lib.rs index a1b1b41be6e..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; @@ -20,6 +23,7 @@ pub enum BluetoothError { NotFound, NotSupported, Security, + InvalidState, } #[derive(Deserialize, Serialize)] 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<String>, name_prefix: String, services: ServiceUUIDSequence, manufacturer_id: Option<u16>, @@ -33,7 +33,7 @@ pub struct BluetoothScanfilter { } impl BluetoothScanfilter { - pub fn new(name: String, + pub fn new(name: Option<String>, name_prefix: String, services: Vec<String>, manufacturer_id: Option<u16>, @@ -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 b6f8544aeab..7080a38668b 100644 --- a/components/script/dom/bluetooth.rs +++ b/components/script/dom/bluetooth.rs @@ -2,30 +2,34 @@ * 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; +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, Security, Type}; +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."; 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. @@ -43,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<HashMap<String, MutHeap<JS<BluetoothDevice>>>>, + service_instance_map: DOMRefCell<HashMap<String, MutHeap<JS<BluetoothRemoteGATTService>>>>, + characteristic_instance_map: DOMRefCell<HashMap<String, MutHeap<JS<BluetoothRemoteGATTCharacteristic>>>>, + descriptor_instance_map: DOMRefCell<HashMap<String, MutHeap<JS<BluetoothRemoteGATTDescriptor>>>>, } 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()), } } @@ -58,6 +70,19 @@ impl Bluetooth { BluetoothBinding::Wrap) } + pub fn get_service_map(&self) -> &DOMRefCell<HashMap<String, MutHeap<JS<BluetoothRemoteGATTService>>>> { + &self.service_instance_map + } + + pub fn get_characteristic_map(&self) + -> &DOMRefCell<HashMap<String, MutHeap<JS<BluetoothRemoteGATTCharacteristic>>>> { + &self.characteristic_instance_map + } + + pub fn get_descriptor_map(&self) -> &DOMRefCell<HashMap<String, MutHeap<JS<BluetoothRemoteGATTDescriptor>>>> { + &self.descriptor_instance_map + } + fn get_bluetooth_thread(&self) -> IpcSender<BluetoothMethodMsg> { self.global().as_window().bluetooth_thread() } @@ -103,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)) @@ -213,13 +244,13 @@ fn canonicalize_filter(filter: &BluetoothRequestDeviceFilter) -> Fallible<Blueto return Err(Type(NAME_TOO_LONG_ERROR.to_owned())); } if name.len() > MAX_FILTER_NAME_LENGTH { - return Err(Type(FILTER_NAME_TOO_LONG_ERROR.to_owned())); + return Err(NotFound); } // Step 2.4.4.2. - name.to_string() + Some(name.to_string()) }, - None => String::new(), + None => None, }; // Step 2.4.5. @@ -233,7 +264,7 @@ fn canonicalize_filter(filter: &BluetoothRequestDeviceFilter) -> Fallible<Blueto return Err(Type(NAME_TOO_LONG_ERROR.to_owned())); } if name_prefix.len() > MAX_FILTER_NAME_LENGTH { - return Err(Type(FILTER_NAME_TOO_LONG_ERROR.to_owned())); + return Err(NotFound); } // Step 2.4.5.2. @@ -289,6 +320,7 @@ impl From<BluetoothError> for Error { BluetoothError::NotFound => Error::NotFound, BluetoothError::NotSupported => Error::NotSupported, BluetoothError::Security => Error::Security, + BluetoothError::InvalidState => Error::InvalidState, } } } 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<DOMString>, ad_data: MutHeap<JS<BluetoothAdvertisingData>>, gatt: MutNullableHeap<JS<BluetoothRemoteGATTServer>>, + context: MutHeap<JS<Bluetooth>>, } impl BluetoothDevice { pub fn new_inherited(id: DOMString, name: Option<DOMString>, - 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<DOMString>, - adData: &BluetoothAdvertisingData) + adData: &BluetoothAdvertisingData, + context: &Bluetooth) -> Root<BluetoothDevice> { reflect_dom_object(box BluetoothDevice::new_inherited(id, name, - adData), + adData, + context), global, BluetoothDeviceBinding::Wrap) } + + pub fn get_context(&self) -> Root<Bluetooth> { + self.context.get() + } } impl BluetoothDeviceMethods for BluetoothDevice { diff --git a/components/script/dom/bluetoothremotegattcharacteristic.rs b/components/script/dom/bluetoothremotegattcharacteristic.rs index 0fae7548ede..1b2a16c1a4b 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; @@ -87,16 +87,26 @@ 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(); 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)) @@ -117,18 +127,34 @@ 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)) @@ -182,10 +208,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..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:: @@ -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/components/script/dom/bluetoothremotegattserver.rs b/components/script/dom/bluetoothremotegattserver.rs index 5e589fe07af..9ac1ca4c4f4 100644 --- a/components/script/dom/bluetoothremotegattserver.rs +++ b/components/script/dom/bluetoothremotegattserver.rs @@ -2,13 +2,13 @@ * 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; 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,17 +72,27 @@ 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(); 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)) @@ -103,19 +113,35 @@ 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 a4fc78c8d93..c597338e1ba 100644 --- a/components/script/dom/bluetoothremotegattservice.rs +++ b/components/script/dom/bluetoothremotegattservice.rs @@ -2,11 +2,13 @@ * 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; 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}; @@ -60,6 +62,10 @@ impl BluetoothRemoteGATTService { BluetoothRemoteGATTServiceBinding::Wrap) } + pub fn get_device(&self) -> Root<BluetoothDevice> { + self.device.get() + } + fn get_bluetooth_thread(&self) -> IpcSender<BluetoothMethodMsg> { self.global().as_window().bluetooth_thread() } @@ -76,12 +82,20 @@ 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(); 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, @@ -93,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)) @@ -118,6 +134,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( @@ -125,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) }, @@ -159,6 +190,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(), @@ -167,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)) @@ -192,21 +233,37 @@ 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(), 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/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<void> watchAdvertisements(); + // void unwatchAdvertisements(); + // readonly attribute boolean watchingAdvertisements; }; // BluetoothDevice implements EventTarget; 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 9ca4c50773e..c5e6963a63a 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 21a592c3ac1..5e5ab938a28 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/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/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/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/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/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/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/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/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/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/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/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 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/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/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/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/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/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/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 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/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 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/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 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 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/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 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 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/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/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 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 diff --git a/tests/wpt/web-platform-tests/bluetooth/bluetooth-helpers.js b/tests/wpt/mozilla/tests/mozilla/bluetooth/bluetooth-helpers.js index 14ed7d66d85..14ed7d66d85 100644 --- a/tests/wpt/web-platform-tests/bluetooth/bluetooth-helpers.js +++ b/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 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/connect/device-goes-out-of-range.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/connect/device-goes-out-of-range.html index 063bcb6b009..f189a9971f2 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/connect/device-goes-out-of-range.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/connect/device-goes-out-of-range.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/connect/get-same-gatt-server.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/connect/get-same-gatt-server.html index 85dab11927f..8572fd86e37 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/connect/get-same-gatt-server.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/connect/get-same-gatt-server.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/disconnect/connect-disconnect-twice.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/disconnect/connect-disconnect-twice.html index 51cac67b626..fd60327fa64 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/disconnect/connect-disconnect-twice.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/disconnect/connect-disconnect-twice.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/disconnect/disconnect-once.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/disconnect/disconnect-once.html index 1e13b354d7b..17a17718655 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/disconnect/disconnect-once.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/disconnect/disconnect-once.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/disconnect/disconnect-twice-in-a-row.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/disconnect/disconnect-twice-in-a-row.html index 0fa63704779..d42fed6ce46 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/disconnect/disconnect-twice-in-a-row.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/disconnect/disconnect-twice-in-a-row.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/blacklisted-characteristic.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/blacklisted-characteristic.html index 131c7fa3afd..e3e207af9a1 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/blacklisted-characteristic.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/blacklisted-characteristic.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/characteristic-found.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/characteristic-found.html index 10754eaad3d..d0d914cccbc 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/characteristic-found.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/characteristic-found.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/characteristic-not-found.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/characteristic-not-found.html index a7360567a22..a65ca1bd077 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/characteristic-not-found.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/characteristic-not-found.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/device-goes-out-of-range.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/device-goes-out-of-range.html index 87491e03439..e826bd6a0c9 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/device-goes-out-of-range.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/device-goes-out-of-range.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/disconnect-called-before.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/disconnect-called-before.html index 63f00e2c6c8..58900dd6157 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/disconnect-called-before.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/disconnect-called-before.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/disconnect-called-during.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/disconnect-called-during.html index 983c191b616..13ecf55d2b4 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/disconnect-called-during.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/disconnect-called-during.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/get-same-characteristic.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/get-same-characteristic.html index f749e8e2ccb..ded15a8810e 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/get-same-characteristic.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/get-same-characteristic.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/invalid-characteristic-name.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/invalid-characteristic-name.html index 418603ea43d..46c46938127 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/invalid-characteristic-name.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/invalid-characteristic-name.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/service-is-removed.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/service-is-removed.html index 9a10c745ab4..7b77ac64c5f 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/service-is-removed.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/service-is-removed.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/blacklisted-characteristics-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/blacklisted-characteristics-with-uuid.html index 9957fa98b31..fbb73f15cfa 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/blacklisted-characteristics-with-uuid.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/blacklisted-characteristics-with-uuid.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/blacklisted-characteristics.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/blacklisted-characteristics.html index f4701ac77ca..84ddb24bff8 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/blacklisted-characteristics.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/blacklisted-characteristics.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/characteristics-found-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/characteristics-found-with-uuid.html index d078623642f..acea079cc9b 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/characteristics-found-with-uuid.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/characteristics-found-with-uuid.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/characteristics-found.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/characteristics-found.html index d50e8e44921..3cc5ee4791c 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/characteristics-found.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/characteristics-found.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/characteristics-not-found-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/characteristics-not-found-with-uuid.html index 9c4f0bcd310..48e0f3dffdf 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/characteristics-not-found-with-uuid.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/characteristics-not-found-with-uuid.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/characteristics-not-found.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/characteristics-not-found.html index 029d20c48da..4df6cf24d62 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/characteristics-not-found.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/characteristics-not-found.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/correct-characteristics.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/correct-characteristics.html index f3a1f88649f..097bfb85196 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/correct-characteristics.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/correct-characteristics.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/device-goes-out-of-range-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/device-goes-out-of-range-with-uuid.html index 735e2c63a95..76d102c081d 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/device-goes-out-of-range-with-uuid.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/device-goes-out-of-range-with-uuid.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/device-goes-out-of-range.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/device-goes-out-of-range.html index b852d85f492..ffb825bceb2 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/device-goes-out-of-range.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/device-goes-out-of-range.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/disconnect-called-before-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/disconnect-called-before-with-uuid.html index 02f3cace850..381be5bab68 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/disconnect-called-before-with-uuid.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/disconnect-called-before-with-uuid.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/disconnect-called-before.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/disconnect-called-before.html index a4462a8a8ae..446b9e9f92e 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/disconnect-called-before.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/disconnect-called-before.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/disconnect-called-during-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/disconnect-called-during-with-uuid.html index f54500fa844..5750034d0a5 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/disconnect-called-during-with-uuid.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/disconnect-called-during-with-uuid.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/disconnect-called-during.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/disconnect-called-during.html index 9905336ec64..e32d601a12f 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/disconnect-called-during.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/disconnect-called-during.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/get-same-characteristics.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/get-same-characteristics.html index 4911bce432c..713ebf15e31 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/get-same-characteristics.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/get-same-characteristics.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/invalid-characteristic-name.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/invalid-characteristic-name.html index ea960f6af10..00820d06f37 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/invalid-characteristic-name.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/invalid-characteristic-name.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/service-is-removed-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/service-is-removed-with-uuid.html index d6a4e546e7f..524309694f7 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/service-is-removed-with-uuid.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/service-is-removed-with-uuid.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/service-is-removed.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/service-is-removed.html index 1847acf7db4..94f71584ce7 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/service-is-removed.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/service-is-removed.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/blacklisted-descriptor.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/blacklisted-descriptor.html index 69487ee04a4..f3a0260c115 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/blacklisted-descriptor.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/blacklisted-descriptor.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/characteristic-is-removed.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/characteristic-is-removed.html index 7af5169917c..4989a8bec84 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/characteristic-is-removed.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/characteristic-is-removed.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/descriptor-found.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/descriptor-found.html index 4ae4ec1f93f..bcd39dd6874 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/descriptor-found.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/descriptor-found.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/descriptor-not-found.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/descriptor-not-found.html index ac1673956a1..25d69ec131e 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/descriptor-not-found.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/descriptor-not-found.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/device-goes-out-of-range.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/device-goes-out-of-range.html index f766aab8a04..cfaa3fc1e6c 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/device-goes-out-of-range.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/device-goes-out-of-range.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/disconnect-called-before.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/disconnect-called-before.html index da515ef859c..f6b5bdb6238 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/disconnect-called-before.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/disconnect-called-before.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/disconnect-called-during.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/disconnect-called-during.html index 812d506a9ff..b0d38d06222 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/disconnect-called-during.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/disconnect-called-during.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/get-same-descriptor.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/get-same-descriptor.html index 9a64c293309..fdb00d8c419 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/get-same-descriptor.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/get-same-descriptor.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/invalid-descriptor-name.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/invalid-descriptor-name.html index c2b29c3fc99..1a56b8e6a15 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/invalid-descriptor-name.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/invalid-descriptor-name.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/blacklisted-descriptors-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/blacklisted-descriptors-with-uuid.html index 5798594c9fb..67e51e56800 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/blacklisted-descriptors-with-uuid.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/blacklisted-descriptors-with-uuid.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/blacklisted-descriptors.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/blacklisted-descriptors.html index 7859376a64c..790ab94f56a 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/blacklisted-descriptors.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/blacklisted-descriptors.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/characteristic-is-removed-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/characteristic-is-removed-with-uuid.html index ca343b558b0..e3794118465 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/characteristic-is-removed-with-uuid.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/characteristic-is-removed-with-uuid.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/characteristic-is-removed.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/characteristic-is-removed.html index 37d549da975..59ccf3cbcf1 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/characteristic-is-removed.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/characteristic-is-removed.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/correct-descriptors.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/correct-descriptors.html index 99742f1c74b..315ef3a1e62 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/correct-descriptors.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/correct-descriptors.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/descriptors-found-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/descriptors-found-with-uuid.html index 77066e1af4e..2df06d990b3 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/descriptors-found-with-uuid.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/descriptors-found-with-uuid.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/descriptors-found.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/descriptors-found.html index 537b7da3c20..a0cf577397e 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/descriptors-found.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/descriptors-found.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/descriptors-not-found-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/descriptors-not-found-with-uuid.html index 7a1aff27fd1..ad440b9cbdf 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/descriptors-not-found-with-uuid.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/descriptors-not-found-with-uuid.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/descriptors-not-found.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/descriptors-not-found.html index dd1f7937459..03d4ccc976c 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/descriptors-not-found.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/descriptors-not-found.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/device-goes-out-of-range-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/device-goes-out-of-range-with-uuid.html index 3e4b5cc7a75..ba390afb50a 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/device-goes-out-of-range-with-uuid.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/device-goes-out-of-range-with-uuid.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/device-goes-out-of-range.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/device-goes-out-of-range.html index 4f62af9447c..6b3477302ab 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/device-goes-out-of-range.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/device-goes-out-of-range.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/disconnect-called-before-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/disconnect-called-before-with-uuid.html index f3ae8ba674b..1cc47946613 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/disconnect-called-before-with-uuid.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/disconnect-called-before-with-uuid.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/disconnect-called-before.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/disconnect-called-before.html index a18710484cd..bb7852a4a9f 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/disconnect-called-before.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/disconnect-called-before.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/disconnect-called-during-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/disconnect-called-during-with-uuid.html index 7994b46d281..e3b52e9d806 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/disconnect-called-during-with-uuid.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/disconnect-called-during-with-uuid.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/disconnect-called-during.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/disconnect-called-during.html index 67f8394b9f8..1bb4094a168 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/disconnect-called-during.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/disconnect-called-during.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/get-same-descriptors.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/get-same-descriptors.html index b0f761c5dff..b91b63e2eb4 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/get-same-descriptors.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/get-same-descriptors.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/invalid-descriptor-name.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/invalid-descriptor-name.html index 573bf7627c0..ddcc08c04bd 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/invalid-descriptor-name.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/invalid-descriptor-name.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/device-goes-out-of-range.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/device-goes-out-of-range.html index 0de62861621..a26e9b5ec41 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/device-goes-out-of-range.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/device-goes-out-of-range.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/disconnect-called-before.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/disconnect-called-before.html index f13e494febe..d5b0691471f 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/disconnect-called-before.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/disconnect-called-before.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/disconnect-called-during.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/disconnect-called-during.html index 35463ca94e3..e7f43994a5a 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/disconnect-called-during.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/disconnect-called-during.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/disconnected-device.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/disconnected-device.html index 4de7ea326c2..917a81c409e 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/disconnected-device.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/disconnected-device.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/get-same-service.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/get-same-service.html index 752b929a845..e6bbe4c6b65 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/get-same-service.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/get-same-service.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/invalid-service-name.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/invalid-service-name.html index a4406338c39..f23f0201951 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/invalid-service-name.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/invalid-service-name.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/no-permission-absent-service.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/no-permission-absent-service.html index bb431828536..1076da99b39 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/no-permission-absent-service.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/no-permission-absent-service.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/no-permission-present-service.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/no-permission-present-service.html index 63a22fc519b..e889d07fcc7 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/no-permission-present-service.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/no-permission-present-service.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/service-found.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/service-found.html index a9656dcbc47..f5f9982d401 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/service-found.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/service-found.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/service-not-found.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/service-not-found.html index 6009f09a5fd..baeceb4d4e6 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/service-not-found.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryService/service-not-found.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/blacklisted-services-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/blacklisted-services-with-uuid.html index 988b6dea840..9fa4d4c5921 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/blacklisted-services-with-uuid.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/blacklisted-services-with-uuid.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/blacklisted-services.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/blacklisted-services.html index f5e0317e7be..1b72a2951c9 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/blacklisted-services.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/blacklisted-services.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/correct-services.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/correct-services.html index 3b14e7e257f..3ac25687ace 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/correct-services.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/correct-services.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/device-goes-out-of-range-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/device-goes-out-of-range-with-uuid.html index cb001e7366d..bbe01b2a4e5 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/device-goes-out-of-range-with-uuid.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/device-goes-out-of-range-with-uuid.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/device-goes-out-of-range.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/device-goes-out-of-range.html index 068c38ecdeb..a0a3e0b4306 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/device-goes-out-of-range.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/device-goes-out-of-range.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnect-called-before-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnect-called-before-with-uuid.html index 05db5f52c54..325ded0c35e 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnect-called-before-with-uuid.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnect-called-before-with-uuid.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnect-called-before.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnect-called-before.html index 87d8a362eeb..8ce84108aee 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnect-called-before.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnect-called-before.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnect-called-during-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnect-called-during-with-uuid.html index 9b43949f924..076e72741de 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnect-called-during-with-uuid.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnect-called-during-with-uuid.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnect-called-during.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnect-called-during.html index 229e4de7f40..bfcdd886c06 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnect-called-during.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnect-called-during.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnected-device-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnected-device-with-uuid.html index 54bb8f6ac14..d97698bc2d3 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnected-device-with-uuid.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnected-device-with-uuid.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnected-device.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnected-device.html index 37700135f81..f63aff631fe 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnected-device.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/disconnected-device.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/get-same-service.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/get-same-service.html index 889951315e0..762dcfd1327 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/get-same-service.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/get-same-service.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/invalid-service-name.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/invalid-service-name.html index dfae1d89a2b..a558b6cedfd 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/invalid-service-name.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/invalid-service-name.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/no-permission-absent-service-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/no-permission-absent-service-with-uuid.html index 6f23bb9217b..ebcacc95864 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/no-permission-absent-service-with-uuid.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/no-permission-absent-service-with-uuid.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/no-permission-present-service-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/no-permission-present-service-with-uuid.html index 9ed16d2a3a0..f303402cdcc 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/no-permission-present-service-with-uuid.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/no-permission-present-service-with-uuid.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/no-permission-present-service.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/no-permission-present-service.html index d56f7b4e167..d7cab72de16 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/no-permission-present-service.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/no-permission-present-service.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/services-found-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/services-found-with-uuid.html index 7b262688706..e52c949843b 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/services-found-with-uuid.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/services-found-with-uuid.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/services-found.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/services-found.html index d5286126f27..bf67e6e21ca 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/services-found.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/services-found.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/services-not-found-with-uuid.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/services-not-found-with-uuid.html index 42ebb2c48a6..6e92ee43c0d 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/services-not-found-with-uuid.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/services-not-found-with-uuid.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/services-not-found.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/services-not-found.html index d7be5d8d005..84e83604300 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/services-not-found.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/services-not-found.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/blacklisted-characteristic.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/blacklisted-characteristic.html index fda94bf4f1f..0ab27a51651 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/blacklisted-characteristic.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/blacklisted-characteristic.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/characteristic-is-removed.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/characteristic-is-removed.html index 235a1252689..5443ec85518 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/characteristic-is-removed.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/characteristic-is-removed.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/device-goes-out-of-range.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/device-goes-out-of-range.html index c122101ab0f..bfdedbc246c 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/device-goes-out-of-range.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/device-goes-out-of-range.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/disconnect-called-before.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/disconnect-called-before.html index b3bfcb71726..104843dd11c 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/disconnect-called-before.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/disconnect-called-before.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/read-succeeds.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/read-succeeds.html index 47c67838856..fb69e8de416 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/read-succeeds.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/read-succeeds.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/read-updates-value.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/read-updates-value.html index e9ccdc037a8..168573c75cd 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/read-updates-value.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/read-updates-value.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/service-is-removed.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/service-is-removed.html index de072c5309e..e75735a42cd 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/service-is-removed.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/service-is-removed.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/blacklisted-descriptor.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/blacklisted-descriptor.html index a64633ed004..e407be84240 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/blacklisted-descriptor.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/blacklisted-descriptor.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/characteristic-is-removed.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/characteristic-is-removed.html index 6914f6950de..81e5ba10c2c 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/characteristic-is-removed.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/characteristic-is-removed.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/descriptor-is-removed.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/descriptor-is-removed.html index cbd91f011b5..66cf6498a5c 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/descriptor-is-removed.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/descriptor-is-removed.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/device-goes-out-of-range.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/device-goes-out-of-range.html index ab300b2249a..6eac0e4fbf3 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/device-goes-out-of-range.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/device-goes-out-of-range.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/disconnect-called-before.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/disconnect-called-before.html index 5641a22aa9e..d9736243bf4 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/disconnect-called-before.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/disconnect-called-before.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/read-succeeds.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/read-succeeds.html index 1b810c67983..f5977262492 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/read-succeeds.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/read-succeeds.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/read-updates-value.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/read-updates-value.html index 376cde92168..150b870d770 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/read-updates-value.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/read-updates-value.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/service-is-removed.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/service-is-removed.html index fb0d1f95ff5..77cd08043b9 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/service-is-removed.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/service-is-removed.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/accept-all-devices-with-filter.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/accept-all-devices-with-filter.html index e8eba04ae8f..f47cc3beaa9 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/accept-all-devices-with-filter.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/accept-all-devices-with-filter.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/accept-all-devices.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/accept-all-devices.html index 0c2e16db957..66d23a43469 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/accept-all-devices.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/accept-all-devices.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/adapter-not-present.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/adapter-not-present.html index 9f5a419bad5..6cc77fde5c9 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/adapter-not-present.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/adapter-not-present.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/adapter-off.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/adapter-off.html index 06e7d804856..565d59ddbc9 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/adapter-off.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/adapter-off.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/blacklisted-service-in-filter.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/blacklisted-service-in-filter.html index 73ba18855e2..6a91eb3b5fe 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/blacklisted-service-in-filter.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/blacklisted-service-in-filter.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/blacklisted-service-in-optionalServices.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/blacklisted-service-in-optionalServices.html index a1ef467cd11..33395cc9636 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/blacklisted-service-in-optionalServices.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/blacklisted-service-in-optionalServices.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/empty-filter.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/empty-filter.html index e78165b2d75..9ba02650308 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/empty-filter.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/empty-filter.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/empty-filters-member.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/empty-filters-member.html index 4acfedef2bf..34633ba4d75 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/empty-filters-member.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/empty-filters-member.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/empty-namePrefix.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/empty-namePrefix.html index b296fe7a29a..21ee2ee221b 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/empty-namePrefix.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/empty-namePrefix.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/empty-services-member.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/empty-services-member.html index 9176cc76626..e3f10eb25fe 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/empty-services-member.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/empty-services-member.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-device-name-name.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-device-name-name.html index 9b35a48ac92..6ea752cdb45 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-device-name-name.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-device-name-name.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-device-name-namePrefix.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-device-name-namePrefix.html index c2321712ced..cc92a3cc53b 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-device-name-namePrefix.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-device-name-namePrefix.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-name-in-adv-name.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-name-in-adv-name.html index 7ea0dafa53e..246a43a4a0d 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-name-in-adv-name.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-name-in-adv-name.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-name-in-adv-namePrefix.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-name-in-adv-namePrefix.html index 7b8d7ced422..3f737f48748 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-name-in-adv-namePrefix.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/max-length-for-name-in-adv-namePrefix.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/no-arguments.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/no-arguments.html index 3e59141ad09..107614c557f 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/no-arguments.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/no-arguments.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/no-filters-member.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/no-filters-member.html index 0763557d308..7aa27067133 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/no-filters-member.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/no-filters-member.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-device-name-name.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-device-name-name.html index 3a5ca1fe042..3327ffab534 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-device-name-name.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-device-name-name.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-device-name-namePrefix.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-device-name-namePrefix.html index 978d58e8de3..65d5fa0fa7a 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-device-name-namePrefix.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-device-name-namePrefix.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-name-in-adv-name.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-name-in-adv-name.html index f32a26929d6..84f564efbfd 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-name-in-adv-name.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-name-in-adv-name.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-name-in-adv-namePrefix.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-name-in-adv-namePrefix.html index 46a0c8072ae..d96664c337c 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-name-in-adv-namePrefix.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-max-length-for-name-in-adv-namePrefix.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-valid-length-name-name.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-valid-length-name-name.html index 6bead355297..5c004713b5e 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-valid-length-name-name.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-valid-length-name-name.html @@ -2,7 +2,7 @@ <meta charset="utf-8"> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-valid-length-name-namePrefix.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-valid-length-name-namePrefix.html index e02e4b3a19c..088b3781861 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-valid-length-name-namePrefix.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/unicode-valid-length-name-namePrefix.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/wrong-service-in-optionalServices-member.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/wrong-service-in-optionalServices-member.html index dd6a5d7317e..752f6765a2e 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/wrong-service-in-optionalServices-member.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/wrong-service-in-optionalServices-member.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> let test_specs = [{ diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/wrong-service-in-services-member.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/wrong-service-in-services-member.html index cb84b955fa2..cf249d87e19 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/wrong-service-in-services-member.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/canonicalizeFilter/wrong-service-in-services-member.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> let test_specs = [{ 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 @@ -<!doctype html> -<script src="/resources/testharness.js"></script> -<script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> -<script> -'use strict'; -promise_test(() => { - window.testRunner.setBluetoothMockDataSet(adapter_type.glucose_heart_rate); - return window.navigator.bluetooth.requestDevice({ - filters: [{services: [glucose.name]}], - optionalServices: [tx_power.name] - }) - .then(device => { - assert_equals(device.uuids.length, 2); - assert_in_array(glucose.uuid, device.uuids); - assert_in_array(tx_power.uuid, device.uuids); - }); -}, 'We should only see UUID\'s that we\'ve been given permission for.'); -</script> diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/discovery-succeeds.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/discovery-succeeds.html index bb5b669c431..6ee528fbe1f 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/discovery-succeeds.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/discovery-succeeds.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/filter-does-not-match.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/filter-does-not-match.html index d9066068a1f..a82d1196966 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/filter-does-not-match.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/filter-does-not-match.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; let matching_services = [heart_rate.uuid]; diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/filter-matches.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/filter-matches.html index f137d541fdf..c986a40d4ed 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/filter-matches.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/filter-matches.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-empty-device-from-name-empty-filter.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-empty-device-from-name-empty-filter.html index 5fc093ba4e9..3f6a7748535 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-empty-device-from-name-empty-filter.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-empty-device-from-name-empty-filter.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-empty-device-from-name-prefix-filter.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-empty-device-from-name-prefix-filter.html index 553d5cf8367..4d546668961 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-empty-device-from-name-prefix-filter.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-empty-device-from-name-prefix-filter.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-empty-device-from-name-wrong-filter.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-empty-device-from-name-wrong-filter.html index 17454b7a40a..f930bd4662d 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-empty-device-from-name-wrong-filter.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-empty-device-from-name-wrong-filter.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-empty-device-from-service-filter.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-empty-device-from-service-filter.html index 0c8ad3eff6d..d1791204055 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-empty-device-from-service-filter.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-empty-device-from-service-filter.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-empty-filter.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-empty-filter.html index 85e9c94a59f..8ac94f17558 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-empty-filter.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-empty-filter.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-missing-device-from-name-empty-filter.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-missing-device-from-name-empty-filter.html index 8477b5a1da9..12e2deea0b9 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-missing-device-from-name-empty-filter.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-missing-device-from-name-empty-filter.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-missing-device-from-name-prefix-filter.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-missing-device-from-name-prefix-filter.html index e34fa4fa9ff..4cc36f3d569 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-missing-device-from-name-prefix-filter.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-missing-device-from-name-prefix-filter.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-missing-device-from-name-wrong-filter.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-missing-device-from-name-wrong-filter.html index 1686d48f132..528707e2379 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-missing-device-from-name-wrong-filter.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-missing-device-from-name-wrong-filter.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-missing-device-from-service-filter.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-missing-device-from-service-filter.html index 1073fc5f465..7f228de9ce3 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-missing-device-from-service-filter.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/name-missing-device-from-service-filter.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/no-devices.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/no-devices.html index 5ef8848b9b2..75f14073a34 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/no-devices.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/no-devices.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/not-accept-all-devices-without-filter.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/not-accept-all-devices-without-filter.html index 013432047ad..d4a7dc37314 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/not-accept-all-devices-without-filter.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/not-accept-all-devices-without-filter.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/same-device.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/same-device.html index ead68342ee9..949db7f453f 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/same-device.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/same-device.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/single-filter-single-service.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/single-filter-single-service.html index 10ffd492447..e74bbd92054 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/single-filter-single-service.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/single-filter-single-service.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/single-filter-two-services-fails.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/single-filter-two-services-fails.html index 5c49545d14f..eabc7250e08 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/single-filter-two-services-fails.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/single-filter-two-services-fails.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/single-filter-two-services-succeeds.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/single-filter-two-services-succeeds.html index 3da018861c5..9cac9e48ed0 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/single-filter-two-services-succeeds.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/single-filter-two-services-succeeds.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/two-filters.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/two-filters.html index c5dd766f898..e6097442df3 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/two-filters.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/two-filters.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/blacklisted-characteristic.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/blacklisted-characteristic.html index cd591ccd056..4c7ffa8c2e3 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/blacklisted-characteristic.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/blacklisted-characteristic.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/characteristic-is-removed.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/characteristic-is-removed.html index 35d002c07c1..c4ff0d6ce17 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/characteristic-is-removed.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/characteristic-is-removed.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/device-goes-out-of-range.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/device-goes-out-of-range.html index 45a3076ae91..05d365554eb 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/device-goes-out-of-range.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/device-goes-out-of-range.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/disconnect-called-before.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/disconnect-called-before.html index 1ebe8ca7696..bb8536f363f 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/disconnect-called-before.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/disconnect-called-before.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/service-is-removed.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/service-is-removed.html index f51bfe44a4e..5034dae1eb1 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/service-is-removed.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/service-is-removed.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/write-succeeds.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/write-succeeds.html index 0344c2c2d21..f87d4c9d8ce 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/write-succeeds.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/write-succeeds.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/write-updates-value.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/write-updates-value.html index d49dc2933c3..eaf5fb9f7d3 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/write-updates-value.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/write-updates-value.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/blacklisted-descriptor.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/blacklisted-descriptor.html index 709053449a9..26896704df0 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/blacklisted-descriptor.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/blacklisted-descriptor.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/characteristic-is-removed.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/characteristic-is-removed.html index 0ab4aa51a14..d8c9ac417a7 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/characteristic-is-removed.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/characteristic-is-removed.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/descriptor-is-removed.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/descriptor-is-removed.html index 68e48930a72..f52fa78ccf5 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/descriptor-is-removed.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/descriptor-is-removed.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/device-goes-out-of-range.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/device-goes-out-of-range.html index 6bae889ac15..9ec7e5218e2 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/device-goes-out-of-range.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/device-goes-out-of-range.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/disconnect-called-before.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/disconnect-called-before.html index 939f9e4be36..30cd957a23f 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/disconnect-called-before.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/disconnect-called-before.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/service-is-removed.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/service-is-removed.html index 36d38d44d2c..284e6fee6e0 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/service-is-removed.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/service-is-removed.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/write-succeeds.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/write-succeeds.html index 9a0c3c66127..61afdd2a2dc 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/write-succeeds.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/write-succeeds.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(t => { diff --git a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/write-updates-value.html b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/write-updates-value.html index 9fb5adf749d..ee6f028b5dc 100644 --- a/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/write-updates-value.html +++ b/tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/write-updates-value.html @@ -1,7 +1,7 @@ <!doctype html> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> -<script src="/bluetooth/bluetooth-helpers.js"></script> +<script src="/_mozilla/mozilla/bluetooth/bluetooth-helpers.js"></script> <script> 'use strict'; promise_test(() => { |