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

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

1 files changed, 0 insertions, 45 deletions

diff --git a/_test/cases/inc/pageutils_resolve_id.test.php b/_test/cases/inc/pageutils_resolve_id.test.php
deleted file mode 100644
index 9aa4ee8b7..000000000
--- a/_test/cases/inc/pageutils_resolve_id.test.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-require_once DOKU_INC.'inc/utf8.php';
-require_once DOKU_INC.'inc/pageutils.php';
-
-class init_resolve_id_test extends UnitTestCase {
-
-
-    function test1(){
-        // we test multiple cases here
-        // format: $ns, $page, $output
-        $tests   = array();
-
-        // relative current in root
-        $tests[] = array('','page','page');
-        $tests[] = array('','.page','page');
-        $tests[] = array('','.:page','page');
-
-        // relative current in namespace
-        $tests[] = array('lev1:lev2','page','lev1:lev2:page');
-        $tests[] = array('lev1:lev2','.page','lev1:lev2:page');
-        $tests[] = array('lev1:lev2','.:page','lev1:lev2:page');
-
-        // relative upper in root
-        $tests[] = array('','..page','page');
-        $tests[] = array('','..:page','page');
-
-        // relative upper in namespace
-        $tests[] = array('lev1:lev2','..page','lev1:page');
-        $tests[] = array('lev1:lev2','..:page','lev1:page');
-        $tests[] = array('lev1:lev2','..:..:page','page');
-        $tests[] = array('lev1:lev2','..:..:..:page','page');
-
-        // strange and broken ones
-        $tests[] = array('lev1:lev2','....:....:page','lev1:lev2:page');
-        $tests[] = array('lev1:lev2','..:..:lev3:page','lev3:page');
-        $tests[] = array('lev1:lev2','..:..:lev3:..:page','page');
-        $tests[] = array('lev1:lev2','..:..:lev3:..:page:....:...','page');
-
-        foreach($tests as $test){
-            $this->assertEqual(resolve_id($test[0],$test[1]),$test[2]);
-        }
-    }
-
-}
-//Setup VIM: ex: et ts=4 :