Commit 08372332 authored by rniwa@webkit.org's avatar rniwa@webkit.org

Use testRunner instead of layoutTestController in ietestcenter, inspector,...

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:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@120416 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 55b0e113
2012-06-15 Ryosuke Niwa <rniwa@webkit.org>
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:
2012-06-15 Emil A Eklund <eae@chromium.org>
Unreviewed chromium win and mac rebaseline for r120403.
......
......@@ -47,9 +47,9 @@
</head>
<body>
<script>
if (window.layoutTestController) {
if (window.testRunner) {
// Unfortunately, this needs to be a pixel test
window.layoutTestController.waitUntilDone();
window.testRunner.waitUntilDone();
}
</script>
......@@ -83,7 +83,7 @@
function finished()
{
window.layoutTestController.notifyDone();
window.testRunner.notifyDone();
}
</script>
......
......@@ -4,13 +4,13 @@
<script src="../../http/tests/inspector/console-test.js"></script>
<script>
layoutTestController.setCanOpenWindows();
testRunner.setCanOpenWindows();
function doDialog()
{
layoutTestController.closeWebInspector();
testRunner.closeWebInspector();
showModalDialog('data:text/html,<script>setTimeout(close, 0);%3c/script>');
setTimeout(function(){layoutTestController.notifyDone();}, 0);
setTimeout(function(){testRunner.notifyDone();}, 0);
}
function test()
......
......@@ -9,8 +9,8 @@
window.whereAmI = "main world";
layoutTestController.setIsolatedWorldSecurityOrigin(632, "file:///");
layoutTestController.evaluateScriptInIsolatedWorld(632, "window.whereAmI = 'brave new world'");
testRunner.setIsolatedWorldSecurityOrigin(632, "file:///");
testRunner.evaluateScriptInIsolatedWorld(632, "window.whereAmI = 'brave new world'");
function extension_testAudits(nextTest)
{
......
......@@ -6,8 +6,8 @@
window.whereAmI = "main world";
layoutTestController.setIsolatedWorldSecurityOrigin(632, "file:///");
layoutTestController.evaluateScriptInIsolatedWorld(632, "window.whereAmI = 'brave new world'");
testRunner.setIsolatedWorldSecurityOrigin(632, "file:///");
testRunner.evaluateScriptInIsolatedWorld(632, "window.whereAmI = 'brave new world'");
function extension_testEvalInMainWorldImplicit(nextTest)
{
......
......@@ -2,8 +2,8 @@
<head>
<script>
if (window.layoutTestController)
layoutTestController.dumpAsText();
if (window.testRunner)
testRunner.dumpAsText();
if (window.internals)
internals.settings.setJavaScriptProfilingEnabled(true);
......@@ -19,8 +19,8 @@ function startTest()
{
pageFunction();
printResult();
if (window.layoutTestController)
layoutTestController.notifyDone();
if (window.testRunner)
testRunner.notifyDone();
}
function printResult()
......
......@@ -13,8 +13,8 @@ function performActions()
window.webkitCancelRequestAnimationFrame(requestId);
}
if (window.layoutTestController)
layoutTestController.display();
if (window.testRunner)
testRunner.display();
}
function test()
......@@ -34,7 +34,7 @@ function test()
}
}
if (!window.layoutTestController)
if (!window.testRunner)
setTimeout(performActions, 2000);
</script>
......
......@@ -6,8 +6,8 @@
function performActions()
{
if (window.layoutTestController)
layoutTestController.display();
if (window.testRunner)
testRunner.display();
}
function test()
......
......@@ -12,7 +12,7 @@ function performActions()
function bar() {
var image = new Image();
image.onload = function() { layoutTestController.evaluateInWebInspector(0, "window.step2()"); }
image.onload = function() { testRunner.evaluateInWebInspector(0, "window.step2()"); }
image.src = "resources/anotherImage.png";
}
}
......@@ -55,7 +55,7 @@ function test()
}
}
if (!window.layoutTestController)
if (!window.testRunner)
setTimeout(performActions, 3000);
</script>
......
......@@ -37,7 +37,7 @@ function test()
}
}
if (!window.layoutTestController)
if (!window.testRunner)
setTimeout(performActions, 2000);
</script>
......
......@@ -3,8 +3,8 @@
<meta charset="utf-8">
<script src="../fast/js/resources/js-test-pre.js"></script>
<script>
if (window.layoutTestController)
layoutTestController.overridePreference("WebKitJavaEnabled", "1");
if (window.testRunner)
testRunner.overridePreference("WebKitJavaEnabled", "1");
</script>
</head>
<body>
......
......@@ -3,8 +3,8 @@
<meta charset="utf-8">
<script src="../fast/js/resources/js-test-pre.js"></script>
<script>
if (window.layoutTestController)
layoutTestController.overridePreference("WebKitJavaEnabled", "1");
if (window.testRunner)
testRunner.overridePreference("WebKitJavaEnabled", "1");
</script>
</head>
<body>
......
......@@ -3,8 +3,8 @@
<meta charset="utf-8">
<script src="../fast/js/resources/js-test-pre.js"></script>
<script>
if (window.layoutTestController)
layoutTestController.overridePreference("WebKitJavaEnabled", "1");
if (window.testRunner)
testRunner.overridePreference("WebKitJavaEnabled", "1");
</script>
</head>
<body>
......
......@@ -3,8 +3,8 @@
<meta charset="utf-8">
<script src="../fast/js/resources/js-test-pre.js"></script>
<script>
if (window.layoutTestController)
layoutTestController.overridePreference("WebKitJavaEnabled", "1");
if (window.testRunner)
testRunner.overridePreference("WebKitJavaEnabled", "1");
</script>
</head>
<body>
......
<html>
<head>
<script>
if (window.layoutTestController) {
layoutTestController.dumpAsText();
layoutTestController.overridePreference("WebKitJavaEnabled", "1");
if (window.testRunner) {
testRunner.dumpAsText();
testRunner.overridePreference("WebKitJavaEnabled", "1");
}
</script>
</head>
......@@ -27,7 +27,7 @@ try {
else
log("FAIL: result is " + result);
} catch (ex) {
if (window.layoutTestController)
if (window.testRunner)
log("FAIL: Exception raised");
else
log(ex);
......
......@@ -3,10 +3,10 @@
Test passes if it does not crash.
<applet code=doesnotexist.class></applet>
<script>
if (window.layoutTestController) {
layoutTestController.overridePreference("WebKitJavaEnabled", "1");
layoutTestController.dumpAsText();
layoutTestController.waitUntilDone();
if (window.testRunner) {
testRunner.overridePreference("WebKitJavaEnabled", "1");
testRunner.dumpAsText();
testRunner.waitUntilDone();
}
function walk(arr, currentPrefix, index, domNode) {
......@@ -21,8 +21,8 @@ function walk(arr, currentPrefix, index, domNode) {
function crash() {
var temp = new Array();
walk(temp, "", 0, document.documentElement);
if (window.layoutTestController)
layoutTestController.notifyDone();
if (window.testRunner)
testRunner.notifyDone();
}
setTimeout("crash();", 0);
......
......@@ -3,8 +3,8 @@
<meta charset="utf-8">
<script src="../fast/js/resources/js-test-pre.js"></script>
<script>
if (window.layoutTestController)
layoutTestController.overridePreference("WebKitJavaEnabled", "1");
if (window.testRunner)
testRunner.overridePreference("WebKitJavaEnabled", "1");
</script>
</head>
<body>
......
......@@ -4,9 +4,9 @@
<meta charset="utf-8">
<script src="../../../fast/js/resources/js-test-pre.js"></script>
<script>
if (window.layoutTestController) {
layoutTestController.overridePreference("WebKitJavaEnabled", "1");
layoutTestController.waitUntilDone();
if (window.testRunner) {
testRunner.overridePreference("WebKitJavaEnabled", "1");
testRunner.waitUntilDone();
}
</script>
</head>
......@@ -49,7 +49,7 @@ function startTest()
function shouldBeWithErrorCheck(_a, _b)
{
// Don't want full stack traces from Java exceptions.
if (window.layoutTestController) {
if (window.testRunner) {
try {
eval(_a);
} catch (ex) {
......
......@@ -4,9 +4,9 @@
<meta charset="utf-8">
<script src="../../../fast/js/resources/js-test-pre.js"></script>
<script>
if (window.layoutTestController) {
layoutTestController.overridePreference("WebKitJavaEnabled", "1");
layoutTestController.waitUntilDone();
if (window.testRunner) {
testRunner.overridePreference("WebKitJavaEnabled", "1");
testRunner.waitUntilDone();
}
</script>
</head>
......@@ -49,7 +49,7 @@ function startTest()
function shouldBeWithErrorCheck(_a, _b)
{
// Don't want full stack traces from Java exceptions.
if (window.layoutTestController) {
if (window.testRunner) {
try {
eval(_a);
} catch (ex) {
......
......@@ -4,9 +4,9 @@
<meta charset="utf-8">
<script src="../../../fast/js/resources/js-test-pre.js"></script>
<script>
if (window.layoutTestController) {
layoutTestController.overridePreference("WebKitJavaEnabled", "1");
layoutTestController.waitUntilDone();
if (window.testRunner) {
testRunner.overridePreference("WebKitJavaEnabled", "1");
testRunner.waitUntilDone();
}
</script>
</head>
......@@ -49,7 +49,7 @@ function startTest()
function shouldBeWithErrorCheck(_a, _b)
{
// Don't want full stack traces from Java exceptions.
if (window.layoutTestController) {
if (window.testRunner) {
try {
eval(_a);
} catch (ex) {
......
......@@ -4,9 +4,9 @@
<meta charset="utf-8">
<script src="../../../fast/js/resources/js-test-pre.js"></script>
<script>
if (window.layoutTestController) {
layoutTestController.overridePreference("WebKitJavaEnabled", "1");
layoutTestController.waitUntilDone();
if (window.testRunner) {
testRunner.overridePreference("WebKitJavaEnabled", "1");
testRunner.waitUntilDone();
}
</script>
</head>
......@@ -49,7 +49,7 @@ function startTest()
function shouldBeWithErrorCheck(_a, _b)
{
// Don't want full stack traces from Java exceptions.
if (window.layoutTestController) {
if (window.testRunner) {
try {
eval(_a);
} catch (ex) {
......
......@@ -4,9 +4,9 @@
<meta charset="utf-8">
<script src="../../../fast/js/resources/js-test-pre.js"></script>
<script>
if (window.layoutTestController) {
layoutTestController.overridePreference("WebKitJavaEnabled", "1");
layoutTestController.waitUntilDone();
if (window.testRunner) {
testRunner.overridePreference("WebKitJavaEnabled", "1");
testRunner.waitUntilDone();
}
</script>
</head>
......@@ -49,7 +49,7 @@ function startTest()
function shouldBeWithErrorCheck(_a, _b)
{
// Don't want full stack traces from Java exceptions.
if (window.layoutTestController) {
if (window.testRunner) {
try {
eval(_a);
} catch (ex) {
......
......@@ -4,9 +4,9 @@
<meta charset="utf-8">
<script src="../../../fast/js/resources/js-test-pre.js"></script>
<script>
if (window.layoutTestController) {
layoutTestController.overridePreference("WebKitJavaEnabled", "1");
layoutTestController.waitUntilDone();
if (window.testRunner) {
testRunner.overridePreference("WebKitJavaEnabled", "1");
testRunner.waitUntilDone();
}
</script>
</head>
......@@ -49,7 +49,7 @@ function startTest()
function shouldBeWithErrorCheck(_a, _b)
{
// Don't want full stack traces from Java exceptions.
if (window.layoutTestController) {
if (window.testRunner) {
try {
eval(_a);
} catch (ex) {
......
......@@ -4,9 +4,9 @@
<meta charset="utf-8">
<script src="../../../fast/js/resources/js-test-pre.js"></script>
<script>
if (window.layoutTestController) {
layoutTestController.overridePreference("WebKitJavaEnabled", "1");
layoutTestController.waitUntilDone();
if (window.testRunner) {
testRunner.overridePreference("WebKitJavaEnabled", "1");
testRunner.waitUntilDone();
}
</script>
</head>
......@@ -49,7 +49,7 @@ function startTest()
function shouldBeWithErrorCheck(_a, _b)
{
// Don't want full stack traces from Java exceptions.
if (window.layoutTestController) {
if (window.testRunner) {
try {
eval(_a);
} catch (ex) {
......
......@@ -4,9 +4,9 @@
<meta charset="utf-8">
<script src="../../../fast/js/resources/js-test-pre.js"></script>
<script>
if (window.layoutTestController) {
layoutTestController.overridePreference("WebKitJavaEnabled", "1");
layoutTestController.waitUntilDone();
if (window.testRunner) {
testRunner.overridePreference("WebKitJavaEnabled", "1");
testRunner.waitUntilDone();
}
</script>
</head>
......@@ -49,7 +49,7 @@ function startTest()
function shouldBeWithErrorCheck(_a, _b)
{
// Don't want full stack traces from Java exceptions.
if (window.layoutTestController) {
if (window.testRunner) {
try {
eval(_a);
} catch (ex) {
......
......@@ -4,9 +4,9 @@
<meta charset="utf-8">
<script src="../../../fast/js/resources/js-test-pre.js"></script>
<script>
if (window.layoutTestController) {
layoutTestController.overridePreference("WebKitJavaEnabled", "1");
layoutTestController.waitUntilDone();
if (window.testRunner) {
testRunner.overridePreference("WebKitJavaEnabled", "1");
testRunner.waitUntilDone();
}
</script>
</head>
......@@ -49,7 +49,7 @@ function startTest()
function shouldBeWithErrorCheck(_a, _b)
{
// Don't want full stack traces from Java exceptions.
if (window.layoutTestController) {
if (window.testRunner) {
try {
eval(_a);
} catch (ex) {
......