test/diffparse_test.py

   1 from __future__ import absolute_import, division, unicode_literals
   2 import unittest
   3
   4 from cola import core
   5 from cola import diffparse
   6
   7 from . import helper
   8
   9
  10 class ParseDiffTestCase(unittest.TestCase):
  11
  12     def test_diff(self):
  13         fixture_path = helper.fixture('diff.txt')
  14         parser = diffparse.DiffParser(
  15             'cola/diffparse.py', core.read(fixture_path))
  16         hunks = parser.hunks
  17
  18         self.assertEqual(len(hunks), 3)
  19         self.assertEqual(hunks[0].first_line_idx, 0)
  20         self.assertEqual(len(hunks[0].lines), 23)
  21         self.assertEqual(
  22             hunks[0].lines[0],
  23             '@@ -6,10 +6,21 @@ from cola import gitcmds\n')
  24         self.assertEqual(
  25             hunks[0].lines[1],
  26             ' from cola import gitcfg\n')
  27         self.assertEqual(hunks[0].lines[2], ' \n')
  28         self.assertEqual(hunks[0].lines[3], ' \n')
  29         self.assertEqual(hunks[0].lines[4], '+class DiffSource(object):\n')
  30         self.assertEqual(
  31             hunks[0].lines[-1],
  32             r"         self._header_start_re = re.compile('^@@ -(\d+)"
  33             r" \+(\d+),(\d+) @@.*')"
  34             '\n')
  35
  36         self.assertEqual(hunks[1].first_line_idx, 23)
  37         self.assertEqual(len(hunks[1].lines), 18)
  38         self.assertEqual(
  39             hunks[1].lines[0],
  40             '@@ -29,13 +40,11 @@ class DiffParser(object):\n')
  41         self.assertEqual(
  42             hunks[1].lines[1],
  43             '         self.diff_sel = []\n')
  44         self.assertEqual(
  45             hunks[1].lines[2],
  46             '         self.selected = []\n')
  47         self.assertEqual(
  48             hunks[1].lines[3],
  49             '         self.filename = filename\n')
  50         self.assertEqual(
  51             hunks[1].lines[4],
  52             '+        self.diff_source = diff_source or DiffSource()\n')
  53         self.assertEqual(
  54             hunks[1].lines[-1],
  55             '         self.header = header\n')
  56
  57         self.assertEqual(hunks[2].first_line_idx, 41)
  58         self.assertEqual(len(hunks[2].lines), 16)
  59         self.assertEqual(
  60             hunks[2].lines[0],
  61             '@@ -43,11 +52,10 @@ class DiffParser(object):\n')
  62         self.assertEqual(
  63             hunks[2].lines[-1],
  64             '         """Writes a new diff corresponding to the user\'s'
  65             ' selection."""\n')
  66
  67     def test_diff_at_start(self):
  68         fixture_path = helper.fixture('diff-start.txt')
  69         parser = diffparse.DiffParser('foo bar/a', core.read(fixture_path))
  70         hunks = parser.hunks
  71
  72         self.assertEqual(hunks[0].lines[0], '@@ -1 +1,4 @@\n')
  73         self.assertEqual(hunks[-1].lines[-1], '+c\n')
  74         self.assertEqual(hunks[0].old_start, 1)
  75         self.assertEqual(hunks[0].old_count, 1)
  76         self.assertEqual(hunks[0].new_start, 1)
  77         self.assertEqual(hunks[0].new_count, 4)
  78         self.assertEqual(parser.generate_patch(1, 3),
  79                          '--- a/foo bar/a\n'
  80                          '+++ b/foo bar/a\n'
  81                          '@@ -1 +1,3 @@\n'
  82                          ' bar\n'
  83                          '+a\n'
  84                          '+b\n')
  85         self.assertEqual(parser.generate_patch(0, 4),
  86                          '--- a/foo bar/a\n'
  87                          '+++ b/foo bar/a\n'
  88                          '@@ -1 +1,4 @@\n'
  89                          ' bar\n'
  90                          '+a\n'
  91                          '+b\n'
  92                          '+c\n')
  93
  94     def test_diff_at_end(self):
  95         fixture_path = helper.fixture('diff-end.txt')
  96         parser = diffparse.DiffParser('rijndael.js', core.read(fixture_path))
  97         hunks = parser.hunks
  98
  99         self.assertEqual(hunks[0].lines[0], '@@ -1,39 +1 @@\n')
 100         self.assertEqual(
 101             hunks[-1].lines[-1],
 102             "+module.exports = require('./build/Release/rijndael');\n")
 103         self.assertEqual(hunks[0].old_start, 1)
 104         self.assertEqual(hunks[0].old_count, 39)
 105         self.assertEqual(hunks[0].new_start, 1)
 106         self.assertEqual(hunks[0].new_count, 1)
 107
 108     def test_diff_that_empties_file(self):
 109         fixture_path = helper.fixture('diff-empty.txt')
 110         parser = diffparse.DiffParser('filename', core.read(fixture_path))
 111         hunks = parser.hunks
 112
 113         self.assertEqual(hunks[0].lines[0], '@@ -1,2 +0,0 @@\n')
 114         self.assertEqual(hunks[-1].lines[-1], '-second\n')
 115         self.assertEqual(hunks[0].old_start, 1)
 116         self.assertEqual(hunks[0].old_count, 2)
 117         self.assertEqual(hunks[0].new_start, 0)
 118         self.assertEqual(hunks[0].new_count, 0)
 119         self.assertEqual(parser.generate_patch(1, 1),
 120                          '--- a/filename\n'
 121                          '+++ b/filename\n'
 122                          '@@ -1,2 +1 @@\n'
 123                          '-first\n'
 124                          ' second\n')
 125         self.assertEqual(parser.generate_patch(0, 2),
 126                          '--- a/filename\n'
 127                          '+++ b/filename\n'
 128                          '@@ -1,2 +0,0 @@\n'
 129                          '-first\n'
 130                          '-second\n')
 131
 132     def test_diff_file_removal(self):
 133         diff_text = """\
 134 deleted file mode 100755
 135 @@ -1,1 +0,0 @@
 136 -#!/bin/sh
 137 """
 138         parser = diffparse.DiffParser('deleted.txt', diff_text)
 139         self.assertEqual(1, len(parser.hunks))
 140
 141         # Selecting the first two lines generate no diff
 142         expect = None
 143         actual = parser.generate_patch(0, 1)
 144         self.assertEqual(expect, actual)
 145
 146         # Selecting the last line should generate a line removal
 147         expect = """\
 148 --- a/deleted.txt
 149 +++ b/deleted.txt
 150 @@ -1 +0,0 @@
 151 -#!/bin/sh
 152 """
 153         actual = parser.generate_patch(1, 2)
 154         self.assertEqual(expect, actual)
 155
 156         # All three lines should map to the same hunk diff
 157         actual = parser.generate_hunk_patch(0)
 158         self.assertEqual(expect, actual)
 159
 160         actual = parser.generate_hunk_patch(1)
 161         self.assertEqual(expect, actual)
 162
 163         actual = parser.generate_hunk_patch(2)
 164         self.assertEqual(expect, actual)
 165
 166
 167 class DiffLinesTestCase(unittest.TestCase):
 168
 169     def setUp(self):
 170         self.parser = diffparse.DiffLines()
 171         fixture_path = helper.fixture('diff.txt')
 172         self.text = core.read(fixture_path)
 173
 174     def test_basic_diff_line_count(self):
 175         """Verify the basic line counts"""
 176         lines = self.parser.parse(self.text)
 177         expect = len(self.text.splitlines())
 178         actual = len(lines)
 179         self.assertEqual(expect, actual)
 180
 181     def test_diff_line_count_ranges(self):
 182         parser = self.parser
 183         lines = parser.parse(self.text)
 184
 185         # Diff header
 186         line = 0
 187         count = 1
 188         self.assertEqual(lines[line][0], parser.DASH)
 189         self.assertEqual(lines[line][1], parser.DASH)
 190         line += count
 191
 192         # 3 lines of context
 193         count = 3
 194         current_old = 6
 195         current_new = 6
 196         for i in range(count):
 197             self.assertEqual(lines[line+i][0], current_old+i)
 198             self.assertEqual(lines[line+i][1], current_new+i)
 199         line += count
 200         current_old += count
 201         current_new += count
 202
 203         # 10 lines of new text
 204         count = 10
 205         for i in range(count):
 206             self.assertEqual(lines[line+i][0], parser.EMPTY)
 207             self.assertEqual(lines[line+i][1], current_new+i)
 208
 209         line += count
 210         current_new += count
 211
 212         # 3 more lines of context
 213         count = 3
 214         for i in range(count):
 215             self.assertEqual(lines[line+i][0], current_old+i)
 216             self.assertEqual(lines[line+i][1], current_new+i)
 217         line += count
 218         current_new += count
 219         current_old += count
 220
 221         # 1 line of removal
 222         count = 1
 223         for i in range(count):
 224             self.assertEqual(lines[line+i][0], current_old+i)
 225             self.assertEqual(lines[line+i][1], parser.EMPTY)
 226         line += count
 227         current_old += count
 228
 229         # 2 lines of addition
 230         count = 2
 231         for i in range(count):
 232             self.assertEqual(lines[line+i][0], parser.EMPTY)
 233             self.assertEqual(lines[line+i][1], current_new+i)
 234         line += count
 235         current_new += count
 236
 237         # 3 more lines of context
 238         count = 3
 239         for i in range(count):
 240             self.assertEqual(lines[line+i][0], current_old+i)
 241             self.assertEqual(lines[line+i][1], current_new+i)
 242         line += count
 243         current_new += count
 244         current_old += count
 245
 246         # 1 line of header
 247         count = 1
 248         for i in range(count):
 249             self.assertEqual(lines[line+i][0], parser.DASH)
 250             self.assertEqual(lines[line+i][1], parser.DASH)
 251         line += count
 252
 253         # 3 more lines of context
 254         current_old = 29
 255         current_new = 40
 256         count = 3
 257         for i in range(count):
 258             self.assertEqual(lines[line+i][0], current_old+i)
 259             self.assertEqual(lines[line+i][1], current_new+i)
 260         line += count
 261         current_new += count
 262         current_old += count
 263
 264         expect_max_old = 54
 265         self.assertEqual(expect_max_old, parser.old.max_value)
 266
 267         expect_max_new = 62
 268         self.assertEqual(expect_max_new, parser.new.max_value)
 269
 270         self.assertEqual(parser.digits(), 2)
 271
 272     def test_diff_line_for_merge(self):
 273         """Verify the basic line counts"""
 274         text = """@@@ -1,23 -1,33 +1,75 @@@
 275 ++<<<<<<< upstream
 276  +
 277  +Ok
 278 """
 279         parser = self.parser
 280         lines = parser.parse(text)
 281         self.assertEqual(len(lines), 4)
 282         self.assertEqual(len(lines[0]), 3)
 283         self.assertEqual(len(lines[1]), 3)
 284         self.assertEqual(len(lines[2]), 3)
 285         self.assertEqual(len(lines[3]), 3)
 286
 287         self.assertEqual(lines[0][0], parser.DASH)
 288         self.assertEqual(lines[0][1], parser.DASH)
 289         self.assertEqual(lines[0][2], parser.DASH)
 290
 291         self.assertEqual(lines[1][0], parser.EMPTY)
 292         self.assertEqual(lines[1][1], parser.EMPTY)
 293         self.assertEqual(lines[1][2], 1)
 294
 295         self.assertEqual(lines[2][0], 1)
 296         self.assertEqual(lines[2][1], parser.EMPTY)
 297         self.assertEqual(lines[2][2], 2)
 298
 299         self.assertEqual(lines[3][0], 2)
 300         self.assertEqual(lines[3][1], parser.EMPTY)
 301         self.assertEqual(lines[3][2], 3)
 302
 303
 304 class FormatDiffLinesTestCase(unittest.TestCase):
 305
 306     def test_format_basic(self):
 307         fmt = diffparse.FormatDigits()
 308         fmt.set_digits(2)
 309
 310         expect = '01 99'
 311         actual = fmt.value(1, 99)
 312         self.assertEqual(expect, actual)
 313
 314     def test_format_reuse(self):
 315         fmt = diffparse.FormatDigits()
 316
 317         fmt.set_digits(3)
 318         expect = '001 099'
 319         actual = fmt.value(1, 99)
 320         self.assertEqual(expect, actual)
 321
 322         fmt.set_digits(4)
 323         expect = '0001 0099'
 324         actual = fmt.value(1, 99)
 325         self.assertEqual(expect, actual)
 326
 327     def test_format_special_values(self):
 328         fmt = diffparse.FormatDigits(dash='-')
 329         fmt.set_digits(3)
 330
 331         expect = '    099'
 332         actual = fmt.value(fmt.EMPTY, 99)
 333         self.assertEqual(expect, actual)
 334
 335         expect = '001    '
 336         actual = fmt.value(1, fmt.EMPTY)
 337         self.assertEqual(expect, actual)
 338
 339         expect = '       '
 340         actual = fmt.value(fmt.EMPTY, fmt.EMPTY)
 341         self.assertEqual(expect, actual)
 342
 343         expect = '--- 001'
 344         actual = fmt.value(fmt.DASH, 1)
 345         self.assertEqual(expect, actual)
 346
 347         expect = '099 ---'
 348         actual = fmt.value(99, fmt.DASH)
 349         self.assertEqual(expect, actual)
 350
 351         expect = '--- ---'
 352         actual = fmt.value(fmt.DASH, fmt.DASH)
 353         self.assertEqual(expect, actual)
 354
 355         expect = '    ---'
 356         actual = fmt.value(fmt.EMPTY, fmt.DASH)
 357         self.assertEqual(expect, actual)
 358
 359         expect = '---    '
 360         actual = fmt.value(fmt.DASH, fmt.EMPTY)
 361         self.assertEqual(expect, actual)
 362
 363
 364 class ParseRangeStrTestCase(unittest.TestCase):
 365
 366     def test_parse_range_str(self):
 367         start, count = diffparse.parse_range_str('1,2')
 368         self.assertEqual(start, 1)
 369         self.assertEqual(count, 2)
 370
 371     def test_parse_range_str_single_line(self):
 372         start, count = diffparse.parse_range_str('2')
 373         self.assertEqual(start, 2)
 374         self.assertEqual(count, 1)
 375
 376     def test_parse_range_str_empty(self):
 377         start, count = diffparse.parse_range_str('0,0')
 378         self.assertEqual(start, 0)
 379         self.assertEqual(count, 0)
 380
 381
 382 if __name__ == '__main__':
 383     unittest.main()