diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-03-02 11:37:58 -0600 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-03-02 11:37:58 -0600 |
| commit | 8415ae839cf699e043fe24ad91585dc419596ff8 (patch) | |
| tree | 9580efa06b52b15f64481af587cb723897263eff /tests | |
| parent | 39ca212e17e80d14dbbd20cf5542ab37f27bd217 (diff) | |
| download | forums-8415ae839cf699e043fe24ad91585dc419596ff8.tar forums-8415ae839cf699e043fe24ad91585dc419596ff8.tar.gz forums-8415ae839cf699e043fe24ad91585dc419596ff8.tar.bz2 forums-8415ae839cf699e043fe24ad91585dc419596ff8.tar.xz forums-8415ae839cf699e043fe24ad91585dc419596ff8.zip | |
[ticket/11386] Update tests with new constructors for ext.manager/migrator
PHPBB3-11386
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/dbal/migrator_test.php | 21 | ||||
| -rw-r--r-- | tests/extension/manager_test.php | 17 | ||||
| -rw-r--r-- | tests/extension/metadata_manager_test.php | 1 | ||||
| -rw-r--r-- | tests/test_framework/phpbb_functional_test_case.php | 17 |
4 files changed, 50 insertions, 6 deletions
diff --git a/tests/dbal/migrator_test.php b/tests/dbal/migrator_test.php index 9460e76f37..6fc08d51f8 100644 --- a/tests/dbal/migrator_test.php +++ b/tests/dbal/migrator_test.php @@ -44,7 +44,26 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case $tools = array( new phpbb_db_migration_tool_config($this->config), ); - $this->migrator = new phpbb_db_migrator($this->config, $this->db, $this->db_tools, 'phpbb_migrations', dirname(__FILE__) . '/../../phpBB/', 'php', 'phpbb_', $tools); + + $this->extension_manager = new phpbb_extension_manager( + new phpbb_mock_container_builder(), + $this->db, + $this->config, + 'phpbb_ext', + dirname(__FILE__) . '/../../phpBB/', + '.php', + null + ); + $this->migrator = new phpbb_db_migrator( + $this->config, + $this->db, + $this->db_tools, + $this->extension_manager, + 'phpbb_migrations', + dirname(__FILE__) . '/../../phpBB/', + 'php', + 'phpbb_', $tools + ); } public function test_update() diff --git a/tests/extension/manager_test.php b/tests/extension/manager_test.php index 9032afbd73..e9db928997 100644 --- a/tests/extension/manager_test.php +++ b/tests/extension/manager_test.php @@ -97,15 +97,28 @@ class phpbb_extension_manager_test extends phpbb_database_test_case $php_ext = 'php'; $table_prefix = 'phpbb_'; - return new phpbb_extension_manager( + $manager = new phpbb_extension_manager( new phpbb_mock_container_builder(), $db, $config, - new phpbb_db_migrator($config, $db, $db_tools, 'phpbb_migrations', $phpbb_root_path, $php_ext, $table_prefix, array()), 'phpbb_ext', dirname(__FILE__) . '/', '.' . $php_ext, ($with_cache) ? new phpbb_mock_cache() : null ); + $migrator = new phpbb_db_migrator( + $config, + $db, + $db_tools, + $manager, + 'phpbb_migrations', + $phpbb_root_path, + $php_ext, + $table_prefix, + array() + ); + $manager->set_migrator($migrator); + + return $manager; } } diff --git a/tests/extension/metadata_manager_test.php b/tests/extension/metadata_manager_test.php index cdea8d5258..7fb19b67e3 100644 --- a/tests/extension/metadata_manager_test.php +++ b/tests/extension/metadata_manager_test.php @@ -53,7 +53,6 @@ class metadata_manager_test extends phpbb_database_test_case new phpbb_mock_container_builder(), $this->db, $this->config, - new phpbb_db_migrator($this->config, $this->db, $this->db_tools, 'phpbb_migrations', $this->phpbb_root_path, $this->php_ext, $this->table_prefix, array()), 'phpbb_ext', $this->phpbb_root_path, $this->phpEx, diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index b570b464e6..ff358033b1 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -138,16 +138,29 @@ class phpbb_functional_test_case extends phpbb_test_case $db = $this->get_db(); $db_tools = new phpbb_db_tools($db); - return new phpbb_extension_manager( + $extension_manager = new phpbb_extension_manager( new phpbb_mock_container_builder(), $db, $config, - new phpbb_db_migrator($config, $db, $db_tools, self::$config['table_prefix'] . 'migrations', $phpbb_root_path, $php_ext, self::$config['table_prefix'], array()), self::$config['table_prefix'] . 'ext', dirname(__FILE__) . '/', '.' . $php_ext, $this->get_cache_driver() ); + $migrator = new phpbb_db_migrator( + $config, + $db, + $db_tools, + $manager, + self::$config['table_prefix'] . 'migrations', + $phpbb_root_path, + $php_ext, + self::$config['table_prefix'], + array() + ); + $extension_manager->set_migrator($migrator); + + return $extension_manager; } static protected function install_board() |