third_party/WebKit/LayoutTests/fast/canvas/draw-focus-if-needed-on-event.html - Issue 2700823002: Use testharness.js instead of js-test.js in LayoutTests/fast/canvas tests.

Unified Diff: third_party/WebKit/LayoutTests/fast/canvas/draw-focus-if-needed-on-event.html

Issue 2700823002: Use testharness.js instead of js-test.js in LayoutTests/fast/canvas tests. (Closed)

Patch Set: Addressing comments Created 3 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « third_party/WebKit/LayoutTests/fast/canvas/draw-focus-if-needed-invisible-crash-expected.txt ('k') | third_party/WebKit/LayoutTests/fast/canvas/draw-focus-if-needed-on-event-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/LayoutTests/fast/canvas/draw-focus-if-needed-on-event.html

diff --git a/third_party/WebKit/LayoutTests/fast/canvas/draw-focus-if-needed-on-event.html b/third_party/WebKit/LayoutTests/fast/canvas/draw-focus-if-needed-on-event.html

index aef285b0b6f831f36021809d0ea9bb63caba0780..6fcf15def6e64a657205d4ea039eaca4f33793db 100644

--- a/third_party/WebKit/LayoutTests/fast/canvas/draw-focus-if-needed-on-event.html

+++ b/third_party/WebKit/LayoutTests/fast/canvas/draw-focus-if-needed-on-event.html

@@ -1,17 +1,10 @@

-<!DOCTYPE HTML>

-<head>

-<title>Canvas test: drawFocusIfNeeded</title>

-<script src="../../resources/js-test.js"></script>

-</head>

-<body style="padding: 0; margin: 0">

+<script src="../../resources/testharness.js"></script>

+<script src="../../resources/testharnessreport.js"></script>

</canvas>

-if (window.testRunner)

- testRunner.dumpAsText();

var canvas = document.getElementById("canvas").getContext("2d");

document.getElementById("button1").addEventListener('focus', function() {

@@ -28,17 +21,21 @@ document.getElementById("button1").addEventListener('focus', function() {

canvas.drawFocusIfNeeded(document.getElementById("button2"));

});

-document.getElementById("button1").focus();

-// The top rect's focus ring is tied to button1, which is focused.

-// It should have an outline in some color other than the background color.

-var imageData = canvas.getImageData(49, 50, 1, 1);

-var data = imageData.data;

-shouldBe("data[0] != 0 || data[1] != 0 || data[2] != 0", "true");

+test(function(t) {

-// The bottom rect"s focus ring is tied to button2, which is not focused.

-imageData = canvas.getImageData(49, 200, 1, 1);

-data = imageData.data;

-shouldBe("data[0] == 0 && data[1] == 0 && data[2] == 0", "true");

+ document.getElementById("button1").focus();

+ // The top rect's focus ring is tied to button1, which is focused.

+ // It should have an outline in some color other than the background color.

+ var imageData = canvas.getImageData(49, 50, 1, 1);

+ var data = imageData.data;

+ assert_true(data[0] != 0 || data[1] != 0 || data[2] != 0);

+ // The bottom rect"s focus ring is tied to button2, which is not focused.

+ imageData = canvas.getImageData(49, 200, 1, 1);

+ data = imageData.data;

+ assert_true(data[0] == 0 && data[1] == 0 && data[2] == 0);

+}, 'Test that drawFocusIfNeeded does not crash on event.');

</script>

</body>