Changeset 130512 in webkit

Timestamp:

Oct 5, 2012, 9:13:35 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

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

Patch by Christophe Dumez <Christophe Dumez> 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):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/efl/tests/test_ewk2_view.cpp (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-10-05  Christophe Dumez  <christophe.dumez@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  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp

@@ -311 +311 @@
 }
 
-static void checkFullScreenProperty(Evas_Object* webView, bool expectedState)
-{
-    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)
+TEST_F(EWK2UnitTestBase, ewk_view_full_screen_enter)
 {
     const char fullscreenHTML[] =
@@ -338 +328 @@
     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[] =
@@ -359 +348 @@
     ASSERT_TRUE(waitUntilTitleChangedTo("fullscreen exited"));
     ASSERT_TRUE(fullScreenCallbackCalled);
-    checkFullScreenProperty(webView(), false);
 }