Refactor the unit tests.

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 exceptions
-import random
-import string
 import StringIO
 import unittest
 
 # Local imports
-import __init__
 import presubmit_support as presubmit
 import presubmit_canned_checks
-mox = __init__.mox
-
-def String(max_length):
-  return ''.join([random.choice(string.letters)
-                  for x in xrange(random.randint(1, max_length))])
-
-def Strings(max_arg_count, max_arg_length):
-  return [String(max_arg_length) for x in xrange(max_arg_count)]
-
-def Args(max_arg_count=8, max_arg_length=16):
-  return Strings(max_arg_count, random.randint(1, max_arg_length))
-
-def _DirElts(max_elt_count=4, max_elt_length=8):
-  return presubmit.os.sep.join(Strings(max_elt_count, max_elt_length))
-
-def Dir(max_elt_count=4, max_elt_length=8):
-  return (random.choice((presubmit_support.os.sep, '')) +
-              _DirElts(max_elt_count, max_elt_length))
-
-def Url(max_elt_count=4, max_elt_length=8):
-  return ('svn://random_host:port/a' +
-          _DirElts(max_elt_count, max_elt_length).replace(os.sep, '/'))
-
-def RootDir(max_elt_count=4, max_elt_length=8):
-  return presubmit.os.sep + _DirElts(max_elt_count, max_elt_length)
+import super_mox
+from super_mox import mox
 
 
-class PresubmitTestsBase(mox.MoxTestBase):
+class PresubmitTestsBase(super_mox.SuperMoxTestBase):
   """Setups and tear downs the mocks but doesn't test anything as-is."""
   presubmit_text = """
 def CheckChangeOnUpload(input_api, output_api):
   if not input_api.change.NOSUCHKEY:
     return [output_api.PresubmitError("!!")]
   elif not input_api.change.REALLYNOSUCHKEY:
     return [output_api.PresubmitPromptWarning("??")]
   elif not input_api.change.REALLYABSOLUTELYNOSUCHKEY:
     return [output_api.PresubmitPromptWarning("??"),
             output_api.PresubmitError("XX!!XX")]
   else:
     return ()
 """
 
   def setUp(self):
-    mox.MoxTestBase.setUp(self)
+    super_mox.SuperMoxTestBase.setUp(self)
     self.mox.StubOutWithMock(presubmit, 'warnings')
     # Stub out 'os' but keep os.path.dirname/join/normpath/splitext and os.sep.
     os_sep = presubmit.os.sep
     os_path_join = presubmit.os.path.join
     os_path_dirname = presubmit.os.path.dirname
     os_path_normpath = presubmit.os.path.normpath
     os_path_splitext = presubmit.os.path.splitext
     self.mox.StubOutWithMock(presubmit, 'os')
     self.mox.StubOutWithMock(presubmit.os, 'path')
     presubmit.os.sep = os_sep
     presubmit.os.path.join = os_path_join
     presubmit.os.path.dirname = os_path_dirname
     presubmit.os.path.normpath = os_path_normpath
     presubmit.os.path.splitext = os_path_splitext
     self.mox.StubOutWithMock(presubmit, 'sys')
     # Special mocks.
     def MockAbsPath(f):
       return f
     presubmit.os.path.abspath = MockAbsPath
     self.mox.StubOutWithMock(presubmit.gcl, 'GetRepositoryRoot')
-    fake_root_dir = RootDir()
+    fake_root_dir = self.RootDir()
     self.fake_root_dir = fake_root_dir
     def MockGetRepositoryRoot():
       return fake_root_dir
     presubmit.gcl.GetRepositoryRoot = MockGetRepositoryRoot
     self.mox.StubOutWithMock(presubmit.gclient, 'CaptureSVNInfo')
     self.mox.StubOutWithMock(presubmit.gcl, 'GetSVNFileProperty')
     self.mox.StubOutWithMock(presubmit.gcl, 'ReadFile')
 
-  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))
-
   def MakeBasicChange(self, name, description, root=None):
     ci = presubmit.gcl.ChangeInfo(name, 0, 0, description, None)
     if root is None:
       root = self.fake_root_dir
     return presubmit.GclChange(ci, root)
 
 
 class PresubmitUnittest(PresubmitTestsBase):
   """General presubmit_support.py tests (excluding InputApi and OutputApi)."""
   def testMembersChanged(self):
@@ skipping 1277 matching lines @@
     test_result.errors = 0
     self.mox.ReplayAll()
 
     results = presubmit_canned_checks.RunPythonUnitTests(
         input_api, presubmit.OutputApi, ['test_module'])
     self.assertEquals(len(results), 0)
 
 
 if __name__ == '__main__':
   unittest.main()