Centralize testing to make it simpler to test when rename are supported correctly

tests/patch_test.py

 #!/usr/bin/env python
 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Unit tests for patch.py."""
 
 import logging
 import os
 import sys
@@ skipping 123 matching lines @@
 
 
 DELETE = (
     '--- tools/clang_check/README.chromium\n'
     '+++ /dev/null\n'
     '@@ -1,1 +0,0 @@\n'
     '-bar\n')
 
 
 class PatchTest(unittest.TestCase):
+  def _check_patch(self,
+      p,
+      filename,
+      diff,
+      is_binary=False,
+      is_delete=False,
+      is_git_diff=False,
+      is_new=False,
+      patchlevel=0,
+      svn_properties=None):
+    svn_properties = svn_properties or []
+    self.assertEquals(p.filename, filename)
+    self.assertEquals(p.is_binary, is_binary)
+    self.assertEquals(p.is_delete, is_delete)
+    if hasattr(p, 'is_git_diff'):
+      self.assertEquals(p.is_git_diff, is_git_diff)
+    self.assertEquals(p.is_new, is_new)
+    if hasattr(p, 'patchlevel'):
+      self.assertEquals(p.patchlevel, patchlevel)
+    if diff:
+      self.assertEquals(p.get(), diff)
+    if hasattr(p, 'svn_properties'):
+      self.assertEquals(p.svn_properties, svn_properties)
+
   def testFilePatchDelete(self):
     p = patch.FilePatchDelete('foo', False)
-    self.assertEquals(p.filename, 'foo')
-    self.assertEquals(p.is_binary, False)
-    self.assertEquals(p.is_delete, True)
-    self.assertEquals(p.is_new, False)
+    self._check_patch(p, 'foo', None, is_delete=True)
     try:
       p.get()
       self.fail()
     except NotImplementedError:
       pass
+
+  def testFilePatchDeleteBin(self):
     p = patch.FilePatchDelete('foo', True)
-    self.assertEquals(p.filename, 'foo')
-    self.assertEquals(p.is_binary, True)
-    self.assertEquals(p.is_delete, True)
-    self.assertEquals(p.is_new, False)
+    self._check_patch(p, 'foo', None, is_delete=True, is_binary=True)
     try:
       p.get()
       self.fail()
     except NotImplementedError:
       pass
 
   def testFilePatchBinary(self):
     p = patch.FilePatchBinary('foo', 'data', [], is_new=False)
-    self.assertEquals(p.filename, 'foo')
-    self.assertEquals(p.is_binary, True)
-    self.assertEquals(p.is_delete, False)
-    self.assertEquals(p.is_new, False)
-    self.assertEquals(p.get(), 'data')
+    self._check_patch(p, 'foo', 'data', is_binary=True)
 
   def testFilePatchBinaryNew(self):
     p = patch.FilePatchBinary('foo', 'data', [], is_new=True)
-    self.assertEquals(p.filename, 'foo')
-    self.assertEquals(p.is_binary, True)
-    self.assertEquals(p.is_delete, False)
-    self.assertEquals(p.is_new, True)
-    self.assertEquals(p.get(), 'data')
+    self._check_patch(p, 'foo', 'data', is_binary=True, is_new=True)
 
   def testFilePatchDiff(self):
     p = patch.FilePatchDiff('chrome/file.cc', SVN_PATCH, [])
-    self.assertEquals(p.filename, 'chrome/file.cc')
-    self.assertEquals(p.is_binary, False)
-    self.assertEquals(p.is_delete, False)
-    self.assertEquals(p.is_git_diff, False)
-    self.assertEquals(p.is_new, False)
-    self.assertEquals(p.patchlevel, 0)
-    self.assertEquals(p.get(), SVN_PATCH)
+    self._check_patch(p, 'chrome/file.cc', SVN_PATCH)
 
   def testFilePatchDiffHeaderMode(self):
     diff = (
         'diff --git a/git_cl/git-cl b/git_cl/git-cl\n'
         'old mode 100644\n'
         'new mode 100755\n')
     p = patch.FilePatchDiff('git_cl/git-cl', diff, [])
-    self.assertEquals(p.filename, 'git_cl/git-cl')
-    self.assertEquals(p.is_binary, False)
-    self.assertEquals(p.is_delete, False)
-    self.assertEquals(p.is_git_diff, True)
-    self.assertEquals(p.is_new, False)
-    self.assertEquals(p.patchlevel, 1)
-    self.assertEquals(p.get(), diff)
-    self.assertEquals([('svn:executable', '*')], p.svn_properties)
+    self._check_patch(
+        p, 'git_cl/git-cl', diff, is_git_diff=True, patchlevel=1,
+        svn_properties=[('svn:executable', '*')])
 
   def testFilePatchDiffHeaderModeIndex(self):
     diff = (
         'Index: Junk\n'
         'diff --git a/git_cl/git-cl b/git_cl/git-cl\n'
         'old mode 100644\n'
         'new mode 100755\n')
     p = patch.FilePatchDiff('git_cl/git-cl', diff, [])
-    self.assertEquals(p.filename, 'git_cl/git-cl')
-    self.assertEquals(p.is_binary, False)
-    self.assertEquals(p.is_delete, False)
-    self.assertEquals(p.is_git_diff, True)
-    self.assertEquals(p.is_new, False)
-    self.assertEquals(p.patchlevel, 1)
-    self.assertEquals(p.get(), diff)
+    self._check_patch(
+        p, 'git_cl/git-cl', diff, is_git_diff=True, patchlevel=1,
+        svn_properties=[('svn:executable', '*')])
 
   def testFilePatchDiffSvnNew(self):
     # The code path is different for git and svn.
     p = patch.FilePatchDiff('foo', NEW, [])
-    self.assertEquals(p.filename, 'foo')
-    self.assertEquals(p.is_binary, False)
-    self.assertEquals(p.is_delete, False)
-    self.assertEquals(p.is_git_diff, False)
-    self.assertEquals(p.is_new, True)
-    self.assertEquals(p.patchlevel, 0)
-    self.assertEquals(p.get(), NEW)
+    self._check_patch(p, 'foo', NEW, is_new=True)
 
   def testFilePatchDiffGitNew(self):
     # The code path is different for git and svn.
     p = patch.FilePatchDiff('foo', GIT_NEW, [])
-    self.assertEquals(p.filename, 'foo')
-    self.assertEquals(p.is_binary, False)
-    self.assertEquals(p.is_delete, False)
-    self.assertEquals(p.is_git_diff, True)
-    self.assertEquals(p.is_new, True)
-    self.assertEquals(p.patchlevel, 1)
-    self.assertEquals(p.get(), GIT_NEW)
+    self._check_patch(
+        p, 'foo', GIT_NEW, is_new=True, is_git_diff=True, patchlevel=1)
 
   def testFilePatchDiffBad(self):
     try:
       patch.FilePatchDiff('foo', 'data', [])
       self.fail()
     except patch.UnsupportedPatchFormat:
       pass
 
   def testFilePatchDiffEmpty(self):
     try:
@@ skipping 194 matching lines @@
     patches = patch.PatchSet([
         patch.FilePatchDiff('chrome\\file.cc', mangled_patch, []),
         patch.FilePatchDelete('other\\place\\foo', True),
     ])
     expected = ['chrome/file.cc', 'other/place/foo']
     self.assertEquals(expected, patches.filenames)
     self.assertEquals(SVN_PATCH, patches.patches[0].get())
 
   def testDelete(self):
     p = patch.FilePatchDiff('tools/clang_check/README.chromium', DELETE, [])
-    self.assertEquals(p.filename, 'tools/clang_check/README.chromium')
-    self.assertEquals(p.is_binary, False)
-    self.assertEquals(p.is_delete, True)
-    self.assertEquals(p.is_new, False)
-    self.assertEquals(p.get(), DELETE)
-    self.assertEquals([], p.svn_properties)
+    self._check_patch(
+        p, 'tools/clang_check/README.chromium', DELETE, is_delete=True)
 
   def testGitDelete(self):
     p = patch.FilePatchDiff('tools/clang_check/README.chromium', GIT_DELETE, [])
-    self.assertEquals(p.filename, 'tools/clang_check/README.chromium')
-    self.assertEquals(p.is_binary, False)
-    self.assertEquals(p.is_delete, True)
-    self.assertEquals(p.is_new, False)
-    self.assertEquals(p.get(), GIT_DELETE)
-    self.assertEquals([], p.svn_properties)
+    self._check_patch(
+        p, 'tools/clang_check/README.chromium', GIT_DELETE, is_delete=True,
+        is_git_diff=True, patchlevel=1)
 
   def testGitRename(self):
     p = patch.FilePatchDiff('tools/run_local_server.sh', GIT_RENAME, [])
-    self.assertEquals(p.filename, 'tools/run_local_server.sh')
-    self.assertEquals(p.is_binary, False)
-    self.assertEquals(p.is_delete, False)
-    self.assertEquals(p.is_new, False)
-    self.assertEquals(p.get(), GIT_RENAME)
-    self.assertEquals([], p.svn_properties)
+    self._check_patch(p, 'tools/run_local_server.sh', GIT_RENAME,
+        is_git_diff=True, patchlevel=1)
 
   def testGitRenamePartial(self):
     p = patch.FilePatchDiff(
         'chrome/browser/chromeos/views/webui_menu_widget.h',
         GIT_RENAME_PARTIAL, [])
-    self.assertEquals(
-        p.filename, 'chrome/browser/chromeos/views/webui_menu_widget.h')
-    self.assertEquals(p.is_binary, False)
-    self.assertEquals(p.is_delete, False)
-    self.assertEquals(p.is_new, False)
-    self.assertEquals(p.get(), GIT_RENAME_PARTIAL)
-    self.assertEquals([], p.svn_properties)
+    self._check_patch(
+        p, 'chrome/browser/chromeos/views/webui_menu_widget.h',
+        GIT_RENAME_PARTIAL, is_git_diff=True, patchlevel=1)
 
   def testGitCopy(self):
     p = patch.FilePatchDiff('pp', GIT_COPY, [])
-    self.assertEquals(p.filename, 'pp')
-    self.assertEquals(p.is_binary, False)
-    self.assertEquals(p.is_delete, False)
-    self.assertEquals(p.is_new, False)
-    self.assertEquals(p.get(), GIT_COPY)
-    self.assertEquals([], p.svn_properties)
-
-  def testGitNew(self):
-    p = patch.FilePatchDiff('foo', GIT_NEW, [])
-    self.assertEquals(p.filename, 'foo')
-    self.assertEquals(p.is_binary, False)
-    self.assertEquals(p.is_delete, False)
-    self.assertEquals(p.is_new, True)
-    self.assertEquals(p.get(), GIT_NEW)
-    self.assertEquals([], p.svn_properties)
+    self._check_patch(p, 'pp', GIT_COPY, is_git_diff=True, patchlevel=1)
 
   def testOnlyHeader(self):
-    p = patch.FilePatchDiff('file_a', '--- file_a\n+++ file_a\n', [])
-    self.assertTrue(p)
+    diff = '--- file_a\n+++ file_a\n'
+    p = patch.FilePatchDiff('file_a', diff, [])
+    self._check_patch(p, 'file_a', diff)
 
   def testSmallest(self):
-    p = patch.FilePatchDiff(
-        'file_a', '--- file_a\n+++ file_a\n@@ -0,0 +1 @@\n+foo\n', [])
-    self.assertTrue(p)
+    diff = '--- file_a\n+++ file_a\n@@ -0,0 +1 @@\n+foo\n'
+    p = patch.FilePatchDiff('file_a', diff, [])
+    self._check_patch(p, 'file_a', diff)
 
   def testInverted(self):
     try:
       patch.FilePatchDiff(
         'file_a', '+++ file_a\n--- file_a\n@@ -0,0 +1 @@\n+foo\n', [])
       self.fail()
     except patch.UnsupportedPatchFormat:
       pass
 
   def testInvertedOnlyHeader(self):
     try:
       patch.FilePatchDiff('file_a', '+++ file_a\n--- file_a\n', [])
       self.fail()
     except patch.UnsupportedPatchFormat:
       pass
 
   def testRenameOnlyHeader(self):
-    p = patch.FilePatchDiff('file_b', '--- file_a\n+++ file_b\n', [])
-    self.assertEquals(p.filename, 'file_b')
-    self.assertEquals(p.is_binary, False)
-    self.assertEquals(p.is_delete, False)
+    diff = '--- file_a\n+++ file_b\n'
+    p = patch.FilePatchDiff('file_b', diff, [])
     # Should it be marked as new?
-    self.assertEquals(p.is_new, False)
-    self.assertEquals(p.get(), '--- file_a\n+++ file_b\n')
-    self.assertEquals([], p.svn_properties)
+    self._check_patch(p, 'file_b', diff)
 
   def testGitCopyPartial(self):
     diff = (
         'diff --git a/wtf b/wtf2\n'
         'similarity index 98%\n'
         'copy from wtf\n'
         'copy to wtf2\n'
         'index 79fbaf3..3560689 100755\n'
         '--- a/wtf\n'
         '+++ b/wtf2\n'
         '@@ -1,4 +1,4 @@\n'
         '-#!/usr/bin/env python\n'
         '+#!/usr/bin/env python1.3\n'
         ' # Copyright (c) 2010 The Chromium Authors. All rights reserved.\n'
         ' # blah blah blah as\n'
         ' # found in the LICENSE file.\n')
     p = patch.FilePatchDiff('wtf2', diff, [])
-    self.assertEquals(p.filename, 'wtf2')
-    self.assertEquals(p.is_binary, False)
-    self.assertEquals(p.is_delete, False)
     # Should it be marked as new?
-    self.assertEquals(p.is_new, False)
-    self.assertEquals(p.get(), diff)
-    self.assertEquals([], p.svn_properties)
+    self._check_patch(p, 'wtf2', diff, is_git_diff=True, patchlevel=1)
 
   def testGitExe(self):
     diff = (
         'diff --git a/natsort_test.py b/natsort_test.py\n'
         'new file mode 100755\n'
         '--- /dev/null\n'
         '+++ b/natsort_test.py\n'
         '@@ -0,0 +1,1 @@\n'
         '+#!/usr/bin/env python\n')
     p = patch.FilePatchDiff('natsort_test.py', diff, [])
-    self.assertEquals(p.filename, 'natsort_test.py')
-    self.assertEquals(p.is_binary, False)
-    self.assertEquals(p.is_delete, False)
-    self.assertEquals(p.is_new, True)
-    self.assertEquals(p.get(), diff)
-    self.assertEquals([('svn:executable', '*')], p.svn_properties)
+    self._check_patch(
+        p, 'natsort_test.py', diff, is_new=True, is_git_diff=True, patchlevel=1,
+        svn_properties=[('svn:executable', '*')])
 
   def testGitExe2(self):
     diff = (
         'diff --git a/natsort_test.py b/natsort_test.py\n'
         'new file mode 100644\n'
         '--- /dev/null\n'
         '+++ b/natsort_test.py\n'
         '@@ -0,0 +1,1 @@\n'
         '+#!/usr/bin/env python\n')
     p = patch.FilePatchDiff('natsort_test.py', diff, [])
-    self.assertEquals(p.filename, 'natsort_test.py')
-    self.assertEquals(p.is_binary, False)
-    self.assertEquals(p.is_delete, False)
-    self.assertEquals(p.is_new, True)
-    self.assertEquals(p.get(), diff)
-    self.assertEquals([], p.svn_properties)
+    self._check_patch(
+        p, 'natsort_test.py', diff, is_new=True, is_git_diff=True, patchlevel=1)
 
 
 if __name__ == '__main__':
   logging.basicConfig(level=
       [logging.WARNING, logging.INFO, logging.DEBUG][
         min(2, sys.argv.count('-v'))])
   unittest.main()