Rev 2493: Restore the test for iter_log_data as a deprecated function. in http://bzr.arbash-meinel.com/branches/bzr/jam-integration

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/jam-integration

------------------------------------------------------------
revno: 2493
revision-id: john at arbash-meinel.com-20070524121925-jf60fhqgvtcy6n0g
parent: john at arbash-meinel.com-20070524121306-jlb942ezpitxujud
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-05-24 07:19:25 -0500
message:
  Restore the test for iter_log_data as a deprecated function.
modified:
  bzrlib/tests/test_missing.py   test_missing.py-20051212000028-694fa4f658a81f48
-------------- next part --------------
=== modified file 'bzrlib/tests/test_missing.py'
--- a/bzrlib/tests/test_missing.py	2007-05-24 12:13:06 +0000
+++ b/bzrlib/tests/test_missing.py	2007-05-24 12:19:25 +0000
@@ -20,8 +20,10 @@
 from bzrlib.builtins import merge
 from bzrlib.missing import (
     find_unmerged,
+    iter_log_data,
     iter_log_revisions,
     )
+from bzrlib.symbol_versioning import zero_seventeen
 from bzrlib.tests import TestCaseWithTransport
 from bzrlib.workingtree import WorkingTree
 
@@ -56,6 +58,77 @@
         merger_tree.commit('d', rev_id='d')
         self.assertEqual(find_unmerged(original, merger), ([], [(2, 'd')]))
 
+    def test_iter_log_data(self):
+        base_tree = self.make_branch_and_tree('base')
+        self.build_tree(['base/a'])
+        base_tree.add(['a'], ['a-id'])
+        base_tree.commit('add a', rev_id='b-1')
+
+        child_tree = base_tree.bzrdir.sprout('child').open_workingtree()
+
+        self.build_tree(['child/b'])
+        child_tree.add(['b'], ['b-id'])
+        child_tree.commit('adding b', rev_id='c-2')
+
+        child_tree.remove(['a'])
+        child_tree.commit('removing a', rev_id='c-3')
+
+        self.build_tree_contents([('child/b', 'new contents for b\n')])
+        child_tree.commit('modifying b', rev_id='c-4')
+
+        child_tree.rename_one('b', 'c')
+        child_tree.commit('rename b=>c', rev_id='c-5')
+
+        base_extra, child_extra = find_unmerged(base_tree.branch,
+                                                child_tree.branch)
+        results = list(self.applyDeprecated(zero_seventeen, iter_log_data,
+                            base_extra,
+                            base_tree.branch.repository,
+                            verbose=True))
+        self.assertEqual([], results)
+
+        results = list(self.applyDeprecated(zero_seventeen, iter_log_data,
+                            child_extra,
+                            child_tree.branch.repository,
+                            verbose=True))
+        self.assertEqual(4, len(results))
+
+        r0,r1,r2,r3 = results
+
+        self.assertEqual((2, 'c-2'), (r0[0], r0[1].revision_id))
+        self.assertEqual((3, 'c-3'), (r1[0], r1[1].revision_id))
+        self.assertEqual((4, 'c-4'), (r2[0], r2[1].revision_id))
+        self.assertEqual((5, 'c-5'), (r3[0], r3[1].revision_id))
+
+        delta0 = r0[2]
+        self.assertNotEqual(None, delta0)
+        self.assertEqual([('b', 'b-id', 'file')], delta0.added)
+        self.assertEqual([], delta0.removed)
+        self.assertEqual([], delta0.renamed)
+        self.assertEqual([], delta0.modified)
+
+        delta1 = r1[2]
+        self.assertNotEqual(None, delta1)
+        self.assertEqual([], delta1.added)
+        self.assertEqual([('a', 'a-id', 'file')], delta1.removed)
+        self.assertEqual([], delta1.renamed)
+        self.assertEqual([], delta1.modified)
+
+        delta2 = r2[2]
+        self.assertNotEqual(None, delta2)
+        self.assertEqual([], delta2.added)
+        self.assertEqual([], delta2.removed)
+        self.assertEqual([], delta2.renamed)
+        self.assertEqual([('b', 'b-id', 'file', True, False)], delta2.modified)
+
+        delta3 = r3[2]
+        self.assertNotEqual(None, delta3)
+        self.assertEqual([], delta3.added)
+        self.assertEqual([], delta3.removed)
+        self.assertEqual([('b', 'c', 'b-id', 'file', False, False)],
+                         delta3.renamed)
+        self.assertEqual([], delta3.modified)
+
     def test_iter_log_revisions(self):
         base_tree = self.make_branch_and_tree('base')
         self.build_tree(['base/a'])