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 'bantu/ticket/11109' into develop

Browse Source 
* bantu/ticket/11109:
  [ticket/11109] Re-add file conflict checks to compress class
This commit is contained in:
Andreas Fischer 2012-09-14 01:27:48 +02:00
commit 635a58a7e2
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/compress/compress_test.php
View File

@ -25,6 +25,12 @@ class phpbb_compress_test extends phpbb_test_case
'dir/subdir/4.txt', 'dir/subdir/4.txt',
); );
protected $conflicts = array(
'1_1.txt',
'1_2.txt',
'dir/2_1.txt',
);
protected function setUp() protected function setUp()
{ {
// Required for compress::add_file // Required for compress::add_file
@ -82,6 +88,11 @@ class phpbb_compress_test extends phpbb_test_case
); );
$compress->add_custom_file($this->path . 'dir/3.txt', 'dir/3.txt'); $compress->add_custom_file($this->path . 'dir/3.txt', 'dir/3.txt');
$compress->add_data(file_get_contents($this->path . 'dir/subdir/4.txt'), 'dir/subdir/4.txt'); $compress->add_data(file_get_contents($this->path . 'dir/subdir/4.txt'), 'dir/subdir/4.txt');
// Add multiples of the same file to check conflicts are handled
$compress->add_file($this->path . '1.txt', $this->path);
$compress->add_file($this->path . '1.txt', $this->path);
$compress->add_file($this->path . 'dir/2.txt', $this->path);
} }
protected function valid_extraction($extra = array()) protected function valid_extraction($extra = array())
@ -141,7 +152,7 @@ class phpbb_compress_test extends phpbb_test_case
$compress->mode = 'r'; $compress->mode = 'r';
$compress->open(); $compress->open();
$compress->extract('tests/compress/' . self::EXTRACT_DIR); $compress->extract('tests/compress/' . self::EXTRACT_DIR);
$this->valid_extraction(); $this->valid_extraction($this->conflicts);
} }
/** /**
@ -157,6 +168,6 @@ class phpbb_compress_test extends phpbb_test_case
$compress = new compress_zip('r', $zip); $compress = new compress_zip('r', $zip);
$compress->extract('tests/compress/' . self::EXTRACT_DIR); $compress->extract('tests/compress/' . self::EXTRACT_DIR);
$this->valid_extraction(); $this->valid_extraction($this->conflicts);
} }
} }