Merge branch master into stable

7 files changed, 299 insertions, 0 deletions

diff --git a/_test/tests/inc/common_ml.test.php b/_test/tests/inc/common_ml.test.php
new file mode 100644
index 000000000..0abfde37a
--- /dev/null
+++ b/_test/tests/inc/common_ml.test.php
@@ -0,0 +1,77 @@
+<?php
+
+class common_ml_test extends DokuWikiTest {
+
+    private $script = 'lib/exe/fetch.php';
+
+    function test_ml_empty() {
+        global $conf;
+        $conf['useslash'] = 0;
+        $conf['userewrite'] = 0;
+        $conf['start'] = 'start';
+
+        $this->assertEquals(DOKU_BASE . $this->script . '?media=' , ml());
+    }
+
+    function test_ml_args_array() {
+        global $conf;
+        $conf['useslash'] = 0;
+        $conf['userewrite'] = 0;
+
+        $args = array('a' => 'b', 'c' => 'd', 'q' => '&ä');
+
+        $expect = DOKU_BASE . $this->script . '?a=b&amp;c=d&amp;q=%26%C3%A4&amp;media=some:';
+        $this->assertEquals($expect, ml('some:', $args));
+    }
+
+    function test_ml_args_string() {
+        global $conf;
+        $conf['useslash'] = 0;
+        $conf['userewrite'] = 0;
+
+        $args = 'a=b&c=d';
+
+        $expect = DOKU_BASE . $this->script . '?a=b&c=d&amp;media=some:';
+        $this->assertEquals($expect, ml('some:', $args));
+    }
+
+    function test_ml_args_comma_string() {
+        global $conf;
+        $conf['useslash'] = 0;
+        $conf['userewrite'] = 0;
+
+        $args = 'a=b,c=d';
+
+        $expect = DOKU_BASE . $this->script . '?a=b&amp;c=d&amp;media=some:';
+        $this->assertEquals($expect, ml('some:', $args));
+    }
+
+
+    function test_ml_imgresize_array() {
+        global $conf;
+        $conf['useslash'] = 0;
+        $conf['userewrite'] = 0;
+
+        $id = 'some:';
+        $w = 80;
+        $args = array('w' => $w);
+        $tok = media_get_token($id,$w,0);
+
+        $expect = DOKU_BASE . $this->script . '?w='.$w.'&amp;tok='.$tok.'&amp;media='.$id;
+        $this->assertEquals($expect, ml($id, $args));
+    }
+
+    function test_ml_imgresize_string() {
+        global $conf;
+        $conf['useslash'] = 0;
+        $conf['userewrite'] = 0;
+
+        $id = 'some:';
+        $w = 80;
+        $args = 'w='.$w;
+        $tok = media_get_token($id,$w,0);
+
+        $expect = DOKU_BASE . $this->script . '?w='.$w.'&amp;tok='.$tok.'&amp;media='.$id;
+        $this->assertEquals($expect, ml($id, $args));
+    }
+}
diff --git a/_test/tests/inc/httpclient_http.test.php b/_test/tests/inc/httpclient_http.test.php
index 252eb6b65..387eb53aa 100644
--- a/_test/tests/inc/httpclient_http.test.php
+++ b/_test/tests/inc/httpclient_http.test.php
@@ -204,5 +204,16 @@ class httpclient_http_test extends DokuWikiTest {
         $this->assertFalse($data === false, 'HTTP response');
         $this->assertEquals(2550,strlen($data));
     }
+
+    /**
+     * This address caused trouble with stream_select()
+     *
+     * @group internet
+     */
+    function test_wikimatrix(){
+        $http = new HTTPClient();
+        $data = $http->get('http://www.wikimatrix.org/cfeed/dokuwiki/-/-');
+        $this->assertTrue($data !== false, $http->error);
+    }
 }
 //Setup VIM: ex: et ts=4 :
diff --git a/_test/tests/inc/tar.test.php b/_test/tests/inc/tar.test.php
index e8805a75d..90bc2e49e 100644
--- a/_test/tests/inc/tar.test.php
+++ b/_test/tests/inc/tar.test.php
@@ -316,4 +316,48 @@ class Tar_TestCase extends DokuWikiTest {
 
         TestUtils::rdelete($out);
     }
+
+    /**
+     * A single zero file should be just a header block + the footer
+     */
+    public function test_zerofile(){
+        $dir = dirname(__FILE__).'/tar';
+        $tar = new Tar();
+        $tar->create();
+        $tar->addFile("$dir/zero.txt", 'zero.txt');
+        $file = $tar->getArchive(Tar::COMPRESS_NONE);
+
+        $this->assertEquals(512*3, strlen($file)); // 1 header block + 2 footer blocks
+    }
+
+    public function test_zerodata(){
+        $tar = new Tar();
+        $tar->create();
+        $tar->addData('zero.txt','');
+        $file = $tar->getArchive(Tar::COMPRESS_NONE);
+
+        $this->assertEquals(512*3, strlen($file)); // 1 header block + 2 footer blocks
+    }
+
+    /**
+     * A file of exactly one block should be just a header block + data block + the footer
+     */
+    public function test_blockfile(){
+        $dir = dirname(__FILE__).'/tar';
+        $tar = new Tar();
+        $tar->create();
+        $tar->addFile("$dir/block.txt", 'block.txt');
+        $file = $tar->getArchive(Tar::COMPRESS_NONE);
+
+        $this->assertEquals(512*4, strlen($file)); // 1 header block + data block + 2 footer blocks
+    }
+
+    public function test_blockdata(){
+        $tar = new Tar();
+        $tar->create();
+        $tar->addData('block.txt', str_pad('', 512, 'x'));
+        $file = $tar->getArchive(Tar::COMPRESS_NONE);
+
+        $this->assertEquals(512*4, strlen($file)); // 1 header block + data block + 2 footer blocks
+    }
 }
\ No newline at end of file
diff --git a/_test/tests/inc/tar/block.txt b/_test/tests/inc/tar/block.txt
new file mode 100644
index 000000000..9b2f53080
--- /dev/null
+++ b/_test/tests/inc/tar/block.txt
@@ -0,0 +1 @@
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
\ No newline at end of file
diff --git a/_test/tests/inc/tar/zero.txt b/_test/tests/inc/tar/zero.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/_test/tests/inc/tar/zero.txt
diff --git a/_test/tests/lib/exe/fetch_imagetoken.test.php b/_test/tests/lib/exe/fetch_imagetoken.test.php
new file mode 100644
index 000000000..9e5b6e4a2
--- /dev/null
+++ b/_test/tests/lib/exe/fetch_imagetoken.test.php
@@ -0,0 +1,99 @@
+<?php
+
+class fetch_imagetoken_test extends DokuWikiTest {
+ 
+    private $media = 'wiki:dokuwiki-128.png';
+    private $width = 200;
+    private $height = 0;
+
+    function setUp() {
+        // check we can carry out these tests
+        if (!file_exists(mediaFN($this->media))) {
+            $this->markTestSkipped('Source image required for test');
+        }
+
+        header('X-Test: check headers working');
+        $header_check = function_exists('xdebug_get_headers') ? xdebug_get_headers() : headers_list();
+        if (empty($header_check)) {
+            $this->markTestSkipped('headers not returned, perhaps your sapi does not return headers, try xdebug');
+        } else {
+            header_remove('X-Test');
+        }
+
+        parent::setUp();
+
+        global $conf;
+        $conf['sendfile'] = 0;
+
+        global $MIME, $EXT, $CACHE, $INPUT;    // variables fetch creates in global scope -- should this be in fetch?
+    }

+
+    function getUri() {
+       $w = $this->width ? 'w='.$this->width.'&' : '';
+       $h = $this->height ? 'h='.$this->height.'&' : '';
+
+       return '/lib/exe/fetch.php?'.$w.$h.'{%token%}media='.$this->media;
+    }
+
+    function fetchResponse($token){
+        $request = new TestRequest();
+        return $request->get(array(),str_replace('{%token%}',$token,$this->getUri()));
+    }
+

+    /**

+     *  modified image request with valid token
+     *  expect: header with mime-type
+     *  expect: content
+     *  expect: no error response
+     */

+    function test_valid_token(){

+        $valid_token = 'tok='.media_get_token($this->media, $this->width, $this->height).'&';
+        $response = $this->fetchResponse($valid_token);
+        $this->assertTrue((bool)$response->getHeader('Content-Type'));
+        $this->assertTrue((bool)($response->getContent()));
+        
+        $status_code = $response->getStatusCode();
+        $this->assertTrue(is_null($status_code) || (200 == $status_code));
+    }

+    

+    /**

+     *  modified image request with invalid token
+     *  expect: 412 status code

+     */

+    function test_invalid_token(){

+        $invalid_token = 'tok='.media_get_token('junk',200,100).'&';

+        $this->assertEquals(412,$this->fetchResponse($invalid_token)->getStatusCode());

+    }

+    

+    /**

+     *  modified image request with no token

+     *  expect: 412 status code
+     */

+    function test_missing_token(){

+        $no_token = '';

+        $this->assertEquals(412,$this->fetchResponse($notoken)->getStatusCode());
+    }
+
+    /**
+     *  native image request which doesn't require a token
+     *  try: with a token & without a token
+     *  expect: (for both) header with mime-type, content matching source image filesize & no error response
+     */
+    function test_no_token_required(){
+        $this->width = $this->height = 0;   // no width & height, means image request at native dimensions
+        $any_token = 'tok='.media_get_token('junk',200,100).'&';
+        $no_token = '';
+        $bytes = filesize(mediaFN($this->media));
+
+        foreach(array($any_token, $no_token) as $token) {
+            $response = $this->fetchResponse($token);
+            $this->assertTrue((bool)$response->getHeader('Content-Type'));
+            $this->assertEquals(strlen($response->getContent()), $bytes);
+
+            $status_code = $response->getStatusCode();
+            $this->assertTrue(is_null($status_code) || (200 == $status_code));
+        }
+    }
+
+}
+//Setup VIM: ex: et ts=4 :
diff --git a/_test/tests/test/basic.test.php b/_test/tests/test/basic.test.php
index a0ea48a3a..05778ccf9 100644
--- a/_test/tests/test/basic.test.php
+++ b/_test/tests/test/basic.test.php
@@ -4,6 +4,24 @@
  * @group integration
  */
 class InttestsBasicTest extends DokuWikiTest {
+
+    private $some_headers =  array(
+          'Content-Type: image/png',
+          'Date: Fri, 22 Mar 2013 16:10:01 GMT',
+          'X-Powered-By: PHP/5.3.15',
+          'Expires: Sat, 23 Mar 2013 17:03:46 GMT',
+          'Cache-Control: public, proxy-revalidate, no-transform, max-age=86400',
+          'Pragma: public',
+          'Last-Modified: Fri, 22 Mar 2013 01:48:28 GMT',
+          'ETag: "63daab733b38c30c337229b2e587f8fb"',
+          'Content-Disposition: inline; filename="fe389b0db8c1088c336abb502d2f9ae7.media.200x200.png',
+          'Accept-Ranges: bytes',
+          'Content-Type: image/png',
+          'Content-Length: 62315',
+          'Status: 200 OK',
+          'Status: 404 Not Found',
+     );
+
     /**
      * Execute the simplest possible request and expect
      * a dokuwiki page which obviously has the word "DokuWiki"
@@ -101,5 +119,54 @@ class InttestsBasicTest extends DokuWikiTest {
         $this->assertTrue(strpos($response->getContent(), 'Andreas Gohr') >= 0);
     }
 
+    function testScripts() {
+        $request = new TestRequest();
+
+        // doku
+        $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());

+
+        // fetch
+        $response = $request->get(array(),'/lib/exe/fetch.php?media=wiki:dokuwiki-128.png');
+        $this->assertEquals('lib/exe/fetch.php',$request->getScript());
+
+        // detail
+        $response = $request->get(array(),'/lib/exe/detail.php?id=start&media=wiki:dokuwiki-128.png');
+        $this->assertEquals('lib/exe/detail.php',$request->getScript());
+    }
+
+    function testHeaders(){
+        header('X-Test: check headers working');
+        $header_check = function_exists('xdebug_get_headers') ? xdebug_get_headers() : headers_list();
+        if (empty($header_check)) {
+            $this->markTestSkipped('headers not returned, perhaps your sapi does not return headers, try xdebug');
+        } else {
+            header_remove('X-Test');
+        }
+
+        $request = new TestRequest();
+        $response = $request->get(array(),'/lib/exe/fetch.php?media=wiki:dokuwiki-128.png');
+        $headers = $response->getHeaders();

+        $this->assertTrue(!empty($headers));

+    }
+
+    function testGetHeader(){
+        $response = new TestResponse('',$this->some_headers);
+
+        $this->assertEquals('Pragma: public', $response->getHeader('Pragma'));
+        $this->assertEmpty($response->getHeader('Junk'));
+        $this->assertEquals(array('Content-Type: image/png','Content-Type: image/png'), $response->getHeader('Content-Type'));
+    }
+
+    function testGetStatus(){
+       $response = new TestResponse('',$this->some_headers);
+       $this->assertEquals(404, $response->getStatusCode());
+
+       $response = new TestResponse('',array_slice($this->some_headers,0,-2));  // slice off the last two headers to leave no status header
+       $this->assertNull($response->getStatusCode());
+    }
 
 }