3 files changed, 52 insertions, 8 deletions
diff --git a/tests/controller/helper_route_test.php b/tests/controller/helper_route_test.php
index df0794a047..621efaa830 100644
--- a/tests/controller/helper_route_test.php
+++ b/tests/controller/helper_route_test.php
@@ -42,12 +42,12 @@ class phpbb_controller_helper_route_test extends phpbb_test_case
 			)
 		);
 
-		$finder = new \phpbb\extension\finder(
-			$this->extension_manager,
+		$finder = new \phpbb\finder(
 			new \phpbb\filesystem(),
 			dirname(__FILE__) . '/',
 			new phpbb_mock_cache()
 		);
+		$finder->set_extensions(array_keys($this->extension_manager->all_enabled()));
 		$this->provider = new \phpbb\controller\provider();
 		$this->provider->find_routing_files($finder);
 		$this->provider->find(dirname(__FILE__) . '/');
diff --git a/tests/extension/finder_test.php b/tests/extension/finder_test.php
index 8cc5146b33..2116cc057b 100644
--- a/tests/extension/finder_test.php
+++ b/tests/extension/finder_test.php
@@ -14,7 +14,9 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 
 class phpbb_extension_finder_test extends phpbb_test_case
 {
+	/** @var \phpbb\extension\manager */
 	protected $extension_manager;
+	/** @var \phpbb\finder */
 	protected $finder;
 
 	public function setUp()
@@ -56,6 +58,47 @@ class phpbb_extension_finder_test extends phpbb_test_case
 		);
 	}
 
+	public function set_extensions_data()
+	{
+		return array(
+			array(
+				array(),
+				array('\phpbb\default\implementation'),
+			),
+			array(
+				array('vendor3/bar'),
+				array(
+					'\phpbb\default\implementation',
+					'\vendor3\bar\my\hidden_class',
+				),
+			),
+			array(
+				array('vendor2/foo', 'vendor3/bar'),
+				array(
+					'\phpbb\default\implementation',
+					'\vendor2\foo\a_class',
+					'\vendor2\foo\b_class',
+					'\vendor3\bar\my\hidden_class',
+				),
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider set_extensions_data
+	 */
+	public function test_set_extensions($extensions, $expected)
+	{
+		$classes = $this->finder
+			->set_extensions($extensions)
+			->core_path('phpbb/default/')
+			->extension_suffix('_class')
+			->get_classes();
+
+		sort($classes);
+		$this->assertEquals($expected, $classes);
+	}
+
 	public function test_get_directories()
 	{
 		$dirs = $this->finder
@@ -201,7 +244,8 @@ class phpbb_extension_finder_test extends phpbb_test_case
 	public function test_get_classes_create_cache()
 	{
 		$cache = new phpbb_mock_cache;
-		$finder = new \phpbb\extension\finder($this->extension_manager, new \phpbb\filesystem(), dirname(__FILE__) . '/', $cache, 'php', '_custom_cache_name');
+		$finder = new \phpbb\finder(new \phpbb\filesystem(), dirname(__FILE__) . '/', $cache, 'php', '_custom_cache_name');
+		$finder->set_extensions(array_keys($this->extension_manager->all_enabled()));
 		$files = $finder->suffix('_class.php')->get_files();
 
 		$expected_files = array(
@@ -239,8 +283,7 @@ class phpbb_extension_finder_test extends phpbb_test_case
 			'is_dir' => false,
 		);
 
-		$finder = new \phpbb\extension\finder(
-			$this->extension_manager,
+		$finder = new \phpbb\finder(
 			new \phpbb\filesystem(),
 			dirname(__FILE__) . '/',
 			new phpbb_mock_cache(array(
@@ -249,6 +292,7 @@ class phpbb_extension_finder_test extends phpbb_test_case
 				),
 			))
 		);
+		$finder->set_extensions(array_keys($this->extension_manager->all_enabled()));
 
 		$classes = $finder
 			->core_path($query['core_path'])
diff --git a/tests/pagination/pagination_test.php b/tests/pagination/pagination_test.php
index e233264cc6..f253118253 100644
--- a/tests/pagination/pagination_test.php
+++ b/tests/pagination/pagination_test.php
@@ -35,16 +35,16 @@ class phpbb_pagination_pagination_test extends phpbb_template_template_test_case
 			->will($this->returnCallback(array($this, 'return_callback_implode')));
 
 		$manager = new phpbb_mock_extension_manager(dirname(__FILE__) . '/', array());
-		$this->finder = new \phpbb\extension\finder(
-			$manager,
+		$finder = new \phpbb\finder(
 			new \phpbb\filesystem(),
 			dirname(__FILE__) . '/',
 			new phpbb_mock_cache()
 		);
+		$finder->set_extensions(array_keys($manager->all_enabled()));
 
 		$this->config = new \phpbb\config\config(array('enable_mod_rewrite' => '1'));
 		$provider = new \phpbb\controller\provider();
-		$provider->find_routing_files($this->finder);
+		$provider->find_routing_files($finder);
 		$provider->find(dirname(__FILE__) . '/');
 		$this->helper = new phpbb_mock_controller_helper($this->template, $this->user, $this->config, $provider, $manager, '', 'php', dirname(__FILE__) . '/');
 		$this->pagination = new \phpbb\pagination($this->template, $this->user, $this->helper);