[webkit-changes] [152835] trunk/Source/WebKit2

Thu, 18 Jul 2013 01:00:15 -0700

Title: [152835] trunk/Source/WebKit2
Revision
152835
Author
[email protected]
Date
2013-07-18 01:01:22 -0700 (Thu, 18 Jul 2013)

Log Message

[EFL][WK2] Replace mouseClick with more meaningful method in test_ewk2_context_menu.cpp
https://bugs.webkit.org/show_bug.cgi?id=118796

Patch by Dong-Gwan Kim <[email protected]> on 2013-07-18
Reviewed by Christophe Dumez.

Some mouseClick methods are used in test_ewk2_context_menu.cpp.
But it is difficult to understand what they mean.
So i would like to replace those with more meaningful method for readability.

* UIProcess/API/efl/tests/test_ewk2_context_menu.cpp:
(EWK2ContextMenuTest::testContextMenu):
(EWK2ContextMenuTest::testContextMenuForRemoveAndAppend):
(EWK2ContextMenuTest::testContextMenuForSubmenu):
(EWK2ContextMenuTest::finishTest):
(EWK2ContextMenuTest::showContextMenu):
(TEST_F):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (152834 => 152835)


--- trunk/Source/WebKit2/ChangeLog	2013-07-18 07:51:58 UTC (rev 152834)
+++ trunk/Source/WebKit2/ChangeLog	2013-07-18 08:01:22 UTC (rev 152835)
@@ -1,5 +1,24 @@
 2013-07-18  Dong-Gwan Kim  <[email protected]>
 
+        [EFL][WK2] Replace mouseClick with more meaningful method in test_ewk2_context_menu.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=118796
+
+        Reviewed by Christophe Dumez.
+
+        Some mouseClick methods are used in test_ewk2_context_menu.cpp.
+        But it is difficult to understand what they mean.
+        So i would like to replace those with more meaningful method for readability.
+
+        * UIProcess/API/efl/tests/test_ewk2_context_menu.cpp:
+        (EWK2ContextMenuTest::testContextMenu):
+        (EWK2ContextMenuTest::testContextMenuForRemoveAndAppend):
+        (EWK2ContextMenuTest::testContextMenuForSubmenu):
+        (EWK2ContextMenuTest::finishTest):
+        (EWK2ContextMenuTest::showContextMenu):
+        (TEST_F):
+
+2013-07-18  Dong-Gwan Kim  <[email protected]>
+
         [EFL][WK2] Replace mouseClick with more meaningful method in test_ewk2_file_chooser_request.cpp
         https://bugs.webkit.org/show_bug.cgi?id=118792

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


--- trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_context_menu.cpp	2013-07-18 07:51:58 UTC (rev 152834)
+++ trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_context_menu.cpp	2013-07-18 08:01:22 UTC (rev 152835)
@@ -65,7 +65,7 @@
      * 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)
+    static Eina_Bool testContextMenu(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));
@@ -102,7 +102,7 @@
      * 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)
+    static Eina_Bool testContextMenuForRemoveAndAppend(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));
@@ -138,7 +138,7 @@
      * 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)
+    static Eina_Bool testContextMenuForSubmenu(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);
@@ -174,12 +174,18 @@
         return true;
     }
 
-    static Eina_Bool hideContextMenu(Ewk_View_Smart_Data*)
+    static Eina_Bool finishTest(Ewk_View_Smart_Data*)
     {
         testFinished = true;
 
         return true;
     }
+
+protected:
+    void showContextMenu()
+    {
+        mouseClick(10, 20, /*Right*/ 3);
+    }
 };
 
 TEST_F(EWK2ContextMenuTest, ewk_context_menu_item_select)
@@ -189,11 +195,11 @@
         "<body><a href="" Link</a></body>"
         "</html>";
 
-    ewkViewClass()->context_menu_show = showContextMenu;
+    ewkViewClass()->context_menu_show = testContextMenu;
 
     ewk_view_html_string_load(webView(), itemSelectHTML, "file:///", 0);
     ASSERT_TRUE(waitUntilLoadFinished());
-    mouseClick(10, 20, /*Right*/ 3);
+    showContextMenu();
     ASSERT_TRUE(waitUntilLoadFinished());
 }
 
@@ -205,17 +211,17 @@
         "</html>";
 
     ewkViewClass()->custom_item_selected = customItemSelected;
-    ewkViewClass()->context_menu_show = showContextMenuForRemoveAndAppend;
-    ewkViewClass()->context_menu_hide = hideContextMenu;
+    ewkViewClass()->context_menu_show = testContextMenuForRemoveAndAppend;
+    ewkViewClass()->context_menu_hide = finishTest;
 
     ewk_view_html_string_load(webView(), itemSelectHTML, "file:///", 0);
     ASSERT_TRUE(waitUntilLoadFinished());
-    mouseClick(10, 20, /*Right*/ 3);
+    showContextMenu();
     testFinished = false;
     ASSERT_TRUE(waitUntilTrue(testFinished));
 
-    ewkViewClass()->context_menu_show = showContextMenuForSubmenu;
-    mouseClick(10, 20, /*Right*/ 3);
+    ewkViewClass()->context_menu_show = testContextMenuForSubmenu;
+    showContextMenu();
     testFinished = false;
     ASSERT_TRUE(waitUntilTrue(testFinished));
 }

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to