kallithea Changeset - 6c1a8d17b2b9

Changeset - 6c1a8d17b2b9

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich (mads) - 5 years ago 2021-02-17 15:03:14
mads@kiilerich.com

diffs: add test coverage of inline diff with other markup

Add trailing whitespaces ... but also whitespace before changes (which might
seem trailing but isn't).

2 files changed with 8 insertions and 2 deletions:

kallithea/tests/fixtures/markuptest.diff

kallithea/tests/models/test_diff_parsers.py

0 comments (0 inline, 0 general)

kallithea/tests/fixtures/markuptest.diff

➞

Show inline comments

 diff --git a/f b/f
 --- a/f
 +++ b/f
-@@ -51,6 +51,13 @@
+@@ -51,8 +51,15 @@
  	begin();
 +	int foo;
 +	int bar;
 +	int baz;
 +	int space;
@@ @@ -14,6 +14,9 @@ diff --git a/f b/f @@
 -	#define MAX_STEPS (48)
++
 +	#define MAX_STEPS (64)
 -	#define MIN_STEPS (48)
 +	#define MIN_STEPS (42)
 -	#define MORE_STEPS	+(48)
 +	#define LESS_STEPS	(42)

kallithea/tests/models/test_diff_parsers.py

➞

Show inline comments

@@ @@ -348,13 +348,13 @@ class TestDiffLib(base.TestController): @@
         #from pprint import pprint; pprint(chunks[1])
         l = ['\n']
         for d in chunks[1]:
             l.append('%(action)-7s %(new_lineno)3s %(old_lineno)3s %(line)r\n' % d)
         s = ''.join(l)
         assert s == r'''
-context         '@@ -51,6 +51,13 @@'
+context         '@@ -51,8 +51,15 @@'
 unmod    51  51 '<u>\t</u>begin();'
 unmod    52  52 '<u>\t</u><i></i>'
 add      53     '<u>\t</u>int foo;<u class="cr"></u>'
 add      54     '<u>\t</u>int bar; <u class="cr"></u>'
 add      55     '<u>\t</u>int baz;<u>\t</u><u class="cr"></u>'
 add      56     '<u>\t</u>int space; <i></i>'
@@ @@ -364,7 +364,10 @@ unmod 59 53 ' <i></i>' @@
 del          54 '<u>\t</u>#define MAX_STEPS (48)'
 add      60     '<u>\t</u><u class="cr"></u>'
 add      61     '<u>\t</u>#define MAX_STEPS (64)<u class="cr"></u>'
 unmod    62  55 ''
 del          56 '<u>\t</u>#define MIN_STEPS (<del>48</del>)'
 add      63     '<u>\t</u>#define MIN_STEPS (<ins>42</ins>)'
 unmod    64  57 ''
 del          58 '<u>\t</u>#define <del>MORE_STEPS</del><u>\t</u><del>+</del>(<del>48</del>)<del><u>\t</u></del><del><i></i></del>'
 add      65     '<u>\t</u>#define <ins>LESS_STEPS</ins><u>\t</u>(<ins>42</ins>)<ins> <i></i></ins>'
 '''

0 comments (0 inline, 0 general)