Attachment 231288 Details for Bug 132817 – Patch

[patch] Patch

bug-132817-20140512213639.patch (text/plain), 4.03 KB, created by Gyuyoung Kim on 2014-05-12 05:37:03 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Gyuyoung Kim

Created: 2014-05-12 05:37:03 PDT

Size: 4.03 KB

patch

obsolete

>Subversion Revision: 168607
>diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
>index d042338a70816825d3b1e6989670e31a8ae01a37..a186df8a8a1978caf9c4fe1965332fb772906f9e 100644
>--- a/Source/WebKit2/ChangeLog
>+++ b/Source/WebKit2/ChangeLog
>@@ -1,3 +1,19 @@
>+2014-05-12  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
>+
>+        [EFL][WK2] Fix ewk_view_navigation test in EWK2ViewTest 
>+        https://bugs.webkit.org/show_bug.cgi?id=132817
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        To load test html pages, call ewk_view_uri_set() instead of EWK2UnitTestServer.
>+        Besides this patch adds test html page for ewk_view_navigation unit test.
>+
>+        * UIProcess/API/efl/tests/resources/Page1.html: Added.
>+        * UIProcess/API/efl/tests/resources/Page2.html: Added.
>+        * UIProcess/API/efl/tests/resources/Page3.html: Added.
>+        * UIProcess/API/efl/tests/test_ewk2_view.cpp:
>+        (TEST_F):
>+
> 2014-05-11  Anders Carlsson  <andersca@apple.com>
> 
>         Remove local storage directory and sandbox extension from WebProcessCreationParameters
>diff --git a/Source/WebKit2/UIProcess/API/efl/tests/resources/Page1.html b/Source/WebKit2/UIProcess/API/efl/tests/resources/Page1.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..2e5050f841e1c2f8c4f4a71dbeff0457e5a4622b
>--- /dev/null
>+++ b/Source/WebKit2/UIProcess/API/efl/tests/resources/Page1.html
>@@ -0,0 +1 @@
>+<html><head><title>Page1</title></head></html>
>diff --git a/Source/WebKit2/UIProcess/API/efl/tests/resources/Page2.html b/Source/WebKit2/UIProcess/API/efl/tests/resources/Page2.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..b11f94b51b56e0455209c562587b20b4aec8030d
>--- /dev/null
>+++ b/Source/WebKit2/UIProcess/API/efl/tests/resources/Page2.html
>@@ -0,0 +1 @@
>+<html><head><title>Page2</title></head></html>
>diff --git a/Source/WebKit2/UIProcess/API/efl/tests/resources/Page3.html b/Source/WebKit2/UIProcess/API/efl/tests/resources/Page3.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..353978f5d17c1bb1e8f3bc5e74a13a73c10eddf4
>--- /dev/null
>+++ b/Source/WebKit2/UIProcess/API/efl/tests/resources/Page3.html
>@@ -0,0 +1 @@
>+<html><head><title>Page3</title></head></html>
>diff --git a/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp b/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp
>index 30634d46bb0505bdc003e49ca8d046995abb4ef7..c50371fde3a008cbe89501f973b01e225ad3c721 100644
>--- a/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp
>+++ b/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp
>@@ -288,17 +288,16 @@ TEST_F(EWK2ViewTest, ewk_view_html_string_load)
> 
> TEST_F(EWK2ViewTest, ewk_view_navigation)
> {
>-    std::unique_ptr<EWK2UnitTestServer> httpServer = std::make_unique<EWK2UnitTestServer>();
>-    httpServer->run(serverCallbackNavigation);
>-
>     // Visit Page1
>-    ASSERT_TRUE(loadUrlSync(httpServer->getURLForPath("/Page1").data()));
>+    ewk_view_url_set(webView(), environment->urlForResource("/Page1.html").data());
>+    ASSERT_TRUE(waitUntilTitleChangedTo("Page1"));
>     ASSERT_STREQ("Page1", ewk_view_title_get(webView()));
>     ASSERT_FALSE(ewk_view_back_possible(webView()));
>     ASSERT_FALSE(ewk_view_forward_possible(webView()));
> 
>     // Visit Page2
>-    ASSERT_TRUE(loadUrlSync(httpServer->getURLForPath("/Page2").data()));
>+    ewk_view_url_set(webView(), environment->urlForResource("/Page2.html").data());
>+    ASSERT_TRUE(waitUntilTitleChangedTo("Page2"));
>     ASSERT_STREQ("Page2", ewk_view_title_get(webView()));
>     ASSERT_TRUE(ewk_view_back_possible(webView()));
>     ASSERT_FALSE(ewk_view_forward_possible(webView()));
>@@ -318,7 +317,7 @@ TEST_F(EWK2ViewTest, ewk_view_navigation)
>     ASSERT_FALSE(ewk_view_forward_possible(webView()));
> 
>     // Visit Page3
>-    ewk_view_url_set(webView(), httpServer->getURLForPath("/Page3").data());
>+    ewk_view_url_set(webView(), environment->urlForResource("/Page3.html").data());
>     ASSERT_TRUE(waitUntilTitleChangedTo("Page3"));
>     ASSERT_STREQ("Page3", ewk_view_title_get(webView()));
>     ASSERT_TRUE(ewk_view_back_possible(webView()));

Actions: View | Formatted Diff | Diff

Attachments on bug 132817: 231288