Skip to content

Commit bef0478

Browse files
rniwarniwa
committed
Use testRunner instead of layoutTestController in networkinformation, perf, plugins, pointer-lock, printing, scrollbars, and security tests
https://bugs.webkit.org/show_bug.cgi?id=89181 Reviewed by Kent Tamura. * perf/clone-with-focus.html: * perf/nested-combined-selectors.html: * perf/table-rows-length-caching.html: * platform/chromium/plugins/call-as-function.html: * platform/chromium/plugins/get-url-with-blank-target2.html: * platform/chromium/plugins/get-url-with-iframe-target-no-crash.html: * platform/chromium/printing/custom-page-size-style-expected.txt: * platform/chromium/printing/custom-page-size-style.html: * platform/gtk/plugins/invalidate-rect-with-null-npp-argument.html: * platform/gtk/scrollbars/overflow-scrollbar-horizontal-wheel-scroll.html: * platform/mac-wk2/plugins/contents-scale-factor.html: * platform/mac-wk2/plugins/mouse-events-scaled.html: * platform/mac/plugins/bindings-array-apply-crash.html: * platform/mac/plugins/bindings-objc-long-method-name.html: * platform/mac/plugins/bindings-objc-method-name-conversion.html: * platform/mac/plugins/bindings-test-objc.html: * platform/mac/plugins/call-as-function-test.html: * platform/mac/plugins/convert-point.html: * platform/mac/plugins/disable-plugins.html: * platform/mac/plugins/jsobjc-dom-wrappers.html: * platform/mac/plugins/jsobjc-simple.html: * platform/mac/plugins/pluginDocumentView-deallocated-dataSource.html-disabled: * platform/mac/plugins/root-object-premature-delete-crash.html: * platform/mac/plugins/supports-carbon-event-model.html: * platform/mac/plugins/testplugin-onnew-onpaint.html: * platform/mac/plugins/throw-on-dealloc.html: * platform/mac/plugins/undefined-property-crash.html: * platform/mac/plugins/update-widget-from-style-recalc.html: * platform/mac/plugins/webScriptObject-exception-deadlock.html: * platform/mac/scrollbars/key-window-not-first-responder.html: * platform/qt/plugins/application-plugin-plugins-disabled.html: * platform/win/plugins/call-javascript-that-destroys-plugin.html: * platform/win/plugins/get-value-netscape-window.html: * platform/win/plugins/iframe-inside-overflow.html: * platform/win/plugins/npn-invalidate-rect-invalidates-window.html: * platform/win/plugins/visibility-hidden.html: * platform/win/plugins/window-geometry-initialized-before-set-window.html: * platform/win/plugins/window-region-is-set-to-clip-rect.html: * platform/win/plugins/windowless-paint-rect-coordinates.html: * plugins/: * pointer-lock/lock-fail-responses-expected.txt: * pointer-lock/lock-fail-responses.html: * pointer-lock/pointer-lock-api.html: * pointer-lock/pointerlockchange-pointerlockerror-events-expected.txt: * pointer-lock/pointerlockchange-pointerlockerror-events.html: * pointer-lock/pointerlocklost-event-expected.txt: * pointer-lock/pointerlocklost-event.html: * printing/compositing-layer-printing.html: * printing/css2.1/README.txt: * printing/css2.1/page-break-after-000.html: * printing/css2.1/page-break-after-001.html: * printing/css2.1/page-break-after-002.html: * printing/css2.1/page-break-after-003.html: * printing/css2.1/page-break-after-004.html: * printing/css2.1/page-break-before-000.html: * printing/css2.1/page-break-before-001.html: * printing/css2.1/page-break-before-002.html: * printing/css2.1/page-break-inside-000.html: * printing/iframe-print.html: * printing/media-queries-print.html: * printing/numberOfPages-expected.txt: * printing/page-count-layout-overflow.html: * printing/page-count-relayout-shrink.html: * printing/page-count-with-one-word.html: * printing/page-format-data-display-none.html: * printing/page-format-data-expected.txt: * printing/page-format-data.html: * printing/page-rule-css-text.html: * printing/page-rule-in-media-query.html: * printing/page-rule-selection-expected.txt: * printing/page-rule-selection.html: * printing/pageNumerForElementById-expected.txt: * printing/print-close-crash.html: * printing/pseudo-class-outside-page.html: * printing/resources/paged-media-test-utils.js: (pageNumberForElementShouldBe): (numberOfPagesShouldBe): (runPrintingTest): * printing/return-from-printing-mode.html: * printing/script-tests/numberOfPages.js: * printing/script-tests/pageNumerForElementById.js: * printing/setPrinting.html: * printing/simultaneous-position-float-change.html: * printing/single-line-must-not-be-split-into-two-pages.html: * printing/width-overflow.html: * printing/zoomed-document.html: * scrollbars/hidden-iframe-scrollbar-crash.html: * scrollbars/hidden-iframe-scrollbar-crash2.html: * scrollbars/hidden-scrollbar-prevents-layout.html: * scrollbars/overflow-custom-scrollbar-crash.html: * scrollbars/resources/hidden-iframe-scrollbar-crash2.html: * scrollbars/scroll-rtl-or-bt-layer.html: * scrollbars/scrollable-iframe-remove-crash.html: * scrollbars/scrollbar-click-does-not-blur-content.html: * scrollbars/scrollbar-crash-on-refresh.html: * scrollbars/scrollbar-drag-thumb-with-large-content.html: * scrollbars/scrollbar-gradient-crash.html: * scrollbars/scrollbar-iframe-click-does-not-blur-content.html: * scrollbars/scrollbar-initial-position.html: * scrollbars/scrollbar-middleclick-nopaste.html: * scrollbars/scrollbar-miss-mousemove-disabled.html: * scrollbars/scrollbar-miss-mousemove.html: * scrollbars/scrollbar-owning-renderer-crash.html: * scrollbars/scrollbar-part-created-with-no-parent-crash.html: * scrollbars/scrollbar-percent-padding-crash.html: * scrollbars/scrollbar-scrollbarparts-repaint-crash.html: * scrollbars/scrollevent-iframe-no-scrolling-wheel.html: * scrollbars/scrollevent-iframe-no-scrolling.html: * security/autocomplete-cleared-on-back.html: * security/block-test-no-port.html: * security/block-test.html: * security/set-form-autocomplete-attribute.html: Canonical link: https://commits.webkit.org/107031@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@120417 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 5d1667d commit bef0478

220 files changed

Lines changed: 934 additions & 814 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎LayoutTests/ChangeLog‎

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,123 @@
1+
2012-06-15 Ryosuke Niwa <rniwa@webkit.org>
2+
3+
Use testRunner instead of layoutTestController in networkinformation, perf, plugins, pointer-lock, printing, scrollbars, and security tests
4+
https://bugs.webkit.org/show_bug.cgi?id=89181
5+
6+
Reviewed by Kent Tamura.
7+
8+
* perf/clone-with-focus.html:
9+
* perf/nested-combined-selectors.html:
10+
* perf/table-rows-length-caching.html:
11+
* platform/chromium/plugins/call-as-function.html:
12+
* platform/chromium/plugins/get-url-with-blank-target2.html:
13+
* platform/chromium/plugins/get-url-with-iframe-target-no-crash.html:
14+
* platform/chromium/printing/custom-page-size-style-expected.txt:
15+
* platform/chromium/printing/custom-page-size-style.html:
16+
* platform/gtk/plugins/invalidate-rect-with-null-npp-argument.html:
17+
* platform/gtk/scrollbars/overflow-scrollbar-horizontal-wheel-scroll.html:
18+
* platform/mac-wk2/plugins/contents-scale-factor.html:
19+
* platform/mac-wk2/plugins/mouse-events-scaled.html:
20+
* platform/mac/plugins/bindings-array-apply-crash.html:
21+
* platform/mac/plugins/bindings-objc-long-method-name.html:
22+
* platform/mac/plugins/bindings-objc-method-name-conversion.html:
23+
* platform/mac/plugins/bindings-test-objc.html:
24+
* platform/mac/plugins/call-as-function-test.html:
25+
* platform/mac/plugins/convert-point.html:
26+
* platform/mac/plugins/disable-plugins.html:
27+
* platform/mac/plugins/jsobjc-dom-wrappers.html:
28+
* platform/mac/plugins/jsobjc-simple.html:
29+
* platform/mac/plugins/pluginDocumentView-deallocated-dataSource.html-disabled:
30+
* platform/mac/plugins/root-object-premature-delete-crash.html:
31+
* platform/mac/plugins/supports-carbon-event-model.html:
32+
* platform/mac/plugins/testplugin-onnew-onpaint.html:
33+
* platform/mac/plugins/throw-on-dealloc.html:
34+
* platform/mac/plugins/undefined-property-crash.html:
35+
* platform/mac/plugins/update-widget-from-style-recalc.html:
36+
* platform/mac/plugins/webScriptObject-exception-deadlock.html:
37+
* platform/mac/scrollbars/key-window-not-first-responder.html:
38+
* platform/qt/plugins/application-plugin-plugins-disabled.html:
39+
* platform/win/plugins/call-javascript-that-destroys-plugin.html:
40+
* platform/win/plugins/get-value-netscape-window.html:
41+
* platform/win/plugins/iframe-inside-overflow.html:
42+
* platform/win/plugins/npn-invalidate-rect-invalidates-window.html:
43+
* platform/win/plugins/visibility-hidden.html:
44+
* platform/win/plugins/window-geometry-initialized-before-set-window.html:
45+
* platform/win/plugins/window-region-is-set-to-clip-rect.html:
46+
* platform/win/plugins/windowless-paint-rect-coordinates.html:
47+
* plugins/:
48+
* pointer-lock/lock-fail-responses-expected.txt:
49+
* pointer-lock/lock-fail-responses.html:
50+
* pointer-lock/pointer-lock-api.html:
51+
* pointer-lock/pointerlockchange-pointerlockerror-events-expected.txt:
52+
* pointer-lock/pointerlockchange-pointerlockerror-events.html:
53+
* pointer-lock/pointerlocklost-event-expected.txt:
54+
* pointer-lock/pointerlocklost-event.html:
55+
* printing/compositing-layer-printing.html:
56+
* printing/css2.1/README.txt:
57+
* printing/css2.1/page-break-after-000.html:
58+
* printing/css2.1/page-break-after-001.html:
59+
* printing/css2.1/page-break-after-002.html:
60+
* printing/css2.1/page-break-after-003.html:
61+
* printing/css2.1/page-break-after-004.html:
62+
* printing/css2.1/page-break-before-000.html:
63+
* printing/css2.1/page-break-before-001.html:
64+
* printing/css2.1/page-break-before-002.html:
65+
* printing/css2.1/page-break-inside-000.html:
66+
* printing/iframe-print.html:
67+
* printing/media-queries-print.html:
68+
* printing/numberOfPages-expected.txt:
69+
* printing/page-count-layout-overflow.html:
70+
* printing/page-count-relayout-shrink.html:
71+
* printing/page-count-with-one-word.html:
72+
* printing/page-format-data-display-none.html:
73+
* printing/page-format-data-expected.txt:
74+
* printing/page-format-data.html:
75+
* printing/page-rule-css-text.html:
76+
* printing/page-rule-in-media-query.html:
77+
* printing/page-rule-selection-expected.txt:
78+
* printing/page-rule-selection.html:
79+
* printing/pageNumerForElementById-expected.txt:
80+
* printing/print-close-crash.html:
81+
* printing/pseudo-class-outside-page.html:
82+
* printing/resources/paged-media-test-utils.js:
83+
(pageNumberForElementShouldBe):
84+
(numberOfPagesShouldBe):
85+
(runPrintingTest):
86+
* printing/return-from-printing-mode.html:
87+
* printing/script-tests/numberOfPages.js:
88+
* printing/script-tests/pageNumerForElementById.js:
89+
* printing/setPrinting.html:
90+
* printing/simultaneous-position-float-change.html:
91+
* printing/single-line-must-not-be-split-into-two-pages.html:
92+
* printing/width-overflow.html:
93+
* printing/zoomed-document.html:
94+
* scrollbars/hidden-iframe-scrollbar-crash.html:
95+
* scrollbars/hidden-iframe-scrollbar-crash2.html:
96+
* scrollbars/hidden-scrollbar-prevents-layout.html:
97+
* scrollbars/overflow-custom-scrollbar-crash.html:
98+
* scrollbars/resources/hidden-iframe-scrollbar-crash2.html:
99+
* scrollbars/scroll-rtl-or-bt-layer.html:
100+
* scrollbars/scrollable-iframe-remove-crash.html:
101+
* scrollbars/scrollbar-click-does-not-blur-content.html:
102+
* scrollbars/scrollbar-crash-on-refresh.html:
103+
* scrollbars/scrollbar-drag-thumb-with-large-content.html:
104+
* scrollbars/scrollbar-gradient-crash.html:
105+
* scrollbars/scrollbar-iframe-click-does-not-blur-content.html:
106+
* scrollbars/scrollbar-initial-position.html:
107+
* scrollbars/scrollbar-middleclick-nopaste.html:
108+
* scrollbars/scrollbar-miss-mousemove-disabled.html:
109+
* scrollbars/scrollbar-miss-mousemove.html:
110+
* scrollbars/scrollbar-owning-renderer-crash.html:
111+
* scrollbars/scrollbar-part-created-with-no-parent-crash.html:
112+
* scrollbars/scrollbar-percent-padding-crash.html:
113+
* scrollbars/scrollbar-scrollbarparts-repaint-crash.html:
114+
* scrollbars/scrollevent-iframe-no-scrolling-wheel.html:
115+
* scrollbars/scrollevent-iframe-no-scrolling.html:
116+
* security/autocomplete-cleared-on-back.html:
117+
* security/block-test-no-port.html:
118+
* security/block-test.html:
119+
* security/set-form-autocomplete-attribute.html:
120+
1121
2012-06-15 Ryosuke Niwa <rniwa@webkit.org>
2122

3123
Use testRunner instead of layoutTestController in ietestcenter, inspector, java, jquery, loader, mathml, media, and mhtml tests

‎LayoutTests/perf/clone-with-focus.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<div id="console"></div>
77

88
<script>
9-
if (window.layoutTestController)
10-
layoutTestController.dumpAsText();
9+
if (window.testRunner)
10+
testRunner.dumpAsText();
1111

1212
var listElement = document.getElementById('list');
1313
var templateElement = list.firstChild;

‎LayoutTests/perf/nested-combined-selectors.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<script src="../resources/magnitude-perf.js"></script>
77
<script>
88

9-
if (window.layoutTestController)
10-
layoutTestController.dumpAsText();
9+
if (window.testRunner)
10+
testRunner.dumpAsText();
1111

1212
var list;
1313
var stack;

‎LayoutTests/perf/table-rows-length-caching.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<script src="../resources/magnitude-perf.js"></script>
77
<script>
88

9-
if (window.layoutTestController)
10-
layoutTestController.dumpAsText();
9+
if (window.testRunner)
10+
testRunner.dumpAsText();
1111

1212
var table;
1313
var sandbox = document.getElementById('sandbox');

‎LayoutTests/platform/chromium/plugins/call-as-function.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<html>
22
<script>
3-
if (window.layoutTestController)
4-
layoutTestController.dumpAsText();
3+
if (window.testRunner)
4+
testRunner.dumpAsText();
55

66
function runTest() {
77
var c = document.getElementById('console');

‎LayoutTests/platform/chromium/plugins/get-url-with-blank-target2.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
else
1212
d.innerHTML = "FAILED - got error code " + result
1313

14-
layoutTestController.notifyDone();
14+
testRunner.notifyDone();
1515
}
1616

1717
function runtest() {
18-
if (window.layoutTestController) {
19-
layoutTestController.dumpAsText();
20-
layoutTestController.waitUntilDone();
21-
layoutTestController.setCanOpenWindows();
18+
if (window.testRunner) {
19+
testRunner.dumpAsText();
20+
testRunner.waitUntilDone();
21+
testRunner.setCanOpenWindows();
2222
// The new window should close immediately after it opens and finishes
2323
// loading. The setTimeout allows NPP_URLNotify to run before the
2424
// window is closed.

‎LayoutTests/platform/chromium/plugins/get-url-with-iframe-target-no-crash.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<html>
22
<script>
33
function runtest() {
4-
if (window.layoutTestController) {
5-
layoutTestController.dumpAsText();
6-
layoutTestController.waitUntilDone();
7-
plg.getURLNotify("data:text/html,<body onload='layoutTestController.notifyDone()'></body>", "frame", "callback");
4+
if (window.testRunner) {
5+
testRunner.dumpAsText();
6+
testRunner.waitUntilDone();
7+
plg.getURLNotify("data:text/html,<body onload='testRunner.notifyDone()'></body>", "frame", "callback");
88
plg.parentNode.removeChild(plg)
99
} else {
1010
document.write("Cannot run interactively");

‎LayoutTests/platform/chromium/printing/custom-page-size-style-expected.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
44

55

66
Test page size: 10in 10in. Page has custom page size style
7-
PASS layoutTestController.hasCustomPageSizeStyle(0) is true
7+
PASS testRunner.hasCustomPageSizeStyle(0) is true
88
Test page size: auto. Page does not have any custom page size style
9-
PASS layoutTestController.hasCustomPageSizeStyle(0) is false
9+
PASS testRunner.hasCustomPageSizeStyle(0) is false
1010

1111
PASS successfullyParsed is true
1212

‎LayoutTests/platform/chromium/printing/custom-page-size-style.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@
1515
document.getElementById("head_element").appendChild(styleElement);
1616
}
1717

18-
if (window.layoutTestController) {
19-
layoutTestController.dumpAsText();
18+
if (window.testRunner) {
19+
testRunner.dumpAsText();
2020

2121
// Page size style tests.
2222
debug("Test page size: 10in 10in. Page has custom page size style");
2323
appendStyle("@page {size:10in 10in;}");
24-
shouldBe("layoutTestController.hasCustomPageSizeStyle(0)", "true");
24+
shouldBe("testRunner.hasCustomPageSizeStyle(0)", "true");
2525

2626
debug("Test page size: auto. Page does not have any custom page size style");
2727
appendStyle("@page {size:auto;}");
28-
shouldBe("layoutTestController.hasCustomPageSizeStyle(0)", "false");
28+
shouldBe("testRunner.hasCustomPageSizeStyle(0)", "false");
2929

3030
debug("");
3131
} else {
32-
testFailed("This test can be run only with window.layoutTestController");
32+
testFailed("This test can be run only with window.testRunner");
3333
}
3434
</script>
3535
<script src="../../../fast/js/resources/js-test-post.js"></script>

‎LayoutTests/platform/gtk/plugins/invalidate-rect-with-null-npp-argument.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<html>
33
<head>
44
<script>
5-
if (window.layoutTestController)
6-
layoutTestController.dumpAsText();
5+
if (window.testRunner)
6+
testRunner.dumpAsText();
77
</script>
88
</head>
99
<body>

0 commit comments

Comments
 (0)