diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-10-14 17:24:03 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-10-14 17:24:03 +0200 |
| commit | 207a73537b2bb7f4608509f3ec79aaa313608ccb (patch) | |
| tree | 0bfdefa599ff24a51e9063619e513ab2ebcbd19a /tests/test_framework/phpbb_database_test_case.php | |
| parent | 37d9e7e30c3edbd14bb4e0f098ce676f1d7fe07b (diff) | |
| parent | a8aa7fd6c094dcba20c45c6e81928c5a6942c48b (diff) | |
| download | forums-207a73537b2bb7f4608509f3ec79aaa313608ccb.tar forums-207a73537b2bb7f4608509f3ec79aaa313608ccb.tar.gz forums-207a73537b2bb7f4608509f3ec79aaa313608ccb.tar.bz2 forums-207a73537b2bb7f4608509f3ec79aaa313608ccb.tar.xz forums-207a73537b2bb7f4608509f3ec79aaa313608ccb.zip | |
Merge remote-tracking branch 'naderman/feature/functional-tests' into develop
* naderman/feature/functional-tests:
[feature/functional-tests] Don't add elements to backup list twice
[feature/functional-tests] Generate config correctly and install only once
[feature/functional-tests] Configure functional tests through config file
[feature/functional-tests] Implementing functional test framework with goutte
Diffstat (limited to 'tests/test_framework/phpbb_database_test_case.php')
| -rw-r--r-- | tests/test_framework/phpbb_database_test_case.php | 42 |
1 files changed, 5 insertions, 37 deletions
diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php index e1b368dcea..b1484450b8 100644 --- a/tests/test_framework/phpbb_database_test_case.php +++ b/tests/test_framework/phpbb_database_test_case.php @@ -40,46 +40,14 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test public function get_database_config() { - if (isset($_SERVER['PHPBB_TEST_DBMS'])) - { - return array( - 'dbms' => isset($_SERVER['PHPBB_TEST_DBMS']) ? $_SERVER['PHPBB_TEST_DBMS'] : '', - 'dbhost' => isset($_SERVER['PHPBB_TEST_DBHOST']) ? $_SERVER['PHPBB_TEST_DBHOST'] : '', - 'dbport' => isset($_SERVER['PHPBB_TEST_DBPORT']) ? $_SERVER['PHPBB_TEST_DBPORT'] : '', - 'dbname' => isset($_SERVER['PHPBB_TEST_DBNAME']) ? $_SERVER['PHPBB_TEST_DBNAME'] : '', - 'dbuser' => isset($_SERVER['PHPBB_TEST_DBUSER']) ? $_SERVER['PHPBB_TEST_DBUSER'] : '', - 'dbpasswd' => isset($_SERVER['PHPBB_TEST_DBPASSWD']) ? $_SERVER['PHPBB_TEST_DBPASSWD'] : '', - ); - } - else if (file_exists(dirname(__FILE__) . '/../test_config.php')) - { - include(dirname(__FILE__) . '/../test_config.php'); - - return array( - 'dbms' => $dbms, - 'dbhost' => $dbhost, - 'dbport' => $dbport, - 'dbname' => $dbname, - 'dbuser' => $dbuser, - 'dbpasswd' => $dbpasswd, - ); - } - else if (extension_loaded('sqlite') && version_compare(PHPUnit_Runner_Version::id(), '3.4.15', '>=')) - { - // Silently use sqlite - return array( - 'dbms' => 'sqlite', - 'dbhost' => dirname(__FILE__) . '/../phpbb_unit_tests.sqlite2', // filename - 'dbport' => '', - 'dbname' => '', - 'dbuser' => '', - 'dbpasswd' => '', - ); - } - else + $config = phpbb_test_case_helpers::get_test_config(); + + if (!isset($config['dbms'])) { $this->markTestSkipped('Missing test_config.php: See first error.'); } + + return $config; } public function getConnection() |