Changeset 90942 in webkit

Timestamp:

Jul 13, 2011 12:40:09 PM (13 years ago)

Author:

Dimitri Glazkov

Message:

Introduce TestExpectationSerializer.list_to_string.
​https://bugs.webkit.org/show_bug.cgi?id=64462

Reviewed by Adam Barth.

• Scripts/webkitpy/layout_tests/models/test_expectations.py: Added list_to_string and change the relevant callsite to use it.
• Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py: Added tests for it.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/models/test_expectations.py (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-07-13  Dimitri Glazkov  <dglazkov@chromium.org>
+
+        Introduce TestExpectationSerializer.list_to_string.
+        https://bugs.webkit.org/show_bug.cgi?id=64462
+
+        Reviewed by Adam Barth.
+
+        * Scripts/webkitpy/layout_tests/models/test_expectations.py: Added list_to_string and change the relevant callsite to use it.
+        * Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py: Added tests for it.
+
 2011-07-13  Dimitri Glazkov  <dglazkov@chromium.org>
 

trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py

@@ -158 +158 @@
         return ''.join(result)
 
+    @classmethod
+    def list_to_string(cls, expectations):
+        return "\n".join([TestExpectationSerializer.to_string(expectation) for expectation in expectations])
+
 
 class TestExpectationParser:
@@ -508 +512 @@
     def remove_rebaselined_tests(self, tests):
         """Returns a copy of the expectations with the tests removed."""
-        lines = []
-        for expectation in self._expectations:
-            if not (expectation.valid and expectation.name in tests and "rebaseline" in expectation.modifiers):
-                lines.append(TestExpectationSerializer.to_string(expectation))
-        return "\n".join(lines)
+        def without_rebaseline_modifier(expectation):
+            return not (expectation.valid and expectation.name in tests and "rebaseline" in expectation.modifiers)
+
+        return TestExpectationSerializer.list_to_string(filter(without_rebaseline_modifier, self._expectations))
 
     def _add_to_all_expectations(self, test, options, expectations):

trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py

@@ -558 +558 @@
         self.assertEqual(expected_string, TestExpectationSerializer.to_string(expectation))
 
+    def assert_list_round_trip(self, in_string, expected_string=None):
+        expectations = TestExpectationParser.parse_list(in_string, TestValidator())
+        if expected_string is None:
+            expected_string = in_string
+        self.assertEqual(expected_string, TestExpectationSerializer.list_to_string(expectations))
+
     def assert_to_string(self, expectation, expected_string):
         self.assertEqual(TestExpectationSerializer.to_string(expectation), expected_string)
@@ -603 +609 @@
         self.assert_round_trip('// Foo : =')
 
+    def test_list_roundtrip(self):
+        self.assert_list_round_trip('')
+        self.assert_list_round_trip('\n')
+        self.assert_list_round_trip('\n\n')
+        self.assert_list_round_trip('bar')
+        self.assert_list_round_trip('bar\n//Qux.')
+        self.assert_list_round_trip('bar\n//Qux.\n')
+
     def test_string_whitespace_stripping(self):
         self.assert_round_trip('\n', '')