2 files changed, 44 insertions, 1 deletions
diff --git a/_test/tests/inc/input.test.php b/_test/tests/inc/input.test.php
index 761b7ddbc..59b5ea4b9 100644
--- a/_test/tests/inc/input.test.php
+++ b/_test/tests/inc/input.test.php
@@ -12,7 +12,8 @@ class input_test extends DokuWikiTest {
         'zero'   => '0',
         'one'    => '1',
         'empty'  => '',
-        'emptya' => array()
+        'emptya' => array(),
+        'do'     => array('save' => 'Speichern'),
     );
 
     public function test_str() {
@@ -213,4 +214,20 @@ class input_test extends DokuWikiTest {
         $this->assertEquals('bla',$test);
     }
 
+    public function test_extract(){
+        $_REQUEST = $this->data;
+        $_POST    = $this->data;
+        $_GET     = $this->data;
+        $INPUT    = new Input();
+
+        $this->assertEquals('save', $INPUT->extract('do')->str('do'));
+        $this->assertEquals('', $INPUT->extract('emptya')->str('emptya'));
+        $this->assertEquals('foo', $INPUT->extract('string')->str('string'));
+        $this->assertEquals('foo', $INPUT->extract('array')->str('array'));
+
+        $this->assertEquals('save', $INPUT->post->extract('do')->str('do'));
+        $this->assertEquals('', $INPUT->post->extract('emptya')->str('emptya'));
+        $this->assertEquals('foo', $INPUT->post->extract('string')->str('string'));
+        $this->assertEquals('foo', $INPUT->post->extract('array')->str('array'));
+    }
 }
diff --git a/_test/tests/lib/exe/js_js_compress.test.php b/_test/tests/lib/exe/js_js_compress.test.php
index 49f93cc54..b1ae2a84f 100644
--- a/_test/tests/lib/exe/js_js_compress.test.php
+++ b/_test/tests/lib/exe/js_js_compress.test.php
@@ -118,6 +118,32 @@ class js_js_compress_test extends DokuWikiTest {
         $this->assertEquals("var foo='this is a multiline string';",js_compress($text));
     }
 
+    function test_nocompress(){
+        $text = <<<EOF
+var meh   =    'test' ;
+
+/* BEGIN NOCOMPRESS */
+
+
+var foo   =    'test' ;
+
+var bar   =    'test' ;
+
+
+/* END NOCOMPRESS */
+
+var moh   =    'test' ;
+EOF;
+        $out = <<<EOF
+var meh='test';
+var foo   =    'test' ;
+
+var bar   =    'test' ;
+var moh='test';
+EOF;
+
+        $this->assertEquals($out, js_compress($text));
+    }
 
     /**
      * Test the files provided with the original JsStrip