Merge branch 'master' of github.com:splitbrain/dokuwiki into frontend_improvements

Conflicts:
	lib/tpl/dokuwiki/css/basic.css

1 files changed, 0 insertions, 89 deletions

diff --git a/_test/cases/inc/init_fullpath.test.php b/_test/cases/inc/init_fullpath.test.php
deleted file mode 100644
index aa63b0ce9..000000000
--- a/_test/cases/inc/init_fullpath.test.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-require_once DOKU_INC.'inc/init.php';
-
-class init_fullpath_test extends UnitTestCase {
-
-    function test_unix_paths(){
-        $base = $_SERVER['SCRIPT_FILENAME'];
-        $_SERVER['SCRIPT_FILENAME'] = '/absolute/path/self.php';
-        $GLOBALS['DOKU_UNITTEST_ASSUME_WINDOWS'] = false;
-
-        // paths to check
-        $tests = array(
-                        '/foo/bar/baz' => '/foo/bar/baz',
-                        '/foo//bar/baz' => '/foo/bar/baz',
-                        '/foo/../bar/baz' => '/bar/baz',
-                        '/foo/./bar/baz' => '/foo/bar/baz',
-                        '/foo/bar/..' => '/foo',
-                        '/foo/bar/../../../baz' => '/baz',
-
-                        'foo/bar/baz' => '/absolute/path/foo/bar/baz',
-                        'foo//bar/baz' => '/absolute/path/foo/bar/baz',
-                        'foo/../bar/baz' => '/absolute/path/bar/baz',
-                        'foo/./bar/baz' => '/absolute/path/foo/bar/baz',
-                        'foo/bar/..' => '/absolute/path/foo',
-                        'foo/bar/../../../baz' => '/absolute/baz',
-                      );
-
-        foreach($tests as $from => $to){
-            $info = "Testing '$from' resulted in '".fullpath($from)."'";
-            $this->signal('failinfo',$info);
-
-            $this->assertEqual(fullpath($from),$to);
-        }
-
-
-        $_SERVER['SCRIPT_FILENAME'] = $base;
-        unset($GLOBALS['DOKU_UNITTEST_ASSUME_WINDOWS']);
-    }
-
-    function test_windows_paths(){
-        $base = $_SERVER['SCRIPT_FILENAME'];
-        $_SERVER['SCRIPT_FILENAME'] = '/absolute/path/self.php';
-        $GLOBALS['DOKU_UNITTEST_ASSUME_WINDOWS'] = true;
-
-        // paths to check
-        $tests = array(
-                        'c:foo/bar/baz' => 'c:/foo/bar/baz',
-                        'c:foo//bar/baz' => 'c:/foo/bar/baz',
-                        'c:foo/../bar/baz' => 'c:/bar/baz',
-                        'c:foo/./bar/baz' => 'c:/foo/bar/baz',
-                        'c:foo/bar/..' => 'c:/foo',
-                        'c:foo/bar/../../../baz' => 'c:/baz',
-
-                        'c:/foo/bar/baz' => 'c:/foo/bar/baz',
-                        'c:/foo//bar/baz' => 'c:/foo/bar/baz',
-                        'c:/foo/../bar/baz' => 'c:/bar/baz',
-                        'c:/foo/./bar/baz' => 'c:/foo/bar/baz',
-                        'c:/foo/bar/..' => 'c:/foo',
-                        'c:/foo/bar/../../../baz' => 'c:/baz',
-
-                        'c:\\foo\\bar\\baz' => 'c:/foo/bar/baz',
-                        'c:\\foo\\\\bar\\baz' => 'c:/foo/bar/baz',
-                        'c:\\foo\\..\\bar\\baz' => 'c:/bar/baz',
-                        'c:\\foo\\.\\bar\\baz' => 'c:/foo/bar/baz',
-                        'c:\\foo\\bar\\..' => 'c:/foo',
-                        'c:\\foo\\bar\\..\\..\\..\\baz' => 'c:/baz',
-
-                        '\\\\server\\share/foo/bar/baz' => '\\\\server\\share/foo/bar/baz',
-                        '\\\\server\\share/foo//bar/baz' => '\\\\server\\share/foo/bar/baz',
-                        '\\\\server\\share/foo/../bar/baz' => '\\\\server\\share/bar/baz',
-                        '\\\\server\\share/foo/./bar/baz' => '\\\\server\\share/foo/bar/baz',
-                        '\\\\server\\share/foo/bar/..' => '\\\\server\\share/foo',
-                        '\\\\server\\share/foo/bar/../../../baz' => '\\\\server\\share/baz',
-                      );
-
-        foreach($tests as $from => $to){
-            $info = "Testing '$from' resulted in '".fullpath($from)."'";
-            $this->signal('failinfo',$info);
-
-            $this->assertEqual(fullpath($from),$to);
-        }
-
-
-        $_SERVER['SCRIPT_FILENAME'] = $base;
-        unset($GLOBALS['DOKU_UNITTEST_ASSUME_WINDOWS']);
-    }
-
-}
-//Setup VIM: ex: et ts=4 :