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

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

1 files changed, 43 insertions, 0 deletions

diff --git a/_test/tests/inc/pageutils_resolve_id.test.php b/_test/tests/inc/pageutils_resolve_id.test.php
new file mode 100644
index 000000000..23a2405d4
--- /dev/null
+++ b/_test/tests/inc/pageutils_resolve_id.test.php
@@ -0,0 +1,43 @@
+<?php
+
+class init_resolve_id_test extends DokuWikiTest {
+
+
+    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->assertEquals(resolve_id($test[0],$test[1]),$test[2]);
+        }
+    }
+
+}
+//Setup VIM: ex: et ts=4 :