<!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>[169801] 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/169801">169801</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-06-11 04:56:05 -0700 (Wed, 11 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EFL][WK2] Add missing test cases for EWK2ViewTest.
https://bugs.webkit.org/show_bug.cgi?id=133715
Patch by Shivakumar JM <shiva.jm@samsung.com> on 2014-06-11
Reviewed by Gyuyoung Kim.
Add missing test cases for ewk_view.h APIs, ewk_view_stop(), ewk_view_html_string_load(), ewk_view_theme_get(),
ewk_view_feed_touch_event(), ewk_view_text_find_highlight_clear(), ewk_view_text_find(), ewk_view_text_matches_count(),
ewk_view_page_contents_get(), ewk_view_script_execute().
* PlatformEfl.cmake:
* UIProcess/API/efl/tests/test_ewk2_view.cpp:
(TEST_F):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformEflcmake">trunk/Source/WebKit2/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflteststest_ewk2_viewcpp">trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (169800 => 169801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-11 10:46:24 UTC (rev 169800)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-11 11:56:05 UTC (rev 169801)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-06-11 Shivakumar JM <shiva.jm@samsung.com>
+
+ [EFL][WK2] Add missing test cases for EWK2ViewTest.
+ https://bugs.webkit.org/show_bug.cgi?id=133715
+
+ Reviewed by Gyuyoung Kim.
+
+ Add missing test cases for ewk_view.h APIs, ewk_view_stop(), ewk_view_html_string_load(), ewk_view_theme_get(),
+ ewk_view_feed_touch_event(), ewk_view_text_find_highlight_clear(), ewk_view_text_find(), ewk_view_text_matches_count(),
+ ewk_view_page_contents_get(), ewk_view_script_execute().
+
+ * PlatformEfl.cmake:
+ * UIProcess/API/efl/tests/test_ewk2_view.cpp:
+ (TEST_F):
+
</ins><span class="cx"> 2014-06-11 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Use a different user agent string depending on the site
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformEfl.cmake (169800 => 169801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformEfl.cmake 2014-06-11 10:46:24 UTC (rev 169800)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2014-06-11 11:56:05 UTC (rev 169801)
</span><span class="lines">@@ -485,6 +485,7 @@
</span><span class="cx"> test_ewk2_ssl
</span><span class="cx"> test_ewk2_storage_manager
</span><span class="cx"> test_ewk2_window_features
</span><ins>+ test_ewk2_view
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> # Skipped unit tests list:
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflteststest_ewk2_viewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp (169800 => 169801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp 2014-06-11 10:46:24 UTC (rev 169800)
+++ trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp 2014-06-11 11:56:05 UTC (rev 169801)
</span><span class="lines">@@ -252,6 +252,8 @@
</span><span class="cx"> {
</span><span class="cx"> Evas_Object* view = ewk_view_add(canvas());
</span><span class="cx"> ASSERT_EQ(ewk_context_default_get(), ewk_view_context_get(view));
</span><ins>+
+ EXPECT_TRUE(ewk_view_stop(view));
</ins><span class="cx"> evas_object_del(view);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -291,6 +293,10 @@
</span><span class="cx"> ewk_view_html_string_load(webView(), "<html><head><title>Bar</title></head><body>Foo</body></html>", 0, 0);
</span><span class="cx"> ASSERT_TRUE(waitUntilTitleChangedTo("Bar"));
</span><span class="cx"> ASSERT_STREQ("Bar", ewk_view_title_get(webView()));
</span><ins>+
+ // Checking in case of null for html and webview
+ ASSERT_FALSE(ewk_view_html_string_load(0, "<html><head><title>Foo</title></head><body>Bar</body></html>", 0, 0));
+ ASSERT_FALSE(ewk_view_html_string_load(webView(), 0, 0, 0));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST_F(EWK2ViewTest, ewk_view_navigation)
</span><span class="lines">@@ -403,6 +409,8 @@
</span><span class="cx"> ewk_view_theme_set(webView(), environment->pathForTheme("big_button_theme.edj").data());
</span><span class="cx"> ewk_view_html_string_load(webView(), buttonHTML, "file:///", 0);
</span><span class="cx"> EXPECT_TRUE(waitUntilTitleChangedTo("299")); // button of big button theme has 299px as padding (15 to -285)
</span><ins>+
+ EXPECT_STREQ(environment->pathForTheme("big_button_theme.edj").data(), ewk_view_theme_get(webView()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST_F(EWK2ViewTest, ewk_view_mouse_events_enabled)
</span><span class="lines">@@ -720,6 +728,10 @@
</span><span class="cx"> ASSERT_TRUE(ewk_view_feed_touch_event(webView(), EWK_TOUCH_CANCEL, points, evas_key_modifier_get(evas_object_evas_get(webView()))));
</span><span class="cx"> points = eina_list_remove(points, &point1);
</span><span class="cx">
</span><ins>+ // Checking in case of null for points and webview
+ EXPECT_FALSE(ewk_view_feed_touch_event(0, EWK_TOUCH_CANCEL, points, evas_key_modifier_get(evas_object_evas_get(webView()))));
+ EXPECT_FALSE(ewk_view_feed_touch_event(webView(), EWK_TOUCH_CANCEL, 0, evas_key_modifier_get(evas_object_evas_get(webView()))));
+
</ins><span class="cx"> eina_list_free(points);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -741,12 +753,24 @@
</span><span class="cx"> ecore_main_loop_iterate();
</span><span class="cx"> EXPECT_EQ(3, matchCount);
</span><span class="cx">
</span><ins>+ EXPECT_TRUE(ewk_view_text_find_highlight_clear(webView()));
+
</ins><span class="cx"> matchCount = -1;
</span><span class="cx"> ewk_view_text_find(webView(), "mango", EWK_FIND_OPTIONS_SHOW_OVERLAY, 100);
</span><span class="cx"> while (matchCount < 0)
</span><span class="cx"> ecore_main_loop_iterate();
</span><span class="cx"> EXPECT_EQ(0, matchCount);
</span><span class="cx">
</span><ins>+ matchCount = -1;
+ ewk_view_text_find(webView(), "banana", EWK_FIND_OPTIONS_SHOW_HIGHLIGHT, 100);
+ while (matchCount < 0)
+ ecore_main_loop_iterate();
+ EXPECT_EQ(2, matchCount);
+
+ // Checking in case of null for text and webview
+ ASSERT_FALSE(ewk_view_text_find(0, "apple", EWK_FIND_OPTIONS_SHOW_OVERLAY, 100));
+ ASSERT_FALSE(ewk_view_text_find(webView(), 0, EWK_FIND_OPTIONS_SHOW_OVERLAY, 100));
+
</ins><span class="cx"> evas_object_smart_callback_del(webView(), "text,found", onTextFound);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -799,6 +823,10 @@
</span><span class="cx"> ecore_main_loop_iterate();
</span><span class="cx"> EXPECT_EQ(-1, matchCount);
</span><span class="cx">
</span><ins>+ // Checking in case of null for text and webview
+ EXPECT_FALSE(ewk_view_text_matches_count(0, "apple", EWK_FIND_OPTIONS_NONE, 100));
+ EXPECT_FALSE(ewk_view_text_matches_count(webView(), 0, EWK_FIND_OPTIONS_NONE, 100));
+
</ins><span class="cx"> evas_object_smart_callback_del(webView(), "text,found", onTextFound);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1016,6 +1044,11 @@
</span><span class="cx"> obtainedPageContents = false;
</span><span class="cx"> ASSERT_TRUE(ewk_view_page_contents_get(webView(), EWK_PAGE_CONTENTS_TYPE_STRING, PageContentsAsStringCallback, 0));
</span><span class="cx"> waitUntilTrue(obtainedPageContents);
</span><ins>+
+ // Checking in case of null for callback and webview
+ EXPECT_FALSE(ewk_view_page_contents_get(webView(), EWK_PAGE_CONTENTS_TYPE_STRING, 0, 0));
+ EXPECT_FALSE(ewk_view_page_contents_get(0, EWK_PAGE_CONTENTS_TYPE_STRING, PageContentsAsStringCallback, 0));
+ EXPECT_FALSE(ewk_view_page_contents_get(webView(), static_cast<Ewk_Page_Contents_Type>(2), PageContentsAsStringCallback, 0));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST_F(EWK2ViewTest, ewk_view_user_agent)
</span><span class="lines">@@ -1076,6 +1109,10 @@
</span><span class="cx"> waitUntilTrue(scriptExecuteCallbackCalled);
</span><span class="cx"> ASSERT_STREQ("test", eina_strbuf_string_get(result));
</span><span class="cx">
</span><ins>+ // Checking in case of null for script and webview
+ EXPECT_FALSE(ewk_view_script_execute(0, getDataScript, scriptExecuteCallback, static_cast<void*>(result)));
+ EXPECT_FALSE(ewk_view_script_execute(webView(), 0, scriptExecuteCallback, static_cast<void*>(result)));
+
</ins><span class="cx"> eina_strbuf_free(result);
</span><span class="cx">
</span><span class="cx"> ASSERT_FALSE(ewk_view_script_execute(webView(), 0, 0, 0));
</span></span></pre>
</div>
</div>
</body>
</html>