| Index: LayoutTests/http/tests/serviceworker/resources/headers-worker.js
|
| diff --git a/LayoutTests/http/tests/serviceworker/resources/headers-worker.js b/LayoutTests/http/tests/serviceworker/resources/headers-worker.js
|
| index 5d4de507f79e74acada66e234b9621c569684fdc..8693bac742598e6055dc15a535cffb3ac1464199 100644
|
| --- a/LayoutTests/http/tests/serviceworker/resources/headers-worker.js
|
| +++ b/LayoutTests/http/tests/serviceworker/resources/headers-worker.js
|
| @@ -10,9 +10,9 @@ test(function() {
|
| }
|
|
|
| var expectedMap = {
|
| - 'content-language': 'ja',
|
| - 'content-type': 'text/html; charset=UTF-8',
|
| - 'x-serviceworker-test': 'response test field'
|
| + 'content-language': 'ja',
|
| + 'content-type': 'text/html; charset=UTF-8',
|
| + 'x-serviceworker-test': 'response test field'
|
| };
|
|
|
| var headers = new Headers;
|
| @@ -27,7 +27,8 @@ test(function() {
|
| assert_true(headers.has(key));
|
| assert_true(headers.has(key.toUpperCase()));
|
| assert_equals(headers.get(key), expectedMap[key.toLowerCase()]);
|
| - assert_equals(headers.get(key.toUpperCase()), expectedMap[key.toLowerCase()]);
|
| + assert_equals(headers.get(key.toUpperCase()),
|
| + expectedMap[key.toLowerCase()]);
|
| assert_equals(headers.get('dummy'), null);
|
| assert_false(headers.has('dummy'));
|
|
|
| @@ -37,52 +38,54 @@ test(function() {
|
| assert_equals(size(headers), 2, 'headers size should have -1 size');
|
| Object.keys(expectedMap).forEach(function(key) {
|
| if (key == deleteKey.toLowerCase())
|
| - assert_false(headers.has(key));
|
| + assert_false(headers.has(key));
|
| else
|
| - assert_true(headers.has(key));
|
| - });
|
| + assert_true(headers.has(key));
|
| + });
|
|
|
| // 'set()'
|
| var testCasesForSet = [
|
| - // For a new key/value pair.
|
| - { key: 'Cache-Control',
|
| - value: 'max-age=3600',
|
| - isNewEntry: true },
|
| -
|
| - // For an existing key.
|
| - { key: 'X-ServiceWorker-Test',
|
| - value: 'response test field - updated',
|
| - isUpdate: true },
|
| -
|
| - // For setting a numeric value, expecting to see DOMString on getting.
|
| - { key: 'X-Numeric-Value',
|
| - value: 12345,
|
| - expectedValue: '12345',
|
| - isNewEntry: true },
|
| -
|
| - // For case-insensitivity test.
|
| - { key: 'content-language',
|
| - value: 'fi',
|
| - isUpdate: true }
|
| + // For a new key/value pair.
|
| + { key: 'Cache-Control',
|
| + value: 'max-age=3600',
|
| + isNewEntry: true },
|
| +
|
| + // For an existing key.
|
| + { key: 'X-ServiceWorker-Test',
|
| + value: 'response test field - updated',
|
| + isUpdate: true },
|
| +
|
| + // For setting a numeric value, expecting to see DOMString on getting.
|
| + { key: 'X-Numeric-Value',
|
| + value: 12345,
|
| + expectedValue: '12345',
|
| + isNewEntry: true },
|
| +
|
| + // For case-insensitivity test.
|
| + { key: 'content-language',
|
| + value: 'fi',
|
| + isUpdate: true }
|
| ];
|
|
|
| var expectedHeaderSize = size(headers);
|
| testCasesForSet.forEach(function(testCase) {
|
| var key = testCase.key;
|
| var value = testCase.value;
|
| - var expectedValue = ('expectedValue' in testCase) ? testCase.expectedValue : testCase.value;
|
| - expectedHeaderSize = testCase.isNewEntry ? (expectedHeaderSize + 1) : expectedHeaderSize;
|
| + var expectedValue = ('expectedValue' in testCase) ?
|
| + testCase.expectedValue : testCase.value;
|
| + expectedHeaderSize = testCase.isNewEntry ?
|
| + (expectedHeaderSize + 1) : expectedHeaderSize;
|
|
|
| headers.set(key, value);
|
| assert_true(headers.has(key));
|
| assert_equals(headers.get(key), expectedValue);
|
| if (testCase.isUpdate)
|
| - assert_true(headers.get(key) != expectedMap[key.toLowerCase()]);
|
| + assert_true(headers.get(key) != expectedMap[key.toLowerCase()]);
|
| assert_equals(size(headers), expectedHeaderSize);
|
|
|
| // Update expectedMap too for forEach() test below.
|
| expectedMap[key.toLowerCase()] = expectedValue;
|
| - });
|
| + });
|
|
|
| // '[Symbol.iterator]()'
|
| for (var header of headers) {
|
| @@ -111,9 +114,9 @@ test(function() {
|
| assert_equals(allValues.length, 1, 'the second header should be deleted');
|
| assert_equals(allValues[0], 'response test field - set');
|
| headers.append('X-ServiceWorker-TEST', 'response test field - append');
|
| - assert_equals(size(headers), 5, 'headers size should increase by 1.')
|
| + assert_equals(size(headers), 5, 'headers size should increase by 1.');
|
| headers.delete('X-ServiceWORKER-Test');
|
| - assert_equals(size(headers), 3, 'two headers should be deleted.')
|
| + assert_equals(size(headers), 3, 'two headers should be deleted.');
|
|
|
| // new Headers with sequence<sequence<ByteString>>
|
| headers = new Headers([['a', 'b'], ['c', 'd'], ['c', 'e']]);
|
| @@ -144,62 +147,75 @@ test(function() {
|
| var invalidNames = ['', '(', ')', '<', '>', '@', ',', ';', ':', '\\', '"',
|
| '/', '[', ']', '?', '=', '{', '}', '\u3042', 'a(b'];
|
| invalidNames.forEach(function(name) {
|
| - assert_throws({name:'TypeError'},
|
| + assert_throws({name: 'TypeError'},
|
| function() { headers.append(name, 'a'); },
|
| - 'Headers.append with an invalid name (' + name +') should throw');
|
| - assert_throws({name:'TypeError'},
|
| + 'Headers.append with an invalid name (' + name +
|
| + ') should throw');
|
| + assert_throws({name: 'TypeError'},
|
| function() { headers.delete(name); },
|
| - 'Headers.delete with an invalid name (' + name +') should throw');
|
| - assert_throws({name:'TypeError'},
|
| + 'Headers.delete with an invalid name (' + name +
|
| + ') should throw');
|
| + assert_throws({name: 'TypeError'},
|
| function() { headers.get(name); },
|
| - 'Headers.get with an invalid name (' + name +') should throw');
|
| - assert_throws({name:'TypeError'},
|
| + 'Headers.get with an invalid name (' + name +
|
| + ') should throw');
|
| + assert_throws({name: 'TypeError'},
|
| function() { headers.getAll(name); },
|
| - 'Headers.getAll with an invalid name (' + name +') should throw');
|
| - assert_throws({name:'TypeError'},
|
| + 'Headers.getAll with an invalid name (' + name +
|
| + ') should throw');
|
| + assert_throws({name: 'TypeError'},
|
| function() { headers.has(name); },
|
| - 'Headers.has with an invalid name (' + name +') should throw');
|
| - assert_throws({name:'TypeError'},
|
| + 'Headers.has with an invalid name (' + name +
|
| + ') should throw');
|
| + assert_throws({name: 'TypeError'},
|
| function() { headers.set(name, 'a'); },
|
| - 'Headers.set with an invalid name (' + name +') should throw');
|
| - assert_throws({name:'TypeError'},
|
| + 'Headers.set with an invalid name (' + name +
|
| + ') should throw');
|
| + assert_throws({name: 'TypeError'},
|
| function() {
|
| var obj = {};
|
| obj[name] = 'a';
|
| var headers = new Headers(obj);
|
| },
|
| - 'new Headers with an invalid name (' + name +') should throw');
|
| - assert_throws({name:'TypeError'},
|
| + 'new Headers with an invalid name (' + name +
|
| + ') should throw');
|
| + assert_throws({name: 'TypeError'},
|
| function() { var headers = new Headers([[name, 'a']]); },
|
| - 'new Headers with an invalid name (' + name +') should throw');
|
| - });
|
| + 'new Headers with an invalid name (' + name +
|
| + ') should throw');
|
| + });
|
|
|
| var invalidValues = ['test \r data', 'test \n data'];
|
| invalidValues.forEach(function(value) {
|
| - assert_throws({name:'TypeError'},
|
| + assert_throws({name: 'TypeError'},
|
| function() { headers.append('a', value); },
|
| 'Headers.append with an invalid value should throw');
|
| - assert_throws({name:'TypeError'},
|
| + assert_throws({name: 'TypeError'},
|
| function() { headers.set('a', value); },
|
| 'Headers.set with an invalid value should throw');
|
| - assert_throws({name:'TypeError'},
|
| + assert_throws({name: 'TypeError'},
|
| function() { var headers = new Headers({'a': value}); },
|
| 'new Headers with an invalid value should throw');
|
| - assert_throws({name:'TypeError'},
|
| + assert_throws({name: 'TypeError'},
|
| function() { var headers = new Headers([['a', value]]); },
|
| 'new Headers with an invalid value should throw');
|
| - });
|
| + });
|
|
|
| - assert_throws({name:'TypeError'},
|
| + assert_throws({name: 'TypeError'},
|
| function() { var headers = new Headers([[]]); },
|
| - 'new Headers with a sequence with less than two strings should throw');
|
| - assert_throws({name:'TypeError'},
|
| + 'new Headers with a sequence with less than two strings ' +
|
| + 'should throw');
|
| + assert_throws({name: 'TypeError'},
|
| function() { var headers = new Headers([['a']]); },
|
| - 'new Headers with a sequence with less than two strings should throw');
|
| - assert_throws({name:'TypeError'},
|
| + 'new Headers with a sequence with less than two strings ' +
|
| + 'should throw');
|
| + assert_throws({name: 'TypeError'},
|
| function() { var headers = new Headers([['a', 'b'], []]); },
|
| - 'new Headers with a sequence with less than two strings should throw');
|
| - assert_throws({name:'TypeError'},
|
| - function() { var headers = new Headers([['a', 'b'], ['x', 'y', 'z']]); },
|
| - 'new Headers with a sequence with more than two strings should throw');
|
| -}, 'Headers in ServiceWorkerGlobalScope');
|
| + 'new Headers with a sequence with less than two strings ' +
|
| + 'should throw');
|
| + assert_throws({name: 'TypeError'},
|
| + function() { var headers = new Headers([['a', 'b'],
|
| + ['x', 'y', 'z']]); },
|
| + 'new Headers with a sequence with more than two strings ' +
|
| + 'should throw');
|
| + }, 'Headers in ServiceWorkerGlobalScope');
|
|
|