Make AffectedFile member variables private.

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):
   """Setups and tear downs the mocks but doesn't test anything as-is."""
   def setUp(self):
     self._warnings_stack = warnings.catch_warnings()
+    self.mox = mox.Mox()
     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'):
@@ skipping 45 matching lines @@
       else:
         return 'one:%s\r\ntwo:%s' % (path, path)
     gcl.ReadFile = MockReadFile
 
     self.original_GetRepositoryRoot = gcl.GetRepositoryRoot
     def MockGetRepositoryRoot():
       return ''
     gcl.GetRepositoryRoot = MockGetRepositoryRoot
     self._sys_stdout = sys.stdout
     sys.stdout = StringIO.StringIO()
+    self._os_path_exists = os.path.exists
+    os.path.exists = self.mox.CreateMockAnything()
+    self._os_path_isdir = os.path.isdir
+    os.path.isdir = self.mox.CreateMockAnything()
 
   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
 
@@ skipping 45 matching lines @@
                          'BUG=123',
                          ' STORY =http://foo/  \t',
                          'and some more regular text  \t')
     files = [
       ['A', 'foo/blat.cc'],
       ['M', 'binary.dll'],  # a binary file
       ['A', 'isdir'],  # a directory
       ['M', 'flop/notfound.txt'],  # not found in SVN, still exists locally
       ['D', 'boo/flap.h'],
     ]
-
+    os.path.exists(os.path.join('foo', 'blat.cc')).AndReturn(True)
+    os.path.isdir(os.path.join('foo', 'blat.cc')).AndReturn(False)
+    os.path.exists('binary.dll').AndReturn(True)
+    os.path.isdir('binary.dll').AndReturn(False)
+    os.path.exists('isdir').AndReturn(True)
+    os.path.isdir('isdir').AndReturn(True)
+    os.path.exists(os.path.join('flop', 'notfound.txt')).AndReturn(False)
+    os.path.exists(os.path.join('boo', 'flap.h')).AndReturn(False)
+    self.mox.ReplayAll()
     ci = gcl.ChangeInfo(name='mychange',
                         description='\n'.join(description_lines),
                         files=files)
     change = presubmit.GclChange(ci)
 
     self.failUnless(change.Change() == 'mychange')
     self.failUnless(change.DescriptionText() ==
                     'Hello there\nthis is a change\nand some more regular text')
     self.failUnless(change.FullDescriptionText() ==
                     '\n'.join(description_lines))
@@ skipping 37 matching lines @@
     self.failUnless(rhs_lines[1][1] == 2)
     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])
+    self.mox.VerifyAll()
 
   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),
@@ skipping 149 matching lines @@
     os.path.isfile = MockIsFile
     self.failIf(presubmit.DoPresubmitChecks(ci, False, True, output, input,
                                             DEFAULT_SCRIPT))
     self.assertEquals(output.getvalue().count('!!'), 1)
 
   def testDirectoryHandling(self):
     files = [
       ['A', 'isdir'],
       ['A', 'isdir\\blat.cc'],
     ]
+    os.path.exists('isdir').AndReturn(True)
+    os.path.isdir('isdir').AndReturn(True)
+    os.path.exists(os.path.join('isdir', 'blat.cc')).AndReturn(True)
+    os.path.isdir(os.path.join('isdir', 'blat.cc')).AndReturn(False)
+    self.mox.ReplayAll()
     ci = gcl.ChangeInfo(name='mychange',
                         description='foo',
                         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'))
-
+    self.mox.VerifyAll()
     affected_files_and_dirs = change.AffectedFiles(include_dirs=True)
     self.failUnless(len(affected_files_and_dirs) == 2)
 
   def testTags(self):
     DEFAULT_SCRIPT = """
 def CheckChangeOnUpload(input_api, output_api):
  if input_api.change.tags['BUG'] != 'boo':
    return [output_api.PresubmitError('Tag parsing failed. 1')]
  if input_api.change.tags['STORY'] != 'http://tracker.com/42':
    return [output_api.PresubmitError('Tag parsing failed. 2')]
@@ skipping 94 matching lines @@
                          ' 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'],
       ['M', 'flop/notfound.txt'],
       ['A', 'boo/flap.h'],
     ]
 
+    os.path.exists(os.path.join('foo', 'blat.cc')).AndReturn(True)
+    os.path.isdir(os.path.join('foo', 'blat.cc')).AndReturn(False)
+    os.path.exists(os.path.join('foo', 'blat', 'binary.dll')).AndReturn(True)
+    os.path.isdir(os.path.join('foo', 'blat', 'binary.dll')).AndReturn(False)
+    os.path.exists(os.path.join('foo', 'mat', 'beingdeleted.txt')).AndReturn(
+        False)
+    os.path.exists(os.path.join('flop', 'notfound.txt')).AndReturn(False)
+    os.path.exists(os.path.join('boo', 'flap.h')).AndReturn(True)
+    os.path.isdir(os.path.join('boo', 'flap.h')).AndReturn(False)
+    self.mox.ReplayAll()
     ci = gcl.ChangeInfo(name='mychange',
                         description='\n'.join(description_lines),
                         files=files)
     change = presubmit.GclChange(ci)
 
     api = presubmit.InputApi(change, 'foo/PRESUBMIT.py')
 
     affected_files = api.AffectedFiles()
     self.assertEquals(len(affected_files), 3)
     self.assertEquals(affected_files[0].LocalPath(),
                       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.assertEqual(rhs_lines[0][0].LocalPath(),
                     presubmit.normpath('foo/blat.cc'))
+    self.mox.VerifyAll()
 
   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'],
       ['A', os.path.join('isdir', 'blat.cc')]
@@ skipping 77 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', 'IsTextFile',
-      'LocalPath', 'NewContents',
-      'OldContents', 'OldFileTempPath', 'Property', 'ServerPath', 'action',
-      'is_directory', 'path', 'properties', 'repository_root', 'server_path',
+      'AbsoluteLocalPath', 'Action', 'IsDirectory', 'IsTextFile', 'LocalPath',
+      'NewContents', 'OldContents', 'OldFileTempPath', 'Property', 'ServerPath',
     ]
     # 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')
+    os.path.exists(os.path.join('foo', 'blat.cc')).AndReturn(False)
+    self.mox.ReplayAll()
     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()])
+    self.mox.VerifyAll()
 
     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')
 
+  def testIsDirectoryNotExists(self):
+    # Verify cache coherency
+    os.path.exists('foo.cc').AndReturn(False)
+    self.mox.ReplayAll()
+    affected_file = presubmit.SvnAffectedFile('foo.cc', 'A')
+    self.failIf(affected_file.IsDirectory())
+    self.failIf(affected_file.IsDirectory())

[Jói Sigurðsson, 2009/05/28 21:30:51]

duplicate?

[M-A Ruel, 2009/05/29 00:59:55]

Yes, that's to verify the cache coherency. I've move the comment down a bit.

+    self.mox.VerifyAll()
+
+  def testIsDirectory(self):
+    # Verify cache coherency
+    os.path.exists('foo.cc').AndReturn(True)
+    os.path.isdir('foo.cc').AndReturn(True)
+    self.mox.ReplayAll()
+    affected_file = presubmit.SvnAffectedFile('foo.cc', 'A')
+    self.failUnless(affected_file.IsDirectory())
+    self.failUnless(affected_file.IsDirectory())

[Jói Sigurðsson, 2009/05/28 21:30:51]

duplicate?

+    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()