Skip to content

Commit 1f5c1da

Browse files
rniwarniwa
committed
Use testRunner instead of layoutTestController in transforms, transitions, traversal, userscripts, webarchive, webaudio, and webintents tests
https://bugs.webkit.org/show_bug.cgi?id=89269 Reviewed by Adam Barth. * transitions/: * traversal/: * userscripts/: * webarchive/: * webaudio/: * webintents/web-intents-delivery.html: * webintents/web-intents-failure.html: * webintents/web-intents-reload.html: * webintents/web-intents-reply.html: Canonical link: https://commits.webkit.org/107133@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@120521 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 41eaf82 commit 1f5c1da

206 files changed

Lines changed: 667 additions & 650 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: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
2012-06-15 Ryosuke Niwa <rniwa@webkit.org>
2+
3+
Use testRunner instead of layoutTestController in transforms, transitions, traversal, userscripts, webarchive, webaudio, and webintents tests
4+
https://bugs.webkit.org/show_bug.cgi?id=89269
5+
6+
Reviewed by Adam Barth.
7+
8+
* transitions/:
9+
* traversal/:
10+
* userscripts/:
11+
* webarchive/:
12+
* webaudio/:
13+
* webintents/web-intents-delivery.html:
14+
* webintents/web-intents-failure.html:
15+
* webintents/web-intents-reload.html:
16+
* webintents/web-intents-reply.html:
17+
118
2012-06-15 Ryosuke Niwa <rniwa@webkit.org>
219

320
Use testRunner instead of layoutTestController in the rest of sputnik tests

‎LayoutTests/transitions/3d/interrupted-transition.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
</style>
1313
<script>
1414

15-
if (window.layoutTestController) {
16-
window.layoutTestController.dumpAsText();
17-
window.layoutTestController.waitUntilDone();
15+
if (window.testRunner) {
16+
window.testRunner.dumpAsText();
17+
window.testRunner.waitUntilDone();
1818
}
1919

2020
var NUMBER_OF_INTERRUPTIONS = 30;
@@ -34,8 +34,8 @@
3434
var results = document.getElementById("results");
3535
results.innerText = "The transition completed successfully.";
3636

37-
if (window.layoutTestController)
38-
window.layoutTestController.notifyDone();
37+
if (window.testRunner)
38+
window.testRunner.notifyDone();
3939
}
4040

4141
window.addEventListener("load", function () {

‎LayoutTests/transitions/bad-transition-shorthand-crash.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
}
1414
</style>
1515
<script>
16-
if (window.layoutTestController) {
17-
layoutTestController.dumpAsText();
18-
layoutTestController.waitUntilDone();
16+
if (window.testRunner) {
17+
testRunner.dumpAsText();
18+
testRunner.waitUntilDone();
1919
}
2020

2121
function finish()
2222
{
23-
if (window.layoutTestController)
24-
layoutTestController.notifyDone();
23+
if (window.testRunner)
24+
testRunner.notifyDone();
2525
}
2626

2727
function returnToStart()

‎LayoutTests/transitions/cancel-transition.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
}
3939
</style>
4040
<script>
41-
if (window.layoutTestController) {
42-
layoutTestController.dumpAsText();
43-
layoutTestController.waitUntilDone();
41+
if (window.testRunner) {
42+
testRunner.dumpAsText();
43+
testRunner.waitUntilDone();
4444
}
4545

4646
result = "<span style='color:red'>CHECK NOT COMPLETED</span>";
@@ -83,8 +83,8 @@
8383
result += "<span style='color:green'>PASS</span>";
8484

8585
document.getElementById('result').innerHTML = result;
86-
if (window.layoutTestController)
87-
layoutTestController.notifyDone();
86+
if (window.testRunner)
87+
testRunner.notifyDone();
8888
}
8989

9090
function start()

‎LayoutTests/transitions/change-values-during-transition.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
}
1414
</style>
1515
<script>
16-
if (window.layoutTestController) {
17-
layoutTestController.dumpAsText();
18-
layoutTestController.waitUntilDone();
16+
if (window.testRunner) {
17+
testRunner.dumpAsText();
18+
testRunner.waitUntilDone();
1919
}
2020

2121
var result = "PASS";
@@ -66,8 +66,8 @@
6666
}
6767

6868
document.getElementById('result').innerText = result;
69-
if (window.layoutTestController)
70-
layoutTestController.notifyDone();
69+
if (window.testRunner)
70+
testRunner.notifyDone();
7171
}
7272

7373
function goBack()

‎LayoutTests/transitions/equivalent-background-image-no-transition.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
}
1616
</style>
1717
<script>
18-
if (window.layoutTestController) {
19-
layoutTestController.dumpAsText();
20-
layoutTestController.waitUntilDone();
18+
if (window.testRunner) {
19+
testRunner.dumpAsText();
20+
testRunner.waitUntilDone();
2121
}
2222
</script>
2323
</head>
@@ -31,13 +31,13 @@
3131
document.getElementById('foo').addEventListener('webkitTransitionEnd', function(evt) {
3232
if(evt.propertyName == "background-image" && !finished) {
3333
document.getElementById('result').innerHTML = ("FAIL: saw a background-image transition");
34-
if (window.layoutTestController)
35-
layoutTestController.notifyDone();
34+
if (window.testRunner)
35+
testRunner.notifyDone();
3636
finished = true;
3737
} else if(evt.propertyName == "top" && !finished) {
3838
document.getElementById('result').innerHTML = ("PASS: no background-image transition");
39-
if (window.layoutTestController)
40-
layoutTestController.notifyDone();
39+
if (window.testRunner)
40+
testRunner.notifyDone();
4141
}
4242
});
4343

‎LayoutTests/transitions/extra-transition.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@
5858
}
5959
</style>
6060
<script>
61-
if (window.layoutTestController) {
62-
layoutTestController.waitUntilDone();
63-
layoutTestController.dumpAsText();
61+
if (window.testRunner) {
62+
testRunner.waitUntilDone();
63+
testRunner.dumpAsText();
6464
}
6565

6666
function init()
@@ -83,8 +83,8 @@
8383
else
8484
log('transform="'+transform+'", expected "matrix(1, 0, 0, 1, 100, 0)": FAIL');
8585

86-
if (window.layoutTestController)
87-
layoutTestController.notifyDone();
86+
if (window.testRunner)
87+
testRunner.notifyDone();
8888
}
8989
</script>
9090
</head>

‎LayoutTests/transitions/first-letter-color-transition.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121

2222
</style>
2323
<script type="text/javascript" charset="utf-8">
24-
if (window.layoutTestController) {
25-
layoutTestController.dumpAsText();
26-
layoutTestController.waitUntilDone();
24+
if (window.testRunner) {
25+
testRunner.dumpAsText();
26+
testRunner.waitUntilDone();
2727
}
2828

2929
var result = "";
@@ -35,8 +35,8 @@
3535
result += "FAIL";
3636

3737
document.getElementById('result').innerHTML = result;
38-
if (window.layoutTestController)
39-
layoutTestController.notifyDone();
38+
if (window.testRunner)
39+
testRunner.notifyDone();
4040
}
4141

4242
window.addEventListener('webkitTransitionEnd', transitionEnded, false);

‎LayoutTests/transitions/first-letter-transition.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
</style>
4141
<script src="resources/transition-test-helpers.js"></script>
4242
<script type="text/javascript" charset="utf-8">
43-
if (window.layoutTestController) {
44-
layoutTestController.dumpAsText();
45-
layoutTestController.waitUntilDone();
43+
if (window.testRunner) {
44+
testRunner.dumpAsText();
45+
testRunner.waitUntilDone();
4646
}
4747

4848
var result = "Transtions test result: <br><br>";
@@ -58,8 +58,8 @@
5858

5959
if (transitions == 5) {
6060
document.getElementById('result').innerHTML = result;
61-
if (window.layoutTestController)
62-
layoutTestController.notifyDone();
61+
if (window.testRunner)
62+
testRunner.notifyDone();
6363
}
6464
}
6565

‎LayoutTests/transitions/hang-with-bad-transition-list.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@
1111
<script>
1212
function checkRunning()
1313
{
14-
var current = layoutTestController.numberOfActiveAnimations();
14+
var current = testRunner.numberOfActiveAnimations();
1515
if (current == 0)
1616
document.getElementById('result').innerHTML = "Number of active animations before transition is (0) as expected";
1717
else
1818
document.getElementById('result').innerHTML = "Number of active transitions is (" + current + ") but was expecting (0)";
19-
layoutTestController.notifyDone();
19+
testRunner.notifyDone();
2020
}
2121

22-
if (window.layoutTestController) {
23-
layoutTestController.dumpAsText();
24-
layoutTestController.waitUntilDone();
22+
if (window.testRunner) {
23+
testRunner.dumpAsText();
24+
testRunner.waitUntilDone();
2525
window.setTimeout(checkRunning, 300);
2626
}
2727
</script>

0 commit comments

Comments
 (0)