##// END OF EJS Templates
diffs: add test coverage of inline diff with other markup...
Mads Kiilerich -
r8641:6c1a8d17 default
parent child Browse files
Show More
@@ -1,7 +1,7 b''
1 diff --git a/f b/f
1 diff --git a/f b/f
2 --- a/f
2 --- a/f
3 +++ b/f
3 +++ b/f
4 @@ -51,6 +51,13 @@
4 @@ -51,8 +51,15 @@
5 begin();
5 begin();
6
6
7 + int foo;
7 + int foo;
@@ -17,3 +17,6 b' diff --git a/f b/f'
17
17
18 - #define MIN_STEPS (48)
18 - #define MIN_STEPS (48)
19 + #define MIN_STEPS (42)
19 + #define MIN_STEPS (42)
20
21 - #define MORE_STEPS +(48)
22 + #define LESS_STEPS (42)
@@ -351,7 +351,7 b' class TestDiffLib(base.TestController):'
351 l.append('%(action)-7s %(new_lineno)3s %(old_lineno)3s %(line)r\n' % d)
351 l.append('%(action)-7s %(new_lineno)3s %(old_lineno)3s %(line)r\n' % d)
352 s = ''.join(l)
352 s = ''.join(l)
353 assert s == r'''
353 assert s == r'''
354 context '@@ -51,6 +51,13 @@'
354 context '@@ -51,8 +51,15 @@'
355 unmod 51 51 '<u>\t</u>begin();'
355 unmod 51 51 '<u>\t</u>begin();'
356 unmod 52 52 '<u>\t</u><i></i>'
356 unmod 52 52 '<u>\t</u><i></i>'
357 add 53 '<u>\t</u>int foo;<u class="cr"></u>'
357 add 53 '<u>\t</u>int foo;<u class="cr"></u>'
@@ -367,4 +367,7 b" add 61 '<u>\\t</u>#define MAX_ST"
367 unmod 62 55 ''
367 unmod 62 55 ''
368 del 56 '<u>\t</u>#define MIN_STEPS (<del>48</del>)'
368 del 56 '<u>\t</u>#define MIN_STEPS (<del>48</del>)'
369 add 63 '<u>\t</u>#define MIN_STEPS (<ins>42</ins>)'
369 add 63 '<u>\t</u>#define MIN_STEPS (<ins>42</ins>)'
370 unmod 64 57 ''
371 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>'
372 add 65 '<u>\t</u>#define <ins>LESS_STEPS</ins><u>\t</u>(<ins>42</ins>)<ins> <i></i></ins>'
370 '''
373 '''
General Comments 0
You need to be logged in to leave comments. Login now