webkitpy: Simplify DiffParser, removing support for SVN patches.

third_party/WebKit/Tools/Scripts/webkitpy/style/patchreader_unittest.py

Index: third_party/WebKit/Tools/Scripts/webkitpy/style/patchreader_unittest.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/style/patchreader_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/style/patchreader_unittest.py
index e96e5b64a276ace7a7e1a08e9817606f53b014a9..03871e333fcd9ed8dedba559ff98b05ee04ead19 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/style/patchreader_unittest.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/style/patchreader_unittest.py
@@ -31,21 +31,16 @@
 
 import unittest
 
-from webkitpy.common.system.filesystem_mock import MockFileSystem
 from webkitpy.style.patchreader import PatchReader
 
 
 class PatchReaderTest(unittest.TestCase):
 
-    """Test the PatchReader class."""
-
     class MockTextFileReader(object):
 
         def __init__(self):
-            self.passed_to_process_file = []
-            """A list of (file_path, line_numbers) pairs."""
-            self.delete_only_file_count = 0
-            """A number of times count_delete_only_file() called"""
+            self.passed_to_process_file = []  # A list of (file_path, line_numbers) pairs.
+            self.delete_only_file_count = 0  # A number of times count_delete_only_file() called.
 
         def process_file(self, file_path, line_numbers):
             self.passed_to_process_file.append((file_path, line_numbers))
@@ -54,48 +49,41 @@ class PatchReaderTest(unittest.TestCase):
             self.delete_only_file_count += 1
 
     def setUp(self):
-        file_reader = self.MockTextFileReader()
-        self._file_reader = file_reader
-        self._patch_checker = PatchReader(file_reader)
-
-    def _call_check_patch(self, patch_string):
-        self._patch_checker.check(patch_string)
+        self._file_reader = self.MockTextFileReader()
 
     def _assert_checked(self, passed_to_process_file, delete_only_file_count):
-        self.assertEqual(self._file_reader.passed_to_process_file,
-                         passed_to_process_file)
-        self.assertEqual(self._file_reader.delete_only_file_count,
-                         delete_only_file_count)
+        self.assertEqual(self._file_reader.passed_to_process_file, passed_to_process_file)
+        self.assertEqual(self._file_reader.delete_only_file_count, delete_only_file_count)
 
     def test_check_patch(self):
-        # The modified line_numbers array for this patch is: [2].
-        self._call_check_patch("""diff --git a/__init__.py b/__init__.py
-index ef65bee..e3db70e 100644
---- a/__init__.py
-+++ b/__init__.py
-@@ -1,1 +1,2 @@
- # Required for Python to search this directory for module files
-+# New line
-""")
-        self._assert_checked([("__init__.py", [2])], 0)
+        PatchReader(self._file_reader).check(
+            'diff --git a/__init__.py b/__init__.py\n'
+            'index ef65bee..e3db70e 100644\n'
+            '--- a/__init__.py\n'
+            '+++ b/__init__.py\n'
+            '@@ -1,1 +1,2 @@\n'
+            ' # Required for Python to search this directory for module files\n'
+            '+# New line\n')
+        self._assert_checked(
+            passed_to_process_file=[('__init__.py', [2])],
+            delete_only_file_count=0)
 
     def test_check_patch_with_deletion(self):
-        self._call_check_patch("""Index: __init__.py
-===================================================================
---- __init__.py  (revision 3593)
-+++ __init__.py  (working copy)
-@@ -1 +0,0 @@
--foobar
-""")
-        # _mock_check_file should not be called for the deletion patch.
-        self._assert_checked([], 1)
+        PatchReader(self._file_reader).check(
+            'diff --git a/__init__.py b/__init.py\n'
+            'deleted file mode 100644\n'
+            'index ef65bee..0000000\n'
+            '--- a/__init__.py\n'
+            '+++ /dev/null\n'
+            '@@ -1 +0,0 @@\n'
+            '-foobar\n')
+        # The deleted file isn't be processed.
+        self._assert_checked(passed_to_process_file=[], delete_only_file_count=1)
 
     def test_check_patch_with_png_deletion(self):
-        fs = MockFileSystem()
-        diff_text = """Index: LayoutTests/platform/mac/foo-expected.png
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = image/png
-"""
-        self._patch_checker.check(diff_text, fs)
-        self._assert_checked([], 1)
+        PatchReader(self._file_reader).check(
+            'diff --git a/foo-expected.png b/foo-expected.png\n'
+            'deleted file mode 100644\n'
+            'index ef65bee..0000000\n'
+            'Binary files a/foo-expected.png and /dev/null differ\n')
+        self._assert_checked(passed_to_process_file=[], delete_only_file_count=1)