From 66d935e75f9ebbb37332c14e0a9425170c7c9330 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Sat, 17 Aug 2013 21:33:32 +0200
Subject: Fix backlinks for internal links with parameters

This adds the parameter extraction code from the xhtml renderer to the
metadata renderer in order to not to include the parameters in the id
that is recorded as link target. A test case checks that the link is
actually returned as backlink (fails without the fix).
---
 _test/tests/inc/fulltext_backlinks.test.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to '_test')

diff --git a/_test/tests/inc/fulltext_backlinks.test.php b/_test/tests/inc/fulltext_backlinks.test.php
index 058e13498..b20a16ee1 100644
--- a/_test/tests/inc/fulltext_backlinks.test.php
+++ b/_test/tests/inc/fulltext_backlinks.test.php
@@ -8,7 +8,7 @@ if (!defined('DOKU_INC')) die();
  *
  * @author Michael Hamann <michael@content-space.de>
  */
-class fultext_backlinks_test extends DokuWikiTest {
+class fulltext_backlinks_test extends DokuWikiTest {
 
     public function test_internallink() {
         saveWikiText('test:internallinks', '[[internälLink]] [[..:internal link]]', 'Test initialization');
@@ -74,4 +74,12 @@ class fultext_backlinks_test extends DokuWikiTest {
         $this->assertEquals(array(), ft_backlinks('test:internallink'));
         $this->assertEquals(array(), ft_backlinks('internal_link'));
     }
+
+    function test_parameters() {
+        saveWikiText('test:links', '[[wiki:syntax?do=export_raw]] [[:web:scripts:add_vhost.sh?do=export_raw]]', 'Init tests');
+        idx_addPage('test:links');
+
+        $this->assertEquals(array('test:links'), ft_backlinks('wiki:syntax'));
+        $this->assertEquals(array('test:links'), ft_backlinks('web:scripts:add_vhost.sh'));
+    }
 }
-- 
cgit v1.2.3


From 8ef75711c492f1188d121995778e82cd5aa95e1b Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Thu, 19 Sep 2013 21:34:37 +0200
Subject: Extend pageutils_clean_id tests to show more behavior details

---
 _test/tests/inc/pageutils_clean_id.test.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to '_test')

diff --git a/_test/tests/inc/pageutils_clean_id.test.php b/_test/tests/inc/pageutils_clean_id.test.php
index 478fd2bc4..f67109ba3 100644
--- a/_test/tests/inc/pageutils_clean_id.test.php
+++ b/_test/tests/inc/pageutils_clean_id.test.php
@@ -43,6 +43,9 @@ class init_clean_id_test extends DokuWikiTest {
         $tests[] = array('ns._#!ns:page','false','ns._ns:page');
         $tests[] = array('ns_:page',false,'ns:page');
         $tests[] = array('page...page','false','page...page');
+        $tests[] = array('page---page','false','page---page');
+        $tests[] = array('page___page','false','page_page');
+        $tests[] = array('page_-.page','false','page_-.page');
         $tests[] = array(':page',false,'page');
         $tests[] = array(':ns:page',false,'ns:page');
         $tests[] = array('page:',false,'page');
-- 
cgit v1.2.3


From 0d9a72ff5d870d72772f5f6b4b83b8ee0b4a1f05 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Wed, 25 Sep 2013 18:16:00 +0200
Subject: added unittests for rowspans at first table row

---
 _test/tests/inc/parser/parser_table.test.php | 58 ++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

(limited to '_test')

diff --git a/_test/tests/inc/parser/parser_table.test.php b/_test/tests/inc/parser/parser_table.test.php
index 96789c38c..542a307b8 100644
--- a/_test/tests/inc/parser/parser_table.test.php
+++ b/_test/tests/inc/parser/parser_table.test.php
@@ -270,6 +270,64 @@ def');
         );
         $this->assertEquals(array_map('stripbyteindex',$this->H->calls),$calls);
     }
+
+    function testCellRowSpanFirstRow() {
+        $this->P->addMode('table',new Doku_Parser_Mode_Table());
+        $this->P->parse('
+abc
+|::: ^  d:::^:::|  :::  |
+| b ^ e  | | ::: |
+|c  ^  ::: | |:::|
+def');
+
+        $calls = array (
+            array('document_start',array()),
+            array('p_open',array()),
+            array('cdata',array("\n\nabc")),
+            array('p_close',array()),
+            array('table_open',array(4, 3, 6)),
+            array('tablerow_open',array()),
+            array('tablecell_open',array(1,NULL,1)),
+            array('cdata',array('')),
+            array('tablecell_close',array()),
+            array('tableheader_open',array(1,'right',1)),
+            array('cdata',array('  d:::')),
+            array('tableheader_close',array()),
+            array('tableheader_open',array(1,NULL,1)),
+            array('cdata',array('')),
+            array('tableheader_close',array()),
+            array('tablecell_open',array(1,NULL,3)),
+            array('cdata',array('')),
+            array('tablecell_close',array()),
+            array('tablerow_close',array()),
+            array('tablerow_open',array()),
+            array('tablecell_open',array(1,NULL,1)),
+            array('cdata',array(' b ')),
+            array('tablecell_close',array()),
+            array('tableheader_open',array(1,'left',2)),
+            array('cdata',array(' e  ')),
+            array('tableheader_close',array()),
+            array('tablecell_open',array(1,NULL,1)),
+            array('cdata',array(' ')),
+            array('tablecell_close',array()),
+            array('tablerow_close',array()),
+            array('tablerow_open',array()),
+            array('tablecell_open',array(1,'left',1)),
+            array('cdata',array('c  ')),
+            array('tablecell_close',array()),
+            array('tablecell_open',array(1,NULL,1)),
+            array('cdata',array(' ')),
+            array('tablecell_close',array()),
+            array('tablerow_close',array()),
+
+            array('table_close',array(69)),
+            array('p_open',array()),
+            array('cdata',array('def')),
+            array('p_close',array()),
+            array('document_end',array()),
+        );
+        $this->assertEquals(array_map('stripbyteindex',$this->H->calls),$calls);
+    }
     
     function testCellAlignmentFormatting() {
         $this->P->addMode('table',new Doku_Parser_Mode_Table());
-- 
cgit v1.2.3


From 0ee5ed1e998c1e67c4a0b7687977c4e2e0f29494 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 12 Oct 2013 12:41:24 +0200
Subject: IETF's message lint service as a test for Mailer class

---
 _test/tests/inc/mailer.test.php | 56 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

(limited to '_test')

diff --git a/_test/tests/inc/mailer.test.php b/_test/tests/inc/mailer.test.php
index ef78692b3..fefb6f508 100644
--- a/_test/tests/inc/mailer.test.php
+++ b/_test/tests/inc/mailer.test.php
@@ -156,5 +156,61 @@ class mailer_test extends DokuWikiTest {
         $this->assertEquals(0, preg_match('/(^|\n)Bcc: (\n|$)/', $header), 'Bcc found in headers.');
         $this->assertEquals(0, preg_match('/(^|\n)Cc: (\n|$)/', $header), 'Bcc found in headers.');
     }
+
+    /**
+     * @group internet
+     */
+    function test_lint(){
+        // prepare a simple multipart message
+        $mail = new TestMailer();
+        $mail->to(array('Möp <moep@example.com> ',' foo <foo@example.com>'));
+        $mail->subject('This is a töst');
+        $mail->setBody('Hello Wörld,
+
+        please don\'t burn, okay?
+        ');
+        $mail->attachContent('some test data', 'text/plain', 'text.txt');
+        $msg = $mail->dump();
+        $msglines = explode("\n", $msg);
+
+        // ask message lint if it is okay
+        $html = new HTTPClient();
+        $results = $html->post('http://tools.ietf.org/tools/msglint/msglint', array('msg'=>$msg));
+        $this->assertTrue($results !== false);
+
+        // parse the result lines
+        $lines = explode("\n", $results);
+        $rows  = count($lines);
+        $i=0;
+        while(trim($lines[$i]) != '-----------' && $i<$rows) $i++; //skip preamble
+        for($i=$i+1; $i<$rows; $i++){
+            $line = trim($lines[$i]);
+            if($line == '-----------') break; //skip appendix
+
+            // get possible continuation of the line
+            while($lines[$i+1][0] == ' '){
+                $line .= ' '.trim($lines[$i+1]);
+                $i++;
+            }
+
+            // check the line for errors
+            if(substr($line,0,5) == 'ERROR'){
+                // get the context in which the error occured
+                $errorin = '';
+                if(preg_match('/line (\d+)$/', $line, $m)){
+                    $errorin .= "\n".$msglines[$m[1] - 1];
+                }
+                if(preg_match('/lines (\d+)-(\d+)$/', $line, $m)){
+                    for($x=$m[1]-1; $x<$m[2]; $x++){
+                        $errorin .= "\n".$msglines[$x];
+                    }
+                }
+
+                // raise the error
+                throw new Exception($line.$errorin);
+            }
+        }
+
+    }
 }
 //Setup VIM: ex: et ts=4 :
-- 
cgit v1.2.3


From d6e04b603a81d6c55c3bb71974689892762b6a01 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 12 Oct 2013 13:30:54 +0200
Subject: successfully validate Mailer mails with msglint

---
 _test/tests/inc/mailer.test.php | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to '_test')

diff --git a/_test/tests/inc/mailer.test.php b/_test/tests/inc/mailer.test.php
index fefb6f508..feb454fcf 100644
--- a/_test/tests/inc/mailer.test.php
+++ b/_test/tests/inc/mailer.test.php
@@ -164,6 +164,7 @@ class mailer_test extends DokuWikiTest {
         // prepare a simple multipart message
         $mail = new TestMailer();
         $mail->to(array('Möp <moep@example.com> ',' foo <foo@example.com>'));
+        $mail->from('Me <test@example.com>');
         $mail->subject('This is a töst');
         $mail->setBody('Hello Wörld,
 
@@ -173,6 +174,8 @@ class mailer_test extends DokuWikiTest {
         $msg = $mail->dump();
         $msglines = explode("\n", $msg);
 
+        //echo $msg;
+
         // ask message lint if it is okay
         $html = new HTTPClient();
         $results = $html->post('http://tools.ietf.org/tools/msglint/msglint', array('msg'=>$msg));
@@ -195,6 +198,10 @@ class mailer_test extends DokuWikiTest {
 
             // check the line for errors
             if(substr($line,0,5) == 'ERROR'){
+                // ignore some errors
+                if(strpos($line, "missing mandatory header 'return-path'")) continue; #set by MDA
+                if(strpos($line, "bare newline in text body decoded")) continue; #seems to be false positive
+
                 // get the context in which the error occured
                 $errorin = '';
                 if(preg_match('/line (\d+)$/', $line, $m)){
-- 
cgit v1.2.3


From ec82d005b6a02f137645cd756cccfbab7025047a Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 12 Oct 2013 14:07:59 +0200
Subject: check msglint for warnings, too

---
 _test/tests/inc/mailer.test.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to '_test')

diff --git a/_test/tests/inc/mailer.test.php b/_test/tests/inc/mailer.test.php
index feb454fcf..3a89413b4 100644
--- a/_test/tests/inc/mailer.test.php
+++ b/_test/tests/inc/mailer.test.php
@@ -170,7 +170,7 @@ class mailer_test extends DokuWikiTest {
 
         please don\'t burn, okay?
         ');
-        $mail->attachContent('some test data', 'text/plain', 'text.txt');
+        $mail->attachContent('some test data', 'text/plain', 'a text.txt');
         $msg = $mail->dump();
         $msglines = explode("\n", $msg);
 
@@ -197,7 +197,7 @@ class mailer_test extends DokuWikiTest {
             }
 
             // check the line for errors
-            if(substr($line,0,5) == 'ERROR'){
+            if(substr($line,0,5) == 'ERROR' || substr($line,0,7) == 'WARNING'){
                 // ignore some errors
                 if(strpos($line, "missing mandatory header 'return-path'")) continue; #set by MDA
                 if(strpos($line, "bare newline in text body decoded")) continue; #seems to be false positive
-- 
cgit v1.2.3


From a467e020fa551217347181ffd6915c7d29e6ff59 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Tue, 15 Oct 2013 11:35:26 +0200
Subject: Added unit tests for CSS shorthand compression FS#2509

---
 _test/tests/lib/exe/css_css_compress.test.php | 40 +++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

(limited to '_test')

diff --git a/_test/tests/lib/exe/css_css_compress.test.php b/_test/tests/lib/exe/css_css_compress.test.php
index a7c87b6a7..a614ea2fd 100644
--- a/_test/tests/lib/exe/css_css_compress.test.php
+++ b/_test/tests/lib/exe/css_css_compress.test.php
@@ -62,6 +62,46 @@ class css_css_compress_test extends DokuWikiTest {
         $this->assertEquals(css_compress($text), 'a{left:20px;top:20px}');
     }
 
+    function test_shortening() {
+        $input = array(
+            'margin:0em 0em 0em 0em ul.test margin:0em :0em div#FFFFFF {',
+            'margin:  1px 1px 1px 1px;',
+            'padding: 1px 2px 1px 2px;',
+            'margin:  1px 2px 3px 1px;',
+            'padding: 1px 2px 3px 4px;',
+            'margin:  00.00em 0em 01.00px 0em;',
+            'padding: 0010em 0010.00em 00.00em 00.00100em;',
+            'padding: 0010% 0010.00% 00.00% 00.00100xxx;',
+            'padding: 0.0em .0em 0.em 00.00em;',
+            'padding: 01.0em;',
+            'color:   #FFFFFF;',
+            'color:   #777777;',
+            'color:   #123456;',
+            'border:  01.0em solid #ffffff;',
+        );
+
+        $expected = array(
+            'margin:0em 0em 0em 0em ul.test margin:0em :0em div#FFFFFF{',
+            'margin:1px;',
+            'padding:1px 2px;',
+            'margin:1px 2px 3px 1px;',
+            'padding:1px 2px 3px 4px;',
+            'margin:0 0 1px 0;',
+            'padding:10em 10em 0 .001em;',
+            'padding:10% 10% 0 00.00100xxx;',
+            'padding:0;',
+            'padding:1em;',
+            'color:#FFF;',
+            'color:#777;',
+            'color:#123456;',
+            'border:1em solid #fff;',
+        );
+
+        $input = array_map('css_compress', $input);
+
+        $this->assertEquals($expected, $input);
+    }
+
 }
 
 //Setup VIM: ex: et ts=4 :
-- 
cgit v1.2.3


From 74ed54d4f9a7c9796916f33f649ef94619a31704 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Wed, 16 Oct 2013 11:29:27 +0200
Subject: fix signature mail unittest, and improve some signatures info plugin

---
 _test/tests/inc/subscription.test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '_test')

diff --git a/_test/tests/inc/subscription.test.php b/_test/tests/inc/subscription.test.php
index 333400576..34a7b9e4b 100644
--- a/_test/tests/inc/subscription.test.php
+++ b/_test/tests/inc/subscription.test.php
@@ -237,7 +237,7 @@ class MockupSubscription extends Subscription {
         return parent::buildregex($user, $style, $data);
     }
 
-    protected function send($subscriber_mail, $subject, $id, $template, $trep, $hrep = null) {
+    protected function send($subscriber_mail, $subject, $id, $template, $trep, $hrep = null, $headers = array()) {
         $this->mails[] = $subscriber_mail;
         return true;
     }
-- 
cgit v1.2.3


From c8d2e830e238503225cac35736b815864d334b1d Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Wed, 16 Oct 2013 21:50:25 +0100
Subject: escape '$' in mailer test strings

---
 _test/tests/inc/mailer.test.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to '_test')

diff --git a/_test/tests/inc/mailer.test.php b/_test/tests/inc/mailer.test.php
index 3a89413b4..dc234232f 100644
--- a/_test/tests/inc/mailer.test.php
+++ b/_test/tests/inc/mailer.test.php
@@ -50,8 +50,8 @@ class mailer_test extends DokuWikiTest {
         // set a bunch of test headers
         $mail->setHeader('test-header','bla');
         $mail->setHeader('to','A valid ASCII name <test@example.com>');
-        $mail->setHeader('from',"Thös ne\needs\x00serious cleaning$§%.");
-        $mail->setHeader('bad',"Thös ne\needs\x00serious cleaning$§%.",false);
+        $mail->setHeader('from',"Thös ne\needs\x00serious cleaning\$§%.");
+        $mail->setHeader('bad',"Thös ne\needs\x00serious cleaning\$§%.",false);
         $mail->setHeader("weird\n*+\x00foo.-_@bar?",'now clean');
 
         // are they set?
-- 
cgit v1.2.3


From 4d8acaacee33f49d51c06f6dae1dbe245018a020 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Wed, 16 Oct 2013 21:52:02 +0100
Subject: remove '&' reference operator from metadata test, not required in
 php5

---
 _test/tests/inc/parserutils_set_metadata_during_rendering.test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '_test')

diff --git a/_test/tests/inc/parserutils_set_metadata_during_rendering.test.php b/_test/tests/inc/parserutils_set_metadata_during_rendering.test.php
index f08785ca2..18660553d 100644
--- a/_test/tests/inc/parserutils_set_metadata_during_rendering.test.php
+++ b/_test/tests/inc/parserutils_set_metadata_during_rendering.test.php
@@ -80,7 +80,7 @@ class parserutils_set_metadata_during_rendering_test extends DokuWikiTest {
     }
 
     // wrapper function for the fake plugin controller, return $this for the fake syntax of this test
-    function &load($type,$name,$new=false,$disabled=false){
+    function load($type,$name,$new=false,$disabled=false){
         if ($name == 'parserutils_test') {
             return $this;
         } else {
-- 
cgit v1.2.3


From 4e2ac2e47ffdfffadfa5674d55f6f96c5e1cae77 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Fri, 18 Oct 2013 12:05:50 +0100
Subject: add missing $_SERVER values for init.php when called from cli

---
 _test/bootstrap.php | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to '_test')

diff --git a/_test/bootstrap.php b/_test/bootstrap.php
index 732fef9ed..3f59db515 100644
--- a/_test/bootstrap.php
+++ b/_test/bootstrap.php
@@ -68,6 +68,13 @@ $default_server_vars = array(
     'REQUEST_TIME' => time(),
 );
 
+// fixup for $_SERVER when run from CLI,
+// some values should be mocked for use by inc/init.php which is called here
+// [ $_SERVER is also mocked in TestRequest::execute() ]
+if (php_sapi_name() == 'cli') {
+  $_SERVER = array_merge($default_server_vars, $_SERVER);
+}
+
 // create temp directories
 mkdir(TMP_DIR);
 
-- 
cgit v1.2.3


From eb9dc16998a7eb887015ef72e4100eb20617e7b8 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Fri, 18 Oct 2013 12:27:17 +0100
Subject: set error level so it is propagated correctly to dokuwiki

---
 _test/bootstrap.php | 1 +
 1 file changed, 1 insertion(+)

(limited to '_test')

diff --git a/_test/bootstrap.php b/_test/bootstrap.php
index 732fef9ed..4cb6420bd 100644
--- a/_test/bootstrap.php
+++ b/_test/bootstrap.php
@@ -15,6 +15,7 @@ require_once DOKU_UNITTEST.'core/TestUtils.php';
 define('SIMPLE_TEST', true);
 
 // basic behaviours
+define('DOKU_E_LEVEL',E_ALL);
 error_reporting(E_ALL);
 set_time_limit(0);
 ini_set('memory_limit','2048M');
-- 
cgit v1.2.3


From 9aac3abfe47b9ff6977643d06caf0f9520cd55f1 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Fri, 18 Oct 2013 12:33:07 +0100
Subject: also use DOKU_E_LEVEL in bootstrap's call to error_reporting()

---
 _test/bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '_test')

diff --git a/_test/bootstrap.php b/_test/bootstrap.php
index 4cb6420bd..c3eba048a 100644
--- a/_test/bootstrap.php
+++ b/_test/bootstrap.php
@@ -16,7 +16,7 @@ define('SIMPLE_TEST', true);
 
 // basic behaviours
 define('DOKU_E_LEVEL',E_ALL);
-error_reporting(E_ALL);
+error_reporting(DOKU_E_LEVEL);
 set_time_limit(0);
 ini_set('memory_limit','2048M');
 
-- 
cgit v1.2.3


From d301130ed39d5dad319c60cdb3879c6751611831 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Sat, 19 Oct 2013 14:35:22 +0100
Subject: additional auth_nameencode tests (apostrophe & backslash)

---
 _test/tests/inc/auth_nameencode.test.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to '_test')

diff --git a/_test/tests/inc/auth_nameencode.test.php b/_test/tests/inc/auth_nameencode.test.php
index da9f31f90..074155486 100644
--- a/_test/tests/inc/auth_nameencode.test.php
+++ b/_test/tests/inc/auth_nameencode.test.php
@@ -19,6 +19,18 @@ class auth_nameencode_test extends DokuWikiTest {
         $this->assertEquals(auth_nameencode($in),$out);
     }
 
+    function test_apostrophe(){
+        $in  = 'hey\'you';
+        $out = 'hey%27you';
+        $this->assertEquals(auth_nameencode($in),$out);
+    }
+
+    function test_backslash(){
+        $in  = 'hey\\you';
+        $out = 'hey%5cyou';
+        $this->assertEquals(auth_nameencode($in),$out);
+    }
+
     function test_complex(){
         $in  = 'hey $ you !$%! foo ';
         $out = 'hey%20%24%20you%20%21%24%25%21%20foo%20';
-- 
cgit v1.2.3


From a8dba4523d2ecd09dd69a68a36673eaf5c009c57 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Sat, 19 Oct 2013 16:09:15 +0200
Subject: Fix FS#2854: Treat numerically different keys as different

---
 _test/tests/inc/indexer_indexing.test.php | 45 +++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 _test/tests/inc/indexer_indexing.test.php

(limited to '_test')

diff --git a/_test/tests/inc/indexer_indexing.test.php b/_test/tests/inc/indexer_indexing.test.php
new file mode 100644
index 000000000..8600cf156
--- /dev/null
+++ b/_test/tests/inc/indexer_indexing.test.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Tests the indexing functionality of the indexer
+ *
+ * @author Michael Hamann <michael@content-space.de>
+ */
+class indexer_indexing_test extends DokuWikiTest {
+    public function setUp() {
+        parent::setUp();
+        saveWikiText('testpage', 'Foo bar baz.', 'Test initialization');
+        saveWikiText('notfound', 'Foon barn bazn.', 'Test initialization');
+        idx_addPage('testpage');
+        idx_addPage('notfound');
+    }
+
+    public function test_words() {
+        $indexer = idx_get_indexer();
+        $query = array('baz', 'foo');
+        $this->assertEquals(array('baz' => array('testpage' => 1), 'foo' => array('testpage' => 1)), $indexer->lookup($query));
+    }
+
+    public function test_numerically_identical_words() {
+        $indexer = idx_get_indexer();
+        $indexer->addPageWords('testpage', '0x1 002');
+        $indexer->addPageWords('notfound', '0x2');
+        $query = array('001', '002');
+        $this->assertEquals(array('001' => array('notfound' => 1), '002' => array('testpage' => 1)), $indexer->lookup($query));
+    }
+
+    public function test_meta() {
+        $indexer = idx_get_indexer();
+        $indexer->addMetaKeys('testpage', 'testkey', 'testvalue');
+        $indexer->addMetaKeys('notfound', 'testkey', 'notvalue');
+        $query = 'testvalue';
+        $this->assertEquals(array('testpage'), $indexer->lookupKey('testkey', $query));
+    }
+
+    public function test_numerically_identical_meta_values() {
+        $indexer = idx_get_indexer();
+        $indexer->addMetaKeys('testpage', 'numkey', array('0001', '01'));
+        $indexer->addMetaKeys('notfound', 'numkey', array('00001', '000001'));
+        $query = array('001', '01');
+        $this->assertEquals(array('001' => array(), '01' => array('testpage')), $indexer->lookupKey('numkey', $query));
+    }
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 9f5b9cf15569babaa90f0d6f3dd58cefd5439bc5 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Sat, 19 Oct 2013 17:10:43 +0200
Subject: Fix the indexer indexing test case (changed the data but not the
 result)

---
 _test/tests/inc/indexer_indexing.test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '_test')

diff --git a/_test/tests/inc/indexer_indexing.test.php b/_test/tests/inc/indexer_indexing.test.php
index 8600cf156..628e82e00 100644
--- a/_test/tests/inc/indexer_indexing.test.php
+++ b/_test/tests/inc/indexer_indexing.test.php
@@ -24,7 +24,7 @@ class indexer_indexing_test extends DokuWikiTest {
         $indexer->addPageWords('testpage', '0x1 002');
         $indexer->addPageWords('notfound', '0x2');
         $query = array('001', '002');
-        $this->assertEquals(array('001' => array('notfound' => 1), '002' => array('testpage' => 1)), $indexer->lookup($query));
+        $this->assertEquals(array('001' => array(), '002' => array('testpage' => 1)), $indexer->lookup($query));
     }
 
     public function test_meta() {
-- 
cgit v1.2.3


From 698e7df8c9d5c43a93ed6822efa537158682a700 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Sat, 19 Oct 2013 18:24:20 +0100
Subject: add tests for usernames with 2 & 3 byte utf8 characters

---
 _test/tests/inc/auth_nameencode.test.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to '_test')

diff --git a/_test/tests/inc/auth_nameencode.test.php b/_test/tests/inc/auth_nameencode.test.php
index da9f31f90..64e437004 100644
--- a/_test/tests/inc/auth_nameencode.test.php
+++ b/_test/tests/inc/auth_nameencode.test.php
@@ -42,6 +42,22 @@ class auth_nameencode_test extends DokuWikiTest {
         $out = '%40hey%24you';
         $this->assertEquals(auth_nameencode($in),$out);
     }
+
+    // include a two byte utf8 character which shouldn't be encoded
+    function test_hebrew(){
+        $in = 'nun-נ8';
+        $expect = 'nun%2dנ8';
+
+        $this->assertEquals($expect, auth_nameencode($in));
+    }
+
+    // include a three byte utf8 character which shouldn't be encoded
+    function test_devanagiri(){
+        $in = 'ut-fठ8';
+        $expect = 'ut%2dfठ8';
+
+        $this->assertEquals($expect, auth_nameencode($in));
+    }
 }
 
 //Setup VIM: ex: et ts=4 :
-- 
cgit v1.2.3


From d1612d99b95fed9b053ebdb5e4c12f30aeb69203 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 20 Oct 2013 21:05:09 +0200
Subject: escaped another $ in mailer test

---
 _test/tests/inc/mailer.test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '_test')

diff --git a/_test/tests/inc/mailer.test.php b/_test/tests/inc/mailer.test.php
index dc234232f..bac0c39ba 100644
--- a/_test/tests/inc/mailer.test.php
+++ b/_test/tests/inc/mailer.test.php
@@ -63,7 +63,7 @@ class mailer_test extends DokuWikiTest {
         $this->assertArrayHasKey('From',$headers);
         $this->assertEquals('Ths neeedsserious cleaning.',$headers['From']);
         $this->assertArrayHasKey('Bad',$headers);
-        $this->assertEquals("Thös ne\needs\x00serious cleaning$§%.",$headers['Bad']);
+        $this->assertEquals("Thös ne\needs\x00serious cleaning\$§%.",$headers['Bad']);
         $this->assertArrayHasKey('Weird+foo.-_@bar',$headers);
 
         // unset a header again
-- 
cgit v1.2.3


From 03a4f627659f89d54c121b485ca89dfaa4a304c0 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Sun, 20 Oct 2013 19:36:56 +0100
Subject: change error level to ignore notices

---
 _test/bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '_test')

diff --git a/_test/bootstrap.php b/_test/bootstrap.php
index c3eba048a..9f4bb5fbd 100644
--- a/_test/bootstrap.php
+++ b/_test/bootstrap.php
@@ -15,7 +15,7 @@ require_once DOKU_UNITTEST.'core/TestUtils.php';
 define('SIMPLE_TEST', true);
 
 // basic behaviours
-define('DOKU_E_LEVEL',E_ALL);
+define('DOKU_E_LEVEL',E_ALL ^ E_NOTICE);
 error_reporting(DOKU_E_LEVEL);
 set_time_limit(0);
 ini_set('memory_limit','2048M');
-- 
cgit v1.2.3


From 712c66312b26ec08723b47583b7be846451ed712 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 20 Oct 2013 21:28:32 +0200
Subject: more verbosity in test case

---
 _test/tests/inc/httpclient_http_proxy.test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '_test')

diff --git a/_test/tests/inc/httpclient_http_proxy.test.php b/_test/tests/inc/httpclient_http_proxy.test.php
index faa7a4280..c53e3579c 100644
--- a/_test/tests/inc/httpclient_http_proxy.test.php
+++ b/_test/tests/inc/httpclient_http_proxy.test.php
@@ -13,7 +13,7 @@ class httpclient_http_proxy_test extends DokuWikiTest {
         $http->proxy_port = 8080;
 
         $data = $http->get($this->url);
-        $this->assertFalse($data === false, 'HTTP response');
+        $this->assertFalse($data === false, 'HTTP response '.$http->error);
         $this->assertTrue(strpos($data,'DokuWiki') !== false, 'response content');
     }
 
-- 
cgit v1.2.3


From b7cfeab63d3666a24fad96ae42669a2f55e9da03 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 20 Oct 2013 21:37:54 +0200
Subject: make sure HTTP test uses HTTP only and doesn't get redirected

---
 _test/tests/inc/httpclient_http_proxy.test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '_test')

diff --git a/_test/tests/inc/httpclient_http_proxy.test.php b/_test/tests/inc/httpclient_http_proxy.test.php
index c53e3579c..4aa039fcc 100644
--- a/_test/tests/inc/httpclient_http_proxy.test.php
+++ b/_test/tests/inc/httpclient_http_proxy.test.php
@@ -1,7 +1,7 @@
 <?php
 
 class httpclient_http_proxy_test extends DokuWikiTest {
-    protected $url = 'http://www.dokuwiki.org/README';
+    protected $url = 'http://test.dokuwiki.org/README';
 
     /**
      * @group internet
-- 
cgit v1.2.3


From 1f6e92fa1bf9bf1d01cd159a9495657661ea6f4f Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Fri, 25 Oct 2013 13:30:27 +0100
Subject: unittests for auth_loadACL

---
 _test/tests/inc/auth_loadacl.test.php | 121 ++++++++++++++++++++++++++++++++++
 1 file changed, 121 insertions(+)
 create mode 100644 _test/tests/inc/auth_loadacl.test.php

(limited to '_test')

diff --git a/_test/tests/inc/auth_loadacl.test.php b/_test/tests/inc/auth_loadacl.test.php
new file mode 100644
index 000000000..5e7ac3acf
--- /dev/null
+++ b/_test/tests/inc/auth_loadacl.test.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ *  auth_loadACL carries out the user & group substitutions
+ *
+ */
+
+class auth_loadacl_test extends DokuWikiTest {
+
+    function setUp() {
+        global $USERINFO;
+        parent::setUp();
+        $_SERVER['REMOTE_USER'] = 'testuser';
+        $USERINFO['grps'] = array('foo','bar');
+    }
+
+    function tearDown() {
+        parent::tearDown();
+    }
+
+    function auth_loadACL_testwrapper($acls) {
+        global $config_cascade;
+        $acl_file = $config_cascade['acl']['default'];
+
+        $config_cascade['acl']['default'] .= '.test';
+        file_put_contents($config_cascade['acl']['default'],$acls);
+
+        $result = auth_loadACL();
+
+        unlink($config_cascade['acl']['default']);
+        $config_cascade['acl']['default'] = $acl_file;
+
+        return $result;
+    }
+
+    function test_simple() {
+        $acls = <<<ACL
+* @ALL 2
+ACL;
+        $expect = array("*\t@ALL 2");
+        $this->assertEquals($expect, $this->auth_loadACL_testwrapper($acls));
+    }
+
+    function test_user_substitution() {
+        $acls = <<<ACL
+%USER% %USER% 2
+ACL;
+        $expect = array(
+            "testuser\ttestuser 2",
+        );
+        $this->assertEquals($expect, $this->auth_loadACL_testwrapper($acls));
+    }
+
+    function test_group_substitution() {
+        $acls = <<<ACL
+%GROUP% %GROUP% 2
+ACL;
+        $expect = array(
+            "foo\t@foo 2",
+            "bar\t@bar 2",
+        );
+        $this->assertEquals($expect, $this->auth_loadACL_testwrapper($acls));
+    }
+
+    function test_both_substitution() {
+        $acls = <<<ACL
+%GROUP%:%USER% %USER% 2
+%GROUP%:%USER% %GROUP% 2
+ACL;
+        $expect = array(
+            "foo:testuser\ttestuser 2",
+            "bar:testuser\ttestuser 2",
+            "foo:testuser\t@foo 2",
+            "bar:testuser\t@bar 2",
+        );
+        $this->assertEquals($expect, $this->auth_loadACL_testwrapper($acls));
+    }
+
+    // put it all together - read the standard acl provided with the test suite
+    function test_standardtestacls(){
+        $expect = array(
+            "*\t@ALL        8",
+            "private:*\t@ALL        0",
+            "users:*\t@ALL         1",
+            "users:testuser:*\ttestuser       16",
+            "groups:*\t@ALL         1",
+            "groups:foo:*\t@foo      16",
+            "groups:bar:*\t@bar      16",
+        );
+        $this->assertEquals($expect, auth_loadACL());
+    }
+
+    // FS#2867, '\s' in php regular expressions may match non-space characters utf8 strings
+    // this is due to locale setting on the server, which may match bytes '\xA0' and '\x85'
+    // these two bytes are present in valid multi-byte UTF-8 characters.
+    // this test will use one, 'ठ' (DEVANAGARI LETTER TTHA, e0 a4 a0).  There are many others. 
+    function test_FS2867() {
+        global $USERINFO;
+
+        setlocale(LC_ALL, "English_United States.1252");  // should only succeed on windows systems
+        setlocale(LC_ALL, "en_US.UTF-8");                 // should succeed on other systems
+
+        $_SERVER['REMOTE_USER'] = 'utfठ8';
+        $USERINFO['grps'] = array('utfठ16','utfठa');
+
+        $acls = <<<ACL
+%GROUP%:%USER% %USER% 2
+%GROUP%:* %GROUP% 4
+devangariठttha @ALL 2
+ACL;
+        $expect = array(
+            "utfठ16:utfठ8\tutfठ8 2",
+            "utfठa:utfठ8\tutfठ8 2",
+            "utfठ16:*\t@utfठ16 4",
+            "utfठa:*\t@utfठa 4",
+            "devangariठttha\t@ALL 2",
+        );
+        $this->assertEquals($expect, $this->auth_loadACL_testwrapper($acls));
+    }
+}
+
+//Setup VIM: ex: et ts=4 :
-- 
cgit v1.2.3


From 0113757259202e06f0316ef4be0f938b134e6e9c Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Fri, 25 Oct 2013 14:42:48 +0100
Subject: skip FS#2867 test if \s doesn't match \xA0 after attempting to change
 the locale

---
 _test/tests/inc/auth_loadacl.test.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to '_test')

diff --git a/_test/tests/inc/auth_loadacl.test.php b/_test/tests/inc/auth_loadacl.test.php
index 5e7ac3acf..64ab1b9cf 100644
--- a/_test/tests/inc/auth_loadacl.test.php
+++ b/_test/tests/inc/auth_loadacl.test.php
@@ -2,6 +2,7 @@
 /**
  *  auth_loadACL carries out the user & group substitutions
  *
+ * @author     Chris Smith <chris@jalakai.co.uk>
  */
 
 class auth_loadacl_test extends DokuWikiTest {
@@ -99,6 +100,11 @@ ACL;
         setlocale(LC_ALL, "English_United States.1252");  // should only succeed on windows systems
         setlocale(LC_ALL, "en_US.UTF-8");                 // should succeed on other systems
 
+        // no point continuing with this test if \s doesn't match A0
+        if (!preg_match('/\s/',"\xa0")) {
+            $this->markTestSkipped('Unable to change locale.');
+        }
+
         $_SERVER['REMOTE_USER'] = 'utfठ8';
         $USERINFO['grps'] = array('utfठ16','utfठa');
 
-- 
cgit v1.2.3


From 30eae85545994c10dcacb2d7becceaf569c99f65 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Fri, 25 Oct 2013 15:15:58 +0100
Subject: ensure locale is set back to the original value

---
 _test/tests/inc/auth_loadacl.test.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to '_test')

diff --git a/_test/tests/inc/auth_loadacl.test.php b/_test/tests/inc/auth_loadacl.test.php
index 64ab1b9cf..e8d9f6696 100644
--- a/_test/tests/inc/auth_loadacl.test.php
+++ b/_test/tests/inc/auth_loadacl.test.php
@@ -97,11 +97,13 @@ ACL;
     function test_FS2867() {
         global $USERINFO;
 
+        $old_locale = setlocale(LC_ALL, '0');
         setlocale(LC_ALL, "English_United States.1252");  // should only succeed on windows systems
         setlocale(LC_ALL, "en_US.UTF-8");                 // should succeed on other systems
 
         // no point continuing with this test if \s doesn't match A0
         if (!preg_match('/\s/',"\xa0")) {
+            setlocale(LC_ALL, $old_locale);
             $this->markTestSkipped('Unable to change locale.');
         }
 
@@ -121,6 +123,7 @@ ACL;
             "devangariठttha\t@ALL 2",
         );
         $this->assertEquals($expect, $this->auth_loadACL_testwrapper($acls));
+        setlocale(LC_ALL, $old_locale);
     }
 }
 
-- 
cgit v1.2.3


From 9269d0b1fb78c217069efd497734c183df9937be Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Tue, 29 Oct 2013 20:52:27 +0100
Subject: Fix the media usage index to include local links

---
 _test/tests/inc/fulltext_mediause.test.php | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to '_test')

diff --git a/_test/tests/inc/fulltext_mediause.test.php b/_test/tests/inc/fulltext_mediause.test.php
index 9d5b2dc84..503b8bc84 100644
--- a/_test/tests/inc/fulltext_mediause.test.php
+++ b/_test/tests/inc/fulltext_mediause.test.php
@@ -26,6 +26,13 @@ class fultext_mediause_test extends DokuWikiTest {
         $this->assertEquals(array('test:medialinks'), ft_mediause('test:example.png'));
     }
 
+    public function test_media_in_local_links() {
+        saveWikiText('test:locallinks', '[[#test|{{wiki:logolocal.png}}]]', 'Test init');
+        idx_addPage('test:locallinks');
+
+        $this->assertEquals(array('test:locallinks'), ft_mediause('wiki:logolocal.png'));
+    }
+
     public function test_media_in_footnotes() {
         saveWikiText('test:media_footnotes', '(({{footnote.png?20x50}} [[foonote|{{:footlink.png}}]]))', 'Test initialization');
         idx_addPage('test:media_footnotes');
-- 
cgit v1.2.3


From 5f5982130c1a9b9adb0e294b811327ddcfbd4fef Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Tue, 5 Nov 2013 20:09:45 +0000
Subject: Improve css_loadfile() tests - use TMP_DIR constant rather than /tmp
 - swap order of parameters in csstest() to match reported 'expected' &
 'actual' - add tests for use of 'url()' in @import - add tests for @import of
 '.less' files (these test will fail per FS#2875)

---
 _test/tests/lib/exe/css_css_loadfile.test.php | 33 +++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

(limited to '_test')

diff --git a/_test/tests/lib/exe/css_css_loadfile.test.php b/_test/tests/lib/exe/css_css_loadfile.test.php
index c89b69b2c..0aa27b0af 100644
--- a/_test/tests/lib/exe/css_css_loadfile.test.php
+++ b/_test/tests/lib/exe/css_css_loadfile.test.php
@@ -3,13 +3,16 @@
 require_once DOKU_INC.'lib/exe/css.php';
 
 class css_css_loadfile_test extends DokuWikiTest {
+
+    protected $file = '';
+
     public function setUp() {
-        $this->file = tempnam('/tmp', 'css');
+        $this->file = tempnam(TMP_DIR, 'css');
     }
 
     private function csstest($input, $output = null, $location = 'http://www.example.com/') {
         io_saveFile($this->file, $input);
-        $this->assertEquals(css_loadfile($this->file, $location), (is_null($output) ? $input : $output));
+        $this->assertEquals((is_null($output) ? $input : $output), css_loadfile($this->file, $location));
     }
 
     public function test_url_relative() {
@@ -32,11 +35,15 @@ class css_css_loadfile_test extends DokuWikiTest {
     public function test_import_relative() {
         $this->csstest('@import "test/test.png";', '@import "http://www.example.com/test/test.png";');
         $this->csstest('@import \'test/test.png\';', '@import \'http://www.example.com/test/test.png\';');
+        $this->csstest('@import url(test/test.png);', '@import url(http://www.example.com/test/test.png);');
+        $this->csstest('@import url("test/test.png");', '@import url("http://www.example.com/test/test.png");');
     }
 
     public function test_import_absolute() {
         $this->csstest('@import "/test/test.png";');
         $this->csstest('@import \'/test/test.png\';');
+        $this->csstest('@import url(/test/test.png);');
+        $this->csstest('@import url("/test/test.png");');
     }
 
     public function test_import_with_protocol() {
@@ -44,6 +51,28 @@ class css_css_loadfile_test extends DokuWikiTest {
         $this->csstest('@import "https://www.test.com/test/test.png";');
         $this->csstest('@import \'http://www.test.com/test/test.png\';');
         $this->csstest('@import \'https://www.test.com/test/test.png\';');
+        $this->csstest('@import url(http://www.test.com/test/test.png);');
+        $this->csstest('@import url("http://www.test.com/test/test.png");');
+    }
+
+    public function test_less_basic() {
+        $this->csstest('@import "test.less"', '@import "/test.less"');
+        $this->csstest('@import "/test.less"', '@import "/test.less"');
+        $this->csstest('@import url(http://test.less)');
+    }
+
+    // more expected use, where less @import(ed) from e.g. lib/plugins/plugin_name
+    public function test_less_subdirectories() {
+
+        unlink($this->file);
+
+        $dir = TMP_DIR.'/foo/bar';
+        mkdir($dir,0777,true);
+        $this->file = tempnam($dir, 'css');
+
+        $this->csstest('@import "test.less"', '@import "/foo/bar/test.less"');
+        $this->csstest('@import \'test.less\'', '@import \'/foo/bar/test.less\'');
+        $this->csstest('@import url(test.less)', '@import url(/foo/bar/test.less)');
     }
 
     public function tearDown() {
-- 
cgit v1.2.3


From 6d7e4640bed01599dac4bbf5c00b0aff8d3dd4ba Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Tue, 5 Nov 2013 20:49:53 +0000
Subject: additional tests where for relative path to @import less file

---
 _test/tests/lib/exe/css_css_loadfile.test.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to '_test')

diff --git a/_test/tests/lib/exe/css_css_loadfile.test.php b/_test/tests/lib/exe/css_css_loadfile.test.php
index 0aa27b0af..c336702f8 100644
--- a/_test/tests/lib/exe/css_css_loadfile.test.php
+++ b/_test/tests/lib/exe/css_css_loadfile.test.php
@@ -58,6 +58,7 @@ class css_css_loadfile_test extends DokuWikiTest {
     public function test_less_basic() {
         $this->csstest('@import "test.less"', '@import "/test.less"');
         $this->csstest('@import "/test.less"', '@import "/test.less"');
+        $this->csstest('@import "foo/test.less"', '@import "/foo/test.less"');
         $this->csstest('@import url(http://test.less)');
     }
 
@@ -73,6 +74,8 @@ class css_css_loadfile_test extends DokuWikiTest {
         $this->csstest('@import "test.less"', '@import "/foo/bar/test.less"');
         $this->csstest('@import \'test.less\'', '@import \'/foo/bar/test.less\'');
         $this->csstest('@import url(test.less)', '@import url(/foo/bar/test.less)');
+
+        $this->csstest('@import "abc/test.less"', '@import "/foo/bar/abc/test.less"');
     }
 
     public function tearDown() {
-- 
cgit v1.2.3


From ab1fef6644927b857c64c9c153915d50ef2607f1 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Tue, 5 Nov 2013 20:51:07 +0000
Subject: Test to ensure less can parse the @import rewritten by css_loadfile()

This test is horrible, but I believe necessary to ensure that the
@import of less files actually works.

It is horrible as its not a unit test and its not a true functional
test.  It probably implies the code in css_out() should be refactored
to make it easier to test intermediate results.
---
 _test/tests/lib/exe/css_at_import_less.test.php | 78 +++++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 _test/tests/lib/exe/css_at_import_less.test.php

(limited to '_test')

diff --git a/_test/tests/lib/exe/css_at_import_less.test.php b/_test/tests/lib/exe/css_at_import_less.test.php
new file mode 100644
index 000000000..4a6efcf44
--- /dev/null
+++ b/_test/tests/lib/exe/css_at_import_less.test.php
@@ -0,0 +1,78 @@
+<?php
+
+require_once DOKU_INC.'lib/exe/css.php';
+
+class css_at_import_less_test extends DokuWikiTest {
+
+    protected $file = '';
+    protected $import = '';
+
+    public function setUpFiles($subdir = '') {
+
+        $dir = TMP_DIR . $subdir;
+        if (!is_dir($dir)) {
+            mkdir($dir, 0777, true);
+        }
+        if (!is_dir($dir)) {
+            $this->markTestSkipped('Could not create directory.');
+        }
+
+        $this->file = tempnam($dir, 'css');
+
+        $import = '';
+        do {
+            if ($import) unlink($import);
+            $import = tempnam($dir, 'less');
+            $ok = rename($import, $import.'.less');
+        } while (!$ok);
+
+        $this->import = $import.'.less';
+    }
+
+    private function csstest($input, $expected_css, $expected_less) {
+        $location = "http://test.com/";
+        io_saveFile($this->file, $input);
+        $css = css_loadfile($this->file, $location);
+        $less = css_parseless($css);
+        $this->assertEquals($expected_css, $css);
+        $this->assertEquals($expected_less, $less);
+    }
+
+    public function test_basic() {
+        $this->setUpFiles();
+
+        $import = preg_replace('#(^.*[/])#','',$this->import);
+        $in_css = '@import "'.$import.'";';
+        $in_less = '@foo: "bar";
+content: @foo;';
+
+        $expected_css = '@import "/'.$import.'";';
+        $expected_less = 'content: "bar";';
+
+        io_saveFile($this->import, $in_less);
+        $this->csstest($in_css, $expected_css, $expected_less);
+    }
+
+    public function test_subdirectory() {
+        $this->setUpFiles('/foo/bar');
+
+        $import = preg_replace('#(^.*[/])#','',$this->import);
+        $in_css = '@import "'.$import.'";';
+        $in_less = '@foo: "bar";
+content: @foo;';
+
+        $expected_css = '@import "/foo/bar/'.$import.'";';
+        $expected_less = 'content: "bar";';
+
+        io_saveFile($this->import, $in_less);
+        $this->csstest($in_css, $expected_css, $expected_less);
+    }
+
+    public function tearDown() {
+        unlink($this->file);
+        unlink($this->import);
+        unset($this->file, $this->import);
+    }
+}
+
+//Setup VIM: ex: et ts=4 sw=4 :
-- 
cgit v1.2.3


From 28ad2ce3c7b348afcc1efbae4fc64a7ea31585ee Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Sun, 17 Nov 2013 21:18:25 +0000
Subject: ensure css loadfile test doesn't try to create a directory (and fail)
 if the directory already exists

---
 _test/tests/lib/exe/css_css_loadfile.test.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to '_test')

diff --git a/_test/tests/lib/exe/css_css_loadfile.test.php b/_test/tests/lib/exe/css_css_loadfile.test.php
index c336702f8..624becd29 100644
--- a/_test/tests/lib/exe/css_css_loadfile.test.php
+++ b/_test/tests/lib/exe/css_css_loadfile.test.php
@@ -68,7 +68,13 @@ class css_css_loadfile_test extends DokuWikiTest {
         unlink($this->file);
 
         $dir = TMP_DIR.'/foo/bar';
-        mkdir($dir,0777,true);
+        if (!is_dir($dir)) {
+            mkdir($dir, 0777, true);
+        }
+        if (!is_dir($dir)) {
+            $this->markTestSkipped('Could not create directory.');
+        }
+
         $this->file = tempnam($dir, 'css');
 
         $this->csstest('@import "test.less"', '@import "/foo/bar/test.less"');
-- 
cgit v1.2.3


From 5a41afe6e3b958291893a0a10105cd41971fb141 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Sun, 1 Dec 2013 17:57:03 +0000
Subject: FS#1833 (b) Prevent table entry syntax swallowing multiple preceeding
 blank lines (a) this shouldn't be necessary, blank lines are handled by
 paragraph     processing (b) avoids issues with greedy table syntax competing
 with plugins

---
 _test/tests/inc/parser/parser_table.test.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to '_test')

diff --git a/_test/tests/inc/parser/parser_table.test.php b/_test/tests/inc/parser/parser_table.test.php
index 542a307b8..bc19ebff9 100644
--- a/_test/tests/inc/parser/parser_table.test.php
+++ b/_test/tests/inc/parser/parser_table.test.php
@@ -626,5 +626,24 @@ def');
         );
         $this->assertEquals(array_map('stripbyteindex',$this->H->calls),$calls);
     }
+
+    function testTable_FS1833() {
+        $syntax = " \n| Row 0 Col 1    |\n";
+        $this->P->addMode('table',new Doku_Parser_Mode_Table());
+        $this->P->parse($syntax);
+        $calls = array (
+            array('document_start',array()),
+            array('table_open',array(1, 1, 2)),
+            array('tablerow_open',array()),
+            array('tablecell_open',array(1,'left',1)),
+            array('cdata',array(' Row 0 Col 1    ')),
+            array('tablecell_close',array()),
+            array('tablerow_close',array()),
+            array('table_close',array(strlen($syntax))),
+            array('document_end',array()),
+        );
+        $this->assertEquals(array_map('stripbyteindex',$this->H->calls),$calls);
+    }
+
 }
 
-- 
cgit v1.2.3


From 6be717dbb579e1cc7e2fbb82d7ddade3e5892c47 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Sun, 1 Dec 2013 21:25:29 +0100
Subject: Fix sending empty and duplicated headers, FS#2887

This fixes sending empty and duplicated To/Cc/Bcc, Subject and From
headers in the additional headers. The To-header in the additional
headers prevented mail sending on some systems.
---
 _test/tests/inc/mailer.test.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to '_test')

diff --git a/_test/tests/inc/mailer.test.php b/_test/tests/inc/mailer.test.php
index bac0c39ba..4541d9906 100644
--- a/_test/tests/inc/mailer.test.php
+++ b/_test/tests/inc/mailer.test.php
@@ -154,7 +154,19 @@ class mailer_test extends DokuWikiTest {
         $headers['Cc'] = '';
         $header = $mail->prepareHeaders();
         $this->assertEquals(0, preg_match('/(^|\n)Bcc: (\n|$)/', $header), 'Bcc found in headers.');
-        $this->assertEquals(0, preg_match('/(^|\n)Cc: (\n|$)/', $header), 'Bcc found in headers.');
+        $this->assertEquals(0, preg_match('/(^|\n)Cc: (\n|$)/', $header), 'Cc found in headers.');
+    }
+
+    function test_nullTOorCCorBCC() {
+        $mail = new TestMailer();
+        $headers = &$mail->propRef('headers');
+        $headers['Bcc'] = NULL;
+        $headers['Cc'] = NULL;
+        $headers['To'] = NULL;
+        $header = $mail->prepareHeaders();
+        $this->assertEquals(0, preg_match('/(^|\n)Bcc: (\n|$)/', $header), 'Bcc found in headers.');
+        $this->assertEquals(0, preg_match('/(^|\n)Cc: (\n|$)/', $header), 'Cc found in headers.');
+        $this->assertEquals(0, preg_match('/(^|\n)To: (\n|$)/', $header), 'To found in headers.');
     }
 
     /**
-- 
cgit v1.2.3


From ccfec5606dae81e6524f6cfcdaca09d4cde7f111 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 7 Dec 2013 23:10:05 +0000
Subject: crlf 2 lf whitespace fixes

---
 _test/tests/inc/common_basicinfo.test.php | 10 ++---
 _test/tests/inc/common_mediainfo.test.php | 10 ++---
 _test/tests/inc/common_pageinfo.test.php  | 66 +++++++++++++++----------------
 _test/tests/test/basic.test.php           | 12 +++---
 4 files changed, 49 insertions(+), 49 deletions(-)

(limited to '_test')

diff --git a/_test/tests/inc/common_basicinfo.test.php b/_test/tests/inc/common_basicinfo.test.php
index 0369474c9..8359c0877 100644
--- a/_test/tests/inc/common_basicinfo.test.php
+++ b/_test/tests/inc/common_basicinfo.test.php
@@ -18,12 +18,12 @@ class common_infofunctions_test extends DokuWikiTest {
     
     function _get_info() {
         global $USERINFO;
-        $info = array (
-          'isadmin' => true,
+        $info = array (
+          'isadmin' => true,
           'ismanager' => true,
-          'userinfo' => $USERINFO,
-          'perm' => 255,
-          'namespace' => false,
+          'userinfo' => $USERINFO,
+          'perm' => 255,
+          'namespace' => false,
           'ismobile' => false,
           'client' => 'testuser',
         );
diff --git a/_test/tests/inc/common_mediainfo.test.php b/_test/tests/inc/common_mediainfo.test.php
index 0e67fbcd9..cc5b17ec7 100644
--- a/_test/tests/inc/common_mediainfo.test.php
+++ b/_test/tests/inc/common_mediainfo.test.php
@@ -18,12 +18,12 @@ class common_basicinfo_test extends DokuWikiTest {
     
     function _get_info() {
         global $USERINFO;
-        $info = array (
-          'isadmin' => true,
+        $info = array (
+          'isadmin' => true,
           'ismanager' => true,
-          'userinfo' => $USERINFO,
-          'perm' => 255,
-          'namespace' => false,
+          'userinfo' => $USERINFO,
+          'perm' => 255,
+          'namespace' => false,
           'ismobile' => false,
           'client' => 'testuser',
         );
diff --git a/_test/tests/inc/common_pageinfo.test.php b/_test/tests/inc/common_pageinfo.test.php
index c54fbce26..0a1ea0a8f 100644
--- a/_test/tests/inc/common_pageinfo.test.php
+++ b/_test/tests/inc/common_pageinfo.test.php
@@ -31,18 +31,18 @@ class common_pageinfo_test extends DokuWikiTest {
           'ismobile' => false,
           'client' => 'testuser',
         );
-        $info['rev'] = null;
-        $info['subscribed'] = false;
-        $info['locked'] = false;
-        $info['exists'] = false;
-        $info['writable'] = true;
-        $info['editable'] = true;
-        $info['lastmod'] = false;
-        $info['meta'] = array();
-        $info['ip'] = null;
-        $info['user'] = null;
-        $info['sum'] = null;
-        $info['editor'] = null;
+        $info['rev'] = null;
+        $info['subscribed'] = false;
+        $info['locked'] = false;
+        $info['exists'] = false;
+        $info['writable'] = true;
+        $info['editable'] = true;
+        $info['lastmod'] = false;
+        $info['meta'] = array();
+        $info['ip'] = null;
+        $info['user'] = null;
+        $info['sum'] = null;
+        $info['editor'] = null;
 
         return $info;
     }
@@ -72,15 +72,15 @@ class common_pageinfo_test extends DokuWikiTest {
         $rev = filemtime($filename);
 
         $info = $this->_get_expected_pageinfo();
-        $info['id'] = 'wiki:syntax';
+        $info['id'] = 'wiki:syntax';
         $info['namespace'] = 'wiki';
         $info['filepath'] = $filename;
-        $info['exists'] = true;
-        $info['lastmod'] = $rev;
-        $info['meta'] = p_get_metadata($ID);
+        $info['exists'] = true;
+        $info['lastmod'] = $rev;
+        $info['meta'] = p_get_metadata($ID);
 
         $this->assertEquals($info, pageinfo());
-    }
+    }
 
     /**
      *  check info keys and values for anonymous user
@@ -88,8 +88,8 @@ class common_pageinfo_test extends DokuWikiTest {
     function test_anonymoususer(){
         global $ID,$conf,$REV;
 
-        unset($_SERVER['REMOTE_USER']);
-        global $USERINFO; $USERINFO = array();
+        unset($_SERVER['REMOTE_USER']);
+        global $USERINFO; $USERINFO = array();
 
         $ID = 'wiki:syntax';
         $filename = $conf['datadir'].'/wiki/syntax.txt';
@@ -104,15 +104,15 @@ class common_pageinfo_test extends DokuWikiTest {
         $info['meta'] = p_get_metadata($ID);
         $info['rev'] = '';
 
-        $info = array_merge($info, array(
-          'isadmin' => false,
-          'ismanager' => false,
-          'perm' => 8,
-          'client' => '1.2.3.4',
+        $info = array_merge($info, array(
+          'isadmin' => false,
+          'ismanager' => false,
+          'perm' => 8,
+          'client' => '1.2.3.4',
         ));
         unset($info['userinfo']);
         $this->assertEquals($info, pageinfo());
-    }
+    }
 
     /**
      *  check info keys and values with $REV
@@ -135,7 +135,7 @@ class common_pageinfo_test extends DokuWikiTest {
 
         $this->assertEquals($info, pageinfo());
         $this->assertEquals($rev-100, $REV);
-    }
+    }
 
     /**
      *  check info keys and values with $RANGE
@@ -146,7 +146,7 @@ class common_pageinfo_test extends DokuWikiTest {
         $ID = 'wiki:syntax';
         $filename = $conf['datadir'].'/wiki/syntax.txt';
         $rev = filemtime($filename);
-        $range = '1000-2000';
+        $range = '1000-2000';
 
         $info = $this->_get_expected_pageinfo();
         $info['id'] = 'wiki:syntax';
@@ -160,18 +160,18 @@ class common_pageinfo_test extends DokuWikiTest {
         // expected result $RANGE unchanged
         $RANGE = $range;
 
-        $this->assertEquals($info, pageinfo());
+        $this->assertEquals($info, pageinfo());
         $this->assertFalse(isset($REV));
-        $this->assertEquals($range,$RANGE);
+        $this->assertEquals($range,$RANGE);
 
         // check $RANGE with $REV = current
         // expected result: $RANGE unchanged, $REV cleared
         $REV = $rev;
-        $info['rev'] = '';
+        $info['rev'] = '';
 
-        $this->assertEquals($info, pageinfo());
+        $this->assertEquals($info, pageinfo());
         $this->assertEquals('',$REV);
-        $this->assertEquals($range,$RANGE);
+        $this->assertEquals($range,$RANGE);
 
         // check with a real $REV
         // expected result: $REV and $RANGE are cleared
@@ -218,7 +218,7 @@ class common_pageinfo_test extends DokuWikiTest {
         p_set_metadata($ID,array('last_change' => false));
 
         $this->assertEquals($info, pageinfo());
-        $this->assertEquals($info['meta']['last_change'], p_get_metadata($ID,'last_change'));
+        $this->assertEquals($info['meta']['last_change'], p_get_metadata($ID,'last_change'));
 
         // fake an external edit, pageinfo should clear the last change from meta data
         // and not return any editor data
diff --git a/_test/tests/test/basic.test.php b/_test/tests/test/basic.test.php
index 05778ccf9..86acef935 100644
--- a/_test/tests/test/basic.test.php
+++ b/_test/tests/test/basic.test.php
@@ -123,11 +123,11 @@ class InttestsBasicTest extends DokuWikiTest {
         $request = new TestRequest();
 
         // doku
-        $response = $request->get();
-        $this->assertEquals('doku.php',$request->getScript());
+        $response = $request->get();
+        $this->assertEquals('doku.php',$request->getScript());
 
-        $response = $request->get(array(),'/doku.php?id=wiki:dokuwiki&test=foo');
-        $this->assertEquals('doku.php',$request->getScript());
+        $response = $request->get(array(),'/doku.php?id=wiki:dokuwiki&test=foo');
+        $this->assertEquals('doku.php',$request->getScript());
 
         // fetch
         $response = $request->get(array(),'/lib/exe/fetch.php?media=wiki:dokuwiki-128.png');
@@ -149,8 +149,8 @@ class InttestsBasicTest extends DokuWikiTest {
 
         $request = new TestRequest();
         $response = $request->get(array(),'/lib/exe/fetch.php?media=wiki:dokuwiki-128.png');
-        $headers = $response->getHeaders();
-        $this->assertTrue(!empty($headers));
+        $headers = $response->getHeaders();
+        $this->assertTrue(!empty($headers));
     }
 
     function testGetHeader(){
-- 
cgit v1.2.3


From 5a1d05488ca6e176af4d195accbdca8010cf3416 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Wed, 11 Dec 2013 23:02:17 +0100
Subject: Fix indexing numeric words in page contents

Since a8dba4523d2ecd09dd69a68a36673eaf5c009c57 the search index didn't
properly index numeric words anymore, instead they were added as new
words to the word list each time they were indexed, leading to an
ever-increasing index size.
---
 _test/tests/inc/indexer_indexing.test.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to '_test')

diff --git a/_test/tests/inc/indexer_indexing.test.php b/_test/tests/inc/indexer_indexing.test.php
index 628e82e00..3d8278d6c 100644
--- a/_test/tests/inc/indexer_indexing.test.php
+++ b/_test/tests/inc/indexer_indexing.test.php
@@ -42,4 +42,21 @@ class indexer_indexing_test extends DokuWikiTest {
         $query = array('001', '01');
         $this->assertEquals(array('001' => array(), '01' => array('testpage')), $indexer->lookupKey('numkey', $query));
     }
+
+    public function test_numeric_twice() {
+        $indexer = idx_get_indexer();
+        $indexer->addPageWords('testpage', '| 1010 | Dallas |');
+        $query = array('1010');
+        $this->assertEquals(array('1010' => array('testpage' => 1)), $indexer->lookup($query));
+        $indexer->addPageWords('notfound', '| 1010 | Dallas |');
+        $this->assertEquals(array('1010' => array('testpage' => 1, 'notfound' => 1)), $indexer->lookup($query));
+    }
+
+    public function test_numeric_twice_meta() {
+        $indexer = idx_get_indexer();
+        $indexer->addMetaKeys('testpage', 'onezero', array('1010'));
+        $indexer->addMetaKeys('notfound', 'onezero', array('1010'));
+        $query = '1010';
+        $this->assertEquals(array('notfound', 'testpage'), $indexer->lookupKey('onezero', $query));
+    }
 }
\ No newline at end of file
-- 
cgit v1.2.3