Mercurial > kallithea
changeset 8857:6c1a8d17b2b9
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).
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Wed, 17 Feb 2021 15:03:14 +0100 |
| parents | 8014ac73587d |
| children | 7d5e50517430 |
| files | kallithea/tests/fixtures/markuptest.diff kallithea/tests/models/test_diff_parsers.py |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/tests/fixtures/markuptest.diff Tue Feb 16 21:38:09 2021 +0100 +++ b/kallithea/tests/fixtures/markuptest.diff Wed Feb 17 15:03:14 2021 +0100 @@ -1,7 +1,7 @@ diff --git a/f b/f --- a/f +++ b/f -@@ -51,6 +51,13 @@ +@@ -51,8 +51,15 @@ begin(); + int foo; @@ -17,3 +17,6 @@ - #define MIN_STEPS (48) + #define MIN_STEPS (42) + +- #define MORE_STEPS +(48) ++ #define LESS_STEPS (42)
--- a/kallithea/tests/models/test_diff_parsers.py Tue Feb 16 21:38:09 2021 +0100 +++ b/kallithea/tests/models/test_diff_parsers.py Wed Feb 17 15:03:14 2021 +0100 @@ -351,7 +351,7 @@ 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>' @@ -367,4 +367,7 @@ 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>' '''