test_cdiff.py 11KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357
  1. #!/usr/bin/env python
  2. # -*- coding: utf-8 -*-
  3. """Unit test for cdiff"""
  4. import sys
  5. if sys.hexversion < 0x02050000:
  6. raise SystemExit("*** Requires python >= 2.5.0")
  7. import unittest
  8. sys.path.insert(0, '')
  9. import cdiff
  10. class Sequential(object):
  11. """A non-seekable iterator, mock of file object"""
  12. def __init__(self, items):
  13. self._items = items
  14. self._index = 0
  15. def __iter__(self):
  16. while True:
  17. try:
  18. item = self._items[self._index]
  19. except IndexError:
  20. raise StopIteration
  21. yield item
  22. self._index += 1
  23. def readline(self):
  24. try:
  25. item = self._items[self._index]
  26. except IndexError:
  27. return ''
  28. self._index += 1
  29. return item
  30. class TestPatchStream(unittest.TestCase):
  31. def test_is_empty(self):
  32. stream = cdiff.PatchStream(Sequential([]))
  33. self.assertTrue(stream.is_empty())
  34. stream = cdiff.PatchStream(Sequential(['hello', 'world']))
  35. self.assertFalse(stream.is_empty())
  36. def test_read_stream_header(self):
  37. stream = cdiff.PatchStream(Sequential([]))
  38. self.assertEqual(stream.read_stream_header(1), [])
  39. items = ['hello', 'world', 'again']
  40. stream = cdiff.PatchStream(Sequential(items))
  41. self.assertEqual(stream.read_stream_header(2), items[:2])
  42. stream = cdiff.PatchStream(Sequential(items))
  43. self.assertEqual(stream.read_stream_header(4), items[:])
  44. def test_iter_after_read_stream_header(self):
  45. items = ['hello', 'world', 'again', 'and', 'again']
  46. stream = cdiff.PatchStream(Sequential(items))
  47. _ = stream.read_stream_header(2)
  48. out = list(stream)
  49. self.assertEqual(out, items)
  50. class TestHunk(unittest.TestCase):
  51. def test_get_old_text(self):
  52. hunk = cdiff.Hunk([], '@@ -1,2 +1,2 @@', (1,2), (1,2))
  53. hunk.append(('-', 'foo\n'))
  54. hunk.append(('+', 'bar\n'))
  55. hunk.append((' ', 'common\n'))
  56. self.assertEqual(hunk._get_old_text(), ['foo\n', 'common\n'])
  57. def test_get_new_text(self):
  58. hunk = cdiff.Hunk([], '@@ -1,2 +1,2 @@', (1,2), (1,2))
  59. hunk.append(('-', 'foo\n'))
  60. hunk.append(('+', 'bar\n'))
  61. hunk.append((' ', 'common\n'))
  62. self.assertEqual(hunk._get_new_text(), ['bar\n', 'common\n'])
  63. class TestDiff(unittest.TestCase):
  64. def _init_diff(self):
  65. hunk = cdiff.Hunk([], '@@ -1,2 +1,2 @@\n', (1,2), (1,2))
  66. hunk.append(('-', 'hella\n'))
  67. hunk.append(('+', 'hello\n'))
  68. hunk.append((' ', 'world\n'))
  69. diff = cdiff.Diff(['header\n'], '--- old\n', '+++ new\n', [hunk])
  70. return diff
  71. def test_markup_mix(self):
  72. line = 'foo \x00-del\x01 \x00+add\x01 \x00^chg\x01 bar'
  73. base_color = 'red'
  74. diff = cdiff.Diff(None, None, None, None)
  75. self.assertEqual(diff._markup_mix(line, base_color),
  76. '\x1b[31mfoo \x1b[7m\x1b[31mdel\x1b[0m\x1b[31m '
  77. '\x1b[7m\x1b[31madd\x1b[0m\x1b[31m '
  78. '\x1b[4m\x1b[31mchg\x1b[0m\x1b[31m bar\x1b[0m')
  79. def test_markup_traditional(self):
  80. diff = self._init_diff()
  81. out = list(diff.markup_traditional())
  82. self.assertEqual(len(out), 7)
  83. sys.stdout.write('\n')
  84. for markup in out:
  85. sys.stdout.write(markup)
  86. self.assertEqual(out[0], '\x1b[36mheader\n\x1b[0m')
  87. self.assertEqual(out[1], '\x1b[33m--- old\n\x1b[0m')
  88. self.assertEqual(out[2], '\x1b[33m+++ new\n\x1b[0m')
  89. self.assertEqual(out[3], '\x1b[1;34m@@ -1,2 +1,2 @@\n\x1b[0m')
  90. self.assertEqual(out[4],
  91. '\x1b[1;31m-\x1b[0m\x1b[31mhell\x1b[4m'
  92. '\x1b[31ma\x1b[0m\x1b[31m\n\x1b[0m')
  93. self.assertEqual(out[5],
  94. '\x1b[1;32m+\x1b[0m\x1b[32mhell\x1b[4m'
  95. '\x1b[32mo\x1b[0m\x1b[32m\n\x1b[0m')
  96. self.assertEqual(out[6], '\x1b[0m world\n\x1b[0m')
  97. def test_markup_side_by_side_padded(self):
  98. diff = self._init_diff()
  99. out = list(diff.markup_side_by_side(6))
  100. self.assertEqual(len(out), 6)
  101. sys.stdout.write('\n')
  102. for markup in out:
  103. sys.stdout.write(markup)
  104. self.assertEqual(out[0], '\x1b[36mheader\n\x1b[0m')
  105. self.assertEqual(out[1], '\x1b[33m--- old\n\x1b[0m')
  106. self.assertEqual(out[2], '\x1b[33m+++ new\n\x1b[0m')
  107. self.assertEqual(out[3], '\x1b[1;34m@@ -1,2 +1,2 @@\n\x1b[0m')
  108. self.assertEqual(out[4],
  109. '\x1b[33m1\x1b[0m '
  110. '\x1b[31mhell\x1b[4m\x1b[31ma\x1b[0m\x1b[31m\x1b[0m '
  111. '\x1b[0m\x1b[33m1\x1b[0m '
  112. '\x1b[32mhell\x1b[4m\x1b[32mo\x1b[0m\x1b[32m\x1b[0m\n')
  113. self.assertEqual(out[5],
  114. '\x1b[33m2\x1b[0m '
  115. '\x1b[0mworld\x1b[0m '
  116. '\x1b[0m\x1b[33m2\x1b[0m '
  117. '\x1b[0mworld\x1b[0m\n')
  118. def test_markup_side_by_side_off_by_one(self):
  119. diff = self._init_diff()
  120. out = list(diff.markup_side_by_side(5))
  121. self.assertEqual(len(out), 6)
  122. sys.stdout.write('\n')
  123. for markup in out:
  124. sys.stdout.write(markup)
  125. self.assertEqual(out[0], '\x1b[36mheader\n\x1b[0m')
  126. self.assertEqual(out[1], '\x1b[33m--- old\n\x1b[0m')
  127. self.assertEqual(out[2], '\x1b[33m+++ new\n\x1b[0m')
  128. self.assertEqual(out[3], '\x1b[1;34m@@ -1,2 +1,2 @@\n\x1b[0m')
  129. self.assertEqual(out[4],
  130. '\x1b[33m1\x1b[0m '
  131. '\x1b[31mhell\x1b[4m\x1b[31ma\x1b[0m '
  132. '\x1b[0m\x1b[33m1\x1b[0m '
  133. '\x1b[32mhell\x1b[4m\x1b[32mo\x1b[0m\n')
  134. self.assertEqual(out[5],
  135. '\x1b[33m2\x1b[0m '
  136. '\x1b[0mworld\x1b[0m '
  137. '\x1b[0m\x1b[33m2\x1b[0m '
  138. '\x1b[0mworld\x1b[0m\n')
  139. def test_markup_side_by_side_wrapped(self):
  140. diff = self._init_diff()
  141. out = list(diff.markup_side_by_side(4))
  142. self.assertEqual(len(out), 6)
  143. sys.stdout.write('\n')
  144. for markup in out:
  145. sys.stdout.write(markup)
  146. self.assertEqual(out[0], '\x1b[36mheader\n\x1b[0m')
  147. self.assertEqual(out[1], '\x1b[33m--- old\n\x1b[0m')
  148. self.assertEqual(out[2], '\x1b[33m+++ new\n\x1b[0m')
  149. self.assertEqual(out[3], '\x1b[1;34m@@ -1,2 +1,2 @@\n\x1b[0m')
  150. self.assertEqual(out[4],
  151. '\x1b[33m1\x1b[0m '
  152. '\x1b[31mhel\x1b[0m\x1b[1;35m>\x1b[0m '
  153. '\x1b[0m\x1b[33m1\x1b[0m '
  154. '\x1b[32mhel\x1b[0m\x1b[1;35m>\x1b[0m\n')
  155. self.assertEqual(out[5],
  156. '\x1b[33m2\x1b[0m '
  157. '\x1b[0mwor\x1b[0m\x1b[1;35m>\x1b[0m '
  158. '\x1b[0m\x1b[33m2\x1b[0m '
  159. '\x1b[0mwor\x1b[0m\x1b[1;35m>\x1b[0m\n')
  160. class TestUdiff(unittest.TestCase):
  161. diff = cdiff.Udiff(None, None, None, None)
  162. def test_is_hunk_meta_normal(self):
  163. self.assertTrue(self.diff.is_hunk_meta('@@ -1 +1 @@'))
  164. self.assertTrue(self.diff.is_hunk_meta('@@ -3,7 +3,6 @@'))
  165. self.assertTrue(self.diff.is_hunk_meta('@@ -3,7 +3,6 @@ class Foo'))
  166. self.assertTrue(self.diff.is_hunk_meta('@@ -3,7 +3,6 @@ class Foo\n'))
  167. self.assertTrue(self.diff.is_hunk_meta('@@ -3,7 +3,6 @@ class Foo\r\n'))
  168. def test_is_hunk_meta_svn_prop(self):
  169. self.assertTrue(self.diff.is_hunk_meta('## -0,0 +1 ##'))
  170. self.assertTrue(self.diff.is_hunk_meta('## -0,0 +1 ##\n'))
  171. self.assertTrue(self.diff.is_hunk_meta('## -0,0 +1 ##\r\n'))
  172. def test_is_hunk_meta_neg(self):
  173. self.assertFalse(self.diff.is_hunk_meta('@@ -1 + @@'))
  174. self.assertFalse(self.diff.is_hunk_meta('@@ -this is not a hunk meta'))
  175. self.assertFalse(self.diff.is_hunk_meta('## -this is not either'))
  176. def test_parse_hunk_meta_normal(self):
  177. self.assertEqual(
  178. self.diff.parse_hunk_meta('@@ -3,7 +3,6 @@'),
  179. ((3, 7), (3, 6)))
  180. def test_parse_hunk_meta_missing(self):
  181. self.assertEqual(
  182. self.diff.parse_hunk_meta('@@ -3 +3,6 @@'),
  183. ((3, 0), (3, 6)))
  184. self.assertEqual(
  185. self.diff.parse_hunk_meta('@@ -3,7 +3 @@'),
  186. ((3, 7), (3, 0)))
  187. self.assertEqual(
  188. self.diff.parse_hunk_meta('@@ -3 +3 @@'),
  189. ((3, 0), (3, 0)))
  190. def test_parse_hunk_meta_svn_prop(self):
  191. self.assertEqual(
  192. self.diff.parse_hunk_meta('## -0,0 +1 ##'),
  193. ((0, 0), (1, 0)))
  194. def test_is_old(self):
  195. self.assertTrue(self.diff.is_old('-hello world'))
  196. self.assertTrue(self.diff.is_old('----')) # yaml
  197. def test_is_old_neg(self):
  198. self.assertFalse(self.diff.is_old('--- considered as old path'))
  199. self.assertFalse(self.diff.is_old('-------------')) # svn log --diff
  200. def test_is_new(self):
  201. self.assertTrue(self.diff.is_new('+hello world'))
  202. self.assertTrue(self.diff.is_new('++++hello world'))
  203. def test_is_new_neg(self):
  204. self.assertFalse(self.diff.is_new('+++ considered as new path'))
  205. class TestDiffParser(unittest.TestCase):
  206. def test_type_detect(self):
  207. patch = r"""\
  208. spam
  209. --- a
  210. +++ b
  211. @@ -1,2 +1,2 @@
  212. """
  213. items = patch.splitlines(True)
  214. stream = cdiff.PatchStream(Sequential(items))
  215. parser = cdiff.DiffParser(stream)
  216. self.assertEqual(parser._type, 'udiff')
  217. def test_type_detect_neg(self):
  218. patch = r"""\
  219. spam
  220. --- a
  221. +++ b
  222. spam
  223. """
  224. items = patch.splitlines(True)
  225. stream = cdiff.PatchStream(Sequential(items))
  226. self.assertRaises(RuntimeError, cdiff.DiffParser, stream)
  227. def test_parse_dangling_header(self):
  228. patch = r"""\
  229. --- a
  230. +++ b
  231. @@ -1,2 +1,2 @@
  232. -foo
  233. +bar
  234. common
  235. spam
  236. """
  237. items = patch.splitlines(True)
  238. stream = cdiff.PatchStream(Sequential(items))
  239. parser = cdiff.DiffParser(stream)
  240. self.assertRaises(RuntimeError, list, parser._parse())
  241. def test_parse_missing_new_path(self):
  242. patch = r"""\
  243. --- a
  244. +++ b
  245. @@ -1,2 +1,2 @@
  246. -foo
  247. +bar
  248. common
  249. --- c
  250. """
  251. items = patch.splitlines(True)
  252. stream = cdiff.PatchStream(Sequential(items))
  253. parser = cdiff.DiffParser(stream)
  254. self.assertRaises(AssertionError, list, parser._parse())
  255. def test_parse_missing_hunk(self):
  256. patch = r"""\
  257. --- a
  258. +++ b
  259. @@ -1,2 +1,2 @@
  260. -foo
  261. +bar
  262. common
  263. --- c
  264. +++ d
  265. """
  266. items = patch.splitlines(True)
  267. stream = cdiff.PatchStream(Sequential(items))
  268. parser = cdiff.DiffParser(stream)
  269. self.assertRaises(AssertionError, list, parser._parse())
  270. def test_parse_svn_prop(self):
  271. patch = r"""\
  272. --- a
  273. +++ b
  274. Added: svn:executable
  275. ## -0,0 +1 ##
  276. +*
  277. \ No newline at end of property
  278. Added: svn:keywords
  279. ## -0,0 +1 ##
  280. +Id
  281. """
  282. items = patch.splitlines(True)
  283. stream = cdiff.PatchStream(Sequential(items))
  284. parser = cdiff.DiffParser(stream)
  285. out = list(parser._parse())
  286. self.assertEqual(len(out), 1)
  287. self.assertEqual(len(out[0]._hunks), 2)
  288. hunk = out[0]._hunks[1]
  289. self.assertEqual(hunk._hunk_headers, ['Added: svn:keywords\n'])
  290. self.assertEqual(hunk._hunk_list, [('+', 'Id\n')])
  291. if __name__ == '__main__':
  292. unittest.main()
  293. # vim:set et sts=4 sw=4 tw=80: