diff options
author | Adrian Lang <dokuwiki@adrianlang.de> | 2011-02-06 16:49:20 +0100 |
---|---|---|
committer | Adrian Lang <dokuwiki@adrianlang.de> | 2011-02-06 16:49:52 +0100 |
commit | 4f2305cb147b801ff6ef57ed417a366a83e2d92e (patch) | |
tree | 9bd5b75139bec729edc7cbb66bbc4e05e7c69c77 /_test/cases | |
parent | b842a02804e6c492963978620e61739485b7287f (diff) | |
download | rpg-4f2305cb147b801ff6ef57ed417a366a83e2d92e.tar.gz rpg-4f2305cb147b801ff6ef57ed417a366a83e2d92e.tar.bz2 |
Fix whitespace handling in inline diff (closes FS#2161)
Diffstat (limited to '_test/cases')
-rw-r--r-- | _test/cases/inc/DifferenceEngine.test.php | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/_test/cases/inc/DifferenceEngine.test.php b/_test/cases/inc/DifferenceEngine.test.php new file mode 100644 index 000000000..294f0e6e3 --- /dev/null +++ b/_test/cases/inc/DifferenceEngine.test.php @@ -0,0 +1,31 @@ +<?php +require_once DOKU_INC.'inc/DifferenceEngine.php'; + +class differenceengine_test extends UnitTestCase { + + function test_white_between_words(){ + // From FS#2161 + global $lang; + + $df = new Diff(explode("\n","example"), + explode("\n","example example2")); + + $idf = new InlineDiffFormatter(); + $tdf = new TableDiffFormatter(); + + $this->assertEqual($idf->format($df), '<tr><td colspan="4" class="diff-blockheader">@@ ' . $lang['line'] . + ' -1 +1 @@ <span class="diff-deletedline"><del>' . $lang['deleted'] . + '</del></span> <span class="diff-addedline">' . $lang['created'] . + '</span></td></tr> + +<tr><td colspan="4">example <span class="diff-addedline">example2</span></td></tr> +'); + $this->assertEqual($tdf->format($df), + '<tr><td class="diff-blockheader" colspan="2">' . $lang['line'] . ' 1:</td> + <td class="diff-blockheader" colspan="2">' . $lang['line'] . ' 1:</td> +</tr> +<tr><td>-</td><td class="diff-deletedline">example</td><td>+</td><td class="diff-addedline">example <strong>example2</strong></td></tr> +'); + } +} +//Setup VIM: ex: et ts=4 : |