Rev 400: use a helper, and assert that the merge algo is symmetric. in http://bzr.arbash-meinel.com/branches/bzr/bzr-builddeb/changelog-hook

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/bzr-builddeb/changelog-hook

------------------------------------------------------------
revno: 400
revision-id: john at arbash-meinel.com-20100128113025-ei8809wjgv7x3mug
parent: john at arbash-meinel.com-20100128112348-d6hlq3x1xp16mvzm
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: changelog-hook
timestamp: Thu 2010-01-28 05:30:25 -0600
message:
  use a helper, and assert that the merge algo is symmetric.
-------------- next part --------------
=== modified file 'tests/test_merge_changelog.py'
--- a/tests/test_merge_changelog.py	2010-01-28 11:23:48 +0000
+++ b/tests/test_merge_changelog.py	2010-01-28 11:30:25 +0000
@@ -44,6 +44,10 @@
     
 class TestMergeChangelog(tests.TestCase):
 
+    def assertMergeChangelog(self, expected_lines, this_lines, other_lines):
+        merged_lines = merge_changelog.merge_changelog(this_lines, other_lines)
+        self.assertEqualDiff(''.join(expected_lines), ''.join(merged_lines))
+
     def test_merge_by_version(self):
         v_111_2 = """\
 psuedo-prog (1.1.1-2) unstable; urgency=low
@@ -78,5 +82,5 @@
         this_lines = v_111_2 + v_001_1
         other_lines = v_112_1 + v_001_1
         expected_lines = v_112_1 + v_111_2 + v_001_1
-        merged_lines = merge_changelog.merge_changelog(this_lines, other_lines)
-        self.assertEqualDiff(''.join(expected_lines), ''.join(merged_lines))
+        self.assertMergeChangelog(expected_lines, this_lines, other_lines)
+        self.assertMergeChangelog(expected_lines, other_lines, this_lines)