Refactor ChangeInfo.Load() to make it easier to support mulitple format.

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 35 matching lines @@
         'GenerateChangeName', 'GenerateDiff', 'GetCLs', 'GetCacheDir',
         'GetCachedFile', 'GetChangelistInfoFile', 'GetChangesDir',
         'GetCodeReviewSetting', 'GetEditor', 'GetFilesNotInCL', 'GetInfoDir',
         'GetIssueDescription', 'GetModifiedFiles', 'GetRepositoryRoot',
         'ListFiles',
         'LoadChangelistInfoForMultiple', 'MISSING_TEST_MSG',
         'OptionallyDoPresubmitChecks', 'REPOSITORY_ROOT',
         'RunShell', 'RunShellWithReturnCode', 'SVN',
         'SendToRietveld', 'TryChange', 'UnknownFiles', 'Warn',
         'attrs', 'breakpad', 'defer_attributes', 'gclient_utils', 'getpass',
-        'main', 'need_change', 'need_change_and_args', 'no_args', 'os',
+        'json', 'main', 'need_change', 'need_change_and_args', 'no_args', 'os',
         'random', 're', '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
 
@@ skipping 92 matching lines @@
     self.assertEquals(o.GetFileNames(), ['foo', 'bar'])
     self.assertEquals(o.GetFiles(), files)
     self.assertEquals(o.GetLocalRoot(), self.fake_root_dir)
 
   def testLoadWithIssue(self):
     description = ["This is some description.", "force an extra separator."]
     gcl.GetChangelistInfoFile('bleh').AndReturn('bleeeh')
     gcl.os.path.exists('bleeeh').AndReturn(True)
     gcl.gclient_utils.FileRead('bleeeh', 'r').AndReturn(
       gcl.ChangeInfo._SEPARATOR.join(["42, 53", "G      b.cc"] + description))
+    # Does an upgrade.
+    gcl.GetChangelistInfoFile('bleh').AndReturn('bleeeh')
+    gcl.gclient_utils.FileWrite('bleeeh', mox.IgnoreArg())
     self.mox.ReplayAll()
 
     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)
     self.assertEquals(change_info.description,
                       gcl.ChangeInfo._SEPARATOR.join(description))
     self.assertEquals(change_info.GetFiles(), [('G      ', 'b.cc')])
 
   def testLoadEmpty(self):
     gcl.GetChangelistInfoFile('bleh').AndReturn('bleeeh')
     gcl.os.path.exists('bleeeh').AndReturn(True)
     gcl.gclient_utils.FileRead('bleeeh', 'r').AndReturn(
         gcl.ChangeInfo._SEPARATOR.join(["", "", ""]))
+    # Does an upgrade.
+    gcl.GetChangelistInfoFile('bleh').AndReturn('bleeeh')
+    gcl.gclient_utils.FileWrite('bleeeh', mox.IgnoreArg())
     self.mox.ReplayAll()
 
     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)
     self.assertEquals(change_info.description, "")
     self.assertEquals(change_info.GetFiles(), [])
 
   def testSaveEmpty(self):
     gcl.GetChangelistInfoFile('').AndReturn('foo')
+    values = {
+        'description': '', 'patchset': 2, 'issue': 1,
+        'files': [], 'needs_upload': False}
     gcl.gclient_utils.FileWrite(
-        'foo',
-        gcl.ChangeInfo._SEPARATOR.join(['0, 0, clean', '', '']))
+        'foo', gcl.json.dumps(values, sort_keys=True, indent=2))
     self.mox.ReplayAll()
 
-    change_info = gcl.ChangeInfo('', 0, 0, '', None, self.fake_root_dir)
+    change_info = gcl.ChangeInfo('', 1, 2, '', None, self.fake_root_dir)
     change_info.Save()
 
   def testSaveDirty(self):
-    gcl.GetChangelistInfoFile('').AndReturn('foo')
+    gcl.GetChangelistInfoFile('n').AndReturn('foo')
+    values = {
+        'description': 'des', 'patchset': 0, 'issue': 0,
+        'files': [], 'needs_upload': True}
     gcl.gclient_utils.FileWrite(
-        'foo',
-        gcl.ChangeInfo._SEPARATOR.join(['0, 0, dirty', '', '']))
+        'foo', gcl.json.dumps(values, sort_keys=True, indent=2))
     self.mox.ReplayAll()
 
-    change_info = gcl.ChangeInfo('', 0, 0, '', None, self.fake_root_dir,
+    change_info = gcl.ChangeInfo('n', 0, 0, 'des', None, self.fake_root_dir,
                                  needs_upload=True)
     change_info.Save()
 
 
 class CMDuploadUnittest(GclTestsBase):
   def setUp(self):
     GclTestsBase.setUp(self)
     self.mox.StubOutWithMock(gcl, 'CheckHomeForFile')
     self.mox.StubOutWithMock(gcl, 'DoPresubmitChecks')
     self.mox.StubOutWithMock(gcl, 'GenerateDiff')
@@ skipping 126 matching lines @@
     try:
       gcl.CMDupload(['naame', '-s', 'foo'])
       self.fail()
     except SystemExit:
       pass
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()