more tests fixed (down to 50)

darcs-hash:20051023113004-7ad00-cc03ff18908e81f00bafc8e5e386340e9752bf3f.gz

17 files changed, 8 insertions, 152 deletions

diff --git a/_test/cases/inc/parser/lexer.group.php b/_test/cases/inc/parser/lexer.group.php
index cd2528ad7..99ec993be 100644
--- a/_test/cases/inc/parser/lexer.group.php
+++ b/_test/cases/inc/parser/lexer.group.php
@@ -18,12 +18,4 @@ class LexerGroupTest extends GroupTest {
     
 }
 
-/**
-* Conditional test runner
-*/
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = &new LexerGroupTest();
-    $test->run(new HtmlReporter());
-}
 ?>
diff --git a/_test/cases/inc/parser/lexer.test.php b/_test/cases/inc/parser/lexer.test.php
index 8c7eeae71..818009f92 100644
--- a/_test/cases/inc/parser/lexer.test.php
+++ b/_test/cases/inc/parser/lexer.test.php
@@ -593,18 +593,4 @@ class TestOfLexerByteIndices extends UnitTestCase {
     
 }
 
-/**
-* Conditional test runner
-*/
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = & new GroupTest('LexerTests');
-    $test->addTestCase(new TestOfLexerParallelRegex());
-    $test->addTestCase(new TestOfLexerStateStack());
-    $test->addTestCase(new TestOfLexer());
-    $test->addTestCase(new TestOfLexerModes());
-    $test->addTestCase(new TestOfLexerHandlers());
-    $test->addTestCase(new TestOfLexerByteIndices());
-    $test->run(new HtmlReporter());
-}
 ?>
diff --git a/_test/cases/inc/parser/parser.group.php b/_test/cases/inc/parser/parser.group.php
index f1ba38e56..bfd086999 100644
--- a/_test/cases/inc/parser/parser.group.php
+++ b/_test/cases/inc/parser/parser.group.php
@@ -30,12 +30,4 @@ class ParserGroupTest extends GroupTest {
     
 }
 
-/**
-* Conditional test runner
-*/
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = &new ParserGroupTest();
-    $test->run(new HtmlReporter());
-}
 ?>
diff --git a/_test/cases/inc/parser/parser_eol.test.php b/_test/cases/inc/parser/parser_eol.test.php
index 44ade3dda..85260671b 100644
--- a/_test/cases/inc/parser/parser_eol.test.php
+++ b/_test/cases/inc/parser/parser_eol.test.php
@@ -14,11 +14,9 @@ class TestOfDoku_Parser_Eol extends TestOfDoku_Parser {
             array('document_start',array()),
             array('p_open',array()),
             array('cdata',array("Foo")),
-            array('p_close',array()),
-            array('p_open',array()),
+            array('cdata',array(" ")),
             array('cdata',array("Bar")),
-            array('p_close',array()),
-            array('p_open',array()),
+            array('cdata',array(" ")),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -34,14 +32,10 @@ class TestOfDoku_Parser_Eol extends TestOfDoku_Parser {
             array('cdata',array("Foo")),
             array('p_close',array()),
             array('p_open',array()),
-            array('p_close',array()),
-            array('p_open',array()),
             array('cdata',array("bar")),
-            array('p_close',array()),
-            array('p_open',array()),
+            array('cdata',array(" ")),
             array('cdata',array("Foo")),
-            array('p_close',array()),
-            array('p_open',array()),
+            array('cdata',array(" ")),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -55,11 +49,9 @@ class TestOfDoku_Parser_Eol extends TestOfDoku_Parser {
             array('document_start',array()),
             array('p_open',array()),
             array('cdata',array("Foo")),
-            array('p_close',array()),
-            array('p_open',array()),
+            array('cdata',array(" ")),
             array('cdata',array("Bar")),
-            array('p_close',array()),
-            array('p_open',array()),
+            array('cdata',array(" ")),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -74,7 +66,7 @@ class TestOfDoku_Parser_Eol extends TestOfDoku_Parser {
             array('p_open',array()),
             array('cdata',array("\nFoo")),
             array('linebreak',array()),
-            array('cdata',array("Bar\n")),
+            array('cdata',array(" Bar\n")),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -94,8 +86,7 @@ class TestOfDoku_Parser_Eol extends TestOfDoku_Parser {
             array('p_close',array()),
             array('p_open',array()),
             array('cdata',array("Bar")),
-            array('p_close',array()),
-            array('p_open',array()),
+            array('cdata',array(" ")),
             array('p_close',array()),
             array('document_end',array()),
         );
@@ -117,11 +108,3 @@ class TestOfDoku_Parser_Eol extends TestOfDoku_Parser {
 
 }
 
-/**
-* Conditional test runner
-*/
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = &new TestOfDoku_Parser_Eol();
-    $test->run(new HtmlReporter());
-}
diff --git a/_test/cases/inc/parser/parser_footnote.test.php b/_test/cases/inc/parser/parser_footnote.test.php
index 2bcfb3472..d08b2e358 100644
--- a/_test/cases/inc/parser/parser_footnote.test.php
+++ b/_test/cases/inc/parser/parser_footnote.test.php
@@ -374,11 +374,3 @@ class TestOfDoku_Parser_Footnote extends TestOfDoku_Parser {
     }
 }
 
-/**
-* Conditional test runner
-*/
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = &new TestOfDoku_Parser_Footnote();
-    $test->run(new HtmlReporter());
-}
diff --git a/_test/cases/inc/parser/parser_formatting.test.php b/_test/cases/inc/parser/parser_formatting.test.php
index ca89813db..0416ef7c2 100644
--- a/_test/cases/inc/parser/parser_formatting.test.php
+++ b/_test/cases/inc/parser/parser_formatting.test.php
@@ -261,11 +261,3 @@ class TestOfDoku_Parser_Formatting extends TestOfDoku_Parser {
     }
 }
 
-/**
-* Conditional test runner
-*/
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = &new TestOfDoku_Parser_Formatting();
-    $test->run(new HtmlReporter());
-}
diff --git a/_test/cases/inc/parser/parser_headers.test.php b/_test/cases/inc/parser/parser_headers.test.php
index 6a027de78..264f35bcc 100644
--- a/_test/cases/inc/parser/parser_headers.test.php
+++ b/_test/cases/inc/parser/parser_headers.test.php
@@ -261,11 +261,3 @@ class TestOfDoku_Parser_Headers extends TestOfDoku_Parser {
     
 }
 
-/**
-* Conditional test runner
-*/
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = &new TestOfDoku_Parser_Headers();
-    $test->run(new HtmlReporter());
-}
diff --git a/_test/cases/inc/parser/parser_i18n.test.php b/_test/cases/inc/parser/parser_i18n.test.php
index 473ec6eec..5ed27535f 100644
--- a/_test/cases/inc/parser/parser_i18n.test.php
+++ b/_test/cases/inc/parser/parser_i18n.test.php
@@ -170,11 +170,3 @@ def');
     }
 }
 
-/**
-* Conditional test runner
-*/
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = &new TestOfDoku_Parser_i18n();
-    $test->run(new HtmlReporter());
-}
diff --git a/_test/cases/inc/parser/parser_links.test.php b/_test/cases/inc/parser/parser_links.test.php
index 0d27ae6b0..1bcdcd461 100644
--- a/_test/cases/inc/parser/parser_links.test.php
+++ b/_test/cases/inc/parser/parser_links.test.php
@@ -512,11 +512,3 @@ class TestOfDoku_Parser_Links extends TestOfDoku_Parser {
 
 }
 
-/**
-* Conditional test runner
-*/
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = &new TestOfDoku_Parser_Links();
-    $test->run(new HtmlReporter());
-}
diff --git a/_test/cases/inc/parser/parser_lists.test.php b/_test/cases/inc/parser/parser_lists.test.php
index 92bef7812..f6dc1198f 100644
--- a/_test/cases/inc/parser/parser_lists.test.php
+++ b/_test/cases/inc/parser/parser_lists.test.php
@@ -412,11 +412,3 @@ Bar');
     }
 }
 
-/**
-* Conditional test runner
-*/
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = &new TestOfDoku_Parser_Lists();
-    $test->run(new HtmlReporter());
-}
diff --git a/_test/cases/inc/parser/parser_preformatted.test.php b/_test/cases/inc/parser/parser_preformatted.test.php
index 7433cceae..c05d48418 100644
--- a/_test/cases/inc/parser/parser_preformatted.test.php
+++ b/_test/cases/inc/parser/parser_preformatted.test.php
@@ -279,11 +279,3 @@ class TestOfDoku_Parser_Preformatted extends TestOfDoku_Parser {
     }
 }
 
-/**
-* Conditional test runner
-*/
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = &new TestOfDoku_Parser_Preformatted();
-    $test->run(new HtmlReporter());
-}
diff --git a/_test/cases/inc/parser/parser_quote.test.php b/_test/cases/inc/parser/parser_quote.test.php
index ccee56062..a974112c6 100644
--- a/_test/cases/inc/parser/parser_quote.test.php
+++ b/_test/cases/inc/parser/parser_quote.test.php
@@ -104,11 +104,3 @@ class TestOfDoku_Parser_Quote extends TestOfDoku_Parser {
 
 }
 
-/**
-* Conditional test runner
-*/
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = &new TestOfDoku_Parser_Quote();
-    $test->run(new HtmlReporter());
-}
diff --git a/_test/cases/inc/parser/parser_replacements.test.php b/_test/cases/inc/parser/parser_replacements.test.php
index c026e2b19..3df29fddd 100644
--- a/_test/cases/inc/parser/parser_replacements.test.php
+++ b/_test/cases/inc/parser/parser_replacements.test.php
@@ -365,11 +365,3 @@ class TestOfDoku_Parser_Replacements extends TestOfDoku_Parser {
     }
 }
 
-/**
-* Conditional test runner
-*/
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = &new TestOfDoku_Parser_Replacements();
-    $test->run(new HtmlReporter());
-}
diff --git a/_test/cases/inc/parser/parser_table.test.php b/_test/cases/inc/parser/parser_table.test.php
index 0f04dbeee..47f790c2d 100644
--- a/_test/cases/inc/parser/parser_table.test.php
+++ b/_test/cases/inc/parser/parser_table.test.php
@@ -548,11 +548,3 @@ def');
     }
 }
 
-/**
-* Conditional test runner
-*/
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = &new TestOfDoku_Parser_Table();
-    $test->run(new HtmlReporter());
-}
diff --git a/_test/cases/inc/parser/parser_tocsections.test.php b/_test/cases/inc/parser/parser_tocsections.test.php
index 64051e2ad..258b438a8 100644
--- a/_test/cases/inc/parser/parser_tocsections.test.php
+++ b/_test/cases/inc/parser/parser_tocsections.test.php
@@ -506,11 +506,3 @@ Z
     }
 }
 
-/**
-* Conditional test runner
-*/
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = &new TestOfDoku_Parser_TocSections();
-    $test->run(new HtmlReporter());
-}
diff --git a/_test/cases/inc/parser/parser_unformatted.test.php b/_test/cases/inc/parser/parser_unformatted.test.php
index e9c1fce70..5a7d956a9 100644
--- a/_test/cases/inc/parser/parser_unformatted.test.php
+++ b/_test/cases/inc/parser/parser_unformatted.test.php
@@ -39,11 +39,3 @@ class TestOfDoku_Parser_Unformatted extends TestOfDoku_Parser {
     }
 }
 
-/**
-* Conditional test runner
-*/
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = &new TestOfDoku_Parser_Unformatted();
-    $test->run(new HtmlReporter());
-}
diff --git a/_test/runtests.php b/_test/runtests.php
index 2260c7e0f..e41454f8b 100755
--- a/_test/runtests.php
+++ b/_test/runtests.php
@@ -4,7 +4,6 @@ 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 ^ E_NOTICE);
 
 require_once 'lib/testmanager.php';