<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[169367] trunk/Source/WebKit2</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/169367">169367</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-26 21:52:36 -0700 (Mon, 26 May 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>[EFL][WK2] Fix EWK2BackForwardListTest test fails.
https://bugs.webkit.org/show_bug.cgi?id=133171

Patch by Shivakumar JM &lt;shiva.jm@samsung.com&gt; 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=&quot;localhost,127.0.0.1&quot;, 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):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflteststest_ewk2_back_forward_listcpp">trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_back_forward_list.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (169366 => 169367)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2014-05-26  Shivakumar JM  &lt;shiva.jm@samsung.com&gt;
</span><span class="cx"> 
</span><ins>+        [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=&quot;localhost,127.0.0.1&quot;, 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  &lt;shiva.jm@samsung.com&gt;
+
</ins><span class="cx">         [EFL][WK2] Fix code style check errors in EFL API tests.
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=133170
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflteststest_ewk2_back_forward_listcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_back_forward_list.cpp (169366 => 169367)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -100,14 +100,13 @@
</span><span class="cx"> 
</span><span class="cx"> TEST_F(EWK2BackForwardListTest, ewk_back_forward_list_previous_item_get)
</span><span class="cx"> {
</span><del>-    std::unique_ptr&lt;EWK2UnitTestServer&gt; httpServer = std::make_unique&lt;EWK2UnitTestServer&gt;();
-    httpServer-&gt;run(serverCallbackNavigation);
-
-    WKEinaSharedString url1 = urlFromTitle(httpServer.get(), title1);
-    ASSERT_TRUE(loadUrlSync(url1));
</del><ins>+    WKEinaSharedString url1 = environment-&gt;urlForResource(&quot;/Page1.html&quot;).data();
+    ewk_view_url_set(webView(), url1);
+    ASSERT_TRUE(waitUntilTitleChangedTo(title1));
</ins><span class="cx">     ASSERT_STREQ(title1, ewk_view_title_get(webView()));
</span><span class="cx"> 
</span><del>-    ASSERT_TRUE(loadUrlSync(urlFromTitle(httpServer.get(), title2)));
</del><ins>+    ewk_view_url_set(webView(), environment-&gt;urlForResource(&quot;/Page2.html&quot;).data());
+    ASSERT_TRUE(waitUntilTitleChangedTo(title2));
</ins><span class="cx">     ASSERT_STREQ(title2, ewk_view_title_get(webView()));
</span><span class="cx"> 
</span><span class="cx">     Ewk_Back_Forward_List* backForwardList = ewk_view_back_forward_list_get(webView());
</span><span class="lines">@@ -122,14 +121,13 @@
</span><span class="cx"> 
</span><span class="cx"> TEST_F(EWK2BackForwardListTest, ewk_back_forward_list_next_item_get)
</span><span class="cx"> {
</span><del>-    std::unique_ptr&lt;EWK2UnitTestServer&gt; httpServer = std::make_unique&lt;EWK2UnitTestServer&gt;();
-    httpServer-&gt;run(serverCallbackNavigation);
-
-    ASSERT_TRUE(loadUrlSync(urlFromTitle(httpServer.get(), title1)));
</del><ins>+    ewk_view_url_set(webView(), environment-&gt;urlForResource(&quot;/Page1.html&quot;).data());
+    ASSERT_TRUE(waitUntilTitleChangedTo(title1));
</ins><span class="cx">     ASSERT_STREQ(title1, ewk_view_title_get(webView()));
</span><span class="cx"> 
</span><del>-    WKEinaSharedString url2 = urlFromTitle(httpServer.get(), title2);
-    ASSERT_TRUE(loadUrlSync(url2));
</del><ins>+    WKEinaSharedString url2 = environment-&gt;urlForResource(&quot;/Page2.html&quot;).data();
+    ewk_view_url_set(webView(), url2);
+    ASSERT_TRUE(waitUntilTitleChangedTo(title2));
</ins><span class="cx">     ASSERT_STREQ(title2, ewk_view_title_get(webView()));
</span><span class="cx"> 
</span><span class="cx">     // Go back to Page1.
</span><span class="lines">@@ -148,14 +146,13 @@
</span><span class="cx"> 
</span><span class="cx"> TEST_F(EWK2BackForwardListTest, ewk_back_forward_list_item_at_index_get)
</span><span class="cx"> {
</span><del>-    std::unique_ptr&lt;EWK2UnitTestServer&gt; httpServer = std::make_unique&lt;EWK2UnitTestServer&gt;();
-    httpServer-&gt;run(serverCallbackNavigation);
-
-    WKEinaSharedString url1 = urlFromTitle(httpServer.get(), title1);
-    ASSERT_TRUE(loadUrlSync(url1));
</del><ins>+    WKEinaSharedString url1 = environment-&gt;urlForResource(&quot;/Page1.html&quot;).data();
+    ewk_view_url_set(webView(), url1);
+    ASSERT_TRUE(waitUntilTitleChangedTo(title1));
</ins><span class="cx">     ASSERT_STREQ(title1, ewk_view_title_get(webView()));
</span><span class="cx"> 
</span><del>-    ASSERT_TRUE(loadUrlSync(urlFromTitle(httpServer.get(), title2)));
</del><ins>+    ewk_view_url_set(webView(), environment-&gt;urlForResource(&quot;/Page2.html&quot;).data());
+    ASSERT_TRUE(waitUntilTitleChangedTo(title2));
</ins><span class="cx">     ASSERT_STREQ(title2, ewk_view_title_get(webView()));
</span><span class="cx"> 
</span><span class="cx">     Ewk_Back_Forward_List* backForwardList = ewk_view_back_forward_list_get(webView());
</span><span class="lines">@@ -173,13 +170,12 @@
</span><span class="cx"> 
</span><span class="cx"> TEST_F(EWK2BackForwardListTest, ewk_back_forward_list_count)
</span><span class="cx"> {
</span><del>-    std::unique_ptr&lt;EWK2UnitTestServer&gt; httpServer = std::make_unique&lt;EWK2UnitTestServer&gt;();
-    httpServer-&gt;run(serverCallbackNavigation);
-
-    ASSERT_TRUE(loadUrlSync(urlFromTitle(httpServer.get(), title1)));
</del><ins>+    ewk_view_url_set(webView(), environment-&gt;urlForResource(&quot;/Page1.html&quot;).data());
+    ASSERT_TRUE(waitUntilTitleChangedTo(title1));
</ins><span class="cx">     ASSERT_STREQ(title1, ewk_view_title_get(webView()));
</span><span class="cx"> 
</span><del>-    ASSERT_TRUE(loadUrlSync(urlFromTitle(httpServer.get(), title2)));
</del><ins>+    ewk_view_url_set(webView(), environment-&gt;urlForResource(&quot;/Page2.html&quot;).data());
+    ASSERT_TRUE(waitUntilTitleChangedTo(title2));
</ins><span class="cx">     ASSERT_STREQ(title2, ewk_view_title_get(webView()));
</span><span class="cx"> 
</span><span class="cx">     Ewk_Back_Forward_List* backForwardList = ewk_view_back_forward_list_get(webView());
</span><span class="lines">@@ -190,18 +186,18 @@
</span><span class="cx"> 
</span><span class="cx"> TEST_F(EWK2BackForwardListTest, ewk_back_forward_list_n_back_items_copy)
</span><span class="cx"> {
</span><del>-    std::unique_ptr&lt;EWK2UnitTestServer&gt; httpServer = std::make_unique&lt;EWK2UnitTestServer&gt;();
-    httpServer-&gt;run(serverCallbackNavigation);
-
-    WKEinaSharedString url1 = urlFromTitle(httpServer.get(), title1);
-    ASSERT_TRUE(loadUrlSync(url1));
</del><ins>+    WKEinaSharedString url1 = environment-&gt;urlForResource(&quot;/Page1.html&quot;).data();
+    ewk_view_url_set(webView(), url1);
+    ASSERT_TRUE(waitUntilTitleChangedTo(title1));
</ins><span class="cx">     ASSERT_STREQ(title1, ewk_view_title_get(webView()));
</span><span class="cx"> 
</span><del>-    WKEinaSharedString url2 = urlFromTitle(httpServer.get(), title2);
-    ASSERT_TRUE(loadUrlSync(url2));
</del><ins>+    WKEinaSharedString url2 = environment-&gt;urlForResource(&quot;/Page2.html&quot;).data();
+    ewk_view_url_set(webView(), url2);
+    ASSERT_TRUE(waitUntilTitleChangedTo(title2));
</ins><span class="cx">     ASSERT_STREQ(title2, ewk_view_title_get(webView()));
</span><span class="cx"> 
</span><del>-    ASSERT_TRUE(loadUrlSync(urlFromTitle(httpServer.get(), title3)));
</del><ins>+    ewk_view_url_set(webView(), environment-&gt;urlForResource(&quot;/Page3.html&quot;).data());
+    ASSERT_TRUE(waitUntilTitleChangedTo(title3));
</ins><span class="cx">     ASSERT_STREQ(title3, ewk_view_title_get(webView()));
</span><span class="cx"> 
</span><span class="cx">     Ewk_Back_Forward_List* backForwardList = ewk_view_back_forward_list_get(webView());
</span><span class="lines">@@ -227,18 +223,18 @@
</span><span class="cx"> 
</span><span class="cx"> TEST_F(EWK2BackForwardListTest, ewk_back_forward_list_n_forward_items_copy)
</span><span class="cx"> {
</span><del>-    std::unique_ptr&lt;EWK2UnitTestServer&gt; httpServer = std::make_unique&lt;EWK2UnitTestServer&gt;();
-    httpServer-&gt;run(serverCallbackNavigation);
-
-    ASSERT_TRUE(loadUrlSync(urlFromTitle(httpServer.get(), title1)));
</del><ins>+    ewk_view_url_set(webView(), environment-&gt;urlForResource(&quot;/Page1.html&quot;).data());
+    ASSERT_TRUE(waitUntilTitleChangedTo(title1));
</ins><span class="cx">     ASSERT_STREQ(title1, ewk_view_title_get(webView()));
</span><span class="cx"> 
</span><del>-    WKEinaSharedString url2 = urlFromTitle(httpServer.get(), title2);
-    ASSERT_TRUE(loadUrlSync(url2));
</del><ins>+    WKEinaSharedString url2 = environment-&gt;urlForResource(&quot;/Page2.html&quot;).data();
+    ewk_view_url_set(webView(), url2);
+    ASSERT_TRUE(waitUntilTitleChangedTo(title2));
</ins><span class="cx">     ASSERT_STREQ(title2, ewk_view_title_get(webView()));
</span><span class="cx"> 
</span><del>-    WKEinaSharedString url3 = urlFromTitle(httpServer.get(), title3);
-    ASSERT_TRUE(loadUrlSync(url3));
</del><ins>+    WKEinaSharedString url3 = environment-&gt;urlForResource(&quot;/Page3.html&quot;).data();
+    ewk_view_url_set(webView(), url3);
+    ASSERT_TRUE(waitUntilTitleChangedTo(title3));
</ins><span class="cx">     ASSERT_STREQ(title3, ewk_view_title_get(webView()));
</span><span class="cx"> 
</span><span class="cx">     // Go back to Page1.
</span></span></pre>
</div>
</div>

</body>
</html>