<!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>[160540] 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/160540">160540</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-13 02:24:37 -0800 (Fri, 13 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Add a unit tests to WebKit2 to test node names
https://bugs.webkit.org/show_bug.cgi?id=125686
Reviewed by Gustavo Noronha Silva.
* UIProcess/API/gtk/tests/DOMNodeTest.cpp:
(WebKitDOMNodeTest::testTagNames):
(WebKitDOMNodeTest::runTest):
(registerTests):
* UIProcess/API/gtk/tests/TestDOMNode.cpp:
(testWebKitDOMNodeTagNames):
(beforeAll):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtktestsDOMNodeTestcpp">trunk/Source/WebKit2/UIProcess/API/gtk/tests/DOMNodeTest.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtktestsTestDOMNodecpp">trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestDOMNode.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160539 => 160540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-13 09:56:26 UTC (rev 160539)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-13 10:24:37 UTC (rev 160540)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2013-12-13 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Add a unit tests to WebKit2 to test node names
+ https://bugs.webkit.org/show_bug.cgi?id=125686
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * UIProcess/API/gtk/tests/DOMNodeTest.cpp:
+ (WebKitDOMNodeTest::testTagNames):
+ (WebKitDOMNodeTest::runTest):
+ (registerTests):
+ * UIProcess/API/gtk/tests/TestDOMNode.cpp:
+ (testWebKitDOMNodeTagNames):
+ (beforeAll):
+
</ins><span class="cx"> 2013-12-13 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Further GTK WK2 build fixes after r160504.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtktestsDOMNodeTestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/tests/DOMNodeTest.cpp (160539 => 160540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/tests/DOMNodeTest.cpp 2013-12-13 09:56:26 UTC (rev 160539)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/tests/DOMNodeTest.cpp 2013-12-13 10:24:37 UTC (rev 160540)
</span><span class="lines">@@ -22,6 +22,7 @@
</span><span class="cx"> #include "WebProcessTest.h"
</span><span class="cx"> #include <gio/gio.h>
</span><span class="cx"> #include <webkit2/webkit-web-extension.h>
</span><ins>+#include <wtf/gobject/GOwnPtr.h>
</ins><span class="cx">
</span><span class="cx"> class WebKitDOMNodeTest : public WebProcessTest {
</span><span class="cx"> public:
</span><span class="lines">@@ -169,12 +170,36 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ bool testTagNames(WebKitWebExtension* extension, GVariant* args)
+ {
+ static const char* expectedTagNames[] = { "HTML", "HEAD", "BODY", "VIDEO", "SOURCE", "VIDEO", "SOURCE", "INPUT" };
+
+ WebKitWebPage* page = webkit_web_extension_get_page(extension, webPageFromArgs(args));
+ g_assert(WEBKIT_IS_WEB_PAGE(page));
+ WebKitDOMDocument* document = webkit_web_page_get_dom_document(page);
+ g_assert(WEBKIT_DOM_IS_DOCUMENT(document));
+
+ WebKitDOMNodeList* list = webkit_dom_document_get_elements_by_tag_name(document, "*");
+ gulong nodeCount = webkit_dom_node_list_get_length(list);
+ g_assert_cmpuint(nodeCount, ==, G_N_ELEMENTS(expectedTagNames));
+ for (unsigned i = 0; i < nodeCount; i++) {
+ WebKitDOMNode* node = webkit_dom_node_list_item(list, i);
+ g_assert(WEBKIT_DOM_IS_NODE(node));
+ GOwnPtr<char> tagName(webkit_dom_node_get_node_name(node));
+ g_assert_cmpstr(tagName.get(), ==, expectedTagNames[i]);
+ }
+
+ return true;
+ }
+
</ins><span class="cx"> virtual bool runTest(const char* testName, WebKitWebExtension* extension, GVariant* args)
</span><span class="cx"> {
</span><span class="cx"> if (!strcmp(testName, "hierarchy-navigation"))
</span><span class="cx"> return testHierarchyNavigation(extension, args);
</span><span class="cx"> if (!strcmp(testName, "insertion"))
</span><span class="cx"> return testInsertion(extension, args);
</span><ins>+ if (!strcmp(testName, "tag-names"))
+ return testTagNames(extension, args);
</ins><span class="cx">
</span><span class="cx"> g_assert_not_reached();
</span><span class="cx"> return false;
</span><span class="lines">@@ -185,6 +210,7 @@
</span><span class="cx"> {
</span><span class="cx"> REGISTER_TEST(WebKitDOMNodeTest, "WebKitDOMNode/hierarchy-navigation");
</span><span class="cx"> REGISTER_TEST(WebKitDOMNodeTest, "WebKitDOMNode/insertion");
</span><ins>+ REGISTER_TEST(WebKitDOMNodeTest, "WebKitDOMNode/tag-names");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtktestsTestDOMNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestDOMNode.cpp (160539 => 160540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestDOMNode.cpp 2013-12-13 09:56:26 UTC (rev 160539)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestDOMNode.cpp 2013-12-13 10:24:37 UTC (rev 160540)
</span><span class="lines">@@ -50,6 +50,27 @@
</span><span class="cx"> g_assert(testRunner->runTest("WebKitDOMNode", "insertion", g_variant_builder_end(&builder)));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void testWebKitDOMNodeTagNames(WebViewTest* test, gconstpointer)
+{
+ static const char* testHTML = "<html><head></head><body>"
+ "<video id='video' preload='none'>"
+ " <source src='movie.ogg' type='video/ogg'>"
+ " Your browser does not support the video tag."
+ "</video>"
+ "<video id='video2' preload='none'>"
+ " <source src='movie.ogg' type='video/ogg'>"
+ " Your browser does not support the video tag."
+ "</video>"
+ "<input type='hidden' id='test' name='finish' value='false'></body></html>";
+ test->loadHtml(testHTML, 0);
+ test->waitUntilLoadFinished();
+
+ GVariantBuilder builder;
+ g_variant_builder_init(&builder, G_VARIANT_TYPE_VARDICT);
+ g_variant_builder_add(&builder, "{sv}", "pageID", g_variant_new_uint64(webkit_web_view_get_page_id(test->m_webView)));
+ g_assert(testRunner->runTest("WebKitDOMNode", "tag-names", g_variant_builder_end(&builder)));
+}
+
</ins><span class="cx"> void beforeAll()
</span><span class="cx"> {
</span><span class="cx"> testRunner = new WebProcessTestRunner();
</span><span class="lines">@@ -57,6 +78,7 @@
</span><span class="cx">
</span><span class="cx"> WebViewTest::add("WebKitDOMNode", "hierarchy-navigation", testWebKitDOMNodeHierarchyNavigation);
</span><span class="cx"> WebViewTest::add("WebKitDOMNode", "insertion", testWebKitDOMNodeInsertion);
</span><ins>+ WebViewTest::add("WebKitDOMNode", "tag-names", testWebKitDOMNodeTagNames);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void afterAll()
</span></span></pre>
</div>
</div>
</body>
</html>