Title: [130512] trunk/Source/WebKit2
Revision
130512
Author
commit-qu...@webkit.org
Date
2012-10-05 09:13:35 -0700 (Fri, 05 Oct 2012)

Log Message

[EFL] Unskip fullscreen unit tests for EwkView
https://bugs.webkit.org/show_bug.cgi?id=98509

Patch by Christophe Dumez <christophe.du...@intel.com> on 2012-10-05
Reviewed by Kenneth Rohde Christiansen.

Update 2 fullscreen unit tests for EwkView so that
they don't require a call to ecore_evas_fullscreen_set()
to succeed. ecore_evas_fullscreen_set() does not
seem to work in Xvfb and causes the tests to hang.
With this update, we can now run those tests again.

* UIProcess/API/efl/tests/test_ewk2_view.cpp:
(TEST_F):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (130511 => 130512)


--- trunk/Source/WebKit2/ChangeLog	2012-10-05 16:00:46 UTC (rev 130511)
+++ trunk/Source/WebKit2/ChangeLog	2012-10-05 16:13:35 UTC (rev 130512)
@@ -1,3 +1,19 @@
+2012-10-05  Christophe Dumez  <christophe.du...@intel.com>
+
+        [EFL] Unskip fullscreen unit tests for EwkView
+        https://bugs.webkit.org/show_bug.cgi?id=98509
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Update 2 fullscreen unit tests for EwkView so that
+        they don't require a call to ecore_evas_fullscreen_set()
+        to succeed. ecore_evas_fullscreen_set() does not
+        seem to work in Xvfb and causes the tests to hang.
+        With this update, we can now run those tests again.
+
+        * UIProcess/API/efl/tests/test_ewk2_view.cpp:
+        (TEST_F):
+
 2012-10-05  Carlos Garcia Campos  <cgar...@igalia.com>
 
         [GTK] Test /webkit2/WebKitPrintOperation/print-errors gives runtime critical warnings

Modified: trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp (130511 => 130512)


--- trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp	2012-10-05 16:00:46 UTC (rev 130511)
+++ trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp	2012-10-05 16:13:35 UTC (rev 130512)
@@ -310,18 +310,8 @@
     return false;
 }
 
-static void checkFullScreenProperty(Evas_Object* webView, bool expectedState)
+TEST_F(EWK2UnitTestBase, ewk_view_full_screen_enter)
 {
-    Ewk_View_Smart_Data* smartData = static_cast<Ewk_View_Smart_Data*>(evas_object_smart_data_get(webView));
-    Ecore_Evas* ecoreEvas = ecore_evas_ecore_evas_get(smartData->base.evas);
-    bool windowState = false;
-    while (((windowState = ecore_evas_fullscreen_get(ecoreEvas)) != expectedState))
-        ecore_main_loop_iterate();
-    ASSERT_TRUE(expectedState == windowState);
-}
-
-TEST_F(EWK2UnitTestBase, DISABLED_ewk_view_full_screen_enter)
-{
     const char fullscreenHTML[] =
         "<!doctype html><head><script>function makeFullScreen(){"
         "var div = document.getElementById(\"fullscreen\");"
@@ -337,10 +327,9 @@
     mouseClick(50, 50);
     ASSERT_TRUE(waitUntilTitleChangedTo("fullscreen entered"));
     ASSERT_TRUE(fullScreenCallbackCalled);
-    checkFullScreenProperty(webView(), true);
 }
 
-TEST_F(EWK2UnitTestBase, DISABLED_ewk_view_full_screen_exit)
+TEST_F(EWK2UnitTestBase, ewk_view_full_screen_exit)
 {
     const char fullscreenHTML[] =
         "<!doctype html><head><script>function makeFullScreenAndExit(){"
@@ -358,7 +347,6 @@
     mouseClick(50, 50);
     ASSERT_TRUE(waitUntilTitleChangedTo("fullscreen exited"));
     ASSERT_TRUE(fullScreenCallbackCalled);
-    checkFullScreenProperty(webView(), false);
 }
 
 TEST_F(EWK2UnitTestBase, ewk_view_same_page_navigation)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to