From 90a957ad26f52e26c3979464c5ac15b1fd0fcc28 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 21 Jul 2012 17:43:43 +0200
Subject: [ticket/11015] Make DBAL classes autoloadable

PHPBB3-11015

This allows us to just create the object without having to include the
driver first. However, it also means that users must specify the full
class name in config.php
---
 tests/test_framework/phpbb_database_test_case.php  |  7 ++--
 .../phpbb_database_test_connection_manager.php     | 44 +++++++++++-----------
 .../test_framework/phpbb_functional_test_case.php  |  8 +---
 tests/test_framework/phpbb_test_case_helpers.php   |  2 +-
 4 files changed, 28 insertions(+), 33 deletions(-)

(limited to 'tests/test_framework')

diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php
index bb86df0ef0..abc3c8d7a3 100644
--- a/tests/test_framework/phpbb_database_test_case.php
+++ b/tests/test_framework/phpbb_database_test_case.php
@@ -33,7 +33,7 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 		$db_config = $this->get_database_config();
 
 		// Firebird requires table and column names to be uppercase
-		if ($db_config['dbms'] == 'firebird')
+		if ($db_config['dbms'] == 'phpbb_db_driver_firebird')
 		{
 			$xml_data = file_get_contents($path);
 			$xml_data = preg_replace_callback('/(?:(<table name="))([a-z_]+)(?:(">))/', 'phpbb_database_test_case::to_upper', $xml_data);
@@ -100,9 +100,8 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 
 		$config = $this->get_database_config();
 
-		require_once dirname(__FILE__) . '/../../phpBB/includes/db/' . $config['dbms'] . '.php';
-		$dbal = 'dbal_' . $config['dbms'];
-		$db = new $dbal();
+		$dbms = $config['dbms'];
+		$db = new $dbms();
 		$db->sql_connect($config['dbhost'], $config['dbuser'], $config['dbpasswd'], $config['dbname'], $config['dbport']);
 
 		return $db;
diff --git a/tests/test_framework/phpbb_database_test_connection_manager.php b/tests/test_framework/phpbb_database_test_connection_manager.php
index 25e0972f42..db772496a0 100644
--- a/tests/test_framework/phpbb_database_test_connection_manager.php
+++ b/tests/test_framework/phpbb_database_test_connection_manager.php
@@ -108,7 +108,7 @@ class phpbb_database_test_connection_manager
 
 		// 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'))
+		if (!empty($this->config['custom_dsn']) && ($this->config['dbms'] == 'phpbb_db_driver_mssql' || $this->config['dbms'] == 'phpbb_db_driver_firebird'))
 		{
 			$dsn = 'odbc:' . $this->config['custom_dsn'];
 		}
@@ -117,12 +117,12 @@ class phpbb_database_test_connection_manager
 		{
 			switch ($this->config['dbms'])
 			{
-				case 'mssql':
-				case 'mssql_odbc':
+				case 'phpbb_db_driver_mssql':
+				case 'phpbb_db_driver_mssql_odbc':
 					$this->pdo = new phpbb_database_connection_odbc_pdo_wrapper('mssql', 0, $dsn, $this->config['dbuser'], $this->config['dbpasswd']);
 				break;
 
-				case 'firebird':
+				case 'phpbb_db_driver_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']);
@@ -165,14 +165,14 @@ class phpbb_database_test_connection_manager
 	{
 		switch ($this->config['dbms'])
 		{
-			case 'sqlite':
+			case 'phpbb_db_driver_sqlite':
 				if (file_exists($this->config['dbhost']))
 				{
 					unlink($this->config['dbhost']);
 				}
 			break;
 
-			case 'firebird':
+			case 'phpbb_db_driver_firebird':
 				$this->connect();
 				// Drop all of the tables
 				foreach ($this->get_tables() as $table)
@@ -182,7 +182,7 @@ class phpbb_database_test_connection_manager
 				$this->purge_extras();
 			break;
 
-			case 'oracle':
+			case 'phpbb_db_driver_oracle':
 				$this->connect();
 				// Drop all of the tables
 				foreach ($this->get_tables() as $table)
@@ -232,39 +232,39 @@ class phpbb_database_test_connection_manager
 
 		switch ($this->config['dbms'])
 		{
-			case 'mysql':
-			case 'mysql4':
-			case 'mysqli':
+			case 'phpbb_db_driver_mysql':
+			case 'phpbb_db_driver_mysql4':
+			case 'phpbb_db_driver_mysqli':
 				$sql = 'SHOW TABLES';
 			break;
 
-			case 'sqlite':
+			case 'phpbb_db_driver_sqlite':
 				$sql = 'SELECT name
 					FROM sqlite_master
 					WHERE type = "table"';
 			break;
 
-			case 'mssql':
-			case 'mssql_odbc':
-			case 'mssqlnative':
+			case 'phpbb_db_driver_mssql':
+			case 'phpbb_db_driver_mssql_odbc':
+			case 'phpbb_db_driver_mssqlnative':
 				$sql = "SELECT name
 					FROM sysobjects
 					WHERE type='U'";
 			break;
 
-			case 'postgres':
+			case 'phpbb_db_driver_postgres':
 				$sql = 'SELECT relname
 					FROM pg_stat_user_tables';
 			break;
 
-			case 'firebird':
+			case 'phpbb_db_driver_firebird':
 				$sql = 'SELECT rdb$relation_name
 					FROM rdb$relations
 					WHERE rdb$view_source is null
 						AND rdb$system_flag = 0';
 			break;
 
-			case 'oracle':
+			case 'phpbb_db_driver_oracle':
 				$sql = 'SELECT table_name
 					FROM USER_TABLES';
 			break;
@@ -299,8 +299,8 @@ class phpbb_database_test_connection_manager
 	protected function load_schema_from_file($directory)
 	{
 		$schema = $this->dbms['SCHEMA'];
-		
-		if ($this->config['dbms'] == 'mysql')
+
+		if ($this->config['dbms'] == 'phpbb_db_driver_mysql')
 		{
 			$sth = $this->pdo->query('SELECT VERSION() AS version');
 			$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -319,7 +319,7 @@ class phpbb_database_test_connection_manager
 
 		$queries = file_get_contents($filename);
 		$sql = phpbb_remove_comments($queries);
-		
+
 		$sql = split_sql_file($sql, $this->dbms['DELIM']);
 
 		foreach ($sql as $query)
@@ -403,7 +403,7 @@ class phpbb_database_test_connection_manager
 
 		switch ($this->config['dbms'])
 		{
-			case 'firebird':
+			case 'phpbb_db_driver_firebird':
 				$sql = 'SELECT RDB$GENERATOR_NAME
 					FROM RDB$GENERATORS
 					WHERE RDB$SYSTEM_FLAG = 0';
@@ -415,7 +415,7 @@ class phpbb_database_test_connection_manager
 				}
 			break;
 
-			case 'oracle':
+			case 'phpbb_db_driver_oracle':
 				$sql = 'SELECT sequence_name
 					FROM USER_SEQUENCES';
 				$result = $this->pdo->query($sql);
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index c042d75811..ce0042d538 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -87,12 +87,8 @@ class phpbb_functional_test_case extends phpbb_test_case
 		// 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();
+			$dbms = self::$config['dbms'];
+			$this->db = new $dbms();
 			$this->db->sql_connect(self::$config['dbhost'], self::$config['dbuser'], self::$config['dbpasswd'], self::$config['dbname'], self::$config['dbport']);
 		}
 		return $this->db;
diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index 46feef550a..5667aa6ca2 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -54,7 +54,7 @@ class phpbb_test_case_helpers
 		if (extension_loaded('sqlite') && version_compare(PHPUnit_Runner_Version::id(), '3.4.15', '>='))
 		{
 			$config = array_merge($config, array(
-				'dbms'		=> 'sqlite',
+				'dbms'		=> 'phpbb_db_driver_sqlite',
 				'dbhost'	=> dirname(__FILE__) . '/../phpbb_unit_tests.sqlite2', // filename
 				'dbport'	=> '',
 				'dbname'	=> '',
-- 
cgit v1.2.1


From d6cca4e2c0719da35c75d3fff68f4a46255fe352 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 21 Jul 2012 19:35:39 +0200
Subject: [ticket/11015] Fix connection manager db driver selection

PHPBB3-11015
---
 .../phpbb_database_test_connection_manager.php         | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'tests/test_framework')

diff --git a/tests/test_framework/phpbb_database_test_connection_manager.php b/tests/test_framework/phpbb_database_test_connection_manager.php
index db772496a0..82da5fe4c3 100644
--- a/tests/test_framework/phpbb_database_test_connection_manager.php
+++ b/tests/test_framework/phpbb_database_test_connection_manager.php
@@ -334,47 +334,47 @@ class phpbb_database_test_connection_manager
 	protected function get_dbms_data($dbms)
 	{
 		$available_dbms = array(
-			'firebird'	=> array(
+			'phpbb_db_driver_firebird'	=> array(
 				'SCHEMA'		=> 'firebird',
 				'DELIM'			=> ';;',
 				'PDO'			=> 'firebird',
 			),
-			'mysqli'	=> array(
+			'phpbb_db_driver_mysqli'	=> array(
 				'SCHEMA'		=> 'mysql_41',
 				'DELIM'			=> ';',
 				'PDO'			=> 'mysql',
 			),
-			'mysql'		=> array(
+			'phpbb_db_driver_mysql'		=> array(
 				'SCHEMA'		=> 'mysql',
 				'DELIM'			=> ';',
 				'PDO'			=> 'mysql',
 			),
-			'mssql'		=> array(
+			'phpbb_db_driver_mssql'		=> array(
 				'SCHEMA'		=> 'mssql',
 				'DELIM'			=> 'GO',
 				'PDO'			=> 'odbc',
 			),
-			'mssql_odbc'=>	array(
+			'phpbb_db_driver_mssql_odbc'=>	array(
 				'SCHEMA'		=> 'mssql',
 				'DELIM'			=> 'GO',
 				'PDO'			=> 'odbc',
 			),
-			'mssqlnative'		=> array(
+			'phpbb_db_driver_mssqlnative'		=> array(
 				'SCHEMA'		=> 'mssql',
 				'DELIM'			=> 'GO',
 				'PDO'			=> 'sqlsrv',
 			),
-			'oracle'	=>	array(
+			'phpbb_db_driver_oracle'	=>	array(
 				'SCHEMA'		=> 'oracle',
 				'DELIM'			=> '/',
 				'PDO'			=> 'oci',
 			),
-			'postgres' => array(
+			'phpbb_db_driver_postgres' => array(
 				'SCHEMA'		=> 'postgres',
 				'DELIM'			=> ';',
 				'PDO'			=> 'pgsql',
 			),
-			'sqlite'		=> array(
+			'phpbb_db_driver_sqlite'		=> array(
 				'SCHEMA'		=> 'sqlite',
 				'DELIM'			=> ';',
 				'PDO'			=> 'sqlite2',
-- 
cgit v1.2.1


From 195014867ae84fe04ec01c913e38bf1d435590f7 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 10 Nov 2012 11:25:22 +0100
Subject: [ticket/11183] Remove $load_extensions and weird dl() calls

PHPBB3-11183
---
 tests/test_framework/phpbb_functional_test_case.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/test_framework')

diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index d002615e8c..2d44bfc359 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -199,7 +199,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 		$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));
+		file_put_contents($phpbb_root_path . "config.$phpEx", phpbb_create_config_file_data($data, self::$config['dbms'], true, true));
 
 		$this->do_request('final', $data);
 		copy($phpbb_root_path . "config.$phpEx", $phpbb_root_path . "config_test.$phpEx");
-- 
cgit v1.2.1


From f7f21fa6927eab5fcff7d51d3618d2c48bd4e29d Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 10 Nov 2012 14:34:52 +0100
Subject: [ticket/11186] Database unit tests fail on windows using sqlite2

The problem is, that we try to recreate the db and reconnect to it, while the
old connection is still hold. To resolve this, we just drop all tables and
recreate the tables instead of the hole db.

PHPBB3-11186
---
 tests/test_framework/phpbb_database_test_connection_manager.php | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'tests/test_framework')

diff --git a/tests/test_framework/phpbb_database_test_connection_manager.php b/tests/test_framework/phpbb_database_test_connection_manager.php
index 25e0972f42..a43215bcf2 100644
--- a/tests/test_framework/phpbb_database_test_connection_manager.php
+++ b/tests/test_framework/phpbb_database_test_connection_manager.php
@@ -166,12 +166,6 @@ class phpbb_database_test_connection_manager
 		switch ($this->config['dbms'])
 		{
 			case 'sqlite':
-				if (file_exists($this->config['dbhost']))
-				{
-					unlink($this->config['dbhost']);
-				}
-			break;
-
 			case 'firebird':
 				$this->connect();
 				// Drop all of the tables
-- 
cgit v1.2.1


From c73293d82673631da61acffeef31a93bcca139dd Mon Sep 17 00:00:00 2001
From: Fyorl <gaelreth@gmail.com>
Date: Sat, 10 Nov 2012 13:46:40 +0000
Subject: [ticket/11187] Added a blank array to fix errors in functional tests

PHPBB3-11187
---
 tests/test_framework/phpbb_functional_test_case.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/test_framework')

diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index d002615e8c..d0bbf85960 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -125,7 +125,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 		{
 			$this->extension_manager = new phpbb_extension_manager(
 				$this->get_db(),
-				new phpbb_config(),
+				new phpbb_config(array()),
 				self::$config['table_prefix'] . 'ext',
 				$phpbb_root_path,
 				".$phpEx",
-- 
cgit v1.2.1


From e3b0e1a8a23b5627388df2b57ef82737c01dd1a1 Mon Sep 17 00:00:00 2001
From: Fyorl <gaelreth@gmail.com>
Date: Sun, 11 Nov 2012 10:44:47 +0000
Subject: [ticket/11190] Functional tests purge cache before running.

Added functions to get and purge cache to functional framework also.

PHPBB3-11190
---
 .../test_framework/phpbb_functional_test_case.php  | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'tests/test_framework')

diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index d35913e415..bd248a662e 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -9,11 +9,14 @@
 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;
 
 	/**
 	* Session ID for current test's session (each test makes its own)
@@ -47,6 +50,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 		// that were added in other tests are gone
 		$this->lang = array();
 		$this->add_lang('common');
+		$this->purge_cache();
 	}
 
 	public function request($method, $path)
@@ -61,6 +65,25 @@ class phpbb_functional_test_case extends phpbb_test_case
 	{
 	}
 
+	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);
-- 
cgit v1.2.1


From db0cc74af073ede415b1ff21556a31f01ecfbe8f Mon Sep 17 00:00:00 2001
From: Fyorl <gaelreth@gmail.com>
Date: Sun, 11 Nov 2012 10:51:53 +0000
Subject: [ticket/11190-develop] Functional tests purge cache before running.

PHPBB3-11190
---
 tests/test_framework/phpbb_functional_test_case.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tests/test_framework')

diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 41edb3e6af..eb2b497708 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -51,6 +51,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 		// that were added in other tests are gone
 		$this->lang = array();
 		$this->add_lang('common');
+		$this->purge_cache();
 	}
 
 	public function request($method, $path)
-- 
cgit v1.2.1


From 4ab178f3efd2ec497081bc1b3e57e4566d2eee6d Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 15 Nov 2012 08:19:40 -0500
Subject: [ticket/11202] Add a heuristic function to check for response
 success.

This tries to account for php sending fatal errors with 200 status code.

PHPBB3-11202
---
 tests/test_framework/phpbb_functional_test_case.php | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'tests/test_framework')

diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index d35913e415..09f52effec 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -182,7 +182,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 		$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);
 		{
@@ -229,4 +229,19 @@ class phpbb_functional_test_case extends phpbb_test_case
 
 		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.
+	*
+	* @param string $message Optional failure message
+	*/
+	public function assert_response_success($message = null)
+	{
+		$this->assertEquals(200, $this->client->getResponse()->getStatus());
+		$content = $this->client->getResponse()->getContent();
+		$this->assertNotContains('Fatal error:', $content);
+	}
 }
-- 
cgit v1.2.1


From af7ab2d3ac287db1a2c9ed623e21393cb429203f Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 15 Nov 2012 08:40:29 -0500
Subject: [ticket/11202] Custom message does not make sense here, delete it.

PHPBB3-11202
---
 tests/test_framework/phpbb_functional_test_case.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests/test_framework')

diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 09f52effec..de04783bce 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -236,9 +236,9 @@ class phpbb_functional_test_case extends phpbb_test_case
 	* When php decides to die with a fatal error, it still sends 200 OK
 	* status code. This assertion tries to catch that.
 	*
-	* @param string $message Optional failure message
+	* @return null
 	*/
-	public function assert_response_success($message = null)
+	public function assert_response_success()
 	{
 		$this->assertEquals(200, $this->client->getResponse()->getStatus());
 		$content = $this->client->getResponse()->getContent();
-- 
cgit v1.2.1


From ec06d5c5d9f23b6419f048b885b689aa0ab4b351 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 15 Nov 2012 08:18:55 -0500
Subject: [ticket/11204] Reindent.

PHPBB3-11204
---
 .../test_framework/phpbb_functional_test_case.php  | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'tests/test_framework')

diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 8a329d43b1..16e1ccaff9 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -332,17 +332,17 @@ class phpbb_functional_test_case extends phpbb_test_case
 		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);
-    }
+	/**
+	 * 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);
+	}
 
 	/**
 	* Heuristic function to check that the response is success.
-- 
cgit v1.2.1


From a23eebdb7bb60c4b910357c1e948b97d48071d6a Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Fri, 16 Nov 2012 01:09:17 +0100
Subject: [tracker/11015] Prepend phpbb_db_driver_ for PHPBB_TEST_DBMS

PHPBB3-11015
---
 tests/test_framework/phpbb_test_case_helpers.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/test_framework')

diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index 0f4f7fbf34..5c1200657d 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -96,7 +96,7 @@ class phpbb_test_case_helpers
 		if (isset($_SERVER['PHPBB_TEST_DBMS']))
 		{
 			$config = array_merge($config, array(
-				'dbms'		=> isset($_SERVER['PHPBB_TEST_DBMS']) ? $_SERVER['PHPBB_TEST_DBMS'] : '',
+				'dbms'		=> isset($_SERVER['PHPBB_TEST_DBMS']) ? 'phpbb_db_driver_' . $_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'] : '',
-- 
cgit v1.2.1


From 8f8a7f76374679d2f893245c1f607a3b2db56a9a Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Fri, 16 Nov 2012 01:50:30 +0100
Subject: [ticket/11015] Allow full dbms class name in tests/test_config.php

PHPBB3-11015
---
 tests/test_framework/phpbb_test_case_helpers.php | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

(limited to 'tests/test_framework')

diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index 5c1200657d..9bbdcff440 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -78,7 +78,7 @@ class phpbb_test_case_helpers
 			include($test_config);
 
 			$config = array_merge($config, array(
-				'dbms'		=> 'phpbb_db_driver_' . $dbms,
+				'dbms'		=> $this->convert_30_dbms($dbms),
 				'dbhost'	=> $dbhost,
 				'dbport'	=> $dbport,
 				'dbname'	=> $dbname,
@@ -96,7 +96,7 @@ class phpbb_test_case_helpers
 		if (isset($_SERVER['PHPBB_TEST_DBMS']))
 		{
 			$config = array_merge($config, array(
-				'dbms'		=> isset($_SERVER['PHPBB_TEST_DBMS']) ? 'phpbb_db_driver_' . $_SERVER['PHPBB_TEST_DBMS'] : '',
+				'dbms'		=> isset($_SERVER['PHPBB_TEST_DBMS']) ? $this->convert_30_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'] : '',
@@ -223,4 +223,20 @@ class phpbb_test_case_helpers
 			}
 		}
 	}
+
+	/**
+	* Convert 3.0 dbms to 3.1 db driver class name
+	*
+	* @param string $dbms dbms parameter
+	* @return db driver class
+	*/
+	protected function convert_30_dbms($dbms)
+	{
+		if (!preg_match('#^phpbb_db_driver_#', $dbms))
+		{
+			return 'phpbb_db_driver_'.$dbms;
+		}
+
+		return $dbms;
+	}
 }
-- 
cgit v1.2.1


From 5bc0f4b3d49ed1bea45464beece42906646eb026 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 17 Nov 2012 00:24:32 +0100
Subject: [ticket/11015] Move db driver class name fixing to function

PHPBB3-11015
---
 tests/test_framework/phpbb_test_case_helpers.php | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

(limited to 'tests/test_framework')

diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index 9bbdcff440..96a546e538 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -78,7 +78,7 @@ class phpbb_test_case_helpers
 			include($test_config);
 
 			$config = array_merge($config, array(
-				'dbms'		=> $this->convert_30_dbms($dbms),
+				'dbms'		=> phpbb_convert_30_dbms_to_31($dbms),
 				'dbhost'	=> $dbhost,
 				'dbport'	=> $dbport,
 				'dbname'	=> $dbname,
@@ -96,7 +96,7 @@ class phpbb_test_case_helpers
 		if (isset($_SERVER['PHPBB_TEST_DBMS']))
 		{
 			$config = array_merge($config, array(
-				'dbms'		=> isset($_SERVER['PHPBB_TEST_DBMS']) ? $this->convert_30_dbms($_SERVER['PHPBB_TEST_DBMS']) : '',
+				'dbms'		=> isset($_SERVER['PHPBB_TEST_DBMS']) ? phpbb_convert_30_dbms_to_31($_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'] : '',
@@ -223,20 +223,4 @@ class phpbb_test_case_helpers
 			}
 		}
 	}
-
-	/**
-	* Convert 3.0 dbms to 3.1 db driver class name
-	*
-	* @param string $dbms dbms parameter
-	* @return db driver class
-	*/
-	protected function convert_30_dbms($dbms)
-	{
-		if (!preg_match('#^phpbb_db_driver_#', $dbms))
-		{
-			return 'phpbb_db_driver_'.$dbms;
-		}
-
-		return $dbms;
-	}
 }
-- 
cgit v1.2.1


From 41a95d2c646aba8d6a66ee046c532a51a9022784 Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Sun, 18 Nov 2012 20:38:58 -0600
Subject: [ticket/11219] Update sequence values after loading fixtures

If a value is provide for an auto_increment type of column, certain DBMSes
do not update their internal sequencers. If a row is inserted later, it can
be given an ID that is already in use, resulting in an error. The database
test cases now resynchronise the sequencers before the tests are run.

PHPBB3-11219
---
 tests/test_framework/phpbb_database_test_case.php  |  10 ++
 .../phpbb_database_test_connection_manager.php     | 129 +++++++++++++++++++++
 2 files changed, 139 insertions(+)

(limited to 'tests/test_framework')

diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php
index 75a3c0944b..0916679108 100644
--- a/tests/test_framework/phpbb_database_test_case.php
+++ b/tests/test_framework/phpbb_database_test_case.php
@@ -28,6 +28,16 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 		);
 	}
 
+	protected function setUp()
+	{
+		parent::setUp();
+
+		$config = $this->get_database_config();
+		$manager = $this->create_connection_manager($config);
+		$manager->connect();
+		$manager->post_setup_synchronisation();
+	}
+
 	public function createXMLDataSet($path)
 	{
 		$db_config = $this->get_database_config();
diff --git a/tests/test_framework/phpbb_database_test_connection_manager.php b/tests/test_framework/phpbb_database_test_connection_manager.php
index a43215bcf2..cae1720587 100644
--- a/tests/test_framework/phpbb_database_test_connection_manager.php
+++ b/tests/test_framework/phpbb_database_test_connection_manager.php
@@ -426,4 +426,133 @@ class phpbb_database_test_connection_manager
 			$this->pdo->exec($query);
 		}
 	}
+
+	/**
+	* Performs synchronisations on the database after a fixture has been loaded
+	*/
+	public function post_setup_synchronisation()
+	{
+		$this->ensure_connected(__METHOD__);
+		$queries = array();
+
+		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
+					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)
+					WHERE d.referenced_type = 'SEQUENCE'
+						AND d.type = 'TRIGGER'";
+				$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']}) + 1 FROM {$row['TABLE_NAME']}";
+
+					$max_result = $this->pdo->query($sql);
+					$max_row = $max_result->fetch(PDO::FETCH_NUM);
+
+					if (!$max_row)
+					{
+						continue;
+					}
+
+					$maxval = current($max_row);
+					if ($maxval == null)
+					{
+						$maxval = 1;
+					}
+
+					// Get the sequence's next value
+					$sql = "SELECT {$row['SEQUENCE_NAME']}.nextval FROM dual";
+					try
+					{
+						$nextval_result = $this->pdo->query($sql);
+					}
+					catch (PDOException $e)
+					{
+						// If we catch an exception here it's because the sequencer hasn't been initialized yet.
+						// If the table hasn't been used, then there's nothing to do.
+						continue;
+					}
+					$nextval_row = $nextval_result->fetch(PDO::FETCH_NUM);
+
+					if ($nextval_row)
+					{
+						$nextval = current($nextval_row);
+
+						// Make sure we aren't setting the new increment to zero.
+						if ($maxval != $nextval)
+						{
+							// This is a multi-step process. First we need to get the sequence back into position.
+							// That means either advancing it or moving it backwards. Sequences have a minimum value
+							// of 1, so you cannot go past that. Once the offset it determined, you have to request
+							// the next sequence value to actually move the pointer into position. So if you're at 21
+							// and need to be back at 1, set the incrementer to -20. When it's requested, it'll give
+							// you 1. Then we have to set the increment amount back to 1 to resume normal behavior.
+
+							// Move the sequence to the correct position.
+							$sql = "ALTER SEQUENCE {$row['SEQUENCE_NAME']} INCREMENT BY " . ($maxval - $nextval);
+							$this->pdo->exec($sql);
+
+							// Select the next value to actually update the sequence values
+							$sql = "SELECT {$row['SEQUENCE_NAME']}.nextval FROM dual";
+							$this->pdo->query($sql);
+
+							// Reset the sequence's increment amount
+							$sql = "ALTER SEQUENCE {$row['SEQUENCE_NAME']} INCREMENT BY 1";
+							$this->pdo->exec($sql);
+						}
+					}
+				}
+			break;
+
+			case 'postgres':
+				// First get the sequences
+				$sequences = array();
+				$sql = "SELECT relname FROM pg_class WHERE relkind = 'S'";
+				$result = $this->pdo->query($sql);
+				while ($row = $result->fetch(PDO::FETCH_ASSOC))
+				{
+					$sequences[] = $row['relname'];
+				}
+
+				// Now get the name of the column using it
+				foreach ($sequences as $sequence)
+				{
+					$table = str_replace('_seq', '', $sequence);
+					$sql = "SELECT column_name FROM information_schema.columns
+						WHERE table_name = '$table'
+						AND column_default = 'nextval(''$sequence''::regclass)'";
+					$result = $this->pdo->query($sql);
+					$row = $result->fetch(PDO::FETCH_ASSOC);
+
+					// Finally, set the new sequence value
+					if ($row)
+					{
+						$column = $row['column_name'];
+
+						// Get the old value if it exists, or use 1 if it doesn't
+						$sql = "SELECT COALESCE((SELECT MAX({$column}) + 1 FROM {$table}), 1) AS val";
+						$result = $this->pdo->query($sql);
+						$row = $result->fetch(PDO::FETCH_ASSOC);
+
+						if ($row)
+						{
+							// The last parameter is false so that the system doesn't increment it again
+							$queries[] = "SELECT SETVAL('{$sequence}', {$row['val']}, false)";
+						}
+					}
+				}
+			break;
+		}
+
+		foreach ($queries as $query)
+		{
+			$this->pdo->exec($query);
+		}
+	}
 }
-- 
cgit v1.2.1


From 1dff6d1bf988bb0d11a393fad0c0d0183366a5c9 Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Tue, 20 Nov 2012 04:40:06 -0600
Subject: [ticket/11219] Recreate Oracle sequences instead of altering them

The previous method would always leave a gap between the last value and the
new one due to how you have to update the sequence values. To remove gaps in
all situations, the options are to alter the USER_SEQUENCES table or just
drop the sequence and recreate it. The prior requires elevated priveleges
and the latter can break attached objects. Since we don't attach objects to
the sequences, we won't have any problems doing it for the tests.

PHPBB3-11219
---
 .../phpbb_database_test_connection_manager.php     | 71 ++++++----------------
 1 file changed, 18 insertions(+), 53 deletions(-)

(limited to 'tests/test_framework')

diff --git a/tests/test_framework/phpbb_database_test_connection_manager.php b/tests/test_framework/phpbb_database_test_connection_manager.php
index cae1720587..e79a764e1d 100644
--- a/tests/test_framework/phpbb_database_test_connection_manager.php
+++ b/tests/test_framework/phpbb_database_test_connection_manager.php
@@ -439,10 +439,11 @@ class phpbb_database_test_connection_manager
 		{
 			case 'oracle':
 				// Get all of the information about the sequences
-				$sql = "SELECT t.table_name, tc.column_name, d.referenced_name as sequence_name
+				$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_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'";
 				$result = $this->pdo->query($sql);
@@ -450,63 +451,27 @@ class phpbb_database_test_connection_manager
 				while ($row = $result->fetch(PDO::FETCH_ASSOC))
 				{
 					// Get the current max value of the table
-					$sql = "SELECT MAX({$row['COLUMN_NAME']}) + 1 FROM {$row['TABLE_NAME']}";
-
+					$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_NUM);
+					$max_row = $max_result->fetch(PDO::FETCH_ASSOC);
 
 					if (!$max_row)
 					{
 						continue;
 					}
 
-					$maxval = current($max_row);
-					if ($maxval == null)
-					{
-						$maxval = 1;
-					}
-
-					// Get the sequence's next value
-					$sql = "SELECT {$row['SEQUENCE_NAME']}.nextval FROM dual";
-					try
-					{
-						$nextval_result = $this->pdo->query($sql);
-					}
-					catch (PDOException $e)
-					{
-						// If we catch an exception here it's because the sequencer hasn't been initialized yet.
-						// If the table hasn't been used, then there's nothing to do.
-						continue;
-					}
-					$nextval_row = $nextval_result->fetch(PDO::FETCH_NUM);
-
-					if ($nextval_row)
-					{
-						$nextval = current($nextval_row);
-
-						// Make sure we aren't setting the new increment to zero.
-						if ($maxval != $nextval)
-						{
-							// This is a multi-step process. First we need to get the sequence back into position.
-							// That means either advancing it or moving it backwards. Sequences have a minimum value
-							// of 1, so you cannot go past that. Once the offset it determined, you have to request
-							// the next sequence value to actually move the pointer into position. So if you're at 21
-							// and need to be back at 1, set the incrementer to -20. When it's requested, it'll give
-							// you 1. Then we have to set the increment amount back to 1 to resume normal behavior.
-
-							// Move the sequence to the correct position.
-							$sql = "ALTER SEQUENCE {$row['SEQUENCE_NAME']} INCREMENT BY " . ($maxval - $nextval);
-							$this->pdo->exec($sql);
-
-							// Select the next value to actually update the sequence values
-							$sql = "SELECT {$row['SEQUENCE_NAME']}.nextval FROM dual";
-							$this->pdo->query($sql);
-
-							// Reset the sequence's increment amount
-							$sql = "ALTER SEQUENCE {$row['SEQUENCE_NAME']} INCREMENT BY 1";
-							$this->pdo->exec($sql);
-						}
-					}
+					$maxval = (int)$max_row['MAX'];
+					$maxval++;
+
+					// 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 effct.
+					// 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 $maxval";
 				}
 			break;
 
-- 
cgit v1.2.1


From 3ed4fc437e2a88638d705b8f4cab23eacf39fe3c Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 27 Nov 2012 08:08:34 -0500
Subject: [ticket/11174] Move assertion definition to base class.

PHPBB3-11174
---
 tests/test_framework/phpbb_database_test_case.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'tests/test_framework')

diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php
index 75a3c0944b..514619687a 100644
--- a/tests/test_framework/phpbb_database_test_case.php
+++ b/tests/test_framework/phpbb_database_test_case.php
@@ -141,4 +141,20 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 	{
 		return $matches[1] . strtoupper($matches[2]) . $matches[3];
 	}
+
+	public function assert_array_content_equals($one, $two)
+	{
+		// http://stackoverflow.com/questions/3838288/phpunit-assert-two-arrays-are-equal-but-order-of-elements-not-important
+		// but one array_diff is not enough!
+		if (sizeof(array_diff($one, $two)) || sizeof(array_diff($two, $one)))
+		{
+			// get a nice error message
+			$this->assertEquals($one, $two);
+		}
+		else
+		{
+			// increase assertion count
+			$this->assertTrue(true);
+		}
+	}
 }
-- 
cgit v1.2.1


From a5900a6b1120a3d062e6d51579872bf940b13dcb Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 27 Nov 2012 08:18:39 -0500
Subject: [ticket/11174] Extract phpbb_search_test_case.

PHPBB3-11174
---
 tests/test_framework/phpbb_search_test_case.php | 28 +++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 tests/test_framework/phpbb_search_test_case.php

(limited to 'tests/test_framework')

diff --git a/tests/test_framework/phpbb_search_test_case.php b/tests/test_framework/phpbb_search_test_case.php
new file mode 100644
index 0000000000..8b378186df
--- /dev/null
+++ b/tests/test_framework/phpbb_search_test_case.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+abstract class phpbb_search_test_case extends phpbb_database_test_case
+{
+	static protected function get_search_wrapper($class)
+	{
+		$wrapped = $class . '_wrapper';
+		if (!class_exists($wrapped))
+		{
+			$code = "
+class $wrapped extends $class
+{
+	public function get_must_contain_ids() { return \$this->must_contain_ids; }
+	public function get_must_not_contain_ids() { return \$this->must_not_contain_ids; }
+}
+			";
+			eval($code);
+		}
+		return $wrapped;
+	}
+}
-- 
cgit v1.2.1


From 4d1486b08cd2f1e75527ed3b54664361934258a7 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 27 Nov 2012 08:22:43 -0500
Subject: [ticket/11174] Eliminate search wrapper copy pasting.

PHPBB3-11174
---
 tests/test_framework/phpbb_search_test_case.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tests/test_framework')

diff --git a/tests/test_framework/phpbb_search_test_case.php b/tests/test_framework/phpbb_search_test_case.php
index 8b378186df..418d352c17 100644
--- a/tests/test_framework/phpbb_search_test_case.php
+++ b/tests/test_framework/phpbb_search_test_case.php
@@ -19,6 +19,7 @@ class $wrapped extends $class
 {
 	public function get_must_contain_ids() { return \$this->must_contain_ids; }
 	public function get_must_not_contain_ids() { return \$this->must_not_contain_ids; }
+	public function get_split_words() { return \$this->split_words; }
 }
 			";
 			eval($code);
-- 
cgit v1.2.1


From c852044d6eecc0a652800b1661491c0f9c545054 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 1 Dec 2012 00:48:21 -0500
Subject: [ticket/9983] Add redis cache driver tests.

In order to not overwrite data in default redis store, at least
one of redis host or post must be explicitly specified.

Redis cache driver constructor has been modified to accept
host and port as parameters. This was not added to public API
as there are more parameters being passed via global constants.

PHPBB3-9983
---
 tests/test_framework/phpbb_test_case_helpers.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'tests/test_framework')

diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index d10645a732..b56a699d1c 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -91,6 +91,15 @@ class phpbb_test_case_helpers
 			{
 				$config['phpbb_functional_url'] = $phpbb_functional_url;
 			}
+
+			if (isset($redis_host))
+			{
+				$config['redis_host'] = $redis_host;
+			}
+			if (isset($redis_port))
+			{
+				$config['redis_port'] = $redis_port;
+			}
 		}
 
 		if (isset($_SERVER['PHPBB_TEST_DBMS']))
@@ -113,6 +122,16 @@ class phpbb_test_case_helpers
 			));
 		}
 
+		if (isset($_SERVER['PHPBB_TEST_REDIS_HOST']))
+		{
+			$config['redis_host'] = $_SERVER['PHPBB_TEST_REDIS_HOST'];
+		}
+
+		if (isset($_SERVER['PHPBB_TEST_REDIS_PORT']))
+		{
+			$config['redis_port'] = $_SERVER['PHPBB_TEST_REDIS_PORT'];
+		}
+
 		return $config;
 	}
 
-- 
cgit v1.2.1


From 720ef233b122d00ef9d2128c9a0a518ff017b0d7 Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Sat, 1 Dec 2012 22:34:03 -0600
Subject: [ticket/11219] Only update sequences that are affected by a fixture

PHPBB3-11219
---
 tests/test_framework/phpbb_database_test_case.php  | 18 ++++--
 .../phpbb_database_test_connection_manager.php     | 73 +++++++++++++---------
 2 files changed, 55 insertions(+), 36 deletions(-)

(limited to 'tests/test_framework')

diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php
index 0916679108..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);
@@ -32,10 +34,14 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 	{
 		parent::setUp();
 
-		$config = $this->get_database_config();
-		$manager = $this->create_connection_manager($config);
-		$manager->connect();
-		$manager->post_setup_synchronisation();
+		// 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)
@@ -57,7 +63,9 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 			$path = $meta_data['uri'];
 		}
 
-		return parent::createXMLDataSet($path);
+		$this->fixture_xml_data = parent::createXMLDataSet($path);
+
+		return $this->fixture_xml_data;
 	}
 
 	public function get_test_case_helpers()
diff --git a/tests/test_framework/phpbb_database_test_connection_manager.php b/tests/test_framework/phpbb_database_test_connection_manager.php
index e79a764e1d..97281a0812 100644
--- a/tests/test_framework/phpbb_database_test_connection_manager.php
+++ b/tests/test_framework/phpbb_database_test_connection_manager.php
@@ -429,12 +429,19 @@ class phpbb_database_test_connection_manager
 
 	/**
 	* Performs synchronisations on the database after a fixture has been loaded
+	*
+	* @param	PHPUnit_Extensions_Database_DataSet_XmlDataSet	$tables		Tables contained within the loaded fixture
+	*
+	* @return null
 	*/
-	public function post_setup_synchronisation()
+	public function post_setup_synchronisation($xmlDataSet)
 	{
 		$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'), $xmlDataSet->getTableNames());
+
 		switch ($this->config['dbms'])
 		{
 			case 'oracle':
@@ -445,7 +452,9 @@ class phpbb_database_test_connection_manager
 					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 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))
@@ -476,42 +485,44 @@ class phpbb_database_test_connection_manager
 			break;
 
 			case 'postgres':
-				// First get the sequences
-				$sequences = array();
-				$sql = "SELECT relname FROM pg_class WHERE relkind = 'S'";
+				// 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))
 				{
-					$sequences[] = $row['relname'];
-				}
+					// Get the columns used in the fixture for this table
+					$column_names = $xmlDataSet->getTableMetaData($row['table_name'])->getColumns();
 
-				// Now get the name of the column using it
-				foreach ($sequences as $sequence)
-				{
-					$table = str_replace('_seq', '', $sequence);
-					$sql = "SELECT column_name FROM information_schema.columns
-						WHERE table_name = '$table'
-						AND column_default = 'nextval(''$sequence''::regclass)'";
-					$result = $this->pdo->query($sql);
-					$row = $result->fetch(PDO::FETCH_ASSOC);
-
-					// Finally, set the new sequence value
-					if ($row)
+					// 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)
 					{
-						$column = $row['column_name'];
-
-						// Get the old value if it exists, or use 1 if it doesn't
-						$sql = "SELECT COALESCE((SELECT MAX({$column}) + 1 FROM {$table}), 1) AS val";
-						$result = $this->pdo->query($sql);
-						$row = $result->fetch(PDO::FETCH_ASSOC);
-
-						if ($row)
-						{
-							// The last parameter is false so that the system doesn't increment it again
-							$queries[] = "SELECT SETVAL('{$sequence}', {$row['val']}, false)";
-						}
+						$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;
 		}
 
-- 
cgit v1.2.1


From 7d09b9b4bb58e71f0e7b895ef32059ad08d12416 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 2 Dec 2012 23:57:37 -0500
Subject: [ticket/9983] Add phpbb prefix to global variables.

PHPBB3-9983
---
 tests/test_framework/phpbb_test_case_helpers.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'tests/test_framework')

diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index b56a699d1c..fe15eded90 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -92,13 +92,13 @@ class phpbb_test_case_helpers
 				$config['phpbb_functional_url'] = $phpbb_functional_url;
 			}
 
-			if (isset($redis_host))
+			if (isset($phpbb_redis_host))
 			{
-				$config['redis_host'] = $redis_host;
+				$config['redis_host'] = $phpbb_redis_host;
 			}
-			if (isset($redis_port))
+			if (isset($phpbb_redis_port))
 			{
-				$config['redis_port'] = $redis_port;
+				$config['redis_port'] = $phpbb_redis_port;
 			}
 		}
 
-- 
cgit v1.2.1


From 74093d0fd383619ec8b58914ebe2edd68145e070 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 4 Dec 2012 04:32:37 -0500
Subject: [ticket/11015] Fix functional test case.

PHPBB3-11015
---
 tests/test_framework/phpbb_functional_test_case.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/test_framework')

diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index f9c1d64ff8..2a24e96a25 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -86,7 +86,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 	{
 		global $phpbb_root_path, $phpEx;
 		// so we don't reopen an open connection
-		if (!($this->db instanceof dbal))
+		if (!($this->db instanceof phpbb_db_driver))
 		{
 			$dbms = self::$config['dbms'];
 			$this->db = new $dbms();
-- 
cgit v1.2.1


From bdc3ddf2bcec3caa9047d03e954c9de82f4916aa Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 4 Dec 2012 17:19:25 -0500
Subject: [ticket/10491] Set up functional tests sensibly.

PHPBB_FUNCTIONAL_URL goes into setup before class.

Drop PHPBB_FUNCTIONAL_URL check in board installation and
silent return if it is not set.

Take board installation out of constructor.

Install board in setup method.

PHPBB3-10491
---
 .../test_framework/phpbb_functional_test_case.php  | 35 ++++++++++++----------
 1 file changed, 19 insertions(+), 16 deletions(-)

(limited to 'tests/test_framework')

diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 7c03f874e9..85019a5e31 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -33,11 +33,27 @@ class phpbb_functional_test_case extends phpbb_test_case
 	static protected $config = array();
 	static protected $already_installed = false;
 
-	public function setUp()
+	static public function setUpBeforeClass()
 	{
+		parent::setUpBeforeClass();
+
+		self::$config = phpbb_test_case_helpers::get_test_config();
+
 		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.');
+			self::markTestSkipped('phpbb_functional_url was not set in test_config and wasn\'t set as PHPBB_FUNCTIONAL_URL environment variable either.');
+		}
+	}
+
+	public function setUp()
+	{
+		parent::setUp();
+
+		if (!static::$already_installed)
+		{
+			$this->install_board();
+			$this->bootstrap();
+			static::$already_installed = true;
 		}
 
 		$this->cookieJar = new CookieJar;
@@ -91,26 +107,12 @@ 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()
 	{
 		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);
 
@@ -158,6 +160,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 		// end data
 
 		$content = $this->do_request('install');
+		$this->assertNotSame(false, $content);
 		$this->assertContains('Welcome to Installation', $content);
 
 		$this->do_request('create_table', $data);
-- 
cgit v1.2.1


From 38d2868ba8db0f6e24fdfb7bbdfef4925a97770c Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 4 Dec 2012 17:37:46 -0500
Subject: [ticket/10491] Move board installation into setup before class.

Functional posting test already assumed that board is installed
once per test case and not once per test.

PHPBB3-10491
---
 .../test_framework/phpbb_functional_test_case.php  | 28 ++++++++++------------
 1 file changed, 12 insertions(+), 16 deletions(-)

(limited to 'tests/test_framework')

diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 85019a5e31..66f4b6db65 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -31,7 +31,6 @@ class phpbb_functional_test_case extends phpbb_test_case
 	protected $lang = array();
 
 	static protected $config = array();
-	static protected $already_installed = false;
 
 	static public function setUpBeforeClass()
 	{
@@ -43,18 +42,15 @@ class phpbb_functional_test_case extends phpbb_test_case
 		{
 			self::markTestSkipped('phpbb_functional_url was not set in test_config and wasn\'t set as PHPBB_FUNCTIONAL_URL environment variable either.');
 		}
+
+		self::install_board();
 	}
 
 	public function setUp()
 	{
 		parent::setUp();
 
-		if (!static::$already_installed)
-		{
-			$this->install_board();
-			$this->bootstrap();
-			static::$already_installed = true;
-		}
+		$this->bootstrap();
 
 		$this->cookieJar = new CookieJar;
 		$this->client = new Goutte\Client(array(), null, $this->cookieJar);
@@ -109,12 +105,12 @@ class phpbb_functional_test_case extends phpbb_test_case
 		);
 	}
 
-	protected function install_board()
+	static protected function install_board()
 	{
 		global $phpbb_root_path, $phpEx;
 
 		self::$config['table_prefix'] = 'phpbb_';
-		$this->recreate_database(self::$config);
+		self::recreate_database(self::$config);
 
 		if (file_exists($phpbb_root_path . "config.$phpEx"))
 		{
@@ -159,20 +155,20 @@ class phpbb_functional_test_case extends phpbb_test_case
 		));
 		// end data
 
-		$content = $this->do_request('install');
-		$this->assertNotSame(false, $content);
-		$this->assertContains('Welcome to Installation', $content);
+		$content = self::do_request('install');
+		self::assertNotSame(false, $content);
+		self::assertContains('Welcome to Installation', $content);
 
-		$this->do_request('create_table', $data);
+		self::do_request('create_table', $data);
 
-		$this->do_request('config_file', $data);
+		self::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);
+		self::do_request('final', $data);
 		copy($phpbb_root_path . "config.$phpEx", $phpbb_root_path . "config_test.$phpEx");
 	}
 
-	private function do_request($sub, $post_data = null)
+	static private function do_request($sub, $post_data = null)
 	{
 		$context = null;
 
-- 
cgit v1.2.1


From dbb54b217b4d0c0669a566f9c950e8331887d276 Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Wed, 5 Dec 2012 22:57:06 -0600
Subject: [ticket/11219] Coding guidelines and naming consistency changes

PHPBB3-11219
---
 .../phpbb_database_test_connection_manager.php     | 24 ++++++++++++----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'tests/test_framework')

diff --git a/tests/test_framework/phpbb_database_test_connection_manager.php b/tests/test_framework/phpbb_database_test_connection_manager.php
index 97281a0812..d7c2804aa7 100644
--- a/tests/test_framework/phpbb_database_test_connection_manager.php
+++ b/tests/test_framework/phpbb_database_test_connection_manager.php
@@ -430,17 +430,17 @@ class phpbb_database_test_connection_manager
 	/**
 	* Performs synchronisations on the database after a fixture has been loaded
 	*
-	* @param	PHPUnit_Extensions_Database_DataSet_XmlDataSet	$tables		Tables contained within the loaded fixture
+	* @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($xmlDataSet)
+	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'), $xmlDataSet->getTableNames());
+		$table_names = array_map(array($this->pdo, 'PDO::quote'), $xml_data_set->getTableNames());
 
 		switch ($this->config['dbms'])
 		{
@@ -469,18 +469,20 @@ class phpbb_database_test_connection_manager
 						continue;
 					}
 
-					$maxval = (int)$max_row['MAX'];
-					$maxval++;
+					$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 effct.
-					// 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.
+					/**
+					* 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 $maxval";
+									START WITH $max_val";
 				}
 			break;
 
@@ -495,7 +497,7 @@ class phpbb_database_test_connection_manager
 				while ($row = $result->fetch(PDO::FETCH_ASSOC))
 				{
 					// Get the columns used in the fixture for this table
-					$column_names = $xmlDataSet->getTableMetaData($row['table_name'])->getColumns();
+					$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))
-- 
cgit v1.2.1


From 70050020699d9eab9b97bda342e0e928d1591de8 Mon Sep 17 00:00:00 2001
From: Fyorl <gaelreth@gmail.com>
Date: Sun, 8 Jul 2012 20:22:19 +0100
Subject: [ticket/10972] Added methods for creating and deleting basic users

Modified the login method to allow logging in of an arbitrary user.
Also added tests for the new functionality.

PHPBB3-10972
---
 .../test_framework/phpbb_functional_test_case.php  | 45 +++++++++++++++++++++-
 1 file changed, 43 insertions(+), 2 deletions(-)

(limited to 'tests/test_framework')

diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 7c03f874e9..dfbfe2565e 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -194,7 +194,48 @@ class phpbb_functional_test_case extends phpbb_test_case
 		$db_conn_mgr->recreate_db();
 	}
 
-	protected function login()
+	/**
+	* Creates a new user with limited permissions
+	*
+	* @param string $username Also doubles up as the user's password
+	*/
+	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;
+		
+		$db = $this->get_db();
+		$query = "
+			INSERT INTO " . self::$config['table_prefix'] . "users
+				(user_type, group_id, username, username_clean, user_regdate, user_password, user_email, user_lang, user_style, user_rank, user_colour, user_posts, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_from, user_icq, user_aim, user_yim, user_msnm, user_jabber, user_website, user_occ, user_interests, user_actkey, user_newpasswd)
+			VALUES
+				(0, 2, 'user', 'user', 0, '" . phpbb_hash($username) . "', 'nobody@example.com', 'en', 1, 0, '', 1, '', '', '', '', '', 't', 'a', 't', 'd', '', '', '', '', '', '', '', '', '', '', '', '', '', '')
+		";
+
+		$db->sql_query($query);
+	}
+
+	/**
+	* Deletes a user
+	*
+	* @param string $username The username of the user to delete
+	*/
+	protected function delete_user($username)
+	{
+		$db = $this->get_db();
+		$query = "DELETE FROM " . self::$config['table_prefix'] . "users WHERE username = '" . $db->sql_escape($username) . "'";
+		$db->sql_query($query);
+	}
+
+	protected function login($username = 'admin')
 	{
 		$this->add_lang('ucp');
 
@@ -202,7 +243,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 		$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'));
+		$login = $this->client->submit($form, array('username' => $username, 'password' => $username));
 
 		$cookies = $this->cookieJar->all();
 
-- 
cgit v1.2.1


From cafc7feca12730fce59091bd7a18fb5c3f7ecdc0 Mon Sep 17 00:00:00 2001
From: Fyorl <gaelreth@gmail.com>
Date: Mon, 9 Jul 2012 00:24:28 +0100
Subject: [ticket/10972] Moved tests into appropriate places and added comments

PHPBB3-10972
---
 tests/test_framework/phpbb_functional_test_case.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'tests/test_framework')

diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index dfbfe2565e..a72c0940ab 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -197,6 +197,10 @@ class phpbb_functional_test_case extends phpbb_test_case
 	/**
 	* Creates a new user with limited permissions
 	*
+	* Note that creating two users with the same name results in undefined
+	* login behaviour. Always call delete_user after running a test that
+	* requires create_user.
+	*
 	* @param string $username Also doubles up as the user's password
 	*/
 	protected function create_user($username)
-- 
cgit v1.2.1


From d33accb687ab4266559c12a356e121f3634d780b Mon Sep 17 00:00:00 2001
From: Fyorl <gaelreth@gmail.com>
Date: Fri, 10 Aug 2012 12:31:53 +0100
Subject: [ticket/10972] Added explicit checks for creating duplicate users.

PHPBB3-10972
---
 tests/test_framework/phpbb_functional_test_case.php | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'tests/test_framework')

diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index a72c0940ab..9bc2c96753 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -30,6 +30,11 @@ class phpbb_functional_test_case extends phpbb_test_case
 	*/
 	protected $lang = array();
 
+	/**
+	* @var array
+	*/
+	protected $created_users = array();
+
 	static protected $config = array();
 	static protected $already_installed = false;
 
@@ -197,14 +202,18 @@ class phpbb_functional_test_case extends phpbb_test_case
 	/**
 	* Creates a new user with limited permissions
 	*
-	* Note that creating two users with the same name results in undefined
-	* login behaviour. Always call delete_user after running a test that
+	* Always call delete_user after running a test that
 	* requires create_user.
 	*
 	* @param string $username Also doubles up as the user's password
 	*/
 	protected function create_user($username)
 	{
+		if (isset($this->created_users[$username]))
+		{
+			return;
+		}
+		
 		// Required by unique_id
 		global $config;
 
@@ -225,6 +234,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 		";
 
 		$db->sql_query($query);
+		$this->created_users[$username] = 1;
 	}
 
 	/**
@@ -234,6 +244,11 @@ class phpbb_functional_test_case extends phpbb_test_case
 	*/
 	protected function delete_user($username)
 	{
+		if (isset($this->created_users[$username]))
+		{
+			unset($this->created_users[$username]);
+		}
+
 		$db = $this->get_db();
 		$query = "DELETE FROM " . self::$config['table_prefix'] . "users WHERE username = '" . $db->sql_escape($username) . "'";
 		$db->sql_query($query);
-- 
cgit v1.2.1


From ebdd96592a100139c48204ef133e706c0ac465d1 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 6 Dec 2012 22:45:12 -0500
Subject: [ticket/10972] Backport get_db from develop.

PHPBB3-10972
---
 tests/test_framework/phpbb_functional_test_case.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'tests/test_framework')

diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 9bc2c96753..3b6232d091 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -16,7 +16,9 @@ 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)
@@ -70,6 +72,23 @@ 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)
-- 
cgit v1.2.1


From fb5c4440e598f2a775a52299a06e903d3cee5398 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 6 Dec 2012 23:43:22 -0500
Subject: [ticket/10972] Tweak user addition.

Always add users, do not keep track of which users have been added.
The tests should know whether users they want exist or not.

Use more unique user names in tests for robustness.

Added some more assertions here and there.

PHPBB3-10972
---
 .../test_framework/phpbb_functional_test_case.php  | 57 ++++++++++++----------
 1 file changed, 32 insertions(+), 25 deletions(-)

(limited to 'tests/test_framework')

diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 3b6232d091..b17b2dcd5f 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -32,11 +32,6 @@ class phpbb_functional_test_case extends phpbb_test_case
 	*/
 	protected $lang = array();
 
-	/**
-	* @var array
-	*/
-	protected $created_users = array();
-
 	static protected $config = array();
 	static protected $already_installed = false;
 
@@ -225,14 +220,10 @@ class phpbb_functional_test_case extends phpbb_test_case
 	* requires create_user.
 	*
 	* @param string $username Also doubles up as the user's password
+	* @return int ID of created user
 	*/
 	protected function create_user($username)
 	{
-		if (isset($this->created_users[$username]))
-		{
-			return;
-		}
-		
 		// Required by unique_id
 		global $config;
 
@@ -243,17 +234,36 @@ class phpbb_functional_test_case extends phpbb_test_case
 
 		$config['rand_seed'] = '';
 		$config['rand_seed_last_update'] = time() + 600;
-		
+
+		// Required by user_add
+		global $db, $cache;
 		$db = $this->get_db();
-		$query = "
-			INSERT INTO " . self::$config['table_prefix'] . "users
-				(user_type, group_id, username, username_clean, user_regdate, user_password, user_email, user_lang, user_style, user_rank, user_colour, user_posts, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_from, user_icq, user_aim, user_yim, user_msnm, user_jabber, user_website, user_occ, user_interests, user_actkey, user_newpasswd)
-			VALUES
-				(0, 2, 'user', 'user', 0, '" . phpbb_hash($username) . "', 'nobody@example.com', 'en', 1, 0, '', 1, '', '', '', '', '', 't', 'a', 't', 'd', '', '', '', '', '', '', '', '', '', '', '', '', '', '')
-		";
+		if (!function_exists('phpbb_mock_null_cache'))
+		{
+			require_once(__DIR__ . '/../mock/null_cache.php');
+		}
+		$cache = new phpbb_mock_null_cache;
 
-		$db->sql_query($query);
-		$this->created_users[$username] = 1;
+		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);
 	}
 
 	/**
@@ -263,11 +273,6 @@ class phpbb_functional_test_case extends phpbb_test_case
 	*/
 	protected function delete_user($username)
 	{
-		if (isset($this->created_users[$username]))
-		{
-			unset($this->created_users[$username]);
-		}
-
 		$db = $this->get_db();
 		$query = "DELETE FROM " . self::$config['table_prefix'] . "users WHERE username = '" . $db->sql_escape($username) . "'";
 		$db->sql_query($query);
@@ -281,7 +286,9 @@ class phpbb_functional_test_case extends phpbb_test_case
 		$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' => $username, 'password' => $username));
+		$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();
 
-- 
cgit v1.2.1


From ff993ba9d30f5de49e5231647c5bb76d95c357f8 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 6 Dec 2012 23:47:19 -0500
Subject: [ticket/10972] Drop user deletion.

Users should not be deleted in tests that test user creation.
Tests should use unique user names to avoid collisions.

User deletion should use user_remove anyway.

PHPBB3-10972
---
 tests/test_framework/phpbb_functional_test_case.php | 15 ---------------
 1 file changed, 15 deletions(-)

(limited to 'tests/test_framework')

diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index b17b2dcd5f..71e88fbcf6 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -216,9 +216,6 @@ class phpbb_functional_test_case extends phpbb_test_case
 	/**
 	* Creates a new user with limited permissions
 	*
-	* Always call delete_user after running a test that
-	* requires create_user.
-	*
 	* @param string $username Also doubles up as the user's password
 	* @return int ID of created user
 	*/
@@ -266,18 +263,6 @@ class phpbb_functional_test_case extends phpbb_test_case
 		return user_add($user_row);
 	}
 
-	/**
-	* Deletes a user
-	*
-	* @param string $username The username of the user to delete
-	*/
-	protected function delete_user($username)
-	{
-		$db = $this->get_db();
-		$query = "DELETE FROM " . self::$config['table_prefix'] . "users WHERE username = '" . $db->sql_escape($username) . "'";
-		$db->sql_query($query);
-	}
-
 	protected function login($username = 'admin')
 	{
 		$this->add_lang('ucp');
-- 
cgit v1.2.1


From 2bc2cb1f6f78ef8cc2037941501d5389af009cd7 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Mon, 10 Dec 2012 06:42:43 -0500
Subject: [ticket/10491] Install board once per test run.

This is how things used to be. Installing for each test class brings
3-4x performance penalty compared to installing once for the entire
test run. However, with a single installation for all tests an
individual test can see different data when it is invoked by itself
vs when it is executed as part of the entire test suite.

PHPBB3-10491
---
 tests/test_framework/phpbb_functional_test_case.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'tests/test_framework')

diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 66f4b6db65..1e835fcc35 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -31,6 +31,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 	protected $lang = array();
 
 	static protected $config = array();
+	static protected $already_installed = false;
 
 	static public function setUpBeforeClass()
 	{
@@ -43,7 +44,11 @@ class phpbb_functional_test_case extends phpbb_test_case
 			self::markTestSkipped('phpbb_functional_url was not set in test_config and wasn\'t set as PHPBB_FUNCTIONAL_URL environment variable either.');
 		}
 
-		self::install_board();
+		if (!self::$already_installed)
+		{
+			self::install_board();
+			self::$already_installed = true;
+		}
 	}
 
 	public function setUp()
-- 
cgit v1.2.1


From 1441b70ae8e97782ae63c479b0635c1622078a48 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 12 Dec 2012 21:47:48 -0500
Subject: [ticket/10491] Make recreate_database static.

PHPBB3-10491
---
 tests/test_framework/phpbb_functional_test_case.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/test_framework')

diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 1e835fcc35..71bb994f21 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -192,7 +192,7 @@ 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();
-- 
cgit v1.2.1


From 4de07338efcd4f0d390df0f2d7fa883712d8c942 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 13 Dec 2012 07:28:01 -0500
Subject: [ticket/10975] Avoid rewriting global config twice.

PHPBB3-10975
---
 tests/test_framework/phpbb_functional_test_case.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'tests/test_framework')

diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 9097854bd4..b6f8e5c44c 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -251,16 +251,12 @@ class phpbb_functional_test_case extends phpbb_test_case
 		// Required by unique_id
 		global $config;
 
-		if (!is_array($config))
-		{
-			$config = array();
-		}
-
+		$config = new phpbb_config(array());
 		$config['rand_seed'] = '';
 		$config['rand_seed_last_update'] = time() + 600;
 
 		// Required by user_add
-		global $db, $cache, $config, $phpbb_dispatcher;
+		global $db, $cache, $phpbb_dispatcher;
 		$db = $this->get_db();
 		if (!function_exists('phpbb_mock_null_cache'))
 		{
@@ -276,7 +272,6 @@ class phpbb_functional_test_case extends phpbb_test_case
 		{
 			require_once(__DIR__ . '/../../phpBB/includes/functions_user.php');
 		}
-		$config = new phpbb_config(array());
 		set_config(null, null, null, $config);
 		set_config_count(null, null, null, $config);
 		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
-- 
cgit v1.2.1


From 83345d986d172ee8b655ec4600c1f1575ba306d0 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 13 Dec 2012 08:11:10 -0500
Subject: [ticket/11015] Convert database drivers to new spelling in post setup
 sync.

PHPBB3-11015
---
 tests/test_framework/phpbb_database_test_connection_manager.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests/test_framework')

diff --git a/tests/test_framework/phpbb_database_test_connection_manager.php b/tests/test_framework/phpbb_database_test_connection_manager.php
index 3fe3ab8d90..4ce5f03a8b 100644
--- a/tests/test_framework/phpbb_database_test_connection_manager.php
+++ b/tests/test_framework/phpbb_database_test_connection_manager.php
@@ -444,7 +444,7 @@ class phpbb_database_test_connection_manager
 
 		switch ($this->config['dbms'])
 		{
-			case 'oracle':
+			case 'phpbb_db_driver_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
@@ -486,7 +486,7 @@ class phpbb_database_test_connection_manager
 				}
 			break;
 
-			case 'postgres':
+			case 'phpbb_db_driver_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) . ")
-- 
cgit v1.2.1


From 789c04b90025cf230b3b965ece8022104128c92c Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 13 Dec 2012 15:42:00 -0500
Subject: [ticket/11265] Add assertions for board installation success.

PHPBB3-11265
---
 tests/test_framework/phpbb_functional_test_case.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'tests/test_framework')

diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 93a4ab2fbf..8ab6469e9a 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -183,12 +183,20 @@ class phpbb_functional_test_case extends phpbb_test_case
 		self::assertNotSame(false, $content);
 		self::assertContains('Welcome to Installation', $content);
 
-		self::do_request('create_table', $data);
+		$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);
 
-		self::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));
 
-		self::do_request('final', $data);
+		$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");
 	}
 
-- 
cgit v1.2.1


From 586e8cbd97b4e2537f69ebe04b0c9d24fc090a4c Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 13 Dec 2012 15:27:38 -0500
Subject: [ticket/11015] Include functions.php because it is not always
 included.

PHPBB3-11015
---
 tests/test_framework/phpbb_test_case_helpers.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'tests/test_framework')

diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index 18f575b980..47459832d5 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -104,6 +104,11 @@ class phpbb_test_case_helpers
 
 		if (isset($_SERVER['PHPBB_TEST_DBMS']))
 		{
+			if (!function_exists('phpbb_convert_30_dbms_to_31'))
+			{
+				require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+			}
+
 			$config = array_merge($config, array(
 				'dbms'		=> isset($_SERVER['PHPBB_TEST_DBMS']) ? phpbb_convert_30_dbms_to_31($_SERVER['PHPBB_TEST_DBMS']) : '',
 				'dbhost'	=> isset($_SERVER['PHPBB_TEST_DBHOST']) ? $_SERVER['PHPBB_TEST_DBHOST'] : '',
-- 
cgit v1.2.1


From 1774dd2af43e84f879813dedb0780f614810ad8a Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 13 Dec 2012 17:49:30 -0500
Subject: [ticket/11015] Installer still needs 3.0-style dbms name.

PHPBB3-11015
---
 tests/test_framework/phpbb_functional_test_case.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'tests/test_framework')

diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index db7fc4e6a3..67a5050892 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -202,6 +202,8 @@ class phpbb_functional_test_case extends phpbb_test_case
 		self::assertNotSame(false, $content);
 		self::assertContains('Welcome to Installation', $content);
 
+		// Installer uses 3.0-style dbms name
+		$data['dbms'] = str_replace('phpbb_db_driver_', '', $data['dbms']);
 		$content = self::do_request('create_table', $data);
 		self::assertNotSame(false, $content);
 		self::assertContains('The database tables used by phpBB', $content);
-- 
cgit v1.2.1


From d1eb3449af5e7675f6896406e78fa1f240d4a3e8 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 14 Dec 2012 14:05:46 -0500
Subject: [ticket/11268] Delete phpbb_db_driver_mysql4 as there is no such
 thing.

PHPBB3-11268
---
 tests/test_framework/phpbb_database_test_connection_manager.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'tests/test_framework')

diff --git a/tests/test_framework/phpbb_database_test_connection_manager.php b/tests/test_framework/phpbb_database_test_connection_manager.php
index 4ce5f03a8b..03097a10a0 100644
--- a/tests/test_framework/phpbb_database_test_connection_manager.php
+++ b/tests/test_framework/phpbb_database_test_connection_manager.php
@@ -227,7 +227,6 @@ class phpbb_database_test_connection_manager
 		switch ($this->config['dbms'])
 		{
 			case 'phpbb_db_driver_mysql':
-			case 'phpbb_db_driver_mysql4':
 			case 'phpbb_db_driver_mysqli':
 				$sql = 'SHOW TABLES';
 			break;
-- 
cgit v1.2.1