Refactor gcl.py to use a similar pattern for every commands.

tests/gcl_unittest.py

 #!/usr/bin/python
 # Copyright (c) 2010 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 gcl.py."""
 
 # Fixes include path.
 from super_mox import mox, SuperMoxTestBase
 
@@ skipping 13 matching lines @@
     self.mox.StubOutWithMock(gcl.gclient_utils, 'FileRead')
     self.mox.StubOutWithMock(gcl.gclient_utils, 'FileWrite')
     gcl.REPOSITORY_ROOT = None
 
 
 class GclUnittest(GclTestsBase):
   """General gcl.py tests."""
   def testMembersChanged(self):
     self.mox.ReplayAll()
     members = [
-        'CODEREVIEW_SETTINGS', 'CODEREVIEW_SETTINGS_FILE', 'Change',
-        'ChangeInfo', 'Changes', 'Commit', 'DEFAULT_LINT_IGNORE_REGEX',
-        'DEFAULT_LINT_REGEX', 'CheckHomeForFile', 'DeleteEmptyChangeLists',
+        'CODEREVIEW_SETTINGS', 'CODEREVIEW_SETTINGS_FILE',
+        'CMDchange', 'CMDchanges', 'CMDcommit', 'CMDdelete', 'CMDdeleteempties',
+        'CMDdescription', 'CMDdiff', 'CMDhelp', 'CMDlint', 'CMDnothave',
+        'CMDopened', 'CMDpresubmit', 'CMDrename', 'CMDsettings', 'CMDstatus',
+        'CMDtry', 'CMDupload',
+        'ChangeInfo', 'DEFAULT_LINT_IGNORE_REGEX',
+        'DEFAULT_LINT_REGEX', 'CheckHomeForFile',
         'DoPresubmitChecks', 'ErrorExit', 'FILES_CACHE', 'FilterFlag',
         'GenerateChangeName', 'GenerateDiff', 'GetCLs', 'GetCacheDir',
         'GetCachedFile', 'GetChangelistInfoFile', 'GetChangesDir',
         'GetCodeReviewSetting', 'GetEditor', 'GetFilesNotInCL', 'GetInfoDir',
-        'GetIssueDescription', 'GetModifiedFiles', 'GetRepositoryRoot', 'Help',
-        'Lint', 'LoadChangelistInfoForMultiple', 'MISSING_TEST_MSG', 'Opened',
-        'OptionallyDoPresubmitChecks', 'PresubmitCL', 'REPOSITORY_ROOT',
+        'GetIssueDescription', 'GetModifiedFiles', 'GetRepositoryRoot',
+        'ListFiles',
+        'LoadChangelistInfoForMultiple', 'MISSING_TEST_MSG',
+        'OptionallyDoPresubmitChecks', 'REPOSITORY_ROOT',
         'RunShell', 'RunShellWithReturnCode', 'SVN',
-        'SendToRietveld', 'TryChange', 'UnknownFiles', 'UploadCL', 'Warn',
+        'SendToRietveld', 'TryChange', 'UnknownFiles', 'Warn',
         'breakpad', 'gclient_utils', 'getpass', 'main', 'os', 'random', 're',
-        'shutil', 'string', 'subprocess', 'sys', 'tempfile', 'upload',
+        'shutil', 'string', 'subprocess', 'sys', 'tempfile', 'time', 'upload',
         'urllib2',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(gcl, members)
 
   def testIsSVNMoved(self):
     # TODO(maruel): TEST ME
     pass
 
   def testGetSVNFileProperty(self):
@@ skipping 14 matching lines @@
     self.mox.ReplayAll()
     self.assertRaises(gcl.gclient_utils.Error, gcl.GetRepositoryRoot)
 
   def testGetRepositoryRootGood(self):
     root_path = gcl.os.path.join('bleh', 'prout', 'pouet')
     gcl.os.getcwd().AndReturn(root_path)
     gcl.SVN.GetCheckoutRoot(root_path).AndReturn(root_path + '.~')
     self.mox.ReplayAll()
     self.assertEquals(gcl.GetRepositoryRoot(), root_path + '.~')
 
-  def testGetCachedFile(self):
-    # TODO(maruel): TEST ME
-    pass
-
-  def testGetCodeReviewSetting(self):
-    # TODO(maruel): TEST ME
-    pass
-
-  def testGetChangelistInfoFile(self):
-    # TODO(maruel): TEST ME
-    pass
-
-  def testLoadChangelistInfoForMultiple(self):
-    # TODO(maruel): TEST ME
-    pass
-
-  def testGetModifiedFiles(self):
-    # TODO(maruel): TEST ME
-    pass
-
-  def testGetFilesNotInCL(self):
-    # TODO(maruel): TEST ME
-    pass
-
-  def testSendToRietveld(self):
-    # TODO(maruel): TEST ME
-    pass
-
-  def testOpened(self):
-    # TODO(maruel): TEST ME
-    pass
-
   def testHelp(self):
     gcl.sys.stdout.write(mox.StrContains('GCL is a wrapper for Subversion'))
     gcl.sys.stdout.write('\n')
     self.mox.ReplayAll()
-    gcl.Help()
-
-  def testGenerateDiff(self):
-    # TODO(maruel): TEST ME
-    pass
-
-  def testPresubmitCL(self):
-    # TODO(maruel): TEST ME
-    pass
-
-  def testTryChange(self):
-    # TODO(maruel): TEST ME
-    pass
-
-  def testCommit(self):
-    # TODO(maruel): TEST ME
-    pass
-
-  def testChange(self):
-    # TODO(maruel): TEST ME
-    pass
-
-  def testLint(self):
-    # TODO(maruel): TEST ME
-    pass
-
-  def testDoPresubmitChecks(self):
-    # TODO(maruel): TEST ME
-    pass
+    gcl.CMDhelp()
 
 
 class ChangeInfoUnittest(GclTestsBase):
   def setUp(self):
     GclTestsBase.setUp(self)
     self.mox.StubOutWithMock(gcl, 'GetChangelistInfoFile')
     self.mox.StubOutWithMock(gcl, 'GetRepositoryRoot')
 
   def testChangeInfoMembers(self):
     self.mox.ReplayAll()
@@ skipping 66 matching lines @@
     gcl.gclient_utils.FileWrite(
         'foo',
         gcl.ChangeInfo._SEPARATOR.join(['0, 0, dirty', '', '']))
     self.mox.ReplayAll()
 
     change_info = gcl.ChangeInfo('', 0, 0, '', None, self.fake_root_dir,
                                  needs_upload=True)
     change_info.Save()
 
 
-class UploadCLUnittest(GclTestsBase):
+class CMDuploadUnittest(GclTestsBase):
   def setUp(self):
     GclTestsBase.setUp(self)
     self.mox.StubOutWithMock(gcl, 'CheckHomeForFile')
     self.mox.StubOutWithMock(gcl, 'DoPresubmitChecks')
     self.mox.StubOutWithMock(gcl, 'GenerateDiff')
     self.mox.StubOutWithMock(gcl, 'GetCodeReviewSetting')
     self.mox.StubOutWithMock(gcl, 'GetRepositoryRoot')
     self.mox.StubOutWithMock(gcl, 'SendToRietveld')
     self.mox.StubOutWithMock(gcl, 'TryChange')
 
@@ skipping 19 matching lines @@
     gcl.upload.RealMain(['upload.py', '-y', '--server=my_server', '--foo=bar',
         "--message=''", '--issue=1'], change_info.patch).AndReturn(("1",
                                                                     "2"))
     gcl.SendToRietveld("/lint/issue%s_%s" % ('1', '2'), timeout=0.5)
     gcl.GetCodeReviewSetting('TRY_ON_UPLOAD').AndReturn('True')
     gcl.TryChange(change_info, [], swallow_exception=True)
     gcl.os.chdir('somewhere')
     change_info.Save()
     self.mox.ReplayAll()
 
-    gcl.UploadCL(change_info, args)
+    gcl.CMDupload(change_info, args)
 
   def testServerOverride(self):
     change_info = gcl.ChangeInfo('naame', 0, 0, 'deescription',
                                  [('A', 'aa'), ('M', 'bb')],
                                 self.fake_root_dir)
     self.mox.StubOutWithMock(change_info, 'Save')
     args = ['--server=a', '--no_watchlists']
     change_info.Save()
     gcl.CheckHomeForFile('.gcl_upload_no_try').AndReturn(None)
     gcl.DoPresubmitChecks(change_info, False, True).AndReturn(True)
     gcl.GetCodeReviewSetting('CODE_REVIEW_SERVER').AndReturn('my_server')
     gcl.tempfile.mkstemp(text=True).AndReturn((42, 'descfile'))
     gcl.os.write(42, change_info.description)
     gcl.os.close(42)
     gcl.GetCodeReviewSetting('CC_LIST')
     gcl.GetCodeReviewSetting('PRIVATE')
     gcl.os.getcwd().AndReturn('somewhere')
     gcl.os.chdir(change_info.GetLocalRoot())
     gcl.GenerateDiff(change_info.GetFileNames())
     gcl.upload.RealMain(['upload.py', '-y', '--server=my_server', '--server=a',
         "--description_file=descfile",
         "--message=deescription"], change_info.patch).AndReturn(("1", "2"))
     gcl.os.remove('descfile')
     gcl.SendToRietveld("/lint/issue%s_%s" % ('1', '2'), timeout=0.5)
     gcl.os.chdir('somewhere')
     self.mox.ReplayAll()
 
-    gcl.UploadCL(change_info, args)
+    gcl.CMDupload(change_info, args)
 
   def testNoTry(self):
     change_info = gcl.ChangeInfo('naame', 0, 0, 'deescription',
                                  [('A', 'aa'), ('M', 'bb')],
                                  self.fake_root_dir)
     change_info.Save = self.mox.CreateMockAnything()
     args = ['--no-try', '--no_watchlists']
     change_info.Save()
     gcl.DoPresubmitChecks(change_info, False, True).AndReturn(True)
     gcl.GetCodeReviewSetting('CODE_REVIEW_SERVER').AndReturn('my_server')
     gcl.tempfile.mkstemp(text=True).AndReturn((42, 'descfile'))
     gcl.os.write(42, change_info.description)
     gcl.os.close(42)
     gcl.GetCodeReviewSetting('CC_LIST')
     gcl.GetCodeReviewSetting('PRIVATE')
     gcl.os.getcwd().AndReturn('somewhere')
     gcl.os.chdir(change_info.GetLocalRoot())
     gcl.GenerateDiff(change_info.GetFileNames())
     gcl.upload.RealMain(['upload.py', '-y', '--server=my_server',
         "--description_file=descfile",
         "--message=deescription"], change_info.patch).AndReturn(("1", "2"))
     gcl.os.remove('descfile')
     gcl.SendToRietveld("/lint/issue%s_%s" % ('1', '2'), timeout=0.5)
     gcl.os.chdir('somewhere')
     self.mox.ReplayAll()
 
-    gcl.UploadCL(change_info, args)
+    gcl.CMDupload(change_info, args)
 
   def testNormal(self):
     change_info = gcl.ChangeInfo('naame', 0, 0, 'deescription',
                                  [('A', 'aa'), ('M', 'bb')],
                                  self.fake_root_dir)
     self.mox.StubOutWithMock(change_info, 'Save')
     args = ['--no_watchlists']
     change_info.Save()
     gcl.CheckHomeForFile('.gcl_upload_no_try').AndReturn(None)
     gcl.DoPresubmitChecks(change_info, False, True).AndReturn(True)
     gcl.GetCodeReviewSetting('CODE_REVIEW_SERVER').AndReturn('my_server')
     gcl.tempfile.mkstemp(text=True).AndReturn((42, 'descfile'))
     gcl.os.write(42, change_info.description)
     gcl.os.close(42)
     gcl.GetCodeReviewSetting('CC_LIST')
     gcl.GetCodeReviewSetting('PRIVATE')
     gcl.os.getcwd().AndReturn('somewhere')
     gcl.os.chdir(change_info.GetLocalRoot())
     gcl.GenerateDiff(change_info.GetFileNames())
     gcl.upload.RealMain(['upload.py', '-y', '--server=my_server',
         "--description_file=descfile",
         "--message=deescription"], change_info.patch).AndReturn(("1", "2"))
     gcl.os.remove('descfile')
     gcl.SendToRietveld("/lint/issue%s_%s" % ('1', '2'), timeout=0.5)
     gcl.GetCodeReviewSetting('TRY_ON_UPLOAD').AndReturn('True')
     gcl.TryChange(change_info, [], swallow_exception=True)
     gcl.os.chdir('somewhere')
     self.mox.ReplayAll()
 
-    gcl.UploadCL(change_info, args)
+    gcl.CMDupload(change_info, args)
     self.assertEquals(change_info.issue, 1)
     self.assertEquals(change_info.patchset, 2)
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()