Changeset 86165 in webkit

Timestamp:

May 10, 2011 10:28:08 AM (13 years ago)

Author:

levin@chromium.org

Message:

2011-05-10 David Levin <​levin@chromium.org>

Reviewed by Shinichiro Hamaji.

check-webkit-style shouldn't filter the errors using the modified lines for the xml and test expectations checkers.
​https://bugs.webkit.org/show_bug.cgi?id=60466

• Scripts/webkitpy/style/checker.py: (unrelated) style fix.
• Scripts/webkitpy/style/checker_unittest.py: Remove the file_path check since that property was removed.
• Scripts/webkitpy/style/checkers/test_expectations.py: Turn off the line filtering for errors.
• Scripts/webkitpy/style/checkers/test_expectations_unittest.py: Add testing to verify that the line filtering is turned off.
• Scripts/webkitpy/style/checkers/xml.py: Turn off the line filtering for errors and remove the unused file_path parameter.
• Scripts/webkitpy/style/checkers/xml_unittest.py: Add testing to verify that the line filtering is turned off (and fix test_no_error).
• Scripts/webkitpy/style/error_handlers.py: Added a way to turn off the filtering of errors based on the lines changed in the patch.
• Scripts/webkitpy/style/error_handlers_unittest.py: Added a test for turning off the filtering.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/style/checker.py (modified) (1 diff)
• Scripts/webkitpy/style/checker_unittest.py (modified) (1 diff)
• Scripts/webkitpy/style/checkers/test_expectations.py (modified) (1 diff)
• Scripts/webkitpy/style/checkers/test_expectations_unittest.py (modified) (3 diffs)
• Scripts/webkitpy/style/checkers/xml.py (modified) (2 diffs)
• Scripts/webkitpy/style/checkers/xml_unittest.py (modified) (3 diffs)
• Scripts/webkitpy/style/error_handlers.py (modified) (1 diff)
• Scripts/webkitpy/style/error_handlers_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-05-10  David Levin  <levin@chromium.org>
+
+        Reviewed by Shinichiro Hamaji.
+
+        check-webkit-style shouldn't filter the errors using the modified lines for the xml and test expectations checkers.
+        https://bugs.webkit.org/show_bug.cgi?id=60466
+
+        * Scripts/webkitpy/style/checker.py: (unrelated) style fix.
+        * Scripts/webkitpy/style/checker_unittest.py: Remove the file_path check since
+          that property was removed.
+        * Scripts/webkitpy/style/checkers/test_expectations.py: Turn off the line
+          filtering for errors.
+        * Scripts/webkitpy/style/checkers/test_expectations_unittest.py: Add testing to
+          verify that the line filtering is turned off.
+        * Scripts/webkitpy/style/checkers/xml.py: Turn off the line filtering for errors
+          and remove the unused file_path parameter.
+        * Scripts/webkitpy/style/checkers/xml_unittest.py: Add testing to verify that the
+          line filtering is turned off (and fix test_no_error).
+        * Scripts/webkitpy/style/error_handlers.py: Added a way to turn off the filtering
+          of errors based on the lines changed in the patch.
+        * Scripts/webkitpy/style/error_handlers_unittest.py: Added a test for turning off
+          the filtering.
+
 2011-05-10  Adam Roben  <aroben@apple.com>
 

trunk/Tools/Scripts/webkitpy/style/checker.py

@@ -766 +766 @@
         min_confidence = self._configuration.min_confidence
         checker = self._dispatcher.dispatch(file_path,
-                                                      style_error_handler,
-                                                      min_confidence)
+                                            style_error_handler,
+                                            min_confidence)
 
         if checker is None:

trunk/Tools/Scripts/webkitpy/style/checker_unittest.py

@@ -548 +548 @@
         self.assert_checker_xml(file_path)
         checker = self.dispatch(file_path)
-        self.assertEquals(checker.file_path, file_path)
-        self.assertEquals(checker.handle_style_error,
+        self.assertEquals(checker._handle_style_error,
                           self.mock_handle_style_error)
 

trunk/Tools/Scripts/webkitpy/style/checkers/test_expectations.py

@@ -59 +59 @@
         self._file_path = file_path
         self._handle_style_error = handle_style_error
+        self._handle_style_error.turn_off_line_filtering()
         self._tab_checker = TabChecker(file_path, handle_style_error)
         self._output_regex = re.compile('Line:(?P<line>\d+)\s*(?P<message>.+)')

trunk/Tools/Scripts/webkitpy/style/checkers/test_expectations_unittest.py

@@ -51 +51 @@
     def __init__(self):
         self._errors = []
+        self.turned_off_filtering = False
+
+    def turn_off_line_filtering(self):
+        self.turned_off_filtering = True
 
     def __call__(self, lineno, category, confidence, message):
@@ -60 +64 @@
     def reset_errors(self):
         self._errors = []
+        self.turned_off_filtering = False
 
 
@@ -82 +87 @@
         checker.check_tabs(lines)
         self.assertEqual(expected, self._error_collector.get_errors())
+        self.assertTrue(self._error_collector.turned_off_filtering)
 
     def test_valid_expectations(self):

trunk/Tools/Scripts/webkitpy/style/checkers/xml.py

@@ -32 +32 @@
 
     def __init__(self, file_path, handle_style_error):
-        self.file_path = file_path
-        self.handle_style_error = handle_style_error
+        self._handle_style_error = handle_style_error
+        self._handle_style_error.turn_off_line_filtering()
 
     def check(self, lines):
@@ -43 +43 @@
             parser.Parse('', True)
         except expat.ExpatError, error:
-            self.handle_style_error(error.lineno, 'xml/syntax', 5, expat.ErrorString(error.code))
+            self._handle_style_error(error.lineno, 'xml/syntax', 5, expat.ErrorString(error.code))

trunk/Tools/Scripts/webkitpy/style/checkers/xml_unittest.py

@@ -30 +30 @@
 
 
+class MockErrorHandler(object):
+    def __init__(self, handle_style_error):
+        self.turned_off_filtering = False
+        self._handle_style_error = handle_style_error
+
+    def turn_off_line_filtering(self):
+        self.turned_off_filtering = True
+
+    def __call__(self, line_number, category, confidence, message):
+        self._handle_style_error(self, line_number, category, confidence, message)
+
+
 class XMLCheckerTest(unittest.TestCase):
     """Tests XMLChecker class."""
 
     def assert_no_error(self, xml_data):
-        def handle_style_error(line_number, category, confidence, message):
+        def handle_style_error(mock_error_handler, line_number, category, confidence, message):
             self.fail('Unexpected error: %d %s %d %s' % (line_number, category, confidence, message))
-        checker = xml.XMLChecker('foo.xml', handle_style_error)
+
+        error_handler = MockErrorHandler(handle_style_error)
+        checker = xml.XMLChecker('foo.xml', error_handler)
         checker.check(xml_data.split('\n'))
+        self.assertTrue(error_handler.turned_off_filtering)
 
     def assert_error(self, expected_line_number, expected_category, xml_data):
-        def handle_style_error(line_number, category, confidence, message):
-            self.had_error = True
+        def handle_style_error(mock_error_handler, line_number, category, confidence, message):
+            mock_error_handler.had_error = True
             self.assertEquals(expected_line_number, line_number)
             self.assertEquals(expected_category, category)
-        checker = xml.XMLChecker('foo.xml', handle_style_error)
+
+        error_handler = MockErrorHandler(handle_style_error)
+        error_handler.had_error = False
+
+        checker = xml.XMLChecker('foo.xml', error_handler)
         checker.check(xml_data.split('\n'))
-        self.assertTrue(self.had_error)
+        self.assertTrue(error_handler.had_error)
+        self.assertTrue(error_handler.turned_off_filtering)
 
     def mock_handle_style_error(self):
@@ -58 +78 @@
 
     def test_init(self):
-        checker = xml.XMLChecker('foo.xml', self.mock_handle_style_error)
-        self.assertEquals(checker.file_path, 'foo.xml')
-        self.assertEquals(checker.handle_style_error, self.mock_handle_style_error)
+        error_handler = MockErrorHandler(self.mock_handle_style_error)
+        checker = xml.XMLChecker('foo.xml', error_handler)
+        self.assertEquals(checker._handle_style_error, error_handler)
 
     def test_missing_closing_tag(self):
@@ -66 +86 @@
 
     def test_no_error(self):
-        checker = xml.XMLChecker('foo.xml', self.assert_no_error)
-        checker.check(['<foo>', '</foo>'])
+        self.assert_no_error('<foo>\n</foo>')
 
 if __name__ == '__main__':

trunk/Tools/Scripts/webkitpy/style/error_handlers.py

@@ -129 +129 @@
         return self._line_numbers is None or line_number in self._line_numbers
 
+    def turn_off_line_filtering(self):
+        self._line_numbers = None
+
     def __call__(self, line_number, category, confidence, message):
         """Handle the occurrence of a style error.

trunk/Tools/Scripts/webkitpy/style/error_handlers_unittest.py

@@ -186 +186 @@
         self.assertEquals(self._error_messages,
                           ["foo.h(50):  message  [whitespace/tab] [5]\n"])
+
+        # Error on non-modified line after turning off line filtering: error.
+        error_handler.turn_off_line_filtering()
+        self._call_error_handler(error_handler, confidence, line_number=60)
+        self.assertEquals(2, self._error_count)
+        self.assertEquals(self._error_messages,
+                          ['foo.h(50):  message  [whitespace/tab] [5]\n',
+                           'foo.h(60):  message  [whitespace/tab] [5]\n',
+                           'Suppressing further [whitespace/tab] reports for this file.\n'])