Add more tests and cleanup ChangeInfo class.

tests/gcl_unittest.py

 #!/usr/bin/python
 # Copyright (c) 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 gcl.py."""
 
+import StringIO
 import os
+import sys
 import unittest
 
 # Local imports
 import gcl
 
 
 class GclTestsBase(unittest.TestCase):
   """Setups and tear downs the mocks but doesn't test anything as-is."""
   def setUp(self):
     def RunShellMock(filename):
@@ skipping 30 matching lines @@
       'GetModifiedFiles', 'GetNamedNodeText', 'GetNodeNamedAttributeText',
       'GetRepositoryRoot', 'GetSVNFileInfo', 'GetSVNStatus',
       'GetSVNFileProperty', 'Help', 'IGNORE_PATHS', 'IsSVNMoved', 'IsTreeOpen',
       'Lint', 'LoadChangelistInfo', 'LoadChangelistInfoForMultiple',
       'MISSING_TEST_MSG', 'Opened', 'ParseXML', 'PresubmitCL', 'ReadFile',
       'RunShell',
       'RunShellWithReturnCode', 'SEPARATOR', 'SendToRietveld', 'TryChange',
       'UnknownFiles', 'UploadCL', 'Warn', 'WriteFile', 'gcl_info_dir',
       'getpass', 'main', 'os', 'random', 're', 'read_gcl_info',
       'repository_root', 'string', 'subprocess', 'sys', 'tempfile', 'upload',
-      'urllib2', 'use_shell', 'xml',
-        
+      'urllib2', 'xml',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(gcl, members)
 
   def testGetSVNFileInfo(self):
     def RunShellMock(command):
       return r"""<?xml version="1.0"?>
 <info>
 <entry kind="file" path="%s" revision="14628">
 <url>http://src.chromium.org/svn/trunk/src/chrome/app/d</url>
 <repository><root>http://src.chromium.org/svn</root></repository>
 <wc-info>
 <schedule>add</schedule>
 <depth>infinity</depth>
 <copy-from-url>http://src.chromium.org/svn/trunk/src/chrome/app/DEPS</copy-from-url>
 <copy-from-rev>14628</copy-from-rev>
 <checksum>369f59057ba0e6d9017e28f8bdfb1f43</checksum>
 </wc-info>
 </entry>
 </info>
 """ % command[3]
+    # GclTestsBase.tearDown will restore the original.
     gcl.RunShell = RunShellMock
     filename = os.path.join('app', 'd')
     info = gcl.GetSVNFileInfo(filename)
     expected = {
       'URL': 'http://src.chromium.org/svn/trunk/src/chrome/app/d',
       'Repository Root': 'http://src.chromium.org/svn',
       'Schedule': 'add',
       'Copied From URL': 'http://src.chromium.org/svn/trunk/src/chrome/app/DEPS',
       'Copied From Rev': '14628',
       'Path': filename,
@@ skipping 33 matching lines @@
 <wc-status props="normal" item="conflicted" revision="14725">
 <commit revision="14633">
 <author>nsylvain@chromium.org</author>
 <date>2009-04-27T19:37:17.977400Z</date>
 </commit>
 </wc-status>
 </entry>
 </target>
 </status>
 """
+    # GclTestsBase.tearDown will restore the original.
     gcl.RunShell = RunShellMock
     info = gcl.GetSVNStatus('.')
     expected = [
       ('?      ', 'unversionned_file.txt'),
       ('M      ', 'build\\internal\\essential.vsprops'),
       ('A  +   ', 'chrome\\app\\d'),
       ('MM     ', 'chrome\\app\\DEPS'),
       ('C      ', 'scripts\\master\\factory\\gclient_factory.py'),
     ]
     self.assertEquals(sorted(info), sorted(expected))
 
   def testGetSVNStatusEmpty(self):
     def RunShellMock(command):
       return r"""<?xml version="1.0"?>
 <status>
 <target
    path="perf">
 </target>
 </status>
 """
+    # GclTestsBase.tearDown will restore the original.
     gcl.RunShell = RunShellMock
     info = gcl.GetSVNStatus(None)
     self.assertEquals(info, [])
 
+  def testHelp(self):
+    old_stdout = sys.stdout
+    try:
+      dummy = StringIO.StringIO()
+      gcl.sys.stdout = dummy
+      gcl.Help()
+      self.assertEquals(len(dummy.getvalue()), 1718)
+    finally:
+      gcl.sys.stdout = old_stdout
+
+  def testGetRepositoryRoot(self):
+    try:
+      def RunShellMock(filename):
+        return '<?xml version="1.0"?>\n<info>'
+      gcl.RunShell = RunShellMock
+      gcl.GetRepositoryRoot()
+    except Exception,e:
+      self.assertEquals(e.args[0], "gcl run outside of repository")
+    pass
+
+
+class ChangeInfoUnittest(GclTestsBase):
+  def testChangeInfoMembers(self):
+    members = [
+      'CloseIssue', 'Delete', 'FileList', 'MissingTests', 'Save',
+      'UpdateRietveldDescription', 'description', 'files', 'issue', 'name',
+      'patch'
+    ]
+    # If this test fails, you should add the relevant test.
+    self.compareMembers(gcl.ChangeInfo(), members)
+
+  def testChangeInfoBase(self):
+    files = [('M', 'foo'), ('A', 'bar')]
+    o = gcl.ChangeInfo('name2', 'issue2', 'description2', files)
+    self.assertEquals(o.name, 'name2')
+    self.assertEquals(o.issue, 'issue2')
+    self.assertEquals(o.description, 'description2')
+    self.assertEquals(o.files, files)
+    self.assertEquals(o.patch, None)
+    self.assertEquals(o.FileList(), ['foo', 'bar'])
+
 
 if __name__ == '__main__':
   unittest.main()