Skip to content

GitLab

T
tangled
Commit bf9b7c80 authored by jsbell@chromium.org's avatar jsbell@chromium.org
Browse files
Options

Remove sequential_promise_test helper, just use promise_test 

The upstream implementation of promise_test() in web-platform-test has
changed to run the tests sequentially, removing the need for the
sequential_promise_test() helper. Tests now just use promise_test()
directly.

BUG=451338
R=ortuno@chromium.org

Review URL: https://codereview.chromium.org/1295373003

git-svn-id: svn://svn.chromium.org/blink/trunk@200765 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 4e871776
Hide whitespace changes
Inline Side-by-side
Showing with 102 additions and 149 deletions
third_party/WebKit/LayoutTests/bluetooth/connectGATT.html
View file @ bf9b7c80
<!DOCTYPE html>
<script src="../resources/testharness.js"></script>
<script src="../resources/testharness-helpers.js"></script>
<script src="../resources/testharnessreport.js"></script>
<script src="resources/bluetooth-helpers.js"></script>
<script>
......@@ -9,7 +8,7 @@
test(t => { assert_true(window.testRunner instanceof Object); t.done(); },
'window.testRunner is required for the following tests.');
sequential_promise_test(() => {
promise_test(() => {
testRunner.setBluetoothMockDataSet('GenericAccessAdapter');
return requestDeviceWithKeyDown({filters: [{services: ['generic_access']}]})
.then(device => {
......@@ -87,7 +86,7 @@ sequential_promise_test(() => {
message: 'Unsupported device.'
}
}].forEach(testSpec => {
sequential_promise_test(() => {
promise_test(() => {
testRunner.setBluetoothMockDataSet('FailingConnectionsAdapter');
return requestDeviceWithKeyDown({filters: [{services: [testSpec.uuid]}]})
.then(device => {
......@@ -99,7 +98,7 @@ sequential_promise_test(() => {
}, testSpec.testName);
});
sequential_promise_test(() => {
promise_test(() => {
testRunner.setBluetoothMockDataSet('GenericAccessAdapter');
return requestDeviceWithKeyDown({filters: [{services: ['generic_access']}]})
.then(device => device.connectGATT())
......
third_party/WebKit/LayoutTests/bluetooth/getCharacteristic.html
View file @ bf9b7c80
<!DOCTYPE html>
<script src="../resources/testharness.js"></script>
<script src="../resources/testharness-helpers.js"></script>
<script src="../resources/testharnessreport.js"></script>
<script src="resources/bluetooth-helpers.js"></script>
<script>
......@@ -9,7 +8,7 @@
test(t => { assert_true(window.testRunner instanceof Object); t.done(); },
'window.testRunner is required for the following tests.');
sequential_promise_test(() => {
promise_test(() => {
testRunner.setBluetoothMockDataSet('GenericAccessAdapter');
return requestDeviceWithKeyDown({filters: [{services: ['generic_access']}]})
.then(device => device.connectGATT())
......@@ -24,7 +23,7 @@ sequential_promise_test(() => {
});
}, 'Device goes out of range. Reject with NetworkError.');
sequential_promise_test(() => {
promise_test(() => {
testRunner.setBluetoothMockDataSet('GenericAccessAdapter');
return requestDeviceWithKeyDown({filters: [{services: ['generic_access']}]})
.then(device => device.connectGATT())
......@@ -40,7 +39,7 @@ sequential_promise_test(() => {
}, 'Service is removed. Reject with InvalidStateError.');
sequential_promise_test(() => {
promise_test(() => {
testRunner.setBluetoothMockDataSet('GenericAccessAdapter');
return requestDeviceWithKeyDown({filters: [{services: ['generic_access']}]})
.then(device => device.connectGATT())
......@@ -57,7 +56,7 @@ sequential_promise_test(() => {
});
}, 'Request for wrong characteristic. Should return null.');
sequential_promise_test(() => {
promise_test(() => {
testRunner.setBluetoothMockDataSet('GenericAccessAdapter');
return requestDeviceWithKeyDown({filters: [{services: ['generic_access']}]})
.then(device => device.connectGATT())
......@@ -75,7 +74,7 @@ sequential_promise_test(() => {
});
}, 'Request for characteristic. Should return right characteristic');
sequential_promise_test(() => {
promise_test(() => {
testRunner.setBluetoothMockDataSet('GenericAccessAdapter');
return requestDeviceWithKeyDown({filters: [{services: ['generic_access']}]})
.then(device => device.connectGATT())
......@@ -99,7 +98,7 @@ sequential_promise_test(() => {
});
}, 'Calls to get the same characteristic should return the same object.');
sequential_promise_test(() => {
promise_test(() => {
testRunner.setBluetoothMockDataSet('GenericAccessAdapter');
return requestDeviceWithKeyDown({filters: [{services: ['generic_access']}]})
.then(device => device.connectGATT())
......
third_party/WebKit/LayoutTests/bluetooth/getPrimaryService.html
View file @ bf9b7c80
<!DOCTYPE html>
<script src="../resources/testharness.js"></script>
<script src="../resources/testharness-helpers.js"></script>
<script src="../resources/testharnessreport.js"></script>
<script src="resources/bluetooth-helpers.js"></script>
<script>
......@@ -9,7 +8,7 @@
test(t => { assert_true(window.testRunner instanceof Object); t.done(); },
'window.testRunner is required for the following tests.');
sequential_promise_test(() => {
promise_test(() => {
testRunner.setBluetoothMockDataSet('GenericAccessAdapter');
return requestDeviceWithKeyDown({filters: [{services: ['generic_access']}]})
.then(device => device.connectGATT())
......@@ -23,7 +22,7 @@ sequential_promise_test(() => {
});
}, 'Device goes out of range. Reject with NetworkError.');
sequential_promise_test(function() {
promise_test(function() {
testRunner.setBluetoothMockDataSet('GenericAccessAdapter');
return requestDeviceWithKeyDown({filters: [{services: ['generic_access']}]})
.then(device => device.connectGATT())
......@@ -39,7 +38,7 @@ sequential_promise_test(function() {
});
}, 'Request for wrong service. Should return null.');
sequential_promise_test(function() {
promise_test(function() {
testRunner.setBluetoothMockDataSet('GenericAccessAdapter');
return requestDeviceWithKeyDown({filters: [{services: ['generic_access']}]})
.then(device => device.connectGATT())
......@@ -57,7 +56,7 @@ sequential_promise_test(function() {
});
}, 'Request for service. Should return right service');
sequential_promise_test(function() {
promise_test(function() {
testRunner.setBluetoothMockDataSet('GenericAccessAdapter');
return requestDeviceWithKeyDown({filters: [{services: ['generic_access']}]})
.then(device => device.connectGATT())
......@@ -79,7 +78,7 @@ sequential_promise_test(function() {
});
}, 'Calls to get the same service should return the same object.');
sequential_promise_test(() => {
promise_test(() => {
testRunner.setBluetoothMockDataSet('GenericAccessAdapter');
return requestDeviceWithKeyDown({filters: [{services: ['generic_access']}]})
.then(device => device.connectGATT())
......
third_party/WebKit/LayoutTests/bluetooth/idl-BluetoothDevice.html
View file @ bf9b7c80
<!DOCTYPE html>
<script src="../resources/testharness.js"></script>
<script src="../resources/testharness-helpers.js"></script>
<script src="../resources/testharnessreport.js"></script>
<script src="resources/bluetooth-helpers.js"></script>
<script>
......@@ -14,7 +13,7 @@ test(() => {
test(t => { assert_true(window.testRunner instanceof Object); t.done(); },
'window.testRunner is required for the following tests.');
sequential_promise_test(() => {
promise_test(() => {
testRunner.setBluetoothMockDataSet('GlucoseHeartRateAdapter');
return requestDeviceWithKeyDown({filters: [{services: ['heart_rate']}]})
.then(function(device) {
......
third_party/WebKit/LayoutTests/bluetooth/iframeRequestDevice.html
View file @ bf9b7c80
<!DOCTYPE html>
<script src="../resources/testharness.js"></script>
<script src="../resources/testharness-helpers.js"></script>
<script src="../resources/testharnessreport.js"></script>
<script src="resources/bluetooth-helpers.js"></script>
<body>
......
third_party/WebKit/LayoutTests/bluetooth/readValue.html
View file @ bf9b7c80
<!DOCTYPE html>
<script src="../resources/testharness.js"></script>
<script src="../resources/testharness-helpers.js"></script>
<script src="../resources/testharnessreport.js"></script>
<script src="resources/bluetooth-helpers.js"></script>
<script>
......@@ -9,7 +8,7 @@
test(t => { assert_true(window.testRunner instanceof Object); t.done(); },
'window.testRunner is required for the following tests.');
sequential_promise_test(() => {
promise_test(() => {
testRunner.setBluetoothMockDataSet('GenericAccessAdapter');
return requestDeviceWithKeyDown({filters: [{services: ['generic_access']}]})
.then(device => device.connectGATT())
......@@ -25,7 +24,7 @@ sequential_promise_test(() => {
});
}, 'Device goes out of range. Reject with NetworkError.');
sequential_promise_test(() => {
promise_test(() => {
testRunner.setBluetoothMockDataSet('GenericAccessAdapter');
return requestDeviceWithKeyDown({filters: [{services: ['generic_access']}]})
.then(device => device.connectGATT())
......@@ -41,7 +40,7 @@ sequential_promise_test(() => {
});
}, 'Service gets removed. Reject with InvalidStateError.');
sequential_promise_test(() => {
promise_test(() => {
testRunner.setBluetoothMockDataSet('GenericAccessAdapter');
return requestDeviceWithKeyDown({filters: [{services: ['generic_access']}]})
.then(device => device.connectGATT())
......@@ -126,7 +125,7 @@ sequential_promise_test(() => {
message: 'GATT Error: Not supported.'
}
}].forEach(testSpec => {
sequential_promise_test(() => {
promise_test(() => {
testRunner.setBluetoothMockDataSet('FailingGATTOperationsAdapter');
return requestDeviceWithKeyDown({filters: [{services: [errorUUID(0xA0)]}]})
.then(device => device.connectGATT())
......@@ -141,7 +140,7 @@ sequential_promise_test(() => {
}, testSpec.testName);
});
sequential_promise_test(() => {
promise_test(() => {
testRunner.setBluetoothMockDataSet('GenericAccessAdapter');
return requestDeviceWithKeyDown({filters: [{services: ['generic_access']}]})
.then(device => device.connectGATT())
......
third_party/WebKit/LayoutTests/bluetooth/requestDevice.html
View file @ bf9b7c80
......@@ -9,19 +9,19 @@
test(function(t) { assert_true(window.testRunner instanceof Object); t.done(); },
'window.testRunner is required for the following tests.');
sequential_promise_test(() => {
promise_test(() => {
testRunner.setBluetoothMockDataSet('EmptyAdapter');
return assert_promise_rejects(requestDeviceWithKeyDown(),
new TypeError());
}, 'Requires an argument.');
sequential_promise_test(() => {
promise_test(() => {
testRunner.setBluetoothMockDataSet('EmptyAdapter');
return assert_promise_rejects(requestDeviceWithKeyDown({}),
new TypeError());
}, 'RequestDeviceOptions requires a |filters| member.');
sequential_promise_test(() => {
promise_test(() => {
testRunner.setBluetoothMockDataSet('FailStartDiscoveryAdapter');
return assert_promise_rejects_with_message(
requestDeviceWithKeyDown({filters: [{services: ['generic_access']}]}),
......@@ -29,7 +29,7 @@ sequential_promise_test(() => {
'The adapter failed to start a discovery session.');
}, 'Discovery session fails to start.');
sequential_promise_test(() => {
promise_test(() => {
testRunner.setBluetoothMockDataSet('NotPresentAdapter');
return assert_promise_rejects_with_message(
requestDeviceWithKeyDown({filters: [{services: ['generic_access']}]}),
......@@ -37,7 +37,7 @@ sequential_promise_test(() => {
'Bluetooth adapter is not present.');
}, 'Reject with NotFoundError if the adapter is not present.');
sequential_promise_test(() => {
promise_test(() => {
testRunner.setBluetoothMockDataSet('NotPoweredAdapter');
return assert_promise_rejects_with_message(
requestDeviceWithKeyDown({filters: [{services: ['generic_access']}]}),
......@@ -45,7 +45,7 @@ sequential_promise_test(() => {
'Bluetooth adapter is not powered.');
}, 'Reject with NotFoundError if the adapter is off.');
sequential_promise_test(() => {
promise_test(() => {
testRunner.setBluetoothMockDataSet('EmptyAdapter');
return assert_promise_rejects_with_message(
requestDeviceWithKeyDown({filters: [{services: ['generic_access']}]}),
......@@ -53,7 +53,7 @@ sequential_promise_test(() => {
'No Bluetooth devices in range.');
}, 'Reject with NotFoundError if there are no devices around.');
sequential_promise_test(() => {
promise_test(() => {
testRunner.setBluetoothMockDataSet('GenericAccessAdapter');
return Promise.all([
requestDeviceWithKeyDown({filters: [{services: [generic_access.alias]}]}),
......@@ -66,14 +66,14 @@ sequential_promise_test(() => {
});
}, 'Mock will resolve.');
sequential_promise_test(() => {
promise_test(() => {
testRunner.setBluetoothMockDataSet('GenericAccessAdapter');
return assert_promise_rejects(
navigator.bluetooth.requestDevice({filters: [{services: ['generic_access']}]}),
'SecurityError');
}, 'Requires a user gesture.');
sequential_promise_test(() => {
promise_test(() => {
testRunner.setBluetoothMockDataSet('GenericAccessAdapter');
return callWithKeyDown(() => {
var first = navigator.bluetooth.requestDevice({filters: [{services: ['generic_access']}]});
......@@ -85,7 +85,7 @@ sequential_promise_test(() => {
});
}, 'Consumes a user gesture.');
sequential_promise_test(() => {
promise_test(() => {
testRunner.setBluetoothMockDataSet('GenericAccessAdapter');
return Promise.all([
requestDeviceWithKeyDown({filters: [{services: [generic_access.alias]}]}),
......@@ -100,7 +100,7 @@ sequential_promise_test(() => {
});
}, 'Returned device should always be the same.');
sequential_promise_test(() => {
promise_test(() => {
testRunner.setBluetoothMockDataSet('ScanFilterCheckingAdapter');
// The work of this test is done in the ScanFilterCheckingAdapter. It asserts
// that this requestDevice() call tells the platform to scan for only devices
......@@ -115,20 +115,20 @@ sequential_promise_test(() => {
});
}, 'Filters restrict the platform\'s Bluetooth scan.');
sequential_promise_test(() => {
promise_test(() => {
testRunner.setBluetoothMockDataSet('GlucoseHeartRateAdapter');
return requestDeviceWithKeyDown({filters: [{services: ['glucose']}]})
.then(device => assert_equals(device.name, 'Glucose Device'));
}, 'Simple filter selects matching device.');
sequential_promise_test(() => {
promise_test(() => {
testRunner.setBluetoothMockDataSet('GlucoseHeartRateAdapter');
return requestDeviceWithKeyDown({
filters: [{services: ['generic_access', 'heart_rate']}]
}).then(device => assert_equals(device.name, 'Heart Rate Device'));
}, 'Filter with 2 services returns a matching device.');
sequential_promise_test(() => {
promise_test(() => {
testRunner.setBluetoothMockDataSet('GlucoseHeartRateAdapter');
return requestDeviceWithKeyDown({
filters: [{services: ['battery_service']},
......@@ -136,7 +136,7 @@ sequential_promise_test(() => {
}).then(device => assert_equals(device.name, 'Heart Rate Device'));
}, 'An extra filter doesn\'t prevent matching.');
sequential_promise_test(() => {
promise_test(() => {
testRunner.setBluetoothMockDataSet('GlucoseHeartRateAdapter');
// Both devices support the Generic Access service, but things need to
// support both services to pass the filter, and neither has a Battery
......
third_party/WebKit/LayoutTests/bluetooth/writeValue.html
View file @ bf9b7c80
<!DOCTYPE html>
<script src="../resources/testharness.js"></script>
<script src="../resources/testharness-helpers.js"></script>
<script src="../resources/testharnessreport.js"></script>
<script src="resources/bluetooth-helpers.js"></script>
<script>
......@@ -9,7 +8,7 @@
test(function(t) { assert_exists(window, 'testRunner'); t.done(); },
'window.testRunner is required for the following tests.');
sequential_promise_test(() => {
promise_test(() => {
testRunner.setBluetoothMockDataSet('GenericAccessAdapter');
return requestDeviceWithKeyDown({filters: [{services: ['generic_access']}]})
.then(device => device.connectGATT())
......@@ -25,7 +24,7 @@ sequential_promise_test(() => {
});
}, 'Device goes out of range. Reject with NetworkError.');
sequential_promise_test(() => {
promise_test(() => {
testRunner.setBluetoothMockDataSet('GenericAccessAdapter');
return requestDeviceWithKeyDown({filters: [{services: ['generic_access']}]})
.then(device => device.connectGATT())
......@@ -41,7 +40,7 @@ sequential_promise_test(() => {
});
}, 'Service gets removed. Reject with InvalidStateError.');
sequential_promise_test(() => {
promise_test(() => {
testRunner.setBluetoothMockDataSet('GenericAccessAdapter');
return requestDeviceWithKeyDown({filters: [{services: ['generic_access']}]})
.then(device => device.connectGATT())
......@@ -125,7 +124,7 @@ sequential_promise_test(() => {
message: 'GATT Error: Not supported.'
}
}].forEach(testSpec => {
sequential_promise_test(() => {
promise_test(() => {
testRunner.setBluetoothMockDataSet('FailingGATTOperationsAdapter');
return requestDeviceWithKeyDown({filters: [{services: [errorUUID(0xA0)]}]})
.then(device => device.connectGATT())
......@@ -140,7 +139,7 @@ sequential_promise_test(() => {
}, testSpec.testName);
});
sequential_promise_test(() => {
promise_test(() => {
testRunner.setBluetoothMockDataSet('GenericAccessAdapter');
return requestDeviceWithKeyDown({filters: [{services: ['generic_access']}]})
.then(device => device.connectGATT())
......@@ -155,7 +154,7 @@ sequential_promise_test(() => {
});
}, 'Trying to write more than 512 bytes should return an error.');
sequential_promise_test(() => {
promise_test(() => {
testRunner.setBluetoothMockDataSet('GenericAccessAdapter');
return requestDeviceWithKeyDown({filters: [{services: ['generic_access']}]})
.then(device => device.connectGATT())
......
third_party/WebKit/LayoutTests/http/tests/fetch/chromium/error-messages.html
View file @ bf9b7c80
......@@ -4,12 +4,12 @@
<script src="/resources/testharness-helpers.js"></script>
<script src="../resources/fetch-test-helpers.js"></script>
<script>
sequential_promise_test(function(t) {
promise_test(function(t) {
return fetch('../resources/doctype.html')
.then(function() {}, t.unreached_func('must resolve'));
}, 'fetch() with 200 should not output error messages');
sequential_promise_test(function(t) {
promise_test(function(t) {
return fetch('../resources/not-found.html')
.then(function() {}, t.unreached_func('must resolve'));
}, 'fetch() with 404 should not output error messages');
......@@ -17,12 +17,12 @@ sequential_promise_test(function(t) {
// Two didFail() errors
// that have console error messages from outside modules/fetch,
// and thus we OMIT messages from modules/fetch.
sequential_promise_test(function(t) {
promise_test(function(t) {
return fetch('../resources/redirect-loop.php?Count=100')
.then(t.unreached_func('must reject'), function() {});
}, 'net::ERR_TOO_MANY_REDIRECTS should not output error messages');
sequential_promise_test(function(t) {
promise_test(function(t) {
return fetch('../resources/slow-failure.cgi')
.then(function() {}, t.unreached_func('must resolve'));
}, 'net::ERR_INVALID_CHUNKED_ENCODING should not output error messages');
......@@ -30,7 +30,7 @@ sequential_promise_test(function(t) {
// A didFailAccessControlCheck() error
// that has NO console error messages from outside modules/fetch,
// and thus we OUTPUT a message from modules/fetch.
sequential_promise_test(function(t) {
promise_test(function(t) {
return fetch('http://localhost:8000/fetch/resources/doctype.html')
.then(t.unreached_func('must reject'), function() {});
}, 'A didFailAccessControlCheck() error should output an error message');
......@@ -38,12 +38,12 @@ sequential_promise_test(function(t) {
// A didFailRedirectCheck() error
// that has NO console error messages from outside modules/fetch,
// and thus we OUTPUT a message from modules/fetch.
sequential_promise_test(function(t) {
promise_test(function(t) {
return fetch('http://localhost:8000/fetch/resources/redirect-loop.php?Count=100&ACAOrigin=*')
.then(t.unreached_func('must reject'), function() {});
}, 'A didFailRedirectCheck() error should output an error message');
sequential_promise_test(function(t) {
promise_test(function(t) {
return Promise.resolve()
.then(function() {
var request = new Request('http://localhost/');
......
third_party/WebKit/LayoutTests/http/tests/fetch/resources/thorough-util.js
View file @ bf9b7c80
......@@ -397,7 +397,7 @@ function executeTest(test_target) {
function executeTests(test_targets) {
for (var i = 0; i < test_targets.length; ++i) {
sequential_promise_test(
promise_test(
function(counter, t) {
return executeTest(test_targets[counter]);
}.bind(this, i),
......
third_party/WebKit/LayoutTests/http/tests/fetch/script-tests/body-mixin.js
View file @ bf9b7c80
......@@ -12,7 +12,7 @@ function readStream(reader, values) {
return reader.closed;
}
sequential_promise_test(function(test) {
promise_test(function(test) {
return fetch('/fetch/resources/doctype.html')
.then(function(response) {
// Accessing the body property makes the stream start working.
......@@ -24,7 +24,7 @@ sequential_promise_test(function(test) {
})
}, 'FetchTextAfterAccessingStreamTest');
sequential_promise_test(function(test) {
promise_test(function(test) {
var chunks = [];
var actual = '';
return fetch('/fetch/resources/doctype.html')
......@@ -43,7 +43,7 @@ sequential_promise_test(function(test) {
})
}, 'FetchStreamTest');
sequential_promise_test(function(test) {
promise_test(function(test) {
return fetch('/fetch/resources/progressive.php')
.then(function(response) {
var p1 = response.text();
......@@ -62,7 +62,7 @@ sequential_promise_test(function(test) {
})
}, 'FetchTwiceTest');
sequential_promise_test(function(test) {
promise_test(function(test) {
return fetch('/fetch/resources/doctype.html')
.then(function(response) {
return response.arrayBuffer();
......@@ -72,7 +72,7 @@ sequential_promise_test(function(test) {
})
}, 'ArrayBufferTest');
sequential_promise_test(function(test) {
promise_test(function(test) {
return fetch('/fetch/resources/doctype.html')
.then(function(response) {
return response.blob();
......@@ -83,7 +83,7 @@ sequential_promise_test(function(test) {
})
}, 'BlobTest');
sequential_promise_test(function(test) {
promise_test(function(test) {
return fetch('/fetch/resources/doctype.html')
.then(function(response) {
return response.json();
......@@ -95,7 +95,7 @@ sequential_promise_test(function(test) {
})
}, 'JSONFailedTest');
sequential_promise_test(function(test) {
promise_test(function(test) {
return fetch('/fetch/resources/simple.json')
.then(function(response) {
return response.json();
......@@ -106,7 +106,7 @@ sequential_promise_test(function(test) {
})
}, 'JSONTest');
sequential_promise_test(function(test) {
promise_test(function(test) {
return fetch('/fetch/resources/doctype.html')
.then(function(response) {
return response.text();
......@@ -116,7 +116,7 @@ sequential_promise_test(function(test) {
})
}, 'TextTest');
sequential_promise_test(function(test) {
promise_test(function(test) {
return fetch('/fetch/resources/non-ascii.txt')
.then(function(response) {
return response.text();
......@@ -126,7 +126,7 @@ sequential_promise_test(function(test) {
})
}, 'NonAsciiTextTest');
sequential_promise_test(function(test) {
promise_test(function(test) {
var expected = '';
for (var i = 0; i < 100; ++i)
expected += i;
......
third_party/WebKit/LayoutTests/http/tests/fetch/script-tests/fetch.js
View file @ bf9b7c80
......@@ -2,7 +2,7 @@ if (self.importScripts) {
importScripts('../resources/fetch-test-helpers.js');
}
sequential_promise_test(function(t) {
promise_test(function(t) {
return fetch('http://')
.then(
t.unreached_func('fetch of invalid URL must fail'),
......@@ -13,7 +13,7 @@ sequential_promise_test(function(t) {
// Step 4:
// request's url's scheme is not one of "http" and "https"
// A network error.
sequential_promise_test(function(t) {
promise_test(function(t) {
return fetch('ftp://localhost/')
.then(
t.unreached_func('fetch of non-HTTP(S) CORS must fail'),
......@@ -24,14 +24,14 @@ sequential_promise_test(function(t) {
// The last statement:
// Otherwise
// Return a network error.
sequential_promise_test(function(t) {
promise_test(function(t) {
return fetch('foobar://localhost/', {mode: 'no-cors'})
.then(
t.unreached_func('scheme not listed in basic fetch spec must fail'),
function() {});
}, 'fetch of scheme not listed in basic fetch spec');
sequential_promise_test(function(t) {
promise_test(function(t) {
return fetch('/fetch/resources/fetch-status.php?status=200')
.then(function(response) {
assert_equals(response.status, 200);
......@@ -39,7 +39,7 @@ sequential_promise_test(function(t) {
});
}, 'Fetch result of 200 response');
sequential_promise_test(function(t) {
promise_test(function(t) {
return fetch('/fetch/resources/fetch-status.php?status=404')
.then(function(response) {
assert_equals(response.status, 404);
......@@ -47,7 +47,7 @@ sequential_promise_test(function(t) {
});
}, 'Fetch result of 404 response');
sequential_promise_test(function(t) {
promise_test(function(t) {
var request = new Request(
'/fetch/resources/fetch-status.php?status=200#fragment');
......@@ -71,7 +71,7 @@ sequential_promise_test(function(t) {
});
}, 'Request/response url attribute getter with fragment');
sequential_promise_test(function(t) {
promise_test(function(t) {
var redirect_target_url =
BASE_ORIGIN + '/fetch/resources/fetch-status.php?status=200';
var redirect_original_url =
......@@ -103,7 +103,7 @@ function evalJsonp(text) {
});
}
sequential_promise_test(function(t) {
promise_test(function(t) {
var request =
new Request('/serviceworker/resources/fetch-access-control.php',
{
......@@ -121,7 +121,7 @@ sequential_promise_test(function(t) {
});
}, 'Fetch with Blob body test');
sequential_promise_test(function(t) {
promise_test(function(t) {
var request = new Request(
'/serviceworker/resources/fetch-access-control.php',
{method: 'POST', body: 'Test String'});
......@@ -134,7 +134,7 @@ sequential_promise_test(function(t) {
});
}, 'Fetch with string body test');
sequential_promise_test(function(t) {
promise_test(function(t) {
var text = 'Test ArrayBuffer';
var array = new Uint8Array(text.length);
for (var i = 0; i < text.length; ++i)
......@@ -151,7 +151,7 @@ sequential_promise_test(function(t) {
});
}, 'Fetch with ArrayBuffer body test');
sequential_promise_test(function(t) {
promise_test(function(t) {
var text = 'Test ArrayBufferView';
var array = new Uint8Array(text.length);
for (var i = 0; i < text.length; ++i)
......@@ -168,7 +168,7 @@ sequential_promise_test(function(t) {
});
}, 'Fetch with ArrayBufferView body test');
sequential_promise_test(function(t) {
promise_test(function(t) {
var formData = new FormData();
formData.append('StringKey1', '1234567890');
formData.append('StringKey2', 'ABCDEFGHIJ');
......@@ -198,7 +198,7 @@ sequential_promise_test(function(t) {
});
}, 'Fetch with FormData body test');
sequential_promise_test(function(t) {
promise_test(function(t) {
return fetch('../resources/fetch-test-helpers.js')
.then(function(res) { return res.text(); })
.then(function(text) { assert_not_equals(text, ''); });
......
third_party/WebKit/LayoutTests/http/tests/fetch/script-tests/filtered-response.js
View file @ bf9b7c80
......@@ -48,7 +48,7 @@ var headers_cookies = ['sEt-cOokie', 'sEt-cOokie2'];
// basic filtered response
['same-origin', 'cors'].forEach(function(mode) {
sequential_promise_test(function(t) {
promise_test(function(t) {
return fetch(base_url, {mode: mode})
.then(function(response) {
assert_equals(response.type, 'basic');
......@@ -59,14 +59,14 @@ var headers_cookies = ['sEt-cOokie', 'sEt-cOokie2'];
});
// CORS filtered response
sequential_promise_test(function() {
promise_test(function() {
return fetch(other_url, {mode: 'cors'})
.then(function(response) {
check_headers(response.headers, headers_common, [], false);
});
}, 'CORS filtered response');
sequential_promise_test(function() {
promise_test(function() {
// Access-Control-Expose-Headers with a single header name
return fetch(other_url + '?ACEHeaders=x-teSt', {mode: 'cors'})
.then(function(response) {
......
third_party/WebKit/LayoutTests/http/tests/fetch/script-tests/stream-reader.js
View file @ bf9b7c80
......@@ -17,7 +17,7 @@ function read_until_end(reader) {
return consume();
}
sequential_promise_test(function(t) {
promise_test(function(t) {
return fetch('/fetch/resources/doctype.html').then(function(res) {
var stream = res.body;
var reader = stream.getReader();
......@@ -28,7 +28,7 @@ sequential_promise_test(function(t) {
});
}, 'ReadableStreamReader acquisition / releasing');
sequential_promise_test(function(t) {
promise_test(function(t) {
return fetch('/fetch/resources/doctype.html').then(function(res) {
var reader = res.body.getReader();
return read_until_end(reader);
......@@ -50,7 +50,7 @@ sequential_promise_test(function(t) {
});
}, 'read contents with ReadableStreamReader');
sequential_promise_test(function(t) {
promise_test(function(t) {
return fetch('/fetch/resources/progressive.php').then(function(res) {
assert_false(res.bodyUsed);
var reader = res.body.getReader();
......@@ -61,7 +61,7 @@ sequential_promise_test(function(t) {
});
}, 'acquiring a reader should set bodyUsed.');
sequential_promise_test(function(t) {
promise_test(function(t) {
var response;
return fetch('/fetch/resources/progressive.php').then(function(res) {
response = res;
......@@ -77,7 +77,7 @@ sequential_promise_test(function(t) {
});
}, 'Setting bodyUsed means the body is locked.');
sequential_promise_test(function(t) {
promise_test(function(t) {
return fetch('/fetch/resources/slow-failure.cgi').then(function(res) {
return res.text().then(function() {
assert_unreached('text() should fail');
......@@ -89,7 +89,7 @@ sequential_promise_test(function(t) {
});
}, 'Error in text() should be propagated to the body stream.');
sequential_promise_test(function(t) {
promise_test(function(t) {
var reader;
var read = 0;
var original;
......@@ -131,7 +131,7 @@ sequential_promise_test(function(t) {
});
}, 'Clone after reading partially');
sequential_promise_test(function(t) {
promise_test(function(t) {
return fetch('/fetch/resources/progressive.php').then(function(res) {
res.body.cancel();
return res.text();
......@@ -140,7 +140,7 @@ sequential_promise_test(function(t) {
});
}, 'Cancelling stream stops downloading.');
sequential_promise_test(function(t) {
promise_test(function(t) {
return fetch('/fetch/resources/progressive.php').then(function(res) {
var clone = res.clone();
res.body.cancel();
......@@ -151,7 +151,7 @@ sequential_promise_test(function(t) {
});
}, 'Cancelling stream should not affect cloned one.');
sequential_promise_test(function(t) {
promise_test(function(t) {
var stream;
return fetch('/fetch/resources/progressive.php').then(function(res) {
var p = res.text();
......
third_party/WebKit/LayoutTests/http/tests/navigatorconnect/resources/connect-event-worker.js
View file @ bf9b7c80
......@@ -20,11 +20,11 @@ self.addEventListener('install', function(event) {
});
self.addEventListener('activate', function(event) {
sequential_promise_test(function(test) {
promise_test(function(test) {
return wait_for_state(test, self.registration.active, 'activated');
}, 'wait for worker to be activated');
sequential_promise_test(function(test) {
promise_test(function(test) {
var respondResult = NewResolvablePromise();
navigator.services.onconnect = test.step_func(function(event) {
respondResult.resolve(event.respondWith({accept: true}));
......@@ -33,7 +33,7 @@ self.addEventListener('activate', function(event) {
navigator.services.connect(self.registration.scope + '/service')]);
}, 'respondWith can synchronously accept a connection without a promise.');
sequential_promise_test(function(test) {
promise_test(function(test) {
var respondResult = NewResolvablePromise();
navigator.services.onconnect = test.step_func(function(event) {
respondResult.resolve(
......@@ -43,7 +43,7 @@ self.addEventListener('activate', function(event) {
navigator.services.connect(self.registration.scope + '/service')]);
}, 'respondWith can synchronously accept a connection with a promise.');
sequential_promise_test(function(test) {
promise_test(function(test) {
var respondResult = NewResolvablePromise();
navigator.services.onconnect = test.step_func(function(event) {
respondResult.resolve(
......@@ -55,7 +55,7 @@ self.addEventListener('activate', function(event) {
navigator.services.connect(self.registration.scope + '/service')]);
}, 'respondWith can asynchronously accept a connection.');
sequential_promise_test(function(test) {
promise_test(function(test) {
var respondResult = NewResolvablePromise();
navigator.services.onconnect = test.step_func(function(event) {
respondResult.resolve(
......@@ -68,7 +68,7 @@ self.addEventListener('activate', function(event) {
]);
}, 'respondWith can synchronously reject a connection without a promise.');
sequential_promise_test(function(test) {
promise_test(function(test) {
var respondResult = NewResolvablePromise();
navigator.services.onconnect = test.step_func(function(event) {
respondResult.resolve(
......@@ -81,7 +81,7 @@ self.addEventListener('activate', function(event) {
]);
}, 'respondWith can synchronously reject a connection with a resolved promise.');
sequential_promise_test(function(test) {
promise_test(function(test) {
var respondResult = NewResolvablePromise();
navigator.services.onconnect = test.step_func(function(event) {
respondResult.resolve(
......@@ -94,14 +94,14 @@ self.addEventListener('activate', function(event) {
]);
}, 'respondWith can synchronously reject a connection with a rejected promise.');
sequential_promise_test(function(test) {
promise_test(function(test) {
navigator.services.onconnect = test.step_func(function(event) {
});
return promise_rejects(test, 'AbortError',
navigator.services.connect(self.registration.scope + '/service'));
}, 'Not calling respondWith will reject the connection.');
sequential_promise_test(function(test) {
promise_test(function(test) {
var respondResult1 = NewResolvablePromise();
var respondResult2 = NewResolvablePromise();
navigator.services.onconnect = test.step_func(function(event) {
......@@ -114,7 +114,7 @@ self.addEventListener('activate', function(event) {
navigator.services.connect(self.registration.scope + '/service')]);
}, 'Calling respondWith a second time will fail.');
sequential_promise_test(function(test) {
promise_test(function(test) {
var respondResult = NewResolvablePromise();
navigator.services.onconnect = test.step_func(function(event) {
respondResult.resolve(
......
third_party/WebKit/LayoutTests/http/tests/navigatorconnect/resources/postmessage-tests.js
View file @ bf9b7c80
......@@ -23,7 +23,7 @@ function run_postmessage_tests(source_origin, connect_method) {
if (source_origin.charAt(source_origin.length - 1) != '/')
source_origin += '/';
sequential_promise_test(function(t) {
promise_test(function(t) {
var scope = sw_scope + '/echo';
var sw_url = 'resources/echo-worker.js';
var test_message = 'ping over navigator.connect';
......@@ -44,7 +44,7 @@ function run_postmessage_tests(source_origin, connect_method) {
});
}, 'Messages can be sent and received.');
sequential_promise_test(function(t) {
promise_test(function(t) {
var scope = sw_scope + '/echo-port';
var sw_url = 'resources/echo-worker.js';
var test_message = 'ping over navigator.connect';
......@@ -72,7 +72,7 @@ function run_postmessage_tests(source_origin, connect_method) {
});
}, 'Ports can be sent and received.');
sequential_promise_test(function(t) {
promise_test(function(t) {
var scope = sw_scope + '/reply-client-info';
var sw_url = 'resources/reply-client-info-worker.js';
var target_url = scope + '/service';
......
third_party/WebKit/LayoutTests/http/tests/resources/testharness-helpers.js
View file @ bf9b7c80
......@@ -142,23 +142,3 @@ function stringifyDOMObject(object)
}
return JSON.stringify(deepCopy(object));
}
(function() {
var promise_tests = Promise.resolve();
// Helper function to run promise tests one after the other.
// TODO(ortuno): Remove once https://github.com/w3c/testharness.js/pull/115/files
// gets through.
function sequential_promise_test(func, name) {
var test = async_test(name);
promise_tests = promise_tests.then(function() {
return test.step(func, test, test);
}).then(function() {
test.done();
}).catch(test.step_func(function(value) {
// step_func catches the error again so the error doesn't propagate.
throw value;
}));
}
self.sequential_promise_test = sequential_promise_test;
})();
third_party/WebKit/LayoutTests/http/tests/serviceworker/getregistrations.html
View file @ bf9b7c80
......@@ -9,7 +9,7 @@
// Purge the existing registrations for the origin.
// getRegistrations() is used in order to avoid adding additional complexity
// e.g. adding an internal function.
sequential_promise_test(function(t) {
promise_test(function(t) {
var resolve;
var timer;
var p = new Promise(function(r) { resolve = r; });
......@@ -35,7 +35,7 @@ sequential_promise_test(function(t) {
return p;
}, 'Purge the existing registrations.');
sequential_promise_test(function(t) {
promise_test(function(t) {
var scope = 'resources/scope/getregistrations/normal';
var script = 'resources/empty-worker.js';
var registrations = [];
......@@ -53,7 +53,7 @@ sequential_promise_test(function(t) {
});
}, 'Register then getRegistrations');
sequential_promise_test(function(t) {
promise_test(function(t) {
var scope1 = 'resources/scope/getregistrations/scope1';
var scope2 = 'resources/scope/getregistrations/scope2';
var script = 'resources/empty-worker.js';
......@@ -79,7 +79,7 @@ sequential_promise_test(function(t) {
});
}, 'Register multiple times then getRegistrations');
sequential_promise_test(function(t) {
promise_test(function(t) {
var scope = 'resources/scope/getregistrations/register-unregister';
var script = 'resources/empty-worker.js';
return service_worker_unregister_and_register(t, script, scope)
......@@ -97,7 +97,7 @@ sequential_promise_test(function(t) {
});
}, 'Register then Unregister then getRegistrations');
sequential_promise_test(function(t) {
promise_test(function(t) {
// Top-level window's origin: http://127.0.0.1:8000.
// Frame's origin: http://localhost:8000.
var host_info = get_host_info();
......
third_party/WebKit/LayoutTests/resources/testharness-helpers.js
View file @ bf9b7c80
......@@ -161,23 +161,3 @@ function stringifyDOMObject(object)
}
return JSON.stringify(deepCopy(object));
}
(function() {
var promise_tests = Promise.resolve();
// Helper function to run promise tests one after the other.
// TODO(ortuno): Remove once https://github.com/w3c/testharness.js/pull/115/files
// gets through.
function sequential_promise_test(func, name) {
var test = async_test(name);
promise_tests = promise_tests.then(function() {
return test.step(func, test, test);
}).then(function() {
test.done();
}).catch(test.step_func(function(value) {
// step_func catches the error again so the error doesn't propagate.
throw value;
}));
}
self.sequential_promise_test = sequential_promise_test;
})();
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment