<!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>[152773] 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/152773">152773</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-07-17 00:27:41 -0700 (Wed, 17 Jul 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>[EFL][WK2] EWK2WindowFeaturesTest should be defined by inheriting from EWK2UnitTestBase.
https://bugs.webkit.org/show_bug.cgi?id=118780

Patch by Dong-Gwan Kim &lt;donggwan.kim@samsung.com&gt; 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_window_features.cpp:
(EWK2WindowFeaturesTest::createDefaultWindow):
(EWK2WindowFeaturesTest::createWindow):
(TEST_F):</pre>

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

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (152772 => 152773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2013-07-17 07:26:27 UTC (rev 152772)
+++ trunk/Source/WebKit2/ChangeLog        2013-07-17 07:27:41 UTC (rev 152773)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2013-07-17  Dong-Gwan Kim  &lt;donggwan.kim@samsung.com&gt;
</span><span class="cx"> 
</span><ins>+        [EFL][WK2] EWK2WindowFeaturesTest should be defined by inheriting from EWK2UnitTestBase.
+        https://bugs.webkit.org/show_bug.cgi?id=118780
+
+        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_window_features.cpp:
+        (EWK2WindowFeaturesTest::createDefaultWindow):
+        (EWK2WindowFeaturesTest::createWindow):
+        (TEST_F):
+
+2013-07-17  Dong-Gwan Kim  &lt;donggwan.kim@samsung.com&gt;
+
</ins><span class="cx">         [EFL][WK2] EWK2ViewTest should be defined by inheriting from EWK2UnitTestBase.
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=118779
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflteststest_ewk2_window_featurescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_window_features.cpp (152772 => 152773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_window_features.cpp        2013-07-17 07:26:27 UTC (rev 152772)
+++ trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_window_features.cpp        2013-07-17 07:27:41 UTC (rev 152773)
</span><span class="lines">@@ -33,38 +33,62 @@
</span><span class="cx"> using namespace EWK2UnitTest;
</span><span class="cx"> using namespace WebCore;
</span><span class="cx"> 
</span><del>-static Evas_Object* createDefaultWindow(Ewk_View_Smart_Data* smartData, const char*, const Ewk_Window_Features* windowFeatures)
-{
-    // default values of WebCore:WindowFeatures()
-    // - menuBarVisible(true)
-    // - statusBarVisible(true)
-    // - toolBarVisible(true)
-    // - locationBarVisible(true)
-    // - scrollbarsVisible(true)
-    // - resizable(true)
-    // - fullscreen(false)
</del><ins>+class EWK2WindowFeaturesTest : public EWK2UnitTestBase {
+public:
+    static Evas_Object* createDefaultWindow(Ewk_View_Smart_Data* smartData, const char*, const Ewk_Window_Features* windowFeatures)
+    {
+        // default values of WebCore:WindowFeatures()
+        // - menuBarVisible(true)
+        // - statusBarVisible(true)
+        // - toolBarVisible(true)
+        // - locationBarVisible(true)
+        // - scrollbarsVisible(true)
+        // - resizable(true)
+        // - fullscreen(false)
</ins><span class="cx"> 
</span><del>-    EXPECT_TRUE(ewk_window_features_toolbar_visible_get(windowFeatures));
-    EXPECT_TRUE(ewk_window_features_statusbar_visible_get(windowFeatures));
-    EXPECT_TRUE(ewk_window_features_scrollbars_visible_get(windowFeatures));
-    EXPECT_TRUE(ewk_window_features_menubar_visible_get(windowFeatures));
-    EXPECT_TRUE(ewk_window_features_locationbar_visible_get(windowFeatures));
-    EXPECT_TRUE(ewk_window_features_resizable_get(windowFeatures));
</del><ins>+        EXPECT_TRUE(ewk_window_features_toolbar_visible_get(windowFeatures));
+        EXPECT_TRUE(ewk_window_features_statusbar_visible_get(windowFeatures));
+        EXPECT_TRUE(ewk_window_features_scrollbars_visible_get(windowFeatures));
+        EXPECT_TRUE(ewk_window_features_menubar_visible_get(windowFeatures));
+        EXPECT_TRUE(ewk_window_features_locationbar_visible_get(windowFeatures));
+        EXPECT_TRUE(ewk_window_features_resizable_get(windowFeatures));
</ins><span class="cx"> 
</span><del>-    EXPECT_FALSE(ewk_window_features_fullscreen_get(windowFeatures));
</del><ins>+        EXPECT_FALSE(ewk_window_features_fullscreen_get(windowFeatures));
</ins><span class="cx"> 
</span><del>-    int x, y, width, height;
-    ewk_window_features_geometry_get(windowFeatures, &amp;x, &amp;y, &amp;width, &amp;height);
</del><ins>+        int x, y, width, height;
+        ewk_window_features_geometry_get(windowFeatures, &amp;x, &amp;y, &amp;width, &amp;height);
</ins><span class="cx"> 
</span><del>-    EXPECT_EQ(0, x);
-    EXPECT_EQ(0, y);
-    EXPECT_EQ(0, width);
-    EXPECT_EQ(0, height);
</del><ins>+        EXPECT_EQ(0, x);
+        EXPECT_EQ(0, y);
+        EXPECT_EQ(0, width);
+        EXPECT_EQ(0, height);
</ins><span class="cx"> 
</span><del>-    return 0;
-}
</del><ins>+        return 0;
+    }
</ins><span class="cx"> 
</span><del>-TEST_F(EWK2UnitTestBase, ewk_window_features_default_property_get)
</del><ins>+    static Evas_Object* createWindow(Ewk_View_Smart_Data *smartData, const char*, const Ewk_Window_Features *windowFeatures)
+    {
+        EXPECT_FALSE(ewk_window_features_toolbar_visible_get(windowFeatures));
+        EXPECT_TRUE(ewk_window_features_statusbar_visible_get(windowFeatures));
+        EXPECT_TRUE(ewk_window_features_scrollbars_visible_get(windowFeatures));
+        EXPECT_FALSE(ewk_window_features_menubar_visible_get(windowFeatures));
+        EXPECT_FALSE(ewk_window_features_locationbar_visible_get(windowFeatures));
+        EXPECT_TRUE(ewk_window_features_resizable_get(windowFeatures));
+        EXPECT_FALSE(ewk_window_features_fullscreen_get(windowFeatures));
+
+        int x, y, width, height;
+        ewk_window_features_geometry_get(windowFeatures, &amp;x, &amp;y, &amp;width, &amp;height);
+
+        EXPECT_EQ(100, x);
+        EXPECT_EQ(150, y);
+        EXPECT_EQ(400, width);
+        EXPECT_EQ(400, height);
+
+        return 0;
+    }
+};
+
+TEST_F(EWK2WindowFeaturesTest, ewk_window_features_default_property_get)
</ins><span class="cx"> {
</span><span class="cx">     Evas_Object* view = webView();
</span><span class="cx"> 
</span><span class="lines">@@ -76,29 +100,8 @@
</span><span class="cx">     ASSERT_TRUE(waitUntilLoadFinished());
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-static Evas_Object* createWindow(Ewk_View_Smart_Data *smartData, const char*, const Ewk_Window_Features *windowFeatures)
</del><ins>+TEST_F(EWK2WindowFeaturesTest, ewk_window_features_property_get)
</ins><span class="cx"> {
</span><del>-    EXPECT_FALSE(ewk_window_features_toolbar_visible_get(windowFeatures));
-    EXPECT_TRUE(ewk_window_features_statusbar_visible_get(windowFeatures));
-    EXPECT_TRUE(ewk_window_features_scrollbars_visible_get(windowFeatures));
-    EXPECT_FALSE(ewk_window_features_menubar_visible_get(windowFeatures));
-    EXPECT_FALSE(ewk_window_features_locationbar_visible_get(windowFeatures));
-    EXPECT_TRUE(ewk_window_features_resizable_get(windowFeatures));
-    EXPECT_FALSE(ewk_window_features_fullscreen_get(windowFeatures));
-
-    int x, y, width, height;
-    ewk_window_features_geometry_get(windowFeatures, &amp;x, &amp;y, &amp;width, &amp;height);
-
-    EXPECT_EQ(100, x);
-    EXPECT_EQ(150, y);
-    EXPECT_EQ(400, width);
-    EXPECT_EQ(400, height);
-
-    return 0;
-}
-
-TEST_F(EWK2UnitTestBase, ewk_window_features_property_get)
-{
</del><span class="cx">     Evas_Object* view = webView();
</span><span class="cx"> 
</span><span class="cx">     const char windowHTML[] = &quot;&lt;html&gt;&lt;body onLoad=\&quot;window.open('', '', 'left=100,top=150,width=400,height=400,location=no,menubar=no,status=yes,toolbar=no,scrollbars=yes,resizable=yes,fullscreen=no');\&quot;&gt;&lt;/body&gt;&lt;/html&gt;&quot;;
</span></span></pre>
</div>
</div>

</body>
</html>