Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Possible fix for rartests #2667

Closed
wants to merge 1 commit into from

2 participants

@gabriel403

No description provided.

@weierophinney weierophinney referenced this pull request from a commit
@weierophinney weierophinney Merge branch 'hotfix/2667' into develop
Forward port #2667
34cbdaf
@weierophinney weierophinney was assigned
@ghost Unknown referenced this pull request from a commit
@weierophinney weierophinney Merge branch 'hotfix/2667'
Close #2667
891b89b
@ghost Unknown referenced this pull request from a commit
@weierophinney weierophinney Merge branch 'hotfix/2667' into develop
Forward port #2667
ed97dd9
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-filter
@weierophinney weierophinney Merge branch 'hotfix/2667' ef44cf1
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-filter
@weierophinney weierophinney Merge branch 'hotfix/2667' into develop 35b47ac
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Oct 3, 2012
  1. @gabriel403
This page is out of date. Refresh to see the latest.
Showing with 5 additions and 7 deletions.
  1. +5 −7 tests/ZendTest/Filter/Compress/RarTest.php
View
12 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,7 +208,7 @@ 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');
}
@@ -216,7 +216,7 @@ 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__)
- . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . '_compress'
- . DIRECTORY_SEPARATOR, $content);
+ $this->assertTrue($content);
$base = dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files'
. DIRECTORY_SEPARATOR . '_compress' . DIRECTORY_SEPARATOR . 'Compress' . DIRECTORY_SEPARATOR;
Something went wrong with that request. Please try again.