non-context not starting with U+000A] - expected: FAIL - - [innerHTML non-context not starting with U+000A] - expected: FAIL - - [innerHTML <listing> non-context not starting with U+000A] - expected: FAIL - [outerHTML <pre> context starting with U+000A] expected: FAIL @@ -33,15 +24,6 @@ [outerHTML <listing> context starting with U+000A] expected: FAIL - [outerHTML <pre> context not starting with U+000A] - expected: FAIL - - [outerHTML <textarea> context not starting with U+000A] - expected: FAIL - - [outerHTML <listing> context not starting with U+000A] - expected: FAIL - [outerHTML <pre> non-context starting with U+000A] expected: FAIL @@ -51,15 +33,6 @@ [outerHTML <listing> non-context starting with U+000A] expected: FAIL - [outerHTML <pre> non-context not starting with U+000A] - expected: FAIL - - [outerHTML <textarea> non-context not starting with U+000A] - expected: FAIL - - [outerHTML <listing> non-context not starting with U+000A] - expected: FAIL - [innerHTML Void context node area] expected: FAIL diff --git a/tests/wpt/metadata/mozilla-sync b/tests/wpt/metadata/mozilla-sync index 39ceb2544b0..54cf2b52036 100644 --- a/tests/wpt/metadata/mozilla-sync +++ b/tests/wpt/metadata/mozilla-sync @@ -1 +1 @@ -2d13178d2930da8668e77de078eeb65438eb502e \ No newline at end of file +d00639c55f9a342765483d347a3c29d4647f7411 \ No newline at end of file diff --git a/tests/wpt/metadata/workers/interfaces/WorkerUtils/navigator/window-only.worker.js.ini b/tests/wpt/metadata/workers/interfaces/WorkerUtils/navigator/window-only.worker.js.ini new file mode 100644 index 00000000000..33a27f8a6fd --- /dev/null +++ b/tests/wpt/metadata/workers/interfaces/WorkerUtils/navigator/window-only.worker.js.ini @@ -0,0 +1,11 @@ +[window-only.worker] + type: testharness + [NavigatorID properties exposed only for Window: appCodeName] + expected: FAIL + + [NavigatorID properties exposed only for Window: product] + expected: FAIL + + [NavigatorID properties exposed only for Window: taintEnabled] + expected: FAIL + diff --git a/tests/wpt/metadata/workers/semantics/interface-objects/001.worker.js.ini b/tests/wpt/metadata/workers/semantics/interface-objects/001.worker.js.ini index 3c18db71f27..06af6a6a986 100644 --- a/tests/wpt/metadata/workers/semantics/interface-objects/001.worker.js.ini +++ b/tests/wpt/metadata/workers/semantics/interface-objects/001.worker.js.ini @@ -24,3 +24,60 @@ [The TextMetrics interface object should be exposed.] expected: FAIL + [The CanvasPath interface object should be exposed.] + expected: FAIL + + [The Path2D interface object should be exposed.] + expected: FAIL + + [The PromiseRejectionEvent interface object should be exposed.] + expected: FAIL + + [The BroadcastChannel interface object should be exposed.] + expected: FAIL + + [The ReadableStream interface object should be exposed.] + expected: FAIL + + [The WritableStream interface object should be exposed.] + expected: FAIL + + [The ByteLengthQueuingStrategy interface object should be exposed.] + expected: FAIL + + [The CountQueuingStrategy interface object should be exposed.] + expected: FAIL + + [The IDBRequest interface object should be exposed.] + expected: FAIL + + [The IDBOpenDBRequest interface object should be exposed.] + expected: FAIL + + [The IDBVersionChangeEvent interface object should be exposed.] + expected: FAIL + + [The IDBFactory interface object should be exposed.] + expected: FAIL + + [The IDBDatabase interface object should be exposed.] + expected: FAIL + + [The IDBObjectStore interface object should be exposed.] + expected: FAIL + + [The IDBIndex interface object should be exposed.] + expected: FAIL + + [The IDBKeyRange interface object should be exposed.] + expected: FAIL + + [The IDBCursor interface object should be exposed.] + expected: FAIL + + [The IDBCursorWithValue interface object should be exposed.] + expected: FAIL + + [The IDBTransaction interface object should be exposed.] + expected: FAIL + diff --git a/tests/wpt/metadata/workers/semantics/interface-objects/002.worker.js.ini b/tests/wpt/metadata/workers/semantics/interface-objects/002.worker.js.ini index ffc4b68215c..b589fb82022 100644 --- a/tests/wpt/metadata/workers/semantics/interface-objects/002.worker.js.ini +++ b/tests/wpt/metadata/workers/semantics/interface-objects/002.worker.js.ini @@ -15,3 +15,30 @@ [The MouseEvent interface object should not be exposed.] expected: FAIL + [The CanvasRenderingContext2D interface object should not be exposed.] + expected: FAIL + + [The CanvasGradient interface object should not be exposed.] + expected: FAIL + + [The CanvasPattern interface object should not be exposed.] + expected: FAIL + + [The PopStateEvent interface object should not be exposed.] + expected: FAIL + + [The HashChangeEvent interface object should not be exposed.] + expected: FAIL + + [The PageTransitionEvent interface object should not be exposed.] + expected: FAIL + + [The UIEvent interface object should not be exposed.] + expected: FAIL + + [The FocusEvent interface object should not be exposed.] + expected: FAIL + + [The KeyboardEvent interface object should not be exposed.] + expected: FAIL + diff --git a/tests/wpt/metadata/workers/semantics/interface-objects/003.html.ini b/tests/wpt/metadata/workers/semantics/interface-objects/003.html.ini index 5996d348303..e7825487756 100644 --- a/tests/wpt/metadata/workers/semantics/interface-objects/003.html.ini +++ b/tests/wpt/metadata/workers/semantics/interface-objects/003.html.ini @@ -1,5 +1,6 @@ [003.html] type: testharness + expected: ERROR [available interface objects in shared worker] expected: FAIL diff --git a/tests/wpt/metadata/workers/semantics/interface-objects/004.html.ini b/tests/wpt/metadata/workers/semantics/interface-objects/004.html.ini index 24d454d1c26..c904c3dd637 100644 --- a/tests/wpt/metadata/workers/semantics/interface-objects/004.html.ini +++ b/tests/wpt/metadata/workers/semantics/interface-objects/004.html.ini @@ -1,5 +1,6 @@ [004.html] type: testharness + expected: ERROR [unavailable interface objects in shared worker] expected: FAIL diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index fbdcc358cb1..fc7ee02cb96 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -764,32 +764,28 @@ "url": "/_mozilla/css/blur_a.html" } ], - "css/border_black_groove.html": [ + "css/border_black_ridge_a.html": [ { - "path": "css/border_black_groove.html", - "references": [ - [ - "/_mozilla/css/border_black_solid.html", - "!=" - ] - ], - "url": "/_mozilla/css/border_black_groove.html" - } - ], - "css/border_black_ridge.html": [ - { - "path": "css/border_black_ridge.html", + "path": "css/border_black_ridge_a.html", "references": [ [ "/_mozilla/css/border_black_groove.html", "!=" - ], + ] + ], + "url": "/_mozilla/css/border_black_ridge_a.html" + } + ], + "css/border_black_ridge_b.html": [ + { + "path": "css/border_black_ridge_b.html", + "references": [ [ "/_mozilla/css/border_black_solid.html", "!=" ] ], - "url": "/_mozilla/css/border_black_ridge.html" + "url": "/_mozilla/css/border_black_ridge_b.html" } ], "css/border_code_tag.html": [ @@ -2177,7 +2173,7 @@ "path": "css/image_rendering_auto_a.html", "references": [ [ - "/_mozilla/css/image_rendering_pixelated_a.html", + "/_mozilla/css/image_rendering_pixelated_ref.html", "!=" ] ], @@ -14394,20 +14390,28 @@ "url": "/_mozilla/css/border_black_groove.html" } ], - "css/border_black_ridge.html": [ + "css/border_black_ridge_a.html": [ { - "path": "css/border_black_ridge.html", + "path": "css/border_black_ridge_a.html", "references": [ [ "/_mozilla/css/border_black_groove.html", "!=" - ], + ] + ], + "url": "/_mozilla/css/border_black_ridge_a.html" + } + ], + "css/border_black_ridge_b.html": [ + { + "path": "css/border_black_ridge_b.html", + "references": [ [ "/_mozilla/css/border_black_solid.html", "!=" ] ], - "url": "/_mozilla/css/border_black_ridge.html" + "url": "/_mozilla/css/border_black_ridge_b.html" } ], "css/border_code_tag.html": [ @@ -15807,7 +15811,7 @@ "path": "css/image_rendering_auto_a.html", "references": [ [ - "/_mozilla/css/image_rendering_pixelated_a.html", + "/_mozilla/css/image_rendering_pixelated_ref.html", "!=" ] ], diff --git a/tests/wpt/mozilla/meta/mozilla/webgl/tex_image_2d_canvas_no_context.html.ini b/tests/wpt/mozilla/meta/mozilla/webgl/tex_image_2d_canvas_no_context.html.ini deleted file mode 100644 index bae1aef26e0..00000000000 --- a/tests/wpt/mozilla/meta/mozilla/webgl/tex_image_2d_canvas_no_context.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[tex_image_2d_canvas_no_context.html] - type: reftest - disabled: - if os == "linux": https://github.com/servo/servo/issues/7931 diff --git a/tests/wpt/mozilla/tests/css/border_black_ridge.html b/tests/wpt/mozilla/tests/css/border_black_ridge_a.html similarity index 90% rename from tests/wpt/mozilla/tests/css/border_black_ridge.html rename to tests/wpt/mozilla/tests/css/border_black_ridge_a.html index 79c7b93f21f..90cdda1dca8 100644 --- a/tests/wpt/mozilla/tests/css/border_black_ridge.html +++ b/tests/wpt/mozilla/tests/css/border_black_ridge_a.html @@ -2,7 +2,6 @@ <html> <head> <link rel=mismatch href=border_black_groove.html> - <link rel=mismatch href=border_black_solid.html> <style> .box { width: 100px; diff --git a/tests/wpt/mozilla/tests/css/border_black_ridge_b.html b/tests/wpt/mozilla/tests/css/border_black_ridge_b.html new file mode 100644 index 00000000000..db72a2c354c --- /dev/null +++ b/tests/wpt/mozilla/tests/css/border_black_ridge_b.html @@ -0,0 +1,22 @@ +<!DOCTYPE html> +<html> + <head> + <link rel=mismatch href=border_black_solid.html> + <style> + .box { + width: 100px; + height: 100px; + margin: 10px; + border-width: 20px; + border-color: black; + border-style: ridge; + } + </style> + </head> +<body> + <!-- Test mixed border styles. Expect a square with borders with + 2 colors (lighter/dark), it fails if it has a solid dark border. + --> + <div class="box"></div> +</body> +</html> diff --git a/tests/wpt/mozilla/tests/css/image_rendering_auto_a.html b/tests/wpt/mozilla/tests/css/image_rendering_auto_a.html index 37f65265af7..a2fb71e0b5f 100644 --- a/tests/wpt/mozilla/tests/css/image_rendering_auto_a.html +++ b/tests/wpt/mozilla/tests/css/image_rendering_auto_a.html @@ -2,7 +2,7 @@ <html> <head> <!-- Tests that `image-rendering: auto` uses bilinear filtering. --> -<link rel=mismatch href=image_rendering_pixelated_a.html> +<link rel=mismatch href=image_rendering_pixelated_ref.html> <style> img { position: absolute; diff --git a/tests/wpt/web-platform-tests/.travis.yml b/tests/wpt/web-platform-tests/.travis.yml index a3ee2c28841..d2f88f203fa 100644 --- a/tests/wpt/web-platform-tests/.travis.yml +++ b/tests/wpt/web-platform-tests/.travis.yml @@ -5,4 +5,11 @@ python: before_install: - git submodule update --init --recursive # command to run tests, e.g. python setup.py test -script: ./lint +script: + - ./lint + - ./manifest + - ./diff-manifest.py +notifications: + email: + on_success: never + on_failure: always diff --git a/tests/wpt/web-platform-tests/2dcontext/drawing-paths-to-the-canvas/canvas_complexshapes_ispointInpath_001.htm b/tests/wpt/web-platform-tests/2dcontext/drawing-paths-to-the-canvas/canvas_complexshapes_ispointInpath_001.htm index 4728f9c428c..18c3c9afb95 100644 --- a/tests/wpt/web-platform-tests/2dcontext/drawing-paths-to-the-canvas/canvas_complexshapes_ispointInpath_001.htm +++ b/tests/wpt/web-platform-tests/2dcontext/drawing-paths-to-the-canvas/canvas_complexshapes_ispointInpath_001.htm @@ -2,12 +2,14 @@ <html> <head> <title>HTML5 Canvas Test: isPointInPath() unaffected by the current transformation matrix</title> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> <link rel="author" title="Microsoft" href="http://www.microsoft.com" /> <link rel="help" href="http://www.w3.org/TR/2dcontext/#dom-context-2d-ispointinpath" /> <meta name="assert" content="isPointInPath must check the point (x, y) as coordinates unaffected by the current transformation matrix." /> <script type="text/javascript"> - function runTest() - { + async_test(function(t) { + window.addEventListener("load", t.step_func_done(function runTest() { var canvas = document.getElementById("canvas1"); var ctx = canvas.getContext("2d"); @@ -16,17 +18,14 @@ ctx.rect(0, 0, 100, 50); // Ensure that the coordinates passed to isPointInPath are unaffected by the current transformation matrix. - if (ctx.isPointInPath(125, 75) && !ctx.isPointInPath(25, 25)) - { - document.getElementById("testresult").firstChild.data = "PASS"; - } - } + assert_true(ctx.isPointInPath(125, 75), "isPointInPath(125, 75)"); + assert_false(ctx.isPointInPath(25, 25), "!isPointInPath(25, 25)"); + })); + }, "isPointInPath unaffected by transformation matrix"); </script> </head> - <body onload="runTest();"> + <body> <p>Description: isPointInPath must check the point (x, y) as coordinates unaffected by the current transformation matrix.</p> - <p>Test passes if the word "PASS" appears below.</p> - <div id="testresult">FAIL</div> <canvas id="canvas1" width="300" height="150">Browser does not support HTML5 Canvas.</canvas> </body> -</html> \ No newline at end of file +</html> diff --git a/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/canvas_colorsandstyles_createlineargradient_001.htm b/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/canvas_colorsandstyles_createlineargradient_001.htm index a1b9ca90b17..5b77c98de7d 100644 --- a/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/canvas_colorsandstyles_createlineargradient_001.htm +++ b/tests/wpt/web-platform-tests/2dcontext/fill-and-stroke-styles/canvas_colorsandstyles_createlineargradient_001.htm @@ -2,14 +2,18 @@ <html> <head> <title>HTML5 Canvas Test: createlinearGradient() with two points same</title> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> <link rel="author" title="Microsoft" href="http://www.microsoft.com" /> <link rel="help" href="http://www.w3.org/TR/2dcontext/#dom-context-2d-createlineargradient" /> <meta name="assert" content="If the two points in a linear gradient have identical x,y coordinates, the canvas must paint nothing." /> <script type="text/javascript"> - function runTest() - { + async_test(function(t) { + window.addEventListener("load", t.step_func_done(function runTest() { var canvas = document.getElementById("canvas1"); var ctx = canvas.getContext("2d"); + var width = canvas.width; + var height = canvas.height; // Start by drawing a left to right, green-to-blue linear gradient. var lingrad = ctx.createLinearGradient(0, 50, 100, 50); @@ -18,18 +22,38 @@ ctx.fillStyle = lingrad; ctx.fillRect(0, 0, 100, 50); + // Get the current state of the canvas + var initial = ctx.getImageData(0, 0, width, height); + // Nothing must be drawn if the two points in the linear gradient are the same. lingrad = ctx.createLinearGradient(100, 100, 100, 100); lingrad.addColorStop(0, "rgba(255, 0, 0, 1.0)"); lingrad.addColorStop(1, "rgba(255, 0, 0, 1.0)"); ctx.fillStyle = lingrad; ctx.fillRect(0, 0, 300, 150); - } + + // Check that nothing is drawn. + var after = ctx.getImageData(0, 0, width, height); + + // Asserts + assert_equals(initial.width, after.width, "widths are equal"); + assert_equals(initial.height, after.height, "heights are equal"); + assert_array_equals(initial.data, after.data, "data are equal"); + + for (var i = 0; i < after.data.length; i += 4) { + var r = after.data[i]; + var g = after.data[i+1]; + var b = after.data[i+2]; + var a = after.data[i+3]; + assert_false(r == 0xFF && g == 0 && b == 0 && a == 0xFF, "no red"); + } + })); + }, "linear gradient from point to self draws nothing"); </script> </head> - <body onload="runTest()"> + <body> <p>Description: If the two points in a linear gradient have identical x,y coordinates, the canvas must paint nothing.</p> <p>Test passes if there is one left-to-right, green-to-blue linear gradient seen on the page and no red is seen on the page.</p> <canvas id="canvas1" width="300" height="150">Browser does not support HTML5 Canvas.</canvas> </body> -</html> \ No newline at end of file +</html> diff --git a/tests/wpt/web-platform-tests/2dcontext/shadows/canvas_shadows_001.htm b/tests/wpt/web-platform-tests/2dcontext/shadows/canvas_shadows_001.htm index fd7c7d086e3..1763950d612 100644 --- a/tests/wpt/web-platform-tests/2dcontext/shadows/canvas_shadows_001.htm +++ b/tests/wpt/web-platform-tests/2dcontext/shadows/canvas_shadows_001.htm @@ -2,12 +2,14 @@ <html> <head> <title>HTML5 Canvas Test: Shadows for linear gradients</title> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> <link rel="author" title="Microsoft" href="http://www.microsoft.com" /> <link rel="help" href="http://www.w3.org/TR/2dcontext/#shadows" /> <meta name="assert" content="Shadows must be drawn for linear gradients." /> <script type="text/javascript"> - function runTest() - { + async_test(function(t) { + window.addEventListener("load", t.step_func_done(function runTest() { var canvas = document.getElementById("canvas1"); var ctx = canvas.getContext("2d"); @@ -25,10 +27,32 @@ lingrad.addColorStop(1, "rgba(0, 0, 255, 1.0)"); ctx.fillStyle = lingrad; ctx.fillRect(0, 0, 100, 50); - } + + // Check the red is gone + var data = ctx.getImageData(150, 0, 100, 50); + for (var i = 0; i < data.data.length; i += 4) { + var r = data.data[i]; + var g = data.data[i+1]; + var b = data.data[i+2]; + var a = data.data[i+3]; + assert_equals(r, 0, "r channel"); + assert_equals(g, 0, "g channel"); + assert_equals(b, 0, "b channel"); + assert_equals(a, 0xFF, "a channel"); + } + + for (var j = 0; j < data.data.length; j += 4) { + var r2 = data.data[j]; + var g2 = data.data[j+1]; + var b2 = data.data[j+2]; + var a2 = data.data[j+3]; + assert_false(r2 == 0xFF && g2 == 0 && b2 == 0 && a2 == 0xFF, "no red"); + } + })); + }, "linear gradient fillRect draws shadow (black rectange)"); </script> </head> - <body onload="runTest()"> + <body> <p>Description: Shadows must be drawn for linear gradients.</p> <p>Test passes if there is one gradient filled rectangle and one black rectangle, and no red seen on the page.</p> <canvas id="canvas1" width="300" height="150">Browser does not support HTML5 Canvas.</canvas> diff --git a/tests/wpt/web-platform-tests/2dcontext/text-styles/canvas_text_font_001-ref.htm b/tests/wpt/web-platform-tests/2dcontext/text-styles/canvas_text_font_001-ref.htm new file mode 100644 index 00000000000..1a19757e001 --- /dev/null +++ b/tests/wpt/web-platform-tests/2dcontext/text-styles/canvas_text_font_001-ref.htm @@ -0,0 +1,22 @@ +<!doctype HTML> +<html> + <head> + <title>HTML5 Canvas Test: Ignore property-independent style sheet syntax "inherit" in Text (reference)</title> + <script type="text/javascript"> + function runTest() + { + var canvas = document.getElementById("canvas1"); + var ctx = canvas.getContext("2d"); + + ctx.font = "40px Ahem"; + ctx.fillText("Filler", 5, 50); + ctx.fillText("Filler", 5, 100); + } + </script> + </head> + <body onload="runTest()"> + <p>Description: Ignore "inherit" property-independent style sheet syntax without assigning a new font value.</p> + <p>Test passes if there are two identical black boxes below.</p> + <canvas id="canvas1" width="300" height="150">Browser does not support HTML5 Canvas.</canvas> + </body> +</html> diff --git a/tests/wpt/web-platform-tests/2dcontext/text-styles/canvas_text_font_001.htm b/tests/wpt/web-platform-tests/2dcontext/text-styles/canvas_text_font_001.htm index b7d26d672b5..923ce71c077 100644 --- a/tests/wpt/web-platform-tests/2dcontext/text-styles/canvas_text_font_001.htm +++ b/tests/wpt/web-platform-tests/2dcontext/text-styles/canvas_text_font_001.htm @@ -2,6 +2,7 @@ <html> <head> <title>HTML5 Canvas Test: Ignore property-independent style sheet syntax "inherit" in Text</title> + <link rel="match" href="canvas_text_font_001-ref.htm" /> <link rel="author" title="Microsoft" href="http://www.microsoft.com" /> <link rel="help" href="http://www.w3.org/TR/2dcontext/#dom-context-2d-font" /> <meta name="assert" content=": Ignore 'inherit' property-independent style sheet syntax without assigning a new font value." /> @@ -12,21 +13,21 @@ var ctx = canvas.getContext("2d"); // Assign a valid font. - ctx.font = "40px Times New Roman"; + ctx.font = "40px Ahem"; - // Assign property-independent style sheet syntax 'inherit' as font. + // Assign property-independent style sheet syntax 'inherit' as font (this must be ignored). ctx.font = "20px inherit"; - ctx.fillText("Test String", 5, 50); + ctx.fillText("Filler", 5, 50); // Assign a valid font which was used earlier. - ctx.font = "40px Times New Roman"; - ctx.fillText("Test String", 5, 100); + ctx.font = "40px Ahem"; + ctx.fillText("Filler", 5, 100); } </script> </head> <body onload="runTest()"> <p>Description: Ignore "inherit" property-independent style sheet syntax without assigning a new font value.</p> - <p>Test passes if both strings are identical in both size, style, and text.</p> + <p>Test passes if there are two identical black boxes below.</p> <canvas id="canvas1" width="300" height="150">Browser does not support HTML5 Canvas.</canvas> </body> -</html> \ No newline at end of file +</html> diff --git a/tests/wpt/web-platform-tests/README.md b/tests/wpt/web-platform-tests/README.md index 32d6503c773..052f255aba2 100644 --- a/tests/wpt/web-platform-tests/README.md +++ b/tests/wpt/web-platform-tests/README.md @@ -45,15 +45,14 @@ git submodule update --init --recursive The test environment can then be started using -``` -./serve -``` + ./serve This will start HTTP servers on two ports and a websockets server on one port. By default one web server starts on port 8000 and the other ports are randomly-chosen free ports. Tests must be loaded from the -*first* HTTP server in the output. To change the ports, edit the -`config.json` file, for example, replacing the part that reads: +*first* HTTP server in the output. To change the ports, copy the +`config.default.json` file to `config.json` and edit the new file, +replacing the part that reads: ``` "http": [8000, "auto"] @@ -62,7 +61,7 @@ ports are randomly-chosen free ports. Tests must be loaded from the to some port of your choice e.g. ``` -"http":[1234, "auto"] +"http": [1234, "auto"] ``` If you installed OpenSSL in such a way that running `openssl` at a @@ -79,7 +78,7 @@ like: Running wptserve with SSL enabled on Windows typically requires installing an OpenSSL distribution. -[Shining Light](http://slproweb.com/products/Win32OpenSSL.html) +[Shining Light](https://slproweb.com/products/Win32OpenSSL.html) provide a convenient installer that is known to work, but requires a little extra setup. diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/derive_bits_keys/hkdf.js b/tests/wpt/web-platform-tests/WebCryptoAPI/derive_bits_keys/hkdf.js index e3503794063..016740abf0f 100644 --- a/tests/wpt/web-platform-tests/WebCryptoAPI/derive_bits_keys/hkdf.js +++ b/tests/wpt/web-platform-tests/WebCryptoAPI/derive_bits_keys/hkdf.js @@ -33,10 +33,7 @@ function run_test() { Object.keys(derivations[derivedKeySize][saltSize]).forEach(function(hashName) { Object.keys(derivations[derivedKeySize][saltSize][hashName]).forEach(function(infoSize) { var testName = derivedKeySize + " derivedKey, " + saltSize + " salt, " + hashName + ", with " + infoSize + " info"; - var algorithm = {name: "HKDF", salt: salts[saltSize], hash: hashName}; - if (infoSize !== "missing") { - algorithm.info = infos[infoSize]; - } + var algorithm = {name: "HKDF", salt: salts[saltSize], info: infos[infoSize], hash: hashName}; // Check for correct deriveBits result promise_test(function(test) { @@ -121,6 +118,27 @@ function run_test() { }); // Test various error conditions for deriveBits below: + + // missing salt (TypeError) + promise_test(function(test) { + return subtle.deriveBits({name: "HKDF", info: infos[infoSize], hash: hashName}, baseKeys[derivedKeySize], 0) + .then(function(derivation) { + assert_equals(derivation.byteLength, 0, "Derived even with missing salt"); + }, function(err) { + assert_equals(err.name, "TypeError", "deriveBits missing salt correctly threw OperationError: " + err.message); + }); + }, testName + " with missing salt"); + + // missing info (TypeError) + promise_test(function(test) { + return subtle.deriveBits({name: "HKDF", salt: salts[saltSize], hash: hashName}, baseKeys[derivedKeySize], 0) + .then(function(derivation) { + assert_equals(derivation.byteLength, 0, "Derived even with missing info"); + }, function(err) { + assert_equals(err.name, "TypeError", "deriveBits missing info correctly threw OperationError: " + err.message); + }); + }, testName + " with missing info"); + // length null (OperationError) promise_test(function(test) { return subtle.deriveBits(algorithm, baseKeys[derivedKeySize], null) diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/derive_bits_keys/hkdf_vectors.js b/tests/wpt/web-platform-tests/WebCryptoAPI/derive_bits_keys/hkdf_vectors.js index 9c1e388bc82..ef448ec5f2a 100644 --- a/tests/wpt/web-platform-tests/WebCryptoAPI/derive_bits_keys/hkdf_vectors.js +++ b/tests/wpt/web-platform-tests/WebCryptoAPI/derive_bits_keys/hkdf_vectors.js @@ -55,14 +55,12 @@ function getTestData() { var salts = { "normal": new Uint8Array([83, 111, 100, 105, 117, 109, 32, 67, 104, 108, 111, 114, 105, 100, 101, 32, 99, 111, 109, 112, 111, 117, 110, 100]), - "empty": new Uint8Array([]), - "missing": null + "empty": new Uint8Array([]) }; var infos = { "normal": new Uint8Array([72, 75, 68, 70, 32, 101, 120, 116, 114, 97, 32, 105, 110, 102, 111]), - "empty": new Uint8Array([]), - "missing": null + "empty": new Uint8Array([]) }; var derivations = { @@ -70,67 +68,37 @@ function getTestData() { "normal": { "SHA-384": { "normal": new Uint8Array([25, 186, 116, 54, 142, 107, 153, 51, 144, 242, 127, 233, 167, 208, 43, 195, 56, 23, 63, 114, 190, 113, 161, 159, 199, 68, 252, 219, 63, 212, 184, 75]), - "empty": new Uint8Array([151, 96, 31, 78, 12, 83, 165, 211, 243, 162, 129, 0, 153, 188, 104, 32, 236, 80, 8, 52, 52, 118, 155, 89, 252, 36, 164, 23, 169, 84, 55, 52]), - "missing": new Uint8Array([151, 96, 31, 78, 12, 83, 165, 211, 243, 162, 129, 0, 153, 188, 104, 32, 236, 80, 8, 52, 52, 118, 155, 89, 252, 36, 164, 23, 169, 84, 55, 52]) + "empty": new Uint8Array([151, 96, 31, 78, 12, 83, 165, 211, 243, 162, 129, 0, 153, 188, 104, 32, 236, 80, 8, 52, 52, 118, 155, 89, 252, 36, 164, 23, 169, 84, 55, 52]) }, "SHA-512": { "normal": new Uint8Array([75, 189, 109, 178, 67, 95, 182, 150, 21, 127, 96, 137, 201, 119, 195, 199, 63, 62, 172, 94, 243, 221, 107, 170, 230, 4, 203, 83, 191, 187, 21, 62]), - "empty": new Uint8Array([47, 49, 87, 231, 254, 12, 16, 176, 18, 152, 200, 240, 136, 106, 144, 237, 207, 128, 171, 222, 245, 219, 193, 223, 43, 20, 130, 83, 43, 82, 185, 52]), - "missing": new Uint8Array([47, 49, 87, 231, 254, 12, 16, 176, 18, 152, 200, 240, 136, 106, 144, 237, 207, 128, 171, 222, 245, 219, 193, 223, 43, 20, 130, 83, 43, 82, 185, 52]) + "empty": new Uint8Array([47, 49, 87, 231, 254, 12, 16, 176, 18, 152, 200, 240, 136, 106, 144, 237, 207, 128, 171, 222, 245, 219, 193, 223, 43, 20, 130, 83, 43, 82, 185, 52]) }, "SHA-1": { "normal": new Uint8Array([5, 173, 34, 237, 33, 56, 201, 96, 14, 77, 158, 39, 37, 222, 211, 1, 245, 210, 135, 251, 251, 87, 2, 249, 153, 188, 101, 54, 211, 237, 239, 152]), - "empty": new Uint8Array([213, 27, 111, 183, 229, 153, 202, 48, 197, 238, 38, 69, 147, 228, 184, 95, 34, 32, 199, 195, 171, 0, 49, 87, 191, 248, 203, 79, 54, 156, 117, 96]), - "missing": new Uint8Array([213, 27, 111, 183, 229, 153, 202, 48, 197, 238, 38, 69, 147, 228, 184, 95, 34, 32, 199, 195, 171, 0, 49, 87, 191, 248, 203, 79, 54, 156, 117, 96]) + "empty": new Uint8Array([213, 27, 111, 183, 229, 153, 202, 48, 197, 238, 38, 69, 147, 228, 184, 95, 34, 32, 199, 195, 171, 0, 49, 87, 191, 248, 203, 79, 54, 156, 117, 96]) }, "SHA-256": { "normal": new Uint8Array([42, 245, 144, 30, 40, 132, 156, 40, 68, 56, 87, 56, 106, 161, 172, 59, 177, 39, 233, 38, 49, 193, 192, 81, 72, 45, 102, 144, 148, 23, 114, 180]), - "empty": new Uint8Array([158, 75, 113, 144, 51, 116, 33, 1, 233, 15, 26, 214, 30, 47, 243, 180, 37, 104, 99, 102, 114, 150, 215, 67, 137, 241, 240, 42, 242, 196, 230, 166]), - "missing": new Uint8Array([158, 75, 113, 144, 51, 116, 33, 1, 233, 15, 26, 214, 30, 47, 243, 180, 37, 104, 99, 102, 114, 150, 215, 67, 137, 241, 240, 42, 242, 196, 230, 166]) + "empty": new Uint8Array([158, 75, 113, 144, 51, 116, 33, 1, 233, 15, 26, 214, 30, 47, 243, 180, 37, 104, 99, 102, 114, 150, 215, 67, 137, 241, 240, 42, 242, 196, 230, 166]) } }, "empty": { "SHA-384": { "normal": new Uint8Array([251, 72, 47, 242, 44, 79, 141, 70, 108, 77, 254, 110, 41, 242, 204, 46, 205, 171, 245, 136, 67, 40, 251, 240, 138, 115, 143, 217, 69, 241, 102, 203]), - "empty": new Uint8Array([30, 2, 60, 23, 179, 64, 83, 60, 234, 239, 57, 35, 12, 184, 179, 187, 219, 246, 99, 161, 61, 96, 117, 208, 221, 50, 108, 4, 148, 120, 251, 165]), - "missing": new Uint8Array([30, 2, 60, 23, 179, 64, 83, 60, 234, 239, 57, 35, 12, 184, 179, 187, 219, 246, 99, 161, 61, 96, 117, 208, 221, 50, 108, 4, 148, 120, 251, 165]) + "empty": new Uint8Array([30, 2, 60, 23, 179, 64, 83, 60, 234, 239, 57, 35, 12, 184, 179, 187, 219, 246, 99, 161, 61, 96, 117, 208, 221, 50, 108, 4, 148, 120, 251, 165]) }, "SHA-512": { "normal": new Uint8Array([241, 123, 91, 220, 216, 215, 211, 212, 96, 16, 54, 161, 148, 54, 49, 125, 22, 68, 249, 164, 224, 149, 110, 252, 14, 55, 43, 131, 172, 218, 207, 219]), - "empty": new Uint8Array([199, 180, 116, 148, 47, 49, 248, 63, 175, 93, 20, 115, 24, 2, 177, 189, 73, 71, 133, 73, 203, 58, 143, 61, 191, 237, 196, 211, 32, 156, 245, 182]), - "missing": new Uint8Array([199, 180, 116, 148, 47, 49, 248, 63, 175, 93, 20, 115, 24, 2, 177, 189, 73, 71, 133, 73, 203, 58, 143, 61, 191, 237, 196, 211, 32, 156, 245, 182]) + "empty": new Uint8Array([199, 180, 116, 148, 47, 49, 248, 63, 175, 93, 20, 115, 24, 2, 177, 189, 73, 71, 133, 73, 203, 58, 143, 61, 191, 237, 196, 211, 32, 156, 245, 182]) }, "SHA-1": { "normal": new Uint8Array([193, 38, 241, 230, 242, 90, 157, 228, 44, 247, 212, 39, 5, 154, 82, 237, 150, 1, 242, 154, 88, 21, 203, 251, 198, 75, 199, 246, 104, 198, 163, 65]), - "empty": new Uint8Array([50, 21, 195, 240, 141, 231, 5, 73, 176, 81, 183, 3, 55, 69, 168, 24, 79, 140, 186, 166, 177, 115, 83, 48, 210, 188, 182, 177, 111, 70, 66, 239]), - "missing": new Uint8Array([50, 21, 195, 240, 141, 231, 5, 73, 176, 81, 183, 3, 55, 69, 168, 24, 79, 140, 186, 166, 177, 115, 83, 48, 210, 188, 182, 177, 111, 70, 66, 239]) + "empty": new Uint8Array([50, 21, 195, 240, 141, 231, 5, 73, 176, 81, 183, 3, 55, 69, 168, 24, 79, 140, 186, 166, 177, 115, 83, 48, 210, 188, 182, 177, 111, 70, 66, 239]) }, "SHA-256": { "normal": new Uint8Array([115, 60, 139, 107, 207, 172, 135, 92, 127, 8, 152, 42, 110, 63, 251, 86, 10, 206, 166, 241, 101, 71, 110, 184, 52, 96, 185, 53, 62, 212, 29, 254]), - "empty": new Uint8Array([200, 225, 39, 116, 19, 83, 5, 201, 20, 127, 44, 196, 118, 110, 94, 173, 37, 216, 244, 87, 185, 161, 149, 61, 82, 103, 115, 97, 206, 213, 88, 251]), - "missing": new Uint8Array([200, 225, 39, 116, 19, 83, 5, 201, 20, 127, 44, 196, 118, 110, 94, 173, 37, 216, 244, 87, 185, 161, 149, 61, 82, 103, 115, 97, 206, 213, 88, 251]) - } - }, - "missing": { - "SHA-384": { - "normal": new Uint8Array([251, 72, 47, 242, 44, 79, 141, 70, 108, 77, 254, 110, 41, 242, 204, 46, 205, 171, 245, 136, 67, 40, 251, 240, 138, 115, 143, 217, 69, 241, 102, 203]), - "empty": new Uint8Array([30, 2, 60, 23, 179, 64, 83, 60, 234, 239, 57, 35, 12, 184, 179, 187, 219, 246, 99, 161, 61, 96, 117, 208, 221, 50, 108, 4, 148, 120, 251, 165]), - "missing": new Uint8Array([30, 2, 60, 23, 179, 64, 83, 60, 234, 239, 57, 35, 12, 184, 179, 187, 219, 246, 99, 161, 61, 96, 117, 208, 221, 50, 108, 4, 148, 120, 251, 165]) - }, - "SHA-512": { - "normal": new Uint8Array([241, 123, 91, 220, 216, 215, 211, 212, 96, 16, 54, 161, 148, 54, 49, 125, 22, 68, 249, 164, 224, 149, 110, 252, 14, 55, 43, 131, 172, 218, 207, 219]), - "empty": new Uint8Array([199, 180, 116, 148, 47, 49, 248, 63, 175, 93, 20, 115, 24, 2, 177, 189, 73, 71, 133, 73, 203, 58, 143, 61, 191, 237, 196, 211, 32, 156, 245, 182]), - "missing": new Uint8Array([199, 180, 116, 148, 47, 49, 248, 63, 175, 93, 20, 115, 24, 2, 177, 189, 73, 71, 133, 73, 203, 58, 143, 61, 191, 237, 196, 211, 32, 156, 245, 182]) - }, - "SHA-1": { - "normal": new Uint8Array([193, 38, 241, 230, 242, 90, 157, 228, 44, 247, 212, 39, 5, 154, 82, 237, 150, 1, 242, 154, 88, 21, 203, 251, 198, 75, 199, 246, 104, 198, 163, 65]), - "empty": new Uint8Array([50, 21, 195, 240, 141, 231, 5, 73, 176, 81, 183, 3, 55, 69, 168, 24, 79, 140, 186, 166, 177, 115, 83, 48, 210, 188, 182, 177, 111, 70, 66, 239]), - "missing": new Uint8Array([50, 21, 195, 240, 141, 231, 5, 73, 176, 81, 183, 3, 55, 69, 168, 24, 79, 140, 186, 166, 177, 115, 83, 48, 210, 188, 182, 177, 111, 70, 66, 239]) - }, - "SHA-256": { - "normal": new Uint8Array([115, 60, 139, 107, 207, 172, 135, 92, 127, 8, 152, 42, 110, 63, 251, 86, 10, 206, 166, 241, 101, 71, 110, 184, 52, 96, 185, 53, 62, 212, 29, 254]), - "empty": new Uint8Array([200, 225, 39, 116, 19, 83, 5, 201, 20, 127, 44, 196, 118, 110, 94, 173, 37, 216, 244, 87, 185, 161, 149, 61, 82, 103, 115, 97, 206, 213, 88, 251]), - "missing": new Uint8Array([200, 225, 39, 116, 19, 83, 5, 201, 20, 127, 44, 196, 118, 110, 94, 173, 37, 216, 244, 87, 185, 161, 149, 61, 82, 103, 115, 97, 206, 213, 88, 251]) + "empty": new Uint8Array([200, 225, 39, 116, 19, 83, 5, 201, 20, 127, 44, 196, 118, 110, 94, 173, 37, 216, 244, 87, 185, 161, 149, 61, 82, 103, 115, 97, 206, 213, 88, 251]) } } }, @@ -138,67 +106,37 @@ function getTestData() { "normal": { "SHA-384": { "normal": new Uint8Array([249, 21, 113, 181, 33, 247, 238, 241, 62, 87, 58, 164, 99, 120, 101, 158, 243, 183, 243, 111, 253, 209, 187, 5, 93, 178, 205, 119, 210, 96, 196, 103]), - "empty": new Uint8Array([104, 175, 28, 44, 246, 185, 55, 13, 32, 84, 52, 71, 152, 189, 187, 24, 71, 204, 244, 7, 183, 101, 43, 121, 61, 209, 54, 212, 100, 14, 3, 72]), - "missing": new Uint8Array([104, 175, 28, 44, 246, 185, 55, 13, 32, 84, 52, 71, 152, 189, 187, 24, 71, 204, 244, 7, 183, 101, 43, 121, 61, 209, 54, 212, 100, 14, 3, 72]) + "empty": new Uint8Array([104, 175, 28, 44, 246, 185, 55, 13, 32, 84, 52, 71, 152, 189, 187, 24, 71, 204, 244, 7, 183, 101, 43, 121, 61, 209, 54, 212, 100, 14, 3, 72]) }, "SHA-512": { "normal": new Uint8Array([113, 10, 174, 47, 223, 136, 158, 69, 254, 15, 185, 149, 178, 194, 107, 51, 235, 152, 134, 80, 236, 15, 174, 241, 103, 2, 138, 122, 108, 203, 54, 56]), - "empty": new Uint8Array([229, 222, 86, 128, 129, 199, 30, 86, 39, 80, 130, 152, 113, 195, 66, 117, 129, 4, 118, 94, 214, 243, 6, 240, 97, 60, 157, 75, 179, 54, 242, 170]), - "missing": new Uint8Array([229, 222, 86, 128, 129, 199, 30, 86, 39, 80, 130, 152, 113, 195, 66, 117, 129, 4, 118, 94, 214, 243, 6, 240, 97, 60, 157, 75, 179, 54, 242, 170]) + "empty": new Uint8Array([229, 222, 86, 128, 129, 199, 30, 86, 39, 80, 130, 152, 113, 195, 66, 117, 129, 4, 118, 94, 214, 243, 6, 240, 97, 60, 157, 75, 179, 54, 242, 170]) }, "SHA-1": { "normal": new Uint8Array([127, 149, 126, 220, 188, 227, 203, 11, 112, 86, 110, 30, 182, 14, 253, 30, 64, 90, 19, 48, 76, 102, 29, 54, 99, 119, 129, 9, 191, 6, 137, 156]), - "empty": new Uint8Array([48, 98, 243, 207, 26, 115, 11, 156, 239, 81, 240, 44, 29, 250, 200, 94, 217, 30, 75, 0, 101, 235, 80, 202, 159, 216, 176, 16, 126, 114, 135, 51]), - "missing": new Uint8Array([48, 98, 243, 207, 26, 115, 11, 156, 239, 81, 240, 44, 29, 250, 200, 94, 217, 30, 75, 0, 101, 235, 80, 202, 159, 216, 176, 16, 126, 114, 135, 51]) + "empty": new Uint8Array([48, 98, 243, 207, 26, 115, 11, 156, 239, 81, 240, 44, 29, 250, 200, 94, 217, 30, 75, 0, 101, 235, 80, 202, 159, 216, 176, 16, 126, 114, 135, 51]) }, "SHA-256": { "normal": new Uint8Array([49, 183, 214, 133, 48, 168, 99, 231, 23, 192, 129, 202, 105, 23, 182, 134, 80, 179, 221, 154, 41, 243, 6, 6, 226, 202, 209, 153, 190, 193, 77, 19]), - "empty": new Uint8Array([229, 121, 209, 249, 231, 240, 142, 111, 153, 15, 252, 252, 206, 30, 210, 1, 197, 227, 126, 98, 205, 246, 6, 240, 186, 74, 202, 128, 66, 127, 188, 68]), - "missing": new Uint8Array([229, 121, 209, 249, 231, 240, 142, 111, 153, 15, 252, 252, 206, 30, 210, 1, 197, 227, 126, 98, 205, 246, 6, 240, 186, 74, 202, 128, 66, 127, 188, 68]) + "empty": new Uint8Array([229, 121, 209, 249, 231, 240, 142, 111, 153, 15, 252, 252, 206, 30, 210, 1, 197, 227, 126, 98, 205, 246, 6, 240, 186, 74, 202, 128, 66, 127, 188, 68]) } }, "empty": { "SHA-384": { "normal": new Uint8Array([97, 158, 182, 249, 40, 115, 149, 187, 213, 237, 106, 103, 201, 104, 70, 90, 216, 43, 108, 85, 159, 60, 56, 182, 4, 187, 176, 143, 88, 50, 11, 3]), - "empty": new Uint8Array([255, 68, 123, 66, 61, 131, 254, 118, 131, 108, 50, 51, 114, 40, 181, 107, 91, 217, 191, 104, 213, 142, 125, 202, 75, 124, 202, 132, 42, 69, 225, 26]), - "missing": new Uint8Array([255, 68, 123, 66, 61, 131, 254, 118, 131, 108, 50, 51, 114, 40, 181, 107, 91, 217, 191, 104, 213, 142, 125, 202, 75, 124, 202, 132, 42, 69, 225, 26]) + "empty": new Uint8Array([255, 68, 123, 66, 61, 131, 254, 118, 131, 108, 50, 51, 114, 40, 181, 107, 91, 217, 191, 104, 213, 142, 125, 202, 75, 124, 202, 132, 42, 69, 225, 26]) }, "SHA-512": { "normal": new Uint8Array([19, 62, 138, 127, 127, 244, 51, 105, 12, 200, 132, 50, 194, 163, 56, 194, 119, 229, 193, 55, 86, 255, 135, 143, 70, 117, 63, 230, 165, 100, 227, 229]), - "empty": new Uint8Array([222, 84, 247, 238, 200, 12, 156, 198, 109, 52, 159, 201, 135, 248, 13, 70, 29, 178, 239, 79, 244, 225, 133, 5, 210, 139, 216, 12, 180, 44, 125, 118]), - "missing": new Uint8Array([222, 84, 247, 238, 200, 12, 156, 198, 109, 52, 159, 201, 135, 248, 13, 70, 29, 178, 239, 79, 244, 225, 133, 5, 210, 139, 216, 12, 180, 44, 125, 118]) + "empty": new Uint8Array([222, 84, 247, 238, 200, 12, 156, 198, 109, 52, 159, 201, 135, 248, 13, 70, 29, 178, 239, 79, 244, 225, 133, 5, 210, 139, 216, 12, 180, 44, 125, 118]) }, "SHA-1": { "normal": new Uint8Array([173, 185, 60, 219, 206, 121, 183, 213, 17, 89, 182, 192, 19, 26, 43, 98, 242, 56, 40, 210, 106, 205, 104, 94, 52, 192, 101, 53, 230, 247, 116, 150]), - "empty": new Uint8Array([71, 113, 13, 42, 117, 7, 224, 90, 29, 220, 200, 122, 124, 47, 144, 97, 119, 162, 102, 239, 185, 230, 34, 81, 12, 204, 179, 113, 60, 208, 141, 88]), - "missing": new Uint8Array([71, 113, 13, 42, 117, 7, 224, 90, 29, 220, 200, 122, 124, 47, 144, 97, 119, 162, 102, 239, 185, 230, 34, 81, 12, 204, 179, 113, 60, 208, 141, 88]) + "empty": new Uint8Array([71, 113, 13, 42, 117, 7, 224, 90, 29, 220, 200, 122, 124, 47, 144, 97, 119, 162, 102, 239, 185, 230, 34, 81, 12, 204, 179, 113, 60, 208, 141, 88]) }, "SHA-256": { "normal": new Uint8Array([164, 1, 215, 201, 21, 138, 41, 229, 199, 25, 58, 185, 115, 15, 7, 72, 133, 28, 197, 186, 173, 180, 44, 173, 2, 75, 98, 144, 254, 33, 52, 54]), - "empty": new Uint8Array([180, 247, 231, 85, 118, 116, 213, 1, 203, 251, 192, 20, 138, 216, 0, 192, 117, 1, 137, 254, 41, 90, 42, 202, 94, 27, 244, 18, 44, 133, 237, 249]), - "missing": new Uint8Array([180, 247, 231, 85, 118, 116, 213, 1, 203, 251, 192, 20, 138, 216, 0, 192, 117, 1, 137, 254, 41, 90, 42, 202, 94, 27, 244, 18, 44, 133, 237, 249]) - } - }, - "missing": { - "SHA-384": { - "normal": new Uint8Array([97, 158, 182, 249, 40, 115, 149, 187, 213, 237, 106, 103, 201, 104, 70, 90, 216, 43, 108, 85, 159, 60, 56, 182, 4, 187, 176, 143, 88, 50, 11, 3]), - "empty": new Uint8Array([255, 68, 123, 66, 61, 131, 254, 118, 131, 108, 50, 51, 114, 40, 181, 107, 91, 217, 191, 104, 213, 142, 125, 202, 75, 124, 202, 132, 42, 69, 225, 26]), - "missing": new Uint8Array([255, 68, 123, 66, 61, 131, 254, 118, 131, 108, 50, 51, 114, 40, 181, 107, 91, 217, 191, 104, 213, 142, 125, 202, 75, 124, 202, 132, 42, 69, 225, 26]) - }, - "SHA-512": { - "normal": new Uint8Array([19, 62, 138, 127, 127, 244, 51, 105, 12, 200, 132, 50, 194, 163, 56, 194, 119, 229, 193, 55, 86, 255, 135, 143, 70, 117, 63, 230, 165, 100, 227, 229]), - "empty": new Uint8Array([222, 84, 247, 238, 200, 12, 156, 198, 109, 52, 159, 201, 135, 248, 13, 70, 29, 178, 239, 79, 244, 225, 133, 5, 210, 139, 216, 12, 180, 44, 125, 118]), - "missing": new Uint8Array([222, 84, 247, 238, 200, 12, 156, 198, 109, 52, 159, 201, 135, 248, 13, 70, 29, 178, 239, 79, 244, 225, 133, 5, 210, 139, 216, 12, 180, 44, 125, 118]) - }, - "SHA-1": { - "normal": new Uint8Array([173, 185, 60, 219, 206, 121, 183, 213, 17, 89, 182, 192, 19, 26, 43, 98, 242, 56, 40, 210, 106, 205, 104, 94, 52, 192, 101, 53, 230, 247, 116, 150]), - "empty": new Uint8Array([71, 113, 13, 42, 117, 7, 224, 90, 29, 220, 200, 122, 124, 47, 144, 97, 119, 162, 102, 239, 185, 230, 34, 81, 12, 204, 179, 113, 60, 208, 141, 88]), - "missing": new Uint8Array([71, 113, 13, 42, 117, 7, 224, 90, 29, 220, 200, 122, 124, 47, 144, 97, 119, 162, 102, 239, 185, 230, 34, 81, 12, 204, 179, 113, 60, 208, 141, 88]) - }, - "SHA-256": { - "normal": new Uint8Array([164, 1, 215, 201, 21, 138, 41, 229, 199, 25, 58, 185, 115, 15, 7, 72, 133, 28, 197, 186, 173, 180, 44, 173, 2, 75, 98, 144, 254, 33, 52, 54]), - "empty": new Uint8Array([180, 247, 231, 85, 118, 116, 213, 1, 203, 251, 192, 20, 138, 216, 0, 192, 117, 1, 137, 254, 41, 90, 42, 202, 94, 27, 244, 18, 44, 133, 237, 249]), - "missing": new Uint8Array([180, 247, 231, 85, 118, 116, 213, 1, 203, 251, 192, 20, 138, 216, 0, 192, 117, 1, 137, 254, 41, 90, 42, 202, 94, 27, 244, 18, 44, 133, 237, 249]) + "empty": new Uint8Array([180, 247, 231, 85, 118, 116, 213, 1, 203, 251, 192, 20, 138, 216, 0, 192, 117, 1, 137, 254, 41, 90, 42, 202, 94, 27, 244, 18, 44, 133, 237, 249]) } } }, @@ -206,67 +144,37 @@ function getTestData() { "normal": { "SHA-384": { "normal": new Uint8Array([106, 134, 50, 228, 134, 137, 157, 194, 100, 241, 161, 249, 32, 89, 63, 40, 128, 128, 78, 14, 26, 218, 207, 148, 235, 78, 213, 229, 248, 61, 13, 18]), - "empty": new Uint8Array([234, 80, 18, 254, 181, 135, 81, 213, 188, 142, 182, 78, 13, 234, 205, 89, 126, 215, 16, 201, 243, 82, 88, 174, 107, 154, 8, 122, 237, 7, 37, 174]), - "missing": new Uint8Array([234, 80, 18, 254, 181, 135, 81, 213, 188, 142, 182, 78, 13, 234, 205, 89, 126, 215, 16, 201, 243, 82, 88, 174, 107, 154, 8, 122, 237, 7, 37, 174]) + "empty": new Uint8Array([234, 80, 18, 254, 181, 135, 81, 213, 188, 142, 182, 78, 13, 234, 205, 89, 126, 215, 16, 201, 243, 82, 88, 174, 107, 154, 8, 122, 237, 7, 37, 174]) }, "SHA-512": { "normal": new Uint8Array([199, 151, 225, 209, 242, 202, 183, 242, 138, 95, 67, 69, 92, 16, 89, 127, 148, 51, 133, 237, 251, 66, 140, 254, 43, 152, 190, 212, 169, 85, 215, 161]), - "empty": new Uint8Array([224, 140, 220, 196, 197, 166, 170, 121, 157, 134, 188, 3, 169, 84, 117, 39, 110, 187, 128, 29, 154, 222, 1, 110, 20, 168, 250, 91, 100, 5, 22, 81]), - "missing": new Uint8Array([224, 140, 220, 196, 197, 166, 170, 121, 157, 134, 188, 3, 169, 84, 117, 39, 110, 187, 128, 29, 154, 222, 1, 110, 20, 168, 250, 91, 100, 5, 22, 81]) + "empty": new Uint8Array([224, 140, 220, 196, 197, 166, 170, 121, 157, 134, 188, 3, 169, 84, 117, 39, 110, 187, 128, 29, 154, 222, 1, 110, 20, 168, 250, 91, 100, 5, 22, 81]) }, "SHA-1": { "normal": new Uint8Array([171, 103, 158, 103, 188, 180, 48, 95, 238, 66, 239, 148, 14, 80, 156, 221, 212, 6, 227, 73, 143, 133, 116, 24, 169, 121, 171, 57, 207, 49, 95, 81]), - "empty": new Uint8Array([254, 66, 33, 135, 24, 140, 134, 54, 211, 109, 170, 213, 142, 242, 132, 49, 164, 51, 191, 15, 239, 114, 209, 202, 231, 53, 160, 75, 219, 190, 185, 211]), - "missing": new Uint8Array([254, 66, 33, 135, 24, 140, 134, 54, 211, 109, 170, 213, 142, 242, 132, 49, 164, 51, 191, 15, 239, 114, 209, 202, 231, 53, 160, 75, 219, 190, 185, 211]) + "empty": new Uint8Array([254, 66, 33, 135, 24, 140, 134, 54, 211, 109, 170, 213, 142, 242, 132, 49, 164, 51, 191, 15, 239, 114, 209, 202, 231, 53, 160, 75, 219, 190, 185, 211]) }, "SHA-256": { "normal": new Uint8Array([223, 146, 185, 169, 250, 156, 1, 184, 152, 206, 234, 161, 49, 52, 131, 46, 49, 203, 28, 8, 29, 22, 165, 35, 92, 105, 216, 86, 81, 227, 23, 172]), - "empty": new Uint8Array([230, 13, 67, 43, 6, 238, 136, 157, 250, 183, 41, 154, 32, 236, 35, 105, 117, 49, 209, 25, 252, 247, 102, 208, 152, 141, 10, 203, 12, 0, 199, 247]), - "missing": new Uint8Array([230, 13, 67, 43, 6, 238, 136, 157, 250, 183, 41, 154, 32, 236, 35, 105, 117, 49, 209, 25, 252, 247, 102, 208, 152, 141, 10, 203, 12, 0, 199, 247]) + "empty": new Uint8Array([230, 13, 67, 43, 6, 238, 136, 157, 250, 183, 41, 154, 32, 236, 35, 105, 117, 49, 209, 25, 252, 247, 102, 208, 152, 141, 10, 203, 12, 0, 199, 247]) } }, "empty": { "SHA-384": { "normal": new Uint8Array([234, 203, 157, 102, 112, 255, 59, 25, 4, 119, 154, 65, 145, 1, 177, 255, 170, 189, 109, 101, 16, 189, 80, 133, 104, 1, 116, 106, 135, 31, 123, 49]), - "empty": new Uint8Array([71, 12, 198, 83, 135, 202, 74, 16, 199, 166, 138, 59, 81, 72, 200, 229, 19, 218, 166, 49, 1, 0, 7, 57, 196, 198, 101, 155, 134, 17, 136, 132]), - "missing": new Uint8Array([71, 12, 198, 83, 135, 202, 74, 16, 199, 166, 138, 59, 81, 72, 200, 229, 19, 218, 166, 49, 1, 0, 7, 57, 196, 198, 101, 155, 134, 17, 136, 132]) + "empty": new Uint8Array([71, 12, 198, 83, 135, 202, 74, 16, 199, 166, 138, 59, 81, 72, 200, 229, 19, 218, 166, 49, 1, 0, 7, 57, 196, 198, 101, 155, 134, 17, 136, 132]) }, "SHA-512": { "normal": new Uint8Array([87, 3, 145, 116, 241, 111, 84, 24, 168, 104, 86, 218, 235, 119, 246, 157, 75, 77, 80, 0, 51, 75, 109, 209, 244, 244, 179, 231, 179, 220, 185, 211]), - "empty": new Uint8Array([157, 115, 201, 142, 121, 30, 128, 235, 229, 180, 203, 69, 105, 58, 163, 47, 221, 68, 181, 250, 62, 218, 179, 236, 130, 249, 208, 244, 214, 105, 5, 226]), - "missing": new Uint8Array([157, 115, 201, 142, 121, 30, 128, 235, 229, 180, 203, 69, 105, 58, 163, 47, 221, 68, 181, 250, 62, 218, 179, 236, 130, 249, 208, 244, 214, 105, 5, 226]) + "empty": new Uint8Array([157, 115, 201, 142, 121, 30, 128, 235, 229, 180, 203, 69, 105, 58, 163, 47, 221, 68, 181, 250, 62, 218, 179, 236, 130, 249, 208, 244, 214, 105, 5, 226]) }, "SHA-1": { "normal": new Uint8Array([161, 189, 216, 195, 50, 198, 70, 74, 75, 182, 162, 242, 49, 174, 201, 164, 68, 35, 126, 171, 224, 77, 47, 85, 242, 171, 37, 212, 12, 84, 235, 238]), - "empty": new Uint8Array([136, 95, 192, 41, 179, 34, 75, 137, 110, 9, 224, 187, 229, 235, 52, 126, 197, 158, 104, 39, 200, 232, 87, 179, 148, 245, 79, 244, 155, 136, 168, 246]), - "missing": new Uint8Array([136, 95, 192, 41, 179, 34, 75, 137, 110, 9, 224, 187, 229, 235, 52, 126, 197, 158, 104, 39, 200, 232, 87, 179, 148, 245, 79, 244, 155, 136, 168, 246]) + "empty": new Uint8Array([136, 95, 192, 41, 179, 34, 75, 137, 110, 9, 224, 187, 229, 235, 52, 126, 197, 158, 104, 39, 200, 232, 87, 179, 148, 245, 79, 244, 155, 136, 168, 246]) }, "SHA-256": { "normal": new Uint8Array([183, 184, 110, 66, 42, 209, 200, 165, 113, 253, 165, 40, 218, 22, 160, 102, 244, 36, 134, 221, 64, 86, 121, 47, 217, 51, 98, 8, 142, 93, 212, 194]), - "empty": new Uint8Array([235, 112, 240, 29, 237, 233, 175, 175, 164, 73, 238, 225, 177, 40, 101, 4, 225, 246, 35, 136, 179, 247, 221, 79, 149, 102, 151, 176, 232, 40, 254, 24]), - "missing": new Uint8Array([235, 112, 240, 29, 237, 233, 175, 175, 164, 73, 238, 225, 177, 40, 101, 4, 225, 246, 35, 136, 179, 247, 221, 79, 149, 102, 151, 176, 232, 40, 254, 24]) - } - }, - "missing": { - "SHA-384": { - "normal": new Uint8Array([234, 203, 157, 102, 112, 255, 59, 25, 4, 119, 154, 65, 145, 1, 177, 255, 170, 189, 109, 101, 16, 189, 80, 133, 104, 1, 116, 106, 135, 31, 123, 49]), - "empty": new Uint8Array([71, 12, 198, 83, 135, 202, 74, 16, 199, 166, 138, 59, 81, 72, 200, 229, 19, 218, 166, 49, 1, 0, 7, 57, 196, 198, 101, 155, 134, 17, 136, 132]), - "missing": new Uint8Array([71, 12, 198, 83, 135, 202, 74, 16, 199, 166, 138, 59, 81, 72, 200, 229, 19, 218, 166, 49, 1, 0, 7, 57, 196, 198, 101, 155, 134, 17, 136, 132]) - }, - "SHA-512": { - "normal": new Uint8Array([87, 3, 145, 116, 241, 111, 84, 24, 168, 104, 86, 218, 235, 119, 246, 157, 75, 77, 80, 0, 51, 75, 109, 209, 244, 244, 179, 231, 179, 220, 185, 211]), - "empty": new Uint8Array([157, 115, 201, 142, 121, 30, 128, 235, 229, 180, 203, 69, 105, 58, 163, 47, 221, 68, 181, 250, 62, 218, 179, 236, 130, 249, 208, 244, 214, 105, 5, 226]), - "missing": new Uint8Array([157, 115, 201, 142, 121, 30, 128, 235, 229, 180, 203, 69, 105, 58, 163, 47, 221, 68, 181, 250, 62, 218, 179, 236, 130, 249, 208, 244, 214, 105, 5, 226]) - }, - "SHA-1": { - "normal": new Uint8Array([161, 189, 216, 195, 50, 198, 70, 74, 75, 182, 162, 242, 49, 174, 201, 164, 68, 35, 126, 171, 224, 77, 47, 85, 242, 171, 37, 212, 12, 84, 235, 238]), - "empty": new Uint8Array([136, 95, 192, 41, 179, 34, 75, 137, 110, 9, 224, 187, 229, 235, 52, 126, 197, 158, 104, 39, 200, 232, 87, 179, 148, 245, 79, 244, 155, 136, 168, 246]), - "missing": new Uint8Array([136, 95, 192, 41, 179, 34, 75, 137, 110, 9, 224, 187, 229, 235, 52, 126, 197, 158, 104, 39, 200, 232, 87, 179, 148, 245, 79, 244, 155, 136, 168, 246]) - }, - "SHA-256": { - "normal": new Uint8Array([183, 184, 110, 66, 42, 209, 200, 165, 113, 253, 165, 40, 218, 22, 160, 102, 244, 36, 134, 221, 64, 86, 121, 47, 217, 51, 98, 8, 142, 93, 212, 194]), - "empty": new Uint8Array([235, 112, 240, 29, 237, 233, 175, 175, 164, 73, 238, 225, 177, 40, 101, 4, 225, 246, 35, 136, 179, 247, 221, 79, 149, 102, 151, 176, 232, 40, 254, 24]), - "missing": new Uint8Array([235, 112, 240, 29, 237, 233, 175, 175, 164, 73, 238, 225, 177, 40, 101, 4, 225, 246, 35, 136, 179, 247, 221, 79, 149, 102, 151, 176, 232, 40, 254, 24]) + "empty": new Uint8Array([235, 112, 240, 29, 237, 233, 175, 175, 164, 73, 238, 225, 177, 40, 101, 4, 225, 246, 35, 136, 179, 247, 221, 79, 149, 102, 151, 176, 232, 40, 254, 24]) } } } diff --git a/tests/wpt/web-platform-tests/XMLHttpRequest/event-error.html b/tests/wpt/web-platform-tests/XMLHttpRequest/event-error.html deleted file mode 100644 index 3171c49d7a8..00000000000 --- a/tests/wpt/web-platform-tests/XMLHttpRequest/event-error.html +++ /dev/null @@ -1,25 +0,0 @@ -<!DOCTYPE html> -<meta charset="utf-8"> -<title>XMLHttpRequest Test: event - error</title> -<link rel="author" title="Intel" href="http://www.intel.com"> -<meta name="assert" content="Check if event onerror is fired When the request has failed."> -<script src="/resources/testharness.js"></script> -<script src="/resources/testharnessreport.js"></script> - -<div id="log"></div> - -<script> - -async_test(function (t) { - var client = new XMLHttpRequest(); - client.onerror = t.step_func(function(e) { - assert_true(e instanceof ProgressEvent); - assert_equals(e.type, "error"); - t.done(); - }); - - client.open("GET", "http://nonexistent-origin.{{host}}:{{ports[http][0]}}"); - client.send("null"); -}, document.title); - -</script> diff --git a/tests/wpt/web-platform-tests/XMLHttpRequest/setrequestheader-case-insensitive.htm b/tests/wpt/web-platform-tests/XMLHttpRequest/setrequestheader-case-insensitive.htm index cf8810d0fb6..248306fce4a 100644 --- a/tests/wpt/web-platform-tests/XMLHttpRequest/setrequestheader-case-insensitive.htm +++ b/tests/wpt/web-platform-tests/XMLHttpRequest/setrequestheader-case-insensitive.htm @@ -11,7 +11,7 @@ <script> test(function() { var client = new XMLHttpRequest() - client.open("POST", "resources/inspect-headers.py?filter_value=t1, t2, t3", false) + client.open("POST", "resources/inspect-headers.py?filter_value=t1,t2,t3", false) client.setRequestHeader("x-test", "t1") client.setRequestHeader("X-TEST", "t2") client.setRequestHeader("X-teST", "t3") diff --git a/tests/wpt/web-platform-tests/XMLHttpRequest/setrequestheader-header-allowed.htm b/tests/wpt/web-platform-tests/XMLHttpRequest/setrequestheader-header-allowed.htm index df7d94a933d..31e40df16f4 100644 --- a/tests/wpt/web-platform-tests/XMLHttpRequest/setrequestheader-header-allowed.htm +++ b/tests/wpt/web-platform-tests/XMLHttpRequest/setrequestheader-header-allowed.htm @@ -4,7 +4,7 @@ <title>XMLHttpRequest: setRequestHeader() - headers that are allowed</title> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> - <link rel="help" href="https://xhr.spec.whatwg.org/#the-setrequestheader()-method" data-tested-assertations="/following::ol/li[6] /following::ol/li[7]" /> + <link rel="help" href="https://xhr.spec.whatwg.org/#the-setrequestheader()-method" data-tested-assertations="/following::ol/li[6] /following::ol/li[7]" /> </head> <body> <div id="log"></div> @@ -12,7 +12,7 @@ function request(header) { test(function() { var client = new XMLHttpRequest() - client.open("POST", "resources/inspect-headers.py?filter_value=t1, t2", false) + client.open("POST", "resources/inspect-headers.py?filter_value=t1,t2", false) client.setRequestHeader(header, "t1") client.setRequestHeader(header, "t2") client.send(null) diff --git a/tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor_browsing_context.html b/tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor_browsing_context.html new file mode 100644 index 00000000000..e0ada32babf --- /dev/null +++ b/tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor_browsing_context.html @@ -0,0 +1,31 @@ +<!DOCTYPE html> +<meta charset="utf-8"> +<title>AmbientLightSensor Test: Sensor readings must only be available in the top-level browsing context</title> +<link rel="author" title="Intel" href="http://www.intel.com"> +<link rel="help" href="https://www.w3.org/TR/ambient-light/"> +<script src="/resources/testharness.js"></script> +<script src="/resources/testharnessreport.js"></script> +<div id="log"></div> +<iframe src="support-iframe.html" id="frame" style="display:none"> +</iframe> +<script> + +async_test(function (t) { + document.getElementById('frame').onload = t.step_func_done(function(event) { + var iframe = document.getElementById('frame').contentWindow; + let reading = iframe.document.getElementById('reading').value; + assert_equals(reading, "null"); + }); +}, "sensor readings can not be fired within iframes"); + +test(function() { + let sensor = new AmbientLightSensor(); + sensor.start(); + var win = window.open('', '_blank'); + let reading = String(sensor.reading); + win.close(); + sensor.stop(); + assert_equals(reading, "null"); +}, "sensor readings can not be fired on the background tab"); + +</script> diff --git a/tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor_onchange-manual.html b/tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor_onchange-manual.html new file mode 100644 index 00000000000..01950f739a5 --- /dev/null +++ b/tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor_onchange-manual.html @@ -0,0 +1,36 @@ +<!DOCTYPE html> +<meta charset="utf-8"> +<title>AmbientLightSensor Test: onchange</title> +<link rel="author" title="Intel" href="http://www.intel.com"> +<link rel="help" href="https://www.w3.org/TR/ambient-light/"> +<script src="/resources/testharness.js"></script> +<script src="/resources/testharnessreport.js"></script> + +<h2>Description</h2> +<p> + This test validates that the "onchange" event can be invoked when changing the ambient light illuminance of the device. +</p> + +<h2>Precondition</h2> +<ol> + <li> + Change the ambient light illuminance of the device. + </li> +</ol> + +<script> + +async_test(function(t) { + let sensor = new AmbientLightSensor(); + sensor.start(); + + sensor.onchange = t.step_func_done(function(event) { + sensor.stop(); + }); + + sensor.onerror = t.step_func_done(function(event) { + assert_unreached(event.error.name + ":" + event.error.message); + }); +}, "event change fired"); + +</script> diff --git a/tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor_onstatechange.html b/tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor_onstatechange.html new file mode 100644 index 00000000000..99a706f20c5 --- /dev/null +++ b/tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor_onstatechange.html @@ -0,0 +1,39 @@ +<!DOCTYPE html> +<meta charset="utf-8"> +<title>AmbientLightSensor Test: onstatechange</title> +<link rel="author" title="Intel" href="http://www.intel.com"> +<link rel="help" href="https://www.w3.org/TR/ambient-light/"> +<script src="/resources/testharness.js"></script> +<script src="/resources/testharnessreport.js"></script> +<div id="log"></div> +<script> +var sensor; +setup(function() { + sensor = new AmbientLightSensor(); +}); + +test(function() { + assert_equals(sensor.state, "idle"); +}, "The default sensor.state is 'idle'."); + +async_test(function(t) { + sensor.onstatechange = t.step_func_done(function(event) { + assert_equals(sensor.state, "activating"); + }); + sensor.onerror = t.step_func_done(function(event) { + assert_unreached(event.error.name + ":" + event.error.message); + }); + sensor.start(); +}, "The sensor.state changes to 'activating' after sensor.start()."); + +async_test(function(t) { + sensor.onstatechange = t.step_func_done(function(event) { + assert_equals(sensor.state, "idle"); + }); + sensor.onerror = t.step_func_done(function(event) { + assert_unreached(event.error.name + ":" + event.error.message); + }); + sensor.stop(); +}, "The sensor.state changes to 'idle' after sensor.stop()."); + +</script> diff --git a/tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor_start.html b/tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor_start.html new file mode 100644 index 00000000000..2ac29be2168 --- /dev/null +++ b/tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor_start.html @@ -0,0 +1,31 @@ +<!DOCTYPE html> +<meta charset="utf-8"> +<title>AmbientLightSensor Test: start()</title> +<link rel="author" title="Intel" href="http://www.intel.com"> +<link rel="help" href="https://www.w3.org/TR/ambient-light/"> +<script src="/resources/testharness.js"></script> +<script src="/resources/testharnessreport.js"></script> +<div id="log"></div> +<script> +var sensor, start_return; + +setup(function() { + sensor = new AmbientLightSensor(); + start_return = sensor.start(); +}); + +test(function() { + assert_equals(String(sensor.reading), "[object AmbientLightSensorReading]"); +}, "the sensor.reading is AmbientLightSensorReading after executing start() method"); + +test(function() { + assert_throws("InvalidStateError", function() { sensor.start(); }, "start() twice"); +}, "throw an InvalidStateError exception when state is neither idle nor errored"); + +//TODO: The permission is not ready. + +test(function() { + assert_equals(start_return, undefined); +}, "the sensor.start() return undefined"); + +</script> diff --git a/tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor_stop.html b/tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor_stop.html new file mode 100644 index 00000000000..34cd3600be1 --- /dev/null +++ b/tests/wpt/web-platform-tests/ambient-light/AmbientLightSensor_stop.html @@ -0,0 +1,30 @@ +<!DOCTYPE html> +<meta charset="utf-8"> +<title>AmbientLightSensor Test: stop()</title> +<link rel="author" title="Intel" href="http://www.intel.com"> +<link rel="help" href="https://www.w3.org/TR/ambient-light/"> +<script src="/resources/testharness.js"></script> +<script src="/resources/testharnessreport.js"></script> +<div id="log"></div> +<script> + +var sensor, stop_return; +setup(function() { + sensor = new AmbientLightSensor(); + sensor.start(); + stop_return = sensor.stop(); +}); + +test(function() { + assert_equals(String(sensor.reading), "null"); +}, "the sensor.reading is null after executing stop() method"); + +test(function() { + assert_throws("InvalidStateError", function() { sensor.stop(); }, "stop() twice"); +}, "throw an InvalidStateError exception when state is either idle or errored"); + +test(function() { + assert_equals(stop_return, undefined); +}, "the sensor.stop() returns undefined"); + +</script> diff --git a/tests/wpt/web-platform-tests/ambient-light/idlharness.html b/tests/wpt/web-platform-tests/ambient-light/idlharness.html index c2ab2ea9c31..f88a602a6f9 100644 --- a/tests/wpt/web-platform-tests/ambient-light/idlharness.html +++ b/tests/wpt/web-platform-tests/ambient-light/idlharness.html @@ -98,7 +98,7 @@ dictionary AmbientLightSensorReadingInit { idl_array.add_objects({ AmbientLightSensor: ['new AmbientLightSensor();'], AmbientLightSensorReading: ['new AmbientLightSensorReading({ illuminance: 750 });'], - SensorReadingEvent: ['new SensorReadingEvent({ reading: new AmbientLightSensorReading({ illuminance: 750 }) });'] + SensorReadingEvent: ['new SensorReadingEvent("reading", { reading: new AmbientLightSensorReading({ illuminance: 750 }) });'] }); idl_array.test(); diff --git a/tests/wpt/web-platform-tests/ambient-light/support-iframe.html b/tests/wpt/web-platform-tests/ambient-light/support-iframe.html new file mode 100644 index 00000000000..994642d5137 --- /dev/null +++ b/tests/wpt/web-platform-tests/ambient-light/support-iframe.html @@ -0,0 +1,11 @@ +<!DOCTYPE HTML> +<meta charset="utf-8"> +<input type="text" id="reading" /> +<script> + +let sensor = new AmbientLightSensor(); +sensor.start(); +document.getElementById("reading").value = String(sensor.reading); +sensor.stop(); + +</script> diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.1-annotationContextValidated.json b/tests/wpt/web-platform-tests/annotation-model/annotations/3.1-annotationContextValidated.json index f7d79f2f747..b5c165f3c46 100644 --- a/tests/wpt/web-platform-tests/annotation-model/annotations/3.1-annotationContextValidated.json +++ b/tests/wpt/web-platform-tests/annotation-model/annotations/3.1-annotationContextValidated.json @@ -5,7 +5,7 @@ "expectedResult": "valid", "onUnexpectedResult" : "failAndContinue", "errorMessage": "ERROR: Annotation is missing @context key or 'http://www.w3.org/ns/anno.jsonld' is not a value of @context.", - "title": "Annotation has **_@context_ key** and '**http://www.w3.org/ns/anno.jsonld**' is **a value of _@context_** - [model 3.1](https://www.w3.org/TR/annotation-model/#annotations)", + "title": "Implements **_@context_ key** and '**http://www.w3.org/ns/anno.jsonld**' is **a value of _@context_** - [model 3.1](https://www.w3.org/TR/annotation-model/#annotations)", "description": "True when the Annotation has @context key and 'http://www.w3.org/ns/anno.jsonld' is an @context value (Section 3.1)", "type": "object", "required": [ "@context" ], diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.1-annotationIdValidated.json b/tests/wpt/web-platform-tests/annotation-model/annotations/3.1-annotationIdValidated.json index 2fca8a4f3f1..5c31fa91044 100644 --- a/tests/wpt/web-platform-tests/annotation-model/annotations/3.1-annotationIdValidated.json +++ b/tests/wpt/web-platform-tests/annotation-model/annotations/3.1-annotationIdValidated.json @@ -5,7 +5,7 @@ "expectedResult": "valid", "onUnexpectedResult" : "failAndContinue", "errorMessage": "ERROR: Annotation is missing id key or its value is not a single string of format uri.", - "title": "Annotation has **_id_ key** which has a **single value** that is a **string of format uri** - [model 3.1](https://www.w3.org/TR/annotation-model/#annotations)", + "title": "Implements **Annotation _id_ key** which has a **single value** that is a **string of format uri** - [model 3.1](https://www.w3.org/TR/annotation-model/#annotations)", "description": "True when the Annotation has a single id that is a string of format uri (Section 3.1)", "$ref": "id.json#/definitions/idValueFound" } diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.1-annotationTypeValidated.json b/tests/wpt/web-platform-tests/annotation-model/annotations/3.1-annotationTypeValidated.json index b2c20d5e529..a2a6c84b4a1 100644 --- a/tests/wpt/web-platform-tests/annotation-model/annotations/3.1-annotationTypeValidated.json +++ b/tests/wpt/web-platform-tests/annotation-model/annotations/3.1-annotationTypeValidated.json @@ -5,7 +5,7 @@ "expectedResult": "valid", "onUnexpectedResult" : "failAndContinue", "errorMessage": "ERROR: Annotation is missing type key or 'Annotation' is not a value of type.", - "title": "Annotation has **_type_ key** and '**Annotation**' is **a value of _type_** - [model 3.1](https://www.w3.org/TR/annotation-model/#annotations)", + "title": "Implements **Annotation _type_ key** and '**Annotation**' is **a value of _type_** - [model 3.1](https://www.w3.org/TR/annotation-model/#annotations)", "allOf": [ { "$ref": "annotations.json#/definitions/annotationTypeValueFound"} ] diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.1-targetKeyFound.json b/tests/wpt/web-platform-tests/annotation-model/annotations/3.1-targetKeyFound.json index be6ca25048f..b1bb0e2141c 100644 --- a/tests/wpt/web-platform-tests/annotation-model/annotations/3.1-targetKeyFound.json +++ b/tests/wpt/web-platform-tests/annotation-model/annotations/3.1-targetKeyFound.json @@ -5,7 +5,7 @@ "expectedResult": "valid", "onUnexpectedResult" : "failAndContinue", "errorMessage": "Error: Annotation is missing target key.", - "title": "Annotation has a **_target_ key** - [model 3.1](https://www.w3.org/TR/annotation-model/#annotations)", + "title": "Implements **_target_ key** - [model 3.1](https://www.w3.org/TR/annotation-model/#annotations)", "description": "True when the Annotation has a target key (Section 3.1)", "type": "object", "required": ["target" ] diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.2-bodyObjectsRecognized.json b/tests/wpt/web-platform-tests/annotation-model/annotations/3.2-bodyObjectsRecognized.json index 27e79105b50..29a068da338 100644 --- a/tests/wpt/web-platform-tests/annotation-model/annotations/3.2-bodyObjectsRecognized.json +++ b/tests/wpt/web-platform-tests/annotation-model/annotations/3.2-bodyObjectsRecognized.json @@ -6,7 +6,7 @@ "onUnexpectedResult" : "failAndContinue", "errorMessage": "ERROR: One or more Bodies of the Annotation is not one of a string of format uri, an External Web Resource, a Choice or Set, a Specific Resource.", "title": "If present, each **_body_** is one of a **string of format uri**, an **External Web Resource**, an **Embedded Textual Body**, a **Choice** or **Set**, or a **Specific Resource** - [model 3.2](https://www.w3.org/TR/annotation-model/#bodies-and-targets), [model 4](https://www.w3.org/TR/annotation-model/#specific-resources)", - "description": "True when all Body(ies) are one of a string of format uri, an External Web Resource, a Choice or Set, a Specific Resource (Sections 3.2, Section 4)", + "description": "True when all Bodies are one of a string of format uri, an External Web Resource, a Choice or Set, a Specific Resource (Sections 3.2, Section 4)", "type": "object", "properties": { diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.1-annotationCreatedImplemented.json b/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.1-annotationCreatedImplemented.json index d27fa374b5f..eaab005ad42 100644 --- a/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.1-annotationCreatedImplemented.json +++ b/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.1-annotationCreatedImplemented.json @@ -1,10 +1,10 @@ { "$schema": "http://json-schema.org/draft-04/schema#", "id": "3.3.1-annotationCreatedImplemented.json", - "assertionType": "may", + "assertionType": "should", "expectedResult": "valid", "onUnexpectedResult" : "passAndContinue", - "errorMessage": "Valid Annotation-level created key not found. Annotation may have zero or exactly one created key value.", + "errorMessage": "Valid Annotation-level created key not found. Annotation should have exactly one created key value.", "title": "Implements Annotation-level **_created_ key** which has a **single value** that is a **string of format date-time** - [model 3.3.1](https://www.w3.org/TR/annotation-model/#lifecycle-information)", "description": "True when the Annotation implements exactly one created key value (Section 3.3.1)", "allOf": diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.7-annotationViaValidated.json b/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.7-annotationViaValidated.json index 2592ed800df..b7787b5a67c 100644 --- a/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.7-annotationViaValidated.json +++ b/tests/wpt/web-platform-tests/annotation-model/annotations/3.3.7-annotationViaValidated.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "id": "3.3.7-annotationviaValidated.json", + "id": "3.3.7-annotationViaValidated.json", "assertionType": "must", "expectedResult": "valid", "onUnexpectedResult" : "failAndContinue", diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/annotationAgentOptionals.test b/tests/wpt/web-platform-tests/annotation-model/annotations/annotationAgentOptionals.test deleted file mode 100644 index ee61869e49b..00000000000 --- a/tests/wpt/web-platform-tests/annotation-model/annotations/annotationAgentOptionals.test +++ /dev/null @@ -1,25 +0,0 @@ -{ - "@context": "https://www.w3.org/ns/JSONtest-v1.jsonld", - "name": "Annotation implements optional keys and meets optional key value constraints for Creator and Generator Agents", - "description": "Agents (Creators, Generators) involved in an Annotation: <ul> <li>Should include certain properties (keys)</li> <li>May include additional keys</li> <li>should have Agent key values that conform to model recommended constraints</li> </ul> Note: failing an assertion indicates that a recommended or optional feature has not been implemented or has not been implemented correctly.", - "testType": "manual", - "ref": "https://www.w3.org/TR/annotation-model/#other-properties", - "assertions": [ - "annotations/3.3.2-annotationCreatorAgentIdImplemented.json", - "annotations/3.3.2-annotationGeneratorAgentIdImplemented.json", - "annotations/3.3.2-annotationCreatorAgentTypeImplemented.json", - "annotations/3.3.2-annotationGeneratorAgentTypeImplemented.json", - "annotations/3.3.2-annotationCreatorAgentNicknameImplemented.json", - "annotations/3.3.2-annotationGeneratorAgentNicknameImplemented.json", - "annotations/3.3.2-annotationCreatorAgentSingleNameImplemented.json", - "annotations/3.3.2-annotationGeneratorAgentSingleNameImplemented.json", - "annotations/3.3.2-annotationCreatorAgentNameImplemented.json", - "annotations/3.3.2-annotationGeneratorAgentNameImplemented.json", - "annotations/3.3.2-annotationCreatorAgentEmailImplemented.json", - "annotations/3.3.2-annotationGeneratorAgentEmailImplemented.json", - "annotations/3.3.2-annotationCreatorAgentEmail_sha1Implemented.json", - "annotations/3.3.2-annotationGeneratorAgentEmail_sha1Implemented.json", - "annotations/3.3.2-annotationCreatorAgentHomepageImplemented.json", - "annotations/3.3.2-annotationGeneratorAgentHomepageImplemented.json" - ] -} diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/annotationMusts-manual.html b/tests/wpt/web-platform-tests/annotation-model/annotations/annotationMusts-manual.html index 1caa167c73e..d2435ed0991 100644 --- a/tests/wpt/web-platform-tests/annotation-model/annotations/annotationMusts-manual.html +++ b/tests/wpt/web-platform-tests/annotation-model/annotations/annotationMusts-manual.html @@ -1,7 +1,8 @@ <!doctype html> <html> <head> -<title>Annotation has all required keys and all annotation keys used meet required value constraints</title> +<title>A single ANNOTATION has all required keys and all annotation keys used meet required value constraints</title> +<link rel="stylesheet" href="/resources/testharness.css"> <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> <script src="/annotation-model/scripts/ajv.min.js"></script> @@ -11,26 +12,12 @@ setup({explicit_timeout: true, explicit_done: true }); var theDefinitions=[ - "definitions/compositeDetected.json", - "definitions/processingLanguageDetected.json", - "definitions/textDirectionDetected.json", - "definitions/independentsDetected.json", "definitions/specificResource.json", - "definitions/stringUri.json", "definitions/choiceSet.json", "definitions/bodyTarget.json", - "definitions/listDetected.json", - "definitions/formatDetected.json", "definitions/annotations.json", "definitions/otherProperties.json", - "definitions/choiceDetected.json", - "definitions/externalWebResource.json", - "definitions/externalWebResourceDetected.json", - "definitions/languageDetected.json", - "definitions/textualBody.json", - "definitions/id.json", - "definitions/itemsDetected.json", - "definitions/specificResourceDetected.json" + "definitions/id.json" ]; var theTestFile="annotationMusts.test"; @@ -49,13 +36,13 @@ var runningTest = new JSONtest( { <p>Fill the textarea below with JSON output from your annotation client implementation that supports the following criteria:</p> <div id="testDescription"></div> -<p>Specifically, the following assertions will be evaluated:</p> -<div id="assertion"></div> <form name="annotation" id="annotation"> <textarea name="annotation-input" id="annotation-input" style="width: 90%; height: 10em" > +Specifically, the following assertions will be evaluated: +
Specifically, the following assertions will be evaluated: