Merge remote-tracking branch 'splitbrain/master'

1 files changed, 45 insertions, 9 deletions

diff --git a/_test/tests/lib/exe/css_css_compress.test.php b/_test/tests/lib/exe/css_css_compress.test.php
index a614ea2fd..807317ca6 100644
--- a/_test/tests/lib/exe/css_css_compress.test.php
+++ b/_test/tests/lib/exe/css_css_compress.test.php
@@ -10,41 +10,70 @@ class css_css_compress_test extends DokuWikiTest {
                   * line *test*
                   * check
                   */';
-        $this->assertEquals(css_compress($text), '');
+        $this->assertEquals('', css_compress($text));
     }
 
     function test_mlcom2(){
         $text = '#comment/* */ {
                     color: lime;
                 }';
-        $this->assertEquals(css_compress($text), '#comment/* */{color:lime;}');
+        $this->assertEquals('#comment/* */{color:lime;}', css_compress($text));
     }
 
     function test_slcom1(){
         $text = '// this is a comment';
-        $this->assertEquals(css_compress($text), '');
+        $this->assertEquals('', css_compress($text));
     }
 
     function test_slcom2(){
         $text = '#foo {
                     color: lime; // another comment
                 }';
-        $this->assertEquals(css_compress($text), '#foo{color:lime;}');
+        $this->assertEquals('#foo{color:lime;}', css_compress($text));
     }
 
     function test_slcom3(){
         $text = '#foo {
-                    background-image: url(http://foo.bar/baz.jpg);
+                    background-image: url(http://foo.bar/baz.jpg); // this is a comment
                 }';
-        $this->assertEquals(css_compress($text), '#foo{background-image:url(http://foo.bar/baz.jpg);}');
+        $this->assertEquals('#foo{background-image:url(http://foo.bar/baz.jpg);}', css_compress($text));
     }
 
+    function test_slcom4(){
+        $text = '#foo {
+                    background-image: url(http://foo.bar/baz.jpg); background-image: url(http://foo.bar/baz.jpg); // this is a comment
+                }';
+        $this->assertEquals('#foo{background-image:url(http://foo.bar/baz.jpg);background-image:url(http://foo.bar/baz.jpg);}', css_compress($text));
+    }
+
+    function test_slcom5(){
+        $text = '#foo {
+                    background-image: url(http://foo.bar/baz.jpg); // background-image: url(http://foo.bar/baz.jpg); this is all commented
+                }';
+        $this->assertEquals('#foo{background-image:url(http://foo.bar/baz.jpg);}', css_compress($text));
+    }
+
+    function test_slcom6(){
+        $text = '#foo {
+                    background-image: url(//foo.bar/baz.jpg); // background-image: url(http://foo.bar/baz.jpg); this is all commented
+                }';
+        $this->assertEquals('#foo{background-image:url(//foo.bar/baz.jpg);}', css_compress($text));
+    }
+
+    function test_slcom7(){
+        $text = '#foo a[href ^="https://"], #foo a[href ^=\'https://\'] {
+                    background-image: url(//foo.bar/baz.jpg); // background-image: url(http://foo.bar/baz.jpg); this is \'all\' "commented"
+                }';
+        $this->assertEquals('#foo a[href ^="https://"],#foo a[href ^=\'https://\']{background-image:url(//foo.bar/baz.jpg);}', css_compress($text));
+    }
+
+
     function test_hack(){
         $text = '/* Mac IE will not see this and continue with inline-block */
                  /* \\*/
                  display: inline; 
                  /* */';
-        $this->assertEquals(css_compress($text), '/* \\*/display:inline;/* */');
+        $this->assertEquals('/* \\*/display:inline;/* */', css_compress($text));
     }
 
     function test_hack2(){
@@ -54,12 +83,12 @@ class css_css_compress_test extends DokuWikiTest {
                      height: 450px;
                  }
                  /**/';
-        $this->assertEquals(css_compress($text), '/*\\*/* html .page{height:450px;}/**/');
+        $this->assertEquals('/*\\*/* html .page{height:450px;}/**/', css_compress($text));
     }
 
     function test_nl1(){
         $text = "a{left:20px;\ntop:20px}";
-        $this->assertEquals(css_compress($text), 'a{left:20px;top:20px}');
+        $this->assertEquals('a{left:20px;top:20px}', css_compress($text));
     }
 
     function test_shortening() {
@@ -102,6 +131,13 @@ class css_css_compress_test extends DokuWikiTest {
         $this->assertEquals($expected, $input);
     }
 
+    function test_data() {
+        $input  = 'list-style-image: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);';
+        $expect = 'list-style-image:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);';
+
+        $this->assertEquals($expect, css_compress($input));
+    }
+
 }
 
 //Setup VIM: ex: et ts=4 :