Coverage reached 61%

tests/test_cdiff.py

@@ -74,26 +74,136 @@ class TestPatchStream(unittest.TestCase):
 
 class TestHunk(unittest.TestCase):
 
-    def test_mdiff(self):
-        pass
-
     def test_get_old_text(self):
-        pass
+        hunk = cdiff.Hunk([], '@@ -1,2 +1,2 @@', (1,2), (1,2))
+        hunk.append(('-', 'foo\n'))
+        hunk.append(('+', 'bar\n'))
+        hunk.append((' ', 'common\n'))
+        self.assertEqual(
+                hunk._get_old_text(),
+                ['foo\n', 'common\n'])
 
     def test_get_new_text(self):
-        pass
+        hunk = cdiff.Hunk([], '@@ -1,2 +1,2 @@', (1,2), (1,2))
+        hunk.append(('-', 'foo\n'))
+        hunk.append(('+', 'bar\n'))
+        hunk.append((' ', 'common\n'))
+        self.assertEqual(
+                hunk._get_new_text(),
+                ['bar\n', 'common\n'])
 
 
 class TestDiff(unittest.TestCase):
 
+    def _init_diff(self):
+        hunk = cdiff.Hunk([], '@@ -1,2 +1,2 @@\n', (1,2), (1,2))
+        hunk.append(('-', 'hella\n'))
+        hunk.append(('+', 'hello\n'))
+        hunk.append((' ', 'world\n'))
+        diff = cdiff.Diff(['header\n'], '--- old\n', '+++ new\n', [hunk])
+        return diff
+
     def test_markup_mix(self):
-        pass
+        line = 'foo \x00-del\x01 \x00+add\x01 \x00^chg\x01 bar'
+        base_color = 'red'
+        diff = cdiff.Diff(None, None, None, None)
+        self.assertEqual(diff._markup_mix(line, base_color),
+                '\x1b[31mfoo \x1b[7m\x1b[31mdel\x1b[0m\x1b[31m '
+                '\x1b[7m\x1b[31madd\x1b[0m\x1b[31m '
+                '\x1b[4m\x1b[31mchg\x1b[0m\x1b[31m bar\x1b[0m')
 
     def test_markup_traditional(self):
-        pass
-
-    def test_markup_side_by_side(self):
-        pass
+        diff = self._init_diff()
+        out = list(diff.markup_traditional())
+        self.assertEqual(len(out), 7)
+
+        sys.stdout.write('\n')
+        for markup in out:
+            sys.stdout.write(markup)
+
+        self.assertEqual(out[0], '\x1b[36mheader\n\x1b[0m')
+        self.assertEqual(out[1], '\x1b[33m--- old\n\x1b[0m')
+        self.assertEqual(out[2], '\x1b[33m+++ new\n\x1b[0m')
+        self.assertEqual(out[3], '\x1b[1;34m@@ -1,2 +1,2 @@\n\x1b[0m')
+        self.assertEqual(out[4],
+                '\x1b[1;31m-\x1b[0m\x1b[31mhell\x1b[4m'
+                '\x1b[31ma\x1b[0m\x1b[31m\n\x1b[0m')
+        self.assertEqual(out[5],
+                '\x1b[1;32m+\x1b[0m\x1b[32mhell\x1b[4m'
+                '\x1b[32mo\x1b[0m\x1b[32m\n\x1b[0m')
+        self.assertEqual(out[6], '\x1b[0m world\n\x1b[0m')
+
+    def test_markup_side_by_side_padded(self):
+        diff = self._init_diff()
+        out = list(diff.markup_side_by_side(6))
+        self.assertEqual(len(out), 6)
+
+        sys.stdout.write('\n')
+        for markup in out:
+            sys.stdout.write(markup)
+
+        self.assertEqual(out[0], '\x1b[36mheader\n\x1b[0m')
+        self.assertEqual(out[1], '\x1b[33m--- old\n\x1b[0m')
+        self.assertEqual(out[2], '\x1b[33m+++ new\n\x1b[0m')
+        self.assertEqual(out[3], '\x1b[1;34m@@ -1,2 +1,2 @@\n\x1b[0m')
+        self.assertEqual(out[4],
+                '\x1b[33m1\x1b[0m '
+                '\x1b[31mhell\x1b[4m\x1b[31ma\x1b[0m\x1b[31m\x1b[0m  '
+                '\x1b[0m\x1b[33m1\x1b[0m '
+                '\x1b[32mhell\x1b[4m\x1b[32mo\x1b[0m\x1b[32m\x1b[0m\n')
+        self.assertEqual(out[5],
+                '\x1b[33m2\x1b[0m '
+                '\x1b[0mworld\x1b[0m  '
+                '\x1b[0m\x1b[33m2\x1b[0m '
+                '\x1b[0mworld\x1b[0m\n')
+
+    def test_markup_side_by_side_off_by_one(self):
+        diff = self._init_diff()
+        out = list(diff.markup_side_by_side(5))
+        self.assertEqual(len(out), 6)
+
+        sys.stdout.write('\n')
+        for markup in out:
+            sys.stdout.write(markup)
+
+        self.assertEqual(out[0], '\x1b[36mheader\n\x1b[0m')
+        self.assertEqual(out[1], '\x1b[33m--- old\n\x1b[0m')
+        self.assertEqual(out[2], '\x1b[33m+++ new\n\x1b[0m')
+        self.assertEqual(out[3], '\x1b[1;34m@@ -1,2 +1,2 @@\n\x1b[0m')
+        self.assertEqual(out[4],
+                '\x1b[33m1\x1b[0m '
+                '\x1b[31mhell\x1b[4m\x1b[31ma\x1b[0m '
+                '\x1b[0m\x1b[33m1\x1b[0m '
+                '\x1b[32mhell\x1b[4m\x1b[32mo\x1b[0m\n')
+        self.assertEqual(out[5],
+                '\x1b[33m2\x1b[0m '
+                '\x1b[0mworld\x1b[0m '
+                '\x1b[0m\x1b[33m2\x1b[0m '
+                '\x1b[0mworld\x1b[0m\n')
+
+    def test_markup_side_by_side_wrapped(self):
+        diff = self._init_diff()
+        out = list(diff.markup_side_by_side(4))
+        self.assertEqual(len(out), 6)
+
+        sys.stdout.write('\n')
+        for markup in out:
+            sys.stdout.write(markup)
+
+        self.assertEqual(out[0], '\x1b[36mheader\n\x1b[0m')
+        self.assertEqual(out[1], '\x1b[33m--- old\n\x1b[0m')
+        self.assertEqual(out[2], '\x1b[33m+++ new\n\x1b[0m')
+        self.assertEqual(out[3], '\x1b[1;34m@@ -1,2 +1,2 @@\n\x1b[0m')
+        self.assertEqual(out[4],
+                '\x1b[33m1\x1b[0m '
+                '\x1b[31mhel\x1b[0m\x1b[1;35m>\x1b[0m '
+                '\x1b[0m\x1b[33m1\x1b[0m '
+                '\x1b[32mhel\x1b[0m\x1b[1;35m>\x1b[0m\n')
+        self.assertEqual(out[5],
+                '\x1b[33m2\x1b[0m '
+                '\x1b[0mwor\x1b[0m\x1b[1;35m>\x1b[0m '
+                '\x1b[0m\x1b[33m2\x1b[0m '
+                '\x1b[0mwor\x1b[0m\x1b[1;35m>\x1b[0m\n')
 
 
 class TestUdiff(unittest.TestCase):