Title: [123563] trunk/LayoutTests
- Revision
- 123563
- Author
- [email protected]
- Date
- 2012-07-24 18:45:20 -0700 (Tue, 24 Jul 2012)
Log Message
[Tests] Re-factor some tests in fast/forms/number for sharing with other input types
https://bugs.webkit.org/show_bug.cgi?id=92081
Reviewed by Kent Tamura.
This patch moves _javascript_ code from test HTML files into _javascript_
files for sharing _javascript_ code with other input types.
* fast/forms/number/number-change-type-on-focus.html: Removed _javascript_ code and changed to load _javascript_ code from fast/forms/resources/common-change-type-on-focus.js.
* fast/forms/number/number-losing-renderer-on-click.html: Removed _javascript_ code and changed to load _javascript_ code from fast/forms/resources/common-losing-renderer-on-click.js.
* fast/forms/resources/common-change-type-on-focus.js: Remove HTML markup text.
* fast/forms/resources/common-losing-renderer-on-click.js: Remove HTML markup text.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (123562 => 123563)
--- trunk/LayoutTests/ChangeLog 2012-07-25 01:23:29 UTC (rev 123562)
+++ trunk/LayoutTests/ChangeLog 2012-07-25 01:45:20 UTC (rev 123563)
@@ -1,3 +1,18 @@
+2012-07-24 Yoshifumi Inoue <[email protected]>
+
+ [Tests] Re-factor some tests in fast/forms/number for sharing with other input types
+ https://bugs.webkit.org/show_bug.cgi?id=92081
+
+ Reviewed by Kent Tamura.
+
+ This patch moves _javascript_ code from test HTML files into _javascript_
+ files for sharing _javascript_ code with other input types.
+
+ * fast/forms/number/number-change-type-on-focus.html: Removed _javascript_ code and changed to load _javascript_ code from fast/forms/resources/common-change-type-on-focus.js.
+ * fast/forms/number/number-losing-renderer-on-click.html: Removed _javascript_ code and changed to load _javascript_ code from fast/forms/resources/common-losing-renderer-on-click.js.
+ * fast/forms/resources/common-change-type-on-focus.js: Remove HTML markup text.
+ * fast/forms/resources/common-losing-renderer-on-click.js: Remove HTML markup text.
+
2012-07-24 Caio Marcelo de Oliveira Filho <[email protected]>
[Qt] css2.1/t170602* rebaseline after new test fonts
Modified: trunk/LayoutTests/fast/forms/number/number-change-type-on-focus.html (123562 => 123563)
--- trunk/LayoutTests/fast/forms/number/number-change-type-on-focus.html 2012-07-25 01:23:29 UTC (rev 123562)
+++ trunk/LayoutTests/fast/forms/number/number-change-type-on-focus.html 2012-07-25 01:45:20 UTC (rev 123563)
@@ -2,46 +2,16 @@
<html>
<head>
<script src=""
+<script src=""
</head>
<body>
<p id="description"></p>
-<input id=number type=number value=0>
+<input id=test type=number value=0>
<div id="console"></div>
<script>
-description('Bug 46950: Assertion failure by changing type from type=number in focus event.');
-
-var input = document.getElementById('number');
-var spinX = input.offsetLeft + input.offsetWidth - 6;
-var middleX = input.offsetLeft + input.offsetWidth / 2
-var middleY = input.offsetTop + input.offsetHeight / 4;
-
-function changeType(event) {
- this.type = 'text';
-}
-input.addEventListener('focus', changeType, false);
-if (window.eventSender) {
- // Click the spin button.
- eventSender.mouseMoveTo(spinX, middleY);
- eventSender.mouseDown(); // This made an assertion fail.
- eventSender.mouseUp();
-} else {
- debug('Manual testing: Click the spin button, and see if the browser crashes or not.');
-}
-testPassed('Not crashed.');
-
-// Click the input element. The event should not be captured by the spin button.
-if (window.eventSender) {
- var mouseDownCount = 0;
- input.addEventListener('mousedown', function(event) {
- mouseDownCount++;
- }, false);
- eventSender.mouseMoveTo(middleX, middleY);
- eventSender.mouseDown();
- eventSender.mouseUp();
- shouldBe('mouseDownCount', '1');
-}
+testChangeTypeOnFocus();
</script>
<script src=""
</body>
Modified: trunk/LayoutTests/fast/forms/number/number-losing-renderer-on-click.html (123562 => 123563)
--- trunk/LayoutTests/fast/forms/number/number-losing-renderer-on-click.html 2012-07-25 01:23:29 UTC (rev 123562)
+++ trunk/LayoutTests/fast/forms/number/number-losing-renderer-on-click.html 2012-07-25 01:45:20 UTC (rev 123563)
@@ -1,25 +1,11 @@
<html>
<head>
- <script>
- function test()
- {
- if (window.testRunner)
- testRunner.dumpAsText();
- var input = document.getElementById("test");
- var x = input.offsetLeft + input.offsetWidth - 8;
- var y = input.offsetTop + input.offsetHeight - 7;
- if (window.eventSender) {
- eventSender.mouseMoveTo(x, y);
- eventSender.mouseDown();
- eventSender.mouseUp();
- }
- }
- </script>
+ <script src=""
<style>
#test { width: 100px; }
</style>
</head>
- <body _onload_="test()">
+ <body _onload_="testLosingRendererOnClick()">
This tests that we don't crash when the renderer goes away during event handling.<br>
<input type="number" id="test" _onclick_="event.target.style.display='none'">
</body>
Modified: trunk/LayoutTests/fast/forms/resources/common-change-type-on-focus.js (123562 => 123563)
--- trunk/LayoutTests/fast/forms/resources/common-change-type-on-focus.js 2012-07-25 01:23:29 UTC (rev 123562)
+++ trunk/LayoutTests/fast/forms/resources/common-change-type-on-focus.js 2012-07-25 01:45:20 UTC (rev 123563)
@@ -1,48 +1,31 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<script src=""
-</head>
-<body>
-<p id="description"></p>
+var mouseDownCount = 0;
-<input id=number type=number value=0>
+function testChangeTypeOnFocus()
+{
+ var input = document.getElementById('test');
+ description('Bug 46950: Assertion failure by changing type from type=' + input.type + ' in focus event.');
+ input._onfocus_ = function () { this.type = 'text'; };
-<div id="console"></div>
-<script>
-description('Bug 46950: Assertion failure by changing type from type=number in focus event.');
+ var spinX = input.offsetLeft + input.offsetWidth - 6;
+ var middleX = input.offsetLeft + input.offsetWidth / 2
+ var middleY = input.offsetTop + input.offsetHeight / 4;
-var input = document.getElementById('number');
-var spinX = input.offsetLeft + input.offsetWidth - 6;
-var middleX = input.offsetLeft + input.offsetWidth / 2
-var middleY = input.offsetTop + input.offsetHeight / 4;
+ if (window.eventSender) {
+ // Click the spin button.
+ eventSender.mouseMoveTo(spinX, middleY);
+ eventSender.mouseDown(); // This made an assertion fail.
+ eventSender.mouseUp();
+ } else
+ debug('Manual testing: Click the spin button, and see if the browser crashes or not.');
-function changeType(event) {
- this.type = 'text';
-}
-input.addEventListener('focus', changeType, false);
-if (window.eventSender) {
- // Click the spin button.
- eventSender.mouseMoveTo(spinX, middleY);
- eventSender.mouseDown(); // This made an assertion fail.
- eventSender.mouseUp();
-} else {
- debug('Manual testing: Click the spin button, and see if the browser crashes or not.');
-}
-testPassed('Not crashed.');
+ testPassed('Not crashed.');
-// Click the input element. The event should not be captured by the spin button.
-if (window.eventSender) {
- var mouseDownCount = 0;
- input.addEventListener('mousedown', function(event) {
- mouseDownCount++;
- }, false);
- eventSender.mouseMoveTo(middleX, middleY);
- eventSender.mouseDown();
- eventSender.mouseUp();
- shouldBe('mouseDownCount', '1');
+ // Click the input element. The event should not be captured by the spin button.
+ if (window.eventSender) {
+ input._onmousedown_ = function() { ++mouseDownCount; };
+ eventSender.mouseMoveTo(middleX, middleY);
+ eventSender.mouseDown();
+ eventSender.mouseUp();
+ shouldBe('mouseDownCount', '1');
+ }
}
-</script>
-<script src=""
-</body>
-</html>
Modified: trunk/LayoutTests/fast/forms/resources/common-losing-renderer-on-click.js (123562 => 123563)
--- trunk/LayoutTests/fast/forms/resources/common-losing-renderer-on-click.js 2012-07-25 01:23:29 UTC (rev 123562)
+++ trunk/LayoutTests/fast/forms/resources/common-losing-renderer-on-click.js 2012-07-25 01:45:20 UTC (rev 123563)
@@ -1,26 +1,13 @@
-<html>
- <head>
- <script>
- function test()
- {
- if (window.testRunner)
- testRunner.dumpAsText();
- var input = document.getElementById("test");
- var x = input.offsetLeft + input.offsetWidth - 8;
- var y = input.offsetTop + input.offsetHeight - 7;
- if (window.eventSender) {
- eventSender.mouseMoveTo(x, y);
- eventSender.mouseDown();
- eventSender.mouseUp();
- }
- }
- </script>
- <style>
- #test { width: 100px; }
- </style>
- </head>
- <body _onload_="test()">
- This tests that we don't crash when the renderer goes away during event handling.<br>
- <input type="number" id="test" _onclick_="event.target.style.display='none'">
- </body>
-</html>
+function testLosingRendererOnClick()
+{
+ if (window.testRunner)
+ testRunner.dumpAsText();
+ var input = document.getElementById("test");
+ var x = input.offsetLeft + input.offsetWidth - 8;
+ var y = input.offsetTop + input.offsetHeight - 7;
+ if (window.eventSender) {
+ eventSender.mouseMoveTo(x, y);
+ eventSender.mouseDown();
+ eventSender.mouseUp();
+ }
+}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
