Fix gcl breakage.

tests/gcl_unittest.py

Index: tests/gcl_unittest.py
diff --git a/tests/gcl_unittest.py b/tests/gcl_unittest.py
index f731bd596044e13d29d4243fdc966be14461c85c..3d31167652d15efe57f39a92689294494fa4c0f9 100755
--- a/tests/gcl_unittest.py
+++ b/tests/gcl_unittest.py
@@ -17,6 +17,7 @@ class GclTestsBase(super_mox.SuperMoxTestBase):
   """Setups and tear downs the mocks but doesn't test anything as-is."""
   def setUp(self):
     super_mox.SuperMoxTestBase.setUp(self)
+    self.fake_root_dir = self.RootDir()
     self.mox.StubOutWithMock(gcl, 'RunShell')
     self.mox.StubOutWithMock(gcl.gclient, 'CaptureSVNInfo')
     self.mox.StubOutWithMock(gcl.os, 'getcwd')
@@ -60,13 +61,17 @@ class GclUnittest(GclTestsBase):
     # If this test fails, you should add the relevant test.
     self.compareMembers(gcl, members)
 
+  def testIsSVNMoved(self):
+    # TODO(maruel): TEST ME
+    pass
 
-  def testHelp(self):
-    self.mox.StubOutWithMock(gcl.sys, 'stdout')
-    gcl.sys.stdout.write(mox.StrContains('GCL is a wrapper for Subversion'))
-    gcl.sys.stdout.write('\n')
-    self.mox.ReplayAll()
-    gcl.Help()
+  def testGetSVNFileProperty(self):
+    # TODO(maruel): TEST ME
+    pass
+
+  def testUnknownFiles(self):
+    # TODO(maruel): TEST ME
+    pass
 
   def testGetRepositoryRootNone(self):
     gcl.REPOSITORY_ROOT = None
@@ -93,6 +98,73 @@ class GclUnittest(GclTestsBase):
     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):
+    self.mox.StubOutWithMock(gcl.sys, 'stdout')
+    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
+
 
 class ChangeInfoUnittest(GclTestsBase):
   def setUp(self):
@@ -101,7 +173,6 @@ class ChangeInfoUnittest(GclTestsBase):
     self.mox.StubOutWithMock(gcl, 'GetRepositoryRoot')
 
   def testChangeInfoMembers(self):
-    gcl.GetRepositoryRoot().AndReturn('prout')
     self.mox.ReplayAll()
     members = [
       'CloseIssue', 'Delete', 'GetFiles', 'GetFileNames', 'GetLocalRoot',
@@ -110,13 +181,14 @@ class ChangeInfoUnittest(GclTestsBase):
       'patch', 'patchset',
     ]
     # If this test fails, you should add the relevant test.
-    self.compareMembers(gcl.ChangeInfo('', 0, 0, '', None), members)
+    self.compareMembers(gcl.ChangeInfo('', 0, 0, '', None, self.fake_root_dir),
+                        members)
 
   def testChangeInfoBase(self):
     files = [('M', 'foo'), ('A', 'bar')]
-    gcl.GetRepositoryRoot().AndReturn('prout')
     self.mox.ReplayAll()
-    o = gcl.ChangeInfo('name2', '42', '53', 'description2', files)
+    o = gcl.ChangeInfo('name2', '42', '53', 'description2', files,
+                       self.fake_root_dir)
     self.assertEquals(o.name, 'name2')
     self.assertEquals(o.issue, 42)
     self.assertEquals(o.patchset, 53)
@@ -124,7 +196,7 @@ class ChangeInfoUnittest(GclTestsBase):
     self.assertEquals(o.patch, None)
     self.assertEquals(o.GetFileNames(), ['foo', 'bar'])
     self.assertEquals(o.GetFiles(), files)
-    self.assertEquals(o.GetLocalRoot(), 'prout')
+    self.assertEquals(o.GetLocalRoot(), self.fake_root_dir)
 
   def testLoadWithIssue(self):
     description = ["This is some description.", "force an extra separator."]
@@ -132,10 +204,9 @@ class ChangeInfoUnittest(GclTestsBase):
     gcl.os.path.exists('bleeeh').AndReturn(True)
     gcl.ReadFile('bleeeh').AndReturn(
       gcl.ChangeInfo._SEPARATOR.join(["42,53", "G      b.cc"] + description))
-    gcl.GetRepositoryRoot().AndReturn('prout')
     self.mox.ReplayAll()
 
-    change_info = gcl.ChangeInfo.Load('bleh', True, False)
+    change_info = gcl.ChangeInfo.Load('bleh', self.fake_root_dir, True, False)
     self.assertEquals(change_info.name, 'bleh')
     self.assertEquals(change_info.issue, 42)
     self.assertEquals(change_info.patchset, 53)
@@ -148,10 +219,9 @@ class ChangeInfoUnittest(GclTestsBase):
     gcl.os.path.exists('bleeeh').AndReturn(True)
     gcl.ReadFile('bleeeh').AndReturn(
         gcl.ChangeInfo._SEPARATOR.join(["", "", ""]))
-    gcl.GetRepositoryRoot().AndReturn('prout')
     self.mox.ReplayAll()
 
-    change_info = gcl.ChangeInfo.Load('bleh', True, False)
+    change_info = gcl.ChangeInfo.Load('bleh', self.fake_root_dir, True, False)
     self.assertEquals(change_info.name, 'bleh')
     self.assertEquals(change_info.issue, 0)
     self.assertEquals(change_info.patchset, 0)
@@ -161,9 +231,9 @@ class ChangeInfoUnittest(GclTestsBase):
   def testSaveEmpty(self):
     gcl.GetChangelistInfoFile('').AndReturn('foo')
     gcl.WriteFile('foo', gcl.ChangeInfo._SEPARATOR.join(['0, 0', '', '']))
-    gcl.GetRepositoryRoot().AndReturn('prout')
     self.mox.ReplayAll()
-    change_info = gcl.ChangeInfo('', 0, 0, '', None)
+
+    change_info = gcl.ChangeInfo('', 0, 0, '', None, self.fake_root_dir)
     change_info.Save()
 
 
@@ -209,7 +279,8 @@ class UploadCLUnittest(GclTestsBase):
 
   def testServerOverride(self):
     change_info = gcl.ChangeInfo('naame', 0, 0, 'deescription',
-                                 [('A', 'aa'), ('M', 'bb')])
+                                 [('A', 'aa'), ('M', 'bb')],
+                                self.fake_root_dir)
     self.mox.StubOutWithMock(change_info, 'Save')
     args = ['--server=a', '--no_watchlists']
     change_info.Save()
@@ -230,13 +301,12 @@ class UploadCLUnittest(GclTestsBase):
     gcl.os.chdir('somewhere')
     self.mox.ReplayAll()
 
-    # To balance out the call in gcl.ChangeInfo.__init__().
-    gcl.GetRepositoryRoot()
     gcl.UploadCL(change_info, args)
 
   def testNoTry(self):
     change_info = gcl.ChangeInfo('naame', 0, 0, 'deescription',
-                                 [('A', 'aa'), ('M', 'bb')])
+                                 [('A', 'aa'), ('M', 'bb')],
+                                 self.fake_root_dir)
     change_info.Save = self.mox.CreateMockAnything()
     args = ['--no-try', '--no_watchlists']
     change_info.Save()
@@ -257,13 +327,12 @@ class UploadCLUnittest(GclTestsBase):
     gcl.os.chdir('somewhere')
     self.mox.ReplayAll()
 
-    # To balance out the call in gcl.ChangeInfo.__init__().
-    gcl.GetRepositoryRoot()
     gcl.UploadCL(change_info, args)
 
   def testNormal(self):
     change_info = gcl.ChangeInfo('naame', 0, 0, 'deescription',
-                                 ['aa', 'bb'])
+                                 [('A', 'aa'), ('M', 'bb')],
+                                 self.fake_root_dir)
     self.mox.StubOutWithMock(change_info, 'Save')
     args = ['--no_watchlists']
     change_info.Save()
@@ -286,8 +355,6 @@ class UploadCLUnittest(GclTestsBase):
     gcl.os.chdir('somewhere')
     self.mox.ReplayAll()
 
-    # To balance out the call in gcl.ChangeInfo.__init__().
-    gcl.GetRepositoryRoot()
     gcl.UploadCL(change_info, args)
     self.assertEquals(change_info.issue, 1)
     self.assertEquals(change_info.patchset, 2)