Title: [151428] trunk/Source/WebKit2
Revision
151428
Author
[email protected]
Date
2013-06-11 01:35:48 -0700 (Tue, 11 Jun 2013)

Log Message

[EFL][WK2] Fix test_ewk2_context_menu
https://bugs.webkit.org/show_bug.cgi?id=116601

Patch by Michał Pakuła vel Rutka <[email protected]> on 2013-06-11
Reviewed by Gyuyoung Kim.

test_ewk2_context_menu is always passing, it does not test any context menu feature
as it ends before context menu is called.
One single test was divided into two tests: testing WebKit2 created context menu and
testing menus and items created by application.

* UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp:
(EWK2UnitTest::EWK2UnitTestBase::waitUntilTrue): added function introducing internal loop until boolean value is changed to true
* UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.h:
* UIProcess/API/efl/tests/test_ewk2_context_menu.cpp:
(customItemSelected):
(showContextMenu):
(showContextMenuForRemoveAndAppend):
(showContextMenuForSubmenu):
(hideContextMenu):
(TEST_F):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (151427 => 151428)


--- trunk/Source/WebKit2/ChangeLog	2013-06-11 08:10:24 UTC (rev 151427)
+++ trunk/Source/WebKit2/ChangeLog	2013-06-11 08:35:48 UTC (rev 151428)
@@ -1,3 +1,26 @@
+2013-06-11  Michał Pakuła vel Rutka  <[email protected]>
+
+        [EFL][WK2] Fix test_ewk2_context_menu
+        https://bugs.webkit.org/show_bug.cgi?id=116601
+
+        Reviewed by Gyuyoung Kim.
+
+        test_ewk2_context_menu is always passing, it does not test any context menu feature
+        as it ends before context menu is called.
+        One single test was divided into two tests: testing WebKit2 created context menu and
+        testing menus and items created by application.
+
+        * UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp:
+        (EWK2UnitTest::EWK2UnitTestBase::waitUntilTrue): added function introducing internal loop until boolean value is changed to true
+        * UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.h:
+        * UIProcess/API/efl/tests/test_ewk2_context_menu.cpp:
+        (customItemSelected):
+        (showContextMenu):
+        (showContextMenuForRemoveAndAppend):
+        (showContextMenuForSubmenu):
+        (hideContextMenu):
+        (TEST_F):
+
 2013-06-11  Ryuan Choi  <[email protected]>
 
         [EFL][WK2] Add ewk_view_navigate API

Modified: trunk/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp (151427 => 151428)


--- trunk/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp	2013-06-11 08:10:24 UTC (rev 151427)
+++ trunk/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp	2013-06-11 08:35:48 UTC (rev 151428)
@@ -224,6 +224,16 @@
     return !data.didTimeOut();
 }
 
+bool EWK2UnitTestBase::waitUntilTrue(bool &flag, double timeoutSeconds)
+{
+    CallbackDataExpectedValue<bool> data(true, timeoutSeconds);
+
+    while (!data.isDone() && !flag)
+        ecore_main_loop_iterate();
+
+    return !data.didTimeOut();
+}
+
 void EWK2UnitTestBase::mouseClick(int x, int y, int button)
 {
     Evas* evas = evas_object_evas_get(m_webView);

Modified: trunk/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.h (151427 => 151428)


--- trunk/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.h	2013-06-11 08:10:24 UTC (rev 151427)
+++ trunk/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.h	2013-06-11 08:35:48 UTC (rev 151428)
@@ -50,6 +50,7 @@
     bool waitUntilLoadFinished(double timeoutSeconds = defaultTimeoutSeconds);
     bool waitUntilTitleChangedTo(const char* expectedTitle, double timeoutSeconds = defaultTimeoutSeconds);
     bool waitUntilURLChangedTo(const char* expectedURL, double timeoutSeconds = defaultTimeoutSeconds);
+    bool waitUntilTrue(bool &flag, double timeoutSeconds = defaultTimeoutSeconds);
 
     void mouseClick(int x, int y, int button = 1 /*Left*/);
     void mouseDown(int x, int y, int button = 1 /*Left*/);

Modified: trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_context_menu.cpp (151427 => 151428)


--- trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_context_menu.cpp	2013-06-11 08:10:24 UTC (rev 151427)
+++ trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_context_menu.cpp	2013-06-11 08:35:48 UTC (rev 151428)
@@ -27,6 +27,20 @@
 
 extern EWK2UnitTestEnvironment* environment;
 
+static bool testFinished = false;
+
+static const Ewk_Context_Menu_Item_Type customItemType = EWK_ACTION_TYPE;
+static const Ewk_Context_Menu_Item_Action customItemTag = EWK_CONTEXT_MENU_ITEM_BASE_APPLICATION_TAG;
+static const char customItemTitle[] = "Custom Item";
+static const bool customItemChecked = false;
+static const bool customItemEnabled = true;
+
+static const char webkitItemTitle1[] = "Open Link";
+static const char webkitItemTitle2[] = "Open Link in New Window";
+static const char webkitItemTitle3[] = "Download Linked File";
+static const char webkitItemTitle4[] = "Copy Link Location";
+static const char webkitItemNewTitle[] = "Copy Link";
+
 static inline void checkBasicContextMenuItem(Ewk_Context_Menu_Item* item, Ewk_Context_Menu_Item_Type type, Ewk_Context_Menu_Item_Action action, const char* title, Eina_Bool checked, Eina_Bool enabled)
 {
     ASSERT_TRUE(item);
@@ -38,34 +52,69 @@
     EXPECT_EQ(enabled, ewk_context_menu_item_enabled_get(item));
 }
 
-static Eina_Bool showContextMenu(Ewk_View_Smart_Data* smartData, Evas_Coord x, Evas_Coord y, Ewk_Context_Menu* contextMenu)
+static Eina_Bool customItemSelected(Ewk_View_Smart_Data*, Ewk_Context_Menu_Item* item)
 {
+    checkBasicContextMenuItem(item, customItemType, static_cast<Ewk_Context_Menu_Item_Action>(customItemTag), customItemTitle, customItemChecked, customItemEnabled);
+
+    return true;
+}
+
+/**
+ * This callback receives context menu called upon link with items generated by WebKit2.
+ * Items have their properties modified, and one of items is selected.
+ */
+static Eina_Bool showContextMenu(Ewk_View_Smart_Data*, Evas_Coord, Evas_Coord, Ewk_Context_Menu* contextMenu)
+{
     const Eina_List* list = ewk_context_menu_items_get(contextMenu);
     EXPECT_EQ(4, eina_list_count(list));
 
     Ewk_Context_Menu_Item* item = static_cast<Ewk_Context_Menu_Item*>(eina_list_nth(list, 0));
-    checkBasicContextMenuItem(item, EWK_ACTION_TYPE, EWK_CONTEXT_MENU_ITEM_TAG_GO_BACK, "Go Back", false, true);
+    checkBasicContextMenuItem(item, EWK_ACTION_TYPE, EWK_CONTEXT_MENU_ITEM_TAG_OPEN_LINK, webkitItemTitle1, false, true);
 
-    // When context menu is created by WebKit, an item should have parent menu.
-    EXPECT_EQ(contextMenu, ewk_context_menu_item_parent_menu_get(item));
-
     item = static_cast<Ewk_Context_Menu_Item*>(eina_list_nth(list, 1));
-    checkBasicContextMenuItem(item, EWK_ACTION_TYPE, EWK_CONTEXT_MENU_ITEM_TAG_GO_FORWARD, "Go Forward", false, true);
+    checkBasicContextMenuItem(item, EWK_ACTION_TYPE, EWK_CONTEXT_MENU_ITEM_TAG_OPEN_LINK_IN_NEW_WINDOW, webkitItemTitle2, false, true);
     ewk_context_menu_item_enabled_set(item, false);
     EXPECT_FALSE(ewk_context_menu_item_enabled_get(item));
 
     item = static_cast<Ewk_Context_Menu_Item*>(eina_list_nth(list, 2));
-    checkBasicContextMenuItem(item, EWK_ACTION_TYPE, EWK_CONTEXT_MENU_ITEM_TAG_STOP, "Stop", false, true);
+    checkBasicContextMenuItem(item, EWK_ACTION_TYPE, EWK_CONTEXT_MENU_ITEM_TAG_DOWNLOAD_LINK_TO_DISK, webkitItemTitle3, false, true);
     ewk_context_menu_item_checked_set(item, true);
     EXPECT_TRUE(ewk_context_menu_item_checked_get(item));
 
     item = static_cast<Ewk_Context_Menu_Item*>(eina_list_nth(list, 3));
-    checkBasicContextMenuItem(item, EWK_ACTION_TYPE, EWK_CONTEXT_MENU_ITEM_TAG_RELOAD, "Reload", false, true);
-    ewk_context_menu_item_title_set(item, "Refresh");
-    EXPECT_STREQ("Refresh", ewk_context_menu_item_title_get(item));
+    checkBasicContextMenuItem(item, EWK_ACTION_TYPE, EWK_CONTEXT_MENU_ITEM_TAG_COPY_LINK_TO_CLIPBOARD, webkitItemTitle4, false, true);
+    ewk_context_menu_item_title_set(item, webkitItemNewTitle);
+    EXPECT_STREQ(webkitItemNewTitle, ewk_context_menu_item_title_get(item));
 
-    // Makes new context menu items.
-    Ewk_Context_Menu_Item* newItem = ewk_context_menu_item_new(EWK_ACTION_TYPE, EWK_CONTEXT_MENU_ITEM_TAG_OTHER, "New Custom Item", false, true);
+    // When context menu is created by WebKit, an item should have parent menu.
+    EXPECT_EQ(contextMenu, ewk_context_menu_item_parent_menu_get(item));
+
+    item = static_cast<Ewk_Context_Menu_Item*>(eina_list_nth(list, 0));
+
+    EXPECT_TRUE(ewk_context_menu_item_select(contextMenu, item));
+
+    return true;
+}
+
+/**
+ * This callback receives context menu called upon link with items generated by WebKit2.
+ * Received items are removed, then custom item is created and selected.
+ */
+static Eina_Bool showContextMenuForRemoveAndAppend(Ewk_View_Smart_Data*, Evas_Coord, Evas_Coord, Ewk_Context_Menu* contextMenu)
+{
+    const Eina_List* list = ewk_context_menu_items_get(contextMenu);
+    EXPECT_EQ(4, eina_list_count(list));
+
+    const Eina_List* listIterator;
+    void* data;
+    EINA_LIST_FOREACH(list, listIterator, data)
+        ewk_context_menu_item_remove(contextMenu, static_cast<Ewk_Context_Menu_Item*>(data));
+
+    list = ewk_context_menu_items_get(contextMenu);
+    EXPECT_EQ(0, eina_list_count(list));
+
+    Ewk_Context_Menu_Item* newItem = ewk_context_menu_item_new(customItemType, customItemTag, customItemTitle, customItemChecked, customItemEnabled);
+
     // When context menu item is created using ewk_context_menu_item_new, it should not have parent menu.
     EXPECT_EQ(0, ewk_context_menu_item_parent_menu_get(newItem));
     ewk_context_menu_item_append(contextMenu, newItem);
@@ -73,13 +122,26 @@
     // When context menu item is added to menu using ewk_context_menu_item_append, it should have parent menu.
     EXPECT_EQ(contextMenu, ewk_context_menu_item_parent_menu_get(newItem));
 
-    // When context menu item was created using ewk_context_menu_item_new, submenu should be 0.
+    // When non submenu type context menu item was created using ewk_context_menu_item_new, submenu should be 0.
     EXPECT_EQ(0, ewk_context_menu_item_submenu_get(newItem));
 
+    EXPECT_TRUE(ewk_context_menu_item_select(contextMenu, newItem));
+
+    ewk_context_menu_hide(contextMenu);
+
+    return true;
+}
+
+/**
+ * This callback receives context menu called upon link with items generated by WebKit2.
+ * New submenus are created, one of submenu's item is selected.
+ */
+static Eina_Bool showContextMenuForSubmenu(Ewk_View_Smart_Data*, Evas_Coord, Evas_Coord, Ewk_Context_Menu* contextMenu)
+{
     Eina_List* subMenuItemList = 0;
-    Ewk_Context_Menu_Item* subMenuItem1 = ewk_context_menu_item_new(EWK_ACTION_TYPE, EWK_CONTEXT_MENU_ITEM_TAG_OTHER, "New SubMenu Item 1", false, true);
-    Ewk_Context_Menu_Item* subMenuItem2 = ewk_context_menu_item_new(EWK_ACTION_TYPE, EWK_CONTEXT_MENU_ITEM_TAG_OTHER, "New SubMenu Item 2", false, true);
-    Ewk_Context_Menu_Item* subMenuItem3 = ewk_context_menu_item_new(EWK_ACTION_TYPE, EWK_CONTEXT_MENU_ITEM_TAG_OTHER, "New SubMenu Item 3", false, true);
+    Ewk_Context_Menu_Item* subMenuItem1 = ewk_context_menu_item_new(customItemType, customItemTag, customItemTitle, customItemChecked, customItemEnabled);
+    Ewk_Context_Menu_Item* subMenuItem2 = ewk_context_menu_item_new(EWK_ACTION_TYPE, static_cast<Ewk_Context_Menu_Item_Action>(customItemTag + 1), "New SubMenu Item 2", false, true);
+    Ewk_Context_Menu_Item* subMenuItem3 = ewk_context_menu_item_new(EWK_ACTION_TYPE, static_cast<Ewk_Context_Menu_Item_Action>(customItemTag + 2), "New SubMenu Item 3", false, true);
     subMenuItemList = eina_list_append(subMenuItemList, subMenuItem1);
     subMenuItemList = eina_list_append(subMenuItemList, subMenuItem2);
     subMenuItemList = eina_list_append(subMenuItemList, subMenuItem3);
@@ -88,32 +150,32 @@
     // When context menu is created using ewk_context_menu_new_with_items, items should have parent menu.
     EXPECT_EQ(subMenu, ewk_context_menu_item_parent_menu_get(subMenuItem1));
 
-    Ewk_Context_Menu_Item* newItem2 = ewk_context_menu_item_new_with_submenu(EWK_CONTEXT_MENU_ITEM_TAG_OTHER, "New Custom Item 2", true, subMenu);
+    Ewk_Context_Menu_Item* newItem = ewk_context_menu_item_new_with_submenu(EWK_CONTEXT_MENU_ITEM_BASE_APPLICATION_TAG, "New Custom Item", true, subMenu);
     // When context menu item is created using ewk_context_menu_item_new_with_submenu, it should not have parent menu.
     EXPECT_EQ(0, ewk_context_menu_item_parent_menu_get(newItem));
-    ewk_context_menu_item_append(contextMenu, newItem2);
+    ewk_context_menu_item_append(contextMenu, newItem);
 
     // Context menu received from ewk_context_menu_item_submenu_get should be the same as one used to create sub menu.
-    EXPECT_EQ(subMenu, ewk_context_menu_item_submenu_get(newItem2));
+    EXPECT_EQ(subMenu, ewk_context_menu_item_submenu_get(newItem));
 
     // When context menu item is created using ewk_context_menu_item_new_with_submenu and added using ewk_context_menu_item_append it should have parent menu.
     EXPECT_EQ(contextMenu, ewk_context_menu_item_parent_menu_get(newItem));
 
     Ewk_Context_Menu* subMenu2 = ewk_context_menu_new();
-    Ewk_Context_Menu_Item* newItem3 = ewk_context_menu_item_new_with_submenu(EWK_CONTEXT_MENU_ITEM_TAG_OTHER, "New Custom Item 3", true, subMenu2);
-    ewk_context_menu_item_append(contextMenu, newItem3);
+    Ewk_Context_Menu_Item* newItem2 = ewk_context_menu_item_new_with_submenu(EWK_CONTEXT_MENU_ITEM_BASE_APPLICATION_TAG, "New Custom Item 2", true, subMenu2);
+    ewk_context_menu_item_append(contextMenu, newItem2);
 
-    list = ewk_context_menu_items_get(contextMenu);
-    EXPECT_EQ(7, eina_list_count(list));
+    EXPECT_TRUE(ewk_context_menu_item_select(ewk_context_menu_item_parent_menu_get(subMenuItem1), subMenuItem1));
 
-    ewk_context_menu_item_remove(contextMenu, newItem);
-    ewk_context_menu_item_remove(contextMenu, newItem2);
-    ewk_context_menu_item_remove(contextMenu, newItem3);
-    list = ewk_context_menu_items_get(contextMenu);
-    EXPECT_EQ(4, eina_list_count(list));
+    ewk_context_menu_hide(ewk_context_menu_item_parent_menu_get(subMenuItem1));
 
-    EXPECT_TRUE(ewk_context_menu_item_select(contextMenu, item));
+    return true;
+}
 
+static Eina_Bool hideContextMenu(Ewk_View_Smart_Data*)
+{
+    testFinished = true;
+
     return true;
 }
 
@@ -122,11 +184,35 @@
     const char* itemSelectHTML =
         "<html>"
         "<body><a href="" Link</a></body>"
-        "</body></html>"; 
+        "</html>";
 
     ewkViewClass()->context_menu_show = showContextMenu;
 
     ewk_view_html_string_load(webView(), itemSelectHTML, "file:///", 0);
-    mouseClick(20, 30, /*Right*/ 3);
     ASSERT_TRUE(waitUntilLoadFinished());
+    mouseClick(10, 20, /*Right*/ 3);
+    ASSERT_TRUE(waitUntilLoadFinished());
 }
+
+TEST_F(EWK2UnitTestBase, ewk_context_menu_custom_items)
+{
+    const char* itemSelectHTML =
+        "<html>"
+        "<body><a href="" Link</a></body>"
+        "</html>";
+
+    ewkViewClass()->custom_item_selected = customItemSelected;
+    ewkViewClass()->context_menu_show = showContextMenuForRemoveAndAppend;
+    ewkViewClass()->context_menu_hide = hideContextMenu;
+
+    ewk_view_html_string_load(webView(), itemSelectHTML, "file:///", 0);
+    ASSERT_TRUE(waitUntilLoadFinished());
+    mouseClick(10, 20, /*Right*/ 3);
+    testFinished = false;
+    ASSERT_TRUE(waitUntilTrue(testFinished));
+
+    ewkViewClass()->context_menu_show = showContextMenuForSubmenu;
+    mouseClick(10, 20, /*Right*/ 3);
+    testFinished = false;
+    ASSERT_TRUE(waitUntilTrue(testFinished));
+}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to