Modified: trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_context_menu.cpp (152760 => 152761)
--- trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_context_menu.cpp 2013-07-17 07:06:18 UTC (rev 152760)
+++ trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_context_menu.cpp 2013-07-17 07:09:51 UTC (rev 152761)
@@ -41,145 +41,148 @@
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);
+class EWK2ContextMenuTest : public EWK2UnitTestBase {
+public:
+ static 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);
- EXPECT_EQ(type, ewk_context_menu_item_type_get(item));
- EXPECT_EQ(action, ewk_context_menu_item_action_get(item));
- EXPECT_STREQ(title, ewk_context_menu_item_title_get(item));
+ EXPECT_EQ(type, ewk_context_menu_item_type_get(item));
+ EXPECT_EQ(action, ewk_context_menu_item_action_get(item));
+ EXPECT_STREQ(title, ewk_context_menu_item_title_get(item));
EXPECT_EQ(checked, ewk_context_menu_item_checked_get(item));
EXPECT_EQ(enabled, ewk_context_menu_item_enabled_get(item));
-}
+ }
-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);
+ 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;
-}
+ 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));
+ /**
+ * 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_OPEN_LINK, webkitItemTitle1, false, true);
+ 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_OPEN_LINK, webkitItemTitle1, false, true);
- item = static_cast<Ewk_Context_Menu_Item*>(eina_list_nth(list, 1));
- 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, 1));
+ 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_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, 2));
+ 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_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));
+ item = static_cast<Ewk_Context_Menu_Item*>(eina_list_nth(list, 3));
+ 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));
- // When context menu is created by WebKit, an item should have parent menu.
- EXPECT_EQ(contextMenu, ewk_context_menu_item_parent_menu_get(item));
+ // 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));
+ item = static_cast<Ewk_Context_Menu_Item*>(eina_list_nth(list, 0));
- EXPECT_TRUE(ewk_context_menu_item_select(contextMenu, item));
+ EXPECT_TRUE(ewk_context_menu_item_select(contextMenu, item));
- return true;
-}
+ 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));
+ /**
+ * 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));
+ 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));
+ 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);
+ 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);
+ // 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);
- // 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 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 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));
+ // 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));
+ EXPECT_TRUE(ewk_context_menu_item_select(contextMenu, newItem));
- ewk_context_menu_hide(contextMenu);
+ ewk_context_menu_hide(contextMenu);
- return true;
-}
+ 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(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);
- Ewk_Context_Menu* subMenu = ewk_context_menu_new_with_items(subMenuItemList);
+ /**
+ * 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(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);
+ Ewk_Context_Menu* subMenu = ewk_context_menu_new_with_items(subMenuItemList);
- // 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));
+ // 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* 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, newItem);
+ 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, 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(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(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));
+ // 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* 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);
+ Ewk_Context_Menu* subMenu2 = ewk_context_menu_new();
+ 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);
- EXPECT_TRUE(ewk_context_menu_item_select(ewk_context_menu_item_parent_menu_get(subMenuItem1), subMenuItem1));
+ EXPECT_TRUE(ewk_context_menu_item_select(ewk_context_menu_item_parent_menu_get(subMenuItem1), subMenuItem1));
- ewk_context_menu_hide(ewk_context_menu_item_parent_menu_get(subMenuItem1));
+ ewk_context_menu_hide(ewk_context_menu_item_parent_menu_get(subMenuItem1));
- return true;
-}
+ return true;
+ }
-static Eina_Bool hideContextMenu(Ewk_View_Smart_Data*)
-{
- testFinished = true;
+ static Eina_Bool hideContextMenu(Ewk_View_Smart_Data*)
+ {
+ testFinished = true;
- return true;
-}
+ return true;
+ }
+};
-TEST_F(EWK2UnitTestBase, ewk_context_menu_item_select)
+TEST_F(EWK2ContextMenuTest, ewk_context_menu_item_select)
{
const char* itemSelectHTML =
"<html>"
@@ -194,7 +197,7 @@
ASSERT_TRUE(waitUntilLoadFinished());
}
-TEST_F(EWK2UnitTestBase, ewk_context_menu_custom_items)
+TEST_F(EWK2ContextMenuTest, ewk_context_menu_custom_items)
{
const char* itemSelectHTML =
"<html>"
