mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-10 17:45:18 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'p/ticket/11285' into develop-olympus

Browse Source 
* p/ticket/11285:
  [ticket/11285] Use more granularity in dependency checks in compress test
This commit is contained in:
Andreas Fischer 2012-12-20 21:51:18 +01:00
commit e53f4e5eac
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tests/compress/compress_test.php
View File

@ -32,10 +32,16 @@ class phpbb_compress_test extends phpbb_test_case
$phpbb_root_path = ''; $phpbb_root_path = '';
$this->path = dirname(__FILE__) . '/fixtures/'; $this->path = dirname(__FILE__) . '/fixtures/';
}
if (!@extension_loaded('zlib') || !@extension_loaded('bz2')) protected function check_extensions($extensions)
{ {
$this->markTestSkipped('PHP needs to be compiled with --with-zlib and --with-bz2 in order to run these tests'); foreach ($extensions as $extension)
{
if (!@extension_loaded($extension))
{
$this->markTestSkipped("$extension extension is not loaded");
}
} }
} }
@ -103,17 +109,18 @@ class phpbb_compress_test extends phpbb_test_case
public function tar_archive_list() public function tar_archive_list()
{ {
return array( return array(
array('archive.tar', '.tar'), array('archive.tar', '.tar', array()),
array('archive.tar.gz', '.tar.gz'), array('archive.tar.gz', '.tar.gz', array('zlib')),
array('archive.tar.bz2', '.tar.bz2'), array('archive.tar.bz2', '.tar.bz2', array('bz2')),
); );
} }
/** /**
* @dataProvider tar_archive_list * @dataProvider tar_archive_list
*/ */
public function test_extract_tar($filename, $type) public function test_extract_tar($filename, $type, $extensions)
{ {
$this->check_extensions($extensions);
$compress = new compress_tar('r', $this->path . $filename); $compress = new compress_tar('r', $this->path . $filename);
$compress->extract('tests/compress/' . self::EXTRACT_DIR); $compress->extract('tests/compress/' . self::EXTRACT_DIR);
$this->valid_extraction(); $this->valid_extraction();
@ -130,8 +137,10 @@ class phpbb_compress_test extends phpbb_test_case
* @depends test_extract_tar * @depends test_extract_tar
* @dataProvider tar_archive_list * @dataProvider tar_archive_list
*/ */
public function test_compress_tar($filename, $type) public function test_compress_tar($filename, $type, $extensions)
{ {
$this->check_extensions($extensions);
$tar = dirname(__FILE__) . self::ARCHIVE_DIR . $filename; $tar = dirname(__FILE__) . self::ARCHIVE_DIR . $filename;
$compress = new compress_tar('w', $tar); $compress = new compress_tar('w', $tar);
$this->archive_files($compress); $this->archive_files($compress);
@ -149,6 +158,8 @@ class phpbb_compress_test extends phpbb_test_case
*/ */
public function test_compress_zip() public function test_compress_zip()
{ {
$this->check_extensions(array('zlib'));
$zip = dirname(__FILE__) . self::ARCHIVE_DIR . 'archive.zip'; $zip = dirname(__FILE__) . self::ARCHIVE_DIR . 'archive.zip';
$compress = new compress_zip('w', $zip); $compress = new compress_zip('w', $zip);
$this->archive_files($compress); $this->archive_files($compress);