Changeset 152776 in webkit
- Timestamp:
- Jul 17, 2013 1:47:54 AM (11 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r152774 r152776 1 2013-07-17 Dong-Gwan Kim <donggwan.kim@samsung.com> 2 3 [EFL][WK2] EWK2CookieManagerTest should be defined by inheriting from EWK2UnitTestBase. 4 https://bugs.webkit.org/show_bug.cgi?id=118721 5 6 Reviewed by Christophe Dumez. 7 8 It should be defined as relevant test class specific to each test file for more readability. 9 It could be helpful to remove unnecessary static methods. 10 11 * UIProcess/API/efl/tests/test_ewk2_cookie_manager.cpp: 12 (compareHostNames): 13 (onCookiesChanged): 14 (EWK2CookieManagerTest::getAcceptPolicy): 15 (EWK2CookieManagerTest::getHostnamesWithCookies): 16 (EWK2CookieManagerTest::freeHostNames): 17 (EWK2CookieManagerTest::countHostnamesWithCookies): 18 (TEST_F): 19 1 20 2013-07-16 Balazs Kelemen <kbalazs@webkit.org> 2 21 -
trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_cookie_manager.cpp
r135349 r152776 41 41 "</body></html>"; 42 42 43 static void serverCallback(SoupServer* server, SoupMessage* message, const char* path, GHashTable*, SoupClientContext*, gpointer) 44 { 45 if (message->method != SOUP_METHOD_GET) { 46 soup_message_set_status(message, SOUP_STATUS_NOT_IMPLEMENTED); 47 return; 48 } 49 50 soup_message_set_status(message, SOUP_STATUS_OK); 51 if (!strcmp(path, "/index.html")) { 52 Eina_Strbuf* buffer = eina_strbuf_new(); 53 eina_strbuf_append_printf(buffer, INDEX_HTML_STRING, soup_server_get_port(server)); 54 soup_message_headers_replace(message->response_headers, "Set-Cookie", "foo=bar; Max-Age=60"); 55 soup_message_body_append(message->response_body, SOUP_MEMORY_TAKE, eina_strbuf_string_steal(buffer), eina_strbuf_length_get(buffer)); 56 eina_strbuf_free(buffer); 57 } else if (!strcmp(path, "/image.png")) 58 soup_message_headers_replace(message->response_headers, "Set-Cookie", "baz=qux; Max-Age=60"); 59 else 60 soup_message_set_status(message, SOUP_STATUS_NOT_FOUND); 61 62 soup_message_body_complete(message->response_body); 63 } 64 65 static void getAcceptPolicyCallback(Ewk_Cookie_Accept_Policy policy, Ewk_Error* error, void* event_info) 66 { 67 ASSERT_FALSE(error); 68 Ewk_Cookie_Accept_Policy* ret = static_cast<Ewk_Cookie_Accept_Policy*>(event_info); 69 *ret = policy; 70 ecore_main_loop_quit(); 71 } 72 73 static Ewk_Cookie_Accept_Policy getAcceptPolicy(Ewk_Cookie_Manager* manager) 74 { 75 Ewk_Cookie_Accept_Policy policy = EWK_COOKIE_ACCEPT_POLICY_ALWAYS; 76 ewk_cookie_manager_async_accept_policy_get(manager, getAcceptPolicyCallback, &policy); 77 ecore_main_loop_begin(); 78 return policy; 79 } 80 81 static void getHostnamesWithCookiesCallback(Eina_List* hostnames, Ewk_Error* error, void* event_info) 82 { 83 ASSERT_FALSE(error); 84 85 Eina_List** ret = static_cast<Eina_List**>(event_info); 86 Eina_List* l; 87 void* data; 88 EINA_LIST_FOREACH(hostnames, l, data) 89 *ret = eina_list_append(*ret, eina_stringshare_ref(static_cast<char*>(data))); 90 ecore_main_loop_quit(); 91 } 92 93 static Eina_List* getHostnamesWithCookies(Ewk_Cookie_Manager* manager) 94 { 95 Eina_List* ret = 0; 96 ewk_cookie_manager_async_hostnames_with_cookies_get(manager, getHostnamesWithCookiesCallback, &ret); 97 ecore_main_loop_begin(); 98 return ret; 99 } 100 101 static void freeHostNames(Eina_List* hostnames) 102 { 103 void* data; 104 EINA_LIST_FREE(hostnames, data) 105 eina_stringshare_del(static_cast<char*>(data)); 106 } 107 108 static int countHostnamesWithCookies(Ewk_Cookie_Manager* manager) 109 { 110 Eina_List* hostnames = getHostnamesWithCookies(manager); 111 int count = eina_list_count(hostnames); 112 freeHostNames(hostnames); 113 return count; 114 } 115 116 static int compareHostNames(const void* hostName1, const void* hostName2) 117 { 118 return strcmp(static_cast<const char*>(hostName1), static_cast<const char*>(hostName2)); 119 } 120 121 TEST_F(EWK2UnitTestBase, ewk_cookie_manager_accept_policy) 43 class EWK2CookieManagerTest : public EWK2UnitTestBase { 44 public: 45 static void serverCallback(SoupServer* server, SoupMessage* message, const char* path, GHashTable*, SoupClientContext*, gpointer) 46 { 47 if (message->method != SOUP_METHOD_GET) { 48 soup_message_set_status(message, SOUP_STATUS_NOT_IMPLEMENTED); 49 return; 50 } 51 52 soup_message_set_status(message, SOUP_STATUS_OK); 53 if (!strcmp(path, "/index.html")) { 54 Eina_Strbuf* buffer = eina_strbuf_new(); 55 eina_strbuf_append_printf(buffer, INDEX_HTML_STRING, soup_server_get_port(server)); 56 soup_message_headers_replace(message->response_headers, "Set-Cookie", "foo=bar; Max-Age=60"); 57 soup_message_body_append(message->response_body, SOUP_MEMORY_TAKE, eina_strbuf_string_steal(buffer), eina_strbuf_length_get(buffer)); 58 eina_strbuf_free(buffer); 59 } else if (!strcmp(path, "/image.png")) 60 soup_message_headers_replace(message->response_headers, "Set-Cookie", "baz=qux; Max-Age=60"); 61 else 62 soup_message_set_status(message, SOUP_STATUS_NOT_FOUND); 63 64 soup_message_body_complete(message->response_body); 65 } 66 67 static void getAcceptPolicyCallback(Ewk_Cookie_Accept_Policy policy, Ewk_Error* error, void* event_info) 68 { 69 ASSERT_FALSE(error); 70 Ewk_Cookie_Accept_Policy* ret = static_cast<Ewk_Cookie_Accept_Policy*>(event_info); 71 *ret = policy; 72 ecore_main_loop_quit(); 73 } 74 75 static void getHostnamesWithCookiesCallback(Eina_List* hostnames, Ewk_Error* error, void* event_info) 76 { 77 ASSERT_FALSE(error); 78 79 Eina_List** ret = static_cast<Eina_List**>(event_info); 80 Eina_List* l; 81 void* data; 82 EINA_LIST_FOREACH(hostnames, l, data) 83 *ret = eina_list_append(*ret, eina_stringshare_ref(static_cast<char*>(data))); 84 ecore_main_loop_quit(); 85 } 86 87 static int compareHostNames(const void* hostName1, const void* hostName2) 88 { 89 return strcmp(static_cast<const char*>(hostName1), static_cast<const char*>(hostName2)); 90 } 91 92 static void onCookiesChanged(void *eventInfo) 93 { 94 bool* cookiesChanged = static_cast<bool*>(eventInfo); 95 *cookiesChanged = true; 96 } 97 98 protected: 99 Ewk_Cookie_Accept_Policy getAcceptPolicy(Ewk_Cookie_Manager* manager) 100 { 101 Ewk_Cookie_Accept_Policy policy = EWK_COOKIE_ACCEPT_POLICY_ALWAYS; 102 ewk_cookie_manager_async_accept_policy_get(manager, getAcceptPolicyCallback, &policy); 103 ecore_main_loop_begin(); 104 return policy; 105 } 106 107 Eina_List* getHostnamesWithCookies(Ewk_Cookie_Manager* manager) 108 { 109 Eina_List* ret = 0; 110 ewk_cookie_manager_async_hostnames_with_cookies_get(manager, getHostnamesWithCookiesCallback, &ret); 111 ecore_main_loop_begin(); 112 return ret; 113 } 114 115 void freeHostNames(Eina_List* hostnames) 116 { 117 void* data; 118 EINA_LIST_FREE(hostnames, data) 119 eina_stringshare_del(static_cast<char*>(data)); 120 } 121 122 int countHostnamesWithCookies(Ewk_Cookie_Manager* manager) 123 { 124 Eina_List* hostnames = getHostnamesWithCookies(manager); 125 int count = eina_list_count(hostnames); 126 freeHostNames(hostnames); 127 return count; 128 } 129 }; 130 131 TEST_F(EWK2CookieManagerTest, ewk_cookie_manager_accept_policy) 122 132 { 123 133 OwnPtr<EWK2UnitTestServer> httpServer = adoptPtr(new EWK2UnitTestServer); … … 157 167 } 158 168 159 void onCookiesChanged(void *eventInfo) 160 { 161 bool* cookiesChanged = static_cast<bool*>(eventInfo); 162 *cookiesChanged = true; 163 } 164 165 TEST_F(EWK2UnitTestBase, ewk_cookie_manager_changes_watch) 169 TEST_F(EWK2CookieManagerTest, ewk_cookie_manager_changes_watch) 166 170 { 167 171 OwnPtr<EWK2UnitTestServer> httpServer = adoptPtr(new EWK2UnitTestServer); … … 226 230 } 227 231 228 TEST_F(EWK2 UnitTestBase, ewk_cookie_manager_cookies_delete)232 TEST_F(EWK2CookieManagerTest, ewk_cookie_manager_cookies_delete) 229 233 { 230 234 OwnPtr<EWK2UnitTestServer> httpServer = adoptPtr(new EWK2UnitTestServer); … … 262 266 } 263 267 264 TEST_F(EWK2 UnitTestBase, DISABLED_ewk_cookie_manager_permanent_storage)268 TEST_F(EWK2CookieManagerTest, DISABLED_ewk_cookie_manager_permanent_storage) 265 269 { 266 270 OwnPtr<EWK2UnitTestServer> httpServer = adoptPtr(new EWK2UnitTestServer); … … 309 313 unlink(sqliteStorage); 310 314 } 311
Note: See TracChangeset
for help on using the changeset viewer.