6 files changed, 39 insertions, 159 deletions
diff --git a/tests/functional/extension_acp_test.php b/tests/functional/extension_acp_test.php
index 9badab8ced..ada17397d7 100644
--- a/tests/functional/extension_acp_test.php
+++ b/tests/functional/extension_acp_test.php
@@ -12,34 +12,33 @@
 */
 class phpbb_functional_extension_acp_test extends phpbb_functional_test_case
 {
-	static private $copied_files = array();
 	static private $helper;
 
+	static protected $fixtures = array(
+		'',
+	);
+
 	/**
 	* This should only be called once before the tests are run.
-	* This is used to copy the extensions to the phpBB install
+	* This is used to copy the fixtures to the phpBB install
 	*/
 	static public function setUpBeforeClass()
 	{
-		global $phpbb_root_path;
-
 		parent::setUpBeforeClass();
 
 		self::$helper = new phpbb_test_case_helpers(self);
+		self::$helper->copy_ext_fixtures(dirname(__FILE__) . '/fixtures/ext/', self::$fixtures);
+	}
 
-		self::$copied_files = array();
-
-		if (file_exists($phpbb_root_path . 'ext/'))
-		{
-			// First, move any extensions setup on the board to a temp directory
-			self::$copied_files = self::$helper->copy_dir($phpbb_root_path . 'ext/', $phpbb_root_path . 'store/temp_ext/');
-
-			// Then empty the ext/ directory on the board (for accurate test cases)
-			self::$helper->empty_dir($phpbb_root_path . 'ext/');
-		}
+	/**
+	* This should only be called once after the tests are run.
+	* This is used to remove the fixtures from the phpBB install
+	*/
+	static public function tearDownAfterClass()
+	{
+		parent::tearDownAfterClass();
 
-		// Copy our ext/ files from the test case to the board
-		self::$copied_files = array_merge(self::$copied_files, self::$helper->copy_dir(dirname(__FILE__) . '/../extension/ext/', $phpbb_root_path . 'ext/'));
+		self::$helper->restore_original_ext_dir();
 	}
 
 	public function setUp()
@@ -84,29 +83,6 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case
 		$this->add_lang('acp/extensions');
 	}
 
-	/**
-	* This should only be called once after the tests are run.
-	* This is used to remove the files copied to the phpBB install
-	*/
-	static public function tearDownAfterClass()
-	{
-		global $phpbb_root_path;
-
-		if (file_exists($phpbb_root_path . 'store/temp_ext/'))
-		{
-			// Copy back the board installed extensions from the temp directory
-			self::$helper->copy_dir($phpbb_root_path . 'store/temp_ext/', $phpbb_root_path . 'ext/');
-		}
-
-		// Remove all of the files we copied around (from board ext -> temp_ext, from test ext -> board ext)
-		self::$helper->remove_files(self::$copied_files);
-
-		if (file_exists($phpbb_root_path . 'store/temp_ext/'))
-		{
-			self::$helper->empty_dir($phpbb_root_path . 'store/temp_ext/');
-		}
-	}
-
 	public function test_list()
 	{
         $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid);
diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php
index a09035cb2b..c789ea160d 100644
--- a/tests/functional/extension_controller_test.php
+++ b/tests/functional/extension_controller_test.php
@@ -15,6 +15,8 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 {
 	protected $phpbb_extension_manager;
 
+	static private $helper;
+
 	static protected $fixtures = array(
 		'foo/bar/config/routing.yml',
 		'foo/bar/config/services.yml',
@@ -28,30 +30,10 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	*/
 	static public function setUpBeforeClass()
 	{
-		global $phpbb_root_path;
 		parent::setUpBeforeClass();
 
-		$directories = array(
-			$phpbb_root_path . 'ext/foo/bar/',
-			$phpbb_root_path . 'ext/foo/bar/config/',
-			$phpbb_root_path . 'ext/foo/bar/controller/',
-			$phpbb_root_path . 'ext/foo/bar/styles/prosilver/template',
-		);
-
-		foreach ($directories as $dir)
-		{
-			if (!is_dir($dir))
-			{
-				mkdir($dir, 0777, true);
-			}
-		}
-
-		foreach (self::$fixtures as $fixture)
-		{
-			copy(
-				"tests/functional/fixtures/ext/$fixture",
-				"{$phpbb_root_path}ext/$fixture");
-		}
+		self::$helper = new phpbb_test_case_helpers(self);
+		self::$helper->copy_ext_fixtures(dirname(__FILE__) . '/fixtures/ext/', self::$fixtures);
 	}
 
 	/**
@@ -60,20 +42,9 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	*/
 	static public function tearDownAfterClass()
 	{
-		global $phpbb_root_path;
-
-		foreach (self::$fixtures as $fixture)
-		{
-			unlink("{$phpbb_root_path}ext/$fixture");
-		}
+		parent::tearDownAfterClass();
 
-		rmdir("{$phpbb_root_path}ext/foo/bar/config");
-		rmdir("{$phpbb_root_path}ext/foo/bar/controller");
-		rmdir("{$phpbb_root_path}ext/foo/bar/styles/prosilver/template");
-		rmdir("{$phpbb_root_path}ext/foo/bar/styles/prosilver");
-		rmdir("{$phpbb_root_path}ext/foo/bar/styles");
-		rmdir("{$phpbb_root_path}ext/foo/bar");
-		rmdir("{$phpbb_root_path}ext/foo");
+		self::$helper->restore_original_ext_dir();
 	}
 
 	public function setUp()
diff --git a/tests/functional/extension_module_test.php b/tests/functional/extension_module_test.php
index c8686e0ac6..e95f0b7e3f 100644
--- a/tests/functional/extension_module_test.php
+++ b/tests/functional/extension_module_test.php
@@ -16,33 +16,23 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/acp/acp_modules.php';
 class phpbb_functional_extension_module_test extends phpbb_functional_test_case
 {
 	protected $phpbb_extension_manager;
-	static private $copied_files = array();
+
 	static private $helper;
 
+	static protected $fixtures = array(
+		'',
+	);
+
 	/**
 	* This should only be called once before the tests are run.
 	* This is used to copy the fixtures to the phpBB install
 	*/
 	static public function setUpBeforeClass()
 	{
-		global $phpbb_root_path;
 		parent::setUpBeforeClass();
 
 		self::$helper = new phpbb_test_case_helpers(self);
-
-		self::$copied_files = array();
-
-		if (file_exists($phpbb_root_path . 'ext/'))
-		{
-			// First, move any extensions setup on the board to a temp directory
-			self::$copied_files = self::$helper->copy_dir($phpbb_root_path . 'ext/', $phpbb_root_path . 'store/temp_ext/');
-
-			// Then empty the ext/ directory on the board (for accurate test cases)
-			self::$helper->empty_dir($phpbb_root_path . 'ext/');
-		}
-
-		// Copy our ext/ files from the test case to the board
-		self::$copied_files = array_merge(self::$copied_files, self::$helper->copy_dir(dirname(__FILE__) . '/fixtures/ext/', $phpbb_root_path . 'ext/'));
+		self::$helper->copy_ext_fixtures(dirname(__FILE__) . '/fixtures/ext/', self::$fixtures);
 	}
 
 	/**
@@ -51,21 +41,9 @@ class phpbb_functional_extension_module_test extends phpbb_functional_test_case
 	*/
 	static public function tearDownAfterClass()
 	{
-		global $phpbb_root_path;
-
-		if (file_exists($phpbb_root_path . 'store/temp_ext/'))
-		{
-			// Copy back the board installed extensions from the temp directory
-			self::$helper->copy_dir($phpbb_root_path . 'store/temp_ext/', $phpbb_root_path . 'ext/');
-		}
-
-		// Remove all of the files we copied around (from board ext -> temp_ext, from test ext -> board ext)
-		self::$helper->remove_files(self::$copied_files);
+		parent::tearDownAfterClass();
 
-		if (file_exists($phpbb_root_path . 'store/temp_ext/'))
-		{
-			self::$helper->empty_dir($phpbb_root_path . 'store/temp_ext/');
-		}
+		self::$helper->restore_original_ext_dir();
 	}
 
 	public function setUp()
diff --git a/tests/functional/extension_permission_lang_test.php b/tests/functional/extension_permission_lang_test.php
index 04c3a9d497..fe8ea95cf0 100644
--- a/tests/functional/extension_permission_lang_test.php
+++ b/tests/functional/extension_permission_lang_test.php
@@ -16,8 +16,6 @@ class phpbb_functional_extension_permission_lang_test extends phpbb_functional_t
 
 	static private $helper;
 
-	static private $copied_files = array();
-
 	static protected $fixtures = array(
 		'foo/bar/language/en/',
 	);
@@ -28,27 +26,10 @@ class phpbb_functional_extension_permission_lang_test extends phpbb_functional_t
 	*/
 	static public function setUpBeforeClass()
 	{
-		global $phpbb_root_path;
 		parent::setUpBeforeClass();
 
 		self::$helper = new phpbb_test_case_helpers(self);
-
-		self::$copied_files = array();
-
-		if (file_exists($phpbb_root_path . 'ext/'))
-		{
-			// First, move any extensions setup on the board to a temp directory
-			self::$copied_files = self::$helper->copy_dir($phpbb_root_path . 'ext/', $phpbb_root_path . 'store/temp_ext/');
-
-			// Then empty the ext/ directory on the board (for accurate test cases)
-			self::$helper->empty_dir($phpbb_root_path . 'ext/');
-		}
-
-		// Copy our ext/ files from the test case to the board
-		foreach (self::$fixtures as $fixture)
-		{
-			self::$copied_files = array_merge(self::$copied_files, self::$helper->copy_dir(dirname(__FILE__) . '/fixtures/ext/' . $fixture, $phpbb_root_path . 'ext/' . $fixture));
-		}
+		self::$helper->copy_ext_fixtures(dirname(__FILE__) . '/fixtures/ext/', self::$fixtures);
 	}
 
 	/**
@@ -57,21 +38,9 @@ class phpbb_functional_extension_permission_lang_test extends phpbb_functional_t
 	*/
 	static public function tearDownAfterClass()
 	{
-		global $phpbb_root_path;
-		
-		if (file_exists($phpbb_root_path . 'store/temp_ext/'))
-		{
-			// Copy back the board installed extensions from the temp directory
-			self::$helper->copy_dir($phpbb_root_path . 'store/temp_ext/', $phpbb_root_path . 'ext/');
-		}
-
-		// Remove all of the files we copied around (from board ext -> temp_ext, from test ext -> board ext)
-		self::$helper->remove_files(self::$copied_files);
-
-		if (file_exists($phpbb_root_path . 'store/temp_ext/'))
-		{
-			self::$helper->empty_dir($phpbb_root_path . 'store/temp_ext/');
-		}
+		parent::tearDownAfterClass();
+
+		self::$helper->restore_original_ext_dir();
 	}
 
 	public function setUp()
diff --git a/tests/functional/metadata_manager_test.php b/tests/functional/metadata_manager_test.php
index 7e98b0d025..9d36a41354 100644
--- a/tests/functional/metadata_manager_test.php
+++ b/tests/functional/metadata_manager_test.php
@@ -16,7 +16,7 @@ class phpbb_functional_metadata_manager_test extends phpbb_functional_test_case
 {
 	protected $phpbb_extension_manager;
 
-	static private $helpers;
+	static private $helper;
 
 	static protected $fixtures = array(
 		'foo/bar/',
@@ -28,20 +28,10 @@ class phpbb_functional_metadata_manager_test extends phpbb_functional_test_case
 	*/
 	static public function setUpBeforeClass()
 	{
-		global $phpbb_root_path;
 		parent::setUpBeforeClass();
 
-		self::$helpers = new phpbb_test_case_helpers(self);
-
-		if (!file_exists($phpbb_root_path . 'ext/foo/bar/'))
-		{
-			self::$helpers->makedirs($phpbb_root_path . 'ext/foo/bar/');
-		}
-
-		foreach (self::$fixtures as $fixture)
-		{
-			self::$helpers->copy_dir(dirname(__FILE__) . '/fixtures/ext/' . $fixture, $phpbb_root_path . 'ext/' . $fixture);
-		}
+		self::$helper = new phpbb_test_case_helpers(self);
+		self::$helper->copy_ext_fixtures(dirname(__FILE__) . '/fixtures/ext/', self::$fixtures);
 	}
 
 	/**
@@ -50,13 +40,9 @@ class phpbb_functional_metadata_manager_test extends phpbb_functional_test_case
 	*/
 	static public function tearDownAfterClass()
 	{
-		global $phpbb_root_path;
+		parent::tearDownAfterClass();
 
-		foreach (self::$fixtures as $fixture)
-		{
-			self::$helpers->empty_dir($phpbb_root_path . 'ext/' . $fixture);
-		}
-		self::$helpers->empty_dir($phpbb_root_path . 'ext/foo/');
+		self::$helper->restore_original_ext_dir();
 	}
 
 	public function setUp()
diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index 0e0b5c2a8f..367bd3b142 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -38,7 +38,7 @@ class phpbb_test_case_helpers
 		// Copy our ext/ files from the test case to the board
 		foreach ($fixtures as $fixture)
 		{
-			$this->copied_files = array_merge($this->copied_files, $this->copy_dir($fixtures_dir . 'ext/' . $fixture, $phpbb_root_path . 'ext/' . $fixture));
+			$this->copied_files = array_merge($this->copied_files, $this->copy_dir($fixtures_dir . $fixture, $phpbb_root_path . 'ext/' . $fixture));
 		}
 	}