1 files changed, 24 insertions, 23 deletions

diff --git a/tests/extension/metadata_manager_test.php b/tests/extension/metadata_manager_test.php
index ce7be0dea5..e5bd29092e 100644
--- a/tests/extension/metadata_manager_test.php
+++ b/tests/extension/metadata_manager_test.php
@@ -7,7 +7,7 @@
 *
 */
 
-class metadata_manager_test extends phpbb_database_test_case
+class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
 {
 	protected $class_loader;
 	protected $extension_manager;
@@ -34,22 +34,38 @@ class metadata_manager_test extends phpbb_database_test_case
 			'version'		=> '3.1.0',
 		));
 		$this->db = $this->new_dbal();
+		$this->db_tools = new phpbb_db_tools($this->db);
 		$this->phpbb_root_path = dirname(__FILE__) . '/';
-		$this->phpEx = '.php';
+		$this->phpEx = 'php';
 		$this->user = new phpbb_user();
+		$this->table_prefix = 'phpbb_';
 
-		$this->template = new phpbb_template(
+		$this->template = new phpbb_template_twig(
 			$this->phpbb_root_path,
 			$this->phpEx,
 			$this->config,
 			$this->user,
-			new phpbb_style_resource_locator(),
 			new phpbb_template_context()
 		);
 
+		$this->migrator = new phpbb_db_migrator(
+			$this->config,
+			$this->db,
+			$this->db_tools,
+			'phpbb_migrations',
+			$this->phpbb_root_path,
+			'php',
+			$this->table_prefix,
+			array()
+		);
+		$container = new phpbb_mock_container_builder();
+		$container->set('migrator', $migrator);
+
 		$this->extension_manager = new phpbb_extension_manager(
+			$container,
 			$this->db,
 			$this->config,
+			new phpbb_filesystem(),
 			'phpbb_ext',
 			$this->phpbb_root_path,
 			$this->phpEx,
@@ -401,31 +417,16 @@ class metadata_manager_test extends phpbb_database_test_case
 	* Get an instance of the metadata manager
 	*
 	* @param string $ext_name
-	* @return phpbb_extension_metadata_manager_test
+	* @return phpbb_mock_metadata_manager
 	*/
 	private function get_metadata_manager($ext_name)
 	{
-		return new phpbb_extension_metadata_manager_test(
+		return new phpbb_mock_metadata_manager(
 			$ext_name,
-			$this->db,
+			$this->config,
 			$this->extension_manager,
-			$this->phpbb_root_path,
-			$this->phpEx,
 			$this->template,
-			$this->config
+			$this->phpbb_root_path
 		);
 	}
 }
-
-class phpbb_extension_metadata_manager_test extends phpbb_extension_metadata_manager
-{
-	public function set_metadata($metadata)
-	{
-		$this->metadata = $metadata;
-	}
-
-	public function merge_metadata($metadata)
-	{
-		$this->metadata = array_merge($this->metadata, $metadata);
-	}
-}
\ No newline at end of file