diff options
| author | Anika Henke <anika@selfthinker.org> | 2012-06-29 17:51:09 +0100 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2012-06-29 17:51:09 +0100 |
| commit | 0c06a181819249c6a4a2a6c60e13f739df1f2253 (patch) | |
| tree | 859377c572d0acbfc520b02304ef515bf3aebbe0 /_test/cases/inc/DifferenceEngine.test.php | |
| parent | ef7e36e4fd2a168977754f0aac1d855fb651f104 (diff) | |
| parent | 5d0aaf958325f500ce69cfb79e69eb0d8f83fdeb (diff) | |
| download | rpg-0c06a181819249c6a4a2a6c60e13f739df1f2253.tar.gz rpg-0c06a181819249c6a4a2a6c60e13f739df1f2253.tar.bz2 | |
Merge branch 'master' of github.com:splitbrain/dokuwiki into frontend_improvements
Conflicts:
lib/tpl/dokuwiki/css/basic.css
Diffstat (limited to '_test/cases/inc/DifferenceEngine.test.php')
| -rw-r--r-- | _test/cases/inc/DifferenceEngine.test.php | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/_test/cases/inc/DifferenceEngine.test.php b/_test/cases/inc/DifferenceEngine.test.php deleted file mode 100644 index aa1756114..000000000 --- a/_test/cases/inc/DifferenceEngine.test.php +++ /dev/null @@ -1,31 +0,0 @@ -<?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 : |