[Pkg-bazaar-commits] ./bzr/unstable r836: - more merge tests from john

[Martin Pool]

------------------------------------------------------------
revno: 836
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-07-06 10:37:03 +1000
message:
  - more merge tests from john
modified:
  bzrlib/selftest/testmerge3.py
-------------- next part --------------
=== modified file 'bzrlib/selftest/testmerge3.py'
--- a/bzrlib/selftest/testmerge3.py	2005-07-05 13:02:38 +0000
+++ b/bzrlib/selftest/testmerge3.py	2005-07-06 00:37:03 +0000
@@ -108,17 +108,73 @@
 
 
 
+class AppendA(TestBase):
+    def runTest(self):
+        m3 = Merge3(['aaa\n', 'bbb\n'],
+                    ['aaa\n', 'bbb\n', '222\n'],
+                    ['aaa\n', 'bbb\n'])
+
+        self.assertEquals(''.join(m3.merge_lines()),
+                          'aaa\nbbb\n222\n')
+
+class AppendB(TestBase):
+    def runTest(self):
+        m3 = Merge3(['aaa\n', 'bbb\n'],
+                    ['aaa\n', 'bbb\n'],
+                    ['aaa\n', 'bbb\n', '222\n'])
+
+        self.assertEquals(''.join(m3.merge_lines()),
+                          'aaa\nbbb\n222\n')
+
+class AppendAgreement(TestBase):
+    def runTest(self):
+        m3 = Merge3(['aaa\n', 'bbb\n'],
+                    ['aaa\n', 'bbb\n', '222\n'],
+                    ['aaa\n', 'bbb\n', '222\n'])
+
+        self.assertEquals(''.join(m3.merge_lines()),
+                          'aaa\nbbb\n222\n')
+
+class AppendClash(TestBase):
+    def runTest(self):
+        m3 = Merge3(['aaa\n', 'bbb\n'],
+                    ['aaa\n', 'bbb\n', '222\n'],
+                    ['aaa\n', 'bbb\n', '333\n'])
+
+        ml = m3.merge_lines(name_a='a',
+                            name_b='b',
+                            start_marker='<<',
+                            mid_marker='--',
+                            end_marker='>>')
+        self.assertEquals(''.join(ml),
+'''\
+aaa
+bbb
+<< a
+222
+--
+333
+>> b
+''')
+
+
 class InsertAgreement(TestBase):
     def runTest(self):
         m3 = Merge3(['aaa\n', 'bbb\n'],
                     ['aaa\n', '222\n', 'bbb\n'],
                     ['aaa\n', '222\n', 'bbb\n'])
 
+        ml = m3.merge_lines(name_a='a',
+                            name_b='b',
+                            start_marker='<<',
+                            mid_marker='--',
+                            end_marker='>>')
         self.assertEquals(''.join(m3.merge_lines()),
                           'aaa\n222\nbbb\n')
 
 
 
+
 class InsertClash(TestBase):
     """Both try to insert lines in the same place."""
     def runTest(self):