11 files changed, 103 insertions, 46 deletions
diff --git a/tests/dbal/migrator_test.php b/tests/dbal/migrator_test.php
index 89669b85ec..ae4099e6f8 100644
--- a/tests/dbal/migrator_test.php
+++ b/tests/dbal/migrator_test.php
@@ -60,6 +60,7 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case
 			$this->db,
 			$this->config,
 			$this->migrator,
+			new phpbb_filesystem(),
 			'phpbb_ext',
 			dirname(__FILE__) . '/../../phpBB/',
 			'.php',
@@ -144,15 +145,8 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case
 			$this->migrator->update();
 		}
 
-		if ($migrator_test_if_true_failed)
-		{
-			$this->fail('True test failed');
-		}
-
-		if ($migrator_test_if_false_failed)
-		{
-			$this->fail('False test failed');
-		}
+		$this->assertFalse($migrator_test_if_true_failed, 'True test failed');
+		$this->assertFalse($migrator_test_if_false_failed, 'False test failed');
 	}
 
 	public function test_recall()
diff --git a/tests/extension/finder_test.php b/tests/extension/finder_test.php
index c2ac88a76a..4c99ba6343 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
 {
@@ -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..d6bcb97586 100644
--- a/tests/extension/manager_test.php
+++ b/tests/extension/manager_test.php
@@ -112,6 +112,7 @@ class phpbb_extension_manager_test extends phpbb_database_test_case
 			$db,
 			$config,
 			$migrator,
+			new phpbb_filesystem(),
 			'phpbb_ext',
 			dirname(__FILE__) . '/',
 			'.' . $php_ext,
diff --git a/tests/extension/metadata_manager_test.php b/tests/extension/metadata_manager_test.php
index 081a32e277..df7817b479 100644
--- a/tests/extension/metadata_manager_test.php
+++ b/tests/extension/metadata_manager_test.php
@@ -64,6 +64,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,
diff --git a/tests/functions/clean_path_test.php b/tests/filesystem/clean_path_test.php
index bcbe9838d9..50951fc88c 100644
--- a/tests/functions/clean_path_test.php
+++ b/tests/filesystem/clean_path_test.php
@@ -7,11 +7,17 @@
 *
 */
 
-require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
-
-class phpbb_clean_path_test extends phpbb_test_case
+class phpbb_filesystem_clean_path_test extends phpbb_test_case
 {
-	public function clean_path_test_data()
+	protected $filesystem;
+
+	public function setUp()
+	{
+		parent::setUp();
+		$this->filesystem = new phpbb_filesystem();
+	}
+
+	public function clean_path_data()
 	{
 		return array(
 			array('foo', 'foo'),
@@ -33,12 +39,10 @@ class phpbb_clean_path_test extends phpbb_test_case
 	}
 
 	/**
-	* @dataProvider clean_path_test_data
+	* @dataProvider clean_path_data
 	*/
 	public function test_clean_path($input, $expected)
 	{
-		$output = phpbb_clean_path($input);
-
-		$this->assertEquals($expected, $output);
+		$this->assertEquals($expected, $this->filesystem->clean_path($input));
 	}
 }
diff --git a/tests/extension/acp.php b/tests/functional/extension_acp_test.php
index 790df77c0d..1879cbd62c 100644
--- a/tests/extension/acp.php
+++ b/tests/functional/extension_acp_test.php
@@ -7,7 +7,10 @@
 *
 */
 
-class acp_test extends phpbb_functional_test_case
+/**
+* @group functional
+*/
+class phpbb_functional_extension_acp_test extends phpbb_functional_test_case
 {
 	static private $copied_files = array();
 	static private $helper;
@@ -24,14 +27,19 @@ class acp_test extends phpbb_functional_test_case
 
 		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/');
+		self::$copied_files = array();
 
-		// Then empty the ext/ directory on the board (for accurate test cases)
-		self::$helper->empty_dir($phpbb_root_path . 'ext/');
+		if (file_exists($phpbb_root_path . 'ext/'))
+		{
+			// 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/'));
+		self::$copied_files = array_merge(self::$copied_files, self::$helper->copy_dir(dirname(__FILE__) . '/../extension/ext/', $phpbb_root_path . 'ext/'));
 	}
 
 	public function setUp()
@@ -84,13 +92,19 @@ class acp_test extends phpbb_functional_test_case
 	{
 		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/';
+		if (file_exists($phpbb_root_path . 'store/temp_ext/'))
+		{
+			// Copy back the board installed extensions from the temp directory
+			self::$helper->copy_dir($phpbb_root_path . 'store/temp_ext/', $phpbb_root_path . '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);
+
+		if (file_exists($phpbb_root_path . 'store/temp_ext/'))
+		{
+			self::$helper->empty_dir($phpbb_root_path . 'store/temp_ext/');
+		}
 	}
 
 	public function test_list()
diff --git a/tests/functional/memberlist_test.php b/tests/functional/memberlist_test.php
index 66e3591f21..92ede8bd04 100644
--- a/tests/functional/memberlist_test.php
+++ b/tests/functional/memberlist_test.php
@@ -41,38 +41,59 @@ class phpbb_functional_memberlist_test extends phpbb_functional_test_case
 		$this->assertContains('admin', $crawler->filter('h2')->text());
 	}
 
+	protected function get_memberlist_leaders_table_crawler()
+	{
+		$crawler = $this->request('GET', 'memberlist.php?mode=leaders&sid=' . $this->sid);
+		$this->assert_response_success();
+
+		return $crawler->filter('.forumbg-table');
+	}
+
 	public function test_leaders()
 	{
 		$this->login();
 		$this->create_user('memberlist-test-moderator');
 
-		// Admin should be listed, user not
-		$crawler = $this->request('GET', 'memberlist.php?mode=leaders&sid=' . $this->sid);
-		$this->assert_response_success();
-		$this->assertContains('admin', $crawler->text());
-		$this->assertNotContains('memberlist-test-user', $crawler->text());
-		$this->assertNotContains('memberlist-test-moderator', $crawler->text());
+		$crawler = $this->get_memberlist_leaders_table_crawler();
+
+		// Admin in admin group, but not in moderators
+		$this->assertContains('admin', $crawler->eq(0)->text());
+		$this->assertNotContains('admin', $crawler->eq(1)->text());
+
+		// memberlist-test-user in neither group
+		$this->assertNotContains('memberlist-test-user', $crawler->eq(0)->text());
+		$this->assertNotContains('memberlist-test-user', $crawler->eq(1)->text());
+
+		// memberlist-test-moderator in neither group
+		$this->assertNotContains('memberlist-test-moderator', $crawler->eq(0)->text());
+		$this->assertNotContains('memberlist-test-moderator', $crawler->eq(1)->text());
 	}
 
 	public function test_leaders_remove_users()
 	{
 		$this->login();
 
-		// Remove admin from admins
+		// Remove admin from admins, but is now in moderators
 		$this->remove_user_group('ADMINISTRATORS', array('admin'));
-		$crawler = $this->request('GET', 'memberlist.php?mode=leaders&sid=' . $this->sid);
-		$this->assert_response_success();
-		$this->assertContains('admin', $crawler->text());
+		$crawler = $this->get_memberlist_leaders_table_crawler();
+		$this->assertNotContains('admin', $crawler->eq(0)->text());
+		$this->assertContains('admin', $crawler->eq(1)->text());
+
+		// Remove admin from moderators, should not be visible anymore
+		$this->remove_user_group('GLOBAL_MODERATORS', array('admin'));
+		$crawler = $this->get_memberlist_leaders_table_crawler();
+		$this->assertNotContains('admin', $crawler->eq(0)->text());
+		$this->assertNotContains('admin', $crawler->eq(1)->text());
 	}
 
 	public function test_leaders_add_users()
 	{
 		$this->login();
 
-		// Add mod to moderators
+		// Add memberlist-test-moderator to moderators
 		$this->add_user_group('GLOBAL_MODERATORS', array('memberlist-test-moderator'));
-		$crawler = $this->request('GET', 'memberlist.php?mode=leaders&sid=' . $this->sid);
-		$this->assert_response_success();
-		$this->assertContains('memberlist-test-moderator', $crawler->text());
+		$crawler = $this->get_memberlist_leaders_table_crawler();
+		$this->assertNotContains('memberlist-test-moderator', $crawler->eq(0)->text());
+		$this->assertContains('memberlist-test-moderator', $crawler->eq(1)->text());
 	}
 }
diff --git a/tests/log/function_add_log_test.php b/tests/log/function_add_log_test.php
index 864b364862..7aa42be6df 100644
--- a/tests/log/function_add_log_test.php
+++ b/tests/log/function_add_log_test.php
@@ -16,7 +16,7 @@ class phpbb_log_function_add_log_test extends phpbb_database_test_case
 		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/empty_log.xml');
 	}
 
-	public static function test_add_log_function_data()
+	public static function add_log_function_data()
 	{
 		return array(
 			/**
@@ -138,7 +138,7 @@ class phpbb_log_function_add_log_test extends phpbb_database_test_case
 	}
 
 	/**
-	* @dataProvider test_add_log_function_data
+	* @dataProvider add_log_function_data
 	*/
 	public function test_add_log_function($expected, $user_id, $mode, $required1, $additional1 = null, $additional2 = null, $additional3 = null)
 	{
diff --git a/tests/log/function_view_log_test.php b/tests/log/function_view_log_test.php
index 2ecf77aeb8..1ab9488568 100644
--- a/tests/log/function_view_log_test.php
+++ b/tests/log/function_view_log_test.php
@@ -22,7 +22,7 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case
 		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/full_log.xml');
 	}
 
-	public static function test_view_log_function_data()
+	public static function view_log_function_data()
 	{
 		global $phpEx, $phpbb_dispatcher;
 		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
@@ -296,7 +296,7 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case
 	}
 
 	/**
-	* @dataProvider test_view_log_function_data
+	* @dataProvider view_log_function_data
 	*/
 	public function test_view_log_function($expected, $expected_returned, $mode, $log_count, $limit = 5, $offset = 0, $forum_id = 0, $topic_id = 0, $user_id = 0, $limit_days = 0, $sort_by = 'l.log_id ASC', $keywords = '')
 	{
diff --git a/tests/mock/extension_manager.php b/tests/mock/extension_manager.php
index fdda4cbadc..954f2bf1c4 100644
--- a/tests/mock/extension_manager.php
+++ b/tests/mock/extension_manager.php
@@ -14,5 +14,6 @@ class phpbb_mock_extension_manager extends phpbb_extension_manager
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->php_ext = '.php';
 		$this->extensions = $extensions;
+		$this->filesystem = new phpbb_filesystem();
 	}
 }
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index db6a6066e4..b9647e4742 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -153,6 +153,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 			$db,
 			$config,
 			$migrator,
+			new phpbb_filesystem(),
 			self::$config['table_prefix'] . 'ext',
 			dirname(__FILE__) . '/',
 			'.' . $php_ext,
@@ -530,6 +531,9 @@ class phpbb_functional_test_case extends phpbb_test_case
 		$this->assertEquals(200, $this->client->getResponse()->getStatus());
 		$content = $this->client->getResponse()->getContent();
 		$this->assertNotContains('Fatal error:', $content);
+		$this->assertNotContains('Notice:', $content);
+		$this->assertNotContains('Warning:', $content);
+		$this->assertNotContains('[phpBB Debug]', $content);
 	}
 
 	public function assert_filter($crawler, $expr, $msg = null)