Merge remote-tracking branch 'upstream/develop' into feature/prune-users

* upstream/develop: (2171 commits) [ticket/11164] Update composer.phar [ticket/10933] Use inheritDoc, eliminate copy pasted docblocks. [ticket/10933] Dependency inject template context. [ticket/10933] Expanded prose documentation for phpbb_extension_provider. [ticket/10933] Specify empty template path for absolute includephp test. [ticket/10933] Useful documentation for template locate function [ticket/10933] Typo fixes [ticket/10933] Initialize template context when template is constructed. [ticket/11099] Mark acp_ban::display_ban_options() as static. [ticket/11158] Require acl_u_sig for ucp signature module. [ticket/11158] Revert old fix in PHPBB3-10186. [ticket/11159] static public is the currently approved order. [ticket/11157] static public is the currently approved order. [ticket/11157] Fix remaining captcha spam. [ticket/11157] get_captcha_types is an instance method. [ticket/11156] Delete "Misc" tab of forum based permissions + move items [ticket/10848] Move include up. [ticket/11014] Fix old pagination assignment [ticket/11018] Fix several paginations in ACP [ticket/11014] Fix IF statements for new template pagination ... Conflicts: phpBB/includes/functions_user.php
author: Oleg Pudeyev <oleg@bsdpower.com> 2012-11-06 11:11:27 -0500
committer: Oleg Pudeyev <oleg@bsdpower.com> 2012-11-06 11:11:27 -0500
commit: 87ea50948ea53c0d1beab5b44badebeae4292d1a (patch)
tree: dbc99fde4dfc62b84bae60c7e4ab5c02ddbe8a3c /tests
parent: 5b48df41685da785b082612318ebe7a8012c4149 (diff)
parent: 44ff9d020fd218cbdb2f07a0d7f85a630367e3c2 (diff)
download: forums-87ea50948ea53c0d1beab5b44badebeae4292d1a.tar
forums-87ea50948ea53c0d1beab5b44badebeae4292d1a.tar.gz
forums-87ea50948ea53c0d1beab5b44badebeae4292d1a.tar.bz2
forums-87ea50948ea53c0d1beab5b44badebeae4292d1a.tar.xz
forums-87ea50948ea53c0d1beab5b44badebeae4292d1a.zip
212 files changed, 6908 insertions, 599 deletions
diff --git a/tests/RUNNING_TESTS.txt b/tests/RUNNING_TESTS.txt
index 59197acc0f..7c2a7c3fce 100644
--- a/tests/RUNNING_TESTS.txt
+++ b/tests/RUNNING_TESTS.txt
@@ -21,12 +21,13 @@ the following PHP extensions must be installed and enabled to run unit tests:
 
 Database Tests
 --------------
+
 By default all tests requiring a database connection will use sqlite. If you
 do not have sqlite installed the tests will be skipped. If you wish to run the
 tests on a different database you have to create a test_config.php file within
-your tests directory following the same format as phpBB's config.php. An example
-for mysqli can be found below. More information on configuration options can be
-found on the wiki (see below).
+your tests directory following the same format as phpBB's config.php. An
+example for mysqli can be found below. More information on configuration
+options can be found on the wiki (see below).
 
     <?php
     $dbms = 'mysqli';
@@ -36,26 +37,56 @@ found on the wiki (see below).
     $dbuser = 'user';
     $dbpasswd = 'password';
 
-Alternatively you can specify parameters in the environment, so e.g. the following
-will run phpunit with the same parameters as in the shown test_config.php file:
+It is possible to have multiple test_config.php files, for example if you
+are testing on multiple databases. You can specify which test_config.php file
+to use in the environment as follows:
+
+    $ PHPBB_TEST_CONFIG=tests/test_config.php phpunit
+
+Alternatively you can specify parameters in the environment, so e.g. the
+following will run phpunit with the same parameters as in the shown
+test_config.php file:
 
     $ PHPBB_TEST_DBMS='mysqli' PHPBB_TEST_DBHOST='localhost' \
       PHPBB_TEST_DBNAME='database' PHPBB_TEST_DBUSER='user' \
       PHPBB_TEST_DBPASSWD='password' phpunit
 
+Special Database Cases
+----------------------
+In order to run tests on some of the databases that we support, it will be
+necessary to provide a custom DSN string in test_config.php. This is only
+needed for MSSQL 2000+ (PHP module), MSSQL via ODBC, and Firebird when
+PDO_Firebird does not work on your system
+(https://bugs.php.net/bug.php?id=61183). The variable must be named $custom_dsn.
+
+Examples:
+Firebird using http://www.firebirdsql.org/en/odbc-driver/
+$custom_dsn = "Driver={Firebird/InterBase(r) driver};dbname=$dbhost:$dbname";
+
+MSSQL
+$custom_dsn = "Driver={SQL Server Native Client 10.0};Server=$dbhost;Database=$dbname";
+
+The other fields in test_config.php should be filled out as you would normally
+to connect to that database in phpBB.
+
+Additionally, you will need to be running the DbUnit fork from
+https://github.com/phpbb/dbunit/tree/phpbb.
+
 Running
 =======
 
-Once the prerequisites are installed, run the tests from the project root directory (above phpBB):
+Once the prerequisites are installed, run the tests from the project root
+directory (above phpBB):
 
     $ phpunit
 
 Slow tests
 --------------
+
 Certain tests, such as the UTF-8 normalizer or the DNS tests tend to be slow.
 Thus these tests are in the `slow` group, which is excluded by default. You can
-enable slow tests by copying the phpunit.xml.all file to phpunit.xml. If you only
-want the slow tests, run:
+enable slow tests by copying the phpunit.xml.all file to phpunit.xml. If you
+only want the slow tests, run:
 
     $ phpunit --group slow
 
@@ -63,4 +94,4 @@ More Information
 ================
 
 Further information is available on phpbb wiki:
-http://wiki.phpbb.com/display/DEV/Unit+Tests
+http://wiki.phpbb.com/Unit_Tests
diff --git a/tests/bbcode/parser_test.php b/tests/bbcode/parser_test.php
index 9423383938..8c7fbc7128 100644
--- a/tests/bbcode/parser_test.php
+++ b/tests/bbcode/parser_test.php
@@ -4,7 +4,7 @@
 * @package testing
 * @version $Id$
 * @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/bbcode/url_bbcode_test.php b/tests/bbcode/url_bbcode_test.php
new file mode 100644
index 0000000000..d5df386714
--- /dev/null
+++ b/tests/bbcode/url_bbcode_test.php
@@ -0,0 +1,63 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2010 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/bbcode.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/message_parser.php';
+
+class phpbb_url_bbcode_test extends phpbb_test_case
+{
+	public function url_bbcode_test_data()
+	{
+		return array(
+			array(
+				'url only',
+				'[url]http://www.phpbb.com/community/[/url]',
+				'[url:]http&#58;//www&#46;phpbb&#46;com/community/[/url:]'
+			),
+			array(
+				'url with title',
+				'[url=http://www.phpbb.com/community/]One line URL text[/url]',
+				'[url=http&#58;//www&#46;phpbb&#46;com/community/:]One line URL text[/url:]'
+			),
+			array(
+				'url with multiline title',
+				"[url=http://www.phpbb.com/community/]Multiline\x0AURL\x0Atext[/url]",
+				"[url=http&#58;//www&#46;phpbb&#46;com/community/:]Multiline\x0AURL\x0Atext[/url:]"
+			),
+			array(
+				'unclosed url with multiline',
+				"test [url] test \x0A test [url=http://www.phpbb.com/]test[/url] test",
+				"test [url] test \x0A test [url=http&#58;//www&#46;phpbb&#46;com/:]test[/url:] test"
+			),
+			array(
+				'unclosed url with multiline and title',
+				"test [url=http://www.phpbb.com/]test \x0A [url]http://phpbb.com[/url] test",
+				"test [url=http&#58;//www&#46;phpbb&#46;com/:]test \x0A [url]http://phpbb.com[/url:] test"
+			),
+		);
+	}
+
+	/**
+	* @dataProvider url_bbcode_test_data
+	*/
+	public function test_url($description, $message, $expected)
+	{
+		global $user, $request;
+		$user = new phpbb_mock_user;
+		$request = new phpbb_mock_request;
+
+		$bbcode = new bbcode_firstpass();
+		$bbcode->message = $message;
+		$bbcode->bbcode_init(false);
+		$bbcode->parse_bbcode();
+		$this->assertEquals($expected, $bbcode->message);
+	}
+}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index b7c3534cde..1017e0c72f 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -3,39 +3,28 @@
 *
 * @package testing
 * @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
 define('IN_PHPBB', true);
 $phpbb_root_path = 'phpBB/';
 $phpEx = 'php';
-$table_prefix = 'phpbb_';
-
-if (!defined('E_DEPRECATED'))
-{
-    define('E_DEPRECATED', 8192);
-}
-error_reporting(E_ALL & ~E_DEPRECATED);
-
-// If we are on PHP >= 6.0.0 we do not need some code
-if (version_compare(PHP_VERSION, '6.0.0-dev', '>='))
-{
-	define('STRIP', false);
-}
-else
-{
-	@set_magic_quotes_runtime(0);
-	define('STRIP', (get_magic_quotes_gpc()) ? true : false);
-}
+require_once $phpbb_root_path . 'includes/startup.php';
 
+$table_prefix = 'phpbb_';
 require_once $phpbb_root_path . 'includes/constants.php';
 require_once $phpbb_root_path . 'includes/class_loader.' . $phpEx;
 
-$class_loader = new phpbb_class_loader($phpbb_root_path, '.php');
-$class_loader->register();
+$phpbb_class_loader_mock = new phpbb_class_loader('phpbb_mock_', $phpbb_root_path . '../tests/mock/', ".php");
+$phpbb_class_loader_mock->register();
+$phpbb_class_loader_ext = new phpbb_class_loader('phpbb_ext_', $phpbb_root_path . 'ext/', ".php");
+$phpbb_class_loader_ext->register();
+$phpbb_class_loader = new phpbb_class_loader('phpbb_', $phpbb_root_path . 'includes/', ".php");
+$phpbb_class_loader->register();
 
 require_once 'test_framework/phpbb_test_case_helpers.php';
 require_once 'test_framework/phpbb_test_case.php';
 require_once 'test_framework/phpbb_database_test_case.php';
 require_once 'test_framework/phpbb_database_test_connection_manager.php';
+require_once 'test_framework/phpbb_functional_test_case.php';
diff --git a/tests/cache/cache_test.php b/tests/cache/cache_test.php
index b127c507f0..c5f5fac88c 100644
--- a/tests/cache/cache_test.php
+++ b/tests/cache/cache_test.php
@@ -3,13 +3,13 @@
 *
 * @package testing
 * @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
 require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 
-class phpbb_cache_test extends phpbb_test_case
+class phpbb_cache_test extends phpbb_database_test_case
 {
 	private $cache_dir;
 
@@ -18,8 +18,15 @@ class phpbb_cache_test extends phpbb_test_case
 		$this->cache_dir = dirname(__FILE__) . '/../tmp/cache/';
 	}
 
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml');
+	}
+
 	protected function setUp()
 	{
+		parent::setUp();
+
 		if (file_exists($this->cache_dir))
 		{
 			// cache directory possibly left after aborted
@@ -35,6 +42,8 @@ class phpbb_cache_test extends phpbb_test_case
 		{
 			$this->remove_cache_dir();
 		}
+
+		parent::tearDown();
 	}
 
 	private function create_cache_dir()
@@ -67,4 +76,34 @@ class phpbb_cache_test extends phpbb_test_case
 			'File ACM put and get'
 		);
 	}
+
+	public function test_cache_sql()
+	{
+		$driver = new phpbb_cache_driver_file($this->cache_dir);
+
+		global $db, $cache;
+		$db = $this->new_dbal();
+		$cache = new phpbb_cache_service($driver);
+
+		$sql = "SELECT * FROM phpbb_config
+			WHERE config_name = 'foo'";
+		$result = $db->sql_query($sql, 300);
+		$first_result = $db->sql_fetchrow($result);
+
+		$this->assertFileExists($this->cache_dir . 'sql_' . md5(preg_replace('/[\n\r\s\t]+/', ' ', $sql)) . '.php');
+
+		$sql = "SELECT * FROM phpbb_config
+			WHERE config_name = 'foo'";
+		$result = $db->sql_query($sql, 300);
+
+		$this->assertEquals($first_result, $db->sql_fetchrow($result));
+
+		$sql = "SELECT * FROM phpbb_config
+			WHERE config_name = 'bar'";
+		$result = $db->sql_query($sql, 300);
+
+		$this->assertNotEquals($first_result, $db->sql_fetchrow($result));
+
+		$db->sql_close();
+	}
 }
diff --git a/tests/cache/fixtures/config.xml b/tests/cache/fixtures/config.xml
new file mode 100644
index 0000000000..9d395b685c
--- /dev/null
+++ b/tests/cache/fixtures/config.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_config">
+		<column>config_name</column>
+		<column>config_value</column>
+		<column>is_dynamic</column>
+		<row>
+			<value>foo</value>
+			<value>23</value>
+			<value>0</value>
+		</row>
+		<row>
+			<value>bar</value>
+			<value>42</value>
+			<value>1</value>
+		</row>
+	</table>
+</dataset>
diff --git a/tests/class_loader/class_loader_test.php b/tests/class_loader/class_loader_test.php
index 0c7fe3f97a..76af4dde37 100644
--- a/tests/class_loader/class_loader_test.php
+++ b/tests/class_loader/class_loader_test.php
@@ -3,30 +3,34 @@
 *
 * @package testing
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
-require_once dirname(__FILE__) . '/../mock/cache.php';
-
 class phpbb_class_loader_test extends PHPUnit_Framework_TestCase
 {
 	public function setUp()
 	{
-		global $class_loader;
-		$class_loader->unregister();
+		global $phpbb_class_loader;
+		$phpbb_class_loader->unregister();
+
+		global $phpbb_class_loader_ext;
+		$phpbb_class_loader_ext->unregister();
 	}
 
 	public function tearDown()
 	{
-		global $class_loader;
-		$class_loader->register();
+		global $phpbb_class_loader_ext;
+		$phpbb_class_loader_ext->register();
+
+		global $phpbb_class_loader;
+		$phpbb_class_loader->register();
 	}
 
 	public function test_resolve_path()
 	{
 		$prefix = dirname(__FILE__) . '/';
-		$class_loader = new phpbb_class_loader($prefix);
+		$class_loader = new phpbb_class_loader('phpbb_', $prefix . 'includes/');
 
 		$prefix .= 'includes/';
 
@@ -60,11 +64,15 @@ class phpbb_class_loader_test extends PHPUnit_Framework_TestCase
 
 	public function test_resolve_cached()
 	{
-		$cacheMap = array('class_loader' => array('phpbb_a_cached_name' => 'a/cached_name'));
-		$cache = new phpbb_mock_cache($cacheMap);
+		$cache_map = array(
+			'class_loader_phpbb_' => array('phpbb_a_cached_name' => 'a/cached_name'),
+			'class_loader_phpbb_ext_' => array('phpbb_ext_foo' => 'foo'),
+		);
+		$cache = new phpbb_mock_cache($cache_map);
 
 		$prefix = dirname(__FILE__) . '/';
-		$class_loader = new phpbb_class_loader($prefix, '.php', $cache);
+		$class_loader = new phpbb_class_loader('phpbb_', $prefix . 'includes/', '.php', $cache);
+		$class_loader_ext = new phpbb_class_loader('phpbb_ext_', $prefix . 'includes/', '.php', $cache);
 
 		$prefix .= 'includes/';
 
@@ -74,13 +82,22 @@ class phpbb_class_loader_test extends PHPUnit_Framework_TestCase
 			'Class in a directory'
 		);
 
+		$this->assertFalse($class_loader->resolve_path('phpbb_ext_foo'));
+		$this->assertFalse($class_loader_ext->resolve_path('phpbb_a_cached_name'));
+
 		$this->assertEquals(
 			$prefix . 'a/cached_name.php',
 			$class_loader->resolve_path('phpbb_a_cached_name'),
-			'Class in a directory'
+			'Cached class found'
+		);
+
+		$this->assertEquals(
+			$prefix . 'foo.php',
+			$class_loader_ext->resolve_path('phpbb_ext_foo'),
+			'Cached class found in alternative loader'
 		);
 
-		$cacheMap['class_loader']['phpbb_dir_class_name'] = 'dir/class_name';
-		$cache->check($this, $cacheMap);
+		$cache_map['class_loader_phpbb_']['phpbb_dir_class_name'] = 'dir/class_name';
+		$cache->check($this, $cache_map);
 	}
 }
diff --git a/tests/utf/data/.gitkeep b/tests/compress/archive/.gitkeep
index e69de29bb2..e69de29bb2 100644
--- a/tests/utf/data/.gitkeep
+++ b/tests/compress/archive/.gitkeep
diff --git a/tests/compress/compress_test.php b/tests/compress/compress_test.php
new file mode 100644
index 0000000000..ac8dd358d3
--- /dev/null
+++ b/tests/compress/compress_test.php
@@ -0,0 +1,173 @@
+<?php
+/**
+ *
+ * @package testing
+ * @copyright (c) 2012 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_admin.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_compress.php';
+
+class phpbb_compress_test extends phpbb_test_case
+{
+	const EXTRACT_DIR = '/extract/';
+	const ARCHIVE_DIR = '/archive/';
+
+	private $path;
+
+	protected $filelist = array(
+		'1.txt',
+		'dir/2.txt',
+		'dir/3.txt',
+		'dir/subdir/4.txt',
+	);
+
+	protected $conflicts = array(
+		'1_1.txt',
+		'1_2.txt',
+		'dir/2_1.txt',
+	);
+
+	protected function setUp()
+	{
+		// Required for compress::add_file
+		global $phpbb_root_path;
+		$phpbb_root_path = '';
+
+		$this->path = dirname(__FILE__) . '/fixtures/';
+
+		if (!@extension_loaded('zlib') || !@extension_loaded('bz2'))
+		{
+			$this->markTestSkipped('PHP needs to be compiled with --with-zlib and --with-bz2 in order to run these tests');
+		}
+	}
+
+	protected function tearDown()
+	{
+		foreach (array(dirname(__FILE__) . self::EXTRACT_DIR, dirname(__FILE__) . self::ARCHIVE_DIR) as $dir)
+		{
+			$this->clear_dir($dir);
+		}
+	}
+
+	protected function clear_dir($dir)
+	{
+		$iterator = new DirectoryIterator($dir);
+		foreach ($iterator as $fileinfo)
+		{
+			$name = $fileinfo->getFilename();
+			$path = $fileinfo->getPathname();
+
+			if ($name[0] !== '.')
+			{
+				if ($fileinfo->isDir())
+				{
+					$this->clear_dir($path);
+					rmdir($path);
+				}
+				else
+				{
+					unlink($path);
+				}
+			}
+		}
+	}
+
+	protected function archive_files($compress)
+	{
+		$compress->add_file($this->path . '1.txt', $this->path);
+		$compress->add_file(
+			'tests/compress/fixtures/dir/',
+			'tests/compress/fixtures/',
+			'',
+			// The comma here is not an error, this is a comma-separated list
+			'subdir/4.txt,3.txt'
+		);
+		$compress->add_custom_file($this->path . 'dir/3.txt', 'dir/3.txt');
+		$compress->add_data(file_get_contents($this->path . 'dir/subdir/4.txt'), 'dir/subdir/4.txt');
+
+		// Add multiples of the same file to check conflicts are handled
+		$compress->add_file($this->path . '1.txt', $this->path);
+		$compress->add_file($this->path . '1.txt', $this->path);
+		$compress->add_file($this->path . 'dir/2.txt', $this->path);
+	}
+
+	protected function valid_extraction($extra = array())
+	{
+		$filelist = array_merge($this->filelist, $extra);
+
+		foreach ($filelist as $filename)
+		{
+			$path = dirname(__FILE__) . self::EXTRACT_DIR . $filename;
+			$this->assertTrue(file_exists($path));
+
+			// Check the file's contents is correct
+			$contents = explode('_', basename($filename, '.txt'));
+			$contents = $contents[0];
+			$this->assertEquals($contents . "\n", file_get_contents($path));
+		}
+	}
+
+	public function tar_archive_list()
+	{
+		return array(
+			array('archive.tar', '.tar'),
+			array('archive.tar.gz', '.tar.gz'),
+			array('archive.tar.bz2', '.tar.bz2'),
+		);
+	}
+
+	/**
+	 * @dataProvider tar_archive_list
+	 */
+	public function test_extract_tar($filename, $type)
+	{
+		$compress = new compress_tar('r', $this->path . $filename);
+		$compress->extract('tests/compress/' . self::EXTRACT_DIR);
+		$this->valid_extraction();
+	}
+
+	public function test_extract_zip()
+	{
+		$compress = new compress_zip('r', $this->path . 'archive.zip');
+		$compress->extract('tests/compress/' . self::EXTRACT_DIR);
+		$this->valid_extraction();
+	}
+
+	/**
+	 * @depends test_extract_tar
+	 * @dataProvider tar_archive_list
+	 */
+	public function test_compress_tar($filename, $type)
+	{
+		$tar = dirname(__FILE__) . self::ARCHIVE_DIR . $filename;
+		$compress = new compress_tar('w', $tar);
+		$this->archive_files($compress);
+		$compress->close();
+		$this->assertTrue(file_exists($tar));
+
+		$compress->mode = 'r';
+		$compress->open();
+		$compress->extract('tests/compress/' . self::EXTRACT_DIR);
+		$this->valid_extraction($this->conflicts);
+	}
+
+	/**
+	 * @depends test_extract_zip
+	 */
+	public function test_compress_zip()
+	{
+		$zip =  dirname(__FILE__) . self::ARCHIVE_DIR . 'archive.zip';
+		$compress = new compress_zip('w', $zip);
+		$this->archive_files($compress);
+		$compress->close();
+		$this->assertTrue(file_exists($zip));
+
+		$compress = new compress_zip('r', $zip);
+		$compress->extract('tests/compress/' . self::EXTRACT_DIR);
+		$this->valid_extraction($this->conflicts);
+	}
+}
diff --git a/tests/compress/extract/.gitkeep b/tests/compress/extract/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/compress/extract/.gitkeep
diff --git a/tests/compress/fixtures/1.txt b/tests/compress/fixtures/1.txt
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/compress/fixtures/1.txt
@@ -0,0 +1 @@
+1
diff --git a/tests/compress/fixtures/archive.tar b/tests/compress/fixtures/archive.tar
new file mode 100644
index 0000000000..54ed56084e
--- /dev/null
+++ b/tests/compress/fixtures/archive.tar
diff --git a/tests/compress/fixtures/archive.tar.bz2 b/tests/compress/fixtures/archive.tar.bz2
new file mode 100644
index 0000000000..04c0eccd74
--- /dev/null
+++ b/tests/compress/fixtures/archive.tar.bz2
diff --git a/tests/compress/fixtures/archive.tar.gz b/tests/compress/fixtures/archive.tar.gz
new file mode 100644
index 0000000000..195e7a060a
--- /dev/null
+++ b/tests/compress/fixtures/archive.tar.gz
diff --git a/tests/compress/fixtures/archive.zip b/tests/compress/fixtures/archive.zip
new file mode 100644
index 0000000000..bdb618fc26
--- /dev/null
+++ b/tests/compress/fixtures/archive.zip
diff --git a/tests/compress/fixtures/dir/2.txt b/tests/compress/fixtures/dir/2.txt
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/compress/fixtures/dir/2.txt
@@ -0,0 +1 @@
+2
diff --git a/tests/compress/fixtures/dir/3.txt b/tests/compress/fixtures/dir/3.txt
new file mode 100644
index 0000000000..00750edc07
--- /dev/null
+++ b/tests/compress/fixtures/dir/3.txt
@@ -0,0 +1 @@
+3
diff --git a/tests/compress/fixtures/dir/subdir/4.txt b/tests/compress/fixtures/dir/subdir/4.txt
new file mode 100644
index 0000000000..b8626c4cff
--- /dev/null
+++ b/tests/compress/fixtures/dir/subdir/4.txt
@@ -0,0 +1 @@
+4
diff --git a/tests/config/config_test.php b/tests/config/config_test.php
index 9c91d9eb87..5845cc4590 100644
--- a/tests/config/config_test.php
+++ b/tests/config/config_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/config/db_test.php b/tests/config/db_test.php
index e817545a54..0b8f73d53a 100644
--- a/tests/config/db_test.php
+++ b/tests/config/db_test.php
@@ -3,12 +3,10 @@
 *
 * @package testing
 * @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
-require_once dirname(__FILE__) . '/../mock/cache.php';
-
 class phpbb_config_db_test extends phpbb_database_test_case
 {
 	private $cache;
diff --git a/tests/cron/ext/testext/cron/dummy_task.php b/tests/cron/ext/testext/cron/dummy_task.php
new file mode 100644
index 0000000000..a31806c1b1
--- /dev/null
+++ b/tests/cron/ext/testext/cron/dummy_task.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2010 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_ext_testext_cron_dummy_task extends phpbb_cron_task_base
+{
+	public static $was_run = 0;
+
+	public function get_name()
+	{
+		return get_class($this);
+	}
+
+	public function run()
+	{
+		self::$was_run++;
+	}
+
+	public function should_run()
+	{
+		return true;
+	}
+}
diff --git a/tests/cron/includes/cron/task/core/dummy_task.php b/tests/cron/includes/cron/task/core/dummy_task.php
new file mode 100644
index 0000000000..ce3e91a9ba
--- /dev/null
+++ b/tests/cron/includes/cron/task/core/dummy_task.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2010 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_cron_task_core_dummy_task extends phpbb_cron_task_base
+{
+	public static $was_run = 0;
+
+	public function get_name()
+	{
+		return get_class($this);
+	}
+
+	public function run()
+	{
+		self::$was_run++;
+	}
+
+	public function should_run()
+	{
+		return true;
+	}
+}
diff --git a/tests/cron/includes/cron/task/core/second_dummy_task.php b/tests/cron/includes/cron/task/core/second_dummy_task.php
new file mode 100644
index 0000000000..76a55588f9
--- /dev/null
+++ b/tests/cron/includes/cron/task/core/second_dummy_task.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2010 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_cron_task_core_second_dummy_task extends phpbb_cron_task_base
+{
+	public static $was_run = 0;
+
+	public function get_name()
+	{
+		return get_class($this);
+	}
+
+	public function run()
+	{
+		self::$was_run++;
+	}
+
+	public function should_run()
+	{
+		return true;
+	}
+}
diff --git a/tests/cron/manager_test.php b/tests/cron/manager_test.php
index 65d8360fbb..3c541be2a6 100644
--- a/tests/cron/manager_test.php
+++ b/tests/cron/manager_test.php
@@ -3,29 +3,27 @@
 *
 * @package testing
 * @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
-require_once dirname(__FILE__) . '/../mock/cache.php';
-require_once dirname(__FILE__) . '/task/testmod/dummy_task.php';
-require_once dirname(__FILE__) . '/task/testmod/second_dummy_task.php';
-require_once dirname(__FILE__) . '/task2/testmod/simple_ready.php';
-require_once dirname(__FILE__) . '/task2/testmod/simple_not_runnable.php';
-require_once dirname(__FILE__) . '/task2/testmod/simple_should_not_run.php';
+require_once dirname(__FILE__) . '/includes/cron/task/core/dummy_task.php';
+require_once dirname(__FILE__) . '/includes/cron/task/core/second_dummy_task.php';
+require_once dirname(__FILE__) . '/ext/testext/cron/dummy_task.php';
+require_once dirname(__FILE__) . '/tasks/simple_ready.php';
+require_once dirname(__FILE__) . '/tasks/simple_not_runnable.php';
+require_once dirname(__FILE__) . '/tasks/simple_should_not_run.php';
 
 class phpbb_cron_manager_test extends PHPUnit_Framework_TestCase
 {
 	public function setUp()
 	{
-		$this->manager = new phpbb_cron_manager(dirname(__FILE__) . '/task/', 'php');
-		$this->task_name = 'phpbb_cron_task_testmod_dummy_task';
-	}
-
-	public function test_manager_finds_shipped_tasks()
-	{
-		$tasks = $this->manager->find_cron_task_names();
-		$this->assertEquals(2, sizeof($tasks));
+		$this->manager = $this->create_cron_manager(array(
+			new phpbb_cron_task_core_dummy_task(),
+			new phpbb_cron_task_core_second_dummy_task(),
+			new phpbb_ext_testext_cron_dummy_task(),
+		));
+		$this->task_name = 'phpbb_cron_task_core_dummy_task';
 	}
 
 	public function test_manager_finds_shipped_task_by_name()
@@ -35,17 +33,10 @@ class phpbb_cron_manager_test extends PHPUnit_Framework_TestCase
 		$this->assertEquals($this->task_name, $task->get_name());
 	}
 
-	public function test_manager_instantiates_task_by_name()
-	{
-		$task = $this->manager->instantiate_task($this->task_name, array());
-		$this->assertInstanceOf('phpbb_cron_task_wrapper', $task);
-		$this->assertEquals($this->task_name, $task->get_name());
-	}
-
 	public function test_manager_finds_all_ready_tasks()
 	{
 		$tasks = $this->manager->find_all_ready_tasks();
-		$this->assertEquals(2, sizeof($tasks));
+		$this->assertEquals(3, sizeof($tasks));
 	}
 
 	public function test_manager_finds_one_ready_task()
@@ -54,21 +45,16 @@ class phpbb_cron_manager_test extends PHPUnit_Framework_TestCase
 		$this->assertInstanceOf('phpbb_cron_task_wrapper', $task);
 	}
 
-	public function test_manager_finds_all_ready_tasks_cached()
-	{
-		$cache = new phpbb_mock_cache(array('_cron_tasks' => array($this->task_name)));
-		$manager = new phpbb_cron_manager(dirname(__FILE__) . '/../../phpBB/', 'php', $cache);
-
-		$tasks = $manager->find_all_ready_tasks();
-		$this->assertEquals(1, sizeof($tasks));
-	}
-
 	public function test_manager_finds_only_ready_tasks()
 	{
-		$manager = new phpbb_cron_manager(dirname(__FILE__) . '/task2/', 'php');
+		$manager = $this->create_cron_manager(array(
+			new phpbb_cron_task_core_simple_ready(),
+			new phpbb_cron_task_core_simple_not_runnable(),
+			new phpbb_cron_task_core_simple_should_not_run(),
+		));
 		$tasks = $manager->find_all_ready_tasks();
 		$task_names = $this->tasks_to_names($tasks);
-		$this->assertEquals(array('phpbb_cron_task_testmod_simple_ready'), $task_names);
+		$this->assertEquals(array('phpbb_cron_task_core_simple_ready'), $task_names);
 	}
 
 	private function tasks_to_names($tasks)
@@ -76,8 +62,15 @@ class phpbb_cron_manager_test extends PHPUnit_Framework_TestCase
 		$names = array();
 		foreach ($tasks as $task)
 		{
-			$names[] = get_class($task->task);
+			$names[] = $task->get_name();
 		}
 		return $names;
 	}
+
+	private function create_cron_manager($tasks)
+	{
+		global $phpbb_root_path, $phpEx;
+
+		return new phpbb_cron_manager($tasks, $phpbb_root_path, $phpEx);
+	}
 }
diff --git a/tests/cron/task/testmod/dummy_task.php b/tests/cron/task/testmod/dummy_task.php
deleted file mode 100644
index 5941157589..0000000000
--- a/tests/cron/task/testmod/dummy_task.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-class phpbb_cron_task_testmod_dummy_task extends phpbb_cron_task_base
-{
-	public static $was_run = 0;
-
-	public function run()
-	{
-		self::$was_run++;
-	}
-
-	public function should_run()
-	{
-		return true;
-	}
-}
diff --git a/tests/cron/task/testmod/second_dummy_task.php b/tests/cron/task/testmod/second_dummy_task.php
deleted file mode 100644
index 7118b2ebe7..0000000000
--- a/tests/cron/task/testmod/second_dummy_task.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-class phpbb_cron_task_testmod_second_dummy_task extends phpbb_cron_task_base
-{
-	public static $was_run = 0;
-
-	public function run()
-	{
-		self::$was_run++;
-	}
-
-	public function should_run()
-	{
-		return true;
-	}
-}
diff --git a/tests/cron/task2/testmod/simple_not_runnable.php b/tests/cron/task2/testmod/simple_not_runnable.php
deleted file mode 100644
index 54869fa1cc..0000000000
--- a/tests/cron/task2/testmod/simple_not_runnable.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-class phpbb_cron_task_testmod_simple_not_runnable extends phpbb_cron_task_base
-{
-	public function run()
-	{
-	}
-
-	public function is_runnable()
-	{
-		return false;
-	}
-}
diff --git a/tests/cron/task2/testmod/simple_ready.php b/tests/cron/task2/testmod/simple_ready.php
deleted file mode 100644
index e407441e90..0000000000
--- a/tests/cron/task2/testmod/simple_ready.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-class phpbb_cron_task_testmod_simple_ready extends phpbb_cron_task_base
-{
-	public function run()
-	{
-	}
-}
diff --git a/tests/cron/task2/testmod/simple_should_not_run.php b/tests/cron/task2/testmod/simple_should_not_run.php
deleted file mode 100644
index 14ba4cdbd3..0000000000
--- a/tests/cron/task2/testmod/simple_should_not_run.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-class phpbb_cron_task_testmod_simple_should_not_run extends phpbb_cron_task_base
-{
-	public function run()
-	{
-	}
-
-	public function should_run()
-	{
-		return false;
-	}
-}
diff --git a/tests/cron/task_provider_test.php b/tests/cron/task_provider_test.php
new file mode 100644
index 0000000000..ec853bb3ba
--- /dev/null
+++ b/tests/cron/task_provider_test.php
@@ -0,0 +1,50 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2010 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_cron_task_provider_test extends PHPUnit_Framework_TestCase
+{
+	public function setUp()
+	{
+		$this->tasks = array(
+			'phpbb_cron_task_core_dummy_task',
+			'phpbb_cron_task_core_second_dummy_task',
+			'phpbb_ext_testext_cron_dummy_task',
+		);
+
+		$container = $this->getMock('Symfony\Component\DependencyInjection\TaggedContainerInterface');
+		$container
+			->expects($this->once())
+			->method('findTaggedServiceIds')
+			->will($this->returnValue(array_flip($this->tasks)));
+		$container
+			->expects($this->any())
+			->method('get')
+			->will($this->returnCallback(function ($name) {
+				return new $name;
+			}));
+
+		$this->provider = new phpbb_cron_task_provider($container);
+	}
+
+	public function test_manager_finds_shipped_tasks()
+	{
+		$task_names = array();
+		foreach ($this->provider as $task)
+		{
+			$task_names[] = $task->get_name();
+		}
+		sort($task_names);
+
+		$this->assertEquals(array(
+			'phpbb_cron_task_core_dummy_task',
+			'phpbb_cron_task_core_second_dummy_task',
+			'phpbb_ext_testext_cron_dummy_task',
+		), $task_names);
+	}
+}
diff --git a/tests/cron/tasks/simple_not_runnable.php b/tests/cron/tasks/simple_not_runnable.php
new file mode 100644
index 0000000000..56d484eacd
--- /dev/null
+++ b/tests/cron/tasks/simple_not_runnable.php
@@ -0,0 +1,18 @@
+<?php
+
+class phpbb_cron_task_core_simple_not_runnable extends phpbb_cron_task_base
+{
+	public function get_name()
+	{
+		return get_class($this);
+	}
+
+	public function run()
+	{
+	}
+
+	public function is_runnable()
+	{
+		return false;
+	}
+}
diff --git a/tests/cron/tasks/simple_ready.php b/tests/cron/tasks/simple_ready.php
new file mode 100644
index 0000000000..8aa0507406
--- /dev/null
+++ b/tests/cron/tasks/simple_ready.php
@@ -0,0 +1,13 @@
+<?php
+
+class phpbb_cron_task_core_simple_ready extends phpbb_cron_task_base
+{
+	public function get_name()
+	{
+		return get_class($this);
+	}
+
+	public function run()
+	{
+	}
+}
diff --git a/tests/cron/tasks/simple_should_not_run.php b/tests/cron/tasks/simple_should_not_run.php
new file mode 100644
index 0000000000..58f6df2616
--- /dev/null
+++ b/tests/cron/tasks/simple_should_not_run.php
@@ -0,0 +1,18 @@
+<?php
+
+class phpbb_cron_task_core_simple_should_not_run extends phpbb_cron_task_base
+{
+	public function get_name()
+	{
+		return get_class($this);
+	}
+
+	public function run()
+	{
+	}
+
+	public function should_run()
+	{
+		return false;
+	}
+}
diff --git a/tests/datetime/from_format_test.php b/tests/datetime/from_format_test.php
new file mode 100644
index 0000000000..c28925272e
--- /dev/null
+++ b/tests/datetime/from_format_test.php
@@ -0,0 +1,57 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/session.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/user.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/datetime.php';
+require_once dirname(__FILE__) . '/../mock/lang.php';
+
+class phpbb_datetime_from_format_test extends phpbb_test_case
+{
+	public function from_format_data()
+	{
+		return array(
+			array(
+				'UTC',
+				'Y-m-d',
+				'2012-06-08',
+			),
+
+			array(
+				'Europe/Berlin',
+				'Y-m-d H:i:s',
+				'2012-06-08 14:01:02',
+			),
+		);
+	}
+
+	/**
+	* @dataProvider from_format_data()
+	*/
+	public function test_from_format($timezone, $format, $expected)
+	{
+		global $user;
+
+		$user = new phpbb_user();
+		$user->timezone = new DateTimeZone($timezone);
+		$user->lang['datetime'] = array(
+			'TODAY'		=> 'Today',
+			'TOMORROW'	=> 'Tomorrow',
+			'YESTERDAY'	=> 'Yesterday',
+			'AGO'		=> array(
+				0		=> 'less than a minute ago',
+				1		=> '%d minute ago',
+				2		=> '%d minutes ago',
+			),
+		);
+
+		$timestamp = $user->get_timestamp_from_format($format, $expected, new DateTimeZone($timezone));
+		$this->assertEquals($expected, $user->format_date($timestamp, $format, true));
+	}
+}
diff --git a/tests/dbal/auto_increment_test.php b/tests/dbal/auto_increment_test.php
new file mode 100644
index 0000000000..e87fc1c6bd
--- /dev/null
+++ b/tests/dbal/auto_increment_test.php
@@ -0,0 +1,100 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/db/db_tools.php';
+
+class phpbb_dbal_auto_increment_test extends phpbb_database_test_case
+{
+	protected $db;
+	protected $tools;
+	protected $table_exists;
+	protected $table_data;
+
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml');
+	}
+
+	protected function setUp()
+	{
+		parent::setUp();
+
+		$this->db = $this->new_dbal();
+		$this->tools = new phpbb_db_tools($this->db);
+
+		$this->table_data = array(
+			'COLUMNS'		=> array(
+				'c_id'				=> array('UINT', NULL, 'auto_increment'),
+				'c_uint'				=> array('UINT', 4),
+			),
+			'PRIMARY_KEY'	=> 'c_id',
+		);
+		$this->tools->sql_create_table('prefix_table_name', $this->table_data);
+		$this->table_exists = true;
+	}
+
+	protected function tearDown()
+	{
+		if ($this->table_exists)
+		{
+			$this->tools->sql_table_drop('prefix_table_name');
+		}
+
+		parent::tearDown();
+	}
+
+	static protected function get_default_values()
+	{
+		return array(
+			'c_uint' => 0,
+		);
+	}
+
+	public function test_auto_increment()
+	{
+		$sql = 'DELETE FROM prefix_table_name';
+		$result = $this->db->sql_query($sql);
+
+		$row1 = array_merge(self::get_default_values(), array(
+			'c_uint' => 1,
+		));
+		$row2 = array_merge(self::get_default_values(), array(
+			'c_uint' => 2,
+		));
+
+		$sql = 'INSERT INTO prefix_table_name ' . $this->db->sql_build_array('INSERT', $row1);
+		$result = $this->db->sql_query($sql);
+		$id1 = $this->db->sql_nextid();
+
+		$sql = 'INSERT INTO prefix_table_name ' . $this->db->sql_build_array('INSERT', $row2);
+		$result = $this->db->sql_query($sql);
+		$id2 = $this->db->sql_nextid();
+
+		$this->assertGreaterThan($id1, $id2, 'Auto increment should increase the id value');
+
+		$sql = "SELECT *
+			FROM prefix_table_name WHERE c_id = $id1";
+		$result = $this->db->sql_query($sql);
+		$row_actual = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		$row1['c_id'] = $id1;
+		$this->assertEquals($row1, $row_actual);
+
+		$sql = "SELECT *
+			FROM prefix_table_name WHERE c_id = $id2";
+		$result = $this->db->sql_query($sql);
+		$row_actual = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		$row2['c_id'] = $id2;
+		$this->assertEquals($row2, $row_actual);
+	}
+}
diff --git a/tests/dbal/case_test.php b/tests/dbal/case_test.php
new file mode 100644
index 0000000000..57a1729a39
--- /dev/null
+++ b/tests/dbal/case_test.php
@@ -0,0 +1,69 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_dbal_case_test extends phpbb_database_test_case
+{
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/config.xml');
+	}
+
+	public function test_case_int()
+	{
+		$db = $this->new_dbal();
+
+		$sql = 'SELECT ' . $db->sql_case('1 = 1', '1', '2') . ' AS test_num
+			FROM phpbb_config';
+		$result = $db->sql_query_limit($sql, 1);
+
+		$this->assertEquals(1, (int) $db->sql_fetchfield('test_num'));
+
+		$sql = 'SELECT ' . $db->sql_case('1 = 0', '1', '2') . ' AS test_num
+			FROM phpbb_config';
+		$result = $db->sql_query_limit($sql, 1);
+
+		$this->assertEquals(2, (int) $db->sql_fetchfield('test_num'));
+	}
+
+	public function test_case_string()
+	{
+		$db = $this->new_dbal();
+
+		$sql = 'SELECT ' . $db->sql_case('1 = 1', "'foo'", "'bar'") . ' AS test_string
+			FROM phpbb_config';
+		$result = $db->sql_query_limit($sql, 1);
+
+		$this->assertEquals('foo', $db->sql_fetchfield('test_string'));
+
+		$sql = 'SELECT ' . $db->sql_case('1 = 0', "'foo'", "'bar'") . ' AS test_string
+			FROM phpbb_config';
+		$result = $db->sql_query_limit($sql, 1);
+
+		$this->assertEquals('bar', $db->sql_fetchfield('test_string'));
+	}
+
+	public function test_case_column()
+	{
+		$db = $this->new_dbal();
+
+		$sql = 'SELECT ' . $db->sql_case("config_name = 'config1'", 'config_name', 'config_value') . " AS test_string
+			FROM phpbb_config
+			WHERE config_name = 'config1'";
+		$result = $db->sql_query_limit($sql, 1);
+
+		$this->assertEquals('config1', $db->sql_fetchfield('test_string'));
+
+		$sql = 'SELECT ' . $db->sql_case("config_name = 'config1'", 'config_name', 'config_value') . " AS test_string
+			FROM phpbb_config
+			WHERE config_value = 'bar'";
+		$result = $db->sql_query_limit($sql, 1);
+
+		$this->assertEquals('bar', $db->sql_fetchfield('test_string'));
+	}
+}
diff --git a/tests/dbal/concatenate_test.php b/tests/dbal/concatenate_test.php
new file mode 100644
index 0000000000..0891fa58a0
--- /dev/null
+++ b/tests/dbal/concatenate_test.php
@@ -0,0 +1,64 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_dbal_concatenate_test extends phpbb_database_test_case
+{
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/config.xml');
+	}
+
+	public function test_concatenate_string()
+	{
+		$db = $this->new_dbal();
+
+		$sql = 'SELECT config_name, ' . $db->sql_concatenate('config_name', "'" . $db->sql_escape('append') . "'") . ' AS string
+			FROM phpbb_config';
+		$result = $db->sql_query($sql);
+
+		$db->sql_return_on_error(false);
+
+		$this->assertEquals(array(
+				array(
+					'config_name'	=> 'config1',
+					'string'		=> 'config1append',
+				),
+				array(
+					'config_name'	=> 'config2',
+					'string'		=> 'config2append',
+				),
+			),
+			$db->sql_fetchrowset($result)
+		);
+	}
+
+	public function test_concatenate_statement()
+	{
+		$db = $this->new_dbal();
+
+		$sql = 'SELECT config_name, ' . $db->sql_concatenate('config_name', 'config_value') . ' AS string
+			FROM phpbb_config';
+		$result = $db->sql_query($sql);
+
+		$db->sql_return_on_error(false);
+
+		$this->assertEquals(array(
+				array(
+					'config_name'	=> 'config1',
+					'string'		=> 'config1foo',
+				),
+				array(
+					'config_name'	=> 'config2',
+					'string'		=> 'config2bar',
+				),
+			),
+			$db->sql_fetchrowset($result)
+		);
+	}
+}
diff --git a/tests/dbal/cross_join_test.php b/tests/dbal/cross_join_test.php
new file mode 100644
index 0000000000..6c6b8a8449
--- /dev/null
+++ b/tests/dbal/cross_join_test.php
@@ -0,0 +1,55 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php';
+
+class phpbb_dbal_cross_join_test extends phpbb_database_test_case
+{
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/massmail_crossjoin.xml');
+	}
+
+	public function test_cross_join()
+	{
+		$db = $this->new_dbal();
+
+		// http://tracker.phpbb.com/browse/PHPBB3-10296
+		// Test CROSS JOIN with INNER JOIN
+		// Failed on Postgres, MSSQL and Oracle
+		$db->sql_return_on_error(true);
+
+		$sql_ary = array(
+			'SELECT'	=> 'u.username',
+			'FROM'		=> array(
+				'phpbb_users'		=> 'u',
+				'phpbb_user_group'	=> 'ug',
+			),
+			'LEFT_JOIN'	=> array(
+				array(
+					'FROM'	=> array(
+						'phpbb_banlist'	=> 'b',
+					),
+					'ON'	=> 'u.user_id = b.ban_userid',
+				),
+			),
+			'WHERE'		=> 'ug.group_id = 1
+				AND u.user_id = ug.user_id
+				AND b.ban_id IS NULL',
+			'ORDER_BY'	=> 'u.username',
+		);
+		$sql = $db->sql_build_query('SELECT', $sql_ary);
+		$result = $db->sql_query($sql);
+
+		$db->sql_return_on_error(false);
+
+		$this->assertEquals(array(array('username' => 'mass email')), $db->sql_fetchrowset($result));
+	}
+}
diff --git a/tests/dbal/db_tools_test.php b/tests/dbal/db_tools_test.php
new file mode 100644
index 0000000000..c20e46011f
--- /dev/null
+++ b/tests/dbal/db_tools_test.php
@@ -0,0 +1,333 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/db/db_tools.php';
+
+class phpbb_dbal_db_tools_test extends phpbb_database_test_case
+{
+	protected $db;
+	protected $tools;
+	protected $table_exists;
+	protected $table_data;
+
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/config.xml');
+	}
+
+	protected function setUp()
+	{
+		parent::setUp();
+
+		$this->db = $this->new_dbal();
+		$this->tools = new phpbb_db_tools($this->db);
+
+		$this->table_data = array(
+			'COLUMNS'		=> array(
+				'c_id'				=> array('UINT', NULL, 'auto_increment'),
+				'c_int_size'			=> array('INT:4', 4),
+				'c_bint'				=> array('BINT', 4),
+				'c_uint'				=> array('UINT', 4),
+				'c_uint_size'			=> array('UINT:4', 4),
+				'c_tint_size'			=> array('TINT:2', 4),
+				'c_usint'				=> array('USINT', 4),
+				'c_bool'				=> array('BOOL', 1),
+				'c_vchar'				=> array('VCHAR', 'foo'),
+				'c_vchar_size'		=> array('VCHAR:4', 'foo'),
+				'c_char_size'			=> array('CHAR:4', 'foo'),
+				'c_xstext'			=> array('XSTEXT', 'foo'),
+				'c_stext'				=> array('STEXT', 'foo'),
+				'c_text'				=> array('TEXT', 'foo'),
+				'c_mtext'				=> array('MTEXT', 'foo'),
+				'c_xstext_uni'		=> array('XSTEXT_UNI', 'foo'),
+				'c_stext_uni'			=> array('STEXT_UNI', 'foo'),
+				'c_text_uni'			=> array('TEXT_UNI', 'foo'),
+				'c_mtext_uni'			=> array('MTEXT_UNI', 'foo'),
+				'c_timestamp'			=> array('TIMESTAMP', 4),
+				'c_decimal'			=> array('DECIMAL', 4.2),
+				'c_decimal_size'		=> array('DECIMAL:6', 4.2),
+				'c_pdecimal'			=> array('PDECIMAL', 4.2),
+				'c_pdecimal_size'		=> array('PDECIMAL:7', 4.2),
+				'c_vchar_uni'			=> array('VCHAR_UNI', 'foo'),
+				'c_vchar_uni_size'	=> array('VCHAR_UNI:4', 'foo'),
+				'c_vchar_ci'			=> array('VCHAR_CI', 'foo'),
+				'c_varbinary'			=> array('VARBINARY', 'foo'),
+			),
+			'PRIMARY_KEY'	=> 'c_id',
+			'KEYS'			=> array(
+				'i_simple'	=> array('INDEX', 'c_uint'),
+				'i_uniq'	=> array('UNIQUE', 'c_vchar'),
+				'i_comp'	=> array('INDEX', array('c_vchar_uni', 'c_bool')),
+				'i_comp_uniq'	=> array('UNIQUE', array('c_vchar_size', 'c_usint')),
+			),
+		);
+		$this->tools->sql_create_table('prefix_table_name', $this->table_data);
+		$this->table_exists = true;
+	}
+
+	protected function tearDown()
+	{
+		if ($this->table_exists)
+		{
+			$this->tools->sql_table_drop('prefix_table_name');
+		}
+
+		parent::tearDown();
+	}
+
+	public function test_created_and_drop_table()
+	{
+		// table is empty after creation and queryable
+		$sql = 'SELECT * FROM prefix_table_name';
+		$result = $this->db->sql_query($sql);
+		$this->assertTrue(! $this->db->sql_fetchrow($result));
+		$this->db->sql_freeresult($result);
+
+		$this->table_exists = false;
+		$this->tools->sql_table_drop('prefix_table_name');
+	}
+
+	static protected function get_default_values()
+	{
+		return array(
+			'c_int_size' => 0,
+			'c_bint' => 0,
+			'c_uint' => 0,
+			'c_uint_size' => 0,
+			'c_tint_size' => 0,
+			'c_usint' => 0,
+			'c_bool' => 0,
+			'c_vchar' => '',
+			'c_vchar_size' => '',
+			'c_char_size' => 'abcd',
+			'c_xstext' => '',
+			'c_stext' => '',
+			'c_text' => '',
+			'c_mtext' => '',
+			'c_xstext_uni' => '',
+			'c_stext_uni' => '',
+			'c_text_uni' => '',
+			'c_mtext_uni' => '',
+			'c_timestamp' => 0,
+			'c_decimal' => 0,
+			'c_decimal_size' => 0,
+			'c_pdecimal' => 0,
+			'c_pdecimal_size' => 0,
+			'c_vchar_uni' => '',
+			'c_vchar_uni_size' => '',
+			'c_vchar_ci' => '',
+			'c_varbinary' => '',
+		);
+	}
+
+	static public function column_values()
+	{
+		return array(
+			array('c_int_size', -9999),
+			array('c_bint', '99999999999999999'),
+			array('c_uint', 16777215),
+			array('c_uint_size', 9999),
+			array('c_tint_size', -99),
+			array('c_usint', 99),
+			array('c_bool', 0),
+			array('c_vchar', str_repeat('a', 255)),
+			array('c_vchar_size', str_repeat('a', 4)),
+			array('c_char_size', str_repeat('a', 4)),
+			array('c_xstext', str_repeat('a', 1000)),
+			array('c_stext', str_repeat('a', 3000)),
+			array('c_text', str_repeat('a', 8000)),
+			array('c_mtext', str_repeat('a', 10000)),
+			array('c_xstext_uni', str_repeat("\xC3\x84", 100)),
+			array('c_stext_uni', str_repeat("\xC3\x84", 255)),
+			array('c_text_uni', str_repeat("\xC3\x84", 4000)),
+			array('c_mtext_uni', str_repeat("\xC3\x84", 10000)),
+			array('c_timestamp', 2147483647),
+			array('c_decimal', 999.99),
+			array('c_decimal_size', 9999.99),
+			array('c_pdecimal', 999.999),
+			array('c_pdecimal_size', 9999.999),
+			array('c_vchar_uni', str_repeat("\xC3\x84", 255)),
+			array('c_vchar_uni_size', str_repeat("\xC3\x84", 4)),
+			array('c_vchar_ci', str_repeat("\xC3\x84", 255)),
+			array('c_varbinary', str_repeat("\x00\xFF", 127)),
+		);
+	}
+
+	/**
+	* @dataProvider column_values
+	*/
+	public function test_created_column($column_name, $column_value)
+	{
+		if ($column_name === 'c_varbinary' && stripos(get_class($this->db), 'mysql') === false)
+		{
+			$this->markTestIncomplete('Binary handling is not implemented properly on non-MySQL DBMSes.');
+		}
+
+		$row_insert = self::get_default_values();
+		$row_insert[$column_name] = $column_value;
+
+		// empty table
+		$sql = 'DELETE FROM prefix_table_name';
+		$result = $this->db->sql_query($sql);
+
+		$sql = 'INSERT INTO prefix_table_name ' . $this->db->sql_build_array('INSERT', $row_insert);
+		$result = $this->db->sql_query($sql);
+
+		$sql = "SELECT *
+			FROM prefix_table_name";
+		$result = $this->db->sql_query($sql);
+		$row_actual = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		$row_expect = $row_insert;
+
+		unset($row_actual['id']); // auto increment id changes, so ignore
+
+		$type = $this->table_data['COLUMNS'][$column_name][0];
+		$this->assertEquals($row_expect[$column_name], $row_actual[$column_name], "Column $column_name of type $type should have equal return and input value.");
+	}
+
+	public function test_list_columns()
+	{
+		$this->assertEquals(
+			array_keys($this->table_data['COLUMNS']),
+			array_values($this->tools->sql_list_columns('prefix_table_name'))
+		);
+	}
+
+	public function test_column_exists()
+	{
+		$this->assertTrue($this->tools->sql_column_exists('prefix_table_name', 'c_id'));
+		$this->assertFalse($this->tools->sql_column_exists('prefix_table_name', 'column_does_not_exist'));
+	}
+
+	public function test_column_remove()
+	{
+		$this->assertTrue($this->tools->sql_column_exists('prefix_table_name', 'c_int_size'));
+
+		$this->assertTrue($this->tools->sql_column_remove('prefix_table_name', 'c_int_size'));
+
+		$this->assertFalse($this->tools->sql_column_exists('prefix_table_name', 'c_int_size'));
+	}
+
+	public function test_column_remove_primary()
+	{
+		$this->assertTrue($this->tools->sql_column_exists('prefix_table_name', 'c_id'));
+
+		$this->assertTrue($this->tools->sql_column_remove('prefix_table_name', 'c_id'));
+
+		$this->assertFalse($this->tools->sql_column_exists('prefix_table_name', 'c_id'));
+	}
+
+	public function test_list_tables()
+	{
+		$tables = $this->tools->sql_list_tables();
+		$this->assertTrue(isset($tables['prefix_table_name']));
+		$this->assertFalse(isset($tables['prefix_does_not_exist']));
+	}
+
+	public function test_table_exists()
+	{
+		$this->assertTrue($this->tools->sql_table_exists('prefix_table_name'));
+		$this->assertFalse($this->tools->sql_table_exists('prefix_does_not_exist'));
+	}
+
+	public function test_table_drop()
+	{
+		$this->tools->sql_create_table('prefix_test_table',
+			array('COLUMNS' => array(
+				'foo' => array('UINT', 42)))
+		);
+
+		$this->assertTrue($this->tools->sql_table_exists('prefix_test_table'));
+
+		$this->tools->sql_table_drop('prefix_test_table');
+
+		$this->assertFalse($this->tools->sql_table_exists('prefix_test_table'));
+	}
+
+	public function test_peform_schema_changes_drop_tables()
+	{
+		$db_tools = $this->getMock('phpbb_db_tools', array(
+			'sql_table_exists',
+			'sql_table_drop',
+		), array(&$this->db));
+
+		// pretend all tables exist
+		$db_tools->expects($this->any())->method('sql_table_exists')
+			->will($this->returnValue(true));
+
+		// drop tables
+		$db_tools->expects($this->exactly(2))->method('sql_table_drop');
+		$db_tools->expects($this->at(1))->method('sql_table_drop')
+			->with($this->equalTo('dropped_table_1'));
+		$db_tools->expects($this->at(3))->method('sql_table_drop')
+			->with($this->equalTo('dropped_table_2'));
+
+		$db_tools->perform_schema_changes(array(
+			'drop_tables' => array(
+				'dropped_table_1',
+				'dropped_table_2',
+			),
+		));
+	}
+
+	public function test_peform_schema_changes_drop_columns()
+	{
+		$db_tools = $this->getMock('phpbb_db_tools', array(
+			'sql_column_exists',
+			'sql_column_remove',
+		), array(&$this->db));
+
+		// pretend all columns exist
+		$db_tools->expects($this->any())->method('sql_column_exists')
+			->will($this->returnValue(true));
+		$db_tools->expects($this->any())->method('sql_column_exists')
+			->will($this->returnValue(true));
+
+		// drop columns
+		$db_tools->expects($this->exactly(2))->method('sql_column_remove');
+		$db_tools->expects($this->at(1))->method('sql_column_remove')
+			->with($this->equalTo('existing_table'), $this->equalTo('dropped_column_1'));
+		$db_tools->expects($this->at(3))->method('sql_column_remove')
+			->with($this->equalTo('existing_table'), $this->equalTo('dropped_column_2'));
+
+		$db_tools->perform_schema_changes(array(
+			'drop_columns' => array(
+				'existing_table' => array(
+					'dropped_column_1',
+					'dropped_column_2',
+				),
+			),
+		));
+	}
+
+	public function test_index_exists()
+	{
+		$this->assertTrue($this->tools->sql_index_exists('prefix_table_name', 'i_simple'));
+	}
+
+	public function test_unique_index_exists()
+	{
+		$this->assertTrue($this->tools->sql_unique_index_exists('prefix_table_name', 'i_uniq'));
+	}
+
+	public function test_create_index_against_index_exists()
+	{
+		$this->tools->sql_create_index('prefix_table_name', 'fookey', array('c_timestamp', 'c_decimal'));
+		$this->assertTrue($this->tools->sql_index_exists('prefix_table_name', 'fookey'));
+	}
+
+	public function test_create_unique_index_against_unique_index_exists()
+	{
+		$this->tools->sql_create_unique_index('prefix_table_name', 'i_uniq_ts_id', array('c_timestamp', 'c_id'));
+		$this->assertTrue($this->tools->sql_unique_index_exists('prefix_table_name', 'i_uniq_ts_id'));
+	}
+}
diff --git a/tests/dbal/fixtures/massmail_crossjoin.xml b/tests/dbal/fixtures/massmail_crossjoin.xml
new file mode 100644
index 0000000000..ef0a2b7149
--- /dev/null
+++ b/tests/dbal/fixtures/massmail_crossjoin.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_banlist">
+		<column>ban_id</column>
+		<column>ban_userid</column>
+		<row>
+			<value>1</value>
+			<value>2</value>
+		</row>
+	</table>
+	<table name="phpbb_users">
+		<column>user_id</column>
+		<column>username</column>
+		<column>username_clean</column>
+		<column>user_permissions</column>
+		<column>user_sig</column>
+		<column>user_occ</column>
+		<column>user_interests</column>
+		<row>
+			<value>1</value>
+			<value>mass email</value>
+			<value>mass email</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>2</value>
+			<value>banned</value>
+			<value>banned</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>3</value>
+			<value>not in group</value>
+			<value>not in group</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+	</table>
+	<table name="phpbb_user_group">
+		<column>user_id</column>
+		<column>group_id</column>
+		<row>
+			<value>1</value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>2</value>
+			<value>1</value>
+		</row>
+	</table>
+</dataset>
diff --git a/tests/dbal/fixtures/styles.xml b/tests/dbal/fixtures/styles.xml
new file mode 100644
index 0000000000..dcbe39d3b0
--- /dev/null
+++ b/tests/dbal/fixtures/styles.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_styles">
+		<column>style_id</column>
+		<column>style_name</column>
+		<column>style_copyright</column>
+		<column>style_active</column>
+		<column>style_path</column>
+		<column>bbcode_bitfield</column>
+		<column>style_parent_id</column>
+		<column>style_parent_tree</column>
+		<row>
+			<value>1</value>
+			<value>prosilver</value>
+			<value>&amp;copy; phpBB Group</value>
+			<value>1</value>
+			<value>prosilver</value>
+			<value>kNg=</value>
+			<value>0</value>
+			<value></value>
+		</row>
+		<row>
+			<value>2</value>
+			<value>prosilver2</value>
+			<value>&amp;copy; phpBB Group</value>
+			<value>0</value>
+			<value>prosilver2</value>
+			<value>kNg=</value>
+			<value>0</value>
+			<value></value>
+		</row>
+		<row>
+			<value>3</value>
+			<value>Prosilver1</value>
+			<value>&amp;copy; phpBB Group</value>
+			<value>0</value>
+			<value>prosilver1</value>
+			<value>kNg=</value>
+			<value>1</value>
+			<value>prosilver</value>
+		</row>
+	</table>
+</dataset>
diff --git a/tests/dbal/fixtures/three_users.xml b/tests/dbal/fixtures/three_users.xml
index a6789f4a01..a50e3e8634 100644
--- a/tests/dbal/fixtures/three_users.xml
+++ b/tests/dbal/fixtures/three_users.xml
@@ -3,17 +3,33 @@
 	<table name="phpbb_users">
 		<column>user_id</column>
 		<column>username_clean</column>
+		<column>user_permissions</column>
+		<column>user_sig</column>
+		<column>user_occ</column>
+		<column>user_interests</column>
 		<row>
 			<value>1</value>
 			<value>barfoo</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
 		</row>
 		<row>
 			<value>2</value>
 			<value>foobar</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
 		</row>
 		<row>
 			<value>3</value>
 			<value>bertie</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
 		</row>
 	</table>
 </dataset>
diff --git a/tests/dbal/order_lower_test.php b/tests/dbal/order_lower_test.php
new file mode 100644
index 0000000000..84d454742f
--- /dev/null
+++ b/tests/dbal/order_lower_test.php
@@ -0,0 +1,65 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_dbal_order_lower_test extends phpbb_database_test_case
+{
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/styles.xml');
+	}
+
+	public function test_order_lower()
+	{
+		$db = $this->new_dbal();
+
+		// http://tracker.phpbb.com/browse/PHPBB3-10507
+		// Test ORDER BY LOWER(style_name)
+		$db->sql_return_on_error(true);
+
+		$sql = 'SELECT * FROM phpbb_styles ORDER BY LOWER(style_name)';
+		$result = $db->sql_query($sql);
+
+		$db->sql_return_on_error(false);
+
+		$this->assertEquals(array(
+				array(
+					'style_id' 			=> 1,
+					'style_name'		=> 'prosilver',
+					'style_copyright'	=> '&copy; phpBB Group',
+					'style_active'		=> 1,
+					'style_path'		=> 'prosilver',
+					'bbcode_bitfield'	=> 'kNg=',
+					'style_parent_id'	=> 0,
+					'style_parent_tree'	=> '',
+				),
+				array(
+					'style_id' 			=> 3,
+					'style_name'		=> 'Prosilver1',
+					'style_copyright'	=> '&copy; phpBB Group',
+					'style_active'		=> 0,
+					'style_path'		=> 'prosilver1',
+					'bbcode_bitfield'	=> 'kNg=',
+					'style_parent_id'	=> 1,
+					'style_parent_tree'	=> 'prosilver',
+				),
+				array(
+					'style_id' 			=> 2,
+					'style_name'		=> 'prosilver2',
+					'style_copyright'	=> '&copy; phpBB Group',
+					'style_active'		=> 0,
+					'style_path'		=> 'prosilver2',
+					'bbcode_bitfield'	=> 'kNg=',
+					'style_parent_id'	=> 0,
+					'style_parent_tree'	=> '',
+				)
+			), 
+			$db->sql_fetchrowset($result)
+		);
+	}
+}
diff --git a/tests/dbal/schema_test.php b/tests/dbal/schema_test.php
new file mode 100644
index 0000000000..2a332fddba
--- /dev/null
+++ b/tests/dbal/schema_test.php
@@ -0,0 +1,38 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 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_dbal_schema_test extends phpbb_database_test_case
+{
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/config.xml');
+	}
+
+	public function test_config_value_multibyte()
+	{
+		$db = $this->new_dbal();
+
+		$value = str_repeat("\xC3\x84", 255);
+		$sql = "INSERT INTO phpbb_config
+			(config_name, config_value)
+			VALUES ('name', '$value')";
+		$result = $db->sql_query($sql);
+
+		$sql = "SELECT config_value
+			FROM phpbb_config
+			WHERE config_name = 'name'";
+		$result = $db->sql_query_limit($sql, 1);
+		$row = $db->sql_fetchrow($result);
+		$db->sql_freeresult($result);
+
+		$this->assertEquals($value, $row['config_value']);
+	}
+}
diff --git a/tests/dbal/select_test.php b/tests/dbal/select_test.php
index 533416f14b..bd524100a2 100644
--- a/tests/dbal/select_test.php
+++ b/tests/dbal/select_test.php
@@ -3,11 +3,12 @@
 *
 * @package testing
 * @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
 require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php';
 
 class phpbb_dbal_select_test extends phpbb_database_test_case
 {
@@ -16,7 +17,7 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
 		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/three_users.xml');
 	}
 
-	public static function return_on_error_select_data()
+	public function return_on_error_select_data()
 	{
 		return array(
 			array('phpbb_users', "username_clean = 'bertie'", array(array('username_clean' => 'bertie'))),
@@ -43,7 +44,7 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
 		$this->assertEquals($expected, $db->sql_fetchrowset($result));
 	}
 
-	public static function fetchrow_data()
+	public function fetchrow_data()
 	{
 		return array(
 			array('', array(array('username_clean' => 'barfoo'),
@@ -94,7 +95,7 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
 		$db->sql_freeresult($result);
 	}
 
-	public static function fetchfield_data()
+	public function fetchfield_data()
 	{
 		return array(
 			array('', array('barfoo', 'foobar', 'bertie')),
@@ -124,6 +125,32 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
 		$this->assertEquals($expected, $ary);
 	}
 
+	public static function fetchfield_seek_data()
+	{
+		return array(
+			array(1, 'foobar'),
+			array(0, 'barfoo'),
+			array(2, 'bertie'),
+		);
+	}
+
+	/**
+	* @dataProvider fetchfield_seek_data
+	*/
+	public function test_fetchfield_seek($rownum, $expected)
+	{
+		$db = $this->new_dbal();
+
+		$result = $db->sql_query('SELECT username_clean
+			FROM phpbb_users
+			ORDER BY user_id ASC');
+
+		$field = $db->sql_fetchfield('username_clean', $rownum, $result);
+		$db->sql_freeresult($result);
+
+		$this->assertEquals($expected, $field);
+	}
+
 	public static function query_limit_data()
 	{
 		return array(
@@ -165,7 +192,7 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
 		$this->assertEquals($expected, $ary);
 	}
 
-	public static function like_expression_data()
+	public function like_expression_data()
 	{
 		// * = any_char; # = one_char
 		return array(
@@ -202,7 +229,7 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
 		$db->sql_freeresult($result);
 	}
 
-	public static function in_set_data()
+	public function in_set_data()
 	{
 		return array(
 			array('user_id', 3, false, false, array(array('username_clean' => 'bertie'))),
@@ -276,7 +303,7 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
 		$db->sql_freeresult($result);
 	}
 
-	public static function build_array_data()
+	public function build_array_data()
 	{
 		return array(
 			array(array('username_clean' => 'barfoo'), array(array('username_clean' => 'barfoo'))),
@@ -317,4 +344,70 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
 
 		$db->sql_freeresult($result);
 	}
+
+	public function test_nested_transactions()
+	{
+		$db = $this->new_dbal();
+
+		// nested transactions should work on systems that do not require
+		// buffering of nested transactions, so ignore the ones that need
+		// buffering
+		if ($db->sql_buffer_nested_transactions())
+		{
+			return;
+		}
+
+		$sql = 'SELECT user_id FROM phpbb_users ORDER BY user_id ASC';
+		$result1 = $db->sql_query($sql);
+
+		$db->sql_transaction('begin');
+		$result2 = $db->sql_query($sql);
+		$row = $db->sql_fetchrow($result2);
+		$db->sql_transaction('commit');
+
+		$this->assertEquals('1', $row['user_id']);
+	}
+
+	/**
+	 * fix for PHPBB3-10307
+	 */
+	public function test_sql_fetchrow_returns_false_when_empty()
+	{
+		$db = $this->new_dbal();
+
+		$sql = 'SELECT user_id
+			FROM phpbb_users
+			WHERE 1 = 0';
+		$result = $db->sql_query($sql);
+
+		$row = $db->sql_fetchrow($result);
+		$db->sql_freeresult($result);
+
+		$this->assertSame(false, $row);
+	}
+
+	public function test_get_row_count()
+	{
+		$this->assertSame(
+			3,
+			(int) $this->new_dbal()->get_row_count('phpbb_users'),
+			"Failed asserting that user table has exactly 3 rows."
+		);
+	}
+
+	public function test_get_estimated_row_count()
+	{
+		$actual = $this->new_dbal()->get_estimated_row_count('phpbb_users');
+
+		if (is_string($actual) && isset($actual[0]) && $actual[0] === '~')
+		{
+			$actual = substr($actual, 1);
+		}
+
+		$this->assertGreaterThan(
+			1,
+			$actual,
+			"Failed asserting that estimated row count of user table is greater than 1."
+		);
+	}
 }
diff --git a/tests/dbal/write_test.php b/tests/dbal/write_test.php
index 4709d45fa5..987161a831 100644
--- a/tests/dbal/write_test.php
+++ b/tests/dbal/write_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
@@ -16,7 +16,7 @@ class phpbb_dbal_write_test extends phpbb_database_test_case
 		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/config.xml');
 	}
 
-	public static function build_array_insert_data()
+	public function build_array_insert_data()
 	{
 		return array(
 			array(array(
@@ -104,7 +104,7 @@ class phpbb_dbal_write_test extends phpbb_database_test_case
 		$db->sql_freeresult($result);
 	}
 
-	public static function update_data()
+	public function update_data()
 	{
 		return array(
 			array(
diff --git a/tests/download/http_byte_range_test.php b/tests/download/http_byte_range_test.php
index ba2caee192..23b9169fe3 100644
--- a/tests/download/http_byte_range_test.php
+++ b/tests/download/http_byte_range_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
@@ -14,17 +14,20 @@ class phpbb_download_http_byte_range_test extends phpbb_test_case
 	public function test_find_range_request()
 	{
 		// Missing 'bytes=' prefix
-		$_SERVER['HTTP_RANGE'] = 'bztes=';
+		$GLOBALS['request'] = new phpbb_mock_request();
+		$GLOBALS['request']->set_header('Range', 'bztes=');
 		$this->assertEquals(false, phpbb_find_range_request());
-		unset($_SERVER['HTTP_RANGE']);
+		unset($GLOBALS['request']);
 
+		$GLOBALS['request'] = new phpbb_mock_request();
 		$_ENV['HTTP_RANGE'] = 'bztes=';
 		$this->assertEquals(false, phpbb_find_range_request());
 		unset($_ENV['HTTP_RANGE']);
 
-		$_SERVER['HTTP_RANGE'] = 'bytes=0-0,123-125';
+		$GLOBALS['request'] = new phpbb_mock_request();
+		$GLOBALS['request']->set_header('Range', 'bytes=0-0,123-125');
 		$this->assertEquals(array('0-0', '123-125'), phpbb_find_range_request());
-		unset($_SERVER['HTTP_RANGE']);
+		unset($GLOBALS['request']);
 	}
 
 	/**
diff --git a/tests/error_collector_test.php b/tests/error_collector_test.php
new file mode 100644
index 0000000000..d67dea3719
--- /dev/null
+++ b/tests/error_collector_test.php
@@ -0,0 +1,35 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../phpBB/includes/error_collector.php';
+
+class phpbb_error_collector_test extends phpbb_test_case
+{
+	public function test_collection()
+	{
+		$collector = new phpbb_error_collector;
+		$collector->install();
+
+		// Cause a warning
+		1/0; $line = __LINE__;
+
+		$collector->uninstall();
+
+		list($errno, $msg_text, $errfile, $errline) = $collector->errors[0];
+		$error_contents = $collector->format_errors();
+
+		$this->assertEquals($errno, 2);
+
+		// Unfortunately $error_contents will contain the full path here,
+		// because the tests directory is outside of phpbb root path.
+		$this->assertStringStartsWith('Errno 2: Division by zero at ', $error_contents);
+		$this->assertStringEndsWith(" line $line", $error_contents);
+	}
+}
diff --git a/tests/event/dispatcher_test.php b/tests/event/dispatcher_test.php
new file mode 100644
index 0000000000..f8fe060d99
--- /dev/null
+++ b/tests/event/dispatcher_test.php
@@ -0,0 +1,29 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_event_dispatcher_test extends phpbb_test_case
+{
+    public function test_trigger_event()
+    {
+        $dispatcher = new phpbb_event_dispatcher();
+
+        $dispatcher->addListener('core.test_event', function (phpbb_event_data $event) {
+            $event['foo'] = $event['foo'] . '2';
+            $event['bar'] = $event['bar'] . '2';
+        });
+
+        $foo = 'foo';
+        $bar = 'bar';
+
+        $vars = array('foo', 'bar');
+        $result = $dispatcher->trigger_event('core.test_event', compact($vars));
+
+        $this->assertSame(array('foo' => 'foo2', 'bar' => 'bar2'), $result);
+    }
+}
diff --git a/tests/extension/acp.php b/tests/extension/acp.php
new file mode 100644
index 0000000000..790df77c0d
--- /dev/null
+++ b/tests/extension/acp.php
@@ -0,0 +1,205 @@
+<?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/ext.php b/tests/extension/ext/bar/ext.php
new file mode 100644
index 0000000000..5585edf9ac
--- /dev/null
+++ b/tests/extension/ext/bar/ext.php
@@ -0,0 +1,24 @@
+<?php
+
+class phpbb_ext_bar_ext extends phpbb_extension_base
+{
+	static public $state;
+
+	public function enable_step($old_state)
+	{
+		// run 4 steps, then quit
+		if ($old_state === 4)
+		{
+			return false;
+		}
+
+		if ($old_state === false)
+		{
+			$old_state = 0;
+		}
+
+		self::$state = ++$old_state;
+
+		return self::$state;
+	}
+}
diff --git a/tests/extension/ext/bar/my/hidden_class.php b/tests/extension/ext/bar/my/hidden_class.php
new file mode 100644
index 0000000000..0261d7c59a
--- /dev/null
+++ b/tests/extension/ext/bar/my/hidden_class.php
@@ -0,0 +1,5 @@
+<?php
+
+class phpbb_ext_bar_my_hidden_class
+{
+}
diff --git a/tests/extension/ext/foo/a_class.php b/tests/extension/ext/foo/a_class.php
new file mode 100644
index 0000000000..b7be1ad654
--- /dev/null
+++ b/tests/extension/ext/foo/a_class.php
@@ -0,0 +1,5 @@
+<?php
+
+class phpbb_ext_foo_a_class
+{
+}
diff --git a/tests/extension/ext/foo/b_class.php b/tests/extension/ext/foo/b_class.php
new file mode 100644
index 0000000000..4645266122
--- /dev/null
+++ b/tests/extension/ext/foo/b_class.php
@@ -0,0 +1,5 @@
+<?php
+
+class phpbb_ext_foo_b_class
+{
+}
diff --git a/tests/extension/ext/foo/composer.json b/tests/extension/ext/foo/composer.json
new file mode 100644
index 0000000000..744f7be625
--- /dev/null
+++ b/tests/extension/ext/foo/composer.json
@@ -0,0 +1,22 @@
+{
+	"name": "foo/example",
+	"type": "phpbb3-extension",
+	"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",
+	"authors": [{
+			"name": "Nathan Guse",
+			"username": "EXreaction",
+			"email": "email@phpbb.com",
+			"homepage": "http://lithiumstudios.org",
+			"role": "N/A"
+		}],
+	"require": {
+		"php": ">=5.3",
+		"phpbb": "3.1.0-dev"
+	},
+	"extra": {
+		"display-name": "phpBB Foo Extension"
+	}
+}
diff --git a/tests/extension/ext/foo/ext.php b/tests/extension/ext/foo/ext.php
new file mode 100644
index 0000000000..60b3ad1f16
--- /dev/null
+++ b/tests/extension/ext/foo/ext.php
@@ -0,0 +1,13 @@
+<?php
+
+class phpbb_ext_foo_ext extends phpbb_extension_base
+{
+	static public $disabled;
+
+	public function disable_step($old_state)
+	{
+		self::$disabled = true;
+
+		return false;
+	}
+}
diff --git a/tests/extension/ext/foo/sub/type/alternative.php b/tests/extension/ext/foo/sub/type/alternative.php
new file mode 100644
index 0000000000..2ea7353f4b
--- /dev/null
+++ b/tests/extension/ext/foo/sub/type/alternative.php
@@ -0,0 +1,5 @@
+<?php
+
+class phpbb_ext_foo_sub_type_alternative
+{
+}
diff --git a/tests/extension/ext/foo/type/alternative.php b/tests/extension/ext/foo/type/alternative.php
new file mode 100644
index 0000000000..404b66b965
--- /dev/null
+++ b/tests/extension/ext/foo/type/alternative.php
@@ -0,0 +1,5 @@
+<?php
+
+class phpbb_ext_foo_type_alternative
+{
+}
diff --git a/tests/extension/ext/foo/type/dummy/empty.txt b/tests/extension/ext/foo/type/dummy/empty.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/extension/ext/foo/type/dummy/empty.txt
diff --git a/tests/extension/ext/foo/typewrong/error.php b/tests/extension/ext/foo/typewrong/error.php
new file mode 100644
index 0000000000..ba22cfae9a
--- /dev/null
+++ b/tests/extension/ext/foo/typewrong/error.php
@@ -0,0 +1,5 @@
+<?php
+
+class phpbb_ext_foo_typewrong_error
+{
+}
diff --git a/tests/extension/ext/vendor/moo/composer.json b/tests/extension/ext/vendor/moo/composer.json
new file mode 100644
index 0000000000..c91a5e027b
--- /dev/null
+++ b/tests/extension/ext/vendor/moo/composer.json
@@ -0,0 +1,22 @@
+{
+	"name": "moo/example",
+	"type": "phpbb3-extension",
+	"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": "GNU GPL v2",
+	"authors": [{
+			"name": "Nathan Guse",
+			"username": "EXreaction",
+			"email": "email@phpbb.com",
+			"homepage": "http://lithiumstudios.org",
+			"role": "N/A"
+		}],
+	"require": {
+		"php": ">=5.3",
+		"phpbb": "3.1.0-dev"
+	},
+	"extra": {
+		"display-name": "phpBB Moo Extension"
+	}
+}
diff --git a/tests/extension/ext/vendor/moo/ext.php b/tests/extension/ext/vendor/moo/ext.php
new file mode 100644
index 0000000000..e0ac1a22cc
--- /dev/null
+++ b/tests/extension/ext/vendor/moo/ext.php
@@ -0,0 +1,13 @@
+<?php
+
+class phpbb_ext_vendor_moo_ext extends phpbb_extension_base
+{
+	static public $purged;
+
+	public function purge_step($old_state)
+	{
+		self::$purged = true;
+
+		return false;
+	}
+}
diff --git a/tests/extension/ext/vendor/moo/feature_class.php b/tests/extension/ext/vendor/moo/feature_class.php
new file mode 100644
index 0000000000..c3bcc4451c
--- /dev/null
+++ b/tests/extension/ext/vendor/moo/feature_class.php
@@ -0,0 +1,5 @@
+<?php
+
+class phpbb_ext_vendor_moo_feature_class
+{
+}
diff --git a/tests/extension/finder_test.php b/tests/extension/finder_test.php
new file mode 100644
index 0000000000..622f404786
--- /dev/null
+++ b/tests/extension/finder_test.php
@@ -0,0 +1,203 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_extension_finder_test extends phpbb_test_case
+{
+	protected $extension_manager;
+	protected $finder;
+
+	public function setUp()
+	{
+		$this->extension_manager = new phpbb_mock_extension_manager(
+			dirname(__FILE__) . '/',
+			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/',
+				),
+			));
+
+		$this->finder = $this->extension_manager->get_finder();
+	}
+
+	public function test_suffix_get_classes()
+	{
+		$classes = $this->finder
+			->core_path('includes/default/')
+			->extension_suffix('_class')
+			->get_classes();
+
+		sort($classes);
+		$this->assertEquals(
+			array(
+				'phpbb_default_implementation',
+				'phpbb_ext_bar_my_hidden_class',
+				'phpbb_ext_foo_a_class',
+				'phpbb_ext_foo_b_class',
+			),
+			$classes
+		);
+	}
+
+	public function test_get_directories()
+	{
+		$dirs = $this->finder
+			->directory('/type')
+			->get_directories();
+
+		sort($dirs);
+		$this->assertEquals(array(
+			dirname(__FILE__) . '/ext/foo/type/',
+		), $dirs);
+	}
+
+	public function test_prefix_get_directories()
+	{
+		$dirs = $this->finder
+            ->prefix('t')
+			->get_directories();
+
+		sort($dirs);
+		$this->assertEquals(array(
+			dirname(__FILE__) . '/ext/foo/sub/type/',
+			dirname(__FILE__) . '/ext/foo/type/',
+			dirname(__FILE__) . '/ext/foo/typewrong/',
+		), $dirs);
+	}
+
+	public function test_prefix_get_classes()
+	{
+		$classes = $this->finder
+			->core_path('includes/default/')
+			->extension_prefix('hidden_')
+			->get_classes();
+
+		sort($classes);
+		$this->assertEquals(
+			array(
+				'phpbb_default_implementation',
+				'phpbb_ext_bar_my_hidden_class',
+			),
+			$classes
+		);
+	}
+
+	public function test_directory_get_classes()
+	{
+		$classes = $this->finder
+			->core_path('includes/default/')
+			->extension_directory('type')
+			->get_classes();
+
+		sort($classes);
+		$this->assertEquals(
+			array(
+				'phpbb_default_implementation',
+				'phpbb_ext_foo_sub_type_alternative',
+				'phpbb_ext_foo_type_alternative',
+			),
+			$classes
+		);
+	}
+
+	public function test_absolute_directory_get_classes()
+	{
+		$classes = $this->finder
+			->directory('/type/')
+			->get_classes();
+
+		sort($classes);
+		$this->assertEquals(
+			array(
+				'phpbb_ext_foo_type_alternative',
+			),
+			$classes
+		);
+	}
+
+	public function test_sub_directory_get_classes()
+	{
+		$classes = $this->finder
+			->directory('/sub/type')
+			->get_classes();
+
+		sort($classes);
+		$this->assertEquals(
+			array(
+				'phpbb_ext_foo_sub_type_alternative',
+			),
+			$classes
+		);
+	}
+
+	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');
+		$files = $finder->suffix('_class.php')->get_files();
+
+		$expected_files = array(
+			'ext/bar/my/hidden_class.php' => 'bar',
+			'ext/foo/a_class.php' => 'foo',
+			'ext/foo/b_class.php' => 'foo',
+		);
+
+		$query = array(
+			'core_path' => false,
+			'core_suffix' => '_class.php',
+			'core_prefix' => false,
+			'core_directory' => false,
+			'extension_suffix' => '_class.php',
+			'extension_prefix' => false,
+			'extension_directory' => false,
+			'is_dir' => false,
+		);
+
+		$cache->checkAssociativeVar($this, '_custom_cache_name', array(
+			md5(serialize($query)) => $expected_files,
+		), false);
+	}
+
+	public function test_cached_get_files()
+	{
+		$query = array(
+			'core_path' => 'includes/foo',
+			'core_suffix' => false,
+			'core_prefix' => false,
+			'core_directory' => 'bar',
+			'extension_suffix' => false,
+			'extension_prefix' => false,
+			'extension_directory' => false,
+			'is_dir' => false,
+		);
+
+		$finder = new phpbb_extension_finder($this->extension_manager, dirname(__FILE__) . '/', new phpbb_mock_cache(array(
+			'_ext_finder' => array(
+				md5(serialize($query)) => array('file_name' => 'extension'),
+			),
+		)));
+
+		$classes = $finder
+			->core_path($query['core_path'])
+			->core_directory($query['core_directory'])
+			->get_files();
+
+		sort($classes);
+		$this->assertEquals(
+			array(dirname(__FILE__) . '/file_name'),
+			$classes
+		);
+	}
+}
diff --git a/tests/extension/fixtures/extensions.xml b/tests/extension/fixtures/extensions.xml
new file mode 100644
index 0000000000..6eb6fd11a5
--- /dev/null
+++ b/tests/extension/fixtures/extensions.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_ext">
+		<column>ext_name</column>
+		<column>ext_active</column>
+		<column>ext_state</column>
+		<row>
+			<value>foo</value>
+			<value>1</value>
+			<value></value>
+		</row>
+		<row>
+			<value>vendor/moo</value>
+			<value>0</value>
+			<value></value>
+		</row>
+	</table>
+</dataset>
diff --git a/tests/extension/includes/default/implementation.php b/tests/extension/includes/default/implementation.php
new file mode 100644
index 0000000000..91d5f8aa2f
--- /dev/null
+++ b/tests/extension/includes/default/implementation.php
@@ -0,0 +1,5 @@
+<?php
+
+class phpbb_default_impl_class implements phpbb_default_interface
+{
+}
diff --git a/tests/extension/manager_test.php b/tests/extension/manager_test.php
new file mode 100644
index 0000000000..5cde5bccdb
--- /dev/null
+++ b/tests/extension/manager_test.php
@@ -0,0 +1,103 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/ext/bar/ext.php';
+require_once dirname(__FILE__) . '/ext/foo/ext.php';
+require_once dirname(__FILE__) . '/ext/vendor/moo/ext.php';
+
+class phpbb_extension_manager_test extends phpbb_database_test_case
+{
+	protected $extension_manager;
+	protected $class_loader;
+
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/extensions.xml');
+	}
+
+	protected function setUp()
+	{
+		parent::setUp();
+
+		$this->extension_manager = new phpbb_extension_manager(
+			$this->new_dbal(),
+			new phpbb_config(array()),
+			'phpbb_ext',
+			dirname(__FILE__) . '/',
+			'.php',
+			new phpbb_mock_cache
+		);
+	}
+
+	public function test_available()
+	{
+		$this->assertEquals(array('bar', 'foo', 'vendor/moo'), array_keys($this->extension_manager->all_available()));
+	}
+
+	public function test_enabled()
+	{
+		$this->assertEquals(array('foo'), array_keys($this->extension_manager->all_enabled()));
+	}
+
+	public function test_configured()
+	{
+		$this->assertEquals(array('foo', 'vendor/moo'), array_keys($this->extension_manager->all_configured()));
+	}
+
+	public function test_enable()
+	{
+		phpbb_ext_bar_ext::$state = 0;
+
+		$this->assertEquals(array('foo'), array_keys($this->extension_manager->all_enabled()));
+		$this->extension_manager->enable('bar');
+		$this->assertEquals(array('bar', 'foo'), array_keys($this->extension_manager->all_enabled()));
+		$this->assertEquals(array('bar', 'foo', 'vendor/moo'), array_keys($this->extension_manager->all_configured()));
+
+		$this->assertEquals(4, phpbb_ext_bar_ext::$state);
+	}
+
+	public function test_disable()
+	{
+		phpbb_ext_foo_ext::$disabled = false;
+
+		$this->assertEquals(array('foo'), array_keys($this->extension_manager->all_enabled()));
+		$this->extension_manager->disable('foo');
+		$this->assertEquals(array(), array_keys($this->extension_manager->all_enabled()));
+		$this->assertEquals(array('foo', 'vendor/moo'), array_keys($this->extension_manager->all_configured()));
+
+		$this->assertTrue(phpbb_ext_foo_ext::$disabled);
+	}
+
+	public function test_purge()
+	{
+		phpbb_ext_vendor_moo_ext::$purged = false;
+
+		$this->assertEquals(array('foo'), array_keys($this->extension_manager->all_enabled()));
+		$this->assertEquals(array('foo', 'vendor/moo'), array_keys($this->extension_manager->all_configured()));
+		$this->extension_manager->purge('vendor/moo');
+		$this->assertEquals(array('foo'), array_keys($this->extension_manager->all_enabled()));
+		$this->assertEquals(array('foo'), array_keys($this->extension_manager->all_configured()));
+
+		$this->assertTrue(phpbb_ext_vendor_moo_ext::$purged);
+	}
+
+	public function test_enabled_no_cache()
+	{
+		$extension_manager = new phpbb_extension_manager(
+			$this->new_dbal(),
+			new phpbb_config(array()),
+			'phpbb_ext',
+			dirname(__FILE__) . '/',
+			'.php'
+		);
+
+		$this->assertEquals(array('foo'), array_keys($extension_manager->all_enabled()));
+	}
+
+}
diff --git a/tests/extension/metadata_manager_test.php b/tests/extension/metadata_manager_test.php
new file mode 100644
index 0000000000..ce7be0dea5
--- /dev/null
+++ b/tests/extension/metadata_manager_test.php
@@ -0,0 +1,431 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class metadata_manager_test extends phpbb_database_test_case
+{
+	protected $class_loader;
+	protected $extension_manager;
+
+	protected $cache;
+	protected $config;
+	protected $db;
+	protected $phpbb_root_path;
+	protected $phpEx;
+	protected $template;
+	protected $user;
+
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/extensions.xml');
+	}
+
+	protected function setUp()
+	{
+		parent::setUp();
+
+		$this->cache = new phpbb_mock_cache();
+		$this->config = new phpbb_config(array(
+			'version'		=> '3.1.0',
+		));
+		$this->db = $this->new_dbal();
+		$this->phpbb_root_path = dirname(__FILE__) . '/';
+		$this->phpEx = '.php';
+		$this->user = new phpbb_user();
+
+		$this->template = new phpbb_template(
+			$this->phpbb_root_path,
+			$this->phpEx,
+			$this->config,
+			$this->user,
+			new phpbb_style_resource_locator(),
+			new phpbb_template_context()
+		);
+
+		$this->extension_manager = new phpbb_extension_manager(
+			$this->db,
+			$this->config,
+			'phpbb_ext',
+			$this->phpbb_root_path,
+			$this->phpEx,
+			$this->cache
+		);
+	}
+
+	// Should fail from missing composer.json
+	public function test_bar()
+	{
+		$ext_name = 'bar';
+
+		$manager = $this->get_metadata_manager($ext_name);
+
+		try
+		{
+			$manager->get_metadata();
+		}
+		catch(phpbb_extension_exception $e){}
+
+		$this->assertEquals((string) $e, 'The required file does not exist: ' . $this->phpbb_root_path . $this->extension_manager->get_extension_path($ext_name) . 'composer.json');
+	}
+
+	// Should be the same as a direct json_decode of the composer.json file
+	public function test_foo()
+	{
+		$ext_name = 'foo';
+
+		$manager = $this->get_metadata_manager($ext_name);
+
+		try
+		{
+			$metadata = $manager->get_metadata();
+		}
+		catch(phpbb_extension_exception $e)
+		{
+			$this->fail($e);
+		}
+
+		$json = json_decode(file_get_contents($this->phpbb_root_path . 'ext/foo/composer.json'), true);
+
+		$this->assertEquals($metadata, $json);
+	}
+
+	public function test_validator_non_existant()
+	{
+		$ext_name = 'validator';
+
+		$manager = $this->get_metadata_manager($ext_name);
+
+		// Non-existant data
+		try
+		{
+			$manager->validate('name');
+
+			$this->fail('Exception not triggered');
+		}
+		catch(phpbb_extension_exception $e)
+		{
+			$this->assertEquals((string) $e, 'Required meta field \'name\' has not been set.');
+		}
+
+		try
+		{
+			$manager->validate('type');
+
+			$this->fail('Exception not triggered');
+		}
+		catch(phpbb_extension_exception $e)
+		{
+			$this->assertEquals((string) $e, 'Required meta field \'type\' has not been set.');
+		}
+
+		try
+		{
+			$manager->validate('licence');
+
+			$this->fail('Exception not triggered');
+		}
+		catch(phpbb_extension_exception $e)
+		{
+			$this->assertEquals((string) $e, 'Required meta field \'licence\' has not been set.');
+		}
+
+		try
+		{
+			$manager->validate('version');
+
+			$this->fail('Exception not triggered');
+		}
+		catch(phpbb_extension_exception $e)
+		{
+			$this->assertEquals((string) $e, 'Required meta field \'version\' has not been set.');
+		}
+
+		try
+		{
+			$manager->validate_authors();
+
+			$this->fail('Exception not triggered');
+		}
+		catch(phpbb_extension_exception $e)
+		{
+			$this->assertEquals((string) $e, 'Required meta field \'authors\' has not been set.');
+		}
+
+		$manager->merge_metadata(array(
+			'authors'	=> array(
+				array(),
+			),
+		));
+
+		try
+		{
+			$manager->validate_authors();
+
+			$this->fail('Exception not triggered');
+		}
+		catch(phpbb_extension_exception $e)
+		{
+			$this->assertEquals((string) $e, 'Required meta field \'author name\' has not been set.');
+		}
+	}
+
+
+	public function test_validator_invalid()
+	{
+		$ext_name = 'validator';
+
+		$manager = $this->get_metadata_manager($ext_name);
+
+		// Invalid data
+		$manager->set_metadata(array(
+			'name'		=> 'asdf',
+			'type'		=> 'asdf',
+			'licence'	=> '',
+			'version'	=> '',
+		));
+
+		try
+		{
+			$manager->validate('name');
+
+			$this->fail('Exception not triggered');
+		}
+		catch(phpbb_extension_exception $e)
+		{
+			$this->assertEquals((string) $e, 'Meta field \'name\' is invalid.');
+		}
+
+		try
+		{
+			$manager->validate('type');
+
+			$this->fail('Exception not triggered');
+		}
+		catch(phpbb_extension_exception $e)
+		{
+			$this->assertEquals((string) $e, 'Meta field \'type\' is invalid.');
+		}
+
+		try
+		{
+			$manager->validate('licence');
+
+			$this->fail('Exception not triggered');
+		}
+		catch(phpbb_extension_exception $e)
+		{
+			$this->assertEquals((string) $e, 'Meta field \'licence\' is invalid.');
+		}
+
+		try
+		{
+			$manager->validate('version');
+
+			$this->fail('Exception not triggered');
+		}
+		catch(phpbb_extension_exception $e)
+		{
+			$this->assertEquals((string) $e, 'Meta field \'version\' is invalid.');
+		}
+	}
+
+	public function test_validator_valid()
+	{
+		$ext_name = 'validator';
+
+		$manager = $this->get_metadata_manager($ext_name);
+
+		// Valid data
+		$manager->set_metadata(array(
+			'name'		=> 'test/foo',
+			'type'		=> 'phpbb3-extension',
+			'licence'	=> 'GPL v2',
+			'version'	=> '1.0.0',
+		));
+
+		try
+		{
+			$this->assertEquals(true, $manager->validate('enable'));
+		}
+		catch(phpbb_extension_exception $e)
+		{
+			$this->fail($e);
+		}
+	}
+
+
+	public function test_validator_requirements()
+	{
+		$ext_name = 'validator';
+
+		$manager = $this->get_metadata_manager($ext_name);
+		// Too high of requirements
+		$manager->merge_metadata(array(
+			'require'		=> array(
+				'php'		=> '10.0.0',
+				'phpbb'		=> '3.2.0', // config is set to 3.1.0
+			),
+		));
+
+		try
+		{
+			$this->assertEquals(false, $manager->validate_require_php());
+			$this->assertEquals(false, $manager->validate_require_phpbb());
+		}
+		catch(phpbb_extension_exception $e)
+		{
+			$this->fail($e);
+		}
+
+
+		// Too high of requirements
+		$manager->merge_metadata(array(
+			'require'		=> array(
+				'php'		=> '5.3.0',
+				'phpbb'		=> '3.1.0-beta', // config is set to 3.1.0
+			),
+		));
+
+		try
+		{
+			$this->assertEquals(true, $manager->validate_require_php());
+			$this->assertEquals(true, $manager->validate_require_phpbb());
+		}
+		catch(phpbb_extension_exception $e)
+		{
+			$this->fail($e);
+		}
+
+
+		// Too high of requirements
+		$manager->merge_metadata(array(
+			'require'		=> array(
+				'php'		=> '>' . phpversion(),
+				'phpbb'		=> '>3.1.0', // config is set to 3.1.0
+			),
+		));
+
+		try
+		{
+			$this->assertEquals(false, $manager->validate_require_php());
+			$this->assertEquals(false, $manager->validate_require_phpbb());
+		}
+		catch(phpbb_extension_exception $e)
+		{
+			$this->fail($e);
+		}
+
+
+		// Too high of current install
+		$manager->merge_metadata(array(
+			'require'		=> array(
+				'php'		=> '<' . phpversion(),
+				'phpbb'		=> '<3.1.0', // config is set to 3.1.0
+			),
+		));
+
+		try
+		{
+			$this->assertEquals(false, $manager->validate_require_php());
+			$this->assertEquals(false, $manager->validate_require_phpbb());
+		}
+		catch(phpbb_extension_exception $e)
+		{
+			$this->fail($e);
+		}
+
+
+		// Matching requirements
+		$manager->merge_metadata(array(
+			'require'		=> array(
+				'php'		=> phpversion(),
+				'phpbb'		=> '3.1.0', // config is set to 3.1.0
+			),
+		));
+
+		try
+		{
+			$this->assertEquals(true, $manager->validate_require_php());
+			$this->assertEquals(true, $manager->validate_require_phpbb());
+		}
+		catch(phpbb_extension_exception $e)
+		{
+			$this->fail($e);
+		}
+
+
+		// Matching requirements
+		$manager->merge_metadata(array(
+			'require'		=> array(
+				'php'		=> '>=' . phpversion(),
+				'phpbb'		=> '>=3.1.0', // config is set to 3.1.0
+			),
+		));
+
+		try
+		{
+			$this->assertEquals(true, $manager->validate_require_php());
+			$this->assertEquals(true, $manager->validate_require_phpbb());
+		}
+		catch(phpbb_extension_exception $e)
+		{
+			$this->fail($e);
+		}
+
+
+		// Matching requirements
+		$manager->merge_metadata(array(
+			'require'		=> array(
+				'php'		=> '<=' . phpversion(),
+				'phpbb'		=> '<=3.1.0', // config is set to 3.1.0
+			),
+		));
+
+		try
+		{
+			$this->assertEquals(true, $manager->validate_require_php());
+			$this->assertEquals(true, $manager->validate_require_phpbb());
+		}
+		catch(phpbb_extension_exception $e)
+		{
+			$this->fail($e);
+		}
+	}
+
+	/**
+	* Get an instance of the metadata manager
+	*
+	* @param string $ext_name
+	* @return phpbb_extension_metadata_manager_test
+	*/
+	private function get_metadata_manager($ext_name)
+	{
+		return new phpbb_extension_metadata_manager_test(
+			$ext_name,
+			$this->db,
+			$this->extension_manager,
+			$this->phpbb_root_path,
+			$this->phpEx,
+			$this->template,
+			$this->config
+		);
+	}
+}
+
+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/functional/auth_test.php b/tests/functional/auth_test.php
new file mode 100644
index 0000000000..e955dcb4df
--- /dev/null
+++ b/tests/functional/auth_test.php
@@ -0,0 +1,40 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @group functional
+*/
+class phpbb_functional_auth_test extends phpbb_functional_test_case
+{
+	public function test_login()
+	{
+		$this->login();
+
+		// check for logout link
+		$crawler = $this->request('GET', 'index.php');
+		$this->assertContains($this->lang('LOGOUT_USER', 'admin'), $crawler->filter('.navbar')->text());
+	}
+
+	/**
+	* @depends test_login
+	*/
+	public function test_logout()
+	{
+		$this->login();
+		$this->add_lang('ucp');
+
+		// logout
+		$crawler = $this->request('GET', 'ucp.php?sid=' . $this->sid . '&mode=logout');
+		$this->assertContains($this->lang('LOGOUT_REDIRECT'), $crawler->filter('#message')->text());
+
+		// look for a register link, which should be visible only when logged out
+		$crawler = $this->request('GET', 'index.php');
+		$this->assertContains($this->lang('REGISTER'), $crawler->filter('.navbar')->text());
+	}
+}
diff --git a/tests/functional/browse_test.php b/tests/functional/browse_test.php
new file mode 100644
index 0000000000..26c18c4c1f
--- /dev/null
+++ b/tests/functional/browse_test.php
@@ -0,0 +1,32 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @group functional
+*/
+class phpbb_functional_browse_test extends phpbb_functional_test_case
+{
+	public function test_index()
+	{
+		$crawler = $this->request('GET', 'index.php');
+		$this->assertGreaterThan(0, $crawler->filter('.topiclist')->count());
+	}
+
+	public function test_viewforum()
+	{
+		$crawler = $this->request('GET', 'viewforum.php?f=2');
+		$this->assertGreaterThan(0, $crawler->filter('.topiclist')->count());
+	}
+
+	public function test_viewtopic()
+	{
+		$crawler = $this->request('GET', 'viewtopic.php?t=1');
+		$this->assertGreaterThan(0, $crawler->filter('.postbody')->count());
+	}
+}
diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php
new file mode 100644
index 0000000000..e9409d9d3f
--- /dev/null
+++ b/tests/functional/extension_controller_test.php
@@ -0,0 +1,144 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @group functional
+*/
+class phpbb_functional_extension_controller_test extends phpbb_functional_test_case
+{
+	protected $phpbb_extension_manager;
+	/**
+	* This should only be called once before the tests are run.
+	* This is used to copy the fixtures to the phpBB install
+	*/
+	static public function setUpBeforeClass()
+	{
+		global $phpbb_root_path;
+		parent::setUpBeforeClass();
+
+		// these directories need to be created before the files can be copied
+		$directories = array(
+			$phpbb_root_path . 'ext/error/class/',
+			$phpbb_root_path . 'ext/error/classtype/',
+			$phpbb_root_path . 'ext/error/disabled/',
+			$phpbb_root_path . 'ext/foo/bar/',
+			$phpbb_root_path . 'ext/foo/bar/styles/prosilver/template/',
+			$phpbb_root_path . 'ext/foobar/',
+			$phpbb_root_path . 'ext/foobar/styles/prosilver/template/',
+		);
+
+		foreach ($directories as $dir)
+		{
+			if (!is_dir($dir))
+			{
+				mkdir($dir, 0777, true);
+			}
+		}
+
+		$fixtures = array(
+			'error/class/controller.php',
+			'error/class/ext.php',
+			'error/classtype/controller.php',
+			'error/classtype/ext.php',
+			'error/disabled/controller.php',
+			'error/disabled/ext.php',
+			'foo/bar/controller.php',
+			'foo/bar/ext.php',
+			'foo/bar/styles/prosilver/template/foobar_body.html',
+			'foobar/controller.php',
+			'foobar/ext.php',
+			'foobar/styles/prosilver/template/foobar_body.html',
+		);
+
+		foreach ($fixtures as $fixture)
+		{
+			if (!copy("tests/functional/fixtures/ext/$fixture", "{$phpbb_root_path}ext/$fixture"))
+			{
+				echo 'Could not copy file ' . $fixture;
+			}
+		}
+	}
+
+	public function setUp()
+	{
+		parent::setUp();
+
+		$this->phpbb_extension_manager = $this->get_extension_manager();
+
+		$this->purge_cache();
+	}
+
+	/**
+	* Check an extension at ./ext/foobar/ which should have the class
+	* phpbb_ext_foobar_controller
+	*/
+	public function test_foobar()
+	{
+		$this->phpbb_extension_manager->enable('foobar');
+		$crawler = $this->request('GET', 'index.php?ext=foobar');
+		$this->assertContains("This is for testing purposes.", $crawler->filter('#page-body')->text());
+		$this->phpbb_extension_manager->purge('foobar');
+	}
+
+	/**
+	* Check an extension at ./ext/foo/bar/ which should have the class
+	* phpbb_ext_foo_bar_controller
+	*/
+	public function test_foo_bar()
+	{
+		$this->phpbb_extension_manager->enable('foo/bar');
+		$crawler = $this->request('GET', 'index.php?ext=foo/bar');
+		$this->assertContains("This is for testing purposes.", $crawler->filter('#page-body')->text());
+		$this->phpbb_extension_manager->purge('foo/bar');
+	}
+
+	/**
+	* Check the error produced by extension at ./ext/error/class which has class
+	* phpbb_ext_foobar_controller
+	*/
+	public function test_error_class_name()
+	{
+		$this->phpbb_extension_manager->enable('error/class');
+		$crawler = $this->request('GET', 'index.php?ext=error/class');
+		$this->assertContains("The extension error/class is missing a controller class and cannot be accessed through the front-end.", $crawler->filter('#message')->text());
+		$this->phpbb_extension_manager->purge('error/class');
+	}
+
+	/**
+	* Check the error produced by extension at ./ext/error/classtype which has class
+	* phpbb_ext_error_classtype_controller but does not implement phpbb_extension_controller_interface
+	*/
+	public function test_error_class_type()
+	{
+		$this->phpbb_extension_manager->enable('error/classtype');
+		$crawler = $this->request('GET', 'index.php?ext=error/classtype');
+		$this->assertContains("The extension controller class phpbb_ext_error_classtype_controller is not an instance of the phpbb_extension_controller_interface.", $crawler->filter('#message')->text());
+		$this->phpbb_extension_manager->purge('error/classtype');
+	}
+
+	/**
+	* Check the error produced by extension at ./ext/error/disabled that is (obviously)
+	* a disabled extension
+	*/
+	public function test_error_ext_disabled()
+	{
+		$crawler = $this->request('GET', 'index.php?ext=error/disabled');
+		$this->assertContains("The extension error/disabled is not enabled", $crawler->filter('#message')->text());
+	}
+
+	/**
+	* Check the error produced by extension at ./ext/error/404 that is (obviously)
+	* not existant
+	*/
+	public function test_error_ext_missing()
+	{
+		$crawler = $this->request('GET', 'index.php?ext=error/404');
+		$this->assertContains("The extension error/404 does not exist.", $crawler->filter('#message')->text());
+	}
+}
diff --git a/tests/functional/fileupload_form_test.php b/tests/functional/fileupload_form_test.php
new file mode 100644
index 0000000000..f7267fa659
--- /dev/null
+++ b/tests/functional/fileupload_form_test.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ *
+ * @package testing
+ * @copyright (c) 2012 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+/**
+ * @group functional
+ */
+class phpbb_functional_fileupload_form_test extends phpbb_functional_test_case
+{
+	private $path;
+
+	public function setUp()
+	{
+		parent::setUp();
+		$this->path = __DIR__ . '/fixtures/files/';
+		$this->add_lang('posting');
+		$this->login();
+	}
+
+	private function upload_file($filename, $mimetype)
+	{
+		$file = array(
+			'tmp_name' => $this->path . $filename,
+			'name' => $filename,
+			'type' => $mimetype,
+			'size' => filesize($this->path . $filename),
+			'error' => UPLOAD_ERR_OK,
+		);
+
+		$crawler = $this->client->request(
+			'POST',
+			'posting.php?mode=reply&f=2&t=1&sid=' . $this->sid,
+			array('add_file' => $this->lang('ADD_FILE')),
+			array('fileupload' => $file)
+		);
+
+		return $crawler;
+	}
+
+	public function test_empty_file()
+	{
+		$crawler = $this->upload_file('empty.png', 'image/png');
+		$this->assertEquals($this->lang('ATTACHED_IMAGE_NOT_IMAGE'), $crawler->filter('div#message p')->text());
+	}
+
+	public function test_invalid_extension()
+	{
+		$crawler = $this->upload_file('illegal-extension.bif', 'application/octet-stream');
+		$this->assertEquals($this->lang('DISALLOWED_EXTENSION', 'bif'), $crawler->filter('p.error')->text());
+	}
+
+	public function test_too_large()
+	{
+		$this->markTestIncomplete('Functional tests use an admin account which ignores maximum upload size.');
+		$crawler = $this->upload_file('too-large.png', 'image/png');
+		$this->assertEquals($this->lang('WRONG_FILESIZE', '256', 'KiB'), $crawler->filter('p.error')->text());
+	}
+
+	public function test_valid_file()
+	{
+		$crawler = $this->upload_file('valid.jpg', 'image/jpeg');
+		$this->assertContains($this->lang('POSTED_ATTACHMENTS'), $crawler->filter('#postform h3')->eq(1)->text());
+	}
+}
diff --git a/tests/functional/fileupload_remote_test.php b/tests/functional/fileupload_remote_test.php
new file mode 100644
index 0000000000..0deb79acf6
--- /dev/null
+++ b/tests/functional/fileupload_remote_test.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ *
+ * @package testing
+ * @copyright (c) 2012 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+/**
+ * @group functional
+ */
+class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case
+{
+	public function setUp()
+	{
+		parent::setUp();
+		// Only doing this within the functional framework because we need a
+		// URL
+
+		// Global $config required by unique_id
+		// Global $user required by fileupload::remote_upload
+		global $config, $user;
+
+		if (!is_array($config))
+		{
+			$config = array();
+		}
+
+		$config['rand_seed'] = '';
+		$config['rand_seed_last_update'] = time() + 600;
+
+		$user = new phpbb_mock_user();
+		$user->lang = new phpbb_mock_lang();
+	}
+
+	public function tearDown()
+	{
+		global $config, $user;
+		$user = null;
+		$config = array();
+	}
+
+	public function test_invalid_extension()
+	{
+		$upload = new fileupload('', array('jpg'), 100);
+		$file = $upload->remote_upload('http://example.com/image.gif');
+		$this->assertEquals('URL_INVALID', $file->error[0]);
+	}
+
+	public function test_non_existant()
+	{
+		$upload = new fileupload('', array('jpg'), 100);
+		$file = $upload->remote_upload('http://example.com/image.jpg');
+		$this->assertEquals('EMPTY_REMOTE_DATA', $file->error[0]);
+	}
+
+	public function test_successful_upload()
+	{
+		$upload = new fileupload('', array('gif'), 1000);
+		$file = $upload->remote_upload($this->root_url . 'styles/prosilver/theme/images/forum_read.gif');
+		$this->assertEquals(0, sizeof($file->error));
+		$this->assertTrue(file_exists($file->filename));
+	}
+
+	public function test_too_large()
+	{
+		$upload = new fileupload('', array('gif'), 100);
+		$file = $upload->remote_upload($this->root_url . 'styles/prosilver/theme/images/forum_read.gif');
+		$this->assertEquals('WRONG_FILESIZE', $file->error[0]);
+	}
+}
diff --git a/tests/functional/fixtures/ext/error/class/controller.php b/tests/functional/fixtures/ext/error/class/controller.php
new file mode 100644
index 0000000000..74bbbee540
--- /dev/null
+++ b/tests/functional/fixtures/ext/error/class/controller.php
@@ -0,0 +1,14 @@
+<?php
+
+class phpbb_ext_foobar_controller extends phpbb_extension_controller
+{
+	public function handle()
+	{
+		$this->template->set_filenames(array(
+			'body' => 'index_body.html'
+		));
+
+		page_header('Test extension');
+		page_footer();
+	}
+}
diff --git a/tests/functional/fixtures/ext/error/class/ext.php b/tests/functional/fixtures/ext/error/class/ext.php
new file mode 100644
index 0000000000..f97ad2b838
--- /dev/null
+++ b/tests/functional/fixtures/ext/error/class/ext.php
@@ -0,0 +1,6 @@
+<?php
+
+class phpbb_ext_error_class_ext extends phpbb_extension_base
+{
+	
+}
diff --git a/tests/functional/fixtures/ext/error/classtype/controller.php b/tests/functional/fixtures/ext/error/classtype/controller.php
new file mode 100644
index 0000000000..55ac651bdf
--- /dev/null
+++ b/tests/functional/fixtures/ext/error/classtype/controller.php
@@ -0,0 +1,15 @@
+<?php
+
+class phpbb_ext_error_classtype_controller
+{
+	public function handle()
+	{
+		global $template;
+		$template->set_filenames(array(
+			'body' => 'index_body.html'
+		));
+
+		page_header('Test extension');
+		page_footer();
+	}
+}
diff --git a/tests/functional/fixtures/ext/error/classtype/ext.php b/tests/functional/fixtures/ext/error/classtype/ext.php
new file mode 100644
index 0000000000..35b1cd15a2
--- /dev/null
+++ b/tests/functional/fixtures/ext/error/classtype/ext.php
@@ -0,0 +1,6 @@
+<?php
+
+class phpbb_ext_error_classtype_ext extends phpbb_extension_base
+{
+	
+}
diff --git a/tests/functional/fixtures/ext/error/disabled/controller.php b/tests/functional/fixtures/ext/error/disabled/controller.php
new file mode 100644
index 0000000000..57b913f377
--- /dev/null
+++ b/tests/functional/fixtures/ext/error/disabled/controller.php
@@ -0,0 +1,14 @@
+<?php
+
+class phpbb_ext_error_disabled_controller extends phpbb_extension_controller
+{
+	public function handle()
+	{		
+		$this->template->set_filenames(array(
+			'body' => 'index_body.html'
+		));
+
+		page_header('Test extension');
+		page_footer();
+	}
+}
diff --git a/tests/functional/fixtures/ext/error/disabled/ext.php b/tests/functional/fixtures/ext/error/disabled/ext.php
new file mode 100644
index 0000000000..aec8051848
--- /dev/null
+++ b/tests/functional/fixtures/ext/error/disabled/ext.php
@@ -0,0 +1,6 @@
+<?php
+
+class phpbb_ext_error_disabled_ext extends phpbb_extension_base
+{
+	
+}
diff --git a/tests/functional/fixtures/ext/foo/bar/controller.php b/tests/functional/fixtures/ext/foo/bar/controller.php
new file mode 100644
index 0000000000..3375e317b3
--- /dev/null
+++ b/tests/functional/fixtures/ext/foo/bar/controller.php
@@ -0,0 +1,14 @@
+<?php
+
+class phpbb_ext_foo_bar_controller extends phpbb_extension_controller
+{
+	public function handle()
+	{
+		$this->template->set_filenames(array(
+			'body' => 'foobar_body.html'
+		));
+
+		page_header('Test extension');
+		page_footer();
+	}
+}
diff --git a/tests/functional/fixtures/ext/foo/bar/ext.php b/tests/functional/fixtures/ext/foo/bar/ext.php
new file mode 100644
index 0000000000..3a2068631e
--- /dev/null
+++ b/tests/functional/fixtures/ext/foo/bar/ext.php
@@ -0,0 +1,6 @@
+<?php
+
+class phpbb_ext_foo_bar_ext extends phpbb_extension_base
+{
+	
+}
diff --git a/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/foobar_body.html b/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/foobar_body.html
new file mode 100644
index 0000000000..4addf2666f
--- /dev/null
+++ b/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/foobar_body.html
@@ -0,0 +1,5 @@
+<!-- INCLUDE overall_header.html -->
+
+<div id="welcome">This is for testing purposes.</div>
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/tests/functional/fixtures/ext/foobar/controller.php b/tests/functional/fixtures/ext/foobar/controller.php
new file mode 100644
index 0000000000..ff35f12ee0
--- /dev/null
+++ b/tests/functional/fixtures/ext/foobar/controller.php
@@ -0,0 +1,14 @@
+<?php
+
+class phpbb_ext_foobar_controller extends phpbb_extension_controller
+{
+	public function handle()
+	{
+		$this->template->set_filenames(array(
+			'body' => 'foobar_body.html'
+		));
+
+		page_header('Test extension');
+		page_footer();
+	}
+}
diff --git a/tests/functional/fixtures/ext/foobar/ext.php b/tests/functional/fixtures/ext/foobar/ext.php
new file mode 100644
index 0000000000..7cf443d369
--- /dev/null
+++ b/tests/functional/fixtures/ext/foobar/ext.php
@@ -0,0 +1,6 @@
+<?php
+
+class phpbb_ext_foobar_ext extends phpbb_extension_base
+{
+
+}
diff --git a/tests/functional/fixtures/ext/foobar/styles/prosilver/template/foobar_body.html b/tests/functional/fixtures/ext/foobar/styles/prosilver/template/foobar_body.html
new file mode 100644
index 0000000000..4addf2666f
--- /dev/null
+++ b/tests/functional/fixtures/ext/foobar/styles/prosilver/template/foobar_body.html
@@ -0,0 +1,5 @@
+<!-- INCLUDE overall_header.html -->
+
+<div id="welcome">This is for testing purposes.</div>
+
+<!-- INCLUDE overall_footer.html -->
diff --git a/tests/functional/fixtures/files/empty.png b/tests/functional/fixtures/files/empty.png
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/functional/fixtures/files/empty.png
diff --git a/tests/functional/fixtures/files/illegal-extension.bif b/tests/functional/fixtures/files/illegal-extension.bif
new file mode 100644
index 0000000000..3cd5038e38
--- /dev/null
+++ b/tests/functional/fixtures/files/illegal-extension.bif
diff --git a/tests/functional/fixtures/files/too-large.png b/tests/functional/fixtures/files/too-large.png
new file mode 100644
index 0000000000..ed4b0abd80
--- /dev/null
+++ b/tests/functional/fixtures/files/too-large.png
diff --git a/tests/functional/fixtures/files/valid.jpg b/tests/functional/fixtures/files/valid.jpg
new file mode 100644
index 0000000000..95a87ddbdf
--- /dev/null
+++ b/tests/functional/fixtures/files/valid.jpg
diff --git a/tests/functional/lang_test.php b/tests/functional/lang_test.php
new file mode 100644
index 0000000000..053806a431
--- /dev/null
+++ b/tests/functional/lang_test.php
@@ -0,0 +1,45 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @group functional
+*/
+class phpbb_functional_lang_test extends phpbb_functional_test_case
+{
+	public function test_lang()
+	{
+		// Test a language string present in the common language file
+		$this->assertEquals('Board index', $this->lang('FORUM_INDEX'));
+	}
+
+	/**
+	* @expectedException RuntimeException
+	*/
+	public function test_lang_missing()
+	{
+		$this->assertEquals('Your account has now been activated. Thank you for registering.', $this->lang('ACCOUNT_ACTIVE'));
+	}
+
+	public function test_add_lang()
+	{
+		$this->add_lang('ucp');
+
+		// Test a language string present only in the UCP language file
+		$this->assertEquals('Your account has now been activated. Thank you for registering.', $this->lang('ACCOUNT_ACTIVE'));
+	}
+
+	public function test_add_langs()
+	{
+		$this->add_lang(array('groups', 'memberlist'));
+
+		// Test a language string from each UCP and memberlist
+		$this->assertEquals('The selected group is already your default group.', $this->lang('ALREADY_DEFAULT_GROUP'));
+		$this->assertEquals('Profile', $this->lang('ABOUT_USER'));
+	}
+}
diff --git a/tests/functional/posting_test.php b/tests/functional/posting_test.php
new file mode 100644
index 0000000000..f54a3591b2
--- /dev/null
+++ b/tests/functional/posting_test.php
@@ -0,0 +1,102 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @group functional
+*/
+class phpbb_functional_posting_test extends phpbb_functional_test_case
+{
+	public function test_post_new_topic()
+	{
+		$this->login();
+		$this->add_lang('posting');
+
+		$crawler = $this->request('GET', 'posting.php?mode=post&f=2&sid=' . $this->sid);
+		$this->assertContains($this->lang('POST_TOPIC'), $crawler->filter('html')->text());
+
+		$hidden_fields = array();
+		$hidden_fields[] = $crawler->filter('[type="hidden"]')->each(function ($node, $i) {
+			return array('name' => $node->getAttribute('name'), 'value' => $node->getAttribute('value'));
+		});
+
+		$test_message = 'This is a test topic posted by the testing framework.';
+		$form_data = array(
+			'subject'		=> 'Test Topic 1',
+			'message'		=> $test_message,
+			'post'			=> true,
+			'f'				=> 2,
+			'mode'			=> 'post',
+			'sid'			=> $this->sid,
+		);
+
+		foreach ($hidden_fields as $fields)
+		{
+			foreach($fields as $field)
+			{
+				$form_data[$field['name']] = $field['value'];
+			}
+		}
+
+		// Bypass time restriction that said that if the lastclick time (i.e. time when the form was opened)
+		// is not at least 2 seconds before submission, cancel the form
+		$form_data['lastclick'] = 0;
+
+		// I use a request because the form submission method does not allow you to send data that is not
+		// contained in one of the actual form fields that the browser sees (i.e. it ignores "hidden" inputs)
+		// Instead, I send it as a request with the submit button "post" set to true.
+		$crawler = $this->client->request('POST', 'posting.php', $form_data);
+		$this->assertContains($this->lang('POST_STORED'), $crawler->filter('html')->text());
+
+		$crawler = $this->request('GET', 'viewtopic.php?t=2&sid=' . $this->sid);
+		$this->assertContains($test_message, $crawler->filter('html')->text());
+	}
+
+	public function test_post_reply()
+	{
+		$this->login();
+		$this->add_lang('posting');
+
+		$crawler = $this->request('GET', 'posting.php?mode=reply&t=2&f=2&sid=' . $this->sid);
+		$this->assertContains($this->lang('POST_REPLY'), $crawler->filter('html')->text());
+
+		$hidden_fields = array();
+		$hidden_fields[] = $crawler->filter('[type="hidden"]')->each(function ($node, $i) {
+			return array('name' => $node->getAttribute('name'), 'value' => $node->getAttribute('value'));
+		});
+
+		$test_message = 'This is a test post posted by the testing framework.';
+		$form_data = array(
+			'subject'		=> 'Re: Test Topic 1',
+			'message'		=> $test_message,
+			'post'			=> true,
+			't'				=> 2,
+			'f'				=> 2,
+			'mode'			=> 'reply',
+			'sid'			=> $this->sid,
+		);
+
+		foreach ($hidden_fields as $fields)
+		{
+			foreach($fields as $field)
+			{
+				$form_data[$field['name']] = $field['value'];
+			}
+		}
+
+		// For reasoning behind the following command, see the test_post_new_topic() test
+		$form_data['lastclick'] = 0;
+
+		// Submit the post
+		$crawler = $this->client->request('POST', 'posting.php', $form_data);
+		$this->assertContains($this->lang('POST_STORED'), $crawler->filter('html')->text());
+
+		$crawler = $this->request('GET', 'viewtopic.php?t=2&sid=' . $this->sid);
+		$this->assertContains($test_message, $crawler->filter('html')->text());
+	}
+}
diff --git a/tests/functions/clean_path_test.php b/tests/functions/clean_path_test.php
new file mode 100644
index 0000000000..bcbe9838d9
--- /dev/null
+++ b/tests/functions/clean_path_test.php
@@ -0,0 +1,44 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 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_clean_path_test extends phpbb_test_case
+{
+	public function clean_path_test_data()
+	{
+		return array(
+			array('foo', 'foo'),
+			array('foo/bar', 'foo/bar'),
+			array('foo/bar/', 'foo/bar/'),
+			array('foo/./bar', 'foo/bar'),
+			array('foo/./././bar', 'foo/bar'),
+			array('foo/bar/.', 'foo/bar'),
+			array('./foo/bar', './foo/bar'),
+			array('../foo/bar', '../foo/bar'),
+			array('one/two/three', 'one/two/three'),
+			array('one/two/../three', 'one/three'),
+			array('one/../two/three', 'two/three'),
+			array('one/two/..', 'one'),
+			array('one/two/../', 'one/'),
+			array('one/two/../three/../four', 'one/four'),
+			array('one/two/three/../../four', 'one/four'),
+		);
+	}
+
+	/**
+	* @dataProvider clean_path_test_data
+	*/
+	public function test_clean_path($input, $expected)
+	{
+		$output = phpbb_clean_path($input);
+
+		$this->assertEquals($expected, $output);
+	}
+}
diff --git a/tests/functions_acp/build_cfg_template_test.php b/tests/functions_acp/build_cfg_template_test.php
index 7bf85a3532..bf5330fd88 100644
--- a/tests/functions_acp/build_cfg_template_test.php
+++ b/tests/functions_acp/build_cfg_template_test.php
@@ -3,11 +3,10 @@
 *
 * @package testing
 * @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
-require_once dirname(__FILE__) . '/../mock/lang.php';
 require_once dirname(__FILE__) . '/../../phpBB/includes/functions_acp.php';
 
 class phpbb_functions_acp_build_cfg_template_test extends phpbb_test_case
@@ -29,7 +28,7 @@ class phpbb_functions_acp_build_cfg_template_test extends phpbb_test_case
 				array('config_key_name'	=> '2'),
 				'config_key_name',
 				array(),
-				'<input id="key_name" type="password" size="20" maxlength="128" name="config[config_key_name]" value="2" />',
+				'<input id="key_name" type="password" size="20" maxlength="128" name="config[config_key_name]" value="2" autocomplete="off" />',
 			),
 			array(
 				array('text', 0, 255),
@@ -47,8 +46,9 @@ class phpbb_functions_acp_build_cfg_template_test extends phpbb_test_case
 	*/
 	public function test_build_cfg_template_text($tpl_type, $key, $new, $config_key, $vars, $expected)
 	{
-		global $user;
+		global $user, $phpbb_dispatcher;
 
+		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
 		$user->lang = new phpbb_mock_lang();
 
 		$this->assertEquals($expected, build_cfg_template($tpl_type, $key, $new, $config_key, $vars));
@@ -81,8 +81,9 @@ class phpbb_functions_acp_build_cfg_template_test extends phpbb_test_case
 	*/
 	public function test_build_cfg_template_dimension($tpl_type, $key, $new, $config_key, $vars, $expected)
 	{
-		global $user;
+		global $user, $phpbb_dispatcher;
 
+		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
 		$user->lang = new phpbb_mock_lang();
 
 		$this->assertEquals($expected, build_cfg_template($tpl_type, $key, $new, $config_key, $vars));
@@ -107,8 +108,9 @@ class phpbb_functions_acp_build_cfg_template_test extends phpbb_test_case
 	*/
 	public function test_build_cfg_template_textarea($tpl_type, $key, $new, $config_key, $vars, $expected)
 	{
-		global $user;
+		global $user, $phpbb_dispatcher;
 
+		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
 		$user->lang = new phpbb_mock_lang();
 
 		$this->assertEquals($expected, build_cfg_template($tpl_type, $key, $new, $config_key, $vars));
@@ -157,8 +159,9 @@ class phpbb_functions_acp_build_cfg_template_test extends phpbb_test_case
 	*/
 	public function test_build_cfg_template_radio($tpl_type, $key, $new, $config_key, $vars, $expected)
 	{
-		global $user;
+		global $user, $phpbb_dispatcher;
 
+		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
 		$user->lang = new phpbb_mock_lang();
 
 		$this->assertEquals($expected, build_cfg_template($tpl_type, $key, $new, $config_key, $vars));
@@ -183,8 +186,9 @@ class phpbb_functions_acp_build_cfg_template_test extends phpbb_test_case
 	*/
 	public function test_build_cfg_template_append($tpl_type, $key, $new, $config_key, $vars, $expected)
 	{
-		global $user;
+		global $user, $phpbb_dispatcher;
 
+		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
 		$user->lang = new phpbb_mock_lang();
 
 		$this->assertEquals($expected, build_cfg_template($tpl_type, $key, $new, $config_key, $vars));
diff --git a/tests/functions_acp/build_select_test.php b/tests/functions_acp/build_select_test.php
index 7079e69f12..aca49b7655 100644
--- a/tests/functions_acp/build_select_test.php
+++ b/tests/functions_acp/build_select_test.php
@@ -3,11 +3,10 @@
 *
 * @package testing
 * @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
-require_once dirname(__FILE__) . '/../mock/lang.php';
 require_once dirname(__FILE__) . '/../../phpBB/includes/functions_acp.php';
 
 class phpbb_functions_acp_built_select_test extends phpbb_test_case
diff --git a/tests/functions_acp/h_radio_test.php b/tests/functions_acp/h_radio_test.php
index 18cb5d031e..a61f2e8975 100644
--- a/tests/functions_acp/h_radio_test.php
+++ b/tests/functions_acp/h_radio_test.php
@@ -3,11 +3,10 @@
 *
 * @package testing
 * @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
-require_once dirname(__FILE__) . '/../mock/lang.php';
 require_once dirname(__FILE__) . '/../../phpBB/includes/functions_acp.php';
 
 class phpbb_functions_acp_h_radio_test extends phpbb_test_case
diff --git a/tests/functions_acp/validate_config_vars_test.php b/tests/functions_acp/validate_config_vars_test.php
index aa63bc38df..7cd7fa3892 100644
--- a/tests/functions_acp/validate_config_vars_test.php
+++ b/tests/functions_acp/validate_config_vars_test.php
@@ -3,29 +3,15 @@
 *
 * @package testing
 * @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
-require_once dirname(__FILE__) . '/../mock/lang.php';
 require_once dirname(__FILE__) . '/../../phpBB/includes/functions_acp.php';
 
 class phpbb_functions_acp_validate_config_vars_test extends phpbb_test_case
 {
 	/**
-	* Helper function which returns a string in a given length.
-	*/
-	static public function return_string($length)
-	{
-		$string = '';
-		for ($i = 0; $i < $length; $i++)
-		{
-			$string .= 'a';
-		}
-		return $string;
-	}
-
-	/**
 	* Data sets that don't throw an error.
 	*/
 	public function validate_config_vars_fit_data()
@@ -35,8 +21,11 @@ class phpbb_functions_acp_validate_config_vars_test extends phpbb_test_case
 				array(
 					'test_bool'				=> array('lang' => 'TEST_BOOL',			'validate' => 'bool'),
 					'test_string'			=> array('lang' => 'TEST_STRING',		'validate' => 'string'),
+					'test_string'			=> array('lang' => 'TEST_STRING',		'validate' => 'string'),
+					'test_string_128'		=> array('lang' => 'TEST_STRING_128',	'validate' => 'string:128'),
 					'test_string_128'		=> array('lang' => 'TEST_STRING_128',	'validate' => 'string:128'),
 					'test_string_32_64'		=> array('lang' => 'TEST_STRING_32_64',	'validate' => 'string:32:64'),
+					'test_string_32_64'		=> array('lang' => 'TEST_STRING_32_64',	'validate' => 'string:32:64'),
 					'test_int'				=> array('lang' => 'TEST_INT',			'validate' => 'int'),
 					'test_int_32'			=> array('lang' => 'TEST_INT',			'validate' => 'int:32'),
 					'test_int_32_64'		=> array('lang' => 'TEST_INT',			'validate' => 'int:32:64'),
@@ -51,9 +40,12 @@ class phpbb_functions_acp_validate_config_vars_test extends phpbb_test_case
 				),
 				array(
 					'test_bool'			=> true,
-					'test_string'		=> self::return_string(255),
-					'test_string_128'	=> self::return_string(128),
-					'test_string_32_64'	=> self::return_string(48),
+					'test_string'		=> str_repeat('a', 255),
+					'test_string'		=> str_repeat("\xC3\x84", 255),
+					'test_string_128'	=> str_repeat('a', 128),
+					'test_string_128'	=> str_repeat("\xC3\x84", 128),
+					'test_string_32_64'	=> str_repeat('a', 48),
+					'test_string_32_64'	=> str_repeat("\xC3\x84", 48),
 					'test_int'			=> 128,
 					'test_int_32'		=> 32,
 					'test_int_32_64'	=> 48,
@@ -86,17 +78,32 @@ class phpbb_functions_acp_validate_config_vars_test extends phpbb_test_case
 		return array(
 			array(
 				array('test_string_32_64'		=> array('lang' => 'TEST_STRING_32_64',	'validate' => 'string:32:64')),
-				array('test_string_32_64'	=> self::return_string(20)),
+				array('test_string_32_64'	=> str_repeat('a', 20)),
+				array('SETTING_TOO_SHORT'),
+			),
+			array(
+				array('test_string_32_64'		=> array('lang' => 'TEST_STRING_32_64',	'validate' => 'string:32:64')),
+				array('test_string_32_64'	=> str_repeat("\xC3\x84", 20)),
 				array('SETTING_TOO_SHORT'),
 			),
 			array(
 				array('test_string'		=> array('lang' => 'TEST_STRING',	'validate' => 'string')),
-				array('test_string'		=> self::return_string(256)),
+				array('test_string'		=> str_repeat('a', 256)),
+				array('SETTING_TOO_LONG'),
+			),
+			array(
+				array('test_string'		=> array('lang' => 'TEST_STRING',	'validate' => 'string')),
+				array('test_string'		=> str_repeat("\xC3\x84", 256)),
+				array('SETTING_TOO_LONG'),
+			),
+			array(
+				array('test_string_32_64'	=> array('lang' => 'TEST_STRING_32_64',	'validate' => 'string:32:64')),
+				array('test_string_32_64'	=> str_repeat('a', 65)),
 				array('SETTING_TOO_LONG'),
 			),
 			array(
 				array('test_string_32_64'	=> array('lang' => 'TEST_STRING_32_64',	'validate' => 'string:32:64')),
-				array('test_string_32_64'	=> self::return_string(65)),
+				array('test_string_32_64'	=> str_repeat("\xC3\x84", 65)),
 				array('SETTING_TOO_LONG'),
 			),
 
diff --git a/tests/functions_acp/validate_range_test.php b/tests/functions_acp/validate_range_test.php
index a9c9612ad7..8606158251 100644
--- a/tests/functions_acp/validate_range_test.php
+++ b/tests/functions_acp/validate_range_test.php
@@ -3,29 +3,16 @@
 *
 * @package testing
 * @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
-require_once dirname(__FILE__) . '/../mock/lang.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php';
 require_once dirname(__FILE__) . '/../../phpBB/includes/functions_acp.php';
 
 class phpbb_functions_acp_validate_range_test extends phpbb_test_case
 {
 	/**
-	* Helper function which returns a string in a given length.
-	*/
-	static public function return_string($length)
-	{
-		$string = '';
-		for ($i = 0; $i < $length; $i++)
-		{
-			$string .= 'a';
-		}
-		return $string;
-	}
-
-	/**
 	* Data sets that don't throw an error.
 	*/
 	public function validate_range_data_fit()
@@ -53,8 +40,10 @@ class phpbb_functions_acp_validate_range_test extends phpbb_test_case
 			array(array(array('column_type' => 'TINT:-32:64', 'lang' => 'TEST', 'value' => 16))),
 
 			array(array(array('column_type' => 'VCHAR', 'lang' => 'TEST', 'value' => ''))),
-			array(array(array('column_type' => 'VCHAR', 'lang' => 'TEST', 'value' => self::return_string(255)))),
-			array(array(array('column_type' => 'VCHAR:128', 'lang' => 'TEST', 'value' => self::return_string(128)))),
+			array(array(array('column_type' => 'VCHAR', 'lang' => 'TEST', 'value' => str_repeat('a', 255)))),
+			array(array(array('column_type' => 'VCHAR', 'lang' => 'TEST', 'value' => str_repeat("\xC3\x84", 255)))),
+			array(array(array('column_type' => 'VCHAR:128', 'lang' => 'TEST', 'value' => str_repeat('a', 128)))),
+			array(array(array('column_type' => 'VCHAR:128', 'lang' => 'TEST', 'value' => str_repeat("\xC3\x84", 128)))),
 		);
 	}
 
@@ -157,8 +146,10 @@ class phpbb_functions_acp_validate_range_test extends phpbb_test_case
 	public function validate_range_data_too_long()
 	{
 		return array(
-			array(array(array('column_type' => 'VCHAR', 'lang' => 'TEST', 'value' => self::return_string(256)))),
-			array(array(array('column_type' => 'VCHAR:128', 'lang' => 'TEST', 'value' => self::return_string(129)))),
+			array(array(array('column_type' => 'VCHAR', 'lang' => 'TEST', 'value' => str_repeat('a', 256)))),
+			array(array(array('column_type' => 'VCHAR', 'lang' => 'TEST', 'value' => str_repeat("\xC3\x84", 256)))),
+			array(array(array('column_type' => 'VCHAR:128', 'lang' => 'TEST', 'value' => str_repeat('a', 129)))),
+			array(array(array('column_type' => 'VCHAR:128', 'lang' => 'TEST', 'value' => str_repeat("\xC3\x84", 129)))),
 		);
 	}
 
diff --git a/tests/group_positions/fixtures/group_positions.xml b/tests/group_positions/fixtures/group_positions.xml
index 55b1c2e08d..00ea18fe4f 100644
--- a/tests/group_positions/fixtures/group_positions.xml
+++ b/tests/group_positions/fixtures/group_positions.xml
@@ -4,20 +4,24 @@
 		<column>group_id</column>
 		<column>group_teampage</column>
 		<column>group_legend</column>
+		<column>group_desc</column>
 		<row>
 			<value>1</value>
 			<value>0</value>
 			<value>0</value>
+			<value></value>
 		</row>
 		<row>
 			<value>2</value>
 			<value>1</value>
 			<value>0</value>
+			<value></value>
 		</row>
 		<row>
 			<value>3</value>
 			<value>2</value>
 			<value>1</value>
+			<value></value>
 		</row>
 	</table>
 </dataset>
diff --git a/tests/group_positions/group_positions_test.php b/tests/group_positions/group_positions_test.php
index b68f205b37..c17e25511b 100644
--- a/tests/group_positions/group_positions_test.php
+++ b/tests/group_positions/group_positions_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
@@ -15,7 +15,7 @@ class phpbb_group_positions_test extends phpbb_database_test_case
 		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/group_positions.xml');
 	}
 
-	public static function get_group_value_data()
+	public function get_group_value_data()
 	{
 		return array(
 			array('teampage', 1, 0),
@@ -38,7 +38,7 @@ class phpbb_group_positions_test extends phpbb_database_test_case
 		$this->assertEquals($expected, $test_class->get_group_value($group_id));
 	}
 
-	public static function get_group_count_data()
+	public function get_group_count_data()
 	{
 		return array(
 			array('teampage', 2),
@@ -59,7 +59,7 @@ class phpbb_group_positions_test extends phpbb_database_test_case
 		$this->assertEquals($expected, $test_class->get_group_count());
 	}
 
-	public static function add_group_data()
+	public function add_group_data()
 	{
 		return array(
 			array('teampage', 1, array(
@@ -93,7 +93,7 @@ class phpbb_group_positions_test extends phpbb_database_test_case
 		$this->assertEquals($expected, $db->sql_fetchrowset($result));
 	}
 
-	public static function delete_group_data()
+	public function delete_group_data()
 	{
 		return array(
 			array('teampage', 1, false, array(
@@ -147,7 +147,7 @@ class phpbb_group_positions_test extends phpbb_database_test_case
 		$this->assertEquals($expected, $db->sql_fetchrowset($result));
 	}
 
-	public static function move_up_data()
+	public function move_up_data()
 	{
 		return array(
 			array('teampage', 1, array(
@@ -186,7 +186,7 @@ class phpbb_group_positions_test extends phpbb_database_test_case
 		$this->assertEquals($expected, $db->sql_fetchrowset($result));
 	}
 
-	public static function move_down_data()
+	public function move_down_data()
 	{
 		return array(
 			array('teampage', 1, array(
@@ -225,7 +225,7 @@ class phpbb_group_positions_test extends phpbb_database_test_case
 		$this->assertEquals($expected, $db->sql_fetchrowset($result));
 	}
 
-	public static function move_data()
+	public function move_data()
 	{
 		return array(
 			array('teampage', 1, 1, array(
diff --git a/tests/lock/db_test.php b/tests/lock/db_test.php
index ed15423314..f7b1557a0c 100644
--- a/tests/lock/db_test.php
+++ b/tests/lock/db_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/mock/cache.php b/tests/mock/cache.php
index d3f9b8ad5a..b64c92ea89 100644
--- a/tests/mock/cache.php
+++ b/tests/mock/cache.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
@@ -31,12 +31,49 @@ class phpbb_mock_cache implements phpbb_cache_driver_interface
 		$this->data[$var_name] = $var;
 	}
 
+	/**
+	 * Obtain list of word censors. We don't need to parse them here,
+	 * that is tested elsewhere.
+	 */
+	public function obtain_word_list()
+	{
+		return array(
+			'match'		=> array(
+				'#(?<![\\p{Nd}\\p{L}_-])([\\p{Nd}\\p{L}_-]*?badword1[\\p{Nd}\\p{L}_-]*?)(?![\\p{Nd}\\p{L}_-])#iu',
+				'#(?<![\\p{Nd}\\p{L}_-])([\\p{Nd}\\p{L}_-]*?badword2)(?![\\p{Nd}\\p{L}_-])#iu',
+				'#(?<![\\p{Nd}\\p{L}_-])(badword3[\\p{Nd}\\p{L}_-]*?)(?![\\p{Nd}\\p{L}_-])#iu',
+				'#(?<![\\p{Nd}\\p{L}_-])(badword4)(?![\\p{Nd}\\p{L}_-])#iu',
+			),
+			'replace'	=> array(
+				'replacement1',
+				'replacement2',
+				'replacement3',
+				'replacement4',
+			),
+		);
+	}
+
 	public function checkVar(PHPUnit_Framework_Assert $test, $var_name, $data)
 	{
 		$test->assertTrue(isset($this->data[$var_name]));
 		$test->assertEquals($data, $this->data[$var_name]);
 	}
 
+	public function checkAssociativeVar(PHPUnit_Framework_Assert $test, $var_name, $data, $sort = true)
+	{
+		$test->assertTrue(isset($this->data[$var_name]));
+
+		if ($sort)
+		{
+			foreach ($this->data[$var_name] as &$content)
+			{
+				sort($content);
+			}
+		}
+
+		$test->assertEquals($data, $this->data[$var_name]);
+	}
+
 	public function checkVarUnset(PHPUnit_Framework_Assert $test, $var_name)
 	{
 		$test->assertFalse(isset($this->data[$var_name]));
@@ -84,7 +121,7 @@ class phpbb_mock_cache implements phpbb_cache_driver_interface
 	public function sql_load($query)
 	{
 	}
-	public function sql_save($query, &$query_result, $ttl)
+	public function sql_save($query, $query_result, $ttl)
 	{
 	}
 	public function sql_exists($query_id)
diff --git a/tests/mock/event_dispatcher.php b/tests/mock/event_dispatcher.php
new file mode 100644
index 0000000000..8887b16163
--- /dev/null
+++ b/tests/mock/event_dispatcher.php
@@ -0,0 +1,16 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_mock_event_dispatcher
+{
+	public function trigger_event($eventName, $data)
+	{
+		return array();
+	}
+}
diff --git a/tests/mock/extension_manager.php b/tests/mock/extension_manager.php
new file mode 100644
index 0000000000..fdda4cbadc
--- /dev/null
+++ b/tests/mock/extension_manager.php
@@ -0,0 +1,18 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_mock_extension_manager extends phpbb_extension_manager
+{
+	public function __construct($phpbb_root_path, $extensions = array())
+	{
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = '.php';
+		$this->extensions = $extensions;
+	}
+}
diff --git a/tests/mock/filespec.php b/tests/mock/filespec.php
new file mode 100644
index 0000000000..9d2a5c84de
--- /dev/null
+++ b/tests/mock/filespec.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ *
+ * @package testing
+ * @copyright (c) 2012 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+/**
+ * Mock filespec class with some basic values to help with testing the
+ * fileupload class
+ */
+class phpbb_mock_filespec
+{
+	public $filesize;
+	public $realname;
+	public $extension;
+	public $width;
+	public $height;
+	public $error = array();
+
+	public function check_content($disallowed_content)
+	{
+		return true;
+	}
+
+	public function get($property)
+	{
+		return $this->$property;
+	}
+}
diff --git a/tests/mock/fileupload.php b/tests/mock/fileupload.php
new file mode 100644
index 0000000000..409036ba63
--- /dev/null
+++ b/tests/mock/fileupload.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ *
+ * @package testing
+ * @copyright (c) 2012 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+/**
+ * Mock fileupload class with some basic values to help with testing the
+ * filespec class
+ */
+class phpbb_mock_fileupload
+{
+	public $max_filesize = 100;
+	public $error_prefix = '';
+
+	public function valid_dimensions($filespec)
+	{
+		return true;
+	}
+
+	/**
+	 * Copied verbatim from phpBB/includes/functions_upload.php's fileupload
+	 * class to ensure the correct behaviour of filespec::move_file.
+	 *
+	 * Maps file extensions to the constant in second index of the array
+	 * returned by getimagesize()
+	 */
+	public function image_types()
+	{
+		return array(
+			IMAGETYPE_GIF		=> array('gif'),
+			IMAGETYPE_JPEG		=> array('jpg', 'jpeg'),
+			IMAGETYPE_PNG		=> array('png'),
+			IMAGETYPE_SWF		=> array('swf'),
+			IMAGETYPE_PSD		=> array('psd'),
+			IMAGETYPE_BMP		=> array('bmp'),
+			IMAGETYPE_TIFF_II	=> array('tif', 'tiff'),
+			IMAGETYPE_TIFF_MM	=> array('tif', 'tiff'),
+			IMAGETYPE_JPC		=> array('jpg', 'jpeg'),
+			IMAGETYPE_JP2		=> array('jpg', 'jpeg'),
+			IMAGETYPE_JPX		=> array('jpg', 'jpeg'),
+			IMAGETYPE_JB2		=> array('jpg', 'jpeg'),
+			IMAGETYPE_SWC		=> array('swc'),
+			IMAGETYPE_IFF		=> array('iff'),
+			IMAGETYPE_WBMP		=> array('wbmp'),
+			IMAGETYPE_XBM		=> array('xbm'),
+		);
+	}
+}
diff --git a/tests/mock/lang.php b/tests/mock/lang.php
index 17a39629c1..781b3d060e 100644
--- a/tests/mock/lang.php
+++ b/tests/mock/lang.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/mock/request.php b/tests/mock/request.php
index da4015e78b..946dfdada9 100644
--- a/tests/mock/request.php
+++ b/tests/mock/request.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
@@ -11,12 +11,13 @@ class phpbb_mock_request implements phpbb_request_interface
 {
 	protected $data;
 
-	public function __construct($get = array(), $post = array(), $cookie = array(), $request = false)
+	public function __construct($get = array(), $post = array(), $cookie = array(), $server = array(), $request = false)
 	{
 		$this->data[phpbb_request_interface::GET] = $get;
 		$this->data[phpbb_request_interface::POST] = $post;
 		$this->data[phpbb_request_interface::COOKIE] = $cookie;
 		$this->data[phpbb_request_interface::REQUEST] = ($request === false) ? $post + $get : $request;
+		$this->data[phpbb_request_interface::SERVER] = $server;
 	}
 
 	public function overwrite($var_name, $value, $super_global = phpbb_request_interface::REQUEST)
@@ -29,6 +30,18 @@ class phpbb_mock_request implements phpbb_request_interface
 		return isset($this->data[$super_global][$var_name]) ? $this->data[$super_global][$var_name] : $default;
 	}
 
+	public function server($var_name, $default = '')
+	{
+		$super_global = phpbb_request_interface::SERVER;
+		return isset($this->data[$super_global][$var_name]) ? $this->data[$super_global][$var_name] : $default;
+	}
+
+	public function header($header_name, $default = '')
+	{
+		$var_name = 'HTTP_' . str_replace('-', '_', strtoupper($header_name));
+		return $this->server($var_name, $default);
+	}
+
 	public function is_set_post($name)
 	{
 		return $this->is_set($name, phpbb_request_interface::POST);
@@ -39,8 +52,31 @@ class phpbb_mock_request implements phpbb_request_interface
 		return isset($this->data[$super_global][$var]);
 	}
 
+	public function is_ajax()
+	{
+		return false;
+	}
+
+	public function is_secure()
+	{
+		return false;
+	}
+
 	public function variable_names($super_global = phpbb_request_interface::REQUEST)
 	{
 		return array_keys($this->data[$super_global]);
 	}
+
+	/* custom methods */
+
+	public function set_header($header_name, $value)
+	{
+		$var_name = 'HTTP_' . str_replace('-', '_', strtoupper($header_name));
+		$this->data[phpbb_request_interface::SERVER][$var_name] = $value;
+	}
+
+	public function merge($super_global = phpbb_request_interface::REQUEST, $values)
+	{
+		$this->data[$super_global] = array_merge($this->data[$super_global], $values);
+	}
 }
diff --git a/tests/mock/session_testable.php b/tests/mock/session_testable.php
index 47089cb94b..56ff8c8b32 100644
--- a/tests/mock/session_testable.php
+++ b/tests/mock/session_testable.php
@@ -3,12 +3,11 @@
 *
 * @package testing
 * @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
 require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
-require_once dirname(__FILE__) . '/../../phpBB/includes/session.php';
 
 /**
 * Extends the session class to overwrite the setting of cookies.
@@ -17,7 +16,7 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/session.php';
 * test it without warnings about sent headers. This class only stores cookie
 * data for later verification.
 */
-class phpbb_mock_session_testable extends session
+class phpbb_mock_session_testable extends phpbb_session
 {
 	private $_cookies = array();
 
diff --git a/tests/mock/user.php b/tests/mock/user.php
new file mode 100644
index 0000000000..ec14ce430e
--- /dev/null
+++ b/tests/mock/user.php
@@ -0,0 +1,36 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* Mock user class.
+* This class is used when tests invoke phpBB code expecting to have a global
+* user object, to avoid instantiating the actual user object.
+* It has a minimum amount of functionality, just to make tests work.
+*/
+class phpbb_mock_user
+{
+	public $host = "testhost";
+	public $page = array('root_script_path' => '/');
+	
+	private $options = array();
+	public function optionget($item)
+	{
+		if (!isset($this->options[$item]))
+		{
+			throw new Exception(sprintf("You didn't set the option '%s' on the mock user using optionset.", $item));
+		}
+		
+		return $this->options[$item];
+	}
+	
+	public function optionset($item, $value)
+	{
+		$this->options[$item] = $value;
+	}
+}
diff --git a/tests/network/checkdnsrr_test.php b/tests/network/checkdnsrr_test.php
index 5a756dcef8..1942a50f06 100644
--- a/tests/network/checkdnsrr_test.php
+++ b/tests/network/checkdnsrr_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/network/ftp_fsock_pasv_epsv_test.php b/tests/network/ftp_fsock_pasv_epsv_test.php
new file mode 100644
index 0000000000..22f17785b8
--- /dev/null
+++ b/tests/network/ftp_fsock_pasv_epsv_test.php
@@ -0,0 +1,63 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_transfer.php';
+
+/**
+* @group slow
+*/
+class phpbb_network_ftp_fsock_pasv_epsv_test extends phpbb_test_case
+{
+	static protected $ipv4;
+
+	static public function setUpBeforeClass()
+	{
+		$hostname = 'ftp.debian.org.';
+		self::$ipv4 = gethostbyname($hostname);
+
+		if (self::$ipv4 == $hostname)
+		{
+			self::markTestSkipped("Got no A record back from DNS query for $hostname");
+		}
+	}
+
+	public function test_pasv()
+	{
+		// PASV
+		$this->assert_ls_contains_debian(self::$ipv4);
+	}
+
+	public function test_epsv()
+	{
+		$ipv4 = self::$ipv4;
+		// EPSV
+		$this->assert_ls_contains_debian("[::ffff:$ipv4]");
+	}
+
+	protected function assert_ls_contains_debian($hostname)
+	{
+		$o = $this->get_object($hostname);
+		$result = $o->_init();
+		// This test may fail on IPv6 addresses if IPv6 support is
+		// not available. PHP must be compiled with IPv6 support enabled,
+		// and your operating system must be configured for IPv6 as well.
+		if ($result !== true)
+		{
+			$this->markTestSkipped("Failed to connect to $hostname: $result");
+		}
+		$this->assertContains('debian', $o->_ls());
+		$o->_close();
+	}
+
+	protected function get_object($hostname)
+	{
+		return new ftp_fsock($hostname, 'anonymous', 'anonymous@localhost.tld', '/');
+	}
+}
diff --git a/tests/network/inet_ntop_pton_test.php b/tests/network/inet_ntop_pton_test.php
index d3332f20c0..a59c2103bd 100644
--- a/tests/network/inet_ntop_pton_test.php
+++ b/tests/network/inet_ntop_pton_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/network/ip_normalise_test.php b/tests/network/ip_normalise_test.php
index dce0774d85..28059f376a 100644
--- a/tests/network/ip_normalise_test.php
+++ b/tests/network/ip_normalise_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/privmsgs/delete_user_pms_test.php b/tests/privmsgs/delete_user_pms_test.php
new file mode 100644
index 0000000000..265df1596a
--- /dev/null
+++ b/tests/privmsgs/delete_user_pms_test.php
@@ -0,0 +1,102 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_privmsgs.php';
+
+class phpbb_privmsgs_delete_user_pms_test extends phpbb_database_test_case
+{
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/delete_user_pms.xml');
+	}
+
+	public static function delete_user_pms_data()
+	{
+		return array(
+		//	array(
+		//		(user we delete),
+		//		array(remaining privmsgs ids),
+		//		array(remaining privmsgs_to),
+		//	),
+			array(
+				2,
+				array(
+					array('msg_id' => 1),
+				),
+				array(
+					array('msg_id' => 1, 'user_id' => 3),
+				),
+			),
+			array(
+				3,
+				array(
+					array('msg_id' => 1),
+					array('msg_id' => 2),
+					array('msg_id' => 3),
+					array('msg_id' => 5),
+				),
+				array(
+					array('msg_id' => 1, 'user_id' => 2),
+					array('msg_id' => 1, 'user_id' => 4),
+					array('msg_id' => 2, 'user_id' => 2),
+					array('msg_id' => 2, 'user_id' => 4),
+					array('msg_id' => 3, 'user_id' => 2),
+					array('msg_id' => 5, 'user_id' => 2),
+					array('msg_id' => 5, 'user_id' => 4),
+				),
+			),
+			array(
+				5,
+				array(
+					array('msg_id' => 1),
+					array('msg_id' => 2),
+					array('msg_id' => 3),
+					array('msg_id' => 4),
+					array('msg_id' => 5),
+				),
+				array(
+					array('msg_id' => 1, 'user_id' => 2),
+					array('msg_id' => 1, 'user_id' => 3),
+					array('msg_id' => 1, 'user_id' => 4),
+					array('msg_id' => 2, 'user_id' => 2),
+					array('msg_id' => 2, 'user_id' => 4),
+					array('msg_id' => 3, 'user_id' => 2),
+					array('msg_id' => 4, 'user_id' => 3),
+					array('msg_id' => 5, 'user_id' => 2),
+					array('msg_id' => 5, 'user_id' => 3),
+					array('msg_id' => 5, 'user_id' => 4),
+				),
+			),
+		);
+	}
+
+	/**
+	* @dataProvider delete_user_pms_data
+	*/
+	public function test_delete_user_pms($delete_user, $remaining_privmsgs, $remaining_privmsgs_to)
+	{
+		global $db;
+
+		$db = $this->new_dbal();
+
+		phpbb_delete_user_pms($delete_user);
+
+		$sql = 'SELECT msg_id
+			FROM ' . PRIVMSGS_TABLE;
+		$result = $db->sql_query($sql);
+
+		$this->assertEquals($remaining_privmsgs, $db->sql_fetchrowset($result));
+
+		$sql = 'SELECT msg_id, user_id
+			FROM ' . PRIVMSGS_TO_TABLE;
+		$result = $db->sql_query($sql);
+
+		$this->assertEquals($remaining_privmsgs_to, $db->sql_fetchrowset($result));
+	}
+}
diff --git a/tests/privmsgs/fixtures/delete_user_pms.xml b/tests/privmsgs/fixtures/delete_user_pms.xml
new file mode 100644
index 0000000000..9a86501b7a
--- /dev/null
+++ b/tests/privmsgs/fixtures/delete_user_pms.xml
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_users">
+		<column>user_id</column>
+		<column>username</column>
+		<column>username_clean</column>
+		<column>user_new_privmsg</column>
+		<column>user_unread_privmsg</column>
+		<column>user_permissions</column>
+		<column>user_sig</column>
+		<column>user_occ</column>
+		<column>user_interests</column>
+		<row>
+			<value>2</value>
+			<value>sender</value>
+			<value>sender</value>
+			<value>0</value>
+			<value>0</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>3</value>
+			<value>pm in inbox</value>
+			<value>pm in inbox</value>
+			<value>0</value>
+			<value>0</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>4</value>
+			<value>pm in no box</value>
+			<value>pm in no box</value>
+			<value>2</value>
+			<value>2</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>5</value>
+			<value>no pms</value>
+			<value>no pms</value>
+			<value>0</value>
+			<value>0</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+	</table>
+	<table name="phpbb_privmsgs">
+		<column>msg_id</column>
+		<column>root_level</column>
+		<column>author_id</column>
+		<column>message_subject</column>
+		<column>message_text</column>
+		<column>to_address</column>
+		<column>bcc_address</column>
+		<row>
+			<value>1</value>
+			<value>0</value>
+			<value>2</value>
+			<value>#1</value>
+			<value>
+				2 - outbox
+				3 - inbox
+				4 - nobox
+			</value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>2</value>
+			<value>0</value>
+			<value>2</value>
+			<value>#2</value>
+			<value>
+				2 - outbox
+				4 - nobox
+			</value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>3</value>
+			<value>0</value>
+			<value>2</value>
+			<value>#3</value>
+			<value>
+				2 - outbox
+			</value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>4</value>
+			<value>0</value>
+			<value>2</value>
+			<value>#4</value>
+			<value>
+				3 - nobox
+			</value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>5</value>
+			<value>0</value>
+			<value>2</value>
+			<value>#5</value>
+			<value>
+				2 - outbox
+				3 - nobox
+				4 - nobox
+			</value>
+			<value></value>
+			<value></value>
+		</row>
+	</table>
+	<table name="phpbb_privmsgs_to">
+		<column>msg_id</column>
+		<column>user_id</column>
+		<column>author_id</column>
+		<column>pm_new</column>
+		<column>pm_unread</column>
+		<column>folder_id</column>
+		<row>
+			<value>1</value>
+			<value>2</value>
+			<value>2</value>
+			<value>0</value>
+			<value>0</value>
+			<value>-2</value>
+		</row>
+		<row>
+			<value>1</value>
+			<value>3</value>
+			<value>2</value>
+			<value>0</value>
+			<value>0</value>
+			<value>0</value>
+		</row>
+		<row>
+			<value>1</value>
+			<value>4</value>
+			<value>2</value>
+			<value>0</value>
+			<value>0</value>
+			<value>-3</value>
+		</row>
+		<row>
+			<value>2</value>
+			<value>2</value>
+			<value>2</value>
+			<value>0</value>
+			<value>0</value>
+			<value>-2</value>
+		</row>
+		<row>
+			<value>2</value>
+			<value>4</value>
+			<value>2</value>
+			<value>0</value>
+			<value>0</value>
+			<value>-3</value>
+		</row>
+		<row>
+			<value>3</value>
+			<value>2</value>
+			<value>2</value>
+			<value>0</value>
+			<value>0</value>
+			<value>-2</value>
+		</row>
+		<row>
+			<value>4</value>
+			<value>3</value>
+			<value>2</value>
+			<value>0</value>
+			<value>0</value>
+			<value>-3</value>
+		</row>
+		<row>
+			<value>5</value>
+			<value>2</value>
+			<value>2</value>
+			<value>0</value>
+			<value>0</value>
+			<value>-2</value>
+		</row>
+		<row>
+			<value>5</value>
+			<value>3</value>
+			<value>2</value>
+			<value>0</value>
+			<value>0</value>
+			<value>-3</value>
+		</row>
+		<row>
+			<value>5</value>
+			<value>4</value>
+			<value>2</value>
+			<value>0</value>
+			<value>0</value>
+			<value>-3</value>
+		</row>
+	</table>
+</dataset>
diff --git a/tests/profile/custom_test.php b/tests/profile/custom_test.php
new file mode 100644
index 0000000000..1f33b45ba9
--- /dev/null
+++ b/tests/profile/custom_test.php
@@ -0,0 +1,55 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_profile_fields.php';
+
+class phpbb_profile_custom_test extends phpbb_database_test_case
+{
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/profile_fields.xml');
+	}
+
+	static public function dropdownFields()
+	{
+		return array(
+			// note, there is an offset of 1 between option_id (0-indexed)
+			// in the database and values (1-indexed) to avoid problems with
+			// transmitting 0 in an HTML form
+			//    required, value, expected
+			array(1,        '0',   'FIELD_INVALID_VALUE', 'Required field should throw error for out-of-range value'),
+			array(1,        '1',   'FIELD_REQUIRED',      'Required field should throw error for default value'),
+			array(1,        '2',   false,                 'Required field should accept non-default value'),
+			array(0,        '0',   'FIELD_INVALID_VALUE', 'Optional field should throw error for out-of-range value'),
+			array(0,        '1',   false,                 'Optional field should accept default value'),
+			array(0,        '2',   false,                 'Optional field should accept non-default value'),
+		);
+	}
+
+	/**
+	* @dataProvider dropdownFields
+	*/
+	public function test_dropdown_validate($field_required, $field_value, $expected, $description)
+	{
+		global $db;
+		$db = $this->new_dbal();
+
+		$field_data = array(
+			'field_id'			=> 1,
+			'lang_id'			=> 1,
+			'field_novalue'		=> 1,
+			'field_required'	=> $field_required,
+		);
+
+		$cp = new custom_profile;
+		$result = $cp->validate_profile_field(FIELD_DROPDOWN, $field_value, $field_data);
+
+		$this->assertEquals($expected, $result, $description);
+	}
+}
diff --git a/tests/profile/fixtures/profile_fields.xml b/tests/profile/fixtures/profile_fields.xml
new file mode 100644
index 0000000000..0b2929f625
--- /dev/null
+++ b/tests/profile/fixtures/profile_fields.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_profile_fields_lang">
+		<column>field_id</column>
+		<column>lang_id</column>
+		<column>option_id</column>
+		<column>field_type</column>
+		<column>lang_value</column>
+		<row>
+			<value>1</value>
+			<value>1</value>
+			<value>0</value>
+			<value>5</value>
+			<value>Default Option</value>
+		</row>
+		<row>
+			<value>1</value>
+			<value>1</value>
+			<value>1</value>
+			<value>5</value>
+			<value>First Alternative</value>
+		</row>
+		<row>
+			<value>1</value>
+			<value>1</value>
+			<value>2</value>
+			<value>5</value>
+			<value>Third Alternative</value>
+		</row>
+	</table>
+</dataset>
diff --git a/tests/random/gen_rand_string_test.php b/tests/random/gen_rand_string_test.php
index 115c55e4e2..3317c78ed9 100644
--- a/tests/random/gen_rand_string_test.php
+++ b/tests/random/gen_rand_string_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/regex/censor_test.php b/tests/regex/censor_test.php
index fa9104e71d..5929092e07 100644
--- a/tests/regex/censor_test.php
+++ b/tests/regex/censor_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/regex/email_test.php b/tests/regex/email_test.php
index 0695b801d5..b4ea5b23aa 100644
--- a/tests/regex/email_test.php
+++ b/tests/regex/email_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
@@ -28,6 +28,8 @@ class phpbb_regex_email_test extends phpbb_test_case
 			array('alice_foo@bar.phpbb.com'),
 			array('alice+tag@foo.phpbb.com'),
 			array('alice&amp;tag@foo.phpbb.com'),
+			array('alice@phpbb.australia'),
+			array('alice@phpbb.topZlevelZdomainZnamesZcanZbeZupZtoZsixtyZthreeZcharactersZlong'),
 
 			//array('"John Doe"@example.com'),
 			//array('Alice@[192.168.2.1]'),		// IPv4
@@ -96,6 +98,7 @@ class phpbb_regex_email_test extends phpbb_test_case
 			array('! "#$%(),/;<>[]`|@invalidCharsInLocal.org'),
 			array('invalidCharsInDomain@! "#$%(),/;<>_[]`|.org'),
 			array('local@SecondLevelDomainNamesAreInvalidIfTheyAreLongerThan64Charactersss.org'),
+			array('alice@phpbb.topZlevelZdomainZnamesZcanZbeZupZtoZsixtyZthreeZcharactersZlongZ'),
 		);
 	}
 
diff --git a/tests/regex/ipv4_test.php b/tests/regex/ipv4_test.php
index 9829547508..38a3aa4a8e 100644
--- a/tests/regex/ipv4_test.php
+++ b/tests/regex/ipv4_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/regex/ipv6_test.php b/tests/regex/ipv6_test.php
index 1b2018403c..d24217b346 100644
--- a/tests/regex/ipv6_test.php
+++ b/tests/regex/ipv6_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/regex/password_complexity_test.php b/tests/regex/password_complexity_test.php
index 21e8d12a0a..07453555ee 100644
--- a/tests/regex/password_complexity_test.php
+++ b/tests/regex/password_complexity_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/regex/table_prefix_test.php b/tests/regex/table_prefix_test.php
new file mode 100644
index 0000000000..33bdd4ae2d
--- /dev/null
+++ b/tests/regex/table_prefix_test.php
@@ -0,0 +1,35 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 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_regex_table_prefix_test extends phpbb_test_case
+{
+	public function table_prefix_test_data()
+	{
+		return array(
+			array('phpbb_', 1),
+			array('phpBB3', 1),
+			array('a', 1),
+
+			array('', 0),
+			array('_', 0),
+			array('a-', 0),
+			array("'", 0),
+		);
+	}
+
+	/**
+	* @dataProvider table_prefix_test_data
+	*/
+	public function test_table_prefix($prefix, $expected)
+	{
+		$this->assertEquals($expected, preg_match(get_preg_expression('table_prefix'), $prefix));
+	}
+}
diff --git a/tests/regex/url_test.php b/tests/regex/url_test.php
index c3a336063a..b395f5cae2 100644
--- a/tests/regex/url_test.php
+++ b/tests/regex/url_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/request/deactivated_super_global_test.php b/tests/request/deactivated_super_global_test.php
index 995f93443d..2e19928a5a 100644
--- a/tests/request/deactivated_super_global_test.php
+++ b/tests/request/deactivated_super_global_test.php
@@ -4,7 +4,7 @@
 * @package testing
 * @version $Id$
 * @copyright (c) 2009 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/request/request_test.php b/tests/request/request_test.php
index 203c9fd880..bca5125b7a 100644
--- a/tests/request/request_test.php
+++ b/tests/request/request_test.php
@@ -4,7 +4,7 @@
 * @package testing
 * @version $Id$
 * @copyright (c) 2009 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
@@ -22,8 +22,11 @@ class phpbb_request_test extends phpbb_test_case
 		$_REQUEST['test'] = 3;
 		$_GET['unset'] = '';
 
-		$this->type_cast_helper = $this->getMock('phpbb_request_type_cast_helper_interface');
+		$_SERVER['HTTP_HOST'] = 'example.com';
+		$_SERVER['HTTP_ACCEPT'] = 'application/json';
+		$_SERVER['HTTP_SOMEVAR'] = '<value>';
 
+		$this->type_cast_helper = $this->getMock('phpbb_request_type_cast_helper_interface');
 		$this->request = new phpbb_request($this->type_cast_helper);
 	}
 
@@ -44,6 +47,44 @@ class phpbb_request_test extends phpbb_test_case
 		$this->assertEquals($_POST, $GLOBALS['_POST'], 'Checking whether $_POST can still be accessed via $GLOBALS[\'_POST\']');
 	}
 
+	public function test_server()
+	{
+		$this->assertEquals('example.com', $this->request->server('HTTP_HOST'));
+	}
+
+	public function test_server_escaping()
+	{
+		$this->type_cast_helper
+			->expects($this->once())
+			->method('recursive_set_var')
+			->with(
+				$this->anything(),
+				'',
+				true
+			);
+
+		$this->request->server('HTTP_SOMEVAR');
+	}
+
+	public function test_header()
+	{
+		$this->assertEquals('application/json', $this->request->header('Accept'));
+	}
+
+	public function test_header_escaping()
+	{
+		$this->type_cast_helper
+			->expects($this->once())
+			->method('recursive_set_var')
+			->with(
+				$this->anything(),
+				'',
+				true
+			);
+
+		$this->request->header('SOMEVAR');
+	}
+
 	/**
 	* Checks that directly accessing $_POST will trigger
 	* an error.
@@ -60,6 +101,31 @@ class phpbb_request_test extends phpbb_test_case
 		$this->assertFalse($this->request->is_set_post('unset'));
 	}
 
+	public function test_is_ajax_without_ajax()
+	{
+		$this->assertFalse($this->request->is_ajax());
+	}
+
+	public function test_is_ajax_with_ajax()
+	{
+		$this->request->enable_super_globals();
+		$_SERVER['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest';
+		$this->request = new phpbb_request($this->type_cast_helper);
+
+		$this->assertTrue($this->request->is_ajax());
+	}
+
+	public function test_is_secure()
+	{
+		$this->assertFalse($this->request->is_secure());
+
+		$this->request->enable_super_globals();
+		$_SERVER['HTTPS'] = 'on';
+		$this->request = new phpbb_request($this->type_cast_helper);
+
+		$this->assertTrue($this->request->is_secure());
+	}
+
 	public function test_variable_names()
 	{
 		$expected = array('test', 'unset');
diff --git a/tests/request/request_var_test.php b/tests/request/request_var_test.php
index 7a45ef2fee..0e85d4694b 100644
--- a/tests/request/request_var_test.php
+++ b/tests/request/request_var_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
@@ -112,7 +112,7 @@ class phpbb_request_var_test extends phpbb_test_case
 		$this->assertEquals($expected, $result, 'Testing deep access to multidimensional input arrays: ' . $path);
 	}
 
-	public static function deep_access()
+	public function deep_access()
 	{
 		return array(
 			// array(path, default, expected result)
@@ -123,7 +123,7 @@ class phpbb_request_var_test extends phpbb_test_case
 		);
 	}
 
-	public static function request_variables()
+	public function request_variables()
 	{
 		return array(
 			// strings
diff --git a/tests/request/type_cast_helper_test.php b/tests/request/type_cast_helper_test.php
index 06cf2e1bf6..f41db005af 100644
--- a/tests/request/type_cast_helper_test.php
+++ b/tests/request/type_cast_helper_test.php
@@ -4,7 +4,7 @@
 * @package testing
 * @version $Id$
 * @copyright (c) 2009 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
@@ -48,4 +48,24 @@ class phpbb_type_cast_helper_test extends phpbb_test_case
 
 		$this->assertEquals($expected, $data);
 	}
+
+	public function test_simple_untrimmed_recursive_set_var()
+	{
+		$data = " eviL<3\t\t";
+		$expected = " eviL&lt;3\t\t";
+
+		$this->type_cast_helper->recursive_set_var($data, '', true, false);
+
+		$this->assertEquals($expected, $data);
+	}
+
+	public function test_nested_untrimmed_recursive_set_var()
+	{
+		$data = array(" eviL<3\t\t");
+		$expected = array(" eviL&lt;3\t\t");
+
+		$this->type_cast_helper->recursive_set_var($data, array(0 => ''), true, false);
+
+		$this->assertEquals($expected, $data);
+	}
 }
diff --git a/tests/security/base.php b/tests/security/base.php
index db9c884cf4..08878ad60d 100644
--- a/tests/security/base.php
+++ b/tests/security/base.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
@@ -14,20 +14,20 @@ abstract class phpbb_security_test_base extends phpbb_test_case
 	*/
 	protected function setUp()
 	{
-		global $user, $phpbb_root_path;
+		global $user, $phpbb_root_path, $request;
 
 		// Put this into a global function being run by every test to init a proper user session
-		$_SERVER['HTTP_HOST']		= 'localhost';
-		$_SERVER['SERVER_NAME']		= 'localhost';
-		$_SERVER['SERVER_ADDR']		= '127.0.0.1';
-		$_SERVER['SERVER_PORT']		= 80;
-		$_SERVER['REMOTE_ADDR']		= '127.0.0.1';
-		$_SERVER['QUERY_STRING']	= '';
-		$_SERVER['REQUEST_URI']		= '/tests/';
-		$_SERVER['SCRIPT_NAME']		= '/tests/index.php';
-		$_SERVER['PHP_SELF']		= '/tests/index.php';
-		$_SERVER['HTTP_USER_AGENT']	= 'Mozilla/5.0 (Windows; U; Windows NT 6.0; de; rv:1.8.1.14) Gecko/20080404 Firefox/2.0.0.14';
-		$_SERVER['HTTP_ACCEPT_LANGUAGE']	= 'de-de,de;q=0.8,en-us;q=0.5,en;q=0.3';
+		$server['HTTP_HOST']		= 'localhost';
+		$server['SERVER_NAME']		= 'localhost';
+		$server['SERVER_ADDR']		= '127.0.0.1';
+		$server['SERVER_PORT']		= 80;
+		$server['REMOTE_ADDR']		= '127.0.0.1';
+		$server['QUERY_STRING']	= '';
+		$server['REQUEST_URI']		= '/tests/';
+		$server['SCRIPT_NAME']		= '/tests/index.php';
+		$server['PHP_SELF']		= '/tests/index.php';
+		$server['HTTP_USER_AGENT']	= 'Mozilla/5.0 (Windows; U; Windows NT 6.0; de; rv:1.8.1.14) Gecko/20080404 Firefox/2.0.0.14';
+		$server['HTTP_ACCEPT_LANGUAGE']	= 'de-de,de;q=0.8,en-us;q=0.5,en;q=0.3';
 
 /*
 		[HTTP_ACCEPT_ENCODING] => gzip,deflate
@@ -36,14 +36,16 @@ abstract class phpbb_security_test_base extends phpbb_test_case
 		[SCRIPT_FILENAME] => /var/www/tests/index.php
 */
 
+		$request = new phpbb_mock_request(array(), array(), array(), $server);
+
 		// Set no user and trick a bit to circumvent errors
-		$user = new user();
+		$user = new phpbb_user();
 		$user->lang = true;
-		$user->browser				= (!empty($_SERVER['HTTP_USER_AGENT'])) ? htmlspecialchars((string) $_SERVER['HTTP_USER_AGENT']) : '';
-		$user->referer				= (!empty($_SERVER['HTTP_REFERER'])) ? htmlspecialchars((string) $_SERVER['HTTP_REFERER']) : '';
-		$user->forwarded_for		= (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) ? (string) $_SERVER['HTTP_X_FORWARDED_FOR'] : '';
-		$user->host					= (!empty($_SERVER['HTTP_HOST'])) ? (string) strtolower($_SERVER['HTTP_HOST']) : ((!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME'));
-		$user->page = session::extract_current_page($phpbb_root_path);
+		$user->browser				= $server['HTTP_USER_AGENT'];
+		$user->referer				= '';
+		$user->forwarded_for		= '';
+		$user->host					= $server['HTTP_HOST'];
+		$user->page = phpbb_session::extract_current_page($phpbb_root_path);
 	}
 
 	protected function tearDown()
diff --git a/tests/security/extract_current_page_test.php b/tests/security/extract_current_page_test.php
index 71c7a3a397..d77cbbcaf3 100644
--- a/tests/security/extract_current_page_test.php
+++ b/tests/security/extract_current_page_test.php
@@ -3,18 +3,17 @@
 *
 * @package testing
 * @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
 require_once dirname(__FILE__) . '/base.php';
 
 require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
-require_once dirname(__FILE__) . '/../../phpBB/includes/session.php';
 
 class phpbb_security_extract_current_page_test extends phpbb_security_test_base
 {
-	public static function security_variables()
+	public function security_variables()
 	{
 		return array(
 			array('http://localhost/phpBB/index.php', 'mark=forums&x="><script>alert(/XSS/);</script>', 'mark=forums&x=%22%3E%3Cscript%3Ealert(/XSS/);%3C/script%3E'),
@@ -27,10 +26,14 @@ class phpbb_security_extract_current_page_test extends phpbb_security_test_base
 	*/
 	public function test_query_string_php_self($url, $query_string, $expected)
 	{
-		$_SERVER['PHP_SELF'] = $url;
-		$_SERVER['QUERY_STRING'] = $query_string;
+		global $request;
 
-		$result = session::extract_current_page('./');
+		$request->merge(phpbb_request_interface::SERVER, array(
+			'PHP_SELF'	=> $url,
+			'QUERY_STRING'	=> $query_string,
+		));
+
+		$result = phpbb_session::extract_current_page('./');
 
 		$label = 'Running extract_current_page on ' . $query_string . ' with PHP_SELF filled.';
 		$this->assertEquals($expected, $result['query_string'], $label);
@@ -41,10 +44,14 @@ class phpbb_security_extract_current_page_test extends phpbb_security_test_base
 	*/
 	public function test_query_string_request_uri($url, $query_string, $expected)
 	{
-		$_SERVER['REQUEST_URI'] = $url . '?' . $query_string;
-		$_SERVER['QUERY_STRING'] = $query_string;
+		global $request;
+
+		$request->merge(phpbb_request_interface::SERVER, array(
+			'PHP_SELF'	=> $url,
+			'QUERY_STRING'	=> $query_string,
+		));
 
-		$result = session::extract_current_page('./');
+		$result = phpbb_session::extract_current_page('./');
 
 		$label = 'Running extract_current_page on ' . $query_string . ' with REQUEST_URI filled.';
 		$this->assertEquals($expected, $result['query_string'], $label);
diff --git a/tests/security/hash_test.php b/tests/security/hash_test.php
index 19a3822145..0c2580c19b 100644
--- a/tests/security/hash_test.php
+++ b/tests/security/hash_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/security/redirect_test.php b/tests/security/redirect_test.php
index 76347d309f..1325466137 100644
--- a/tests/security/redirect_test.php
+++ b/tests/security/redirect_test.php
@@ -3,18 +3,17 @@
 *
 * @package testing
 * @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
 require_once dirname(__FILE__) . '/base.php';
 
 require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
-require_once dirname(__FILE__) . '/../../phpBB/includes/session.php';
 
 class phpbb_security_redirect_test extends phpbb_security_test_base
 {
-	public static function provider()
+	public function provider()
 	{
 		// array(Input -> redirect(), expected triggered error (else false), expected returned result url (else false))
 		return array(
diff --git a/tests/session/append_sid_test.php b/tests/session/append_sid_test.php
new file mode 100644
index 0000000000..34f6dea8ca
--- /dev/null
+++ b/tests/session/append_sid_test.php
@@ -0,0 +1,54 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 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_session_append_sid_test extends phpbb_test_case
+{
+
+	public function append_sid_data()
+	{
+		return array(
+			array('viewtopic.php?t=1&amp;f=2', false, true, false, 'viewtopic.php?t=1&amp;f=2', 'parameters in url-argument'),
+			array('viewtopic.php', 't=1&amp;f=2', true, false, 'viewtopic.php?t=1&amp;f=2', 'parameters in params-argument using amp'),
+			array('viewtopic.php', 't=1&f=2', false, false, 'viewtopic.php?t=1&f=2', 'parameters in params-argument using &'),
+			array('viewtopic.php', array('t' => 1, 'f' => 2), true, false, 'viewtopic.php?t=1&amp;f=2', 'parameters in params-argument as array'),
+
+			// Custom sid parameter
+			array('viewtopic.php', 't=1&amp;f=2', true, 'custom-sid', 'viewtopic.php?t=1&amp;f=2&amp;sid=custom-sid', 'using session_id'),
+
+			// Testing anchors
+			array('viewtopic.php?t=1&amp;f=2#anchor', false, true, false, 'viewtopic.php?t=1&amp;f=2#anchor', 'anchor in url-argument'),
+			array('viewtopic.php', 't=1&amp;f=2#anchor', true, false, 'viewtopic.php?t=1&amp;f=2#anchor', 'anchor in params-argument'),
+			array('viewtopic.php', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, 'viewtopic.php?t=1&amp;f=2#anchor', 'anchor in params-argument (array)'),
+
+			// Anchors and custom sid
+			array('viewtopic.php?t=1&amp;f=2#anchor', false, true, 'custom-sid', 'viewtopic.php?t=1&amp;f=2&amp;sid=custom-sid#anchor', 'anchor in url-argument using session_id'),
+			array('viewtopic.php', 't=1&amp;f=2#anchor', true, 'custom-sid', 'viewtopic.php?t=1&amp;f=2&amp;sid=custom-sid#anchor', 'anchor in params-argument using session_id'),
+			array('viewtopic.php', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', 'viewtopic.php?t=1&amp;f=2&amp;sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
+
+			// Empty parameters should not append the ?
+			array('viewtopic.php', false, true, false, 'viewtopic.php', 'no params using bool false'),
+			array('viewtopic.php', '', true, false, 'viewtopic.php', 'no params using empty string'),
+			array('viewtopic.php', array(), true, false, 'viewtopic.php', 'no params using empty array'),
+		);
+	}
+
+	/**
+	* @dataProvider append_sid_data
+	*/
+	public function test_append_sid($url, $params, $is_amp, $session_id, $expected, $description)
+	{
+		global $phpbb_dispatcher;
+
+		$phpbb_dispatcher = new phpbb_mock_event_dispatcher;
+		$this->assertEquals($expected, append_sid($url, $params, $is_amp, $session_id));
+	}
+}
+
diff --git a/tests/session/continue_test.php b/tests/session/continue_test.php
index 6737562a0a..ad78d92299 100644
--- a/tests/session/continue_test.php
+++ b/tests/session/continue_test.php
@@ -3,11 +3,10 @@
 *
 * @package testing
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
-require_once dirname(__FILE__) . '/../mock/cache.php';
 require_once dirname(__FILE__) . '/testable_factory.php';
 
 class phpbb_session_continue_test extends phpbb_database_test_case
diff --git a/tests/session/fixtures/sessions_empty.xml b/tests/session/fixtures/sessions_empty.xml
index f94337314e..0e6ddccd88 100644
--- a/tests/session/fixtures/sessions_empty.xml
+++ b/tests/session/fixtures/sessions_empty.xml
@@ -3,17 +3,33 @@
 	<table name="phpbb_users">
 		<column>user_id</column>
 		<column>username_clean</column>
+		<column>user_permissions</column>
+		<column>user_sig</column>
+		<column>user_occ</column>
+		<column>user_interests</column>
 		<row>
 			<value>1</value>
 			<value>anonymous</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
 		</row>
 		<row>
 			<value>3</value>
 			<value>foo</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
 		</row>
 		<row>
 			<value>4</value>
 			<value>bar</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
 		</row>
 	</table>
 	<table name="phpbb_sessions">
diff --git a/tests/session/fixtures/sessions_full.xml b/tests/session/fixtures/sessions_full.xml
index bf6fc65997..509687f4d2 100644
--- a/tests/session/fixtures/sessions_full.xml
+++ b/tests/session/fixtures/sessions_full.xml
@@ -3,17 +3,33 @@
 	<table name="phpbb_users">
 		<column>user_id</column>
 		<column>username_clean</column>
+		<column>user_permissions</column>
+		<column>user_sig</column>
+		<column>user_occ</column>
+		<column>user_interests</column>
 		<row>
 			<value>1</value>
 			<value>anonymous</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
 		</row>
 		<row>
 			<value>3</value>
 			<value>foo</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
 		</row>
 		<row>
 			<value>4</value>
 			<value>bar</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
 		</row>
 	</table>
 	<table name="phpbb_sessions">
diff --git a/tests/session/init_test.php b/tests/session/init_test.php
index 1181fab636..830de34ed0 100644
--- a/tests/session/init_test.php
+++ b/tests/session/init_test.php
@@ -3,11 +3,10 @@
 *
 * @package testing
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
-require_once dirname(__FILE__) . '/../mock/cache.php';
 require_once dirname(__FILE__) . '/testable_factory.php';
 
 class phpbb_session_init_test extends phpbb_database_test_case
diff --git a/tests/session/testable_factory.php b/tests/session/testable_factory.php
index 2b6a1683d3..cb85a01c5c 100644
--- a/tests/session/testable_factory.php
+++ b/tests/session/testable_factory.php
@@ -3,13 +3,10 @@
 *
 * @package testing
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
-require_once dirname(__FILE__) . '/../mock/request.php';
-require_once dirname(__FILE__) . '/../mock/session_testable.php';
-
 /**
 * This class exists to setup an instance of phpbb's session class for testing.
 *
@@ -73,7 +70,8 @@ class phpbb_session_testable_factory
 		$request = $this->request = new phpbb_mock_request(
 			array(),
 			array(),
-			$this->cookies
+			$this->cookies,
+			$this->server_data
 		);
 		request_var(null, null, null, null, $request);
 
@@ -85,8 +83,6 @@ class phpbb_session_testable_factory
 		$cache = $this->cache = new phpbb_mock_cache($this->get_cache_data());
 		$SID = $_SID = null;
 
-		$_SERVER = $this->server_data;
-
 		$session = new phpbb_mock_session_testable;
 		return $session;
 	}
diff --git a/tests/template/includephp_test.php b/tests/template/includephp_test.php
new file mode 100644
index 0000000000..f008a734eb
--- /dev/null
+++ b/tests/template/includephp_test.php
@@ -0,0 +1,47 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/template_test_case.php';
+
+class phpbb_template_includephp_test extends phpbb_template_template_test_case
+{
+	public function test_includephp_relative()
+	{
+		$this->setup_engine(array('tpl_allow_php' => true));
+
+		$cache_file = $this->template->cachepath . 'includephp_relative.html.php';
+
+		$this->run_template('includephp_relative.html', array(), array(), array(), "Path is relative to board root.\ntesting included php", $cache_file);
+
+		$this->template->set_filenames(array('test' => 'includephp_relative.html'));
+		$this->assertEquals("Path is relative to board root.\ntesting included php", $this->display('test'), "Testing INCLUDEPHP");
+	}
+
+	public function test_includephp_absolute()
+	{
+		$path_to_php = dirname(__FILE__) . '/templates/_dummy_include.php.inc';
+		$this->assertTrue(phpbb_is_absolute($path_to_php));
+		$template_text = "Path is absolute.\n<!-- INCLUDEPHP $path_to_php -->";
+
+		$cache_dir = dirname($this->template->cachepath) . '/';
+		$fp = fopen($cache_dir . 'includephp_absolute.html', 'w');
+		fputs($fp, $template_text);
+		fclose($fp);
+
+		$this->setup_engine(array('tpl_allow_php' => true));
+
+		$this->style->set_custom_style('tests', $cache_dir, '');
+		$cache_file = $this->template->cachepath . 'includephp_absolute.html.php';
+
+		$this->run_template('includephp_absolute.html', array(), array(), array(), "Path is absolute.\ntesting included php", $cache_file);
+
+		$this->template->set_filenames(array('test' => 'includephp_absolute.html'));
+		$this->assertEquals("Path is absolute.\ntesting included php", $this->display('test'), "Testing INCLUDEPHP");
+	}
+}
diff --git a/tests/template/invalid_constructs_test.php b/tests/template/invalid_constructs_test.php
new file mode 100644
index 0000000000..19d192b8b6
--- /dev/null
+++ b/tests/template/invalid_constructs_test.php
@@ -0,0 +1,87 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/template_test_case.php';
+
+class phpbb_template_invalid_constructs_test extends phpbb_template_template_test_case
+{
+	public function template_data()
+	{
+		return array(
+			array(
+				'Unknown tag',
+				'invalid/unknown_tag.html',
+				array(),
+				array(),
+				array(),
+				'invalid/output/unknown_tag.html',
+			),
+			/*
+			* Produces a parse error which is fatal, therefore
+			* destroying the test suite.
+			array(
+				'ENDIF without IF',
+				'invalid/endif_without_if.html',
+				array(),
+				array(),
+				array(),
+				'invalid/output/endif_without_if.html',
+			),
+			*/
+		);
+	}
+
+	public function template_data_error()
+	{
+		return array(
+			array(
+				'Include a nonexistent file',
+				'invalid/include_nonexistent_file.html',
+				array(),
+				array(),
+				array(),
+				E_USER_ERROR,
+				'invalid/output/include_nonexistent_file.html',
+			),
+		);
+	}
+
+	/**
+	* @dataProvider template_data
+	*/
+	public function test_template($description, $file, $vars, $block_vars, $destroy, $expected)
+	{
+		$cache_file = $this->template->cachepath . str_replace('/', '.', $file) . '.php';
+
+		$this->assertFileNotExists($cache_file);
+
+		$expected = file_get_contents(dirname(__FILE__) . '/templates/' . $expected);
+		// apparently the template engine does not put
+		// the trailing newline into compiled templates
+		$expected = trim($expected);
+		$this->run_template($file, $vars, $block_vars, $destroy, $expected, $cache_file);
+	}
+
+	/**
+	* @dataProvider template_data_error
+	*/
+	public function test_template_error($description, $file, $vars, $block_vars, $destroy, $error, $expected)
+	{
+		$cache_file = $this->template->cachepath . str_replace('/', '.', $file) . '.php';
+
+		$this->assertFileNotExists($cache_file);
+
+		$expected = file_get_contents(dirname(__FILE__) . '/templates/' . $expected);
+		// apparently the template engine does not put
+		// the trailing newline into compiled templates
+		$expected = trim($expected);
+		$this->setExpectedTriggerError($error, $expected);
+		$this->run_template($file, $vars, $block_vars, $destroy, '', $cache_file);
+	}
+}
diff --git a/tests/template/parent_templates/parent_and_child.html b/tests/template/parent_templates/parent_and_child.html
new file mode 100644
index 0000000000..71984b48ad
--- /dev/null
+++ b/tests/template/parent_templates/parent_and_child.html
@@ -0,0 +1 @@
+Parent template.
diff --git a/tests/template/parent_templates/parent_and_child.js b/tests/template/parent_templates/parent_and_child.js
new file mode 100644
index 0000000000..6d9bb163bf
--- /dev/null
+++ b/tests/template/parent_templates/parent_and_child.js
@@ -0,0 +1 @@
+// JavaScript file in a parent style.
diff --git a/tests/template/parent_templates/parent_only.html b/tests/template/parent_templates/parent_only.html
new file mode 100644
index 0000000000..8cfb90eca2
--- /dev/null
+++ b/tests/template/parent_templates/parent_only.html
@@ -0,0 +1 @@
+Only in parent.
diff --git a/tests/template/parent_templates/parent_only.js b/tests/template/parent_templates/parent_only.js
new file mode 100644
index 0000000000..9c3007d83f
--- /dev/null
+++ b/tests/template/parent_templates/parent_only.js
@@ -0,0 +1 @@
+// JavaScript file only in parent style.
diff --git a/tests/template/renderer_eval_test.php b/tests/template/renderer_eval_test.php
new file mode 100644
index 0000000000..7ebb8b9bda
--- /dev/null
+++ b/tests/template/renderer_eval_test.php
@@ -0,0 +1,31 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_template_renderer_eval_test extends phpbb_test_case
+{
+	public function test_eval()
+	{
+		$compiled_code = '<a href="<?php echo \'Test\'; ?>">';
+		$valid_code = '<a href="Test">';
+		$context = new phpbb_template_context();
+		$template = new phpbb_template_renderer_eval($compiled_code, NULL);
+		ob_start();
+		try
+		{
+			$template->render($context, array());
+		}
+		catch (Exception $exception)
+		{
+			ob_end_clean();
+			throw $exception;
+		}
+		$output = ob_get_clean();
+		$this->assertEquals($valid_code, $output);
+	}
+}
diff --git a/tests/template/subdir/includephp_from_subdir_test.php b/tests/template/subdir/includephp_from_subdir_test.php
new file mode 100644
index 0000000000..517cb85a30
--- /dev/null
+++ b/tests/template/subdir/includephp_from_subdir_test.php
@@ -0,0 +1,29 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/../template_test_case.php';
+
+class phpbb_template_subdir_includephp_from_subdir_test extends phpbb_template_template_test_case
+{
+	// Exact copy of test_includephp_relatve from ../includephp_test.php.
+	// Verifies that relative php inclusion works when including script
+	// (and thus current working directory) is in a subdirectory of
+	// board root.
+	public function test_includephp_relative()
+	{
+		$this->setup_engine(array('tpl_allow_php' => true));
+
+		$cache_file = $this->template->cachepath . 'includephp_relative.html.php';
+
+		$this->run_template('includephp_relative.html', array(), array(), array(), "Path is relative to board root.\ntesting included php", $cache_file);
+
+		$this->template->set_filenames(array('test' => 'includephp_relative.html'));
+		$this->assertEquals("Path is relative to board root.\ntesting included php", $this->display('test'), "Testing INCLUDEPHP");
+	}
+}
diff --git a/tests/template/template_compile_test.php b/tests/template/template_compile_test.php
new file mode 100644
index 0000000000..0cfcd6ceb5
--- /dev/null
+++ b/tests/template/template_compile_test.php
@@ -0,0 +1,31 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 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_template_template_compile_test extends phpbb_test_case
+{
+	private $template_compile;
+	private $template_path;
+
+	protected function setUp()
+	{
+		$this->template_compile = new phpbb_template_compile(false, null, '');
+		$this->template_path = dirname(__FILE__) . '/templates';
+	}
+
+	public function test_in_phpbb()
+	{
+		$output = $this->template_compile->compile_file($this->template_path . '/trivial.html');
+		$this->assertTrue(strlen($output) > 0);
+		$statements = explode(';', $output);
+		$first_statement = $statements[0];
+		$this->assertTrue(!!preg_match('#if.*defined.*IN_PHPBB.*exit#', $first_statement));
+	}
+}
diff --git a/tests/template/template_includejs_test.php b/tests/template/template_includejs_test.php
new file mode 100644
index 0000000000..a8f9a9037f
--- /dev/null
+++ b/tests/template/template_includejs_test.php
@@ -0,0 +1,30 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/template_test_case_with_tree.php';
+
+class phpbb_template_template_includejs_test extends phpbb_template_template_test_case_with_tree
+{
+	public function test_includejs_compilation()
+	{
+		// Reset the engine state
+		$this->setup_engine(array('assets_version' => 1));
+
+		// Prepare correct result
+		$scripts = array(
+			'<script src="' . $this->test_path . '/templates/parent_and_child.js?assets_version=1"></script>',
+			'<script src="' . $this->test_path . '/parent_templates/parent_only.js?assets_version=1"></script>',
+			'<script src="' . $this->test_path . '/templates/child_only.js?assets_version=1"></script>'
+		);
+
+		// Run test
+		$cache_file = $this->template->cachepath . 'includejs.html.php';
+		$this->run_template('includejs.html', array('PARENT' => 'parent_only.js'), array(), array(), implode('', $scripts), $cache_file);
+	}
+}
diff --git a/tests/template/template_inheritance_test.php b/tests/template/template_inheritance_test.php
new file mode 100644
index 0000000000..febfed9ef0
--- /dev/null
+++ b/tests/template/template_inheritance_test.php
@@ -0,0 +1,64 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/template_test_case_with_tree.php';
+
+class phpbb_template_template_inheritance_test extends phpbb_template_template_test_case_with_tree
+{
+	/**
+	 * @todo put test data into templates/xyz.test
+	 */
+	public function template_data()
+	{
+		return array(
+			// First element of the array is test name - keep them distinct
+			array(
+				'simple inheritance - only parent template exists',
+				'parent_only.html',
+				array(),
+				array(),
+				array(),
+				"Only in parent.",
+			),
+			array(
+				'simple inheritance - only child template exists',
+				'child_only.html',
+				array(),
+				array(),
+				array(),
+				"Only in child.",
+			),
+			array(
+				'simple inheritance - both parent and child templates exist',
+				'parent_and_child.html',
+				array(),
+				array(),
+				array(),
+				"Child template.",
+			),
+		);
+	}
+
+	/**
+	* @dataProvider template_data
+	*/
+	public function test_template($name, $file, array $vars, array $block_vars, array $destroy, $expected)
+	{
+		$cache_file = $this->template->cachepath . str_replace('/', '.', $file) . '.php';
+
+		$this->assertFileNotExists($cache_file);
+
+		$this->run_template($file, $vars, $block_vars, $destroy, $expected, $cache_file);
+
+		// Reset the engine state
+		$this->setup_engine();
+
+		$this->run_template($file, $vars, $block_vars, $destroy, $expected, $cache_file);
+	}
+}
diff --git a/tests/template/template_locate_test.php b/tests/template/template_locate_test.php
new file mode 100644
index 0000000000..be9ae06809
--- /dev/null
+++ b/tests/template/template_locate_test.php
@@ -0,0 +1,68 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/template_test_case_with_tree.php';
+
+class phpbb_template_template_locate_test extends phpbb_template_template_test_case_with_tree
+{
+	public function template_data()
+	{
+		return array(
+			// First element of the array is test name - keep them distinct
+			array(
+				'simple inheritance - only parent template exists',
+				$this->test_path . '/parent_templates/parent_only.html',
+				'parent_only.html',
+				false,
+				true,
+			),
+			array(
+				'simple inheritance - only child template exists',
+				$this->test_path . '/templates/child_only.html',
+				'child_only.html',
+				false,
+				true,
+			),
+			array(
+				'simple inheritance - both parent and child templates exist',
+				$this->test_path . '/templates/parent_and_child.html',
+				'parent_and_child.html',
+				false,
+				true,
+			),
+			array(
+				'find first template - only child template exists in main style',
+				'child_only.html',
+				array('parent_only.html', 'child_only.html'),
+				false,
+				false,
+			),
+			array(
+				'find first template - both templates exist in main style',
+				'parent_and_child.html',
+				array('parent_and_child.html', 'child_only.html'),
+				false,
+				false,
+			),
+		);
+	}
+
+	/**
+	* @dataProvider template_data
+	*/
+	public function test_template($name, $expected, $files, $return_default, $return_full_path)
+	{
+		// Reset the engine state
+		$this->setup_engine();
+
+		// Locate template
+		$result = $this->template->locate($files, $return_default, $return_full_path);
+		$this->assertSame($expected, $result);
+	}
+}
diff --git a/tests/template/template_test.php b/tests/template/template_test.php
index 62f94f7d32..f8677ed913 100644
--- a/tests/template/template_test.php
+++ b/tests/template/template_test.php
@@ -3,78 +3,19 @@
 *
 * @package testing
 * @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
 require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
-require_once dirname(__FILE__) . '/../../phpBB/includes/template.php';
+require_once dirname(__FILE__) . '/template_test_case.php';
 
-class phpbb_template_template_test extends phpbb_test_case
+class phpbb_template_template_test extends phpbb_template_template_test_case
 {
-	private $template;
-	private $template_path;
-
-	// Keep the contents of the cache for debugging?
-	const PRESERVE_CACHE = false;
-
-	private function display($handle)
-	{
-		ob_start();
-		$this->assertTrue($this->template->display($handle, false));
-		return self::trim_template_result(ob_get_clean());
-	}
-
-	private static function trim_template_result($result)
-	{
-		return str_replace("\n\n", "\n", implode("\n", array_map('trim', explode("\n", trim($result)))));
-	}
-
-	private function setup_engine()
-	{
-		$this->template_path = dirname(__FILE__) . '/templates';
-		$this->template = new template();
-		$this->template->set_custom_template($this->template_path, 'tests');
-	}
-
-	protected function setUp()
-	{
-		$this->markTestIncomplete("template::display raises notices.");
-
-		// Test the engine can be used
-		$this->setup_engine();
-
-		if (!is_writable(dirname($this->template->cachepath)))
-		{
-			$this->markTestSkipped("Template cache directory is not writable.");
-		}
-
-		foreach (glob($this->template->cachepath . '*') as $file)
-		{
-			unlink($file);
-		}
-
-		$GLOBALS['config'] = array(
-			'load_tplcompile'	=> true,
-			'tpl_allow_php'		=> false,
-		);
-	}
-
-	protected function tearDown()
-	{
-		if (is_object($this->template))
-		{
-			foreach (glob($this->template->cachepath . '*') as $file)
-			{
-				unlink($file);
-			}
-		}
-	}
-
 	/**
 	 * @todo put test data into templates/xyz.test
 	 */
-	public static function template_data()
+	public function template_data()
 	{
 		return array(
 			/*
@@ -91,7 +32,7 @@ class phpbb_template_template_test extends phpbb_test_case
 				array(),
 				array(),
 				array(),
-				"pass\npass\n<!-- DUMMY var -->",
+				"pass\npass\npass\n<!-- DUMMY var -->",
 			),
 			array(
 				'variable.html',
@@ -105,14 +46,14 @@ class phpbb_template_template_test extends phpbb_test_case
 				array(),
 				array(),
 				array(),
-				'0',
+				'03',
 			),
 			array(
 				'if.html',
 				array('S_VALUE' => true),
 				array(),
 				array(),
-				"1\n0",
+				'1',
 			),
 			array(
 				'if.html',
@@ -161,22 +102,22 @@ class phpbb_template_template_test extends phpbb_test_case
 				array(),
 				array('loop' => array(array('VARIABLE' => 'x'))),
 				array(),
-				"first\n0\nx\nset\nlast",
-			),/* no nested top level loops
+				"first\n0 - a\nx - b\nset\nlast",
+			),
 			array(
 				'loop_vars.html',
 				array(),
 				array('loop' => array(array('VARIABLE' => 'x'), array('VARIABLE' => 'y'))),
 				array(),
-				"first\n0\n0\n2\nx\nset\n1\n1\n2\ny\nset\nlast",
+				"first\n0 - a\nx - b\nset\n1 - a\ny - b\nset\nlast",
 			),
 			array(
 				'loop_vars.html',
 				array(),
 				array('loop' => array(array('VARIABLE' => 'x'), array('VARIABLE' => 'y')), 'loop.inner' => array(array(), array())),
 				array(),
-				"first\n0\n0\n2\nx\nset\n1\n1\n2\ny\nset\nlast\n0\n\n1\nlast inner\ninner loop",
-			),*/
+				"first\n0 - a\nx - b\nset\n1 - a\ny - b\nset\nlast\n0 - c\n1 - c\nlast inner\ninner loop",
+			),
 			array(
 				'loop_advanced.html',
 				array(),
@@ -189,14 +130,23 @@ class phpbb_template_template_test extends phpbb_test_case
 				array(),
 				array('loop' => array(array(), array(), array(), array(), array(), array(), array()), 'test' => array(array()), 'test.deep' => array(array()), 'test.deep.defines' => array(array())),
 				array(),
-				"xyz\nabc",
+				"xyz\nabc\nabc\nbar\nbar\nabc",
 			),
 			array(
 				'expressions.html',
 				array(),
 				array(),
 				array(),
-				trim(str_repeat("pass", 39)),
+				trim(str_repeat("pass\n", 10) . "\n"
+					. str_repeat("pass\n", 4) . "\n"
+					. str_repeat("pass\n", 2) . "\n"
+					. str_repeat("pass\n", 6) . "\n"
+					. str_repeat("pass\n", 2) . "\n"
+					. str_repeat("pass\n", 6) . "\n"
+					. str_repeat("pass\n", 2) . "\n"
+					. str_repeat("pass\n", 2) . "\n"
+					. str_repeat("pass\n", 3) . "\n"
+					. str_repeat("pass\n", 2) . "\n"),
 			),
 			array(
 				'php.html',
@@ -213,6 +163,27 @@ class phpbb_template_template_test extends phpbb_test_case
 				'value',
 			),
 			array(
+				'include_define.html',
+				array('VARIABLE' => 'value'),
+				array(),
+				array(),
+				'value',
+			),
+			array(
+				'include_loop.html',
+				array(),
+				array('loop' => array(array('NESTED_FILE' => 'include_loop1.html')), 'loop.inner' => array(array('NESTED_FILE' => 'include_loop1.html'), array('NESTED_FILE' => 'include_loop2.html'), array('NESTED_FILE' => 'include_loop3.html'))),
+				array(),
+				"1\n_1\n_02\n_3",
+			),
+			array(
+				'include_variable.html',
+				array('FILE' => 'variable.html', 'VARIABLE' => 'value'),
+				array(),
+				array(),
+				'value',
+			),
+			array(
 				'loop_vars.html',
 				array(),
 				array('loop' => array(array('VARIABLE' => 'x'), array('VARIABLE' => 'y')), 'loop.inner' => array(array(), array())),
@@ -227,26 +198,75 @@ class phpbb_template_template_test extends phpbb_test_case
 				"first\n0\n0\n2\nx\nset\n1\n1\n2\ny\nset\nlast",
 			),*/
 			array(
+				// Just like a regular loop but the name begins
+				// with an underscore
+				'loop_underscore.html',
+				array(),
+				array(),
+				array(),
+				"noloop\nnoloop",
+			),
+			array(
 				'lang.html',
 				array(),
 				array(),
 				array(),
-				"{ VARIABLE }\n{ VARIABLE }",
+				"{ VARIABLE }\n{ 1_VARIABLE }\n{ VARIABLE }\n{ 1_VARIABLE }",
 			),
 			array(
 				'lang.html',
-				array('L_VARIABLE' => "Value'"),
+				array('L_VARIABLE' => "Value'", 'L_1_VARIABLE' => "1 O'Clock"),
 				array(),
 				array(),
-				"Value'\nValue\'",
+				"Value'\n1 O'Clock\nValue\'\n1 O\'Clock",
 			),
 			array(
 				'lang.html',
-				array('LA_VARIABLE' => "Value'"),
+				array('LA_VARIABLE' => "Value'", 'LA_1_VARIABLE' => "1 O'Clock"),
+				array(),
+				array(),
+				"{ VARIABLE }\n{ 1_VARIABLE }\nValue'\n1 O'Clock",
+			),
+			array(
+				'loop_nested_multilevel_ref.html',
+				array(),
+				array(),
+				array(),
+				"top-level content",
+			),
+			array(
+				'loop_nested_multilevel_ref.html',
 				array(),
+				array('outer' => array(array('VARIABLE' => 'x'), array('VARIABLE' => 'y')), 'outer.inner' => array(array('VARIABLE' => 'z'), array('VARIABLE' => 'zz'))),
 				array(),
-				"{ VARIABLE }\nValue'",
+				// I don't completely understand this output, hopefully it's correct
+				"top-level content\nouter x\nouter y\ninner z\nfirst row\n\ninner zz",
 			),
+			array(
+				'loop_nested_deep_multilevel_ref.html',
+				array(),
+				array('outer' => array(array()), 'outer.middle' => array(array()), 'outer.middle.inner' => array(array('VARIABLE' => 'z'), array('VARIABLE' => 'zz'))),
+				array(),
+				// I don't completely understand this output, hopefully it's correct
+				"top-level content\nouter\nmiddle\ninner z\nfirst row of 2 in inner\n\ninner zz",
+			),
+			array(
+				'loop_size.html',
+				array(),
+				array('loop' => array(array()), 'empty_loop' => array()),
+				array(),
+				"nonexistent = 0\n! nonexistent\n\nempty = 0\n! empty\nloop\n\nin loop",
+			),
+			/* Does not pass with the current implementation.
+			array(
+				'loop_reuse.html',
+				array(),
+				array('one' => array(array('VAR' => 'a'), array('VAR' => 'b')), 'one.one' => array(array('VAR' => 'c'), array('VAR' => 'd'))),
+				array(),
+				// Not entirely sure what should be outputted but the current output of "a" is most certainly wrong
+				"a\nb\nc\nd",
+			),
+			*/
 		);
 	}
 
@@ -257,7 +277,7 @@ class phpbb_template_template_test extends phpbb_test_case
 		$this->template->set_filenames(array('test' => $filename));
 		$this->assertFileNotExists($this->template_path . '/' . $filename, 'Testing missing file, file cannot exist');
 
-		$expecting = sprintf('template->_tpl_load_file(): File %s does not exist or is empty', realpath($this->template_path . '/../') . '/templates/' . $filename);
+		$expecting = sprintf('style resource locator: File for handle test does not exist. Could not find: %s', $this->test_path . '/templates/' . $filename);
 		$this->setExpectedTriggerError(E_USER_ERROR, $expecting);
 
 		$this->display('test');
@@ -265,7 +285,7 @@ class phpbb_template_template_test extends phpbb_test_case
 
 	public function test_empty_file()
 	{
-		$expecting = 'template->set_filenames: Empty filename specified for test';
+		$expecting = 'style resource locator: set_filenames: Empty filename specified for test';
 
 		$this->setExpectedTriggerError(E_USER_ERROR, $expecting);
 		$this->template->set_filenames(array('test' => ''));
@@ -273,52 +293,12 @@ class phpbb_template_template_test extends phpbb_test_case
 
 	public function test_invalid_handle()
 	{
-		$expecting = 'template->_tpl_load(): No file specified for handle test';
+		$expecting = 'No file specified for handle test';
 		$this->setExpectedTriggerError(E_USER_ERROR, $expecting);
 
 		$this->display('test');
 	}
 
-	private function run_template($file, array $vars, array $block_vars, array $destroy, $expected, $cache_file)
-	{
-		$this->template->set_filenames(array('test' => $file));
-		$this->template->assign_vars($vars);
-
-		foreach ($block_vars as $block => $loops)
-		{
-			foreach ($loops as $_vars)
-			{
-				$this->template->assign_block_vars($block, $_vars);
-			}
-		}
-
-		foreach ($destroy as $block)
-		{
-			$this->template->destroy_block_vars($block);
-		}
-
-		try
-		{
-			$this->assertEquals($expected, $this->display('test'), "Testing $file");
-			$this->assertFileExists($cache_file);
-		}
-		catch (ErrorException $e)
-		{
-			if (file_exists($cache_file))
-			{
-				copy($cache_file, str_replace('ctpl_', 'tests_ctpl_', $cache_file));
-			}
-
-			throw $e;
-		}
-
-		// For debugging
-		if (self::PRESERVE_CACHE)
-		{
-			copy($cache_file, str_replace('ctpl_', 'tests_ctpl_', $cache_file));
-		}
-	}
-
 	/**
 	* @dataProvider template_data
 	*/
@@ -360,46 +340,61 @@ class phpbb_template_template_test extends phpbb_test_case
 			$this->template->destroy_block_vars($block);
 		}
 
-		$error_level = error_reporting();
-		error_reporting($error_level & ~E_NOTICE);
-
 		$this->assertEquals($expected, self::trim_template_result($this->template->assign_display('test')), "Testing assign_display($file)");
 
 		$this->template->assign_display('test', 'VARIABLE', false);
 
-		error_reporting($error_level);
-
 		$this->assertEquals($expected, $this->display('container'), "Testing assign_display($file)");
 	}
 
-	public function test_php()
+	public function test_append_var_without_assign_var()
 	{
-		$GLOBALS['config']['tpl_allow_php'] = true;
+		$this->template->set_filenames(array(
+			'append_var'	=> 'variable.html'
+		));
 
-		$cache_file = $this->template->cachepath . 'php.html.php';
+		$items = array('This ', 'is ', 'a ', 'test');
+		$expecting = implode('', $items);
+		
+		foreach ($items as $word)
+		{
+			$this->template->append_var('VARIABLE', $word);
+		}
 
-		$this->assertFileNotExists($cache_file);
+		$this->assertEquals($expecting, $this->display('append_var'));
+	}
 
-		$this->run_template('php.html', array(), array(), array(), 'test', $cache_file);
+	public function test_append_var_with_assign_var()
+	{
+		$this->template->set_filenames(array(
+			'append_var'	=> 'variable.html'
+		));
+
+		$start = 'This ';
+		$items = array('is ', 'a ', 'test');
+		$expecting = $start . implode('', $items);
+		
+		$this->template->assign_var('VARIABLE', $start);
+		foreach ($items as $word)
+		{
+			$this->template->append_var('VARIABLE', $word);
+		}
 
-		$GLOBALS['config']['tpl_allow_php'] = false;
+		$this->assertEquals($expecting, $this->display('append_var'));
 	}
 
-	public function test_includephp()
+	public function test_php()
 	{
-		$GLOBALS['config']['tpl_allow_php'] = true;
+		$this->setup_engine(array('tpl_allow_php' => true));
 
-		$cache_file = $this->template->cachepath . 'includephp.html.php';
-
-		$this->run_template('includephp.html', array(), array(), array(), 'testing included php', $cache_file);
+		$cache_file = $this->template->cachepath . 'php.html.php';
 
-		$this->template->set_filenames(array('test' => 'includephp.html'));
-		$this->assertEquals('testing included php', $this->display('test'), "Testing INCLUDEPHP");
+		$this->assertFileNotExists($cache_file);
 
-		$GLOBALS['config']['tpl_allow_php'] = false;
+		$this->run_template('php.html', array(), array(), array(), 'test', $cache_file);
 	}
 
-	public static function alter_block_array_data()
+	public function alter_block_array_data()
 	{
 		return array(
 			array(
@@ -507,5 +502,5 @@ EOT
 		$this->template->alter_block_array($alter_block, $vararray, $key, $mode);
 		$this->assertEquals($expect, $this->display('test'), $description);
 	}
-}
 
+}
diff --git a/tests/template/template_test_case.php b/tests/template/template_test_case.php
new file mode 100644
index 0000000000..2e6f703eb1
--- /dev/null
+++ b/tests/template/template_test_case.php
@@ -0,0 +1,144 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 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_template_template_test_case extends phpbb_test_case
+{
+	protected $style;
+	protected $template;
+	protected $template_path;
+	protected $style_resource_locator;
+	protected $style_provider;
+
+	protected $test_path = 'tests/template';
+
+	// Keep the contents of the cache for debugging?
+	const PRESERVE_CACHE = true;
+
+	protected function display($handle)
+	{
+		ob_start();
+
+		try
+		{
+			$this->assertTrue($this->template->display($handle, false));
+		}
+		catch (Exception $exception)
+		{
+			// reset output buffering even when an error occured
+			// PHPUnit turns trigger_error into exceptions as well
+			ob_end_clean();
+			throw $exception;
+		}
+
+		$result = self::trim_template_result(ob_get_clean());
+
+		return $result;
+	}
+
+	protected static function trim_template_result($result)
+	{
+		return str_replace("\n\n", "\n", implode("\n", array_map('trim', explode("\n", trim($result)))));
+	}
+
+	protected function config_defaults()
+	{
+		$defaults = array(
+			'load_tplcompile'	=> true,
+			'tpl_allow_php'		=> false,
+		);
+		return $defaults;
+	}
+
+	protected function setup_engine(array $new_config = array())
+	{
+		global $phpbb_root_path, $phpEx, $user;
+
+		$defaults = $this->config_defaults();
+		$config = new phpbb_config(array_merge($defaults, $new_config));
+
+		$this->template_path = $this->test_path . '/templates';
+		$this->style_resource_locator = new phpbb_style_resource_locator();
+		$this->style_provider = new phpbb_style_path_provider();
+		$this->template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, new phpbb_template_context());
+		$this->style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider, $this->template);
+		$this->style->set_custom_style('tests', $this->template_path, '');
+	}
+
+	protected function setUp()
+	{
+		// Test the engine can be used
+		$this->setup_engine();
+
+		$template_cache_dir = dirname($this->template->cachepath);
+		if (!is_writable($template_cache_dir))
+		{
+			$this->markTestSkipped("Template cache directory ({$template_cache_dir}) is not writable.");
+		}
+
+		foreach (glob($this->template->cachepath . '*') as $file)
+		{
+			unlink($file);
+		}
+
+		$this->setup_engine();
+	}
+
+	protected function tearDown()
+	{
+		if (is_object($this->template))
+		{
+			foreach (glob($this->template->cachepath . '*') as $file)
+			{
+				unlink($file);
+			}
+		}
+	}
+
+	protected function run_template($file, array $vars, array $block_vars, array $destroy, $expected, $cache_file)
+	{
+		$this->template->set_filenames(array('test' => $file));
+		$this->template->assign_vars($vars);
+
+		foreach ($block_vars as $block => $loops)
+		{
+			foreach ($loops as $_vars)
+			{
+				$this->template->assign_block_vars($block, $_vars);
+			}
+		}
+
+		foreach ($destroy as $block)
+		{
+			$this->template->destroy_block_vars($block);
+		}
+
+		try
+		{
+			$this->assertEquals($expected, $this->display('test'), "Testing $file");
+			$this->assertFileExists($cache_file);
+		}
+		catch (ErrorException $e)
+		{
+			if (file_exists($cache_file))
+			{
+				copy($cache_file, str_replace('ctpl_', 'tests_ctpl_', $cache_file));
+			}
+			throw $e;
+		}
+
+		// For debugging.
+		// When testing eval path the cache file may not exist.
+		if (self::PRESERVE_CACHE && file_exists($cache_file))
+		{
+			copy($cache_file, str_replace('ctpl_', 'tests_ctpl_', $cache_file));
+		}
+	}
+}
diff --git a/tests/template/template_test_case_with_tree.php b/tests/template/template_test_case_with_tree.php
new file mode 100644
index 0000000000..6a226f317a
--- /dev/null
+++ b/tests/template/template_test_case_with_tree.php
@@ -0,0 +1,29 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/template_test_case.php';
+
+class phpbb_template_template_test_case_with_tree extends phpbb_template_template_test_case
+{
+	protected function setup_engine(array $new_config = array())
+	{
+		global $phpbb_root_path, $phpEx, $user;
+
+		$defaults = $this->config_defaults();
+		$config = new phpbb_config(array_merge($defaults, $new_config));
+
+		$this->template_path = $this->test_path . '/templates';
+		$this->parent_template_path = $this->test_path . '/parent_templates';
+		$this->style_resource_locator = new phpbb_style_resource_locator();
+		$this->style_provider = new phpbb_style_path_provider();
+		$this->template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, new phpbb_template_context());
+		$this->style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider, $this->template);
+		$this->style->set_custom_style('tests', array($this->template_path, $this->parent_template_path), '');
+	}
+}
diff --git a/tests/template/templates/basic.html b/tests/template/templates/basic.html
index c1dd690260..e5c6f280fb 100644
--- a/tests/template/templates/basic.html
+++ b/tests/template/templates/basic.html
@@ -16,5 +16,8 @@ fail
 <!-- BEGINELSE -->
 pass
 <!-- END empty -->
+<!-- IF not S_EMPTY -->
+pass
+<!-- ENDIF -->
 
 <!-- DUMMY var -->
diff --git a/tests/template/templates/child_only.html b/tests/template/templates/child_only.html
new file mode 100644
index 0000000000..6121fef5c5
--- /dev/null
+++ b/tests/template/templates/child_only.html
@@ -0,0 +1 @@
+Only in child.
diff --git a/tests/template/templates/child_only.js b/tests/template/templates/child_only.js
new file mode 100644
index 0000000000..542b26526c
--- /dev/null
+++ b/tests/template/templates/child_only.js
@@ -0,0 +1 @@
+// JavaScript file only in a child style.
diff --git a/tests/template/templates/define.html b/tests/template/templates/define.html
index 82237d21a3..4459fffbe0 100644
--- a/tests/template/templates/define.html
+++ b/tests/template/templates/define.html
@@ -2,6 +2,9 @@
 {$VALUE}
 <!-- DEFINE $VALUE = 'abc' -->
 {$VALUE}
+<!-- INCLUDE define_include.html -->
+{$INCLUDED_VALUE}
+{$VALUE}
 <!-- UNDEFINE $VALUE -->
 {$VALUE}
 <!-- DEFINE $VALUE -->
diff --git a/tests/template/templates/define_include.html b/tests/template/templates/define_include.html
new file mode 100644
index 0000000000..9c470c296a
--- /dev/null
+++ b/tests/template/templates/define_include.html
@@ -0,0 +1,3 @@
+{$VALUE}
+<!-- DEFINE $INCLUDED_VALUE = 'bar' -->
+{$INCLUDED_VALUE}
diff --git a/tests/template/templates/expressions.html b/tests/template/templates/expressions.html
index c40d967dab..e1283f165f 100644
--- a/tests/template/templates/expressions.html
+++ b/tests/template/templates/expressions.html
@@ -1,86 +1,57 @@
 <!-- IF 10 is even -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF 9 is even -->fail<!-- ELSE -->pass<!-- ENDIF -->
-
 <!-- IF not 390 is even -->fail<!-- ELSE -->pass<!-- ENDIF -->
-
 <!-- IF 9 is odd -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF 32 is odd -->fail<!-- ELSE -->pass<!-- ENDIF -->
-
 <!-- IF 32 is div by 16 -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF 10 is not even -->fail<!-- ELSE -->pass<!-- ENDIF -->
-
 <!-- IF 24 == 24 -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF 24 eq 24 -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF ((((((24 == 24)))))) -->pass<!-- ELSE -->fail<!-- ENDIF -->
 
 
 <!-- IF 24 != 20 -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF 24 <> 20 -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF 24 ne 20 -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF 24 neq 20 -->pass<!-- ELSE -->fail<!-- ENDIF -->
 
 
 <!-- IF 10 lt 20 -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF 10 < 20 -->pass<!-- ELSE -->fail<!-- ENDIF -->
 
 
 <!-- IF 10 le 20 -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF 10 lte 20 -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF 10 <= 20 -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF 20 le 20 -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF 20 lte 20 -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF 20 <= 20 -->pass<!-- ELSE -->fail<!-- ENDIF -->
 
 
 <!-- IF 9 gt 1 -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF 9 > 1 -->pass<!-- ELSE -->fail<!-- ENDIF -->
 
 
 <!-- IF 9 >= 1 -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF 9 gte 1 -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF 9 ge 1 -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF 9 >= 9 -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF 9 gte 9 -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF 9 ge 9 -->pass<!-- ELSE -->fail<!-- ENDIF -->
 
 
 <!-- IF true && (10 > 4) -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF true and (10 > 4) -->pass<!-- ELSE -->fail<!-- ENDIF -->
 
 
 <!-- IF false || true -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF false or true -->pass<!-- ELSE -->fail<!-- ENDIF -->
 
 
 <!-- IF !false -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF not false -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF not not not false -->pass<!-- ELSE -->fail<!-- ENDIF -->
 
 
 <!-- IF 6 % 4 == 2 -->pass<!-- ELSE -->fail<!-- ENDIF -->
-
 <!-- IF 24 mod 12 == 0 -->pass<!-- ELSE -->fail<!-- ENDIF -->
diff --git a/tests/template/templates/if.html b/tests/template/templates/if.html
index c502e52f51..eed431019e 100644
--- a/tests/template/templates/if.html
+++ b/tests/template/templates/if.html
@@ -3,9 +3,9 @@
 <!-- ELSEIF S_OTHER_VALUE -->
 2
 <!-- ELSE -->
-0
+03
 <!-- ENDIF -->
 
-<!-- IF (S_VALUE > S_OTHER_VALUE) -->
-0
+<!-- IF S_VALUE and S_OTHER_VALUE and (S_VALUE > S_OTHER_VALUE) -->
+04
 <!-- ENDIF -->
diff --git a/tests/template/templates/include_define.html b/tests/template/templates/include_define.html
new file mode 100644
index 0000000000..2419c8cba1
--- /dev/null
+++ b/tests/template/templates/include_define.html
@@ -0,0 +1,2 @@
+<!-- DEFINE $DEF = 'variable.html' -->
+<!-- INCLUDE {$DEF} -->
diff --git a/tests/template/templates/include_loop.html b/tests/template/templates/include_loop.html
new file mode 100644
index 0000000000..d5c3d9bc82
--- /dev/null
+++ b/tests/template/templates/include_loop.html
@@ -0,0 +1,4 @@
+<!-- BEGIN loop -->
+<!-- INCLUDE {loop.NESTED_FILE} -->
+<!-- BEGIN inner -->_<!-- INCLUDE {inner.NESTED_FILE} --><!-- END inner -->
+<!-- END loop -->
diff --git a/tests/template/templates/include_loop1.html b/tests/template/templates/include_loop1.html
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/template/templates/include_loop1.html
@@ -0,0 +1 @@
+1
diff --git a/tests/template/templates/include_loop2.html b/tests/template/templates/include_loop2.html
new file mode 100644
index 0000000000..9e22bcb8e3
--- /dev/null
+++ b/tests/template/templates/include_loop2.html
@@ -0,0 +1 @@
+02
diff --git a/tests/template/templates/include_loop3.html b/tests/template/templates/include_loop3.html
new file mode 100644
index 0000000000..00750edc07
--- /dev/null
+++ b/tests/template/templates/include_loop3.html
@@ -0,0 +1 @@
+3
diff --git a/tests/template/templates/include_variable.html b/tests/template/templates/include_variable.html
new file mode 100644
index 0000000000..b907e0b44f
--- /dev/null
+++ b/tests/template/templates/include_variable.html
@@ -0,0 +1 @@
+<!-- INCLUDE {FILE} -->
diff --git a/tests/template/templates/includejs.html b/tests/template/templates/includejs.html
new file mode 100644
index 0000000000..8a2587d76b
--- /dev/null
+++ b/tests/template/templates/includejs.html
@@ -0,0 +1,5 @@
+<!-- INCLUDEJS parent_and_child.js -->
+<!-- INCLUDEJS {PARENT} -->
+<!-- DEFINE $TEST = 'child_only.js' -->
+<!-- INCLUDEJS {$TEST} -->
+{SCRIPTS}
+\ No newline at end of file
diff --git a/tests/template/templates/includephp.html b/tests/template/templates/includephp_relative.html
index 70ebdac0d0..297c9efcb0 100644
--- a/tests/template/templates/includephp.html
+++ b/tests/template/templates/includephp_relative.html
@@ -1 +1,2 @@
+Path is relative to board root.
 <!-- INCLUDEPHP ../tests/template/templates/_dummy_include.php.inc -->
diff --git a/tests/template/templates/invalid/endif_without_if.html b/tests/template/templates/invalid/endif_without_if.html
new file mode 100644
index 0000000000..e371ffd150
--- /dev/null
+++ b/tests/template/templates/invalid/endif_without_if.html
@@ -0,0 +1 @@
+<!-- ENDIF -->
diff --git a/tests/template/templates/invalid/include_nonexistent_file.html b/tests/template/templates/invalid/include_nonexistent_file.html
new file mode 100644
index 0000000000..617d2fdaaa
--- /dev/null
+++ b/tests/template/templates/invalid/include_nonexistent_file.html
@@ -0,0 +1 @@
+<!-- INCLUDE nonexistent.html -->
diff --git a/tests/template/templates/invalid/output/endif_without_if.html b/tests/template/templates/invalid/output/endif_without_if.html
new file mode 100644
index 0000000000..5f2239c964
--- /dev/null
+++ b/tests/template/templates/invalid/output/endif_without_if.html
@@ -0,0 +1 @@
+Parse error (fatal, destroys php runtime).
diff --git a/tests/template/templates/invalid/output/include_nonexistent_file.html b/tests/template/templates/invalid/output/include_nonexistent_file.html
new file mode 100644
index 0000000000..8a118d2713
--- /dev/null
+++ b/tests/template/templates/invalid/output/include_nonexistent_file.html
@@ -0,0 +1 @@
+style resource locator: File for handle nonexistent.html does not exist. Could not find:
diff --git a/tests/template/templates/invalid/output/unknown_tag.html b/tests/template/templates/invalid/output/unknown_tag.html
new file mode 100644
index 0000000000..1489e5e31a
--- /dev/null
+++ b/tests/template/templates/invalid/output/unknown_tag.html
@@ -0,0 +1 @@
+<!-- UNKNOWNTAG variable.html -->
diff --git a/tests/template/templates/invalid/unknown_tag.html b/tests/template/templates/invalid/unknown_tag.html
new file mode 100644
index 0000000000..1489e5e31a
--- /dev/null
+++ b/tests/template/templates/invalid/unknown_tag.html
@@ -0,0 +1 @@
+<!-- UNKNOWNTAG variable.html -->
diff --git a/tests/template/templates/lang.html b/tests/template/templates/lang.html
index 2b5ea1cafe..3eecc298cb 100644
--- a/tests/template/templates/lang.html
+++ b/tests/template/templates/lang.html
@@ -1,3 +1,5 @@
 {L_VARIABLE}
+{L_1_VARIABLE}
 
 {LA_VARIABLE}
+{LA_1_VARIABLE}
diff --git a/tests/template/templates/loop_nested.html b/tests/template/templates/loop_nested.html
index 9b251cd453..45b1ef85d4 100644
--- a/tests/template/templates/loop_nested.html
+++ b/tests/template/templates/loop_nested.html
@@ -1,8 +1,6 @@
 <!-- BEGIN outer -->
 	outer - {outer.S_ROW_COUNT}<!-- IF outer.VARIABLE --> - {outer.VARIABLE}<!-- ENDIF -->
-
 	<!-- BEGIN middle -->
 		middle - {middle.S_ROW_COUNT}<!-- IF middle.VARIABLE --> - {middle.VARIABLE}<!-- ENDIF -->
-
 	<!-- END middle -->
 <!-- END outer -->
diff --git a/tests/template/templates/loop_nested_deep_multilevel_ref.html b/tests/template/templates/loop_nested_deep_multilevel_ref.html
new file mode 100644
index 0000000000..bcc2a7c07b
--- /dev/null
+++ b/tests/template/templates/loop_nested_deep_multilevel_ref.html
@@ -0,0 +1,13 @@
+top-level content
+<!-- BEGIN outer -->
+	outer
+	<!-- BEGIN middle -->
+		{outer.middle.S_BLOCK_NAME}
+		<!-- BEGIN inner -->
+			inner {inner.VARIABLE}
+			<!-- IF outer.middle.inner.S_FIRST_ROW -->
+				first row of {outer.middle.inner.S_NUM_ROWS} in {middle.inner.S_BLOCK_NAME}
+			<!-- ENDIF -->
+		<!-- END inner -->
+	<!-- END middle -->
+<!-- END outer -->
diff --git a/tests/template/templates/loop_nested_multilevel_ref.html b/tests/template/templates/loop_nested_multilevel_ref.html
new file mode 100644
index 0000000000..f2f1c746ed
--- /dev/null
+++ b/tests/template/templates/loop_nested_multilevel_ref.html
@@ -0,0 +1,10 @@
+top-level content
+<!-- BEGIN outer -->
+	outer {outer.VARIABLE}
+	<!-- BEGIN inner -->
+		inner {inner.VARIABLE}
+		<!-- IF outer.inner.S_FIRST_ROW -->
+			first row
+		<!-- ENDIF -->
+	<!-- END inner -->
+<!-- END outer -->
diff --git a/tests/template/templates/loop_reuse.html b/tests/template/templates/loop_reuse.html
new file mode 100644
index 0000000000..bd0354ae6f
--- /dev/null
+++ b/tests/template/templates/loop_reuse.html
@@ -0,0 +1,6 @@
+<!-- BEGIN one -->
+	{one.VAR}
+	<!-- BEGIN one -->
+		{one.one.VAR}
+	<!-- END one -->
+<!-- END one -->
diff --git a/tests/template/templates/loop_size.html b/tests/template/templates/loop_size.html
new file mode 100644
index 0000000000..f1938441df
--- /dev/null
+++ b/tests/template/templates/loop_size.html
@@ -0,0 +1,39 @@
+<!-- IF .nonexistent_loop -->
+	nonexistent
+<!-- ENDIF -->
+
+<!-- IF .nonexistent_loop == 0 -->
+	nonexistent = 0
+<!-- ENDIF -->
+
+<!-- IF ! .nonexistent_loop -->
+	! nonexistent
+<!-- ENDIF -->
+
+<!-- IF .empty_loop -->
+	empty
+<!-- ENDIF -->
+
+<!-- IF .empty_loop == 0 -->
+	empty = 0
+<!-- ENDIF -->
+
+<!-- IF ! .empty_loop -->
+	! empty
+<!-- ENDIF -->
+
+<!-- IF .loop -->
+	loop
+<!-- ENDIF -->
+
+<!-- IF .loop == 0 -->
+	loop = 0
+<!-- ENDIF -->
+
+<!-- IF ! .loop -->
+	! loop
+<!-- ENDIF -->
+
+<!-- BEGIN loop -->
+	in loop
+<!-- END -->
diff --git a/tests/template/templates/loop_underscore.html b/tests/template/templates/loop_underscore.html
new file mode 100644
index 0000000000..dafce5dea6
--- /dev/null
+++ b/tests/template/templates/loop_underscore.html
@@ -0,0 +1,21 @@
+<!-- BEGIN _underscore_loop -->
+loop
+<!-- BEGINELSE -->
+noloop
+<!-- END loop -->
+
+<!-- IF ._underscore_loop -->
+loop
+<!-- ELSE -->
+noloop
+<!-- ENDIF -->
+
+<!-- IF ._underscore_loop == 2 -->
+loop
+<!-- ENDIF -->
+
+<!-- BEGIN _underscore_loop -->
+<!-- BEGIN !block -->
+loop#{loop.S_ROW_COUNT}-block#{block.S_ROW_COUNT}
+<!-- END !block -->
+<!-- END _underscore_loop -->
diff --git a/tests/template/templates/loop_vars.html b/tests/template/templates/loop_vars.html
index 4f02fd2e6c..d94a0ae0f7 100644
--- a/tests/template/templates/loop_vars.html
+++ b/tests/template/templates/loop_vars.html
@@ -1,21 +1,14 @@
 <!-- BEGIN loop -->
 <!-- IF loop.S_FIRST_ROW -->first<!-- ENDIF -->
-
-{loop.S_ROW_COUNT}
-
-{loop.VARIABLE}
-
+{loop.S_ROW_NUM} - a
+{loop.VARIABLE} - b
 <!-- IF loop.VARIABLE -->set<!-- ENDIF -->
-
 <!-- IF loop.S_LAST_ROW -->
 last
 <!-- ENDIF -->
 <!-- BEGIN inner -->
-
-{inner.S_ROW_COUNT}
-
+{inner.S_ROW_NUM} - c
 <!-- IF inner.S_LAST_ROW and inner.S_ROW_COUNT and inner.S_NUM_ROWS -->last inner<!-- ENDIF -->
-
 <!-- END inner -->
 <!-- END loop -->
 <!-- IF .loop.inner -->inner loop<!-- ENDIF -->
diff --git a/tests/template/templates/parent_and_child.html b/tests/template/templates/parent_and_child.html
new file mode 100644
index 0000000000..16223d91e7
--- /dev/null
+++ b/tests/template/templates/parent_and_child.html
@@ -0,0 +1 @@
+Child template.
diff --git a/tests/template/templates/parent_and_child.js b/tests/template/templates/parent_and_child.js
new file mode 100644
index 0000000000..d544d94d83
--- /dev/null
+++ b/tests/template/templates/parent_and_child.js
@@ -0,0 +1 @@
+// JavaScript file in a child style.
diff --git a/tests/template/templates/trivial.html b/tests/template/templates/trivial.html
new file mode 100644
index 0000000000..3a1c1c5324
--- /dev/null
+++ b/tests/template/templates/trivial.html
@@ -0,0 +1 @@
+This is a trivial template.
diff --git a/tests/test_framework/phpbb_database_connection_odbc_pdo_wrapper.php b/tests/test_framework/phpbb_database_connection_odbc_pdo_wrapper.php
new file mode 100644
index 0000000000..ec59fa3886
--- /dev/null
+++ b/tests/test_framework/phpbb_database_connection_odbc_pdo_wrapper.php
@@ -0,0 +1,37 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+if (!class_exists('PDO'))
+{
+	return;
+}
+
+/**
+* Used for passing in information about the PDO driver
+* since the PDO class reveals nothing about the DSN that
+* the user provided.
+*
+* This is used in the custom PHPUnit ODBC driver
+*/
+class phpbb_database_connection_odbc_pdo_wrapper extends PDO
+{
+	// Name of the driver being used (i.e. mssql, firebird)
+	public $driver = '';
+
+	// Version number of driver since PDO::getAttribute(PDO::ATTR_CLIENT_VERSION) is pretty useless for this
+	public $version = 0;
+
+	function __construct($dbms, $version, $dsn, $user, $pass)
+	{
+		$this->driver = $dbms;
+		$this->version = (double) $version;
+
+		parent::__construct($dsn, $user, $pass);
+	}
+}
diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php
index e1b368dcea..bb86df0ef0 100644
--- a/tests/test_framework/phpbb_database_test_case.php
+++ b/tests/test_framework/phpbb_database_test_case.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
@@ -28,6 +28,28 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 		);
 	}
 
+	public function createXMLDataSet($path)
+	{
+		$db_config = $this->get_database_config();
+
+		// Firebird requires table and column names to be uppercase
+		if ($db_config['dbms'] == 'firebird')
+		{
+			$xml_data = file_get_contents($path);
+			$xml_data = preg_replace_callback('/(?:(<table name="))([a-z_]+)(?:(">))/', 'phpbb_database_test_case::to_upper', $xml_data);
+			$xml_data = preg_replace_callback('/(?:(<column>))([a-z_]+)(?:(<\/column>))/', 'phpbb_database_test_case::to_upper', $xml_data);
+
+			$new_fixture = tmpfile();
+			fwrite($new_fixture, $xml_data);
+			fseek($new_fixture, 0);
+
+			$meta_data = stream_get_meta_data($new_fixture);
+			$path = $meta_data['uri'];
+		}
+
+		return parent::createXMLDataSet($path);
+	}
+
 	public function get_test_case_helpers()
 	{
 		if (!$this->test_case_helpers)
@@ -40,46 +62,14 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 
 	public function get_database_config()
 	{
-		if (isset($_SERVER['PHPBB_TEST_DBMS']))
-		{
-			return array(
-				'dbms'		=> isset($_SERVER['PHPBB_TEST_DBMS']) ? $_SERVER['PHPBB_TEST_DBMS'] : '',
-				'dbhost'	=> isset($_SERVER['PHPBB_TEST_DBHOST']) ? $_SERVER['PHPBB_TEST_DBHOST'] : '',
-				'dbport'	=> isset($_SERVER['PHPBB_TEST_DBPORT']) ? $_SERVER['PHPBB_TEST_DBPORT'] : '',
-				'dbname'	=> isset($_SERVER['PHPBB_TEST_DBNAME']) ? $_SERVER['PHPBB_TEST_DBNAME'] : '',
-				'dbuser'	=> isset($_SERVER['PHPBB_TEST_DBUSER']) ? $_SERVER['PHPBB_TEST_DBUSER'] : '',
-				'dbpasswd'	=> isset($_SERVER['PHPBB_TEST_DBPASSWD']) ? $_SERVER['PHPBB_TEST_DBPASSWD'] : '',
-			);
-		}
-		else if (file_exists(dirname(__FILE__) . '/../test_config.php'))
-		{
-			include(dirname(__FILE__) . '/../test_config.php');
-
-			return array(
-				'dbms'		=> $dbms,
-				'dbhost'	=> $dbhost,
-				'dbport'	=> $dbport,
-				'dbname'	=> $dbname,
-				'dbuser'	=> $dbuser,
-				'dbpasswd'	=> $dbpasswd,
-			);
-		}
-		else if (extension_loaded('sqlite') && version_compare(PHPUnit_Runner_Version::id(), '3.4.15', '>='))
-		{
-			// Silently use sqlite
-			return array(
-				'dbms'		=> 'sqlite',
-				'dbhost'	=> dirname(__FILE__) . '/../phpbb_unit_tests.sqlite2', // filename
-				'dbport'	=> '',
-				'dbname'	=> '',
-				'dbuser'	=> '',
-				'dbpasswd'	=> '',
-			);
-		}
-		else
+		$config = phpbb_test_case_helpers::get_test_config();
+
+		if (!isset($config['dbms']))
 		{
 			$this->markTestSkipped('Missing test_config.php: See first error.');
 		}
+
+		return $config;
 	}
 
 	public function getConnection()
@@ -138,4 +128,17 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 	{
 		return new phpbb_database_test_connection_manager($config);
 	}
+
+	/**
+	* Converts a match in the middle of a string to uppercase.
+	* This is necessary for transforming the fixture information for Firebird tests
+	*
+	* @param $matches The array of matches from a regular expression
+	*
+	* @return string The string with the specified match converted to uppercase
+	*/
+	public static function to_upper($matches)
+	{
+		return $matches[1] . strtoupper($matches[2]) . $matches[3];
+	}
 }
diff --git a/tests/test_framework/phpbb_database_test_connection_manager.php b/tests/test_framework/phpbb_database_test_connection_manager.php
index a7559e2183..25e0972f42 100644
--- a/tests/test_framework/phpbb_database_test_connection_manager.php
+++ b/tests/test_framework/phpbb_database_test_connection_manager.php
@@ -3,10 +3,13 @@
 *
 * @package testing
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_install.php';
+require_once dirname(__FILE__) . '/phpbb_database_connection_odbc_pdo_wrapper.php';
+
 class phpbb_database_test_connection_manager
 {
 	private $config;
@@ -60,6 +63,13 @@ class phpbb_database_test_connection_manager
 				// e.g. Driver={SQL Server Native Client 10.0};Server=(local)\SQLExpress;
 				$dsn .= $this->config['dbhost'];
 
+				// Primarily for MSSQL Native/Azure as ODBC needs it in $dbhost, attached to the Server param
+				if ($this->config['dbport'])
+				{
+					$port_delimiter = (defined('PHP_OS') && substr(PHP_OS, 0, 3) === 'WIN') ? ',' : ':';
+					$dsn .= $port_delimiter . $this->config['dbport'];
+				}
+
 				if ($use_db)
 				{
 					$dsn .= ';Database=' . $this->config['dbname'];
@@ -69,16 +79,61 @@ class phpbb_database_test_connection_manager
 			default:
 				$dsn .= 'host=' . $this->config['dbhost'];
 
+				if ($this->config['dbport'])
+				{
+					$dsn .= ';port=' . $this->config['dbport'];
+				}
+
 				if ($use_db)
 				{
 					$dsn .= ';dbname=' . $this->config['dbname'];
 				}
+				else if ($this->dbms['PDO'] == 'pgsql')
+				{
+					// Postgres always connects to a
+					// database. If the database is not
+					// specified here, but the username
+					// is specified, then connection
+					// will be to the database named
+					// as the username.
+					//
+					// For greater compatibility, connect
+					// instead to postgres database which
+					// should always exist:
+					// http://www.postgresql.org/docs/9.0/static/manage-ag-templatedbs.html
+					$dsn .= ';dbname=postgres';
+				}
 			break;
 		}
 
+		// These require different connection strings on the phpBB side than they do in PDO
+		// so you must provide a DSN string for ODBC separately
+		if (!empty($this->config['custom_dsn']) && ($this->config['dbms'] == 'mssql' || $this->config['dbms'] == 'firebird'))
+		{
+			$dsn = 'odbc:' . $this->config['custom_dsn'];
+		}
+
 		try
 		{
-			$this->pdo = new PDO($dsn, $this->config['dbuser'], $this->config['dbpasswd']);
+			switch ($this->config['dbms'])
+			{
+				case 'mssql':
+				case 'mssql_odbc':
+					$this->pdo = new phpbb_database_connection_odbc_pdo_wrapper('mssql', 0, $dsn, $this->config['dbuser'], $this->config['dbpasswd']);
+				break;
+
+				case 'firebird':
+					if (!empty($this->config['custom_dsn']))
+					{
+						$this->pdo = new phpbb_database_connection_odbc_pdo_wrapper('firebird', 0, $dsn, $this->config['dbuser'], $this->config['dbpasswd']);
+						break;
+					}
+					// Fall through if they're using the firebird PDO driver and not the generic ODBC driver
+
+				default:
+					$this->pdo = new PDO($dsn, $this->config['dbuser'], $this->config['dbpasswd']);
+				break;
+			}
 		}
 		catch (PDOException $e)
 		{
@@ -86,8 +141,7 @@ class phpbb_database_test_connection_manager
 			throw new Exception("Unable do connect to $cleaned_dsn using PDO with error: {$e->getMessage()}");
 		}
 
-		// good for debug
-		// $this->pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+		$this->pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 	}
 
 	/**
@@ -118,12 +172,41 @@ class phpbb_database_test_connection_manager
 				}
 			break;
 
+			case 'firebird':
+				$this->connect();
+				// Drop all of the tables
+				foreach ($this->get_tables() as $table)
+				{
+					$this->pdo->exec('DROP TABLE ' . $table);
+				}
+				$this->purge_extras();
+			break;
+
+			case 'oracle':
+				$this->connect();
+				// Drop all of the tables
+				foreach ($this->get_tables() as $table)
+				{
+					$this->pdo->exec('DROP TABLE ' . $table . ' CASCADE CONSTRAINTS');
+				}
+				$this->purge_extras();
+			break;
+
 			default:
 				$this->connect(false);
 
 				try
 				{
 					$this->pdo->exec('DROP DATABASE ' . $this->config['dbname']);
+
+					try
+					{
+						$this->pdo->exec('CREATE DATABASE ' . $this->config['dbname']);
+					}
+					catch (PDOException $e)
+					{
+						throw new Exception("Unable to re-create database: {$e->getMessage()}");
+					}
 				}
 				catch (PDOException $e)
 				{
@@ -132,9 +215,8 @@ class phpbb_database_test_connection_manager
 					{
 						$this->pdo->exec('DROP TABLE ' . $table);
 					}
+					$this->purge_extras();
 				}
-
-				$this->pdo->exec('CREATE DATABASE ' . $this->config['dbname']);
 			 break;
 		}
 	}
@@ -234,7 +316,11 @@ class phpbb_database_test_connection_manager
 		}
 
 		$filename = $directory . $schema . '_schema.sql';
-		$sql = $this->split_sql(file_get_contents($filename));
+
+		$queries = file_get_contents($filename);
+		$sql = phpbb_remove_comments($queries);
+		
+		$sql = split_sql_file($sql, $this->dbms['DELIM']);
 
 		foreach ($sql as $query)
 		{
@@ -243,43 +329,6 @@ class phpbb_database_test_connection_manager
 	}
 
 	/**
-	* Split contents of an SQL file into an array of SQL statements
-	*
-	* Note: This method is not the same as split_sql_file from functions_install.
-	*
-	* @param	string	$sql	Raw contents of an SQL file
-	*
-	* @return Array of runnable SQL statements
-	*/
-	protected function split_sql($sql)
-	{
-		$sql = str_replace("\r" , '', $sql);
-		$data = preg_split('/' . preg_quote($this->dbms['DELIM'], '/') . '$/m', $sql);
-
-		$data = array_map('trim', $data);
-
-		// The empty case
-		$end_data = end($data);
-
-		if (empty($end_data))
-		{
-			unset($data[key($data)]);
-		}
-
-		if ($this->config['dbms'] == 'sqlite')
-		{
-			// remove comment lines starting with # - they are not proper sqlite
-			// syntax and break sqlite2
-			foreach ($data as $i => $query)
-			{
-				$data[$i] = preg_replace('/^#.*$/m', "\n", $query);
-			}
-		}
-
-		return $data;
-	}
-
-	/**
 	* Map a phpBB dbms driver name to dbms data array
 	*/
 	protected function get_dbms_data($dbms)
@@ -343,4 +392,44 @@ class phpbb_database_test_connection_manager
 			throw new Exception($message);
 		}
 	}
+
+	/**
+	* Removes extra objects from a database. This is for cases where dropping the database fails.
+	*/
+	public function purge_extras()
+	{
+		$this->ensure_connected(__METHOD__);
+		$queries = array();
+
+		switch ($this->config['dbms'])
+		{
+			case 'firebird':
+				$sql = 'SELECT RDB$GENERATOR_NAME
+					FROM RDB$GENERATORS
+					WHERE RDB$SYSTEM_FLAG = 0';
+				$result = $this->pdo->query($sql);
+
+				while ($row = $result->fetch(PDO::FETCH_NUM))
+				{
+					$queries[] = 'DROP GENERATOR ' . current($row);
+				}
+			break;
+
+			case 'oracle':
+				$sql = 'SELECT sequence_name
+					FROM USER_SEQUENCES';
+				$result = $this->pdo->query($sql);
+
+				while ($row = $result->fetch(PDO::FETCH_NUM))
+				{
+					$queries[] = 'DROP SEQUENCE ' . current($row);
+				}
+			break;
+		}
+
+		foreach ($queries as $query)
+		{
+			$this->pdo->exec($query);
+		}
+	}
 }
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
new file mode 100644
index 0000000000..d002615e8c
--- /dev/null
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -0,0 +1,345 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+use Symfony\Component\BrowserKit\CookieJar;
+
+require_once __DIR__ . '/../../phpBB/includes/functions_install.php';
+
+class phpbb_functional_test_case extends phpbb_test_case
+{
+	protected $client;
+	protected $root_url;
+
+	protected $cache = null;
+	protected $db = null;
+	protected $extension_manager = null;
+
+	/**
+	* Session ID for current test's session (each test makes its own)
+	* @var string
+	*/
+	protected $sid;
+
+	/**
+	* Language array used by phpBB
+	* @var array
+	*/
+	protected $lang = array();
+
+	static protected $config = array();
+	static protected $already_installed = false;
+
+	public function setUp()
+	{
+		if (!isset(self::$config['phpbb_functional_url']))
+		{
+			$this->markTestSkipped('phpbb_functional_url was not set in test_config and wasn\'t set as PHPBB_FUNCTIONAL_URL environment variable either.');
+		}
+
+		$this->cookieJar = new CookieJar;
+		$this->client = new Goutte\Client(array(), null, $this->cookieJar);
+		// Reset the curl handle because it is 0 at this point and not a valid
+		// resource
+		$this->client->getClient()->getCurlMulti()->reset(true);
+		$this->root_url = self::$config['phpbb_functional_url'];
+		// Clear the language array so that things
+		// that were added in other tests are gone
+		$this->lang = array();
+		$this->add_lang('common');
+	}
+
+	public function request($method, $path)
+	{
+		return $this->client->request($method, $this->root_url . $path);
+	}
+
+	// bootstrap, called after board is set up
+	// once per test case class
+	// test cases can override this
+	protected function bootstrap()
+	{
+	}
+
+	public function __construct($name = NULL, array $data = array(), $dataName = '')
+	{
+		parent::__construct($name, $data, $dataName);
+
+		$this->backupStaticAttributesBlacklist += array(
+			'phpbb_functional_test_case' => array('config', 'already_installed'),
+		);
+
+		if (!static::$already_installed)
+		{
+			$this->install_board();
+			$this->bootstrap();
+			static::$already_installed = true;
+		}
+	}
+
+	protected function get_db()
+	{
+		global $phpbb_root_path, $phpEx;
+		// so we don't reopen an open connection
+		if (!($this->db instanceof dbal))
+		{
+			if (!class_exists('dbal_' . self::$config['dbms']))
+			{
+				include($phpbb_root_path . 'includes/db/' . self::$config['dbms'] . ".$phpEx");
+			}
+			$sql_db = 'dbal_' . self::$config['dbms'];
+			$this->db = new $sql_db();
+			$this->db->sql_connect(self::$config['dbhost'], self::$config['dbuser'], self::$config['dbpasswd'], self::$config['dbname'], self::$config['dbport']);
+		}
+		return $this->db;
+	}
+
+	protected function get_cache_driver()
+	{
+		if (!$this->cache)
+		{
+			$this->cache = new phpbb_cache_driver_file;
+		}
+
+		return $this->cache;
+	}
+
+	protected function purge_cache()
+	{
+		$cache = $this->get_cache_driver();
+
+		$cache->purge();
+		$cache->unload();
+		$cache->load();
+	}
+
+	protected function get_extension_manager()
+	{
+		global $phpbb_root_path, $phpEx;
+
+		if (!$this->extension_manager)
+		{
+			$this->extension_manager = new phpbb_extension_manager(
+				$this->get_db(),
+				new phpbb_config(),
+				self::$config['table_prefix'] . 'ext',
+				$phpbb_root_path,
+				".$phpEx",
+				$this->get_cache_driver()
+			);
+		}
+
+		return $this->extension_manager;
+	}
+
+	protected function install_board()
+	{
+		global $phpbb_root_path, $phpEx;
+
+		self::$config = phpbb_test_case_helpers::get_test_config();
+
+		if (!isset(self::$config['phpbb_functional_url']))
+		{
+			return;
+		}
+
+		self::$config['table_prefix'] = 'phpbb_';
+		$this->recreate_database(self::$config);
+
+		if (file_exists($phpbb_root_path . "config.$phpEx"))
+		{
+			if (!file_exists($phpbb_root_path . "config_dev.$phpEx"))
+			{
+				rename($phpbb_root_path . "config.$phpEx", $phpbb_root_path . "config_dev.$phpEx");
+			}
+			else
+			{
+				unlink($phpbb_root_path . "config.$phpEx");
+			}
+		}
+
+		// begin data
+		$data = array();
+
+		$data = array_merge($data, self::$config);
+
+		$data = array_merge($data, array(
+			'default_lang'	=> 'en',
+			'admin_name'	=> 'admin',
+			'admin_pass1'	=> 'admin',
+			'admin_pass2'	=> 'admin',
+			'board_email'	=> 'nobody@example.com',
+		));
+
+		$parseURL = parse_url(self::$config['phpbb_functional_url']);
+
+		$data = array_merge($data, array(
+			'email_enable'		=> false,
+			'smtp_delivery'		=> false,
+			'smtp_host'		=> '',
+			'smtp_auth'		=> '',
+			'smtp_user'		=> '',
+			'smtp_pass'		=> '',
+			'cookie_secure'		=> false,
+			'force_server_vars'	=> false,
+			'server_protocol'	=> $parseURL['scheme'] . '://',
+			'server_name'		=> 'localhost',
+			'server_port'		=> isset($parseURL['port']) ? (int) $parseURL['port'] : 80,
+			'script_path'		=> $parseURL['path'],
+		));
+		// end data
+
+		$content = $this->do_request('install');
+		$this->assertContains('Welcome to Installation', $content);
+
+		$this->do_request('create_table', $data);
+
+		$this->do_request('config_file', $data);
+		file_put_contents($phpbb_root_path . "config.$phpEx", phpbb_create_config_file_data($data, self::$config['dbms'], array(), true, true));
+
+		$this->do_request('final', $data);
+		copy($phpbb_root_path . "config.$phpEx", $phpbb_root_path . "config_test.$phpEx");
+	}
+
+	private function do_request($sub, $post_data = null)
+	{
+		$context = null;
+
+		if ($post_data)
+		{
+			$context = stream_context_create(array(
+				'http' => array(
+					'method'	=> 'POST',
+					'header'	=> 'Content-Type: application/x-www-form-urlencoded',
+					'content'	=> http_build_query($post_data),
+					'ignore_errors' => true,
+				),
+			));
+		}
+
+		return file_get_contents(self::$config['phpbb_functional_url'] . 'install/index.php?mode=install&sub=' . $sub, false, $context);
+	}
+
+	private function recreate_database($config)
+	{
+		$db_conn_mgr = new phpbb_database_test_connection_manager($config);
+		$db_conn_mgr->recreate_db();
+	}
+
+	protected function login()
+	{
+		$this->add_lang('ucp');
+
+		$crawler = $this->request('GET', 'ucp.php');
+		$this->assertContains($this->lang('LOGIN_EXPLAIN_UCP'), $crawler->filter('html')->text());
+
+		$form = $crawler->selectButton($this->lang('LOGIN'))->form();
+		$login = $this->client->submit($form, array('username' => 'admin', 'password' => 'admin'));
+
+		$cookies = $this->cookieJar->all();
+
+		// The session id is stored in a cookie that ends with _sid - we assume there is only one such cookie
+		foreach ($cookies as $cookie);
+		{
+			if (substr($cookie->getName(), -4) == '_sid')
+			{
+				$this->sid = $cookie->getValue();
+			}
+		}
+	}
+
+	/**
+	* Login to the ACP
+	* You must run login() before calling this.
+	*/
+	protected function admin_login()
+	{
+		$this->add_lang('acp/common');
+
+		// Requires login first!
+		if (empty($this->sid))
+		{
+			$this->fail('$this->sid is empty. Make sure you call login() before admin_login()');
+			return;
+		}
+
+		$crawler = $this->request('GET', 'adm/index.php?sid=' . $this->sid);
+		$this->assertContains($this->lang('LOGIN_ADMIN_CONFIRM'), $crawler->filter('html')->text());
+
+		$form = $crawler->selectButton($this->lang('LOGIN'))->form();
+
+		foreach ($form->getValues() as $field => $value)
+		{
+			if (strpos($field, 'password_') === 0)
+			{
+				$login = $this->client->submit($form, array('username' => 'admin', $field => 'admin'));
+
+				$cookies = $this->cookieJar->all();
+
+				// The session id is stored in a cookie that ends with _sid - we assume there is only one such cookie
+				foreach ($cookies as $cookie);
+				{
+					if (substr($cookie->getName(), -4) == '_sid')
+					{
+						$this->sid = $cookie->getValue();
+					}
+				}
+
+				break;
+			}
+		}
+	}
+
+	protected function add_lang($lang_file)
+	{
+		if (is_array($lang_file))
+		{
+			foreach ($lang_file as $file)
+			{
+				$this->add_lang($file);
+			}
+		}
+
+		$lang_path = __DIR__ . "/../../phpBB/language/en/$lang_file.php";
+
+		$lang = array();
+
+		if (file_exists($lang_path))
+		{
+			include($lang_path);
+		}
+
+		$this->lang = array_merge($this->lang, $lang);
+	}
+
+	protected function lang()
+	{
+		$args = func_get_args();
+		$key = $args[0];
+
+		if (empty($this->lang[$key]))
+		{
+			throw new RuntimeException('Language key "' . $key . '" could not be found.');
+		}
+
+		$args[0] = $this->lang[$key];
+
+		return call_user_func_array('sprintf', $args);
+	}
+
+    /**
+     * assertContains for language strings
+     *
+     * @param string $needle Search string
+     * @param string $haystack Search this
+     * @param string $message Optional failure message
+     */
+    public function assertContainsLang($needle, $haystack, $message = null)
+    {
+        $this->assertContains(html_entity_decode($this->lang($needle), ENT_QUOTES), $haystack, $message);
+    }
+}
diff --git a/tests/test_framework/phpbb_test_case.php b/tests/test_framework/phpbb_test_case.php
index f189da3671..8b16f02638 100644
--- a/tests/test_framework/phpbb_test_case.php
+++ b/tests/test_framework/phpbb_test_case.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index 697dc93501..d10645a732 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
@@ -46,4 +46,181 @@ class phpbb_test_case_helpers
 	{
 		mkdir($path, 0777, true);
 	}
+
+	static public function get_test_config()
+	{
+		$config = array();
+
+		if (extension_loaded('sqlite') && version_compare(PHPUnit_Runner_Version::id(), '3.4.15', '>='))
+		{
+			$config = array_merge($config, array(
+				'dbms'		=> 'sqlite',
+				'dbhost'	=> dirname(__FILE__) . '/../phpbb_unit_tests.sqlite2', // filename
+				'dbport'	=> '',
+				'dbname'	=> '',
+				'dbuser'	=> '',
+				'dbpasswd'	=> '',
+			));
+		}
+
+		if (isset($_SERVER['PHPBB_TEST_CONFIG']))
+		{
+			// Could be an absolute path
+			$test_config = $_SERVER['PHPBB_TEST_CONFIG'];
+		}
+		else
+		{
+			$test_config = dirname(__FILE__) . '/../test_config.php';
+		}
+
+		if (file_exists($test_config))
+		{
+			include($test_config);
+
+			$config = array_merge($config, array(
+				'dbms'		=> $dbms,
+				'dbhost'	=> $dbhost,
+				'dbport'	=> $dbport,
+				'dbname'	=> $dbname,
+				'dbuser'	=> $dbuser,
+				'dbpasswd'	=> $dbpasswd,
+				'custom_dsn'	=> isset($custom_dsn) ? $custom_dsn : '',
+			));
+
+			if (isset($phpbb_functional_url))
+			{
+				$config['phpbb_functional_url'] = $phpbb_functional_url;
+			}
+		}
+
+		if (isset($_SERVER['PHPBB_TEST_DBMS']))
+		{
+			$config = array_merge($config, array(
+				'dbms'		=> isset($_SERVER['PHPBB_TEST_DBMS']) ? $_SERVER['PHPBB_TEST_DBMS'] : '',
+				'dbhost'	=> isset($_SERVER['PHPBB_TEST_DBHOST']) ? $_SERVER['PHPBB_TEST_DBHOST'] : '',
+				'dbport'	=> isset($_SERVER['PHPBB_TEST_DBPORT']) ? $_SERVER['PHPBB_TEST_DBPORT'] : '',
+				'dbname'	=> isset($_SERVER['PHPBB_TEST_DBNAME']) ? $_SERVER['PHPBB_TEST_DBNAME'] : '',
+				'dbuser'	=> isset($_SERVER['PHPBB_TEST_DBUSER']) ? $_SERVER['PHPBB_TEST_DBUSER'] : '',
+				'dbpasswd'	=> isset($_SERVER['PHPBB_TEST_DBPASSWD']) ? $_SERVER['PHPBB_TEST_DBPASSWD'] : '',
+				'custom_dsn'	=> isset($_SERVER['PHPBB_TEST_CUSTOM_DSN']) ? $_SERVER['PHPBB_TEST_CUSTOM_DSN'] : '',
+			));
+		}
+
+		if (isset($_SERVER['PHPBB_FUNCTIONAL_URL']))
+		{
+			$config = array_merge($config, array(
+				'phpbb_functional_url'	=> isset($_SERVER['PHPBB_FUNCTIONAL_URL']) ? $_SERVER['PHPBB_FUNCTIONAL_URL'] : '',
+			));
+		}
+
+		return $config;
+	}
+
+	/**
+	* Recursive directory copying function
+	*
+	* @param string $source
+	* @param string $dest
+	* @return array list of files copied
+	*/
+	public function copy_dir($source, $dest)
+	{
+		$source = (substr($source, -1) == '/') ? $source : $source . '/';
+		$dest = (substr($dest, -1) == '/') ? $dest : $dest . '/';
+
+		$copied_files = array();
+
+		if (!is_dir($dest))
+		{
+			$this->makedirs($dest);
+		}
+
+		$files = scandir($source);
+		foreach ($files as $file)
+		{
+			if ($file == '.' || $file == '..')
+			{
+				continue;
+			}
+
+			if (is_dir($source . $file))
+			{
+				$created_dir = false;
+				if (!is_dir($dest . $file))
+				{
+					$created_dir = true;
+					$this->makedirs($dest . $file);
+				}
+
+				$copied_files = array_merge($copied_files, self::copy_dir($source . $file, $dest . $file));
+
+				if ($created_dir)
+				{
+					$copied_files[] = $dest . $file;
+				}
+			}
+			else
+			{
+				if (!file_exists($dest . $file))
+				{
+					copy($source . $file, $dest . $file);
+
+					$copied_files[] = $dest . $file;
+				}
+			}
+		}
+
+		return $copied_files;
+	}
+
+	/**
+	* Remove files/directories that are listed in an array
+	* Designed for use with $this->copy_dir()
+	*
+	* @param array $file_list
+	*/
+	public function remove_files($file_list)
+	{
+		foreach ($file_list as $file)
+		{
+			if (is_dir($file))
+			{
+				rmdir($file);
+			}
+			else
+			{
+				unlink($file);
+			}
+		}
+	}
+
+	/**
+	* Empty directory (remove any subdirectories/files below)
+	*
+	* @param array $file_list
+	*/
+	public function empty_dir($path)
+	{
+		$path = (substr($path, -1) == '/') ? $path : $path . '/';
+
+		$files = scandir($path);
+		foreach ($files as $file)
+		{
+			if ($file == '.' || $file == '..')
+			{
+				continue;
+			}
+
+			if (is_dir($path . $file))
+			{
+				$this->empty_dir($path . $file);
+
+				rmdir($path . $file);
+			}
+			else
+			{
+				unlink($path . $file);
+			}
+		}
+	}
 }
diff --git a/tests/text_processing/censor_text_test.php b/tests/text_processing/censor_text_test.php
new file mode 100644
index 0000000000..043d8eb27d
--- /dev/null
+++ b/tests/text_processing/censor_text_test.php
@@ -0,0 +1,83 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php';
+
+class phpbb_text_processing_censor_text_test extends phpbb_test_case
+{
+	public function censor_text_data()
+	{
+		global $cache, $user;
+		$cache = new phpbb_mock_cache;
+		$user = new phpbb_mock_user;
+
+		$user->optionset('viewcensors', false);
+
+		return array(
+			array('', ''),
+
+			array('badword1', 'replacement1'),
+			array(' badword1', ' replacement1'),
+			array('badword1 ', 'replacement1 '),
+			array(' badword1 ', ' replacement1 '),
+			array('abadword1', 'replacement1'),
+			array('badword1w', 'replacement1'),
+			array('abadword1w', 'replacement1'),
+			array('anotherbadword1test', 'replacement1'),
+			array('this badword1', 'this replacement1'),
+			array('this badword1 word', 'this replacement1 word'),
+
+			array('badword2', 'replacement2'),
+			array('bbadword2', 'replacement2'),
+			array('bbbadword2', 'replacement2'),
+			array('badword2d', 'badword2d'),
+			array('bbadword2d', 'bbadword2d'),
+			array('test badword2', 'test replacement2'),
+			array('test badword2 word', 'test replacement2 word'),
+
+			array('badword3', 'replacement3'),
+			array('bbadword3', 'bbadword3'),
+			array('badword3d', 'replacement3'),
+			array('badword3ddd', 'replacement3'),
+			array('bbadword3d', 'bbadword3d'),
+			array(' badword3 ', ' replacement3 '),
+			array(' badword3', ' replacement3'),
+
+			array('badword4', 'replacement4'),
+			array('this badword4 word', 'this replacement4 word'),
+			array('abadword4', 'abadword4'),
+			array('badword4d', 'badword4d'),
+			array('abadword4d', 'abadword4d'),
+
+			array('badword1 badword2 badword3 badword4', 'replacement1 replacement2 replacement3 replacement4'),
+			array('badword1 badword2 badword3 badword4d', 'replacement1 replacement2 replacement3 badword4d'),
+			array('abadword1 badword2 badword3 badword4', 'replacement1 replacement2 replacement3 replacement4'),
+
+			array("new\nline\ntest", "new\nline\ntest"),
+			array("tab\ttest\t", "tab\ttest\t"),
+			array('öäü', 'öäü'),
+			array('badw' . chr(1) . 'ord1', 'badw' . chr(1) . 'ord1'),
+			array('badw' . chr(2) . 'ord1', 'badw' . chr(2) . 'ord1'),
+			array('badw' . chr(3) . 'ord1', 'badw' . chr(3) . 'ord1'),
+			array('badw' . chr(4) . 'ord1', 'badw' . chr(4) . 'ord1'),
+			array('badw' . chr(5) . 'ord1', 'badw' . chr(5) . 'ord1'),
+			array('badw' . chr(6) . 'ord1', 'badw' . chr(6) . 'ord1'),
+		);
+	}
+
+	/**
+	* @dataProvider censor_text_data
+	*/
+	public function test_censor_text($input, $expected)
+	{
+		$label = 'Testing word censor: ' . $input;
+		$this->assertEquals($expected, censor_text($input), $label);
+	}
+}
diff --git a/tests/text_processing/make_clickable_test.php b/tests/text_processing/make_clickable_test.php
index 29b982d709..d94fac2ae4 100644
--- a/tests/text_processing/make_clickable_test.php
+++ b/tests/text_processing/make_clickable_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
@@ -12,7 +12,7 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php';
 
 class phpbb_text_processing_make_clickable_test extends phpbb_test_case
 {
-	public static function make_clickable_data()
+	public function make_clickable_data()
 	{
 		// value => whether it should work
 		$prefix_texts = array(
diff --git a/tests/tmp/.gitkeep b/tests/tmp/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/tmp/.gitkeep
diff --git a/tests/upload/filespec_test.php b/tests/upload/filespec_test.php
new file mode 100644
index 0000000000..c7ff2e78e0
--- /dev/null
+++ b/tests/upload/filespec_test.php
@@ -0,0 +1,275 @@
+<?php
+/**
+ *
+ * @package testing
+ * @copyright (c) 2012 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+require_once __DIR__ . '/../../phpBB/includes/functions.php';
+require_once __DIR__ . '/../../phpBB/includes/utf/utf_tools.php';
+require_once __DIR__ . '/../../phpBB/includes/functions_upload.php';
+
+class phpbb_filespec_test extends phpbb_test_case
+{
+	const TEST_COUNT = 100;
+	const PREFIX = 'phpbb_';
+	const MAX_STR_LEN = 50;
+	const UPLOAD_MAX_FILESIZE = 1000;
+
+	private $config;
+	public $path;
+
+	protected function setUp()
+	{
+		// Global $config required by unique_id
+		// Global $user required by filespec::additional_checks and
+		// filespec::move_file
+		global $config, $user;
+
+		if (!is_array($config))
+		{
+			$config = array();
+		}
+
+		$config['rand_seed'] = '';
+		$config['rand_seed_last_update'] = time() + 600;
+		// This config value is normally pulled from the database which is set
+		// to this value at install time.
+		// See: phpBB/install/schemas/schema_data.sql
+		$config['mime_triggers'] = 'body|head|html|img|plaintext|a href|pre|script|table|title';
+
+		$user = new phpbb_mock_user();
+		$user->lang = new phpbb_mock_lang();
+
+		$this->config = &$config;
+		$this->path = __DIR__ . '/fixture/';
+
+		// Create copies of the files for use in testing move_file
+		$iterator = new DirectoryIterator($this->path);
+		foreach ($iterator as $fileinfo)
+		{
+			if ($fileinfo->isDot() || $fileinfo->isDir())
+			{
+				continue;
+			}
+
+			copy($fileinfo->getPathname(), $this->path . 'copies/' . $fileinfo->getFilename() . '_copy');
+			if ($fileinfo->getFilename() === 'txt')
+			{
+				copy($fileinfo->getPathname(), $this->path . 'copies/' . $fileinfo->getFilename() . '_copy_2');
+			}
+		}
+	}
+
+	private function get_filespec($override = array())
+	{
+		// Initialise a blank filespec object for use with trivial methods
+		$upload_ary = array(
+			'name' => '',
+			'type' => '',
+			'size' => '',
+			'tmp_name' => '',
+			'error' => '',
+		);
+
+		return new filespec(array_merge($upload_ary, $override), null);
+	}
+
+	protected function tearDown()
+	{
+		global $user;
+		$this->config = array();
+		$user = null;
+
+		$iterator = new DirectoryIterator($this->path . 'copies');
+		foreach ($iterator as $fileinfo)
+		{
+			$name = $fileinfo->getFilename();
+			if ($name[0] !== '.')
+			{
+				unlink($fileinfo->getPathname());
+			}
+		}
+	}
+
+	public function additional_checks_variables()
+	{
+		// False here just indicates the file is too large and fails the
+		// filespec::additional_checks method because of it. All other code
+		// paths in that method are covered elsewhere.
+		return array(
+			array('gif', true),
+			array('jpg', false),
+			array('png', true),
+			array('tif', false),
+			array('txt', false),
+		);
+	}
+
+	/**
+	 * @dataProvider additional_checks_variables
+	 */
+	public function test_additional_checks($filename, $expected)
+	{
+		$upload = new phpbb_mock_fileupload();
+		$filespec = $this->get_filespec();
+		$filespec->upload = $upload;
+		$filespec->file_moved = true;
+		$filespec->filesize = $filespec->get_filesize($this->path . $filename);
+
+		$this->assertEquals($expected, $filespec->additional_checks());
+	}
+
+	public function check_content_variables()
+	{
+		// False here indicates that a file is non-binary and contains
+		// disallowed content that makes IE report the mimetype incorrectly.
+		return array(
+			array('gif', true),
+			array('jpg', true),
+			array('png', true),
+			array('tif', true),
+			array('txt', false),
+		);
+	}
+
+	/**
+	 * @dataProvider check_content_variables
+	 */
+	public function test_check_content($filename, $expected)
+	{
+		$disallowed_content = explode('|', $this->config['mime_triggers']);
+		$filespec = $this->get_filespec(array('tmp_name' => $this->path . $filename));
+		$this->assertEquals($expected, $filespec->check_content($disallowed_content));
+	}
+
+	public function clean_filename_variables()
+	{
+		$chunks = str_split('abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\'\\" /:*?<>|[];(){},#+=-_`', 8);
+		return array(
+			array($chunks[0] . $chunks[7]),
+			array($chunks[1] . $chunks[8]),
+			array($chunks[2] . $chunks[9]),
+			array($chunks[3] . $chunks[4]),
+			array($chunks[5] . $chunks[6]),
+		);
+	}
+
+	/**
+	 * @dataProvider clean_filename_variables
+	 */
+	public function test_clean_filename_real($filename)
+	{
+		$bad_chars = array("'", "\\", ' ', '/', ':', '*', '?', '"', '<', '>', '|');
+		$filespec = $this->get_filespec(array('name' => $filename));
+		$filespec->clean_filename('real', self::PREFIX);
+		$name = $filespec->realname;
+
+		$this->assertEquals(0, preg_match('/%(\w{2})/', $name));
+		foreach ($bad_chars as $char)
+		{
+			$this->assertFalse(strpos($name, $char));
+		}
+	}
+
+	public function test_clean_filename_unique()
+	{
+		$filenames = array();
+		for ($tests = 0; $tests < self::TEST_COUNT; $tests++)
+		{
+			$filespec = $this->get_filespec();
+			$filespec->clean_filename('unique', self::PREFIX);
+			$name = $filespec->realname;
+			
+			$this->assertEquals(strlen($name), 32 + strlen(self::PREFIX));
+			$this->assertRegExp('#^[A-Za-z0-9]+$#', substr($name, strlen(self::PREFIX)));
+			$this->assertFalse(isset($filenames[$name]));
+			$filenames[$name] = true;
+		}
+	}
+
+	public function get_extension_variables()
+	{
+		return array(
+			array('file.png', 'png'),
+			array('file.phpbb.gif', 'gif'),
+			array('file..', ''),
+			array('.file..jpg.webp', 'webp'),
+		);
+	}
+
+	/**
+	 * @dataProvider get_extension_variables
+	 */
+	public function test_get_extension($filename, $expected)
+	{
+		$filespec = $this->get_filespec();
+		$this->assertEquals($expected, $filespec->get_extension($filename));
+	}
+
+	public function is_image_variables()
+	{
+		return array(
+			array('gif', 'image/gif', true),
+			array('jpg', 'image/jpg', true),
+			array('png', 'image/png', true),
+			array('tif', 'image/tif', true),
+			array('txt', 'text/plain', false),
+		);
+	}
+
+	/**
+	 * @dataProvider is_image_variables
+	 */
+	public function test_is_image($filename, $mimetype, $expected)
+	{
+		$filespec = $this->get_filespec(array('tmp_name' => $this->path . $filename, 'type' => $mimetype));
+		$this->assertEquals($expected, $filespec->is_image());
+	}
+
+	public function move_file_variables()
+	{
+		return array(
+			array('gif_copy', 'gif_moved', 'image/gif', 'gif', false, true),
+			array('non_existant', 'still_non_existant', 'text/plain', 'txt', 'GENERAL_UPLOAD_ERROR', false),
+			array('txt_copy', 'txt_as_img', 'image/jpg', 'txt', false, true),
+			array('txt_copy_2', 'txt_moved', 'text/plain', 'txt', false, true),
+			array('jpg_copy', 'jpg_moved', 'image/png', 'jpg', false, true),
+			array('png_copy', 'png_moved', 'image/png', 'jpg', 'IMAGE_FILETYPE_MISMATCH', true),
+		);
+	}
+
+	/**
+	 * @dataProvider move_file_variables
+	 */
+	public function test_move_file($tmp_name, $realname, $mime_type, $extension, $error, $expected)
+	{
+		// Global $phpbb_root_path and $phpEx are required by phpbb_chmod
+		global $phpbb_root_path, $phpEx;
+		$phpbb_root_path = '';
+		$phpEx = 'php';
+
+		$upload = new phpbb_mock_fileupload();
+		$upload->max_filesize = self::UPLOAD_MAX_FILESIZE;
+
+		$filespec = $this->get_filespec(array(
+			'tmp_name' => $this->path . 'copies/' . $tmp_name,
+			'name' => $realname,
+			'type' => $mime_type,
+		));
+		$filespec->extension = $extension;
+		$filespec->upload = $upload;
+		$filespec->local = true;
+
+		$this->assertEquals($expected, $filespec->move_file($this->path . 'copies'));
+		$this->assertEquals($filespec->file_moved, file_exists($this->path . 'copies/' . $realname));
+		if ($error)
+		{
+			$this->assertEquals($error, $filespec->error[0]);
+		}
+
+		$phpEx = '';
+	}
+}
diff --git a/tests/upload/fileupload_test.php b/tests/upload/fileupload_test.php
new file mode 100644
index 0000000000..076855ab56
--- /dev/null
+++ b/tests/upload/fileupload_test.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ *
+ * @package testing
+ * @copyright (c) 2012 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+require_once __DIR__ . '/../../phpBB/includes/functions.php';
+require_once __DIR__ . '/../../phpBB/includes/utf/utf_tools.php';
+require_once __DIR__ . '/../../phpBB/includes/functions_upload.php';
+
+class phpbb_fileupload_test extends phpbb_test_case
+{
+	private $path;
+
+	protected function setUp()
+	{
+		// Global $config required by unique_id
+		// Global $user required by several functions dealing with translations
+		global $config, $user;
+
+		if (!is_array($config))
+		{
+			$config = array();
+		}
+
+		$config['rand_seed'] = '';
+		$config['rand_seed_last_update'] = time() + 600;
+
+		$user = new phpbb_mock_user();
+		$user->lang = new phpbb_mock_lang();
+		$this->path = __DIR__ . '/fixture/';
+	}
+
+	private function gen_valid_filespec()
+	{
+		$filespec = new phpbb_mock_filespec();
+		$filespec->filesize = 1;
+		$filespec->extension = 'jpg';
+		$filespec->realname = 'valid';
+		$filespec->width = 2;
+		$filespec->height = 2;
+
+		return $filespec;
+	}
+
+	protected function tearDown()
+	{
+		// Clear globals
+		global $config, $user;
+		$config = array();
+		$user = null;
+	}
+
+	public function test_common_checks_invalid_extension()
+	{
+		$upload = new fileupload('', array('png'), 100);
+		$file = $this->gen_valid_filespec();
+		$upload->common_checks($file);
+		$this->assertEquals('DISALLOWED_EXTENSION', $file->error[0]);
+	}
+
+	public function test_common_checks_invalid_filename()
+	{
+		$upload = new fileupload('', array('jpg'), 100);
+		$file = $this->gen_valid_filespec();
+		$file->realname = 'invalid?';
+		$upload->common_checks($file);
+		$this->assertEquals('INVALID_FILENAME', $file->error[0]);
+	}
+
+	public function test_common_checks_too_large()
+	{
+		$upload = new fileupload('', array('jpg'), 100);
+		$file = $this->gen_valid_filespec();
+		$file->filesize = 1000;
+		$upload->common_checks($file);
+		$this->assertEquals('WRONG_FILESIZE', $file->error[0]);
+	}
+
+	public function test_common_checks_valid_file()
+	{
+		$upload = new fileupload('', array('jpg'), 1000);
+		$file = $this->gen_valid_filespec();
+		$upload->common_checks($file);
+		$this->assertEquals(0, sizeof($file->error));
+	}
+
+	public function test_local_upload()
+	{
+		$upload = new fileupload('', array('jpg'), 1000);
+
+		copy($this->path . 'jpg', $this->path . 'jpg.jpg');
+		$file = $upload->local_upload($this->path . 'jpg.jpg');
+		$this->assertEquals(0, sizeof($file->error));
+		unlink($this->path . 'jpg.jpg');
+	}
+
+	public function test_valid_dimensions()
+	{
+		$upload = new fileupload('', false, false, 1, 1, 100, 100);
+
+		$file1 = $this->gen_valid_filespec();
+		$file2 = $this->gen_valid_filespec();
+		$file2->height = 101;
+		$file3 = $this->gen_valid_filespec();
+		$file3->width = 0;
+
+		$this->assertTrue($upload->valid_dimensions($file1));
+		$this->assertFalse($upload->valid_dimensions($file2));
+		$this->assertFalse($upload->valid_dimensions($file3));
+	}
+}
diff --git a/tests/upload/fixture/copies/.gitkeep b/tests/upload/fixture/copies/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/upload/fixture/copies/.gitkeep
diff --git a/tests/upload/fixture/gif b/tests/upload/fixture/gif
new file mode 100644
index 0000000000..b636f4b8df
--- /dev/null
+++ b/tests/upload/fixture/gif
diff --git a/tests/upload/fixture/jpg b/tests/upload/fixture/jpg
new file mode 100644
index 0000000000..3cd5038e38
--- /dev/null
+++ b/tests/upload/fixture/jpg
diff --git a/tests/upload/fixture/png b/tests/upload/fixture/png
new file mode 100644
index 0000000000..5514ad40e9
--- /dev/null
+++ b/tests/upload/fixture/png
diff --git a/tests/upload/fixture/tif b/tests/upload/fixture/tif
new file mode 100644
index 0000000000..248b50f9cb
--- /dev/null
+++ b/tests/upload/fixture/tif
diff --git a/tests/upload/fixture/txt b/tests/upload/fixture/txt
new file mode 100644
index 0000000000..a78c858f5c
--- /dev/null
+++ b/tests/upload/fixture/txt
@@ -0,0 +1,2 @@
+<HTML>mime trigger</HTML>
+The HTML tags should remain uppercase so that case-insensitivity can be checked.
diff --git a/tests/user/lang_test.php b/tests/user/lang_test.php
index 6c60583a7b..d7ff451a70 100644
--- a/tests/user/lang_test.php
+++ b/tests/user/lang_test.php
@@ -3,17 +3,15 @@
 *
 * @package testing
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
-require_once dirname(__FILE__) . '/../../phpBB/includes/session.php';
-
 class phpbb_user_lang_test extends phpbb_test_case
 {
 	public function test_user_lang_sprintf()
 	{
-		$user = new user;
+		$user = new phpbb_user;
 		$user->lang = array(
 			'FOO'		=> 'BAR',
 			'BARZ'		=> 'PENG',
@@ -26,6 +24,26 @@ class phpbb_user_lang_test extends phpbb_test_case
 				1		=> '1 post',		// 1
 				2		=> '%d posts',		// 2+
 			),
+			'ARRY_NO_ZERO'	=> array(
+				1		=> '1 post',		// 1
+				2		=> '%d posts',		// 0, 2+
+			),
+			'ARRY_MISSING'	=> array(
+				1		=> '%d post',		// 1
+				//Missing second plural
+			),
+			'ARRY_FLOAT'	=> array(
+				1		=> '1 post',		// 1.x
+				2		=> '%1$.1f posts',	// 0.x, 2+.x
+			),
+			'ARRY_EMPTY'	=> array(
+			),
+			'dateformat'	=> array(
+				'AGO'	=> array(
+					1	=> '%d second',
+					2	=> '%d seconds',
+				),
+			),
 		);
 
 		// No param
@@ -51,8 +69,45 @@ class phpbb_user_lang_test extends phpbb_test_case
 		$this->assertEquals($user->lang('ARRY', 2), '2 posts');
 		$this->assertEquals($user->lang('ARRY', 123), '123 posts');
 
-		// Bug PHPBB3-9949
+		// Empty array returns the language key
+		$this->assertEquals($user->lang('ARRY_EMPTY', 123), 'ARRY_EMPTY');
+
+		// No 0 key defined
+		$this->assertEquals($user->lang('ARRY_NO_ZERO', 0), '0 posts');
+		$this->assertEquals($user->lang('ARRY_NO_ZERO', 1), '1 post');
+		$this->assertEquals($user->lang('ARRY_NO_ZERO', 2), '2 posts');
+
+		// Array with missing keys
+		$this->assertEquals($user->lang('ARRY_MISSING', 2), '2 post');
+
+		// Floats as array key
+		$this->assertEquals($user->lang('ARRY_FLOAT', 1.3), '1 post');
+		$this->assertEquals($user->lang('ARRY_FLOAT', 2.0), '2.0 posts');
+		$this->assertEquals($user->lang('ARRY_FLOAT', 2.51), '2.5 posts');
+
+		// Use sub key, if first paramenter is an array
+		$this->assertEquals($user->lang(array('dateformat', 'AGO'), 2), '2 seconds');
+
+		// ticket PHPBB3-9949 - use first int to determinate the plural-form to use
 		$this->assertEquals($user->lang('ARRY', 1, 2), '1 post');
 		$this->assertEquals($user->lang('ARRY', 1, 's', 2), '1 post');
+
+		// ticket PHPBB3-10345 - different plural rules, not just 0/1/2+
+		$user = new phpbb_user;
+		$user->lang = array(
+			'PLURAL_RULE'		=> 13,
+			'ARRY'		=> array(
+				0		=> '%d is 0',						// 0
+				1		=> '%d is 1',						// 1
+				2		=> '%d ends with 01-10',			// ending with 01-10
+				3		=> '%d ends with 11-19',			// ending with 11-19
+				4		=> '%d is part of the last rule',	// everything else
+			),
+		);
+		$this->assertEquals($user->lang('ARRY', 0), '0 is 0');
+		$this->assertEquals($user->lang('ARRY', 1), '1 is 1');
+		$this->assertEquals($user->lang('ARRY', 103), '103 ends with 01-10');
+		$this->assertEquals($user->lang('ARRY', 15), '15 ends with 11-19');
+		$this->assertEquals($user->lang('ARRY', 300), '300 is part of the last rule');
 	}
 }
diff --git a/tests/utf/normalizer_test.php b/tests/utf/normalizer_test.php
index 38b4ec1b6b..92230cfcc9 100644
--- a/tests/utf/normalizer_test.php
+++ b/tests/utf/normalizer_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
@@ -14,10 +14,13 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_normalizer.php';
 */
 class phpbb_utf_normalizer_test extends phpbb_test_case
 {
+	static private $data_dir;
+
 	static public function setUpBeforeClass()
 	{
-		self::download('http://www.unicode.org/Public/UNIDATA/NormalizationTest.txt', dirname(__FILE__).'/data');
-		self::download('http://www.unicode.org/Public/UNIDATA/UnicodeData.txt', dirname(__FILE__).'/data');
+		self::$data_dir = dirname(__file__) . '/../tmp';
+		self::download('http://www.unicode.org/Public/UNIDATA/NormalizationTest.txt', self::$data_dir);
+		self::download('http://www.unicode.org/Public/UNIDATA/UnicodeData.txt', self::$data_dir);
 	}
 
 	public function test_normalizer()
@@ -62,7 +65,7 @@ class phpbb_utf_normalizer_test extends phpbb_test_case
 
 		$tested_chars = array();
 
-		$fp = fopen(dirname(__FILE__).'/data/NormalizationTest.txt', 'rb');
+		$fp = fopen(self::$data_dir . '/NormalizationTest.txt', 'rb');
 		while (!feof($fp))
 		{
 			$line = fgets($fp);
@@ -99,7 +102,7 @@ class phpbb_utf_normalizer_test extends phpbb_test_case
 					foreach ($tests as $test)
 					{
 						$utf_result = $utf_expected;
-						call_user_func(array('utf_normalizer', $form), &$utf_result);
+						call_user_func_array(array('utf_normalizer', $form), array(&$utf_result));
 
 						$hex_result = $this->utf_to_hexseq($utf_result);
 						$this->assertEquals($utf_expected, $utf_result, "$expected == $form($test) ($hex_expected != $hex_result)");
@@ -117,7 +120,7 @@ class phpbb_utf_normalizer_test extends phpbb_test_case
 	*/
 	public function test_invariants(array $tested_chars)
 	{
-		$fp = fopen(dirname(__FILE__).'/data/UnicodeData.txt', 'rb');
+		$fp = fopen(self::$data_dir . '/UnicodeData.txt', 'rb');
 
 		while (!feof($fp))
 		{
@@ -151,7 +154,7 @@ class phpbb_utf_normalizer_test extends phpbb_test_case
 			foreach (array('nfc', 'nfkc', 'nfd', 'nfkd') as $form)
 			{
 				$utf_result = $utf_expected;
-				call_user_func(array('utf_normalizer', $form), &$utf_result);
+				call_user_func_array(array('utf_normalizer', $form), array(&$utf_result));
 				$hex_result = $this->utf_to_hexseq($utf_result);
 
 				$this->assertEquals($utf_expected, $utf_result, "$hex_expected == $form($hex_tested) ($hex_expected != $hex_result)");
@@ -298,12 +301,14 @@ class phpbb_utf_normalizer_test extends phpbb_test_case
 
 		if (!$fpr = fopen($url, 'rb'))
 		{
-			throw new RuntimeException("Failed to download $url");
+			echo "Failed to download $url\n";
+			return;
 		}
 
 		if (!$fpw = fopen($target, 'wb'))
 		{
-			throw new RuntimeException("Failed to open $target for writing");
+			echo "Failed to open $target for writing\n";
+			return;
 		}
 
 		$chunk = 32768;
diff --git a/tests/utf/utf8_clean_string_test.php b/tests/utf/utf8_clean_string_test.php
index e5a771eafa..ae11e00fbd 100644
--- a/tests/utf/utf8_clean_string_test.php
+++ b/tests/utf/utf8_clean_string_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
@@ -11,7 +11,7 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php';
 
 class phpbb_utf_utf8_clean_string_test extends phpbb_test_case
 {
-	public static function cleanable_strings()
+	public function cleanable_strings()
 	{
 		return array(
 			array('MiXed CaSe', 'mixed case', 'Checking case folding'),
diff --git a/tests/utf/utf8_wordwrap_test.php b/tests/utf/utf8_wordwrap_test.php
index 03fa9dc38c..39fdf73308 100644
--- a/tests/utf/utf8_wordwrap_test.php
+++ b/tests/utf/utf8_wordwrap_test.php
@@ -3,7 +3,7 @@
 *
 * @package testing
 * @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
diff --git a/tests/wrapper/gmgetdate_test.php b/tests/wrapper/gmgetdate_test.php
new file mode 100644
index 0000000000..a838cfdba9
--- /dev/null
+++ b/tests/wrapper/gmgetdate_test.php
@@ -0,0 +1,49 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 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_wrapper_gmgetdate_test extends phpbb_test_case
+{
+	public function test_gmgetdate()
+	{
+		$this->run_gmgetdate_assertion();
+		$this->run_test_with_timezone('UTC');
+		$this->run_test_with_timezone('Europe/Berlin');
+		$this->run_test_with_timezone('America/Los_Angeles');
+		$this->run_test_with_timezone('Antarctica/South_Pole');
+	}
+
+	protected function run_test_with_timezone($timezone_identifier)
+	{
+		$current_timezone = date_default_timezone_get();
+
+		date_default_timezone_set($timezone_identifier);
+		$this->run_gmgetdate_assertion();
+		date_default_timezone_set($current_timezone);
+	}
+
+	protected function run_gmgetdate_assertion()
+	{
+		$expected = time();
+
+		$date_array = phpbb_gmgetdate($expected);
+
+		$actual = gmmktime(
+			$date_array['hours'],
+			$date_array['minutes'],
+			$date_array['seconds'],
+			$date_array['mon'],
+			$date_array['mday'],
+			$date_array['year']
+		);
+
+		$this->assertEquals($expected, $actual);
+	}
+}
diff --git a/tests/wrapper/mt_rand_test.php b/tests/wrapper/mt_rand_test.php
new file mode 100644
index 0000000000..eba0bf2faa
--- /dev/null
+++ b/tests/wrapper/mt_rand_test.php
@@ -0,0 +1,46 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 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_wrapper_mt_rand_test extends phpbb_test_case
+{
+	public function test_max_equals_min()
+	{
+		$result = phpbb_mt_rand(42, 42);
+		$this->assertEquals(42, $result);
+	}
+
+	public function test_max_equals_min_negative()
+	{
+		$result = phpbb_mt_rand(-42, -42);
+		$this->assertEquals(-42, $result);
+	}
+
+	public function test_max_greater_min()
+	{
+		$result = phpbb_mt_rand(3, 4);
+		$this->assertGreaterThanOrEqual(3, $result);
+		$this->assertLessThanOrEqual(4, $result);
+	}
+
+	public function test_min_greater_max()
+	{
+		$result = phpbb_mt_rand(4, 3);
+		$this->assertGreaterThanOrEqual(3, $result);
+		$this->assertLessThanOrEqual(4, $result);
+	}
+
+	public function test_min_greater_max_negative()
+	{
+		$result = phpbb_mt_rand(-3, -4);
+		$this->assertGreaterThanOrEqual(-4, $result);
+		$this->assertLessThanOrEqual(-3, $result);
+	}
+}
diff --git a/tests/wrapper/phpbb_php_ini_fake.php b/tests/wrapper/phpbb_php_ini_fake.php
new file mode 100644
index 0000000000..49bc5936e5
--- /dev/null
+++ b/tests/wrapper/phpbb_php_ini_fake.php
@@ -0,0 +1,16 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_php_ini_fake extends phpbb_php_ini
+{
+	function get($varname)
+	{
+		return $varname;
+	}
+}
diff --git a/tests/wrapper/phpbb_php_ini_test.php b/tests/wrapper/phpbb_php_ini_test.php
new file mode 100644
index 0000000000..8e08d5c204
--- /dev/null
+++ b/tests/wrapper/phpbb_php_ini_test.php
@@ -0,0 +1,86 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/phpbb_php_ini_fake.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+
+class phpbb_wrapper_phpbb_php_ini_test extends phpbb_test_case
+{
+	protected $php_ini;
+
+	public function setUp()
+	{
+		$this->php_ini = new phpbb_php_ini_fake;
+	}
+
+	public function test_get_string()
+	{
+		$this->assertSame(false, $this->php_ini->get_string(false));
+		$this->assertSame('phpbb', $this->php_ini->get_string(' phpbb '));
+	}
+
+	public function test_get_bool()
+	{
+		$this->assertSame(true, $this->php_ini->get_bool('ON'));
+		$this->assertSame(true, $this->php_ini->get_bool('on'));
+		$this->assertSame(true, $this->php_ini->get_bool('1'));
+
+		$this->assertSame(false, $this->php_ini->get_bool('OFF'));
+		$this->assertSame(false, $this->php_ini->get_bool('off'));
+		$this->assertSame(false, $this->php_ini->get_bool('0'));
+		$this->assertSame(false, $this->php_ini->get_bool(''));
+	}
+
+	public function test_get_int()
+	{
+		$this->assertSame(1234, $this->php_ini->get_int('1234'));
+		$this->assertSame(-12345, $this->php_ini->get_int('-12345'));
+		$this->assertSame(false, $this->php_ini->get_int('phpBB'));
+	}
+
+	public function test_get_float()
+	{
+		$this->assertSame(1234.0, $this->php_ini->get_float('1234'));
+		$this->assertSame(-12345.0, $this->php_ini->get_float('-12345'));
+		$this->assertSame(false, $this->php_ini->get_float('phpBB'));
+	}
+
+	public function test_get_bytes_invalid()
+	{
+		$this->assertSame(false, $this->php_ini->get_bytes(false));
+		$this->assertSame(false, $this->php_ini->get_bytes('phpBB'));
+		$this->assertSame(false, $this->php_ini->get_bytes('k'));
+		$this->assertSame(false, $this->php_ini->get_bytes('-k'));
+		$this->assertSame(false, $this->php_ini->get_bytes('M'));
+		$this->assertSame(false, $this->php_ini->get_bytes('-M'));
+	}
+
+	/**
+	* @dataProvider get_bytes_data
+	*/
+	public function test_get_bytes($expected, $value)
+	{
+		$actual = $this->php_ini->get_bytes($value);
+
+		$this->assertTrue(is_float($actual) || is_int($actual));
+		$this->assertEquals($expected, $actual);
+	}
+
+	static public function get_bytes_data()
+	{
+		return array(
+			array(32 * pow(2, 20),		'32m'),
+			array(- 32 * pow(2, 20),	'-32m'),
+			array(8 * pow(2, 30),		'8G'),
+			array(- 8 * pow(2, 30),		'-8G'),
+			array(1234,					'1234'),
+			array(-12345,				'-12345'),
+		);
+	}
+}
diff --git a/tests/wrapper/version_compare_test.php b/tests/wrapper/version_compare_test.php
new file mode 100644
index 0000000000..8b42eb4bee
--- /dev/null
+++ b/tests/wrapper/version_compare_test.php
@@ -0,0 +1,130 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 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_wrapper_version_compare_test extends phpbb_test_case
+{
+	public function test_two_parameters()
+	{
+		$this->assertEquals(-1, phpbb_version_compare('1.0.0', '1.0.1'));
+		$this->assertEquals(0, phpbb_version_compare('1.0.0', '1.0.0'));
+		$this->assertEquals(1, phpbb_version_compare('1.0.1', '1.0.0'));
+	}
+	
+	public function test_three_parameters()
+	{
+		$this->assertEquals(true, phpbb_version_compare('1.0.0', '1.0.1', '<'));
+		$this->assertEquals(true, phpbb_version_compare('1.0.0', '1.0.0', '<='));
+		$this->assertEquals(true, phpbb_version_compare('1.0.0', '1.0.0', '='));
+		$this->assertEquals(true, phpbb_version_compare('1.0.0', '1.0.0', '>='));
+		$this->assertEquals(true, phpbb_version_compare('1.0.1', '1.0.0', '>'));
+	}
+
+	public function test_strict_order()
+	{
+		$releases = array(
+			'2.0.0',
+			'2.0.1',
+			// Those are not version_compare() compatible
+			//'2.0.6a',
+			//'2.0.6b',
+			//'2.0.6c',
+			//'2.0.6d',
+			'2.0.7',
+			'2.0.23',
+			'3.0.A1',
+			'3.0.A2',
+			'3.0.A3',
+			'3.0.B1',
+			'3.0.B2',
+			'3.0.B4',
+			'3.0.B5',
+			'3.0.RC1',
+			'3.0.RC5',
+			'3.0.0',
+			'3.0.1',
+			'3.0.2',
+			'3.0.7',
+			'3.0.7-PL1',
+			'3.0.8-RC1',
+			'3.0.8',
+			'3.0.9-dev',
+			'3.0.9-RC1',
+			'3.0.9-RC2',
+			'3.0.9-RC4',
+			'3.0.10-RC1',
+			'3.1-dev',
+			'3.2-A1',
+		);
+
+		for ($i = 0, $size = sizeof($releases); $i < $size - 1; ++$i)
+		{
+			$version1 = $releases[$i];
+			$version2 = $releases[$i + 1];
+
+			$this->assertEquals(
+				true,
+				phpbb_version_compare($version1, $version2, '<'),
+				"Result of version comparison $version1 < $version2 is incorrect."
+			);
+		}
+	}
+
+	/**
+	* @dataProvider equality_test_data
+	*/
+	public function test_equality($version1, $version2)
+	{
+		$this->assertEquals(
+			0,
+			phpbb_version_compare($version1, $version2),
+			"Result of version comparison $version1 = $version2 is incorrect."
+		);
+
+		$this->assertEquals(
+			true,
+			phpbb_version_compare($version1, $version2, '='),
+			"Result of version comparison $version1 = $version2 is incorrect."
+		);
+	}
+
+	public function equality_test_data()
+	{
+		return array(
+			array('1.1.0-A2', '1.1.0-a2'),
+			array('1.1.0-B1', '1.1.0-b1'),
+		);
+	}
+
+	/**
+	* @dataProvider alpha_beta_test_data
+	*/
+	public function test_alpha_beta($expected, $version1, $version2)
+	{
+		$this->assertEquals(
+			$expected,
+			phpbb_version_compare($version1, $version2),
+			"Result of version comparison ($version1, $version2) = $expected is incorrect."
+		);
+		
+	}
+
+	public function alpha_beta_test_data()
+	{
+		return array(
+			array(-1, '1.1.0-A2', '1.1.0-B1'),
+			array(-1, '1.1.0-a2', '1.1.0-b1'),
+
+			array(-1, '1.1.0-a2', '1.1.0-B1'),
+			array(-1, '1.1.0-A2', '1.1.0-b1'),
+		);
+	}
+
+}
author	Oleg Pudeyev <oleg@bsdpower.com>	2012-11-06 11:11:27 -0500
committer	Oleg Pudeyev <oleg@bsdpower.com>	2012-11-06 11:11:27 -0500
commit	87ea50948ea53c0d1beab5b44badebeae4292d1a (patch)
tree	dbc99fde4dfc62b84bae60c7e4ab5c02ddbe8a3c /tests
parent	5b48df41685da785b082612318ebe7a8012c4149 (diff)
parent	44ff9d020fd218cbdb2f07a0d7f85a630367e3c2 (diff)
download	forums-87ea50948ea53c0d1beab5b44badebeae4292d1a.tar forums-87ea50948ea53c0d1beab5b44badebeae4292d1a.tar.gz forums-87ea50948ea53c0d1beab5b44badebeae4292d1a.tar.bz2 forums-87ea50948ea53c0d1beab5b44badebeae4292d1a.tar.xz forums-87ea50948ea53c0d1beab5b44badebeae4292d1a.zip