5 files changed, 552 insertions, 45 deletions
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 e742b543b0..429bb92bf1 100644
--- a/tests/test_framework/phpbb_database_test_case.php
+++ b/tests/test_framework/phpbb_database_test_case.php
@@ -13,6 +13,8 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 
 	protected $test_case_helpers;
 
+	protected $fixture_xml_data;
+
 	public function __construct($name = NULL, array $data = array(), $dataName = '')
 	{
 		parent::__construct($name, $data, $dataName);
@@ -28,6 +30,44 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 		);
 	}
 
+	protected function setUp()
+	{
+		parent::setUp();
+
+		// Resynchronise tables if a fixture was loaded
+		if (isset($this->fixture_xml_data))
+		{
+			$config = $this->get_database_config();
+			$manager = $this->create_connection_manager($config);
+			$manager->connect();
+			$manager->post_setup_synchronisation($this->fixture_xml_data);
+		}
+	}
+
+	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'];
+		}
+
+		$this->fixture_xml_data = parent::createXMLDataSet($path);
+
+		return $this->fixture_xml_data;
+	}
+
 	public function get_test_case_helpers()
 	{
 		if (!$this->test_case_helpers)
@@ -106,4 +146,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
+	*/
+	static public 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 c734c90a1a..d7c2804aa7 100644
--- a/tests/test_framework/phpbb_database_test_connection_manager.php
+++ b/tests/test_framework/phpbb_database_test_connection_manager.php
@@ -8,6 +8,7 @@
 */
 
 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
 {
@@ -62,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'];
@@ -80,12 +88,52 @@ class phpbb_database_test_connection_manager
 				{
 					$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)
 		{
@@ -93,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);
 	}
 
 	/**
@@ -119,10 +166,24 @@ class phpbb_database_test_connection_manager
 		switch ($this->config['dbms'])
 		{
 			case 'sqlite':
-				if (file_exists($this->config['dbhost']))
+			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)
 				{
-					unlink($this->config['dbhost']);
+					$this->pdo->exec('DROP TABLE ' . $table . ' CASCADE CONSTRAINTS');
 				}
+				$this->purge_extras();
 			break;
 
 			default:
@@ -131,6 +192,15 @@ class phpbb_database_test_connection_manager
 				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)
 				{
@@ -139,9 +209,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;
 		}
 	}
@@ -243,7 +312,7 @@ class phpbb_database_test_connection_manager
 		$filename = $directory . $schema . '_schema.sql';
 
 		$queries = file_get_contents($filename);
-		$sql = remove_comments($queries);
+		$sql = phpbb_remove_comments($queries);
 		
 		$sql = split_sql_file($sql, $this->dbms['DELIM']);
 
@@ -317,4 +386,151 @@ 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);
+		}
+	}
+
+	/**
+	* Performs synchronisations on the database after a fixture has been loaded
+	*
+	* @param	PHPUnit_Extensions_Database_DataSet_XmlDataSet	$xml_data_set		Information about the tables contained within the loaded fixture
+	*
+	* @return null
+	*/
+	public function post_setup_synchronisation($xml_data_set)
+	{
+		$this->ensure_connected(__METHOD__);
+		$queries = array();
+
+		// Get escaped versions of the table names used in the fixture
+		$table_names = array_map(array($this->pdo, 'PDO::quote'), $xml_data_set->getTableNames());
+
+		switch ($this->config['dbms'])
+		{
+			case 'oracle':
+				// Get all of the information about the sequences
+				$sql = "SELECT t.table_name, tc.column_name, d.referenced_name as sequence_name, s.increment_by, s.min_value
+					FROM USER_TRIGGERS t
+					JOIN USER_DEPENDENCIES d ON (d.name = t.trigger_name)
+					JOIN USER_TRIGGER_COLS tc ON (tc.trigger_name = t.trigger_name)
+					JOIN USER_SEQUENCES s ON (s.sequence_name = d.referenced_name)
+					WHERE d.referenced_type = 'SEQUENCE'
+						AND d.type = 'TRIGGER'
+						AND t.table_name IN (" . implode(', ', array_map('strtoupper', $table_names)) . ')';
+
+				$result = $this->pdo->query($sql);
+
+				while ($row = $result->fetch(PDO::FETCH_ASSOC))
+				{
+					// Get the current max value of the table
+					$sql = "SELECT MAX({$row['COLUMN_NAME']}) AS max FROM {$row['TABLE_NAME']}";
+					$max_result = $this->pdo->query($sql);
+					$max_row = $max_result->fetch(PDO::FETCH_ASSOC);
+
+					if (!$max_row)
+					{
+						continue;
+					}
+
+					$max_val = (int) $max_row['MAX'];
+					$max_val++;
+
+					/**
+					* This is not the "proper" way, but the proper way does not allow you to completely reset
+					* tables with no rows since you have to select the next value to make the change go into effect.
+					* You would have to go past the minimum value to set it correctly, but that's illegal.
+					* Since we have no objects attached to our sequencers (triggers aren't attached), this works fine.
+					*/
+					$queries[] = 'DROP SEQUENCE ' . $row['SEQUENCE_NAME'];
+					$queries[] = "CREATE SEQUENCE {$row['SEQUENCE_NAME']} 
+									MINVALUE {$row['MIN_VALUE']} 
+									INCREMENT BY {$row['INCREMENT_BY']} 
+									START WITH $max_val";
+				}
+			break;
+
+			case 'postgres':
+				// Get the sequences attached to the tables
+				$sql = 'SELECT column_name, table_name FROM information_schema.columns
+					WHERE table_name IN (' . implode(', ', $table_names) . ")
+						AND strpos(column_default, '_seq''::regclass') > 0";
+				$result = $this->pdo->query($sql);
+
+				$setval_queries = array();
+				while ($row = $result->fetch(PDO::FETCH_ASSOC))
+				{
+					// Get the columns used in the fixture for this table
+					$column_names = $xml_data_set->getTableMetaData($row['table_name'])->getColumns();
+
+					// Skip sequences that weren't specified in the fixture
+					if (!in_array($row['column_name'], $column_names))
+					{
+						continue;
+					}
+
+					// Get the old value if it exists, or use 1 if it doesn't
+					$sql = "SELECT COALESCE((SELECT MAX({$row['column_name']}) + 1 FROM {$row['table_name']}), 1) AS val";
+					$result_max = $this->pdo->query($sql);
+					$row_max = $result_max->fetch(PDO::FETCH_ASSOC);
+
+					if ($row_max)
+					{
+						$seq_name = $this->pdo->quote($row['table_name'] . '_seq');
+						$max_val = (int) $row_max['val'];
+
+						// The last parameter is false so that the system doesn't increment it again
+						$setval_queries[] = "SETVAL($seq_name, $max_val, false)";
+					}
+				}
+
+				// Combine all of the SETVALs into one query
+				if (sizeof($setval_queries))
+				{
+					$queries[] = 'SELECT ' . implode(', ', $setval_queries);
+				}
+			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
index b5e6f7e377..8ab6469e9a 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -6,36 +6,70 @@
 * @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';
+require_once __DIR__ . '/../../phpBB/includes/acm/acm_file.php';
+require_once __DIR__ . '/../../phpBB/includes/cache.php';
 
 class phpbb_functional_test_case extends phpbb_test_case
 {
 	protected $client;
 	protected $root_url;
 
+	protected $cache = null;
+	protected $db = 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;
 
 	static public function setUpBeforeClass()
 	{
-		if (!extension_loaded('phar'))
+		parent::setUpBeforeClass();
+
+		self::$config = phpbb_test_case_helpers::get_test_config();
+
+		if (!isset(self::$config['phpbb_functional_url']))
 		{
-			self::markTestSkipped('phar extension is not loaded');
+			self::markTestSkipped('phpbb_functional_url was not set in test_config and wasn\'t set as PHPBB_FUNCTIONAL_URL environment variable either.');
 		}
 
-		require_once 'phar://' . __DIR__ . '/../../vendor/goutte.phar';
+		if (!self::$already_installed)
+		{
+			self::install_board();
+			self::$already_installed = true;
+		}
 	}
 
 	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.');
-		}
+		parent::setUp();
 
-		$this->client = new Goutte\Client();
+		$this->bootstrap();
+
+		$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');
+		$this->purge_cache();
 	}
 
 	public function request($method, $path)
@@ -50,6 +84,42 @@ class phpbb_functional_test_case extends phpbb_test_case
 	{
 	}
 
+	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 cache();
+		}
+
+		return $this->cache;
+	}
+
+	protected function purge_cache()
+	{
+		$cache = $this->get_cache_driver();
+
+		$cache->purge();
+		$cache->unload();
+		$cache->load();
+	}
+
 	public function __construct($name = NULL, array $data = array(), $dataName = '')
 	{
 		parent::__construct($name, $data, $dataName);
@@ -57,28 +127,14 @@ class phpbb_functional_test_case extends phpbb_test_case
 		$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 install_board()
+	static 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);
+		self::recreate_database(self::$config);
 
 		if (file_exists($phpbb_root_path . "config.$phpEx"))
 		{
@@ -123,21 +179,28 @@ class phpbb_functional_test_case extends phpbb_test_case
 		));
 		// end data
 
-		$content = $this->do_request('install');
-		$this->assertContains('Welcome to Installation', $content);
-
-		$this->do_request('create_table', $data);
+		$content = self::do_request('install');
+		self::assertNotSame(false, $content);
+		self::assertContains('Welcome to Installation', $content);
 
-		file_put_contents($phpbb_root_path . "config.$phpEx", phpbb_create_config_file_data($data, self::$config['dbms'], array(), true));
+		$content = self::do_request('create_table', $data);
+		self::assertNotSame(false, $content);
+		self::assertContains('The database tables used by phpBB', $content);
+		// 3.0 or 3.1
+		self::assertContains('have been created and populated with some initial data.', $content);
 
-		$this->do_request('config_file', $data);
+		$content = self::do_request('config_file', $data);
+		self::assertNotSame(false, $content);
+		self::assertContains('Configuration file', $content);
+		file_put_contents($phpbb_root_path . "config.$phpEx", phpbb_create_config_file_data($data, self::$config['dbms'], array(), true, true));
 
+		$content = self::do_request('final', $data);
+		self::assertNotSame(false, $content);
+		self::assertContains('You have successfully installed', $content);
 		copy($phpbb_root_path . "config.$phpEx", $phpbb_root_path . "config_test.$phpEx");
-
-		$this->do_request('final', $data);
 	}
 
-	private function do_request($sub, $post_data = null)
+	static private function do_request($sub, $post_data = null)
 	{
 		$context = null;
 
@@ -156,9 +219,135 @@ class phpbb_functional_test_case extends phpbb_test_case
 		return file_get_contents(self::$config['phpbb_functional_url'] . 'install/index.php?mode=install&sub=' . $sub, false, $context);
 	}
 
-	private function recreate_database($config)
+	static private function recreate_database($config)
 	{
 		$db_conn_mgr = new phpbb_database_test_connection_manager($config);
 		$db_conn_mgr->recreate_db();
 	}
+
+	/**
+	* Creates a new user with limited permissions
+	*
+	* @param string $username Also doubles up as the user's password
+	* @return int ID of created user
+	*/
+	protected function create_user($username)
+	{
+		// Required by unique_id
+		global $config;
+
+		if (!is_array($config))
+		{
+			$config = array();
+		}
+
+		$config['rand_seed'] = '';
+		$config['rand_seed_last_update'] = time() + 600;
+
+		// Required by user_add
+		global $db, $cache;
+		$db = $this->get_db();
+		if (!function_exists('phpbb_mock_null_cache'))
+		{
+			require_once(__DIR__ . '/../mock/null_cache.php');
+		}
+		$cache = new phpbb_mock_null_cache;
+
+		if (!function_exists('utf_clean_string'))
+		{
+			require_once(__DIR__ . '/../../phpBB/includes/utf/utf_tools.php');
+		}
+		if (!function_exists('user_add'))
+		{
+			require_once(__DIR__ . '/../../phpBB/includes/functions_user.php');
+		}
+
+		$user_row = array(
+			'username' => $username,
+			'group_id' => 2,
+			'user_email' => 'nobody@example.com',
+			'user_type' => 0,
+			'user_lang' => 'en',
+			'user_timezone' => 0,
+			'user_dateformat' => '',
+			'user_password' => phpbb_hash($username),
+		);
+		return user_add($user_row);
+	}
+
+	protected function login($username = 'admin')
+	{
+		$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();
+		$crawler = $this->client->submit($form, array('username' => $username, 'password' => $username));
+		$this->assert_response_success();
+		$this->assertContains($this->lang('LOGIN_REDIRECT'), $crawler->filter('html')->text());
+
+		$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();
+			}
+		}
+	}
+
+	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);
+	}
+
+	/**
+	* Heuristic function to check that the response is success.
+	*
+	* When php decides to die with a fatal error, it still sends 200 OK
+	* status code. This assertion tries to catch that.
+	*
+	* @return null
+	*/
+	public function assert_response_success()
+	{
+		$this->assertEquals(200, $this->client->getResponse()->getStatus());
+		$content = $this->client->getResponse()->getContent();
+		$this->assertNotContains('Fatal error:', $content);
+	}
 }
diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index b46c36efaa..29adfc6817 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -58,9 +58,19 @@ class phpbb_test_case_helpers
 			));
 		}
 
-		if (file_exists(dirname(__FILE__) . '/../test_config.php'))
+		if (isset($_SERVER['PHPBB_TEST_CONFIG']))
 		{
-			include(dirname(__FILE__) . '/../test_config.php');
+			// 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,
@@ -69,6 +79,7 @@ class phpbb_test_case_helpers
 				'dbname'	=> $dbname,
 				'dbuser'	=> $dbuser,
 				'dbpasswd'	=> $dbpasswd,
+				'custom_dsn'	=> isset($custom_dsn) ? $custom_dsn : '',
 			));
 
 			if (isset($phpbb_functional_url))
@@ -85,7 +96,8 @@ class phpbb_test_case_helpers
 				'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'] : ''
+				'dbpasswd'	=> isset($_SERVER['PHPBB_TEST_DBPASSWD']) ? $_SERVER['PHPBB_TEST_DBPASSWD'] : '',
+				'custom_dsn'	=> isset($_SERVER['PHPBB_TEST_CUSTOM_DSN']) ? $_SERVER['PHPBB_TEST_CUSTOM_DSN'] : '',
 			));
 		}