Merge branch 'master' into stable

Conflicts:
	doku.php

9 files changed, 114 insertions, 2 deletions

diff --git a/_test/cases/inc/auth_password.test.php b/_test/cases/inc/auth_password.test.php
index 8646e3226..928552a14 100644
--- a/_test/cases/inc/auth_password.test.php
+++ b/_test/cases/inc/auth_password.test.php
@@ -43,8 +43,7 @@ class auth_password_test extends UnitTestCase {
         foreach($this->passes as $method => $hash){
             $info = "testing method $method";
             $this->signal('failinfo',$info);
-
-            $hash = auth_cryptPassword('foo'.$method);
+            $hash = auth_cryptPassword('foo'.$method,$method);
             $this->assertTrue(auth_verifyPassword('foo'.$method,$hash));
         }
     }
diff --git a/_test/cases/inc/pageutils_clean_id.test.php b/_test/cases/inc/pageutils_clean_id.test.php
index 01fa7dc1c..167229c7f 100644
--- a/_test/cases/inc/pageutils_clean_id.test.php
+++ b/_test/cases/inc/pageutils_clean_id.test.php
@@ -35,6 +35,16 @@ class init_clean_id_test extends UnitTestCase {
         $tests[] = array('ښ侧化并곦  β',false,'ښ侧化并곦_β');
         $tests[] = array('page:page',false,'page:page');
         $tests[] = array('page;page',false,'page:page');
+        $tests[] = array('page:page 1.2',false,'page:page_1.2');
+
+        $tests[] = array('page._#!','false','page');
+        $tests[] = array('._#!page','false','page');
+        $tests[] = array('page._#!page','false','page._page');
+        $tests[] = array('ns._#!:page','false','ns:page');
+        $tests[] = array('ns:._#!page','false','ns:page');
+        $tests[] = array('ns._#!ns:page','false','ns._ns:page');
+        $tests[] = array('ns_:page',false,'ns:page');
+        $tests[] = array('page...page','false','page...page');
 
         $conf['useslash'] = 0;
         $tests[] = array('page/page',false,'page_page');
diff --git a/_test/cases/inc/search/data/ns1/ns3/page3.txt b/_test/cases/inc/search/data/ns1/ns3/page3.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/_test/cases/inc/search/data/ns1/ns3/page3.txt
diff --git a/_test/cases/inc/search/data/ns1/page1.txt b/_test/cases/inc/search/data/ns1/page1.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/_test/cases/inc/search/data/ns1/page1.txt
diff --git a/_test/cases/inc/search/data/ns1/page2.txt b/_test/cases/inc/search/data/ns1/page2.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/_test/cases/inc/search/data/ns1/page2.txt
diff --git a/_test/cases/inc/search/data/ns2/nopage.ext b/_test/cases/inc/search/data/ns2/nopage.ext
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/_test/cases/inc/search/data/ns2/nopage.ext
diff --git a/_test/cases/inc/search/data/ns2/page1.txt b/_test/cases/inc/search/data/ns2/page1.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/_test/cases/inc/search/data/ns2/page1.txt
diff --git a/_test/cases/inc/search/search.test.php b/_test/cases/inc/search/search.test.php
new file mode 100644
index 000000000..a6f15e9b6
--- /dev/null
+++ b/_test/cases/inc/search/search.test.php
@@ -0,0 +1,102 @@
+<?php
+require_once DOKU_INC.'inc/search.php';
+
+class search_test extends UnitTestCase {
+    function strip_index_data($entry) {
+        $n_entry = array();
+        foreach(array('id', 'type', 'level', 'open') as $k) {
+            $n_entry[$k] = $entry[$k];
+        }
+        return $n_entry;
+    }
+
+    function test_search_index(){
+        $data = array();
+        search($data, dirname(__FILE__) . '/data', 'search_index',
+               array('ns' => 'ns2'));
+        $this->assertEqual(array_map(array($this, 'strip_index_data'), $data),
+                           array(
+                              array(
+                                'id'   => 'ns1',
+                                'type' => 'd',
+                                'level' => 1,
+                                'open' => false
+                              ), array(
+                                'id'   => 'ns2',
+                                'type' => 'd',
+                                'level' => 1,
+                                'open' => true
+                              ), array(
+                                'id' => 'ns2:page1',
+                                'type' => 'f',
+                                'level' => 2,
+                                'open' => true,
+                              ), ));
+        $data = array();
+        search($data, dirname(__FILE__) . '/data', 'search_index',
+               array('ns' => 'ns1/ns3'));
+        $this->assertEqual(array_map(array($this, 'strip_index_data'), $data),
+                           array(
+                              array(
+                                'id' => 'ns1',
+                                'type' => 'd',
+                                'level' => 1,
+                                'open' => true,
+                              ),
+                              array(
+                                'id' => 'ns1:ns3',
+                                'type' => 'd',
+                                'level' => 2,
+                                'open' => true,
+                              ),
+                              array(
+                                'id' => 'ns1:ns3:page3',
+                                'type' => 'f',
+                                'level' => 3,
+                                'open' => true,
+                              ),
+                              array(
+                                'id' => 'ns1:page1',
+                                'type' => 'f',
+                                'level' => 2,
+                                'open' => true,
+                              ),
+                              array(
+                                'id' => 'ns1:page2',
+                                'type' => 'f',
+                                'level' => 2,
+                                'open' => true,
+                              ),
+                              array(
+                                'id' => 'ns2',
+                                'type' => 'd',
+                                'level' => 1,
+                                'open' => false,
+                              ), ));
+        $data = array();
+        search($data, dirname(__FILE__) . '/data', 'search_index',
+               array('ns' => 'ns1/ns3', 'nofiles' => true));
+        $this->assertEqual(array_map(array($this, 'strip_index_data'), $data),
+                           array(
+                              array(
+                                'id' => 'ns1',
+                                'type' => 'd',
+                                'level' => 1,
+                                'open' => true,
+                              ),
+                              array(
+                                'id' => 'ns1:ns3',
+                                'type' => 'd',
+                                'level' => 2,
+                                'open' => true,
+                              ),
+                              array(
+                                'id' => 'ns2',
+                                'type' => 'd',
+                                'level' => 1,
+                                'open' => false,
+                              ), ));
+
+    }
+}
+//Setup VIM: ex: et ts=4 :
diff --git a/_test/cases/inc/utf8_stripspecials.test.php b/_test/cases/inc/utf8_stripspecials.test.php
index 85df75fa1..481f47650 100644
--- a/_test/cases/inc/utf8_stripspecials.test.php
+++ b/_test/cases/inc/utf8_stripspecials.test.php
@@ -17,6 +17,7 @@ class utf8_stripspecials extends UnitTestCase {
         $tests[] = array('ascii.string','','\._\-:\*','asciistring');
         $tests[] = array('ascii.string',' ','\._\-:\*','ascii string');
         $tests[] = array('2.1.14',' ','\._\-:\*','2 1 14');
+        $tests[] = array('string with nbsps','_','\*','string_with_nbsps');
 
         foreach($tests as $test){
             $this->assertEqual(utf8_stripspecials($test[0],$test[1],$test[2]),$test[3]);