4 files changed, 278 insertions, 20 deletions
diff --git a/tests/test_framework/framework.php b/tests/test_framework/framework.php
index 5913d20ca0..abdcd1ad79 100644
--- a/tests/test_framework/framework.php
+++ b/tests/test_framework/framework.php
@@ -33,4 +33,7 @@ if (version_compare(PHPUnit_Runner_Version::id(), '3.3.0', '<'))
 }
 
 require_once 'PHPUnit/Framework.php';
+require_once 'PHPUnit/Extensions/Database/TestCase.php';
+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';
diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php
new file mode 100644
index 0000000000..d558874c6f
--- /dev/null
+++ b/tests/test_framework/phpbb_database_test_case.php
@@ -0,0 +1,168 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2008 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_TestCase
+{
+	protected $test_case_helpers;
+
+	public function init_test_case_helpers()
+	{
+		if (!$this->test_case_helpers)
+		{
+			$this->test_case_helpers = new phpbb_test_case_helpers($this);
+		}
+	}
+
+	function get_dbms_data($dbms)
+	{
+		$available_dbms = array(
+			'firebird'	=> array(
+				'SCHEMA'		=> 'firebird',
+				'DELIM'			=> ';;',
+				'PDO'			=> 'firebird',
+			),
+			'mysqli'	=> array(
+				'SCHEMA'		=> 'mysql_41',
+				'DELIM'			=> ';',
+				'PDO'			=> 'mysql',
+			),
+			'mysql'		=> array(
+				'SCHEMA'		=> 'mysql',
+				'DELIM'			=> ';',
+				'PDO'			=> 'mysql',
+			),
+			'mssql'		=> array(
+				'SCHEMA'		=> 'mssql',
+				'DELIM'			=> 'GO',
+				'PDO'			=> 'odbc',
+			),
+			'mssql_odbc'=>	array(
+				'SCHEMA'		=> 'mssql',
+				'DELIM'			=> 'GO',
+				'PDO'			=> 'odbc',
+			),
+			'mssqlnative'		=> array(
+				'SCHEMA'		=> 'mssql',
+				'DELIM'			=> 'GO',
+				'PDO'			=> 'odbc',
+			),
+			'oracle'	=>	array(
+				'SCHEMA'		=> 'oracle',
+				'DELIM'			=> '/',
+				'PDO'			=> 'oci',
+			),
+			'postgres' => array(
+				'SCHEMA'		=> 'postgres',
+				'DELIM'			=> ';',
+				'PDO'			=> 'pgsql',
+			),
+			'sqlite'		=> array(
+				'SCHEMA'		=> 'sqlite',
+				'DELIM'			=> ';',
+				'PDO'			=> 'sqlite',
+			),
+		);
+
+		if (isset($available_dbms[$dbms]))
+		{
+			return $available_dbms[$dbms];
+		}
+		else
+		{
+			trigger_error('Database unsupported', E_USER_ERROR);
+		}
+	}
+
+	function split_sql_file($sql, $delimiter)
+	{
+		$sql = str_replace("\r" , '', $sql);
+		$data = preg_split('/' . preg_quote($delimiter, '/') . '$/m', $sql);
+
+		$data = array_map('trim', $data);
+
+		// The empty case
+		$end_data = end($data);
+
+		if (empty($end_data))
+		{
+			unset($data[key($data)]);
+		}
+
+		return $data;
+	}
+
+	public function getConnection()
+	{
+		static $already_connected;
+
+		$this->init_test_case_helpers();
+		$database_config = $this->test_case_helpers->get_database_config();
+
+		$dbms_data = $this->get_dbms_data($database_config['dbms']);
+
+		if ($already_connected)
+		{
+			$pdo = new PDO($dbms_data['PDO'] . ':host=' . $database_config['dbhost'] . ';dbname=' . $database_config['dbname'], $database_config['dbuser'], $database_config['dbpasswd']);
+		}
+		else
+		{
+			$pdo = new PDO($dbms_data['PDO'] . ':host=' . $database_config['dbhost'] . ';', $database_config['dbuser'], $database_config['dbpasswd']);
+
+			try
+			{
+				$pdo->exec('DROP DATABASE ' . $database_config['dbname']);
+			}
+			catch (PDOException $e){} // ignore non existent db
+
+			$pdo->exec('CREATE DATABASE ' . $database_config['dbname']);
+
+			$pdo = new PDO($dbms_data['PDO'] . ':host=' . $database_config['dbhost'] . ';dbname=' . $database_config['dbname'], $database_config['dbuser'], $database_config['dbpasswd']);
+
+			if ($database_config['dbms'] == 'mysql')
+			{
+				$sth = $pdo->query('SELECT VERSION() AS version');
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+
+				if (version_compare($row['version'], '4.1.3', '>='))
+				{
+					$dbms_data['SCHEMA'] .= '_41';
+				}
+				else
+				{
+					$dbms_data['SCHEMA'] .= '_40';
+				}
+
+				unset($row, $sth);
+			}
+
+			$sql_query = $this->split_sql_file(file_get_contents("../phpBB/install/schemas/{$dbms_data['SCHEMA']}_schema.sql"), $dbms_data['DELIM']);
+
+			foreach ($sql_query as $sql)
+			{
+				$pdo->exec($sql);
+			}
+
+			$already_connected = true;
+		}
+
+		return $this->createDefaultDBConnection($pdo, 'testdb');
+	}
+
+	public function new_dbal()
+	{
+		$this->init_test_case_helpers();
+		return $this->test_case_helpers->new_dbal();
+	}
+
+	public function setExpectedTriggerError($errno, $message = '')
+	{
+		$this->init_test_case_helpers();
+		$this->test_case_helpers->setExpectedTriggerError($errno, $message);
+	}
+}
diff --git a/tests/test_framework/phpbb_test_case.php b/tests/test_framework/phpbb_test_case.php
index 3cf2a9d442..af867b29ff 100644
--- a/tests/test_framework/phpbb_test_case.php
+++ b/tests/test_framework/phpbb_test_case.php
@@ -9,29 +9,19 @@
 
 class phpbb_test_case extends PHPUnit_Framework_TestCase
 {
-	protected $expectedTriggerError = false;
+	protected $test_case_helpers;
 
-	public function setExpectedTriggerError($errno, $message = '')
+	public function init_test_case_helpers()
 	{
-		$exceptionName = '';
-		switch ($errno)
+		if (!$this->test_case_helpers)
 		{
-			case E_NOTICE:
-			case E_STRICT:
-				PHPUnit_Framework_Error_Notice::$enabled = true;
-				$exceptionName = 'PHPUnit_Framework_Error_Notice';
-			break;
-
-			case E_WARNING:
-				PHPUnit_Framework_Error_Warning::$enabled = true;
-				$exceptionName = 'PHPUnit_Framework_Error_Warning';
-			break;
-
-			default:
-				$exceptionName = 'PHPUnit_Framework_Error';
-			break;
+			$this->test_case_helpers = new phpbb_test_case_helpers($this);
 		}
-		$this->expectedTriggerError = true;
-		$this->setExpectedException($exceptionName, (string) $message, $errno);
+	}
+
+	public function setExpectedTriggerError($errno, $message = '')
+	{
+		$this->init_test_case_helpers();
+		$this->test_case_helpers->setExpectedTriggerError($errno, $message);
 	}
 }
diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
new file mode 100644
index 0000000000..0c5932e1ad
--- /dev/null
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -0,0 +1,97 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2008 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+class phpbb_test_case_helpers
+{
+	protected $expectedTriggerError = false;
+
+	protected $test_case;
+
+	public function __construct($test_case)
+	{
+		$this->test_case = $test_case;
+	}
+
+	public function get_database_config()
+	{
+		static $show_error = true;
+
+		if (!file_exists('test_config.php'))
+		{
+			if ($show_error)
+			{
+				$show_error = false;
+			}
+			else
+			{
+				$this->test_case->markTestSkipped('Missing test_config.php: See first error.');
+				return;
+			}
+
+			trigger_error("You have to create a test_config.php like this:
+\"<?php
+\$dbms = 'mysqli';
+\$dbhost = 'localhost';
+\$dbport = '';
+\$dbname = 'database';
+\$dbuser = 'user';
+\$dbpasswd = 'password';
+\"
+
+NOTE: The database is dropped and recreated with the phpbb-db-schema! Do NOT specify a database with important data.", E_USER_ERROR);
+		}
+		include('test_config.php');
+
+		return array(
+			'dbms'		=> $dbms,
+			'dbhost'	=> $dbhost,
+			'dbport'	=> $dbport,
+			'dbname'	=> $dbname,
+			'dbuser'	=> $dbuser,
+			'dbpasswd'	=> $dbpasswd,
+		);
+	}
+
+	public function new_dbal()
+	{
+		global $phpbb_root_path, $phpEx;
+		$config = $this->get_database_config();
+
+		require_once '../phpBB/includes/db/' . $config['dbms'] . '.php';
+		$dbal = 'dbal_' . $config['dbms'];
+		$db = new $dbal();
+		$db->sql_connect($config['dbhost'], $config['dbuser'], $config['dbpasswd'], $config['dbname'], $config['dbport']);
+
+		return $db;
+	}
+
+	public function setExpectedTriggerError($errno, $message = '')
+	{
+		$exceptionName = '';
+		switch ($errno)
+		{
+			case E_NOTICE:
+			case E_STRICT:
+				PHPUnit_Framework_Error_Notice::$enabled = true;
+				$exceptionName = 'PHPUnit_Framework_Error_Notice';
+			break;
+
+			case E_WARNING:
+				PHPUnit_Framework_Error_Warning::$enabled = true;
+				$exceptionName = 'PHPUnit_Framework_Error_Warning';
+			break;
+
+			default:
+				$exceptionName = 'PHPUnit_Framework_Error';
+			break;
+		}
+		$this->expectedTriggerError = true;
+		$this->test_case->setExpectedException($exceptionName, (string) $message, $errno);
+	}
+}