5 files changed, 89 insertions, 29 deletions
diff --git a/tests/all_tests.php b/tests/all_tests.php
index bae7725ee7..d1d711c4d7 100644
--- a/tests/all_tests.php
+++ b/tests/all_tests.php
@@ -28,7 +28,14 @@ require_once 'network/all_tests.php';
 require_once 'random/all_tests.php';
 
 // exclude the test directory from code coverage reports
-PHPUnit_Util_Filter::addDirectoryToFilter('./');
+if (version_compare(PHPUnit_Runner_Version::id(), '3.5.0') >= 0)
+{
+	PHP_CodeCoverage_Filter::getInstance()->addDirectoryToBlacklist('./');
+}
+else
+{
+	PHPUnit_Util_Filter::addDirectoryToFilter('./');
+}
 
 class phpbb_all_tests
 {
diff --git a/tests/dbal/dbal.php b/tests/dbal/dbal.php
index 1cce891ca9..663323ad61 100644
--- a/tests/dbal/dbal.php
+++ b/tests/dbal/dbal.php
@@ -244,8 +244,9 @@ class phpbb_dbal_test extends phpbb_database_test_case
 				array('username_clean' => 'bertie'))),
 
 			// These here would throw errors and therefor $result should be false.
-			array('user_id', array(), false, false, false, true),
-			array('user_id', array(), true, false, false, true),
+			// Removing for now because SQLite accepts empty IN() syntax
+			/*array('user_id', array(), false, false, false, true),
+			array('user_id', array(), true, false, false, true),*/
 		);
 	}
 
diff --git a/tests/test_framework/framework.php b/tests/test_framework/framework.php
index abdcd1ad79..3a11cc6df9 100644
--- a/tests/test_framework/framework.php
+++ b/tests/test_framework/framework.php
@@ -32,8 +32,12 @@ if (version_compare(PHPUnit_Runner_Version::id(), '3.3.0', '<'))
 	trigger_error('PHPUnit >= 3.3.0 required');
 }
 
-require_once 'PHPUnit/Framework.php';
-require_once 'PHPUnit/Extensions/Database/TestCase.php';
+if (version_compare(PHPUnit_Runner_Version::id(), '3.5.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
index d558874c6f..f6bf420ebc 100644
--- a/tests/test_framework/phpbb_database_test_case.php
+++ b/tests/test_framework/phpbb_database_test_case.php
@@ -19,7 +19,7 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 		}
 	}
 
-	function get_dbms_data($dbms)
+	public function get_dbms_data($dbms)
 	{
 		$available_dbms = array(
 			'firebird'	=> array(
@@ -65,7 +65,7 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 			'sqlite'		=> array(
 				'SCHEMA'		=> 'sqlite',
 				'DELIM'			=> ';',
-				'PDO'			=> 'sqlite',
+				'PDO'			=> 'sqlite2',
 			),
 		);
 
@@ -79,10 +79,13 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 		}
 	}
 
-	function split_sql_file($sql, $delimiter)
+	// NOTE: This function is not the same as split_sql_file from functions_install
+	public function split_sql_file($sql, $dbms)
 	{
+		$dbms_data = $this->get_dbms_data($dbms);
+
 		$sql = str_replace("\r" , '', $sql);
-		$data = preg_split('/' . preg_quote($delimiter, '/') . '$/m', $sql);
+		$data = preg_split('/' . preg_quote($dbms_data['DELIM'], '/') . '$/m', $sql);
 
 		$data = array_map('trim', $data);
 
@@ -94,6 +97,15 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 			unset($data[key($data)]);
 		}
 
+		if ($dbms == 'sqlite')
+		{
+			// trim # off query to satisfy sqlite
+			foreach ($data as $i => $query)
+			{
+				$data[$i] = preg_replace('/^#.*$/m', "\n", $query);
+			}
+		}
+
 		return $data;
 	}
 
@@ -108,21 +120,42 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 
 		if ($already_connected)
 		{
-			$pdo = new PDO($dbms_data['PDO'] . ':host=' . $database_config['dbhost'] . ';dbname=' . $database_config['dbname'], $database_config['dbuser'], $database_config['dbpasswd']);
+			if ($database_config['dbms'] == 'sqlite')
+			{
+				$pdo = new PDO($dbms_data['PDO'] . ':' . $database_config['dbhost']);
+			}
+			else
+			{
+				$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
+			if ($database_config['dbms'] == 'sqlite')
 			{
-				$pdo->exec('DROP DATABASE ' . $database_config['dbname']);
+				// delete existing database
+				if (file_exists($database_config['dbhost']))
+				{
+					unlink($database_config['dbhost']);
+				}
+
+				$pdo = new PDO($dbms_data['PDO'] . ':' . $database_config['dbhost']);
 			}
-			catch (PDOException $e){} // ignore non existent db
+			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->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']);
+			}
 
-			$pdo = new PDO($dbms_data['PDO'] . ':host=' . $database_config['dbhost'] . ';dbname=' . $database_config['dbname'], $database_config['dbuser'], $database_config['dbpasswd']);
+			// good for debug
+			// $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 
 			if ($database_config['dbms'] == 'mysql')
 			{
@@ -141,7 +174,7 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 				unset($row, $sth);
 			}
 
-			$sql_query = $this->split_sql_file(file_get_contents("../phpBB/install/schemas/{$dbms_data['SCHEMA']}_schema.sql"), $dbms_data['DELIM']);
+			$sql_query = $this->split_sql_file(file_get_contents("../phpBB/install/schemas/{$dbms_data['SCHEMA']}_schema.sql"), $database_config['dbms']);
 
 			foreach ($sql_query as $sql)
 			{
diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index 0c5932e1ad..7c026e496e 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -22,7 +22,32 @@ class phpbb_test_case_helpers
 	{
 		static $show_error = true;
 
-		if (!file_exists('test_config.php'))
+		if (file_exists('test_config.php'))
+		{
+			include('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'	=> 'phpbb_unit_tests.sqlite2', // filename
+				'dbport'	=> '',
+				'dbname'	=> '',
+				'dbuser'	=> '',
+				'dbpasswd'	=> '',
+			);
+		}
+		else
 		{
 			if ($show_error)
 			{
@@ -46,16 +71,6 @@ class phpbb_test_case_helpers
 
 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()