<!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>[173880] trunk/Tools</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/173880">173880</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-09-23 11:09:02 -0700 (Tue, 23 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>W3C test importer should detect manual and reference tests according their filenames
https://bugs.webkit.org/show_bug.cgi?id=133852
Patch by Youenn Fablet <youenn.fablet@crf.canon.fr> on 2014-09-23
Reviewed by Bem Jones-Bey.
* Scripts/webkitpy/w3c/test_parser.py:
(TestParser.analyze_test): Adding checks based on WPT filename rules.
(TestParser.is_wpt_manualtest): Detecting whether the test is a manual test based on its filename.
(TestParser):
(TestParser.potential_ref_filename): Getting the potential reference filename of a test from its filename.
(TestParser.is_wpt_reftest): Detecting whether the test is a ref test based on its filename.
* Scripts/webkitpy/w3c/test_parser_unittest.py:
(test_analyze_manual_wpt_test): Adding a test for a "-manual.html" file with testharness.js link in it.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpyw3ctest_parserpy">trunk/Tools/Scripts/webkitpy/w3c/test_parser.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyw3ctest_parser_unittestpy">trunk/Tools/Scripts/webkitpy/w3c/test_parser_unittest.py</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunkToolsScriptswebkitpyw3ctest_parserpy">trunk/Tools/Scripts/webkitpy/w3c/test_parser.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (173879 => 173880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-09-23 17:32:04 UTC (rev 173879)
+++ trunk/Tools/ChangeLog 2014-09-23 18:09:02 UTC (rev 173880)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-09-23 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ W3C test importer should detect manual and reference tests according their filenames
+ https://bugs.webkit.org/show_bug.cgi?id=133852
+
+ Reviewed by Bem Jones-Bey.
+
+ * Scripts/webkitpy/w3c/test_parser.py:
+ (TestParser.analyze_test): Adding checks based on WPT filename rules.
+ (TestParser.is_wpt_manualtest): Detecting whether the test is a manual test based on its filename.
+ (TestParser):
+ (TestParser.potential_ref_filename): Getting the potential reference filename of a test from its filename.
+ (TestParser.is_wpt_reftest): Detecting whether the test is a ref test based on its filename.
+ * Scripts/webkitpy/w3c/test_parser_unittest.py:
+ (test_analyze_manual_wpt_test): Adding a test for a "-manual.html" file with testharness.js link in it.
+
</ins><span class="cx"> 2014-09-23 Bem Jones-Bey <bjonesbe@adobe.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, add Rebecca Hauck as a contributor.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyw3ctest_parserpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/w3c/test_parser.py (173879 => 173880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/w3c/test_parser.py 2014-09-23 17:32:04 UTC (rev 173879)
+++ trunk/Tools/Scripts/webkitpy/w3c/test_parser.py 2014-09-23 18:09:02 UTC (rev 173880)
</span><span class="lines">@@ -108,6 +108,13 @@
</span><span class="cx"> reference_relpath = self.filesystem.relpath(self.filesystem.dirname(self.filename), self.filesystem.dirname(ref_file)) + self.filesystem.sep
</span><span class="cx"> test_info['reference_support_info'] = {'reference_relpath': reference_relpath, 'files': reference_support_files}
</span><span class="cx">
</span><ins>+ # not all reference tests have a <link rel='match'> element in WPT repo
+ elif self.is_wpt_reftest():
+ test_info = {'test': self.filename, 'reference': self.potential_ref_filename()}
+ test_info['reference_support_info'] = {}
+ # we check for wpt manual test before checking for jstest, as some WPT manual tests can be classified as CSS JS tests
+ elif self.is_wpt_manualtest():
+ test_info = None
</ins><span class="cx"> elif self.is_jstest():
</span><span class="cx"> test_info = {'test': self.filename, 'jstest': True}
</span><span class="cx"> elif self.options['all'] is True and not('-ref' in self.filename) and not('reference' in self.filename):
</span><span class="lines">@@ -122,6 +129,19 @@
</span><span class="cx"> """Returns whether the file appears to be a jstest, by searching for usage of W3C-style testharness paths."""
</span><span class="cx"> return bool(self.test_doc.find(src=re.compile('[\'\"/]?/resources/testharness')))
</span><span class="cx">
</span><ins>+ def is_wpt_manualtest(self):
+ """Returns whether the test is a manual test according WPT rules (i.e. file ends with -manual.htm path)."""
+ return self.filename.endswith('-manual.htm') or self.filename.endswith('-manual.html')
+
+ def potential_ref_filename(self):
+ parts = self.filesystem.splitext(self.filename)
+ return parts[0] + '-ref' + parts[1]
+
+ def is_wpt_reftest(self):
+ """Returns whether the test is a ref test according WPT rules (i.e. file has a -ref.html counterpart)."""
+ parts = self.filesystem.splitext(self.filename)
+ return self.filesystem.isfile(self.potential_ref_filename())
+
</ins><span class="cx"> def support_files(self, doc):
</span><span class="cx"> """ Searches the file for all paths specified in url()'s, href or src attributes."""
</span><span class="cx"> support_files = []
</span><span class="cx">Property changes on: trunk/Tools/Scripts/webkitpy/w3c/test_parser.py
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="trunkToolsScriptswebkitpyw3ctest_parser_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/w3c/test_parser_unittest.py (173879 => 173880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/w3c/test_parser_unittest.py 2014-09-23 17:32:04 UTC (rev 173879)
+++ trunk/Tools/Scripts/webkitpy/w3c/test_parser_unittest.py 2014-09-23 18:09:02 UTC (rev 173880)
</span><span class="lines">@@ -155,6 +155,20 @@
</span><span class="cx"> self.assertFalse('refsupport' in test_info.keys(), 'there should be no refsupport files for this test')
</span><span class="cx"> self.assertTrue('jstest' in test_info.keys(), 'test should be a jstest')
</span><span class="cx">
</span><ins>+ def test_analyze_manual_wpt_test(self):
+ """ Tests analyze_test() using a manual jstest """
+
+ test_html = """<head>
+<link href="/resources/testharness.css" rel="stylesheet" type="text/css">
+<script src="/resources/testharness.js"></script>
+</head>
+"""
+ test_path = '/some/madeup/path/'
+ parser = TestParser(options, test_path + 'somefile-manual.html')
+ test_info = parser.analyze_test(test_contents=test_html)
+
+ self.assertEqual(test_info, None, 'test_info is None')
+
</ins><span class="cx"> def test_analyze_pixel_test_all_true(self):
</span><span class="cx"> """ Tests analyze_test() using a test that is neither a reftest or jstest with all=False """
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>