Factor out SVN-specific methods out of AffectedFile.

tests/presubmit_unittest.py

 #!/usr/bin/python
 # Copyright (c) 2006-2009 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 presubmit.py and presubmit_canned_checks.py."""
+"""Unit tests for presubmit_support.py and presubmit_canned_checks.py."""
 
 import os
 import StringIO
 import sys
 import unittest
 
 # Local imports
 import gcl
 import gclient
 import presubmit_support as presubmit
@@ skipping 87 matching lines @@
   def compareMembers(self, object, members):
     """If you add a member, be sure to add the relevant test!"""
     # Skip over members starting with '_' since they are usually not meant to
     # be for public use.
     actual_members = [x for x in sorted(dir(object))
                       if not x.startswith('_')]
     self.assertEqual(actual_members, sorted(members))
 
 
 class PresubmitUnittest(PresubmitTestsBase):
-  """General presubmit.py tests (excluding InputApi and OutputApi)."""
+  """General presubmit_support.py tests (excluding InputApi and OutputApi)."""
   def testMembersChanged(self):
     members = [
       'AffectedFile', 'DoPresubmitChecks', 'GclChange', 'InputApi',
       'ListRelevantPresubmitFiles', 'Main', 'NotImplementedException',
       'OutputApi', 'ParseFiles', 'PresubmitExecuter', 'SPECIAL_KEYS',
-      'ScanSubDirs', 'cPickle', 'cStringIO', 'exceptions',
+      'ScanSubDirs', 'SvnAffectedFile', 'cPickle', 'cStringIO', 'exceptions',
       'fnmatch', 'gcl', 'gclient', 'glob', 'marshal', 'normpath', 'optparse',
       'os', 'pickle', 'presubmit_canned_checks', 're', 'subprocess', 'sys',
       'tempfile', 'types', 'urllib2',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(presubmit, members)
 
   def testListRelevantPresubmitFiles(self):
     presubmit_files = presubmit.ListRelevantPresubmitFiles([
         'blat.cc',
@@ skipping 78 matching lines @@
     self.failUnless(rhs_lines[1][2] == 'two:%s' % files[0][1])
 
     self.failUnless(rhs_lines[2][0].LocalPath() == files[3][1])
     self.failUnless(rhs_lines[2][1] == 1)
     self.failUnless(rhs_lines[2][2] == 'one:%s' % files[3][1])
 
     self.failUnless(rhs_lines[3][0].LocalPath() == files[3][1])
     self.failUnless(rhs_lines[3][1] == 2)
     self.failUnless(rhs_lines[3][2] == 'two:%s' % files[3][1])
 
-  def testAffectedFile(self):
-    af = presubmit.AffectedFile('foo/blat.cc', 'M')
-    self.failUnless(af.ServerPath() == 'svn:/foo/foo/blat.cc')
-    self.failUnless(af.LocalPath() == presubmit.normpath('foo/blat.cc'))
-    self.failUnless(af.Action() == 'M')
-    self.failUnless(af.NewContents() == ['one:%s' % af.LocalPath(),
-                                         'two:%s' % af.LocalPath()])
-
-    af = presubmit.AffectedFile('notfound.cc', 'A')
-    self.failUnless(af.ServerPath() == '')
-
   def testExecPresubmitScript(self):
     description_lines = ('Hello there',
                          'this is a change',
                          'STORY=http://tracker/123')
     files = [
       ['A', 'foo\\blat.cc'],
     ]
     ci = gcl.ChangeInfo(name='mychange',
                         description='\n'.join(description_lines),
                         files=files)
@@ skipping 158 matching lines @@
                         files=files)
     change = presubmit.GclChange(ci)
 
     affected_files = change.AffectedFiles(include_dirs=False)
     self.failUnless(len(affected_files) == 1)
     self.failUnless(affected_files[0].LocalPath().endswith('blat.cc'))
 
     affected_files_and_dirs = change.AffectedFiles(include_dirs=True)
     self.failUnless(len(affected_files_and_dirs) == 2)
 
-  def testSvnProperty(self):
-    affected_file = presubmit.AffectedFile('foo.cc', 'A')
-    self.failUnless(affected_file.SvnProperty('svn:secret-property') ==
-                    'secret-property-value')
-
 
 class InputApiUnittest(PresubmitTestsBase):
   """Tests presubmit.InputApi."""
   def testMembersChanged(self):
     members = [
       'AbsoluteLocalPaths', 'AffectedFiles', 'AffectedTextFiles',
       'DepotToLocalPath', 'FilterTextFiles', 'LocalPaths', 'LocalToDepotPath',
       'PresubmitLocalPath', 'RightHandSideLines', 'ServerPaths',
       'basename', 'cPickle', 'cStringIO', 'canned_checks', 'change',
       'marshal', 'os_path', 'pickle', 'platform',
@@ skipping 167 matching lines @@
     self.failIf(warning._Handle(output, input))
     self.failUnless(output.getvalue().count('???'))
 
     output = StringIO.StringIO()
     input = StringIO.StringIO('\n')
     warning = presubmit.OutputApi.PresubmitPromptWarning('???')
     self.failIf(warning._Handle(output, input))
     self.failUnless(output.getvalue().count('???'))
 
 
+class AffectedFileUnittest(PresubmitTestsBase):
+  def testMembersChanged(self):
+    members = [
+      'AbsoluteLocalPath', 'Action', 'IsDirectory', 'LocalPath', 'NewContents',
+      'OldContents', 'OldFileTempPath', 'Property', 'ServerPath', 'action',
+      'is_directory', 'path', 'properties', 'repository_root', 'server_path',
+    ]
+    # If this test fails, you should add the relevant test.
+    self.compareMembers(presubmit.AffectedFile('a', 'b'), members)
+    self.compareMembers(presubmit.SvnAffectedFile('a', 'b'), members)
+
+  def testAffectedFile(self):
+    af = presubmit.SvnAffectedFile('foo/blat.cc', 'M')
+    self.failUnless(af.ServerPath() == 'svn:/foo/foo/blat.cc')
+    self.failUnless(af.LocalPath() == presubmit.normpath('foo/blat.cc'))
+    self.failUnless(af.Action() == 'M')
+    self.failUnless(af.NewContents() == ['one:%s' % af.LocalPath(),
+                                         'two:%s' % af.LocalPath()])
+
+    af = presubmit.AffectedFile('notfound.cc', 'A')
+    self.failUnless(af.ServerPath() == '')
+
+  def testProperty(self):
+    affected_file = presubmit.SvnAffectedFile('foo.cc', 'A')
+    self.failUnless(affected_file.Property('svn:secret-property') ==
+                    'secret-property-value')
+
+
 class CannedChecksUnittest(PresubmitTestsBase):
   """Tests presubmit_canned_checks.py."""
   class MockInputApi(object):
     class MockUrllib2(object):
       class urlopen(object):
         def __init__(self, url):
           if url == 'url_to_open':
             self.result = '1'
           else:
             self.result = '0'
@@ skipping 122 matching lines @@
     # TODO(maruel): Add real tests.
     self.failIf(presubmit_canned_checks.RunPythonUnitTests(
         self.MockInputApi(),
         presubmit.OutputApi, []))
     self.failUnless(presubmit_canned_checks.RunPythonUnitTests(
         self.MockInputApi(),
         presubmit.OutputApi, ['non_existent_module']))
 
 if __name__ == '__main__':
   unittest.main()