diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-06 01:18:31 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-06 01:18:31 -0500 |
| commit | 2364d4b2172c9f54520f04001b29c517d7138b69 (patch) | |
| tree | ed4b6c409dc865fb2dad1e04631e2c2a4e5d81df /tests/test_framework/phpbb_database_test_case.php | |
| parent | b07ae3fe59c336c7880d5af40166a1a2413fede0 (diff) | |
| parent | 18bcb9f8042fe657db993c3e44cba48b27ec5627 (diff) | |
| download | forums-2364d4b2172c9f54520f04001b29c517d7138b69.tar forums-2364d4b2172c9f54520f04001b29c517d7138b69.tar.gz forums-2364d4b2172c9f54520f04001b29c517d7138b69.tar.bz2 forums-2364d4b2172c9f54520f04001b29c517d7138b69.tar.xz forums-2364d4b2172c9f54520f04001b29c517d7138b69.zip | |
Merge PR #1101 branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11219] Coding guidelines and naming consistency changes
[ticket/11219] Only update sequences that are affected by a fixture
[ticket/11219] Recreate Oracle sequences instead of altering them
[ticket/11219] Add unit test for inserting into a sequence column
[ticket/11219] Update sequence values after loading fixtures
Diffstat (limited to 'tests/test_framework/phpbb_database_test_case.php')
| -rw-r--r-- | tests/test_framework/phpbb_database_test_case.php | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php index 514619687a..b5076b92e9 100644 --- a/tests/test_framework/phpbb_database_test_case.php +++ b/tests/test_framework/phpbb_database_test_case.php @@ -13,6 +13,8 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test protected $test_case_helpers; + protected $fixture_xml_data; + public function __construct($name = NULL, array $data = array(), $dataName = '') { parent::__construct($name, $data, $dataName); @@ -28,6 +30,20 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test ); } + protected function setUp() + { + parent::setUp(); + + // Resynchronise tables if a fixture was loaded + if (isset($this->fixture_xml_data)) + { + $config = $this->get_database_config(); + $manager = $this->create_connection_manager($config); + $manager->connect(); + $manager->post_setup_synchronisation($this->fixture_xml_data); + } + } + public function createXMLDataSet($path) { $db_config = $this->get_database_config(); @@ -47,7 +63,9 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test $path = $meta_data['uri']; } - return parent::createXMLDataSet($path); + $this->fixture_xml_data = parent::createXMLDataSet($path); + + return $this->fixture_xml_data; } public function get_test_case_helpers() |