5 files changed, 4 insertions, 74 deletions
diff --git a/tests/extension/finder_test.php b/tests/extension/finder_test.php
index 6f3cebbd7c..3bf2c42573 100644
--- a/tests/extension/finder_test.php
+++ b/tests/extension/finder_test.php
@@ -36,7 +36,7 @@ class phpbb_extension_finder_test extends phpbb_test_case
 	public function test_suffix_get_classes()
 	{
 		$classes = $this->finder
-			->core_path('includes/default/')
+			->core_path('phpbb/default/')
 			->extension_suffix('_class')
 			->get_classes();
 
@@ -81,7 +81,7 @@ class phpbb_extension_finder_test extends phpbb_test_case
 	public function test_prefix_get_classes()
 	{
 		$classes = $this->finder
-			->core_path('includes/default/')
+			->core_path('phpbb/default/')
 			->extension_prefix('hidden_')
 			->get_classes();
 
@@ -98,7 +98,7 @@ class phpbb_extension_finder_test extends phpbb_test_case
 	public function test_directory_get_classes()
 	{
 		$classes = $this->finder
-			->core_path('includes/default/')
+			->core_path('phpbb/default/')
 			->extension_directory('type')
 			->get_classes();
 
@@ -209,7 +209,7 @@ class phpbb_extension_finder_test extends phpbb_test_case
 	public function test_cached_get_files()
 	{
 		$query = array(
-			'core_path' => 'includes/foo',
+			'core_path' => 'phpbb/foo',
 			'core_suffix' => false,
 			'core_prefix' => false,
 			'core_directory' => 'bar',
diff --git a/tests/extension/metadata_manager_test.php b/tests/extension/metadata_manager_test.php
index bd88f396d9..e5bd29092e 100644
--- a/tests/extension/metadata_manager_test.php
+++ b/tests/extension/metadata_manager_test.php
@@ -7,8 +7,6 @@
 *
 */
 
-require_once dirname(__FILE__) . '/../../phpBB/includes/db/db_tools.php';
-
 class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
 {
 	protected $class_loader;
diff --git a/tests/extension/includes/default/implementation.php b/tests/extension/phpbb/default/implementation.php
index 91d5f8aa2f..91d5f8aa2f 100644
--- a/tests/extension/includes/default/implementation.php
+++ b/tests/extension/phpbb/default/implementation.php
diff --git a/tests/extension/style_path_provider_test.php b/tests/extension/style_path_provider_test.php
deleted file mode 100644
index e1021c20ac..0000000000
--- a/tests/extension/style_path_provider_test.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
-
-class phpbb_extension_style_path_provider_test extends phpbb_test_case
-{
-	protected $relative_root_path;
-	protected $root_path;
-
-	public function setUp()
-	{
-		$this->relative_root_path = './';
-		$this->root_path = dirname(__FILE__) . '/';
-	}
-
-	public function test_find()
-	{
-		$phpbb_style_path_provider = new phpbb_style_path_provider();
-		$phpbb_style_path_provider->set_styles(array($this->relative_root_path . 'styles/prosilver'));
-		$phpbb_style_extension_path_provider = new phpbb_style_extension_path_provider(new phpbb_mock_extension_manager(
-			$this->root_path,
-			array(
-				'foo' => array(
-					'ext_name' => 'foo',
-					'ext_active' => '1',
-					'ext_path' => 'ext/foo/',
-				),
-				'bar' => array(
-					'ext_name' => 'bar',
-					'ext_active' => '1',
-					'ext_path' => 'ext/bar/',
-				),
-			)), $phpbb_style_path_provider, $this->relative_root_path);
-
-		$this->assertEquals(array(
-			'style' => array(
-				$this->relative_root_path . 'styles/prosilver',
-			),
-			'bar' => array(
-				$this->root_path . 'ext/bar/styles/prosilver',
-			),
-		), $phpbb_style_extension_path_provider->find());
-	}
-}
diff --git a/tests/extension/subdir/style_path_provider_test.php b/tests/extension/subdir/style_path_provider_test.php
deleted file mode 100644
index 1b5ce62e5f..0000000000
--- a/tests/extension/subdir/style_path_provider_test.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-require_once dirname(__FILE__) . '/../style_path_provider_test.php';
-
-class phpbb_extension_subdir_style_path_provider_test extends phpbb_extension_style_path_provider_test
-{
-	public function setUp()
-	{
-		$this->relative_root_path = '../';
-		$this->root_path = dirname(__FILE__) . '/../';
-	}
-}