22 files changed, 2 insertions, 71 deletions

diff --git a/_test/cases/inc/common_obfuscate.test.php b/_test/cases/inc/common_obfuscate.test.php
index 60042ac19..3e1e1a72f 100644
--- a/_test/cases/inc/common_obfuscate.test.php
+++ b/_test/cases/inc/common_obfuscate.test.php
@@ -13,7 +13,6 @@ class common_obfuscate_test extends UnitTestCase {
     function test_hex(){
         global $conf;
         $conf['mailguard'] = 'hex';
-print obfuscate('andi@foobar.com');
         $this->assertEqual(obfuscate('jon-doe@example.com'), 
         'jon-doe@example.com');
     }
diff --git a/inc/parser/tests/.htaccess b/_test/cases/inc/parser/.htaccess
index 38539a1a2..38539a1a2 100644
--- a/inc/parser/tests/.htaccess
+++ b/_test/cases/inc/parser/.htaccess
diff --git a/inc/parser/tests/lexer.group.php b/_test/cases/inc/parser/lexer.group.php
index 623cf6af5..623cf6af5 100644
--- a/inc/parser/tests/lexer.group.php
+++ b/_test/cases/inc/parser/lexer.group.php
diff --git a/inc/parser/tests/lexer.test.php b/_test/cases/inc/parser/lexer.test.php
index daf438fdf..8c7eeae71 100644
--- a/inc/parser/tests/lexer.test.php
+++ b/_test/cases/inc/parser/lexer.test.php
@@ -8,7 +8,6 @@
 /**
 * Includes
 */
-require_once('./testconfig.php');
 require_once DOKU_INC . 'inc/parser/lexer.php';
     
 /**
diff --git a/inc/parser/tests/parser.group.php b/_test/cases/inc/parser/parser.group.php
index ca9084127..ca9084127 100644
--- a/inc/parser/tests/parser.group.php
+++ b/_test/cases/inc/parser/parser.group.php
diff --git a/inc/parser/tests/parser.test.php b/_test/cases/inc/parser/parser.test.php
index 53ac650d8..c760c127a 100644
--- a/inc/parser/tests/parser.test.php
+++ b/_test/cases/inc/parser/parser.test.php
@@ -8,7 +8,6 @@
 /**
 * Includes
 */
-require_once('./testconfig.php');
 require_once DOKU_INC . 'inc/parser/parser.php';
 require_once DOKU_INC . 'inc/parser/handler.php';
 //require_once DOKU . 'parser/renderer.php';
diff --git a/inc/parser/tests/parser_eol.test.php b/_test/cases/inc/parser/parser_eol.test.php
index 44ade3dda..44ade3dda 100644
--- a/inc/parser/tests/parser_eol.test.php
+++ b/_test/cases/inc/parser/parser_eol.test.php
diff --git a/inc/parser/tests/parser_footnote.test.php b/_test/cases/inc/parser/parser_footnote.test.php
index 2bcfb3472..2bcfb3472 100644
--- a/inc/parser/tests/parser_footnote.test.php
+++ b/_test/cases/inc/parser/parser_footnote.test.php
diff --git a/inc/parser/tests/parser_formatting.test.php b/_test/cases/inc/parser/parser_formatting.test.php
index ca89813db..ca89813db 100644
--- a/inc/parser/tests/parser_formatting.test.php
+++ b/_test/cases/inc/parser/parser_formatting.test.php
diff --git a/inc/parser/tests/parser_headers.test.php b/_test/cases/inc/parser/parser_headers.test.php
index b8de6983b..b8de6983b 100644
--- a/inc/parser/tests/parser_headers.test.php
+++ b/_test/cases/inc/parser/parser_headers.test.php
diff --git a/inc/parser/tests/parser_i18n.test.php b/_test/cases/inc/parser/parser_i18n.test.php
index f9609b07e..f9609b07e 100644
--- a/inc/parser/tests/parser_i18n.test.php
+++ b/_test/cases/inc/parser/parser_i18n.test.php
diff --git a/inc/parser/tests/parser_links.test.php b/_test/cases/inc/parser/parser_links.test.php
index 4609c399b..0d27ae6b0 100644
--- a/inc/parser/tests/parser_links.test.php
+++ b/_test/cases/inc/parser/parser_links.test.php
@@ -82,7 +82,7 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
     }
     
     function testEmail() {
-        $this->P->addMode('email',new Doku_Parser_Mode_Email());
+        $this->P->addMode('email',new Doku_Parser_Mode_Emaillink());
         $this->P->parse("Foo <bugs@php.net> Bar");
         $calls = array (
             array('document_start',array()),
diff --git a/inc/parser/tests/parser_lists.test.php b/_test/cases/inc/parser/parser_lists.test.php
index 92bef7812..92bef7812 100644
--- a/inc/parser/tests/parser_lists.test.php
+++ b/_test/cases/inc/parser/parser_lists.test.php
diff --git a/inc/parser/tests/parser_preformatted.test.php b/_test/cases/inc/parser/parser_preformatted.test.php
index 2b5746216..2b5746216 100644
--- a/inc/parser/tests/parser_preformatted.test.php
+++ b/_test/cases/inc/parser/parser_preformatted.test.php
diff --git a/inc/parser/tests/parser_quote.test.php b/_test/cases/inc/parser/parser_quote.test.php
index ccee56062..ccee56062 100644
--- a/inc/parser/tests/parser_quote.test.php
+++ b/_test/cases/inc/parser/parser_quote.test.php
diff --git a/inc/parser/tests/parser_replacements.test.php b/_test/cases/inc/parser/parser_replacements.test.php
index 0aae4496b..0aae4496b 100644
--- a/inc/parser/tests/parser_replacements.test.php
+++ b/_test/cases/inc/parser/parser_replacements.test.php
diff --git a/inc/parser/tests/parser_table.test.php b/_test/cases/inc/parser/parser_table.test.php
index 0f04dbeee..0f04dbeee 100644
--- a/inc/parser/tests/parser_table.test.php
+++ b/_test/cases/inc/parser/parser_table.test.php
diff --git a/inc/parser/tests/parser_tocsections.test.php b/_test/cases/inc/parser/parser_tocsections.test.php
index 64051e2ad..64051e2ad 100644
--- a/inc/parser/tests/parser_tocsections.test.php
+++ b/_test/cases/inc/parser/parser_tocsections.test.php
diff --git a/inc/parser/tests/parser_unformatted.test.php b/_test/cases/inc/parser/parser_unformatted.test.php
index e9c1fce70..e9c1fce70 100644
--- a/inc/parser/tests/parser_unformatted.test.php
+++ b/_test/cases/inc/parser/parser_unformatted.test.php
diff --git a/_test/runtests.php b/_test/runtests.php
index ba9bc4b1d..4e0f97b50 100755
--- a/_test/runtests.php
+++ b/_test/runtests.php
@@ -4,6 +4,7 @@ ini_set('memory_limit','128M');
 if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/');
 define('TEST_ROOT', dirname(__FILE__));
 define('TMPL_FILESCHEME_PATH', TEST_ROOT . '/filescheme/');
+define('TEST_RUNNING',TRUE);
 error_reporting(E_ALL);
 
 require_once 'lib/testmanager.php';
diff --git a/inc/parser/tests/alltests.all.php b/inc/parser/tests/alltests.all.php
deleted file mode 100644
index 993553eb2..000000000
--- a/inc/parser/tests/alltests.all.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
-* @version $Id: alltests.all.php,v 1.2 2005/03/25 21:00:22 harryf Exp $
-* @package Dokuwiki
-* @subpackage Tests
-*/
-/**
-* Init
-*/
-require_once('./testconfig.php');
-
-define("TEST_RUNNING", true);
-
-/**
-* @package Dokuwiki
-* @subpackage Tests
-*/
-class AllTests extends GroupTest {
-
-    function AllTests() {
-        $this->GroupTest('All Dokuwiki PHP Tests');
-        $this->loadGroups();
-    }
-
-    function loadGroups() {
-        if ( $d = opendir('.') ) {
-            while (($file = readdir($d)) !== false) {
-                if ( is_file('./'.$file) ) {
-                    $farray = explode('.',$file);
-                    if ( $farray[1] == 'group' ) {
-                        $classname = ucfirst($farray[0]).'GroupTest';
-                        require_once './'.$file;
-                        $this->AddTestCase(new $classname);
-                    }
-                }
-            }
-            closedir($d);
-        }
-    }
-
-}
-
-/**
-* Run the tests
-*/
-$test = &new AllTests();
-$test->run(new HtmlReporter());
-?>
diff --git a/inc/parser/tests/testconfig.php b/inc/parser/tests/testconfig.php
deleted file mode 100644
index d855be8fb..000000000
--- a/inc/parser/tests/testconfig.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-if (!defined('SIMPLE_TEST')) {
-    // Should point at SimpleTest
-    //(absolute path recommended with trailing slash)
-    define('SIMPLE_TEST', '/var/www/simpletest/');
-}
-
-// Load SimpleTest
-if ( @include_once SIMPLE_TEST . 'unit_tester.php' ) {
-    require_once SIMPLE_TEST . 'mock_objects.php';
-    require_once SIMPLE_TEST . 'reporter.php';
-} else {
-    trigger_error('Unable to load SimpleTest: '.
-        'configure SIMPLE_TEST in config.php');
-}
-
-// Modify this as needed
-define('DOKU_INC',realpath(dirname(__FILE__).'/../../../').'/');
-?>