aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/functional/extension_acp_test.php8
-rw-r--r--tests/functional/extension_controller_test.php8
-rw-r--r--tests/functional/extension_module_test.php8
-rw-r--r--tests/functional/extension_permission_lang_test.php8
-rw-r--r--tests/functional/metadata_manager_test.php8
-rw-r--r--tests/test_framework/phpbb_test_case_helpers.php8
6 files changed, 8 insertions, 40 deletions
diff --git a/tests/functional/extension_acp_test.php b/tests/functional/extension_acp_test.php
index 5f8e3762a6..b36f2c6aac 100644
--- a/tests/functional/extension_acp_test.php
+++ b/tests/functional/extension_acp_test.php
@@ -18,10 +18,6 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case
'',
);
- /**
- * 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()
{
parent::setUpBeforeClass();
@@ -30,10 +26,6 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case
self::$helper->copy_ext_fixtures(dirname(__FILE__) . '/../extension/ext/', self::$fixtures);
}
- /**
- * 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();
diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php
index ea5a51291d..9ddf1e3e5c 100644
--- a/tests/functional/extension_controller_test.php
+++ b/tests/functional/extension_controller_test.php
@@ -23,10 +23,6 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
'foo/bar/styles/prosilver/template/',
);
- /**
- * 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()
{
parent::setUpBeforeClass();
@@ -35,10 +31,6 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
self::$helper->copy_ext_fixtures(dirname(__FILE__) . '/fixtures/ext/', self::$fixtures);
}
- /**
- * 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();
diff --git a/tests/functional/extension_module_test.php b/tests/functional/extension_module_test.php
index e95f0b7e3f..12113bedac 100644
--- a/tests/functional/extension_module_test.php
+++ b/tests/functional/extension_module_test.php
@@ -23,10 +23,6 @@ class phpbb_functional_extension_module_test extends phpbb_functional_test_case
'',
);
- /**
- * 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()
{
parent::setUpBeforeClass();
@@ -35,10 +31,6 @@ class phpbb_functional_extension_module_test extends phpbb_functional_test_case
self::$helper->copy_ext_fixtures(dirname(__FILE__) . '/fixtures/ext/', self::$fixtures);
}
- /**
- * 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();
diff --git a/tests/functional/extension_permission_lang_test.php b/tests/functional/extension_permission_lang_test.php
index fe8ea95cf0..6c1720735c 100644
--- a/tests/functional/extension_permission_lang_test.php
+++ b/tests/functional/extension_permission_lang_test.php
@@ -20,10 +20,6 @@ class phpbb_functional_extension_permission_lang_test extends phpbb_functional_t
'foo/bar/language/en/',
);
- /**
- * 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()
{
parent::setUpBeforeClass();
@@ -32,10 +28,6 @@ class phpbb_functional_extension_permission_lang_test extends phpbb_functional_t
self::$helper->copy_ext_fixtures(dirname(__FILE__) . '/fixtures/ext/', self::$fixtures);
}
- /**
- * 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();
diff --git a/tests/functional/metadata_manager_test.php b/tests/functional/metadata_manager_test.php
index 9d36a41354..c55e7373ea 100644
--- a/tests/functional/metadata_manager_test.php
+++ b/tests/functional/metadata_manager_test.php
@@ -22,10 +22,6 @@ class phpbb_functional_metadata_manager_test extends phpbb_functional_test_case
'foo/bar/',
);
- /**
- * 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()
{
parent::setUpBeforeClass();
@@ -34,10 +30,6 @@ class phpbb_functional_metadata_manager_test extends phpbb_functional_test_case
self::$helper->copy_ext_fixtures(dirname(__FILE__) . '/fixtures/ext/', self::$fixtures);
}
- /**
- * 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();
diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index 367bd3b142..1b08f2368f 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -20,6 +20,10 @@ class phpbb_test_case_helpers
private $copied_files = array();
+ /**
+ * This should only be called once before the tests are run.
+ * This is used to copy the fixtures to the phpBB install
+ */
public function copy_ext_fixtures($fixtures_dir, $fixtures)
{
global $phpbb_root_path;
@@ -42,6 +46,10 @@ class phpbb_test_case_helpers
}
}
+ /**
+ * This should only be called once after the tests are run.
+ * This is used to remove the fixtures from the phpBB install
+ */
public function restore_original_ext_dir()
{
global $phpbb_root_path;