[WK2][GTK] Fix unit test WebKit2APITests/WebKitWebView/mouse-target
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 6 Mar 2013 21:09:34 +0000 (21:09 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 6 Mar 2013 21:09:34 +0000 (21:09 +0000)
https://bugs.webkit.org/show_bug.cgi?id=82866

Patch by Manuel Rego Casasnovas <rego@igalia.com> on 2013-03-06
Reviewed by Martin Robinson.

Source/WebKit2:

Test was failing because of new media controls needs more space to be
painted than just 10x10 pixels. This is similar to r144070.

* UIProcess/API/gtk/tests/TestWebKitWebView.cpp:
(testWebViewMouseTarget): Modified HTML in order to give more space to the media controls.

Tools:

* Scripts/run-gtk-tests:
(TestRunner): Unflag WebKit2APITests/WebKitWebView/mouse-target test as
it is passing now.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@144969 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebView.cpp
Tools/ChangeLog
Tools/Scripts/run-gtk-tests

index ab72007..e48dd58 100644 (file)
@@ -1,3 +1,16 @@
+2013-03-06  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        [WK2][GTK] Fix unit test WebKit2APITests/WebKitWebView/mouse-target
+        https://bugs.webkit.org/show_bug.cgi?id=82866
+
+        Reviewed by Martin Robinson.
+
+        Test was failing because of new media controls needs more space to be
+        painted than just 10x10 pixels. This is similar to r144070.
+
+        * UIProcess/API/gtk/tests/TestWebKitWebView.cpp:
+        (testWebViewMouseTarget): Modified HTML in order to give more space to the media controls.
+
 2013-03-06  Tim Horton  <timothy_horton@apple.com>
 
         [wk2] Page Overlays: Hook up the layer border/repaint counter setting to the overlay layer
index 6ed4a38..9cf1ddc 100644 (file)
@@ -479,9 +479,9 @@ static void testWebViewMouseTarget(UIClientTest* test, gconstpointer)
         " <a style='position:absolute; left:1; top:1' href='http://www.webkitgtk.org' title='WebKitGTK+ Title'>WebKitGTK+ Website</a>"
         " <img style='position:absolute; left:1; top:10' src='0xdeadbeef' width=5 height=5></img>"
         " <a style='position:absolute; left:1; top:20' href='http://www.webkitgtk.org/logo' title='WebKitGTK+ Logo'><img src='0xdeadbeef' width=5 height=5></img></a>"
-        " <video style='position:absolute; left:1; top:30' width=10 height=10 controls='controls'><source src='movie.ogg' type='video/ogg' /></video>"
-        " <input style='position:absolute; left:1; top:50' size='10'></input>"
-        " <div style='position:absolute; left:1; top:70; width:30; height:30; overflow:scroll'>&nbsp;</div>"
+        " <input style='position:absolute; left:1; top:30' size='10'></input>"
+        " <div style='position:absolute; left:1; top:50; width:30; height:30; overflow:scroll'>&nbsp;</div>"
+        " <video style='position:absolute; left:1; top:100' width='300' height='300' controls='controls'><source src='movie.ogg' type='video/ogg' /></video>"
         "</body></html>";
 
     test->loadHtml(linksHoveredHTML, "file:///");
@@ -530,7 +530,7 @@ static void testWebViewMouseTarget(UIClientTest* test, gconstpointer)
     g_assert(!test->m_mouseTargetModifiers);
 
     // Move over media.
-    hitTestResult = test->moveMouseAndWaitUntilMouseTargetChanged(1, 30);
+    hitTestResult = test->moveMouseAndWaitUntilMouseTargetChanged(1, 100);
     g_assert(!webkit_hit_test_result_context_is_link(hitTestResult));
     g_assert(!webkit_hit_test_result_context_is_image(hitTestResult));
     g_assert(webkit_hit_test_result_context_is_media(hitTestResult));
@@ -540,7 +540,7 @@ static void testWebViewMouseTarget(UIClientTest* test, gconstpointer)
     g_assert(!test->m_mouseTargetModifiers);
 
     // Mover over input.
-    hitTestResult = test->moveMouseAndWaitUntilMouseTargetChanged(5, 55);
+    hitTestResult = test->moveMouseAndWaitUntilMouseTargetChanged(5, 35);
     g_assert(!webkit_hit_test_result_context_is_link(hitTestResult));
     g_assert(!webkit_hit_test_result_context_is_image(hitTestResult));
     g_assert(!webkit_hit_test_result_context_is_media(hitTestResult));
@@ -549,7 +549,7 @@ static void testWebViewMouseTarget(UIClientTest* test, gconstpointer)
     g_assert(!test->m_mouseTargetModifiers);
 
     // Move over scrollbar.
-    hitTestResult = test->moveMouseAndWaitUntilMouseTargetChanged(5, 95);
+    hitTestResult = test->moveMouseAndWaitUntilMouseTargetChanged(5, 75);
     g_assert(!webkit_hit_test_result_context_is_link(hitTestResult));
     g_assert(!webkit_hit_test_result_context_is_image(hitTestResult));
     g_assert(!webkit_hit_test_result_context_is_media(hitTestResult));
index fd40523..0c008fc 100644 (file)
@@ -1,3 +1,14 @@
+2013-03-06  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        [WK2][GTK] Fix unit test WebKit2APITests/WebKitWebView/mouse-target
+        https://bugs.webkit.org/show_bug.cgi?id=82866
+
+        Reviewed by Martin Robinson.
+
+        * Scripts/run-gtk-tests:
+        (TestRunner): Unflag WebKit2APITests/WebKitWebView/mouse-target test as
+        it is passing now.
+
 2013-03-06  Julie Parent  <jparent@chromium.org>
 
         Dashboard cleanup: remove dashboard time logging.
index 3634e5b..35e70ed 100755 (executable)
@@ -72,7 +72,6 @@ class TestRunner:
         SkippedTest("WebKit2APITests/TestWebKitAccessibility", "/webkit2/WebKitAccessibility/atspi-basic-hierarchy", "Test fails", 100408),
         SkippedTest("WebKit2APITests/TestWebKitFindController", "/webkit2/WebKitFindController/hide", "Test always fails in Xvfb", 89810),
         SkippedTest("WebKit2APITests/TestWebKitWebContext", "/webkit2/WebKitWebContext/uri-scheme", "Test fails", 104779),
-        SkippedTest("WebKit2APITests/TestWebKitWebView", "/webkit2/WebKitWebView/mouse-target", "Test is flaky in GTK Linux 32-bit Release bot", 82866),
         SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.CanHandleRequest", "Test fails", 88453),
         SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.MouseMoveAfterCrash", "Test is flaky", 85066),
         SkippedTest("TestWebKitAPI/TestWebKit2", "WebKit2.NewFirstVisuallyNonEmptyLayoutForImages", "Test is flaky", 85066),