third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_converter_unittest.py - Issue 2790723002: Stop trying to convert CSS properties in imported tests.

Unified Diff: third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_converter_unittest.py

Issue 2790723002: Stop trying to convert CSS properties in imported tests. (Closed)

Patch Set: Created 3 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_converter.py ('k') | third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_copier.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_converter_unittest.py

diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_converter_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_converter_unittest.py

deleted file mode 100644

index 59cbd7ed51595516de3e23cd342617af2cd59318..0000000000000000000000000000000000000000

--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_converter_unittest.py

+++ /dev/null

@@ -1,286 +0,0 @@

-# Redistribution and use in source and binary forms, with or without

-# modification, are permitted provided that the following conditions

-# are met:

-# 1. Redistributions of source code must retain the above

-# copyright notice, this list of conditions and the following

-# disclaimer.

-# 2. Redistributions in binary form must reproduce the above

-# copyright notice, this list of conditions and the following

-# disclaimer in the documentation and/or other materials

-# provided with the distribution.

-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER "AS IS" AND ANY

-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE

-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,

-# OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR

-# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF

-# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

-# SUCH DAMAGE.

-import re

-import unittest

-from webkitpy.common.host import Host

-from webkitpy.common.webkit_finder import WebKitFinder

-from webkitpy.w3c.test_converter import _W3CTestConverter, convert_for_webkit

-from webkitpy.common.system.system_host_mock import MockSystemHost

-from webkitpy.common.system.filesystem_mock import MockFileSystem

-DUMMY_FILENAME = 'dummy.html'

-DUMMY_PATH = 'dummy/testharness/path'

-class W3CTestConverterTest(unittest.TestCase):

- # FIXME: When we move to using a MockHost, this method should be removed, since

- # then we can just pass in a dummy dir path

- def fake_dir_path(self, dirname):

- filesystem = Host().filesystem

- webkit_root = WebKitFinder(filesystem).webkit_base()

- return filesystem.abspath(filesystem.join(webkit_root, 'LayoutTests', 'css', dirname))

- def test_read_prefixed_property_list(self):

- """Tests that the current list of properties requiring the -webkit- prefix load correctly."""

- # FIXME: We should be passing in a MockHost here ...

- converter = _W3CTestConverter(DUMMY_PATH, DUMMY_FILENAME, None)

- prop_list = converter.prefixed_properties

- self.assertTrue(prop_list, 'No prefixed properties found')

- def test_convert_for_webkit_nothing_to_convert(self):

- """Tests convert_for_webkit() using a basic test that has nothing to convert."""

- test_html = """<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<title>CSS Test: DESCRIPTION OF TEST</title>

-<link rel="author" title="NAME_OF_AUTHOR"

-href="mailto:EMAIL OR http://CONTACT_PAGE"/>

-<link rel="help" href="RELEVANT_SPEC_SECTION"/>

-<meta name="assert" content="TEST ASSERTION"/>

-<style type="text/css"><![CDATA[

-CSS FOR TEST

-]]></style>

-</head>

-<body>

-CONTENT OF TEST

-</body>

-</html>

-"""

- converter = _W3CTestConverter(DUMMY_PATH, DUMMY_FILENAME, None)

- converter.feed(test_html)

- converter.close()

- converted = converter.output()

- self.verify_no_conversion_happened(converted, test_html)

- def test_convert_for_webkit_properties_only(self):

- """Tests convert_for_webkit() using a test that has 2 prefixed properties: 1 in a style block + 1 inline style."""

- test_html = """<html>

-<head>

-<link href="/resources/testharness.css" rel="stylesheet" type="text/css">

-<script src="/resources/testharness.js"></script>

-<style type="text/css">

-#block1 { @test0@: propvalue; }

-</style>

-</head>

-<body>

-<div id="elem1" style="@test1@: propvalue;"></div>

-</body>

-</html>

-"""

- fake_dir_path = self.fake_dir_path('harnessandprops')

- converter = _W3CTestConverter(fake_dir_path, DUMMY_FILENAME, None)

- test_content = self.generate_test_content(converter.prefixed_properties, 1, test_html)

- converter.feed(test_content[1])

- converter.close()

- converted = converter.output()

- self.verify_conversion_happened(converted)

- self.verify_prefixed_properties(converted, test_content[0])

- def test_convert_prefixed_properties(self):

- """Tests convert_prefixed_properties() file that has 20 properties requiring the -webkit- prefix.

- The properties are:

- 10 in one style block + 5 in another style

- block + 5 inline styles, including one with multiple prefixed properties.

- 2 when prefixed properties appear in comments without ending ';'.

- The properties in the test content are in all sorts of wack formatting.

- """

- test_html = """<html>

-<style type="text/css"><![CDATA[

-.block1 {

- width: 300px;

- height: 300px

-.block2 {

- @test0@: propvalue;

-.block3{@test1@: propvalue;}

-.block4 { @test2@:propvalue; }

-.block5{ @test3@ :propvalue; }

-#block6 { @test4@ : propvalue; }

-#block7

- @test5@: propvalue;

-#block8 { @test6@: propvalue; }

-#block9:pseudo

- @test7@: propvalue;

- @test8@: propvalue propvalue propvalue;

-]]></style>

-</head>

-<body>

- <div id="elem1" style="@test9@: propvalue;"></div>

- <div id="elem2" style="propname: propvalue; @test10@ : propvalue; propname:propvalue;"></div>

- <div id="elem2" style="@test11@: propvalue; @test12@ : propvalue; @test13@ :propvalue;"></div>

- <div id="elem3" style="@test14@:propvalue"></div>

-</body>

-<style type="text/css"><![CDATA[

-.block10{ @test15@: propvalue; }

-.block11{ @test16@: propvalue; }

-.block12{ @test17@: propvalue; }

-#block13:pseudo

- @test18@: propvalue;

- @test19@: propvalue;

-#missing-semicolon-in-comments {

- /* @test20@: propvalue */

- @test21@: propvalue;

-]]></style>

-</html>

-"""

- converter = _W3CTestConverter(DUMMY_PATH, DUMMY_FILENAME, None)

- test_content = self.generate_test_content(converter.prefixed_properties, 4, test_html)

- converter.feed(test_content[1])

- converter.close()

- converted = converter.output()

- self.verify_conversion_happened(converted)

- self.verify_prefixed_properties(converted, test_content[0])

- def test_convert_attributes_if_needed(self):

- """Tests convert_attributes_if_needed() using a reference file that has some relative src paths."""

- test_html = """<html>

- <head>

- <script src="../../some-script.js"></script>

- <style src="../../../some-style.css"></style>

- </head>

- <body>

- <img src="../../../../some-image.jpg">

- </body>

- </html>

- """

- test_reference_support_info = {

- 'reference_relpath': '../',

- 'files': ['../../some-script.js', '../../../some-style.css', '../../../../some-image.jpg'],

- 'elements': ['script', 'style', 'img']

- }

- converter = _W3CTestConverter(DUMMY_PATH, DUMMY_FILENAME, test_reference_support_info)

- converter.feed(test_html)

- converter.close()

- converted = converter.output()

- self.verify_conversion_happened(converted)

- self.verify_reference_relative_paths(converted, test_reference_support_info)

- def verify_conversion_happened(self, converted):

- self.assertTrue(converted, "conversion didn't happen")

- def verify_no_conversion_happened(self, converted, original):

- self.assertEqual(converted[1], original, 'test should not have been converted')

- def verify_prefixed_properties(self, converted, test_properties):

- self.assertEqual(len(set(converted[0])), len(set(test_properties)), 'Incorrect number of properties converted')

- for test_prop in test_properties:

- self.assertTrue((test_prop in converted[1]), 'Property ' + test_prop + ' not found in converted doc')

- def verify_reference_relative_paths(self, converted, reference_support_info):

- idx = 0

- for path in reference_support_info['files']:

- expected_path = re.sub(reference_support_info['reference_relpath'], '', path, 1)

- element = reference_support_info['elements'][idx]

- expected_tag = '<' + element + ' src=\"' + expected_path + '\">'

- self.assertTrue(expected_tag in converted[1], 'relative path ' + path + ' was not converted correctly')

- idx += 1

- def generate_test_content(self, full_property_list, num_test_properties, html):

- """Inserts properties requiring a -webkit- prefix into the content, replacing \'@testXX@\' with a property."""

- test_properties = []

- count = 0

- while count < num_test_properties:

- test_properties.append(full_property_list[count])

- count += 1

- # Replace the tokens in the testhtml with the test properties. Walk backward

- # through the list to replace the double-digit tokens first

- index = len(test_properties) - 1

- while index >= 0:

- # Use the unprefixed version

- test_prop = test_properties[index].replace('-webkit-', '')

- # Replace the token

- html = html.replace('@test' + str(index) + '@', test_prop)

- index -= 1

- return (test_properties, html)

- def test_convert_for_webkit_with_non_utf8(self):

- files = {'/file': 'e\x87[P', }

- host = MockSystemHost(filesystem=MockFileSystem(files=files))

- convert_for_webkit('', '/file', '', host)

- # This test passes if no Exception is raised

- def test_convert_for_webkit_with_utf8(self):

- files = {'/file': 'foo', }

- host = MockSystemHost(filesystem=MockFileSystem(files=files))

- convert_for_webkit('', '/file', '', host)

- def test_for_capital_end_tags(self):

- test_html = """<FONT></FONT>"""

- converter = _W3CTestConverter(DUMMY_PATH, DUMMY_FILENAME, None)

- converter.feed(test_html)

- self.assertEqual(converter.output(), ([], """<FONT></FONT>"""))

- def test_for_comments(self):

- test_html = """"""

- converter = _W3CTestConverter(DUMMY_PATH, DUMMY_FILENAME, None)

- converter.feed(test_html)

- self.assertEqual(converter.output(), ([], """"""))