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

Mon, 26 May 2014 21:53:19 -0700

Title: [169367] trunk/Source/WebKit2
Revision
169367
Author
commit-qu...@webkit.org
Date
2014-05-26 21:52:36 -0700 (Mon, 26 May 2014)

Log Message

[EFL][WK2] Fix EWK2BackForwardListTest test fails.
https://bugs.webkit.org/show_bug.cgi?id=133171

Patch by Shivakumar JM <shiva...@samsung.com> on 2014-05-26
Reviewed by Gyuyoung Kim.

Use local test html pages instead of EWK2UnitTestServer, call ewk_view_url_set() to load test html pages.
Since even after setting no_proxy="localhost,127.0.0.1", still test server was unable to load the test
html pages for ewk2_back_forward_list tests, so changed to use local html pages.

* UIProcess/API/efl/tests/test_ewk2_back_forward_list.cpp:
(TEST_F):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (169366 => 169367)


--- trunk/Source/WebKit2/ChangeLog	2014-05-27 04:32:33 UTC (rev 169366)
+++ trunk/Source/WebKit2/ChangeLog	2014-05-27 04:52:36 UTC (rev 169367)
@@ -1,5 +1,19 @@
 2014-05-26  Shivakumar JM  <shiva...@samsung.com>
 
+        [EFL][WK2] Fix EWK2BackForwardListTest test fails.
+        https://bugs.webkit.org/show_bug.cgi?id=133171
+
+        Reviewed by Gyuyoung Kim.
+
+        Use local test html pages instead of EWK2UnitTestServer, call ewk_view_url_set() to load test html pages.
+        Since even after setting no_proxy="localhost,127.0.0.1", still test server was unable to load the test 
+        html pages for ewk2_back_forward_list tests, so changed to use local html pages.
+
+        * UIProcess/API/efl/tests/test_ewk2_back_forward_list.cpp:
+        (TEST_F):
+
+2014-05-26  Shivakumar JM  <shiva...@samsung.com>
+
         [EFL][WK2] Fix code style check errors in EFL API tests.
         https://bugs.webkit.org/show_bug.cgi?id=133170

Modified: trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_back_forward_list.cpp (169366 => 169367)


--- trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_back_forward_list.cpp	2014-05-27 04:32:33 UTC (rev 169366)
+++ trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_back_forward_list.cpp	2014-05-27 04:52:36 UTC (rev 169367)
@@ -100,14 +100,13 @@
 
 TEST_F(EWK2BackForwardListTest, ewk_back_forward_list_previous_item_get)
 {
-    std::unique_ptr<EWK2UnitTestServer> httpServer = std::make_unique<EWK2UnitTestServer>();
-    httpServer->run(serverCallbackNavigation);
-
-    WKEinaSharedString url1 = urlFromTitle(httpServer.get(), title1);
-    ASSERT_TRUE(loadUrlSync(url1));
+    WKEinaSharedString url1 = environment->urlForResource("/Page1.html").data();
+    ewk_view_url_set(webView(), url1);
+    ASSERT_TRUE(waitUntilTitleChangedTo(title1));
     ASSERT_STREQ(title1, ewk_view_title_get(webView()));
 
-    ASSERT_TRUE(loadUrlSync(urlFromTitle(httpServer.get(), title2)));
+    ewk_view_url_set(webView(), environment->urlForResource("/Page2.html").data());
+    ASSERT_TRUE(waitUntilTitleChangedTo(title2));
     ASSERT_STREQ(title2, ewk_view_title_get(webView()));
 
     Ewk_Back_Forward_List* backForwardList = ewk_view_back_forward_list_get(webView());
@@ -122,14 +121,13 @@
 
 TEST_F(EWK2BackForwardListTest, ewk_back_forward_list_next_item_get)
 {
-    std::unique_ptr<EWK2UnitTestServer> httpServer = std::make_unique<EWK2UnitTestServer>();
-    httpServer->run(serverCallbackNavigation);
-
-    ASSERT_TRUE(loadUrlSync(urlFromTitle(httpServer.get(), title1)));
+    ewk_view_url_set(webView(), environment->urlForResource("/Page1.html").data());
+    ASSERT_TRUE(waitUntilTitleChangedTo(title1));
     ASSERT_STREQ(title1, ewk_view_title_get(webView()));
 
-    WKEinaSharedString url2 = urlFromTitle(httpServer.get(), title2);
-    ASSERT_TRUE(loadUrlSync(url2));
+    WKEinaSharedString url2 = environment->urlForResource("/Page2.html").data();
+    ewk_view_url_set(webView(), url2);
+    ASSERT_TRUE(waitUntilTitleChangedTo(title2));
     ASSERT_STREQ(title2, ewk_view_title_get(webView()));
 
     // Go back to Page1.
@@ -148,14 +146,13 @@
 
 TEST_F(EWK2BackForwardListTest, ewk_back_forward_list_item_at_index_get)
 {
-    std::unique_ptr<EWK2UnitTestServer> httpServer = std::make_unique<EWK2UnitTestServer>();
-    httpServer->run(serverCallbackNavigation);
-
-    WKEinaSharedString url1 = urlFromTitle(httpServer.get(), title1);
-    ASSERT_TRUE(loadUrlSync(url1));
+    WKEinaSharedString url1 = environment->urlForResource("/Page1.html").data();
+    ewk_view_url_set(webView(), url1);
+    ASSERT_TRUE(waitUntilTitleChangedTo(title1));
     ASSERT_STREQ(title1, ewk_view_title_get(webView()));
 
-    ASSERT_TRUE(loadUrlSync(urlFromTitle(httpServer.get(), title2)));
+    ewk_view_url_set(webView(), environment->urlForResource("/Page2.html").data());
+    ASSERT_TRUE(waitUntilTitleChangedTo(title2));
     ASSERT_STREQ(title2, ewk_view_title_get(webView()));
 
     Ewk_Back_Forward_List* backForwardList = ewk_view_back_forward_list_get(webView());
@@ -173,13 +170,12 @@
 
 TEST_F(EWK2BackForwardListTest, ewk_back_forward_list_count)
 {
-    std::unique_ptr<EWK2UnitTestServer> httpServer = std::make_unique<EWK2UnitTestServer>();
-    httpServer->run(serverCallbackNavigation);
-
-    ASSERT_TRUE(loadUrlSync(urlFromTitle(httpServer.get(), title1)));
+    ewk_view_url_set(webView(), environment->urlForResource("/Page1.html").data());
+    ASSERT_TRUE(waitUntilTitleChangedTo(title1));
     ASSERT_STREQ(title1, ewk_view_title_get(webView()));
 
-    ASSERT_TRUE(loadUrlSync(urlFromTitle(httpServer.get(), title2)));
+    ewk_view_url_set(webView(), environment->urlForResource("/Page2.html").data());
+    ASSERT_TRUE(waitUntilTitleChangedTo(title2));
     ASSERT_STREQ(title2, ewk_view_title_get(webView()));
 
     Ewk_Back_Forward_List* backForwardList = ewk_view_back_forward_list_get(webView());
@@ -190,18 +186,18 @@
 
 TEST_F(EWK2BackForwardListTest, ewk_back_forward_list_n_back_items_copy)
 {
-    std::unique_ptr<EWK2UnitTestServer> httpServer = std::make_unique<EWK2UnitTestServer>();
-    httpServer->run(serverCallbackNavigation);
-
-    WKEinaSharedString url1 = urlFromTitle(httpServer.get(), title1);
-    ASSERT_TRUE(loadUrlSync(url1));
+    WKEinaSharedString url1 = environment->urlForResource("/Page1.html").data();
+    ewk_view_url_set(webView(), url1);
+    ASSERT_TRUE(waitUntilTitleChangedTo(title1));
     ASSERT_STREQ(title1, ewk_view_title_get(webView()));
 
-    WKEinaSharedString url2 = urlFromTitle(httpServer.get(), title2);
-    ASSERT_TRUE(loadUrlSync(url2));
+    WKEinaSharedString url2 = environment->urlForResource("/Page2.html").data();
+    ewk_view_url_set(webView(), url2);
+    ASSERT_TRUE(waitUntilTitleChangedTo(title2));
     ASSERT_STREQ(title2, ewk_view_title_get(webView()));
 
-    ASSERT_TRUE(loadUrlSync(urlFromTitle(httpServer.get(), title3)));
+    ewk_view_url_set(webView(), environment->urlForResource("/Page3.html").data());
+    ASSERT_TRUE(waitUntilTitleChangedTo(title3));
     ASSERT_STREQ(title3, ewk_view_title_get(webView()));
 
     Ewk_Back_Forward_List* backForwardList = ewk_view_back_forward_list_get(webView());
@@ -227,18 +223,18 @@
 
 TEST_F(EWK2BackForwardListTest, ewk_back_forward_list_n_forward_items_copy)
 {
-    std::unique_ptr<EWK2UnitTestServer> httpServer = std::make_unique<EWK2UnitTestServer>();
-    httpServer->run(serverCallbackNavigation);
-
-    ASSERT_TRUE(loadUrlSync(urlFromTitle(httpServer.get(), title1)));
+    ewk_view_url_set(webView(), environment->urlForResource("/Page1.html").data());
+    ASSERT_TRUE(waitUntilTitleChangedTo(title1));
     ASSERT_STREQ(title1, ewk_view_title_get(webView()));
 
-    WKEinaSharedString url2 = urlFromTitle(httpServer.get(), title2);
-    ASSERT_TRUE(loadUrlSync(url2));
+    WKEinaSharedString url2 = environment->urlForResource("/Page2.html").data();
+    ewk_view_url_set(webView(), url2);
+    ASSERT_TRUE(waitUntilTitleChangedTo(title2));
     ASSERT_STREQ(title2, ewk_view_title_get(webView()));
 
-    WKEinaSharedString url3 = urlFromTitle(httpServer.get(), title3);
-    ASSERT_TRUE(loadUrlSync(url3));
+    WKEinaSharedString url3 = environment->urlForResource("/Page3.html").data();
+    ewk_view_url_set(webView(), url3);
+    ASSERT_TRUE(waitUntilTitleChangedTo(title3));
     ASSERT_STREQ(title3, ewk_view_title_get(webView()));
 
     // Go back to Page1.

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to