From 03c4aec3c817c51eda2cf5c241f76e3bef585799 Mon Sep 17 00:00:00 2001
From: chris <chris@jalakai.co.uk>
Date: Fri, 4 Aug 2006 16:22:43 +0200
Subject: unittest fixes

darcs-hash:20060804142243-9b6ab-d208f7f1a67a9958fda05c519c8407ad5e733cea.gz
---
 _test/cases/inc/common_clientIP.test.php          | 147 ----------------------
 _test/cases/inc/common_clientip.test.php          | 147 ++++++++++++++++++++++
 _test/cases/inc/pageutils_resolve_pageid.test.php |   3 +
 _test/cases/inc/parser/parser.test.php            |   1 +
 _test/index.php                                   |  52 ++++----
 _test/lib/testmanager.php                         |   6 +-
 6 files changed, 184 insertions(+), 172 deletions(-)
 delete mode 100644 _test/cases/inc/common_clientIP.test.php
 create mode 100644 _test/cases/inc/common_clientip.test.php

(limited to '_test')

diff --git a/_test/cases/inc/common_clientIP.test.php b/_test/cases/inc/common_clientIP.test.php
deleted file mode 100644
index 257229811..000000000
--- a/_test/cases/inc/common_clientIP.test.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-
-require_once DOKU_INC.'inc/init.php';
-require_once DOKU_INC.'inc/common.php';
-
-class common_clientIP_test extends UnitTestCase {
-
-    function test_simple_all(){
-        $_SERVER['REMOTE_ADDR']          = '123.123.123.123';
-        $_SERVER['HTTP_X_REAL_IP']       = '';
-        $_SERVER['HTTP_X_FORWARDED_FOR'] = '';
-        $out = '123.123.123.123';
-        $this->assertEqual(clientIP(),$out);
-    }
-
-    function test_proxy1_all(){
-        $_SERVER['REMOTE_ADDR']          = '123.123.123.123';
-        $_SERVER['HTTP_X_REAL_IP']       = '77.77.77.77';
-        $_SERVER['HTTP_X_FORWARDED_FOR'] = '';
-        $out = '123.123.123.123,77.77.77.77';
-        $this->assertEqual(clientIP(),$out);
-    }
-
-    function test_proxy2_all(){
-        $_SERVER['REMOTE_ADDR']          = '123.123.123.123';
-        $_SERVER['HTTP_X_REAL_IP']       = '';
-        $_SERVER['HTTP_X_FORWARDED_FOR'] = '77.77.77.77';
-        $out = '123.123.123.123,77.77.77.77';
-        $this->assertEqual(clientIP(),$out);
-    }
-
-    function test_proxyhops_all(){
-        $_SERVER['REMOTE_ADDR']          = '123.123.123.123';
-        $_SERVER['HTTP_X_REAL_IP']       = '';
-        $_SERVER['HTTP_X_FORWARDED_FOR'] = '77.77.77.77,66.66.66.66';
-        $out = '123.123.123.123,77.77.77.77,66.66.66.66';
-        $this->assertEqual(clientIP(),$out);
-    }
-
-    function test_simple_single(){
-        $_SERVER['REMOTE_ADDR']          = '123.123.123.123';
-        $_SERVER['HTTP_X_REAL_IP']       = '';
-        $_SERVER['HTTP_X_FORWARDED_FOR'] = '';
-        $out = '123.123.123.123';
-        $this->assertEqual(clientIP(true),$out);
-    }
-
-    function test_proxy1_single(){
-        $_SERVER['REMOTE_ADDR']          = '123.123.123.123';
-        $_SERVER['HTTP_X_REAL_IP']       = '77.77.77.77';
-        $_SERVER['HTTP_X_FORWARDED_FOR'] = '';
-        $out = '77.77.77.77';
-        $this->assertEqual(clientIP(true),$out);
-    }
-
-    function test_proxy2_single(){
-        $_SERVER['REMOTE_ADDR']          = '123.123.123.123';
-        $_SERVER['HTTP_X_REAL_IP']       = '';
-        $_SERVER['HTTP_X_FORWARDED_FOR'] = '77.77.77.77';
-        $out = '77.77.77.77';
-        $this->assertEqual(clientIP(true),$out);
-    }
-
-    function test_proxyhops_single(){
-        $_SERVER['REMOTE_ADDR']          = '123.123.123.123';
-        $_SERVER['HTTP_X_REAL_IP']       = '';
-        $_SERVER['HTTP_X_FORWARDED_FOR'] = '77.77.77.77,66.66.66.66';
-        $out = '66.66.66.66';
-        $this->assertEqual(clientIP(true),$out);
-    }
-
-    function test_local_all(){
-        $_SERVER['REMOTE_ADDR']          = '123.123.123.123';
-        $_SERVER['HTTP_X_REAL_IP']       = '';
-        $_SERVER['HTTP_X_FORWARDED_FOR'] = '127.0.0.1';
-        $out = '123.123.123.123,127.0.0.1';
-        $this->assertEqual(clientIP(),$out);
-    }
-
-    function test_local1_single(){
-        $_SERVER['REMOTE_ADDR']          = '123.123.123.123';
-        $_SERVER['HTTP_X_REAL_IP']       = '';
-        $_SERVER['HTTP_X_FORWARDED_FOR'] = '127.0.0.1';
-        $out = '123.123.123.123';
-        $this->assertEqual(clientIP(true),$out);
-    }
-
-    function test_local2_single(){
-        $_SERVER['REMOTE_ADDR']          = '127.0.0.1';
-        $_SERVER['HTTP_X_REAL_IP']       = '';
-        $_SERVER['HTTP_X_FORWARDED_FOR'] = '123.123.123.123';
-        $out = '123.123.123.123';
-        $this->assertEqual(clientIP(true),$out);
-    }
-
-    function test_local3_single(){
-        $_SERVER['REMOTE_ADDR']          = '123.123.123.123';
-        $_SERVER['HTTP_X_REAL_IP']       = '';
-        $_SERVER['HTTP_X_FORWARDED_FOR'] = '127.0.0.1,10.0.0.1,192.168.0.2,172.17.1.1,172.21.1.1,172.31.1.1';
-        $out = '123.123.123.123';
-        $this->assertEqual(clientIP(true),$out);
-    }
-
-    function test_local4_single(){
-        $_SERVER['REMOTE_ADDR']          = '127.0.0.1';
-        $_SERVER['HTTP_X_REAL_IP']       = '';
-        $_SERVER['HTTP_X_FORWARDED_FOR'] = '192.168.0.5';
-        $out = '192.168.0.5';
-        $this->assertEqual(clientIP(true),$out);
-    }
-
-    function test_garbage_all(){
-        $_SERVER['REMOTE_ADDR']          = '123.123.123.123';
-        $_SERVER['HTTP_X_REAL_IP']       = '';
-        $_SERVER['HTTP_X_FORWARDED_FOR'] = 'some garbage, or something, 222';
-        $out = '123.123.123.123';
-        $this->assertEqual(clientIP(),$out);
-    }
-
-    function test_garbage_single(){
-        $_SERVER['REMOTE_ADDR']          = '123.123.123.123';
-        $_SERVER['HTTP_X_REAL_IP']       = '';
-        $_SERVER['HTTP_X_FORWARDED_FOR'] = 'some garbage, or something, 222';
-        $out = '123.123.123.123';
-        $this->assertEqual(clientIP(true),$out);
-    }
-
-    function test_garbageonly_all(){
-        $_SERVER['REMOTE_ADDR']          = 'argh';
-        $_SERVER['HTTP_X_REAL_IP']       = '';
-        $_SERVER['HTTP_X_FORWARDED_FOR'] = 'some garbage, or something, 222';
-        $out = '0.0.0.0';
-        $this->assertEqual(clientIP(),$out);
-    }
-
-    function test_garbageonly_single(){
-        $_SERVER['REMOTE_ADDR']          = 'argh';
-        $_SERVER['HTTP_X_REAL_IP']       = '';
-        $_SERVER['HTTP_X_FORWARDED_FOR'] = 'some garbage, or something, 222';
-        $out = '0.0.0.0';
-        $this->assertEqual(clientIP(true),$out);
-    }
-
-
-}
-
-//Setup VIM: ex: et ts=4 enc=utf-8 :
diff --git a/_test/cases/inc/common_clientip.test.php b/_test/cases/inc/common_clientip.test.php
new file mode 100644
index 000000000..257229811
--- /dev/null
+++ b/_test/cases/inc/common_clientip.test.php
@@ -0,0 +1,147 @@
+<?php
+
+require_once DOKU_INC.'inc/init.php';
+require_once DOKU_INC.'inc/common.php';
+
+class common_clientIP_test extends UnitTestCase {
+
+    function test_simple_all(){
+        $_SERVER['REMOTE_ADDR']          = '123.123.123.123';
+        $_SERVER['HTTP_X_REAL_IP']       = '';
+        $_SERVER['HTTP_X_FORWARDED_FOR'] = '';
+        $out = '123.123.123.123';
+        $this->assertEqual(clientIP(),$out);
+    }
+
+    function test_proxy1_all(){
+        $_SERVER['REMOTE_ADDR']          = '123.123.123.123';
+        $_SERVER['HTTP_X_REAL_IP']       = '77.77.77.77';
+        $_SERVER['HTTP_X_FORWARDED_FOR'] = '';
+        $out = '123.123.123.123,77.77.77.77';
+        $this->assertEqual(clientIP(),$out);
+    }
+
+    function test_proxy2_all(){
+        $_SERVER['REMOTE_ADDR']          = '123.123.123.123';
+        $_SERVER['HTTP_X_REAL_IP']       = '';
+        $_SERVER['HTTP_X_FORWARDED_FOR'] = '77.77.77.77';
+        $out = '123.123.123.123,77.77.77.77';
+        $this->assertEqual(clientIP(),$out);
+    }
+
+    function test_proxyhops_all(){
+        $_SERVER['REMOTE_ADDR']          = '123.123.123.123';
+        $_SERVER['HTTP_X_REAL_IP']       = '';
+        $_SERVER['HTTP_X_FORWARDED_FOR'] = '77.77.77.77,66.66.66.66';
+        $out = '123.123.123.123,77.77.77.77,66.66.66.66';
+        $this->assertEqual(clientIP(),$out);
+    }
+
+    function test_simple_single(){
+        $_SERVER['REMOTE_ADDR']          = '123.123.123.123';
+        $_SERVER['HTTP_X_REAL_IP']       = '';
+        $_SERVER['HTTP_X_FORWARDED_FOR'] = '';
+        $out = '123.123.123.123';
+        $this->assertEqual(clientIP(true),$out);
+    }
+
+    function test_proxy1_single(){
+        $_SERVER['REMOTE_ADDR']          = '123.123.123.123';
+        $_SERVER['HTTP_X_REAL_IP']       = '77.77.77.77';
+        $_SERVER['HTTP_X_FORWARDED_FOR'] = '';
+        $out = '77.77.77.77';
+        $this->assertEqual(clientIP(true),$out);
+    }
+
+    function test_proxy2_single(){
+        $_SERVER['REMOTE_ADDR']          = '123.123.123.123';
+        $_SERVER['HTTP_X_REAL_IP']       = '';
+        $_SERVER['HTTP_X_FORWARDED_FOR'] = '77.77.77.77';
+        $out = '77.77.77.77';
+        $this->assertEqual(clientIP(true),$out);
+    }
+
+    function test_proxyhops_single(){
+        $_SERVER['REMOTE_ADDR']          = '123.123.123.123';
+        $_SERVER['HTTP_X_REAL_IP']       = '';
+        $_SERVER['HTTP_X_FORWARDED_FOR'] = '77.77.77.77,66.66.66.66';
+        $out = '66.66.66.66';
+        $this->assertEqual(clientIP(true),$out);
+    }
+
+    function test_local_all(){
+        $_SERVER['REMOTE_ADDR']          = '123.123.123.123';
+        $_SERVER['HTTP_X_REAL_IP']       = '';
+        $_SERVER['HTTP_X_FORWARDED_FOR'] = '127.0.0.1';
+        $out = '123.123.123.123,127.0.0.1';
+        $this->assertEqual(clientIP(),$out);
+    }
+
+    function test_local1_single(){
+        $_SERVER['REMOTE_ADDR']          = '123.123.123.123';
+        $_SERVER['HTTP_X_REAL_IP']       = '';
+        $_SERVER['HTTP_X_FORWARDED_FOR'] = '127.0.0.1';
+        $out = '123.123.123.123';
+        $this->assertEqual(clientIP(true),$out);
+    }
+
+    function test_local2_single(){
+        $_SERVER['REMOTE_ADDR']          = '127.0.0.1';
+        $_SERVER['HTTP_X_REAL_IP']       = '';
+        $_SERVER['HTTP_X_FORWARDED_FOR'] = '123.123.123.123';
+        $out = '123.123.123.123';
+        $this->assertEqual(clientIP(true),$out);
+    }
+
+    function test_local3_single(){
+        $_SERVER['REMOTE_ADDR']          = '123.123.123.123';
+        $_SERVER['HTTP_X_REAL_IP']       = '';
+        $_SERVER['HTTP_X_FORWARDED_FOR'] = '127.0.0.1,10.0.0.1,192.168.0.2,172.17.1.1,172.21.1.1,172.31.1.1';
+        $out = '123.123.123.123';
+        $this->assertEqual(clientIP(true),$out);
+    }
+
+    function test_local4_single(){
+        $_SERVER['REMOTE_ADDR']          = '127.0.0.1';
+        $_SERVER['HTTP_X_REAL_IP']       = '';
+        $_SERVER['HTTP_X_FORWARDED_FOR'] = '192.168.0.5';
+        $out = '192.168.0.5';
+        $this->assertEqual(clientIP(true),$out);
+    }
+
+    function test_garbage_all(){
+        $_SERVER['REMOTE_ADDR']          = '123.123.123.123';
+        $_SERVER['HTTP_X_REAL_IP']       = '';
+        $_SERVER['HTTP_X_FORWARDED_FOR'] = 'some garbage, or something, 222';
+        $out = '123.123.123.123';
+        $this->assertEqual(clientIP(),$out);
+    }
+
+    function test_garbage_single(){
+        $_SERVER['REMOTE_ADDR']          = '123.123.123.123';
+        $_SERVER['HTTP_X_REAL_IP']       = '';
+        $_SERVER['HTTP_X_FORWARDED_FOR'] = 'some garbage, or something, 222';
+        $out = '123.123.123.123';
+        $this->assertEqual(clientIP(true),$out);
+    }
+
+    function test_garbageonly_all(){
+        $_SERVER['REMOTE_ADDR']          = 'argh';
+        $_SERVER['HTTP_X_REAL_IP']       = '';
+        $_SERVER['HTTP_X_FORWARDED_FOR'] = 'some garbage, or something, 222';
+        $out = '0.0.0.0';
+        $this->assertEqual(clientIP(),$out);
+    }
+
+    function test_garbageonly_single(){
+        $_SERVER['REMOTE_ADDR']          = 'argh';
+        $_SERVER['HTTP_X_REAL_IP']       = '';
+        $_SERVER['HTTP_X_FORWARDED_FOR'] = 'some garbage, or something, 222';
+        $out = '0.0.0.0';
+        $this->assertEqual(clientIP(true),$out);
+    }
+
+
+}
+
+//Setup VIM: ex: et ts=4 enc=utf-8 :
diff --git a/_test/cases/inc/pageutils_resolve_pageid.test.php b/_test/cases/inc/pageutils_resolve_pageid.test.php
index 2546bd2af..ab282b57a 100644
--- a/_test/cases/inc/pageutils_resolve_pageid.test.php
+++ b/_test/cases/inc/pageutils_resolve_pageid.test.php
@@ -2,6 +2,9 @@
 require_once DOKU_INC.'inc/utf8.php';
 require_once DOKU_INC.'inc/pageutils.php';
 
+global $conf;
+if (!isset($conf['datadir'])) $conf['datadir'] = $conf['savedir'].'/pages';
+
 class init_resolve_pageid_test extends UnitTestCase {
 
 
diff --git a/_test/cases/inc/parser/parser.test.php b/_test/cases/inc/parser/parser.test.php
index c760c127a..d18a245f7 100644
--- a/_test/cases/inc/parser/parser.test.php
+++ b/_test/cases/inc/parser/parser.test.php
@@ -10,6 +10,7 @@
 */
 require_once DOKU_INC . 'inc/parser/parser.php';
 require_once DOKU_INC . 'inc/parser/handler.php';
+require_once DOKU_INC . 'inc/events.php';
 //require_once DOKU . 'parser/renderer.php';
 
 //Mock::generate('Doku_Renderer');
diff --git a/_test/index.php b/_test/index.php
index 7410cf461..99fae4b95 100644
--- a/_test/index.php
+++ b/_test/index.php
@@ -1,7 +1,13 @@
 <?php
+define('DOKU_UNITTEST',true);
+define('DOKU_TESTSCRIPT',$_SERVER['PHP_SELF']);
+
 if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/');
-define('DOKU_CONF',realpath(dirname(__FILE__).'/../conf').'/'        );
+define('DOKU_CONF',realpath(dirname(__FILE__).'/../conf').'/');
+
 require_once DOKU_CONF . 'dokuwiki.php';
+if(@file_exists(DOKU_CONF.'local.php')){ require_once(DOKU_CONF.'local.php'); }
+
 $conf['lang'] = 'en'; 
 define('TEST_ROOT', dirname(__FILE__));
 define('TMPL_FILESCHEME_PATH', TEST_ROOT . '/filescheme/');
@@ -56,7 +62,7 @@ function DW_TESTS_PaintRunMore() {
         break;
         case DW_TESTS_OUTPUT_HTML:
         default:
-            echo "<p><a href='" . $_SERVER['PHP_SELF'] . "'>Run more tests</a></p>";
+            echo "<p><a href='" . DOKU_TESTSCRIPT . "'>Run more tests</a></p>";
         break;
     }
 }
@@ -94,8 +100,8 @@ function DW_TESTS_PaintSuiteHeader() {
         case DW_TESTS_OUTPUT_HTML:
         default:
             echo "<h1>Dokuwiki: Unit Test Suite</h1>\n";
-            echo "<p><a href='index.php?show=groups'>Test groups</a>";
-            echo " || <a href='index.php?show=cases'>Test cases</a></p>";
+            echo "<p><a href='". DOKU_TESTSCRIPT ."?show=groups'>Test groups</a>";
+            echo " || <a href='". DOKU_TESTSCRIPT ."?show=cases'>Test cases</a></p>";
         break;
     }
 }
@@ -140,25 +146,25 @@ EOD;
 }
 
 /** OUTPUT STARTS HERE **/
-
-// If it's a group test
-if (isset($_GET['group'])) {
-    if ('all' == $_GET['group']) {
-        TestManager::runAllTests(DW_TESTS_GetReporter());
-    } else {
-        TestManager::runGroupTest(ucfirst($_GET['group']),
-                                  TEST_GROUPS,
-                                  DW_TESTS_GetReporter());
-    }
-    DW_TESTS_PaintRunMore();
-    exit();
-}
-
-// If it's a single test case
-if (isset($_GET['case'])) {
-    TestManager::runTestCase($_GET['case'], TEST_CASES, DW_TESTS_GetReporter());
-    DW_TESTS_PaintRunMore();
-    exit();
+
+// If it's a group test
+if (isset($_GET['group'])) {
+    if ('all' == $_GET['group']) {
+        TestManager::runAllTests(DW_TESTS_GetReporter());
+    } else {
+        TestManager::runGroupTest(ucfirst($_GET['group']),
+                                  TEST_GROUPS,
+                                  DW_TESTS_GetReporter());
+    }
+    DW_TESTS_PaintRunMore();
+    exit();
+}
+
+// If it's a single test case
+if (isset($_GET['case'])) {
+    TestManager::runTestCase($_GET['case'], TEST_CASES, DW_TESTS_GetReporter());
+    DW_TESTS_PaintRunMore();
+    exit();
 }
 
 // Else it's the main page
diff --git a/_test/lib/testmanager.php b/_test/lib/testmanager.php
index 51d7f5a99..def86ca27 100644
--- a/_test/lib/testmanager.php
+++ b/_test/lib/testmanager.php
@@ -47,7 +47,7 @@ class TestManager {
         require_once SIMPLE_TEST . 'web_tester.php';
         require_once SIMPLE_TEST . 'mock_objects.php';
         require_once 'web.inc.php';
-		require_once 'mock_functions.php';
+        require_once 'mock_functions.php';
     }
 
     function runAllTests(&$reporter) {
@@ -286,7 +286,9 @@ class HTMLTestManager extends TestManager {
                 "?case=" . urlencode($testcase) . "'>" .
                 $testcase . "</a></li>\n";
         }
-        return $buffer . "</ul>\n";
+
+        $buffer .= "</ul>\n";
+        return $buffer;
     }
 }
 
-- 
cgit v1.2.3