Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-12 08:55:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rename blacklist to blocklist

Browse source
This commit is contained in:
Zakor Gyula 2016-11-14 11:39:30 +01:00
parent 870841099a
commit f98fbecfda
26 changed files with 181 additions and 181 deletions
Download patch file Download diff file Expand all files Collapse all files

84
tests/wpt/mozilla/meta/MANIFEST.json
View file

@ -6746,10 +6746,10 @@
"url": "/_mozilla/mozilla/bluetooth/disconnect/disconnect-twice-in-a-row.html"
}
],
"mozilla/bluetooth/getCharacteristic/blacklisted-characteristic.html": [
"mozilla/bluetooth/getCharacteristic/blocklisted-characteristic.html": [
{
"path": "mozilla/bluetooth/getCharacteristic/blacklisted-characteristic.html",
"url": "/_mozilla/mozilla/bluetooth/getCharacteristic/blacklisted-characteristic.html"
"path": "mozilla/bluetooth/getCharacteristic/blocklisted-characteristic.html",
"url": "/_mozilla/mozilla/bluetooth/getCharacteristic/blocklisted-characteristic.html"
}
],
"mozilla/bluetooth/getCharacteristic/characteristic-found.html": [
@ -6800,16 +6800,16 @@
"url": "/_mozilla/mozilla/bluetooth/getCharacteristic/service-is-removed.html"
}
],
"mozilla/bluetooth/getCharacteristics/blacklisted-characteristics-with-uuid.html": [
"mozilla/bluetooth/getCharacteristics/blocklisted-characteristics-with-uuid.html": [
{
"path": "mozilla/bluetooth/getCharacteristics/blacklisted-characteristics-with-uuid.html",
"url": "/_mozilla/mozilla/bluetooth/getCharacteristics/blacklisted-characteristics-with-uuid.html"
"path": "mozilla/bluetooth/getCharacteristics/blocklisted-characteristics-with-uuid.html",
"url": "/_mozilla/mozilla/bluetooth/getCharacteristics/blocklisted-characteristics-with-uuid.html"
}
],
"mozilla/bluetooth/getCharacteristics/blacklisted-characteristics.html": [
"mozilla/bluetooth/getCharacteristics/blocklisted-characteristics.html": [
{
"path": "mozilla/bluetooth/getCharacteristics/blacklisted-characteristics.html",
"url": "/_mozilla/mozilla/bluetooth/getCharacteristics/blacklisted-characteristics.html"
"path": "mozilla/bluetooth/getCharacteristics/blocklisted-characteristics.html",
"url": "/_mozilla/mozilla/bluetooth/getCharacteristics/blocklisted-characteristics.html"
}
],
"mozilla/bluetooth/getCharacteristics/characteristics-found-with-uuid.html": [
@ -6902,10 +6902,10 @@
"url": "/_mozilla/mozilla/bluetooth/getCharacteristics/service-is-removed.html"
}
],
"mozilla/bluetooth/getDescriptor/blacklisted-descriptor.html": [
"mozilla/bluetooth/getDescriptor/blocklisted-descriptor.html": [
{
"path": "mozilla/bluetooth/getDescriptor/blacklisted-descriptor.html",
"url": "/_mozilla/mozilla/bluetooth/getDescriptor/blacklisted-descriptor.html"
"path": "mozilla/bluetooth/getDescriptor/blocklisted-descriptor.html",
"url": "/_mozilla/mozilla/bluetooth/getDescriptor/blocklisted-descriptor.html"
}
],
"mozilla/bluetooth/getDescriptor/characteristic-is-removed.html": [
@ -6956,16 +6956,16 @@
"url": "/_mozilla/mozilla/bluetooth/getDescriptor/invalid-descriptor-name.html"
}
],
"mozilla/bluetooth/getDescriptors/blacklisted-descriptors-with-uuid.html": [
"mozilla/bluetooth/getDescriptors/blocklisted-descriptors-with-uuid.html": [
{
"path": "mozilla/bluetooth/getDescriptors/blacklisted-descriptors-with-uuid.html",
"url": "/_mozilla/mozilla/bluetooth/getDescriptors/blacklisted-descriptors-with-uuid.html"
"path": "mozilla/bluetooth/getDescriptors/blocklisted-descriptors-with-uuid.html",
"url": "/_mozilla/mozilla/bluetooth/getDescriptors/blocklisted-descriptors-with-uuid.html"
}
],
"mozilla/bluetooth/getDescriptors/blacklisted-descriptors.html": [
"mozilla/bluetooth/getDescriptors/blocklisted-descriptors.html": [
{
"path": "mozilla/bluetooth/getDescriptors/blacklisted-descriptors.html",
"url": "/_mozilla/mozilla/bluetooth/getDescriptors/blacklisted-descriptors.html"
"path": "mozilla/bluetooth/getDescriptors/blocklisted-descriptors.html",
"url": "/_mozilla/mozilla/bluetooth/getDescriptors/blocklisted-descriptors.html"
}
],
"mozilla/bluetooth/getDescriptors/characteristic-is-removed-with-uuid.html": [
@ -7118,16 +7118,16 @@
"url": "/_mozilla/mozilla/bluetooth/getPrimaryService/service-not-found.html"
}
],
"mozilla/bluetooth/getPrimaryServices/blacklisted-services-with-uuid.html": [
"mozilla/bluetooth/getPrimaryServices/blocklisted-services-with-uuid.html": [
{
"path": "mozilla/bluetooth/getPrimaryServices/blacklisted-services-with-uuid.html",
"url": "/_mozilla/mozilla/bluetooth/getPrimaryServices/blacklisted-services-with-uuid.html"
"path": "mozilla/bluetooth/getPrimaryServices/blocklisted-services-with-uuid.html",
"url": "/_mozilla/mozilla/bluetooth/getPrimaryServices/blocklisted-services-with-uuid.html"
}
],
"mozilla/bluetooth/getPrimaryServices/blacklisted-services.html": [
"mozilla/bluetooth/getPrimaryServices/blocklisted-services.html": [
{
"path": "mozilla/bluetooth/getPrimaryServices/blacklisted-services.html",
"url": "/_mozilla/mozilla/bluetooth/getPrimaryServices/blacklisted-services.html"
"path": "mozilla/bluetooth/getPrimaryServices/blocklisted-services.html",
"url": "/_mozilla/mozilla/bluetooth/getPrimaryServices/blocklisted-services.html"
}
],
"mozilla/bluetooth/getPrimaryServices/correct-services.html": [
@ -7244,10 +7244,10 @@
"url": "/_mozilla/mozilla/bluetooth/idl-BluetoothUUID.html"
}
],
"mozilla/bluetooth/readValue/characteristic/blacklisted-characteristic.html": [
"mozilla/bluetooth/readValue/characteristic/blocklisted-characteristic.html": [
{
"path": "mozilla/bluetooth/readValue/characteristic/blacklisted-characteristic.html",
"url": "/_mozilla/mozilla/bluetooth/readValue/characteristic/blacklisted-characteristic.html"
"path": "mozilla/bluetooth/readValue/characteristic/blocklisted-characteristic.html",
"url": "/_mozilla/mozilla/bluetooth/readValue/characteristic/blocklisted-characteristic.html"
}
],
"mozilla/bluetooth/readValue/characteristic/characteristic-is-removed.html": [
@ -7286,10 +7286,10 @@
"url": "/_mozilla/mozilla/bluetooth/readValue/characteristic/service-is-removed.html"
}
],
"mozilla/bluetooth/readValue/descriptor/blacklisted-descriptor.html": [
"mozilla/bluetooth/readValue/descriptor/blocklisted-descriptor.html": [
{
"path": "mozilla/bluetooth/readValue/descriptor/blacklisted-descriptor.html",
"url": "/_mozilla/mozilla/bluetooth/readValue/descriptor/blacklisted-descriptor.html"
"path": "mozilla/bluetooth/readValue/descriptor/blocklisted-descriptor.html",
"url": "/_mozilla/mozilla/bluetooth/readValue/descriptor/blocklisted-descriptor.html"
}
],
"mozilla/bluetooth/readValue/descriptor/characteristic-is-removed.html": [
@ -7358,16 +7358,16 @@
"url": "/_mozilla/mozilla/bluetooth/requestDevice/adapter-off.html"
}
],
"mozilla/bluetooth/requestDevice/blacklisted-service-in-filter.html": [
"mozilla/bluetooth/requestDevice/blocklisted-service-in-filter.html": [
{
"path": "mozilla/bluetooth/requestDevice/blacklisted-service-in-filter.html",
"url": "/_mozilla/mozilla/bluetooth/requestDevice/blacklisted-service-in-filter.html"
"path": "mozilla/bluetooth/requestDevice/blocklisted-service-in-filter.html",
"url": "/_mozilla/mozilla/bluetooth/requestDevice/blocklisted-service-in-filter.html"
}
],
"mozilla/bluetooth/requestDevice/blacklisted-service-in-optionalServices.html": [
"mozilla/bluetooth/requestDevice/blocklisted-service-in-optionalServices.html": [
{
"path": "mozilla/bluetooth/requestDevice/blacklisted-service-in-optionalServices.html",
"url": "/_mozilla/mozilla/bluetooth/requestDevice/blacklisted-service-in-optionalServices.html"
"path": "mozilla/bluetooth/requestDevice/blocklisted-service-in-optionalServices.html",
"url": "/_mozilla/mozilla/bluetooth/requestDevice/blocklisted-service-in-optionalServices.html"
}
],
"mozilla/bluetooth/requestDevice/canonicalizeFilter/empty-filter.html": [
@ -7592,10 +7592,10 @@
"url": "/_mozilla/mozilla/bluetooth/requestDevice/two-filters.html"
}
],
"mozilla/bluetooth/writeValue/characteristic/blacklisted-characteristic.html": [
"mozilla/bluetooth/writeValue/characteristic/blocklisted-characteristic.html": [
{
"path": "mozilla/bluetooth/writeValue/characteristic/blacklisted-characteristic.html",
"url": "/_mozilla/mozilla/bluetooth/writeValue/characteristic/blacklisted-characteristic.html"
"path": "mozilla/bluetooth/writeValue/characteristic/blocklisted-characteristic.html",
"url": "/_mozilla/mozilla/bluetooth/writeValue/characteristic/blocklisted-characteristic.html"
}
],
"mozilla/bluetooth/writeValue/characteristic/characteristic-is-removed.html": [
@ -7634,10 +7634,10 @@
"url": "/_mozilla/mozilla/bluetooth/writeValue/characteristic/write-updates-value.html"
}
],
"mozilla/bluetooth/writeValue/descriptor/blacklisted-descriptor.html": [
"mozilla/bluetooth/writeValue/descriptor/blocklisted-descriptor.html": [
{
"path": "mozilla/bluetooth/writeValue/descriptor/blacklisted-descriptor.html",
"url": "/_mozilla/mozilla/bluetooth/writeValue/descriptor/blacklisted-descriptor.html"
"path": "mozilla/bluetooth/writeValue/descriptor/blocklisted-descriptor.html",
"url": "/_mozilla/mozilla/bluetooth/writeValue/descriptor/blocklisted-descriptor.html"
}
],
"mozilla/bluetooth/writeValue/descriptor/characteristic-is-removed.html": [

10
tests/wpt/mozilla/tests/mozilla/bluetooth/bluetooth-helpers.js
View file

@ -2,14 +2,14 @@
// Bluetooth UUID constants:
// Services:
var blacklist_test_service_uuid = "611c954a-263b-4f4a-aab6-01ddb953f985";
var blocklist_test_service_uuid = "611c954a-263b-4f4a-aab6-01ddb953f985";
var request_disconnection_service_uuid = "01d7d889-7451-419f-aeb8-d65e7b9277af";
// Characteristics:
var blacklist_exclude_reads_characteristic_uuid = "bad1c9a2-9a5b-4015-8b60-1579bbbf2135";
var blocklist_exclude_reads_characteristic_uuid = "bad1c9a2-9a5b-4015-8b60-1579bbbf2135";
var request_disconnection_characteristic_uuid = "01d7d88a-7451-419f-aeb8-d65e7b9277af";
// Descriptors:
var blacklist_exclude_reads_descriptor_uuid = "aaaaaaaa-aaaa-1181-0510-810819516110";
var blacklist_descriptor_uuid = "07711111-6104-0970-7011-1107105110aaa";
var blocklist_exclude_reads_descriptor_uuid = "aaaaaaaa-aaaa-1181-0510-810819516110";
var blocklist_descriptor_uuid = "07711111-6104-0970-7011-1107105110aaa";
var characteristic_user_description_uuid = "00002901-0000-1000-8000-00805f9b34fb";
// Bluetooth Adapter types:
@ -23,7 +23,7 @@ var adapter_type = {
no_name_heart_rate: 'NoNameHeartRateAdapter',
glucose_heart_rate: 'GlucoseHeartRateAdapter',
unicode_device: 'UnicodeDeviceAdapter',
blacklist: 'BlacklistTestAdapter',
blocklist: 'BlocklistTestAdapter',
missing_characteristic_heart_rate: 'MissingCharacteristicHeartRateAdapter',
missing_service_heart_rate: 'MissingServiceHeartRateAdapter',
missing_descriptor_heart_rate: 'MissingDescriptorHeartRateAdapter'

4
tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/blacklisted-characteristic.html → tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristic/blocklisted-characteristic.html
View file

@ -5,12 +5,12 @@
<script>
'use strict';
promise_test(t => {
window.testRunner.setBluetoothMockDataSet(adapter_type.blacklist);
window.testRunner.setBluetoothMockDataSet(adapter_type.blocklist);
return window.navigator.bluetooth.requestDevice({
filters: [{services: [device_information.name]}]
})
.then(device => device.gatt.connect())
.then(gattServer => gattServer.getPrimaryService(device_information.name))
.then(service => promise_rejects(t, 'SecurityError', service.getCharacteristic(serial_number_string.name)));
}, 'Serial Number String characteristic is blacklisted.');
}, 'Serial Number String characteristic is blocklisted.');
</script>

4
tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/blacklisted-characteristics-with-uuid.html → tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/blocklisted-characteristics-with-uuid.html
View file

@ -5,12 +5,12 @@
<script>
'use strict';
promise_test(t => {
window.testRunner.setBluetoothMockDataSet(adapter_type.blacklist);
window.testRunner.setBluetoothMockDataSet(adapter_type.blocklist);
return window.navigator.bluetooth.requestDevice({
filters: [{services: [device_information.name]}]
})
.then(device => device.gatt.connect())
.then(gattServer => gattServer.getPrimaryService(device_information.name))
.then(service => promise_rejects(t, 'SecurityError', service.getCharacteristics(serial_number_string.name)));
}, 'Serial Number String characteristic is blacklisted. Should reject with SecurityError.');
}, 'Serial Number String characteristic is blocklisted. Should reject with SecurityError.');
</script>

4
tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/blacklisted-characteristics.html → tests/wpt/mozilla/tests/mozilla/bluetooth/getCharacteristics/blocklisted-characteristics.html
View file

@ -5,12 +5,12 @@
<script>
'use strict';
promise_test(t => {
window.testRunner.setBluetoothMockDataSet(adapter_type.blacklist);
window.testRunner.setBluetoothMockDataSet(adapter_type.blocklist);
return window.navigator.bluetooth.requestDevice({
filters: [{services: [device_information.name]}]
})
.then(device => device.gatt.connect())
.then(gattServer => gattServer.getPrimaryService(device_information.name))
.then(service => promise_rejects(t, 'NotFoundError', service.getCharacteristics()));
}, 'The Device Information service is composed of blacklisted characteristics so we shouldn\'t find any.');
}, 'The Device Information service is composed of blocklisted characteristics so we shouldn\'t find any.');
</script>

12
tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/blacklisted-descriptor.html → tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptor/blocklisted-descriptor.html
View file

@ -5,14 +5,14 @@
<script>
'use strict';
promise_test(t => {
window.testRunner.setBluetoothMockDataSet(adapter_type.blacklist);
window.testRunner.setBluetoothMockDataSet(adapter_type.blocklist);
return window.navigator.bluetooth.requestDevice({
filters: [{services: [blacklist_test_service_uuid]}]
filters: [{services: [blocklist_test_service_uuid]}]
})
.then(device => device.gatt.connect())
.then(gattServer => gattServer.getPrimaryService(blacklist_test_service_uuid))
.then(service => service.getCharacteristic(blacklist_exclude_reads_characteristic_uuid))
.then(gattServer => gattServer.getPrimaryService(blocklist_test_service_uuid))
.then(service => service.getCharacteristic(blocklist_exclude_reads_characteristic_uuid))
.then(characteristic => promise_rejects(t, 'SecurityError',
characteristic.getDescriptor(blacklist_descriptor_uuid)));
}, 'The descriptor is blacklisted.');
characteristic.getDescriptor(blocklist_descriptor_uuid)));
}, 'The descriptor is blocklisted.');
</script>

12
tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/blacklisted-descriptors-with-uuid.html → tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/blocklisted-descriptors-with-uuid.html
View file

@ -5,14 +5,14 @@
<script>
'use strict';
promise_test(t => {
window.testRunner.setBluetoothMockDataSet(adapter_type.blacklist);
window.testRunner.setBluetoothMockDataSet(adapter_type.blocklist);
return window.navigator.bluetooth.requestDevice({
filters: [{services: [blacklist_test_service_uuid]}]
filters: [{services: [blocklist_test_service_uuid]}]
})
.then(device => device.gatt.connect())
.then(gattServer => gattServer.getPrimaryService(blacklist_test_service_uuid))
.then(service => service.getCharacteristic(blacklist_exclude_reads_characteristic_uuid))
.then(gattServer => gattServer.getPrimaryService(blocklist_test_service_uuid))
.then(service => service.getCharacteristic(blocklist_exclude_reads_characteristic_uuid))
.then(characteristic => promise_rejects(t, 'SecurityError',
characteristic.getDescriptors(blacklist_descriptor_uuid)));
}, 'The descriptor is blacklisted. Should reject with SecurityError.');
characteristic.getDescriptors(blocklist_descriptor_uuid)));
}, 'The descriptor is blocklisted. Should reject with SecurityError.');
</script>

12
tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/blacklisted-descriptors.html → tests/wpt/mozilla/tests/mozilla/bluetooth/getDescriptors/blocklisted-descriptors.html
View file

@ -5,17 +5,17 @@
<script>
'use strict';
promise_test(t => {
window.testRunner.setBluetoothMockDataSet(adapter_type.blacklist);
window.testRunner.setBluetoothMockDataSet(adapter_type.blocklist);
return window.navigator.bluetooth.requestDevice({
filters: [{services: [blacklist_test_service_uuid]}]
filters: [{services: [blocklist_test_service_uuid]}]
})
.then(device => device.gatt.connect())
.then(gattServer => gattServer.getPrimaryService(blacklist_test_service_uuid))
.then(service => service.getCharacteristic(blacklist_exclude_reads_characteristic_uuid))
.then(gattServer => gattServer.getPrimaryService(blocklist_test_service_uuid))
.then(service => service.getCharacteristic(blocklist_exclude_reads_characteristic_uuid))
.then(characteristic => characteristic.getDescriptors())
.then(descriptors => {
assert_equals(descriptors.length, 1);
assert_equals(descriptors[0].uuid, blacklist_exclude_reads_descriptor_uuid);
assert_equals(descriptors[0].uuid, blocklist_exclude_reads_descriptor_uuid);
});
}, 'The descriptors are blacklisted.');
}, 'The descriptors are blocklisted.');
</script>

4
tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/blacklisted-services-with-uuid.html → tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/blocklisted-services-with-uuid.html
View file

@ -5,12 +5,12 @@
<script>
'use strict';
promise_test(t => {
window.testRunner.setBluetoothMockDataSet(adapter_type.blacklist);
window.testRunner.setBluetoothMockDataSet(adapter_type.blocklist);
return window.navigator.bluetooth.requestDevice({
filters: [{services: [device_information.name]}],
optionalServices: [human_interface_device.name]
})
.then(device => device.gatt.connect())
.then(gattServer => promise_rejects(t, 'SecurityError', gattServer.getPrimaryServices(human_interface_device.name)));
}, 'Request for services. Does not return blacklisted service.');
}, 'Request for services. Does not return blocklisted service.');
</script>

8
tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/blacklisted-services.html → tests/wpt/mozilla/tests/mozilla/bluetooth/getPrimaryServices/blocklisted-services.html
View file

@ -5,11 +5,11 @@
<script>
'use strict';
promise_test(() => {
window.testRunner.setBluetoothMockDataSet(adapter_type.blacklist);
window.testRunner.setBluetoothMockDataSet(adapter_type.blocklist);
return window.navigator.bluetooth.requestDevice({
filters: [{services: [device_information.name]}],
optionalServices: [
blacklist_test_service_uuid, generic_access.name,
blocklist_test_service_uuid, generic_access.name,
heart_rate.name, human_interface_device.name
]
})
@ -17,10 +17,10 @@ promise_test(() => {
.then(gattServer => gattServer.getPrimaryServices())
.then(services => {
assert_equals(services.length, 4);
assert_equals(services[0].uuid, blacklist_test_service_uuid);
assert_equals(services[0].uuid, blocklist_test_service_uuid);
assert_equals(services[1].uuid, device_information.uuid);
assert_equals(services[2].uuid, generic_access.uuid);
assert_equals(services[3].uuid, heart_rate.uuid);
});
}, 'Request for services. Does not return blacklisted service.');
}, 'Request for services. Does not return blocklisted service.');
</script>

8
tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/blacklisted-characteristic.html → tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/characteristic/blocklisted-characteristic.html
View file

@ -5,13 +5,13 @@
<script>
'use strict';
promise_test(t => {
window.testRunner.setBluetoothMockDataSet(adapter_type.blacklist);
window.testRunner.setBluetoothMockDataSet(adapter_type.blocklist);
return window.navigator.bluetooth.requestDevice({
filters: [{services: [blacklist_test_service_uuid]}]
filters: [{services: [blocklist_test_service_uuid]}]
})
.then(device => device.gatt.connect())
.then(gattServer => gattServer.getPrimaryService(blacklist_test_service_uuid))
.then(service => service.getCharacteristic(blacklist_exclude_reads_characteristic_uuid))
.then(gattServer => gattServer.getPrimaryService(blocklist_test_service_uuid))
.then(service => service.getCharacteristic(blocklist_exclude_reads_characteristic_uuid))
.then(characteristic => {
return characteristic.writeValue(new Uint8Array(1))
.then(() => promise_rejects(t, 'SecurityError', characteristic.readValue()));

10
tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/blacklisted-descriptor.html → tests/wpt/mozilla/tests/mozilla/bluetooth/readValue/descriptor/blocklisted-descriptor.html
View file

@ -5,14 +5,14 @@
<script>
'use strict';
promise_test(t => {
window.testRunner.setBluetoothMockDataSet(adapter_type.blacklist);
window.testRunner.setBluetoothMockDataSet(adapter_type.blocklist);
return window.navigator.bluetooth.requestDevice({
filters: [{services: [blacklist_test_service_uuid]}]
filters: [{services: [blocklist_test_service_uuid]}]
})
.then(device => device.gatt.connect())
.then(gattServer => gattServer.getPrimaryService(blacklist_test_service_uuid))
.then(service => service.getCharacteristic(blacklist_exclude_reads_characteristic_uuid))
.then(characteristic => characteristic.getDescriptor(blacklist_exclude_reads_descriptor_uuid))
.then(gattServer => gattServer.getPrimaryService(blocklist_test_service_uuid))
.then(service => service.getCharacteristic(blocklist_exclude_reads_characteristic_uuid))
.then(characteristic => characteristic.getDescriptor(blocklist_exclude_reads_descriptor_uuid))
.then(descriptor => {
return descriptor.writeValue(new Uint8Array(1))
.then(() => promise_rejects(t, 'SecurityError', descriptor.readValue()));

6
tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/blacklisted-service-in-filter.html → tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/blocklisted-service-in-filter.html
View file

@ -5,9 +5,9 @@
<script>
'use strict';
promise_test(t => {
window.testRunner.setBluetoothMockDataSet(adapter_type.blacklist);
window.testRunner.setBluetoothMockDataSet(adapter_type.blocklist);
return promise_rejects(
t, 'SecurityError', window.navigator.bluetooth.requestDevice({filters: [{services: [human_interface_device.name]}]}),
'Requesting blacklisted service rejects.');
}, 'Reject with SecurityError if requesting a blacklisted service.');
'Requesting blocklisted service rejects.');
}, 'Reject with SecurityError if requesting a blocklisted service.');
</script>

6
tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/blacklisted-service-in-optionalServices.html → tests/wpt/mozilla/tests/mozilla/bluetooth/requestDevice/blocklisted-service-in-optionalServices.html
View file

@ -6,14 +6,14 @@
'use strict';
promise_test(t => {
let expected = 'SecurityError';
window.testRunner.setBluetoothMockDataSet(adapter_type.blacklist);
window.testRunner.setBluetoothMockDataSet(adapter_type.blocklist);
return window.navigator.bluetooth.requestDevice({
filters: [{services: [blacklist_test_service_uuid]}],
filters: [{services: [blocklist_test_service_uuid]}],
optionalServices: [human_interface_device.name]
})
.then(device => device.gatt.connect())
.then(gattServer => Promise.all([
promise_rejects(t, expected, gattServer.getPrimaryService(human_interface_device.name)),
promise_rejects(t, expected, gattServer.getPrimaryServices(human_interface_device.name))]));
}, 'Blacklisted UUID in optionalServices is removed and access not granted.');
}, 'Blocklisted UUID in optionalServices is removed and access not granted.');
</script>

4
tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/blacklisted-characteristic.html → tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/characteristic/blocklisted-characteristic.html
View file

@ -5,9 +5,9 @@
<script>
'use strict';
promise_test(t => {
window.testRunner.setBluetoothMockDataSet(adapter_type.blacklist);
window.testRunner.setBluetoothMockDataSet(adapter_type.blocklist);
return window.navigator.bluetooth.requestDevice({
filters: [{services: [blacklist_test_service_uuid]}],
filters: [{services: [blocklist_test_service_uuid]}],
optionalServices: [generic_access.name]
})
.then(device => device.gatt.connect())

0
tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/blacklisted-descriptor.html → tests/wpt/mozilla/tests/mozilla/bluetooth/writeValue/descriptor/blocklisted-descriptor.html
View file