Add AffectedFile.IsTextFile() and deprecate AffectedTextFiles().

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_support.py and presubmit_canned_checks.py."""
 
 import os
 import StringIO
 import sys
 import unittest
+import warnings
 
 # Local imports
 import gcl
 import gclient
 import presubmit_support as presubmit
 import presubmit_canned_checks
 
 
 class PresubmitTestsBase(unittest.TestCase):
   """Setups and tear downs the mocks but doesn't test anything as-is."""
   def setUp(self):
+    self._warnings_stack = warnings.catch_warnings()
+    warnings.simplefilter("ignore", DeprecationWarning)
     self.original_IsFile = os.path.isfile
     def MockIsFile(f):
       dir = os.path.dirname(f)
       return dir.endswith('haspresubmit') or dir == ''
     os.path.isfile = MockIsFile
 
     self.original_CaptureSVNInfo = gclient.CaptureSVNInfo
     def MockCaptureSVNInfo(path):
       if path.count('notfound'):
         return {}
@@ skipping 52 matching lines @@
     self._sys_stdout = sys.stdout
     sys.stdout = StringIO.StringIO()
 
   def tearDown(self):
     os.path.isfile = self.original_IsFile
     gclient.CaptureSVNInfo = self.original_CaptureSVNInfo
     gcl.GetSVNFileProperty = self.original_GetSVNFileProperty
     gcl.ReadFile = self.original_ReadFile
     gcl.GetRepositoryRoot = self.original_GetRepositoryRoot
     sys.stdout = self._sys_stdout
+    self._warnings_stack = None
 
   @staticmethod
   def MakeBasicChange(name, description):
     ci = gcl.ChangeInfo(name=name,
                         description=description,
                         files=[])
     change = presubmit.GclChange(ci)
     return change
 
   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_support.py tests (excluding InputApi and OutputApi)."""
   def testMembersChanged(self):
     members = [
       'AffectedFile', 'DoPresubmitChecks', 'GclChange', 'InputApi',
       'ListRelevantPresubmitFiles', 'Main', 'NotImplementedException',
       'OutputApi', 'ParseFiles', 'PresubmitExecuter',
-      'ScanSubDirs', 'SvnAffectedFile', 'cPickle', 'cStringIO', 'exceptions',
+      'ScanSubDirs', 'SvnAffectedFile',
+      'cPickle', 'cStringIO', 'deprecated', 'exceptions',
       'fnmatch', 'gcl', 'gclient', 'glob', 'marshal', 'normpath', 'optparse',
       'os', 'pickle', 'presubmit_canned_checks', 're', 'subprocess', 'sys',
-      'tempfile', 'types', 'urllib2',
+      'tempfile', 'types', 'urllib2', 'warnings',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(presubmit, members)
 
   def testListRelevantPresubmitFiles(self):
     presubmit_files = presubmit.ListRelevantPresubmitFiles([
         'blat.cc',
         'foo/haspresubmit/yodle/smart.h',
         'moo/mat/gat/yo.h',
         'foo/luck.h'])
@@ skipping 308 matching lines @@
       'DepotToLocalPath', 'FilterTextFiles', 'LocalPaths', 'LocalToDepotPath',
       'PresubmitLocalPath', 'RightHandSideLines', 'ServerPaths',
       'basename', 'cPickle', 'cStringIO', 'canned_checks', 'change',
       'marshal', 'os_path', 'pickle', 'platform',
       're', 'subprocess', 'tempfile', 'urllib2', 'version',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(presubmit.InputApi(None, './.'), members)
 
   def testDepotToLocalPath(self):
-    path = presubmit.InputApi.DepotToLocalPath('svn:/foo/smurf')
+    path = presubmit.InputApi(None, './p').DepotToLocalPath('svn:/foo/smurf')
     self.failUnless(path == 'smurf')
-    path = presubmit.InputApi.DepotToLocalPath('svn:/foo/notfound/burp')
+    path = presubmit.InputApi(None, './p').DepotToLocalPath(
+        'svn:/foo/notfound/burp')
     self.failUnless(path == None)
 
   def testLocalToDepotPath(self):
-    path = presubmit.InputApi.LocalToDepotPath('smurf')
+    path = presubmit.InputApi(None, './p').LocalToDepotPath('smurf')
     self.failUnless(path == 'svn:/foo/smurf')
-    path = presubmit.InputApi.LocalToDepotPath('notfound-food')
+    path = presubmit.InputApi(None, './p').LocalToDepotPath('notfound-food')
     self.failUnless(path == None)
 
   def testInputApiConstruction(self):
     # Fudge the change object, it's not used during construction anyway
     api = presubmit.InputApi(change=42, presubmit_path='foo/path/PRESUBMIT.py')
     self.failUnless(api.PresubmitLocalPath() == 'foo/path')
     self.failUnless(api.change == 42)
 
   def testFilterTextFiles(self):
     class MockAffectedFile(object):
@@ skipping 46 matching lines @@
                       presubmit.normpath('foo/blat.cc'))
     self.assertEquals(affected_files[1].LocalPath(),
                       presubmit.normpath('foo/blat/binary.dll'))
     self.assertEquals(affected_files[2].LocalPath(),
                       presubmit.normpath('foo/mat/beingdeleted.txt'))
 
     rhs_lines = []
     for line in api.RightHandSideLines():
       rhs_lines.append(line)
     self.failUnless(len(rhs_lines) == 2)
-    self.failUnless(rhs_lines[0][0].LocalPath() ==
+    self.assertEqual(rhs_lines[0][0].LocalPath(),
                     presubmit.normpath('foo/blat.cc'))
 
   def testGetAbsoluteLocalPath(self):
     # Regression test for bug of presubmit stuff that relies on invoking
     # SVN (e.g. to get mime type of file) not working unless gcl invoked
     # from the client root (e.g. if you were at 'src' and did 'cd base' before
     # invoking 'gcl upload' it would fail because svn wouldn't find the files
     # the presubmit script was asking about).
     files = [
       ['A', 'isdir'],
@@ skipping 78 matching lines @@
     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',
+      'AbsoluteLocalPath', 'Action', 'IsDirectory', 'IsTextFile',
+      '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')
@@ skipping 146 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()