Remove SVN-specific function InputApi.FilterTextFiles().

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 __init__
 import gcl
 import gclient
 import presubmit_support as presubmit
 import presubmit_canned_checks
 mox = __init__.mox
 
 
-class PresubmitTestsBase(unittest.TestCase):
+class PresubmitTestsBase(mox.MoxTestBase):
   """Setups and tear downs the mocks but doesn't test anything as-is."""
   def setUp(self):
-    if hasattr(warnings, 'catch_warnings'):
-      self._warnings_stack = warnings.catch_warnings()
-    else:
-      self._warnings_stack = None
-    warnings.simplefilter("ignore", DeprecationWarning)
-    self.mox = mox.Mox()
+    super(PresubmitTestsBase, self).setUp()
+    self.mox.StubOutWithMock(presubmit, 'warnings')
     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 58 matching lines @@
 
   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
     os.path.exists = self._os_path_exists
     os.path.isdir = self._os_path_isdir
-    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):
@@ skipping 73 matching lines @@
 
     self.failUnless(change.BUG == '123')
     self.failUnless(change.STORY == 'http://foo/')
 
     self.failUnless(len(change.AffectedFiles()) == 4)
     self.failUnless(len(change.AffectedFiles(include_dirs=True)) == 5)
     self.failUnless(len(change.AffectedFiles(include_deletes=False)) == 3)
     self.failUnless(len(change.AffectedFiles(include_dirs=True,
                                              include_deletes=False)) == 4)
 
-    affected_text_files = change.AffectedTextFiles(include_deletes=True)
-    self.failUnless(len(affected_text_files) == 3)
+    affected_text_files = change.AffectedTextFiles()
+    self.failUnless(len(affected_text_files) == 2)
     self.failIf(filter(lambda x: x.LocalPath() == 'binary.dll',
                        affected_text_files))
 
     local_paths = change.LocalPaths()
     expected_paths = [presubmit.normpath(f[1]) for f in files]
     self.failUnless(
         len(filter(lambda x: x in expected_paths, local_paths)) == 4)
 
     server_paths = change.ServerPaths()
     expected_paths = ['svn:/foo/%s' % f[1] for f in files if
@@ skipping 247 matching lines @@
                        'Running default presubmit script.\n\n'
                        '** Presubmit Messages **\n\n'
                        'http://tracker.com/42\n\n'))
 
 
 class InputApiUnittest(PresubmitTestsBase):
   """Tests presubmit.InputApi."""
   def testMembersChanged(self):
     members = [
       'AbsoluteLocalPaths', 'AffectedFiles', 'AffectedTextFiles',
-      'DepotToLocalPath', 'FilterTextFiles', 'LocalPaths', 'LocalToDepotPath',
+      'DepotToLocalPath', '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(None, './p').DepotToLocalPath('svn:/foo/smurf')
     self.failUnless(path == 'smurf')
     path = presubmit.InputApi(None, './p').DepotToLocalPath(
         'svn:/foo/notfound/burp')
     self.failUnless(path == None)
 
   def testLocalToDepotPath(self):
     path = presubmit.InputApi(None, './p').LocalToDepotPath('smurf')
     self.failUnless(path == 'svn:/foo/smurf')
     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):
-      def __init__(self, path, action):
-        self.path = path
-        self.action = action
-      def Action(self):
-        return self.action
-      def LocalPath(self):
-        return self.path
-      def AbsoluteLocalPath(self):
-        return self.path
-
-    list = [MockAffectedFile('foo/blat.txt', 'M'),
-            MockAffectedFile('foo/binary.blob', 'M'),
-            MockAffectedFile('blat/flop.txt', 'D')]
-
-    output = presubmit.InputApi.FilterTextFiles(list, include_deletes=True)
-    self.failUnless(len(output) == 2)
-    self.failUnless(list[0] in output and list[2] in output)
-
-    output = presubmit.InputApi.FilterTextFiles(list, include_deletes=False)
-    self.failUnless(len(output) == 1)
-    self.failUnless(list[0] in output)
-
   def testInputApiPresubmitScriptFiltering(self):
     description_lines = ('Hello there',
                          'this is a change',
                          'BUG=123',
                          ' STORY =http://foo/  \t',
                          'and some more regular text')
     files = [
       ['A', os.path.join('foo', 'blat.cc')],
       ['M', os.path.join('foo', 'blat', 'binary.dll')],
       ['D', 'foo/mat/beingdeleted.txt'],
@@ skipping 66 matching lines @@
     # New helper functions need to work
     absolute_paths_from_change = change.AbsoluteLocalPaths(include_dirs=True)
     api = presubmit.InputApi(change=change, presubmit_path='isdir/PRESUBMIT.py')
     absolute_paths_from_api = api.AbsoluteLocalPaths(include_dirs=True)
     for absolute_paths in [absolute_paths_from_change,
                            absolute_paths_from_api]:
       self.failUnless(absolute_paths[0] == presubmit.normpath('c:/temp/isdir'))
       self.failUnless(absolute_paths[1] ==
                       presubmit.normpath('c:/temp/isdir/blat.cc'))
 
+  def testDeprecated(self):
+    presubmit.warnings.warn(mox.IgnoreArg(), category=mox.IgnoreArg(),
+                            stacklevel=2)
+    self.mox.ReplayAll()
+    change = presubmit.GclChange(gcl.ChangeInfo(name='mychange',
+                                                description='Bleh\n'))
+    api = presubmit.InputApi(change, 'foo/PRESUBMIT.py')
+    api.AffectedTextFiles(include_deletes=False)
+    self.mox.VerifyAll()
+
 
 class OuputApiUnittest(PresubmitTestsBase):
   """Tests presubmit.OutputApi."""
   def testMembersChanged(self):
     members = [
       'MailTextResult', 'PresubmitError', 'PresubmitNotifyResult',
       'PresubmitPromptWarning', 'PresubmitResult',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(presubmit.OutputApi(), members)
@@ skipping 83 matching lines @@
   def testIsDirectory(self):
     os.path.exists('foo.cc').AndReturn(True)
     os.path.isdir('foo.cc').AndReturn(True)
     self.mox.ReplayAll()
     affected_file = presubmit.SvnAffectedFile('foo.cc', 'A')
     # Verify cache coherency.
     self.failUnless(affected_file.IsDirectory())
     self.failUnless(affected_file.IsDirectory())
     self.mox.VerifyAll()
 
+  def testIsTextFile(self):
+    list = [presubmit.SvnAffectedFile('foo/blat.txt', 'M'),
+            presubmit.SvnAffectedFile('foo/binary.blob', 'M'),
+            presubmit.SvnAffectedFile('blat/flop.txt', 'D')]
+    os.path.exists(os.path.join('foo', 'blat.txt')).AndReturn(True)
+    os.path.isdir(os.path.join('foo', 'blat.txt')).AndReturn(False)
+    os.path.exists(os.path.join('foo', 'binary.blob')).AndReturn(True)
+    os.path.isdir(os.path.join('foo', 'binary.blob')).AndReturn(False)
+    self.mox.ReplayAll()
+
+    output = filter(lambda x: x.IsTextFile(), list)
+    self.failUnless(len(output) == 1)
+    self.failUnless(list[0] == output[0])
+    self.mox.VerifyAll()
+
 
 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:
@@ skipping 123 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()