diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-06-08 17:02:31 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-06-08 17:07:35 +0200 |
| commit | a61ab1e5e4bbe786d3f500438bb0dd6ca395989e (patch) | |
| tree | 66edc87984c752091d0eb240a94a8955967fcdd1 /tests/functional/extension_module_test.php | |
| parent | c8ee6cb0c200b7e64ebbae11806f4daddfd8d93d (diff) | |
| download | forums-a61ab1e5e4bbe786d3f500438bb0dd6ca395989e.tar forums-a61ab1e5e4bbe786d3f500438bb0dd6ca395989e.tar.gz forums-a61ab1e5e4bbe786d3f500438bb0dd6ca395989e.tar.bz2 forums-a61ab1e5e4bbe786d3f500438bb0dd6ca395989e.tar.xz forums-a61ab1e5e4bbe786d3f500438bb0dd6ca395989e.zip | |
[ticket/11550] Use new functionality from the test case helpers
Instead of duplicating the extension copy code, it is now in the helpers.
So we remove the code from existing tests.
PHPBB3-11550
Diffstat (limited to 'tests/functional/extension_module_test.php')
| -rw-r--r-- | tests/functional/extension_module_test.php | 38 |
1 files changed, 8 insertions, 30 deletions
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() |