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

Wed, 17 Jul 2013 00:10:16 -0700

Title: [152762] trunk/Source/WebKit2
Revision
152762
Author
[email protected]
Date
2013-07-17 00:11:19 -0700 (Wed, 17 Jul 2013)

Log Message

[EFL][WK2] EWK2AuthRequestTest should be defined by inheriting from EWK2UnitTestBase.
https://bugs.webkit.org/show_bug.cgi?id=118766

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

It should be defined as relevant test class specific to each test file for more readability.
It could be helpful to remove unnecessary static methods.

* UIProcess/API/efl/tests/test_ewk2_auth_request.cpp:
(EWK2AuthRequestTest::serverCallback):
(EWK2AuthRequestTest::onAuthenticationRequest):
(EWK2AuthRequestTest::onLoadFinished):
(TEST_F):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (152761 => 152762)


--- trunk/Source/WebKit2/ChangeLog	2013-07-17 07:09:51 UTC (rev 152761)
+++ trunk/Source/WebKit2/ChangeLog	2013-07-17 07:11:19 UTC (rev 152762)
@@ -1,5 +1,21 @@
 2013-07-17  Dong-Gwan Kim  <[email protected]>
 
+        [EFL][WK2] EWK2AuthRequestTest should be defined by inheriting from EWK2UnitTestBase.
+        https://bugs.webkit.org/show_bug.cgi?id=118766
+
+        Reviewed by Christophe Dumez.
+
+        It should be defined as relevant test class specific to each test file for more readability.
+        It could be helpful to remove unnecessary static methods.
+
+        * UIProcess/API/efl/tests/test_ewk2_auth_request.cpp:
+        (EWK2AuthRequestTest::serverCallback):
+        (EWK2AuthRequestTest::onAuthenticationRequest):
+        (EWK2AuthRequestTest::onLoadFinished):
+        (TEST_F):
+
+2013-07-17  Dong-Gwan Kim  <[email protected]>
+
         [EFL][WK2] EWK2ContextMenuTest should be defined by inheriting from EWK2UnitTestBase.
         https://bugs.webkit.org/show_bug.cgi?id=118767

Modified: trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_auth_request.cpp (152761 => 152762)


--- trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_auth_request.cpp	2013-07-17 07:09:51 UTC (rev 152761)
+++ trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_auth_request.cpp	2013-07-17 07:11:19 UTC (rev 152762)
@@ -42,43 +42,54 @@
     "<head><title>EFLWebKit2 Authentication test</title></head>"
     "<body></body></html>";
 
-static void serverCallback(SoupServer*, SoupMessage* message, const char* path, GHashTable*, SoupClientContext*, void*)
-{
-    if (message->method != SOUP_METHOD_GET) {
-        soup_message_set_status(message, SOUP_STATUS_NOT_IMPLEMENTED);
-        return;
+class EWK2AuthRequestTest : public EWK2UnitTestBase {
+public:
+    static void serverCallback(SoupServer*, SoupMessage* message, const char* path, GHashTable*, SoupClientContext*, void*)
+    {
+        if (message->method != SOUP_METHOD_GET) {
+            soup_message_set_status(message, SOUP_STATUS_NOT_IMPLEMENTED);
+            return;
+        }
+
+        if (!strcmp(path, "/index.html")) {
+            const char* authorization = soup_message_headers_get_one(message->request_headers, "Authorization");
+            // Require authentication
+            if (authorization && !strcmp(authorization, expectedAuthorization)) {
+                // Successful authentication.
+                soup_message_set_status(message, SOUP_STATUS_OK);
+                soup_message_body_append(message->response_body, SOUP_MEMORY_COPY, indexHTMLString, strlen(indexHTMLString));
+            } else {
+                // No (valid) authorization header provided by the client, request authentication.
+                soup_message_set_status(message, SOUP_STATUS_UNAUTHORIZED);
+                soup_message_headers_append(message->response_headers, "WWW-Authenticate", "Basic realm=\"my realm\"");
+            }
+        } else
+            soup_message_set_status(message, SOUP_STATUS_NOT_FOUND);
+
+        soup_message_body_complete(message->response_body);
     }
 
-    if (!strcmp(path, "/index.html")) {
-        const char* authorization = soup_message_headers_get_one(message->request_headers, "Authorization");
-        // Require authentication
-        if (authorization && !strcmp(authorization, expectedAuthorization)) {
-            // Successful authentication.
-            soup_message_set_status(message, SOUP_STATUS_OK);
-            soup_message_body_append(message->response_body, SOUP_MEMORY_COPY, indexHTMLString, strlen(indexHTMLString));
-        } else {
-            // No (valid) authorization header provided by the client, request authentication.
-            soup_message_set_status(message, SOUP_STATUS_UNAUTHORIZED);
-            soup_message_headers_append(message->response_headers, "WWW-Authenticate", "Basic realm=\"my realm\"");
-        }
-    } else
-        soup_message_set_status(message, SOUP_STATUS_NOT_FOUND);
+    static void onAuthenticationRequest(void* userData, Evas_Object*, void* eventInfo)
+    {
+        Ewk_Auth_Request** returnRequest = static_cast<Ewk_Auth_Request**>(userData);
+        ASSERT_TRUE(returnRequest);
 
-    soup_message_body_complete(message->response_body);
-}
+        Ewk_Auth_Request* request = static_cast<Ewk_Auth_Request*>(eventInfo);
+        ASSERT_TRUE(request);
 
-static void onAuthenticationRequest(void* userData, Evas_Object*, void* eventInfo)
-{
-    Ewk_Auth_Request** returnRequest = static_cast<Ewk_Auth_Request**>(userData);
-    ASSERT_TRUE(returnRequest);
+        *returnRequest = ewk_object_ref(request);
+    }
 
-    Ewk_Auth_Request* request = static_cast<Ewk_Auth_Request*>(eventInfo);
-    ASSERT_TRUE(request);
+    static void onLoadFinished(void* userData, Evas_Object*, void*)
+    {
+        bool* isFinished = static_cast<bool*>(userData);
+        ASSERT_TRUE(isFinished);
 
-    *returnRequest = ewk_object_ref(request);
-}
+        *isFinished = true;
+    }
+};
 
-TEST_F(EWK2UnitTestBase, ewk_auth_request_success)
+TEST_F(EWK2AuthRequestTest, ewk_auth_request_success)
 {
     OwnPtr<EWK2UnitTestServer> httpServer = adoptPtr(new EWK2UnitTestServer);
     httpServer->run(serverCallback);
@@ -105,7 +116,7 @@
     ASSERT_TRUE(waitUntilTitleChangedTo(expectedSuccessTitle));
 }
 
-TEST_F(EWK2UnitTestBase, ewk_auth_request_failure_then_success)
+TEST_F(EWK2AuthRequestTest, ewk_auth_request_failure_then_success)
 {
     OwnPtr<EWK2UnitTestServer> httpServer = adoptPtr(new EWK2UnitTestServer);
     httpServer->run(serverCallback);
@@ -146,16 +157,8 @@
     ASSERT_TRUE(waitUntilTitleChangedTo(expectedSuccessTitle));
 }
 
-static void onLoadFinished(void* userData, Evas_Object*, void*)
+TEST_F(EWK2AuthRequestTest, ewk_auth_request_cancel)
 {
-    bool* isFinished = static_cast<bool*>(userData);
-    ASSERT_TRUE(isFinished);
-
-    *isFinished = true;
-}
-
-TEST_F(EWK2UnitTestBase, ewk_auth_request_cancel)
-{
     OwnPtr<EWK2UnitTestServer> httpServer = adoptPtr(new EWK2UnitTestServer);
     httpServer->run(serverCallback);
 

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

Reply via email to