[ticket/11045] Removed file conflict tests for compress class

PHPBB3-11045

1 files changed, 2 insertions, 13 deletions

diff --git a/tests/compress/compress_test.php b/tests/compress/compress_test.php
index ac8dd358d3..65094671e3 100644
--- a/tests/compress/compress_test.php
+++ b/tests/compress/compress_test.php
@@ -25,12 +25,6 @@ class phpbb_compress_test extends phpbb_test_case
 		'dir/subdir/4.txt',
 	);
 
-	protected $conflicts = array(
-		'1_1.txt',
-		'1_2.txt',
-		'dir/2_1.txt',
-	);
-
 	protected function setUp()
 	{
 		// Required for compress::add_file
@@ -88,11 +82,6 @@ class phpbb_compress_test extends phpbb_test_case
 		);
 		$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');
-
-		// 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())
@@ -152,7 +141,7 @@ class phpbb_compress_test extends phpbb_test_case
 		$compress->mode = 'r';
 		$compress->open();
 		$compress->extract('tests/compress/' . self::EXTRACT_DIR);
-		$this->valid_extraction($this->conflicts);
+		$this->valid_extraction();
 	}
 
 	/**
@@ -168,6 +157,6 @@ class phpbb_compress_test extends phpbb_test_case
 
 		$compress = new compress_zip('r', $zip);
 		$compress->extract('tests/compress/' . self::EXTRACT_DIR);
-		$this->valid_extraction($this->conflicts);
+		$this->valid_extraction();
 	}
 }