Added configuration variables for empty link testcases and added testcases for resolve_pageid

2 files changed, 68 insertions, 4 deletions

diff --git a/_test/cases/inc/pageutils_resolve_pageid.test.php b/_test/cases/inc/pageutils_resolve_pageid.test.php
index d9ea89869..c65ed1866 100644
--- a/_test/cases/inc/pageutils_resolve_pageid.test.php
+++ b/_test/cases/inc/pageutils_resolve_pageid.test.php
@@ -50,6 +50,10 @@ class init_resolve_pageid_test extends UnitTestCase {
         $tests[] = array('foo','foo:','foo:start');
         $tests[] = array('foo','playground:','playground:playground');
 
+        // empty $page
+        global $ID;
+        $ID = 'my:space';
+        $tests[] = array('my', '', 'my:space');
 
         foreach($tests as $test){
             $page = $test[1];
@@ -59,5 +63,23 @@ class init_resolve_pageid_test extends UnitTestCase {
         }
     }
 
+    /**
+     * Empty page on homepage should resolve to start page
+     */
+    function test_resolve_pageid_empty_homepage() {
+        global $ID;
+        $ID = '';
+
+        global $conf;
+        $conf['start'] = 'someverystrangestartname';
+
+        $ns = '';
+        $page = '';
+        $exist = true;
+
+        resolve_pageid($ns, $page, $exist);
+        $this->assertEqual($page, $conf['start']);
+   }
+
 }
 //Setup VIM: ex: et ts=4 :
diff --git a/_test/cases/inc/parser/xhtml_links.test.php b/_test/cases/inc/parser/xhtml_links.test.php
index 4954086a2..11883dd9c 100644
--- a/_test/cases/inc/parser/xhtml_links.test.php
+++ b/_test/cases/inc/parser/xhtml_links.test.php
@@ -48,10 +48,17 @@ class xhtml_links_test extends UnitTestCase {
         global $ID;
         $ID = 'my:space';
 
+        global $conf;
+        $conf['basedir']     = '/';
+        $conf['useheading']  = 0;
+        $conf['userewrite']  = 0;
+        $conf['useslash']    = 0;
+        $conf['canonical']   = 0;
+
         $p = new Doku_Renderer_xhtml();
         $p->internallink('');
 
-        $expect = '<span class="curid"><a href="/./doku.php/my:space" class="wikilink1" title="my:space">start</a></span>';
+        $expect = '<span class="curid"><a href="/./doku.php?id=my:space" class="wikilink1" title="my:space">start</a></span>';
 
         $this->assertEqual($p->doc, $expect);
     }
@@ -63,10 +70,17 @@ class xhtml_links_test extends UnitTestCase {
         global $ID;
         $ID = 'my:space';
 
+        global $conf;
+        $conf['basedir']     = '/';
+        $conf['useheading']  = 0;
+        $conf['userewrite']  = 0;
+        $conf['useslash']    = 0;
+        $conf['canonical']   = 0;
+
         $p = new Doku_Renderer_xhtml();
         $p->internallink('', 'my caption');
 
-        $expect = '<span class="curid"><a href="/./doku.php/my:space" class="wikilink1" title="my:space">my caption</a></span>';
+        $expect = '<span class="curid"><a href="/./doku.php?id=my:space" class="wikilink1" title="my:space">my caption</a></span>';
 
         $this->assertEqual($p->doc, $expect);
     }
@@ -78,10 +92,17 @@ class xhtml_links_test extends UnitTestCase {
         global $ID;
         $ID = 'my:space';
 
+        global $conf;
+        $conf['basedir']     = '/';
+        $conf['useheading']  = 0;
+        $conf['userewrite']  = 0;
+        $conf['useslash']    = 0;
+        $conf['canonical']   = 0;
+
         $p = new Doku_Renderer_xhtml();
         $p->internallink('?do=index');
 
-        $expect = '<span class="curid"><a href="/./doku.php/my:space?do=index" class="wikilink1" title="my:space">start</a></span>';
+        $expect = '<span class="curid"><a href="/./doku.php?id=my:space&amp;do=index" class="wikilink1" title="my:space">start</a></span>';
 
         $this->assertEqual($p->doc, $expect);
     }
@@ -93,10 +114,17 @@ class xhtml_links_test extends UnitTestCase {
         global $ID;
         $ID = 'my:space';
 
+        global $conf;
+        $conf['basedir']     = '/';
+        $conf['useheading']  = 0;
+        $conf['userewrite']  = 0;
+        $conf['useslash']    = 0;
+        $conf['canonical']   = 0;
+
         $p = new Doku_Renderer_xhtml();
         $p->internallink('?do=index', 'my caption');
 
-        $expect = '<span class="curid"><a href="/./doku.php/my:space?do=index" class="wikilink1" title="my:space">my caption</a></span>';
+        $expect = '<span class="curid"><a href="/./doku.php?id=my:space&amp;do=index" class="wikilink1" title="my:space">my caption</a></span>';
 
         $this->assertEqual($p->doc, $expect);
     }
@@ -108,6 +136,13 @@ class xhtml_links_test extends UnitTestCase {
         global $ID;
         $ID = 'my:space';
 
+        global $conf;
+        $conf['basedir']     = '/';
+        $conf['useheading']  = 0;
+        $conf['userewrite']  = 0;
+        $conf['useslash']    = 0;
+        $conf['canonical']   = 0;
+
         $p = new Doku_Renderer_xhtml();
         $p->locallink('test');
 
@@ -123,6 +158,13 @@ class xhtml_links_test extends UnitTestCase {
         global $ID;
         $ID = 'my:space';
 
+        global $conf;
+        $conf['basedir']     = '/';
+        $conf['useheading']  = 0;
+        $conf['userewrite']  = 0;
+        $conf['useslash']    = 0;
+        $conf['canonical']   = 0;
+
         $p = new Doku_Renderer_xhtml();
         $p->locallink('test', 'my caption');