Fix handling of file renames.

tests/checkout_test.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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 checkout.py."""
 
 from __future__ import with_statement
 import logging
 import os
@@ skipping 22 matching lines @@
 
 
 class FakeRepos(fake_repos.FakeReposBase):
   def populateSvn(self):
     """Creates a few revisions of changes files."""
     subprocess2.check_call(
         ['svn', 'checkout', self.svn_base, self.svn_checkout, '-q',
          '--non-interactive', '--no-auth-cache',
          '--username', self.USERS[0][0], '--password', self.USERS[0][1]])
     assert os.path.isdir(os.path.join(self.svn_checkout, '.svn'))
+    self._commit_svn(self._tree_1())
+    self._commit_svn(self._tree_2())
+
+  @staticmethod
+  def _tree_1():
     fs = {}
     fs['trunk/origin'] = 'svn@1'
     fs['trunk/codereview.settings'] = (
         '# Test data\n'
         'bar: pouet\n')
     fs['trunk/chrome/file.cc'] = (
         'a\n'
         'bb\n'
         'ccc\n'
         'dd\n'
         'e\n'
         'ff\n'
         'ggg\n'
         'hh\n'
         'i\n'
         'jj\n'
         'kkk\n'
         'll\n'
         'm\n'
         'nn\n'
         'ooo\n'
         'pp\n'
         'q\n')
-    self._commit_svn(fs)
+    return fs
+
+  @classmethod
+  def _tree_2(cls):
+    fs = cls._tree_1()
     fs['trunk/origin'] = 'svn@2\n'
     fs['trunk/extra'] = 'dummy\n'
     fs['trunk/bin_file'] = '\x00'
-    self._commit_svn(fs)
+    fs['trunk/chromeos/views/DOMui_menu_widget.h'] = (
+      '// Copyright (c) 2010\n'
+      '// Use of this source code\n'
+      '// found in the LICENSE file.\n'
+      '\n'
+      '#ifndef DOM\n'
+      '#define DOM\n'
+      '#pragma once\n'
+      '\n'
+      '#include <string>\n'
+      '#endif\n')
+    return fs
 
   def populateGit(self):
     raise NotImplementedError()
 
 
 # pylint: disable=R0201
 class BaseTest(fake_repos.FakeReposTestBase):
   name = 'foo'
   FAKE_REPOS_CLASS = FakeRepos
   is_read_only = False
@@ skipping 12 matching lines @@
     subprocess2.call = redirect_call
     self.usr, self.pwd = self.FAKE_REPOS.USERS[0]
     self.previous_log = None
 
   def tearDown(self):
     subprocess2.call = self._old_call
     super(BaseTest, self).tearDown()
 
   def get_patches(self):
     return patch.PatchSet([
+        patch.FilePatchDiff('new_dir/subdir/new_file', GIT.NEW_SUBDIR, []),
+        patch.FilePatchDiff('chrome/file.cc', GIT.PATCH, []),
         # TODO(maruel): Test with is_new == False.
         patch.FilePatchBinary('bin_file', '\x00', [], is_new=True),
-        patch.FilePatchDiff(
-            'chrome/file.cc', GIT.PATCH, []),
-        patch.FilePatchDiff('new_dir/subdir/new_file', GIT.NEW_SUBDIR, []),
         patch.FilePatchDelete('extra', False),
     ])
 
   def get_trunk(self, modified):
     tree = {}
     subroot = 'trunk/'
     for k, v in self.FAKE_REPOS.svn_revs[-1].iteritems():
       if k.startswith(subroot):
         f = k[len(subroot):]
         assert f not in tree
@@ skipping 76 matching lines @@
     co.prepare(None)
     ps = self.get_patches()
     results = []
     co.apply_patch(ps)
     expected_co = getattr(co, 'checkout', co)
     # Because of ReadOnlyCheckout.
     expected = [(expected_co, p) for p in ps.patches]
     self.assertEquals(len(expected), len(results))
     self.assertEquals(expected, results)
 
+  def _check_move(self, co):
+    """Makes sure file moves are handled correctly."""
+    co.prepare(None)
+    patchset = patch.PatchSet([
+        patch.FilePatchDelete('chromeos/views/DOMui_menu_widget.h', False),
+        patch.FilePatchDiff(
+          'chromeos/views/webui_menu_widget.h', GIT.RENAME_PARTIAL, []),
+    ])
+    co.apply_patch(patchset)
+    # Make sure chromeos/views/DOMui_menu_widget.h is deleted and
+    # chromeos/views/webui_menu_widget.h is correctly created.
+    root = os.path.join(self.root_dir, self.name)
+    tree = self.get_trunk(False)
+    del tree['chromeos/views/DOMui_menu_widget.h']
+    tree['chromeos/views/webui_menu_widget.h'] = (
+        '// Copyright (c) 2011\n'
+        '// Use of this source code\n'
+        '// found in the LICENSE file.\n'
+        '\n'
+        '#ifndef WEB\n'
+        '#define WEB\n'
+        '#pragma once\n'
+        '\n'
+        '#include <string>\n'
+        '#endif\n')
+    #print patchset[0].get()
+    #print fake_repos.read_tree(root)
+    self.assertTree(tree, root)
+
 
 class SvnBaseTest(BaseTest):
   def setUp(self):
     super(SvnBaseTest, self).setUp()
     self.enabled = self.FAKE_REPOS.set_up_svn()
     self.assertTrue(self.enabled)
     self.svn_trunk = 'trunk'
     self.svn_url = self.svn_base + self.svn_trunk
     self.previous_log = self._log()
 
@@ skipping 128 matching lines @@
         ['svn', 'pget', 'svn:eol-style', 'chrome/file.cc'],
         cwd=co.project_path)
     self.assertEquals('LF\n', out)
 
   def testProcess(self):
     self._test_process(self._get_co)
 
   def testPrepare(self):
     self._test_prepare(self._get_co(None))
 
+  def testMove(self):
+    self._check_move(self._get_co(None))
+
 
 class GitSvnCheckout(SvnBaseTest):
   name = 'foo.git'
 
   def _get_co(self, post_processors):
     self.assertNotEqual(False, post_processors)
     return checkout.GitSvnCheckout(
         self.root_dir, self.name[:-4],
         self.usr, self.pwd,
         self.svn_base, self.svn_trunk, post_processors)
@@ skipping 50 matching lines @@
     # TODO(maruel): Cheat here until prepare(revision != None) implemented.
     co.old_prepare = co.prepare
     def prepare(rev):
       # Basically, test that it is broken.
       self.assertEquals(1, rev)
       self.assertEquals(2, co.old_prepare(None))
       return 1
     co.prepare = prepare
     self._test_prepare(co)
 
+  def testMove(self):
+    self._check_move(self._get_co(None))
+
 
 class RawCheckout(SvnBaseTest):
   def setUp(self):
     super(RawCheckout, self).setUp()
     # Use a svn checkout as the base.
     self.base_co = checkout.SvnCheckout(
         self.root_dir, self.name, None, None, self.svn_url)
     self.base_co.prepare(None)
 
   def _get_co(self, post_processors):
@@ skipping 43 matching lines @@
     # RawCheckout doesn't support prepare() but emulate it.
     co = self._get_co(None)
     revs = [1]
     def prepare(asked):
       self.assertEquals(1, asked)
       return revs.pop(0)
     co.prepare = prepare
     self._test_prepare(co)
     self.assertEquals([], revs)
 
+  def testMove(self):
+    self._check_move(self._get_co(None))
+
 
 class ReadOnlyCheckout(SvnBaseTest):
   # Use SvnCheckout as the backed since it support read-only checkouts too.
   is_read_only = True
 
   def _get_co(self, post_processors):
     self.assertNotEqual(False, post_processors)
     return checkout.ReadOnlyCheckout(
         checkout.SvnCheckout(
             self.root_dir, self.name, None, None, self.svn_url, None),
@@ skipping 11 matching lines @@
         'Hunk #1 FAILED at 3.\n'
         '1 out of 1 hunk FAILED -- saving rejects to file '
         'chrome/file.cc.rej\n')
 
   def testProcess(self):
     self._test_process(self._get_co)
 
   def testPrepare(self):
     self._test_prepare(self._get_co(None))
 
+  def testMove(self):
+    self._check_move(self._get_co(None))
+
 
 if __name__ == '__main__':
   if '-v' in sys.argv:
     DEBUGGING = True
     logging.basicConfig(
         level=logging.DEBUG,
         format='%(levelname)5s %(filename)15s(%(lineno)3d): %(message)s')
   else:
     logging.basicConfig(
         level=logging.ERROR,
         format='%(levelname)5s %(filename)15s(%(lineno)3d): %(message)s')
   unittest.main()