Merge branch 'hotfix/2667' into develop

Forward port #2667
zendframework · Oct 4, 2012 · 34cbdaf · 34cbdaf
2 parents 7684f9c + 55ab702
commit 34cbdaf
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/tests/ZendTest/Filter/Compress/RarTest.php b/tests/ZendTest/Filter/Compress/RarTest.php
@@ -108,7 +108,7 @@ public function testBasicUsage()
                             . DIRECTORY_SEPARATOR . 'compressed.rar', $content);
 
         $content = $filter->decompress($content);
-        $this->assertEquals(dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR, $content);
+        $this->assertTrue($content);
         $content = file_get_contents(dirname(__DIR__) . '/_files/zipextracted.txt');
         $this->assertEquals('compress me', $content);
     }
@@ -208,15 +208,15 @@ public function testSettingCallbackThrowsExceptionOnMissingCallback()
     {
         $filter = new RarCompression();
 
-        $this->setExpectedException('Zend\Filter\Exception\InvalidArgumentException', 'must be between');
+        $this->setExpectedException('Zend\Filter\Exception\RuntimeException', 'No compression callback available');
         $filter->compress('test.txt');
     }
 
     public function testSettingCallbackThrowsExceptionOnInvalidCallback()
     {
         $filter = new RarCompression();
 
-        $this->setExpectedException('Zend\Filter\Exception\InvalidArgumentException', 'must be between');
+        $this->setExpectedException('Zend\Filter\Exception\InvalidArgumentException', 'Invalid callback provided');
         $filter->setCallback('invalidCallback');
     }
 
@@ -241,7 +241,7 @@ public function testRarCompressFile()
                             . DIRECTORY_SEPARATOR . 'compressed.rar', $content);
 
         $content = $filter->decompress($content);
-        $this->assertEquals(dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR, $content);
+        $this->assertTrue($content);
         $content = file_get_contents(dirname(__DIR__) . '/_files/zipextracted.txt');
         $this->assertEquals('compress me', $content);
     }
@@ -266,9 +266,7 @@ public function testRarCompressDirectory()
 
         mkdir(dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . '_compress');
         $content = $filter->decompress($content);
-        $this->assertEquals(dirname(__DIR__)
+        $this->assertTrue($content);
-                            . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . '_compress'
-                            . DIRECTORY_SEPARATOR, $content);
 
         $base = dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files'
               . DIRECTORY_SEPARATOR . '_compress' . DIRECTORY_SEPARATOR . 'Compress' . DIRECTORY_SEPARATOR;