wikilink creating refactored to _resolveinterwiki().

Added DOKU_BASE for local target

1 files changed, 11 insertions, 12 deletions

diff --git a/_test/tests/inc/parser/renderer_resolveinterwiki.test.php b/_test/tests/inc/parser/renderer_resolveinterwiki.test.php
index 5ce54fac6..f17838f92 100644
--- a/_test/tests/inc/parser/renderer_resolveinterwiki.test.php
+++ b/_test/tests/inc/parser/renderer_resolveinterwiki.test.php
@@ -7,29 +7,28 @@ require_once DOKU_INC . 'inc/parser/renderer.php';
  */
 class Test_resolveInterwiki extends PHPUnit_Framework_TestCase {
 
-
     function testDefaults() {
         $Renderer = new Doku_Renderer();
         $Renderer->interwiki = getInterwiki();
         $Renderer->interwiki['scheme'] = '{SCHEME}://example.com';
-        $Renderer->interwiki['slash'] = '/test';
-        $Renderer->interwiki['onlytext'] = 'onlytext';
-
-         //var_dump($Renderer->interwiki);
+        $Renderer->interwiki['withslash'] = '/test';
+        $Renderer->interwiki['onlytext'] = 'onlytext{NAME}'; //with {URL} double urlencoded
+        $Renderer->interwiki['withquery'] = 'anyns:{NAME}?do=edit';
 
         $tests = array(
             // shortcut, reference and expected
-            array('wp', 'foo @+%/', 'http://en.wikipedia.org/wiki/foo @+%/'),
-            array('amazon', 'foo @+%/', 'http://www.amazon.com/exec/obidos/ASIN/foo%20%40%2B%25%2F/splitbrain-20/'),
-            array('doku', 'foo @+%/', 'http://www.dokuwiki.org/foo%20%40%2B%25%2F'),
+            array('wp', 'foo @+%/#txt', 'http://en.wikipedia.org/wiki/foo @+%/#txt'),
+            array('amazon', 'foo @+%/#txt', 'http://www.amazon.com/exec/obidos/ASIN/foo%20%40%2B%25%2F/splitbrain-20/#txt'),
+            array('doku', 'foo @+%/#txt', 'http://www.dokuwiki.org/foo%20%40%2B%25%2F#txt'),
             //ToDo: Check needed, is double slash in path desired
             array('coral', 'http://example.com:83/path/naar/?query=foo%20%40%2B%25%2F', 'http://example.com.83.nyud.net:8090//path/naar/?query=foo%20%40%2B%25%2F'),
-            array('scheme', 'ftp://foo @+%/', 'ftp://example.com'),
+            array('scheme', 'ftp://foo @+%/#txt', 'ftp://example.com#txt'),
             //relative url
-            array('slash', 'foo @+%/', '/testfoo%20%40%2B%25%2F'),
+            array('withslash', 'foo @+%/#txt', '/testfoo%20%40%2B%25%2F#txt'),
             //dokuwiki id's
-            array('onlytext', 'foo @+%/', 'onlytextfoo%20%40%2B%25%2F'),
-            array('user', 'foo @+%/', 'wiki:users:foo%20%40%2B%25%2F')
+            array('onlytext', 'foo @+%#txt', '/tmp/doku.php?id=onlytextfoo%20%40%2B%25#txt'),
+            array('user', 'foo @+%#txt', '/tmp/doku.php?id=wiki:users:foo%20%40%2B%25#txt'),
+            array('withquery', 'foo @+%#txt', '/tmp/doku.php?id=anyns:foo%20%40%2B%25&do=edit#txt')
         );
 
         foreach($tests as $test) {