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/metadata_manager_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/metadata_manager_test.php')
-rw-r--r-- | tests/functional/metadata_manager_test.php | 24 |
1 files changed, 5 insertions, 19 deletions
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() |