Rev 399: Add a direct test that merge_changelog has the behavior we expect. 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: 399
revision-id: john at arbash-meinel.com-20100128112348-d6hlq3x1xp16mvzm
parent: john at arbash-meinel.com-20100128111824-f1bm98r52o5q462y
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: changelog-hook
timestamp: Thu 2010-01-28 05:23:48 -0600
message:
  Add a direct test that merge_changelog has the behavior we expect.
-------------- next part --------------
=== modified file 'tests/test_merge_changelog.py'
--- a/tests/test_merge_changelog.py	2010-01-28 11:18:24 +0000
+++ b/tests/test_merge_changelog.py	2010-01-28 11:23:48 +0000
@@ -44,5 +44,39 @@
     
 class TestMergeChangelog(tests.TestCase):
 
-    def test_nothing(self):
-        pass
+    def test_merge_by_version(self):
+        v_111_2 = """\
+psuedo-prog (1.1.1-2) unstable; urgency=low
+
+  * New upstream release.
+  * Awesome bug fixes.
+
+ -- Joe Foo <joe at example.com> Thu, 28 Jan 2010 10:45:44 +0000
+
+""".splitlines(True)
+
+        v_112_1 = """\
+psuedo-prog (1.1.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * No bug fixes :(
+
+ -- Barry Foo <barry at example.com> Thu, 27 Jan 2010 10:45:44 +0000
+
+""".splitlines(True)
+
+        v_001_1 = """\
+psuedo-prog (0.0.1-1) unstable; urgency=low
+
+  * New project released!!!!
+  * No bugs evar
+
+ -- Barry Foo <barry at example.com> Thu, 27 Jan 2010 10:00:44 +0000
+
+""".splitlines(True)
+
+        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))