Changeset 90934 in webkit

Timestamp:

Jul 13, 2011 11:40:12 AM (13 years ago)

Author:

Dimitri Glazkov

Message:

Eliminate TestExpectationsFile.
​https://bugs.webkit.org/show_bug.cgi?id=64458

Turns out, we can just use a Python list.

Reviewed by Adam Barth.

• Scripts/webkitpy/layout_tests/models/test_expectations.py: Folded TestExpectationsFile.append into TestExpectationParser.parse_list,

removed TestExpectationsFile.

• Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py: Moved tests to better reflect new names, removed iterator test,

since there's no more custom iterator machinery.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/models/test_expectations.py (modified) (4 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>
+
+        Eliminate TestExpectationsFile.
+        https://bugs.webkit.org/show_bug.cgi?id=64458
+
+        Turns out, we can just use a Python list.
+
+        Reviewed by Adam Barth.
+
+        * Scripts/webkitpy/layout_tests/models/test_expectations.py: Folded TestExpectationsFile.append into TestExpectationParser.parse_list,
+            removed TestExpectationsFile.
+        * Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py: Moved tests to better reflect new names, removed iterator test,
+            since there's no more custom iterator machinery.
+
 2011-07-13  Philippe Normand  <pnormand@igalia.com>
 

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

@@ -196 +196 @@
 
     @classmethod
+    def parse_list(cls, expectations_string, validator):
+        """Returns a list of TestExpectationLines, one for each line in expectations_string."""
+        expectations = []
+        line_number = 0
+        for line in expectations_string.split("\n"):
+            expectation, errors = cls.parse(line)
+            line_number += 1
+            expectation.valid = validator.validate(line_number, expectation, errors)
+            expectations.append(expectation)
+        return expectations
+
+    @classmethod
     def _split_expectation_string(cls, line, errors):
         """Splits line into a string of modifiers, a test name, a string of expectations, and a comment,
@@ -243 +255 @@
         self.valid = False
         self.malformed = False
-
-
-class TestExpectationsFile:
-    """Represents a test expectation file, which is a mutable collection of comments and test expectations."""
-
-    def __init__(self):
-        self._expectations = []
-
-    def __iter__(self):
-        return self._expectations.__iter__()
-
-    def append(self, expectations_string, validator):
-        """Add a TestExpectationLine for each item in expectations_string."""
-        line_number = 0
-        for line in expectations_string.split("\n"):
-            expectation, errors = TestExpectationParser.parse(line)
-            line_number += 1
-            expectation.valid = validator.validate(line_number, expectation, errors)
-            self._expectations.append(expectation)
 
 
@@ -401 +394 @@
 
         self._matcher = ModifierMatcher(self._test_config)
-        self._expectations = TestExpectationsFile()
         self._overrides_allowed = False
-        self._expectations.append(expectations, self)
+        self._expectations = TestExpectationParser.parse_list(expectations, self)
 
         # List of tests that are in the overrides file (used for checking for
@@ -414 +406 @@
         if overrides:
             self._overrides_allowed = True
-            self._expectations.append(self._overrides, self)
+            self._expectations += TestExpectationParser.parse_list(self._overrides, self)
             self._overrides_allowed = False
 

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

@@ -537 +537 @@
         self.assertEqual(len(errors), 0)
 
+    def test_line_number_increment(self):
+        validator = TestValidator()
+        expectations = TestExpectationParser.parse_list('// Bar\nFOO : bar = BAZ\n\n', validator)
+        self.assertEqual(str(validator.line_numbers), '[1, 2, 3, 4]')
+
+    def test_validator_feedback(self):
+        validator = TestValidator()
+        expectations = TestExpectationParser.parse_list('FOO : bar1 = BAZ\nFOO : bar2 = BAZ\nFOO : bar3 = BAZ', validator)
+        line_number = 0
+        for expectation in expectations:
+            line_number += 1
+            self.assertEqual(line_number % 2 == 0, expectation.valid)
+
 
 class TestExpectationSerializerTests(unittest.TestCase):
@@ -608 +621 @@
         return line_number % 2 == 0
 
-
-class TestExpectationsFileTests(unittest.TestCase):
-    def test_line_number_increment(self):
-        validator = TestValidator()
-        expectations = TestExpectationsFile()
-        expectations.append('// Bar\nFOO : bar = BAZ\n\n', validator)
-        self.assertEqual(str(validator.line_numbers), '[1, 2, 3, 4]')
-
-    def test_iterator(self):
-        validator = TestValidator()
-        expectations = TestExpectationsFile()
-        expectations.append('\n\n\n\n', validator)
-        line_number = 0
-        for expectation in expectations:
-            line_number += 1
-        self.assertEqual(line_number, 5)
-
-    def test_validator_feedback(self):
-        validator = TestValidator()
-        expectations = TestExpectationsFile()
-        expectations.append('FOO : bar1 = BAZ\nFOO : bar2 = BAZ\nFOO : bar3 = BAZ', validator)
-        line_number = 0
-        for expectation in expectations:
-            line_number += 1
-            self.assertEqual(line_number % 2 == 0, expectation.valid)
-
 if __name__ == '__main__':
     unittest.main()