From b3cb5bcea1f6001d9609479a41e90d1a049d0523 Mon Sep 17 00:00:00 2001
From: Dominik Eckelmann <deckelmann@gmail.com>
Date: Sat, 7 Apr 2012 22:40:50 +0200
Subject: fixed some simpletest unit tests

---
 _test/cases/inc/DifferenceEngine.test.php  | 31 ------------------------------
 _test/cases/inc/difference_engine.test.php | 31 ++++++++++++++++++++++++++++++
 _test/cases/inc/form_form.test.php         |  3 +--
 3 files changed, 32 insertions(+), 33 deletions(-)
 delete mode 100644 _test/cases/inc/DifferenceEngine.test.php
 create mode 100644 _test/cases/inc/difference_engine.test.php

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 @@&nbsp;<span class="diff-deletedline"><del>' . $lang['deleted'] .
-                                              '</del></span>&nbsp;<span class="diff-addedline">' . $lang['created'] .
-                                              '</span></td></tr>
-
-<tr><td colspan="4">example&nbsp;<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&nbsp;<strong>example2</strong></td></tr>
-');
-    }
-}
-//Setup VIM: ex: et ts=4 :
diff --git a/_test/cases/inc/difference_engine.test.php b/_test/cases/inc/difference_engine.test.php
new file mode 100644
index 000000000..aa1756114
--- /dev/null
+++ b/_test/cases/inc/difference_engine.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 @@&nbsp;<span class="diff-deletedline"><del>' . $lang['deleted'] .
+                                              '</del></span>&nbsp;<span class="diff-addedline">' . $lang['created'] .
+                                              '</span></td></tr>
+
+<tr><td colspan="4">example&nbsp;<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&nbsp;<strong>example2</strong></td></tr>
+');
+    }
+}
+//Setup VIM: ex: et ts=4 :
diff --git a/_test/cases/inc/form_form.test.php b/_test/cases/inc/form_form.test.php
index 5d5fa72af..7bffb53e2 100644
--- a/_test/cases/inc/form_form.test.php
+++ b/_test/cases/inc/form_form.test.php
@@ -1,7 +1,6 @@
 <?php
 
-require_once DOKU_INC.'inc/auth.php';
-require_once DOKU_INC.'inc/form.php';
+require_once DOKU_INC.'inc/init.php';
 
 class form_test extends UnitTestCase {
 
-- 
cgit v1.2.3