Skip to content

Commit 5d1667d

Browse files
rniwarniwa
committed
Use testRunner instead of layoutTestController in ietestcenter, inspector, java, jquery, loader, mathml, media, and mhtml tests
https://bugs.webkit.org/show_bug.cgi?id=89176 Reviewed by Kent Tamura. * ietestcenter/css3/bordersbackgrounds/background-attachment-local-scrolling.htm: * inspector/audits/resources/audits-style1.css: * inspector/console/console-long-eval-crash.html: * inspector/extensions/extensions-audits-content-script.html: * inspector/extensions/extensions-eval-content-script.html: * inspector/profiler/cpu-profiler-profiling-without-inspector.html: * inspector/timeline/timeline-animation-frame.html: * inspector/timeline/timeline-paint.html: * inspector/timeline/timeline-receive-response-event.html: * inspector/timeline/timeline-timer.html: * java/argument-to-object-type.html: * java/array-return.html: * java/array-sort.html: * java/embedding-java-with-object.html: * java/inaccessible-class.html: * java/inline-applet-crash.html: * java/java-and-plugins.html: * java/lc3/: * jquery/resources/helper.js: * loader/go-back-to-different-window-size.html: * loader/load-defer-resume-crash.html: * loader/navigation-while-deferring-loads.html: * loader/reload-subresource-when-type-changes.html: * mathml/EmptyMFracCrash.xhtml: * mathml/EmptyMunderOverCrash.xhtml: * mathml/empty-mroot-crash.xhtml: * mathml/empty-msubsup-crash.html: * mathml/fenced-whitespace-separators-crash.html: * mathml/msub-anonymous-child-render-crash.html: * mathml/msubsup-no-grandchild.xhtml: * mathml/msubsup-remove-children.xhtml: * mathml/munderover-remove-children.html: * mathml/operator-hijacks-fenced-node.xhtml: * mathml/wbr-in-mroot-crash.html: * media/W3C/w3cwrapper.js: (test): (async_test.t.done): (async_test): * media/adopt-node-crash.html: * media/audio-controls-do-not-fade-out.html: * media/audio-controls-rendering.html: * media/audio-delete-while-slider-thumb-clicked.html: * media/audio-delete-while-step-button-clicked.html: * media/audio-garbage-collect.html: * media/audio-no-installed-engines.html: * media/audio-only-video-intrinsic-size.html: * media/audio-repaint.html: * media/context-menu-actions.html: * media/controls-after-reload.html: * media/controls-drag-timebar.html: * media/controls-layout-direction.html: * media/controls-right-click-on-timebar.html: * media/controls-without-preload.html: * media/crash-closing-page-with-media-as-plugin-fallback.html: * media/fallback.html: * media/media-blocked-by-beforeload.html: * media/media-blocked-by-willsendrequest.html: * media/media-controls-clone-crash.html: * media/media-controls-invalid-url.html: * media/media-document-audio-repaint.html: * media/media-document-audio-size.html: * media/media-fullscreen.js: (canplaythrough): * media/media-volume-slider-rendered-normal.html: * media/no-auto-play-in-sandbox.html: * media/remove-from-document-before-load.html: * media/resources/foreignobject-media.svg: * media/restore-from-page-cache.html: * media/svg-as-image-with-media-blocked.html: * media/video-beforeload-remove-source.html: * media/video-canvas-alpha.html: * media/video-canvas.html-disabled: * media/video-click-dblckick-standalone.html: * media/video-controls-in-media-document.html: * media/video-controls-no-scripting.html: * media/video-controls-toggling.html: * media/video-controls-visible-audio-only.html: * media/video-controls-with-mutation-event-handler.html: * media/video-delay-load-event.html: * media/video-display-toggle.html: * media/video-document-types.html: * media/video-element-other-namespace-crash.html: * media/video-empty-source.html: * media/video-no-audio.html: * media/video-paint-test.js: (init.waitForMultipleEvents): (initAndPause.waitForMultipleEvents): (initAndPause): * media/video-plays-past-end-of-test.html: * media/video-poster-blocked-by-willsendrequest.html: * media/video-replaces-poster.html: * media/video-source-inserted.html: * media/video-test.js: (endTest): * media/video-volume-slider.html: * media/video-zoom.html: * mhtml/check_domain.mht: * mhtml/multi_frames.html_original: * mhtml/multi_frames_binary.mht: * mhtml/multi_frames_ie.mht: * mhtml/multi_frames_unmht.mht: * mhtml/page_with_css_and_js_ie.mht: * mhtml/page_with_css_and_js_unmht.mht: * mhtml/page_with_image.html_original: * mhtml/page_with_image_ie.mht: * mhtml/page_with_image_unmht.mht: * mhtml/simple_page.html_original: * mhtml/simple_page_ie.mht: * mhtml/simple_page_unmht.mht: * networkinformation/resources/event-after-navigation-new.html: * networkinformation/script-tests/event-after-navigation.js: * platform/chromium/media/video-frame-size-change.html: Canonical link: https://commits.webkit.org/107030@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@120416 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 3277e2c commit 5d1667d

288 files changed

Lines changed: 1208 additions & 1088 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 ietestcenter, inspector, java, jquery, loader, mathml, media, and mhtml tests
4+
https://bugs.webkit.org/show_bug.cgi?id=89176
5+
6+
Reviewed by Kent Tamura.
7+
8+
* ietestcenter/css3/bordersbackgrounds/background-attachment-local-scrolling.htm:
9+
* inspector/audits/resources/audits-style1.css:
10+
* inspector/console/console-long-eval-crash.html:
11+
* inspector/extensions/extensions-audits-content-script.html:
12+
* inspector/extensions/extensions-eval-content-script.html:
13+
* inspector/profiler/cpu-profiler-profiling-without-inspector.html:
14+
* inspector/timeline/timeline-animation-frame.html:
15+
* inspector/timeline/timeline-paint.html:
16+
* inspector/timeline/timeline-receive-response-event.html:
17+
* inspector/timeline/timeline-timer.html:
18+
* java/argument-to-object-type.html:
19+
* java/array-return.html:
20+
* java/array-sort.html:
21+
* java/embedding-java-with-object.html:
22+
* java/inaccessible-class.html:
23+
* java/inline-applet-crash.html:
24+
* java/java-and-plugins.html:
25+
* java/lc3/:
26+
* jquery/resources/helper.js:
27+
* loader/go-back-to-different-window-size.html:
28+
* loader/load-defer-resume-crash.html:
29+
* loader/navigation-while-deferring-loads.html:
30+
* loader/reload-subresource-when-type-changes.html:
31+
* mathml/EmptyMFracCrash.xhtml:
32+
* mathml/EmptyMunderOverCrash.xhtml:
33+
* mathml/empty-mroot-crash.xhtml:
34+
* mathml/empty-msubsup-crash.html:
35+
* mathml/fenced-whitespace-separators-crash.html:
36+
* mathml/msub-anonymous-child-render-crash.html:
37+
* mathml/msubsup-no-grandchild.xhtml:
38+
* mathml/msubsup-remove-children.xhtml:
39+
* mathml/munderover-remove-children.html:
40+
* mathml/operator-hijacks-fenced-node.xhtml:
41+
* mathml/wbr-in-mroot-crash.html:
42+
* media/W3C/w3cwrapper.js:
43+
(test):
44+
(async_test.t.done):
45+
(async_test):
46+
* media/adopt-node-crash.html:
47+
* media/audio-controls-do-not-fade-out.html:
48+
* media/audio-controls-rendering.html:
49+
* media/audio-delete-while-slider-thumb-clicked.html:
50+
* media/audio-delete-while-step-button-clicked.html:
51+
* media/audio-garbage-collect.html:
52+
* media/audio-no-installed-engines.html:
53+
* media/audio-only-video-intrinsic-size.html:
54+
* media/audio-repaint.html:
55+
* media/context-menu-actions.html:
56+
* media/controls-after-reload.html:
57+
* media/controls-drag-timebar.html:
58+
* media/controls-layout-direction.html:
59+
* media/controls-right-click-on-timebar.html:
60+
* media/controls-without-preload.html:
61+
* media/crash-closing-page-with-media-as-plugin-fallback.html:
62+
* media/fallback.html:
63+
* media/media-blocked-by-beforeload.html:
64+
* media/media-blocked-by-willsendrequest.html:
65+
* media/media-controls-clone-crash.html:
66+
* media/media-controls-invalid-url.html:
67+
* media/media-document-audio-repaint.html:
68+
* media/media-document-audio-size.html:
69+
* media/media-fullscreen.js:
70+
(canplaythrough):
71+
* media/media-volume-slider-rendered-normal.html:
72+
* media/no-auto-play-in-sandbox.html:
73+
* media/remove-from-document-before-load.html:
74+
* media/resources/foreignobject-media.svg:
75+
* media/restore-from-page-cache.html:
76+
* media/svg-as-image-with-media-blocked.html:
77+
* media/video-beforeload-remove-source.html:
78+
* media/video-canvas-alpha.html:
79+
* media/video-canvas.html-disabled:
80+
* media/video-click-dblckick-standalone.html:
81+
* media/video-controls-in-media-document.html:
82+
* media/video-controls-no-scripting.html:
83+
* media/video-controls-toggling.html:
84+
* media/video-controls-visible-audio-only.html:
85+
* media/video-controls-with-mutation-event-handler.html:
86+
* media/video-delay-load-event.html:
87+
* media/video-display-toggle.html:
88+
* media/video-document-types.html:
89+
* media/video-element-other-namespace-crash.html:
90+
* media/video-empty-source.html:
91+
* media/video-no-audio.html:
92+
* media/video-paint-test.js:
93+
(init.waitForMultipleEvents):
94+
(initAndPause.waitForMultipleEvents):
95+
(initAndPause):
96+
* media/video-plays-past-end-of-test.html:
97+
* media/video-poster-blocked-by-willsendrequest.html:
98+
* media/video-replaces-poster.html:
99+
* media/video-source-inserted.html:
100+
* media/video-test.js:
101+
(endTest):
102+
* media/video-volume-slider.html:
103+
* media/video-zoom.html:
104+
* mhtml/check_domain.mht:
105+
* mhtml/multi_frames.html_original:
106+
* mhtml/multi_frames_binary.mht:
107+
* mhtml/multi_frames_ie.mht:
108+
* mhtml/multi_frames_unmht.mht:
109+
* mhtml/page_with_css_and_js_ie.mht:
110+
* mhtml/page_with_css_and_js_unmht.mht:
111+
* mhtml/page_with_image.html_original:
112+
* mhtml/page_with_image_ie.mht:
113+
* mhtml/page_with_image_unmht.mht:
114+
* mhtml/simple_page.html_original:
115+
* mhtml/simple_page_ie.mht:
116+
* mhtml/simple_page_unmht.mht:
117+
* networkinformation/resources/event-after-navigation-new.html:
118+
* networkinformation/script-tests/event-after-navigation.js:
119+
* platform/chromium/media/video-frame-size-change.html:
120+
1121
2012-06-15 Emil A Eklund <eae@chromium.org>
2122

3123
Unreviewed chromium win and mac rebaseline for r120403.

‎LayoutTests/ietestcenter/css3/bordersbackgrounds/background-attachment-local-scrolling.htm‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@
4747
</head>
4848
<body>
4949
<script>
50-
if (window.layoutTestController) {
50+
if (window.testRunner) {
5151
// Unfortunately, this needs to be a pixel test
52-
window.layoutTestController.waitUntilDone();
52+
window.testRunner.waitUntilDone();
5353
}
5454
</script>
5555

@@ -83,7 +83,7 @@
8383

8484
function finished()
8585
{
86-
window.layoutTestController.notifyDone();
86+
window.testRunner.notifyDone();
8787
}
8888

8989
</script>

‎LayoutTests/inspector/console/console-long-eval-crash.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
<script src="../../http/tests/inspector/console-test.js"></script>
55
<script>
66

7-
layoutTestController.setCanOpenWindows();
7+
testRunner.setCanOpenWindows();
88

99
function doDialog()
1010
{
11-
layoutTestController.closeWebInspector();
11+
testRunner.closeWebInspector();
1212
showModalDialog('data:text/html,<script>setTimeout(close, 0);%3c/script>');
13-
setTimeout(function(){layoutTestController.notifyDone();}, 0);
13+
setTimeout(function(){testRunner.notifyDone();}, 0);
1414
}
1515

1616
function test()

‎LayoutTests/inspector/extensions/extensions-audits-content-script.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
window.whereAmI = "main world";
1111

12-
layoutTestController.setIsolatedWorldSecurityOrigin(632, "file:///");
13-
layoutTestController.evaluateScriptInIsolatedWorld(632, "window.whereAmI = 'brave new world'");
12+
testRunner.setIsolatedWorldSecurityOrigin(632, "file:///");
13+
testRunner.evaluateScriptInIsolatedWorld(632, "window.whereAmI = 'brave new world'");
1414

1515
function extension_testAudits(nextTest)
1616
{

‎LayoutTests/inspector/extensions/extensions-eval-content-script.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
window.whereAmI = "main world";
88

9-
layoutTestController.setIsolatedWorldSecurityOrigin(632, "file:///");
10-
layoutTestController.evaluateScriptInIsolatedWorld(632, "window.whereAmI = 'brave new world'");
9+
testRunner.setIsolatedWorldSecurityOrigin(632, "file:///");
10+
testRunner.evaluateScriptInIsolatedWorld(632, "window.whereAmI = 'brave new world'");
1111

1212
function extension_testEvalInMainWorldImplicit(nextTest)
1313
{

‎LayoutTests/inspector/profiler/cpu-profiler-profiling-without-inspector.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<head>
33
<script>
44

5-
if (window.layoutTestController)
6-
layoutTestController.dumpAsText();
5+
if (window.testRunner)
6+
testRunner.dumpAsText();
77
if (window.internals)
88
internals.settings.setJavaScriptProfilingEnabled(true);
99

@@ -19,8 +19,8 @@
1919
{
2020
pageFunction();
2121
printResult();
22-
if (window.layoutTestController)
23-
layoutTestController.notifyDone();
22+
if (window.testRunner)
23+
testRunner.notifyDone();
2424
}
2525

2626
function printResult()

‎LayoutTests/inspector/timeline/timeline-animation-frame.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
window.webkitCancelRequestAnimationFrame(requestId);
1414
}
1515

16-
if (window.layoutTestController)
17-
layoutTestController.display();
16+
if (window.testRunner)
17+
testRunner.display();
1818
}
1919

2020
function test()
@@ -34,7 +34,7 @@
3434
}
3535
}
3636

37-
if (!window.layoutTestController)
37+
if (!window.testRunner)
3838
setTimeout(performActions, 2000);
3939

4040
</script>

‎LayoutTests/inspector/timeline/timeline-paint.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
function performActions()
88
{
9-
if (window.layoutTestController)
10-
layoutTestController.display();
9+
if (window.testRunner)
10+
testRunner.display();
1111
}
1212

1313
function test()

‎LayoutTests/inspector/timeline/timeline-receive-response-event.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
function bar() {
1414
var image = new Image();
15-
image.onload = function() { layoutTestController.evaluateInWebInspector(0, "window.step2()"); }
15+
image.onload = function() { testRunner.evaluateInWebInspector(0, "window.step2()"); }
1616
image.src = "resources/anotherImage.png";
1717
}
1818
}
@@ -55,7 +55,7 @@
5555
}
5656
}
5757

58-
if (!window.layoutTestController)
58+
if (!window.testRunner)
5959
setTimeout(performActions, 3000);
6060

6161
</script>

‎LayoutTests/inspector/timeline/timeline-timer.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
}
3838
}
3939

40-
if (!window.layoutTestController)
40+
if (!window.testRunner)
4141
setTimeout(performActions, 2000);
4242

4343
</script>

0 commit comments

Comments
 (0)