7 files changed, 99 insertions, 229 deletions
diff --git a/tests/extension/acp.php b/tests/extension/acp.php
deleted file mode 100644
index 790df77c0d..0000000000
--- a/tests/extension/acp.php
+++ /dev/null
@@ -1,205 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-class acp_test extends phpbb_functional_test_case
-{
-	static private $copied_files = array();
-	static private $helper;
-
-	/**
-	* This should only be called once before the tests are run.
-	* This is used to copy the extensions to the phpBB install
-	*/
-	static public function setUpBeforeClass()
-	{
-		global $phpbb_root_path;
-
-		parent::setUpBeforeClass();
-
-		self::$helper = new phpbb_test_case_helpers(self);
-
-		// First, move any extensions setup on the board to a temp directory
-		self::$copied_files = self::$helper->copy_dir($phpbb_root_path . 'ext/', $phpbb_root_path . 'store/temp_ext/');
-
-		// Then empty the ext/ directory on the board (for accurate test cases)
-		self::$helper->empty_dir($phpbb_root_path . 'ext/');
-
-		// Copy our ext/ files from the test case to the board
-		self::$copied_files = array_merge(self::$copied_files, self::$helper->copy_dir(dirname(__FILE__) . '/ext/', $phpbb_root_path . 'ext/'));
-	}
-
-	public function setUp()
-	{
-		parent::setUp();
-
-		$this->get_db();
-
-		// Clear the phpbb_ext table
-		$this->db->sql_query('DELETE FROM phpbb_ext');
-
-		// Insert our base data
-		$insert_rows = array(
-			array(
-				'ext_name'		=> 'foo',
-				'ext_active'	=> true,
-				'ext_state'		=> 'b:0;',
-			),
-			array(
-				'ext_name'		=> 'vendor/moo',
-				'ext_active'	=> false,
-				'ext_state'		=> 'b:0;',
-			),
-
-			// do not exist
-			array(
-				'ext_name'		=> 'test2',
-				'ext_active'	=> true,
-				'ext_state'		=> 'b:0;',
-			),
-			array(
-				'ext_name'		=> 'test3',
-				'ext_active'	=> false,
-				'ext_state'		=> 'b:0;',
-			),
-		);
-		$this->db->sql_multi_insert('phpbb_ext', $insert_rows);
-
-		$this->login();
-		$this->admin_login();
-
-		$this->add_lang('acp/extensions');
-	}
-
-	/**
-	* This should only be called once after the tests are run.
-	* This is used to remove the files copied to the phpBB install
-	*/
-	static public function tearDownAfterClass()
-	{
-		global $phpbb_root_path;
-
-		// Copy back the board installed extensions from the temp directory
-		self::$helper->copy_dir($phpbb_root_path . 'store/temp_ext/', $phpbb_root_path . 'ext/');
-
-		self::$copied_files[] = $phpbb_root_path . 'store/temp_ext/';
-
-		// Remove all of the files we copied around (from board ext -> temp_ext, from test ext -> board ext)
-		self::$helper->remove_files(self::$copied_files);
-	}
-
-	public function test_list()
-	{
-        $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid);
-
-        $this->assertCount(1, $crawler->filter('.ext_enabled'));
-        $this->assertCount(4, $crawler->filter('.ext_disabled'));
-
-        $this->assertContains('phpBB Foo Extension', $crawler->filter('.ext_enabled')->eq(0)->text());
-        $this->assertContainsLang('PURGE', $crawler->filter('.ext_enabled')->eq(0)->text());
-
-        $this->assertContains('The "test2" extension is not valid.', $crawler->filter('.ext_disabled')->eq(0)->text());
-
-        $this->assertContains('The "test3" extension is not valid.', $crawler->filter('.ext_disabled')->eq(1)->text());
-
-        $this->assertContains('phpBB Moo Extension', $crawler->filter('.ext_disabled')->eq(2)->text());
-        $this->assertContainsLang('DETAILS', $crawler->filter('.ext_disabled')->eq(2)->text());
-        $this->assertContainsLang('ENABLE', $crawler->filter('.ext_disabled')->eq(2)->text());
-        $this->assertContainsLang('PURGE', $crawler->filter('.ext_disabled')->eq(2)->text());
-
-        $this->assertContains('The "bar" extension is not valid.', $crawler->filter('.ext_disabled')->eq(3)->text());
-	}
-
-	public function test_details()
-	{
-        $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=details&ext_name=foo&sid=' . $this->sid);
-
-        $validation = array(
-        	'DISPLAY_NAME'		=> 'phpBB Foo Extension',
-        	'CLEAN_NAME'		=> 'foo/example',
-        	'DESCRIPTION'		=> 'An example/sample extension to be used for testing purposes in phpBB Development.',
-        	'VERSION'	  		=> '1.0.0',
-        	'TIME'				=> '2012-02-15 01:01:01',
-        	'LICENCE'			=> 'GPL-2.0',
-        	'PHPBB_VERSION'		=> '3.1.0-dev',
-        	'PHP_VERSION'		=> '>=5.3',
-        	'AUTHOR_NAME'		=> 'Nathan Guse',
-        	'AUTHOR_EMAIL'		=> 'email@phpbb.com',
-        	'AUTHOR_HOMEPAGE'	=> 'http://lithiumstudios.org',
-        	'AUTHOR_ROLE'		=> 'N/A',
-        );
-
-        for ($i = 0; $i < $crawler->filter('dl')->count(); $i++)
-        {
-        	$text = $crawler->filter('dl')->eq($i)->text();
-
-        	$match = false;
-
-        	foreach ($validation as $language_key => $expected)
-        	{
-        		if (strpos($text, $this->lang($language_key)) === 0)
-        		{
-        			$match = true;
-
-        			$this->assertContains($expected, $text);
-				}
-			}
-
-			if (!$match)
-			{
-				$this->fail('Unexpected field: "' . $text . '"');
-			}
-		}
-	}
-
-	public function test_enable_pre()
-	{
-		// Foo is already enabled (redirect to list)
-        $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=enable_pre&ext_name=foo&sid=' . $this->sid);
-        $this->assertContainsLang('EXTENSION_NAME', $crawler->filter('html')->text());
-        $this->assertContainsLang('EXTENSION_OPTIONS', $crawler->filter('html')->text());
-        $this->assertContainsLang('EXTENSION_ACTIONS', $crawler->filter('html')->text());
-
-        $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=enable_pre&ext_name=vendor%2Fmoo&sid=' . $this->sid);
-        $this->assertContainsLang('ENABLE_CONFIRM', $crawler->filter('html')->text());
-	}
-
-	public function test_disable_pre()
-	{
-        // Moo is not enabled (redirect to list)
-        $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=disable_pre&ext_name=vendor%2Fmoo&sid=' . $this->sid);
-        $this->assertContainsLang('EXTENSION_NAME', $crawler->filter('html')->text());
-        $this->assertContainsLang('EXTENSION_OPTIONS', $crawler->filter('html')->text());
-        $this->assertContainsLang('EXTENSION_ACTIONS', $crawler->filter('html')->text());
-
-        $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=disable_pre&ext_name=foo&sid=' . $this->sid);
-        $this->assertContainsLang('DISABLE_CONFIRM', $crawler->filter('html')->text());
-	}
-
-	public function test_purge_pre()
-	{
-        // test2 is not available (error)
-        $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=purge_pre&ext_name=test2&sid=' . $this->sid);
-        $this->assertContains('The required file does not exist', $crawler->filter('html')->text());
-
-        $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=purge_pre&ext_name=foo&sid=' . $this->sid);
-        $this->assertContainsLang('PURGE_CONFIRM', $crawler->filter('html')->text());
-	}
-
-	public function test_actions()
-	{
-        $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=enable&ext_name=vendor%2Fmoo&sid=' . $this->sid);
-        $this->assertContainsLang('ENABLE_SUCCESS', $crawler->filter('html')->text());
-
-        $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=disable&ext_name=vendor%2Fmoo&sid=' . $this->sid);
-        $this->assertContainsLang('DISABLE_SUCCESS', $crawler->filter('html')->text());
-
-        $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=purge&ext_name=vendor%2Fmoo&sid=' . $this->sid);
-        $this->assertContainsLang('PURGE_SUCCESS', $crawler->filter('html')->text());
-	}
-}
-\ No newline at end of file
diff --git a/tests/extension/ext/bar/styles/prosilver/template/foobar_body.html b/tests/extension/ext/bar/styles/prosilver/template/foobar_body.html
new file mode 100644
index 0000000000..00c2a84a18
--- /dev/null
+++ b/tests/extension/ext/bar/styles/prosilver/template/foobar_body.html
@@ -0,0 +1 @@
+bertie rules!
diff --git a/tests/extension/finder_test.php b/tests/extension/finder_test.php
index c96b11a73c..dc3e26be02 100644
--- a/tests/extension/finder_test.php
+++ b/tests/extension/finder_test.php
@@ -6,6 +6,7 @@
 * @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_finder_test extends phpbb_test_case
 {
@@ -66,7 +67,7 @@ class phpbb_extension_finder_test extends phpbb_test_case
 	public function test_prefix_get_directories()
 	{
 		$dirs = $this->finder
-            ->prefix('t')
+            ->prefix('ty')
 			->get_directories();
 
 		sort($dirs);
@@ -142,13 +143,28 @@ class phpbb_extension_finder_test extends phpbb_test_case
 		);
 	}
 
+	public function test_uncleansub_directory_get_classes()
+	{
+		$classes = $this->finder
+			->directory('/sub/../sub/type')
+			->get_classes();
+
+		sort($classes);
+		$this->assertEquals(
+			array(
+				'phpbb_ext_foo_sub_type_alternative',
+			),
+			$classes
+		);
+	}
+
 	/**
 	* These do not work because of changes with PHPBB3-11386
 	* They do not seem neccessary to me, so I am commenting them out for now
 	public function test_get_classes_create_cache()
 	{
 		$cache = new phpbb_mock_cache;
-		$finder = new phpbb_extension_finder($this->extension_manager, dirname(__FILE__) . '/', $cache, '.php', '_custom_cache_name');
+		$finder = new phpbb_extension_finder($this->extension_manager, new phpbb_filesystem(), dirname(__FILE__) . '/', $cache, 'php', '_custom_cache_name');
 		$files = $finder->suffix('_class.php')->get_files();
 
 		$expected_files = array(
@@ -188,6 +204,7 @@ class phpbb_extension_finder_test extends phpbb_test_case
 
 		$finder = new phpbb_extension_finder(
 			$this->extension_manager,
+			new phpbb_filesystem(),
 			dirname(__FILE__) . '/',
 			new phpbb_mock_cache(array(
 				'_ext_finder' => array(
diff --git a/tests/extension/manager_test.php b/tests/extension/manager_test.php
index 1f311116f4..106f078691 100644
--- a/tests/extension/manager_test.php
+++ b/tests/extension/manager_test.php
@@ -112,9 +112,10 @@ class phpbb_extension_manager_test extends phpbb_database_test_case
 			$db,
 			$config,
 			$migrator,
+			new phpbb_filesystem(),
 			'phpbb_ext',
 			dirname(__FILE__) . '/',
-			'.' . $php_ext,
+			$php_ext,
 			($with_cache) ? new phpbb_mock_cache() : null
 		);
 	}
diff --git a/tests/extension/metadata_manager_test.php b/tests/extension/metadata_manager_test.php
index 081a32e277..2f38a26217 100644
--- a/tests/extension/metadata_manager_test.php
+++ b/tests/extension/metadata_manager_test.php
@@ -7,7 +7,9 @@
 *
 */
 
-class metadata_manager_test extends phpbb_database_test_case
+require_once dirname(__FILE__) . '/../../phpBB/includes/db/db_tools.php';
+
+class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
 {
 	protected $class_loader;
 	protected $extension_manager;
@@ -36,7 +38,7 @@ class metadata_manager_test extends phpbb_database_test_case
 		$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_';
 
@@ -64,6 +66,7 @@ class metadata_manager_test extends phpbb_database_test_case
 			$this->db,
 			$this->config,
 			$this->migrator,
+			new phpbb_filesystem(),
 			'phpbb_ext',
 			$this->phpbb_root_path,
 			$this->phpEx,
@@ -415,31 +418,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
diff --git a/tests/extension/style_path_provider_test.php b/tests/extension/style_path_provider_test.php
new file mode 100644
index 0000000000..e1021c20ac
--- /dev/null
+++ b/tests/extension/style_path_provider_test.php
@@ -0,0 +1,50 @@
+<?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
new file mode 100644
index 0000000000..1b5ce62e5f
--- /dev/null
+++ b/tests/extension/subdir/style_path_provider_test.php
@@ -0,0 +1,18 @@
+<?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__) . '/../';
+	}
+}