third_party/WebKit/LayoutTests/fast/canvas/fallback-content.html - Issue 2703803002: Use testharness.js instead of js-test.js in LayoutTests/fast/canvas tests.

Unified Diff: third_party/WebKit/LayoutTests/fast/canvas/fallback-content.html

Issue 2703803002: 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

Index: third_party/WebKit/LayoutTests/fast/canvas/fallback-content.html

diff --git a/third_party/WebKit/LayoutTests/fast/canvas/fallback-content.html b/third_party/WebKit/LayoutTests/fast/canvas/fallback-content.html

index 699aecb4bdd6b9ea038d7d01795cd2546386320a..9dff9a65cca9bab98d533c1ca2ea2a12ccbfba69 100644

--- a/third_party/WebKit/LayoutTests/fast/canvas/fallback-content.html

+++ b/third_party/WebKit/LayoutTests/fast/canvas/fallback-content.html

@@ -1,8 +1,9 @@

-<!DOCTYPE HTML>

<html>

<body>

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

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

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

<div>

<button id="button1">Button</button>

@@ -34,61 +35,59 @@

</canvas>

</div>

-<div id="console"></div>

-description("This test makes sure that focusable elements in canvas fallback content are focusable.");

-if (window.testRunner)

- window.testRunner.dumpAsText();

var element;

+var previousFocusedElement;

function checkFocusable(id) {

- debug(id + " should be focusable.");

element = document.getElementById(id);

element.focus();

- shouldBe("document.activeElement == element", "true");

- debug("");

+ assert_true(document.activeElement == element);

}

-checkFocusable("link1");

-checkFocusable("button1");

-checkFocusable("text1");

-checkFocusable("checkbox1");

-checkFocusable("radio1");

-checkFocusable("slider1");

-checkFocusable("submit1");

-checkFocusable("combobox1");

-checkFocusable("listbox1");

-checkFocusable("textarea1");

-checkFocusable("focusable1");

-checkFocusable("link2");

-checkFocusable("button2");

-checkFocusable("text2");

-checkFocusable("checkbox2");

-checkFocusable("radio2");

-checkFocusable("slider2");

-checkFocusable("submit2");

-checkFocusable("combobox2");

-checkFocusable("listbox2");

-checkFocusable("textarea2");

-checkFocusable("focusable2");

-var previousFocusedElement;

function checkNotFocusable(id) {

- debug(id + " should not be focusable.");

previousFocusedElement = document.activeElement;

element = document.getElementById(id);

element.focus();

- shouldBe("document.activeElement == previousFocusedElement", "true");

- debug("");

+ assert_true(document.activeElement == previousFocusedElement);

}

-checkNotFocusable("linkInHiddenCanvas");

+var focusableTestScenarios = [

+ ['FocusableTestCase1', "link1"],

+ ['FocusableTestCase2', "button1"],

+ ['FocusableTestCase3', "text1"],

+ ['FocusableTestCase4', "checkbox1"],

+ ['FocusableTestCase5', "radio1"],

+ ['FocusableTestCase6', "slider1"],

+ ['FocusableTestCase7', "submit1"],

+ ['FocusableTestCase8', "combobox1"],

+ ['FocusableTestCase9', "listbox1"],

+ ['FocusableTestCase10', "textarea1"],

+ ['FocusableTestCase11', "focusable1"],

+ ['FocusableTestCase12', "link2"],

+ ['FocusableTestCase13', "button2"],

+ ['FocusableTestCase14', "text2"],

+ ['FocusableTestCase15', "checkbox2"],

+ ['FocusableTestCase16', "radio2"],

+ ['FocusableTestCase17', "slider2"],

+ ['FocusableTestCase18', "submit2"],

+ ['FocusableTestCase19', "combobox2"],

+ ['FocusableTestCase20', "listbox2"],

+ ['FocusableTestCase21', "textarea2"],

+ ['FocusableTestCase22', "focusable2"]

+];

+var notFocusableTestScenarios = [

+ ['NotFocusableTestCase', "linkInHiddenCanvas"],

+];

+generate_tests(checkFocusable, focusableTestScenarios);

+generate_tests(checkNotFocusable, notFocusableTestScenarios);

document.querySelector("#container").remove();

-</script>

+</script>

</body>

</html>

« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/fast/canvas/fallback-content-expected.txt » ('j') | no next file with comments »