5 files changed, 371 insertions, 9 deletions
diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php
index bb86df0ef0..b5076b92e9 100644
--- a/tests/test_framework/phpbb_database_test_case.php
+++ b/tests/test_framework/phpbb_database_test_case.php
@@ -13,6 +13,8 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 
 	protected $test_case_helpers;
 
+	protected $fixture_xml_data;
+
 	public function __construct($name = NULL, array $data = array(), $dataName = '')
 	{
 		parent::__construct($name, $data, $dataName);
@@ -28,6 +30,20 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 		);
 	}
 
+	protected function setUp()
+	{
+		parent::setUp();
+
+		// Resynchronise tables if a fixture was loaded
+		if (isset($this->fixture_xml_data))
+		{
+			$config = $this->get_database_config();
+			$manager = $this->create_connection_manager($config);
+			$manager->connect();
+			$manager->post_setup_synchronisation($this->fixture_xml_data);
+		}
+	}
+
 	public function createXMLDataSet($path)
 	{
 		$db_config = $this->get_database_config();
@@ -47,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()
@@ -137,8 +155,24 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 	*
 	* @return string The string with the specified match converted to uppercase
 	*/
-	public static function to_upper($matches)
+	static public function to_upper($matches)
 	{
 		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);
+		}
+	}
 }
diff --git a/tests/test_framework/phpbb_database_test_connection_manager.php b/tests/test_framework/phpbb_database_test_connection_manager.php
index 25e0972f42..d7c2804aa7 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
@@ -432,4 +426,111 @@ class phpbb_database_test_connection_manager
 			$this->pdo->exec($query);
 		}
 	}
+
+	/**
+	* Performs synchronisations on the database after a fixture has been loaded
+	*
+	* @param	PHPUnit_Extensions_Database_DataSet_XmlDataSet	$xml_data_set		Information about the tables contained within the loaded fixture
+	*
+	* @return null
+	*/
+	public function post_setup_synchronisation($xml_data_set)
+	{
+		$this->ensure_connected(__METHOD__);
+		$queries = array();
+
+		// Get escaped versions of the table names used in the fixture
+		$table_names = array_map(array($this->pdo, 'PDO::quote'), $xml_data_set->getTableNames());
+
+		switch ($this->config['dbms'])
+		{
+			case 'oracle':
+				// Get all of the information about the sequences
+				$sql = "SELECT t.table_name, tc.column_name, d.referenced_name as sequence_name, s.increment_by, s.min_value
+					FROM USER_TRIGGERS t
+					JOIN USER_DEPENDENCIES d ON (d.name = t.trigger_name)
+					JOIN USER_TRIGGER_COLS tc ON (tc.trigger_name = t.trigger_name)
+					JOIN USER_SEQUENCES s ON (s.sequence_name = d.referenced_name)
+					WHERE d.referenced_type = 'SEQUENCE'
+						AND d.type = 'TRIGGER'
+						AND t.table_name IN (" . implode(', ', array_map('strtoupper', $table_names)) . ')';
+
+				$result = $this->pdo->query($sql);
+
+				while ($row = $result->fetch(PDO::FETCH_ASSOC))
+				{
+					// Get the current max value of the table
+					$sql = "SELECT MAX({$row['COLUMN_NAME']}) AS max FROM {$row['TABLE_NAME']}";
+					$max_result = $this->pdo->query($sql);
+					$max_row = $max_result->fetch(PDO::FETCH_ASSOC);
+
+					if (!$max_row)
+					{
+						continue;
+					}
+
+					$max_val = (int) $max_row['MAX'];
+					$max_val++;
+
+					/**
+					* This is not the "proper" way, but the proper way does not allow you to completely reset
+					* tables with no rows since you have to select the next value to make the change go into effect.
+					* You would have to go past the minimum value to set it correctly, but that's illegal.
+					* Since we have no objects attached to our sequencers (triggers aren't attached), this works fine.
+					*/
+					$queries[] = 'DROP SEQUENCE ' . $row['SEQUENCE_NAME'];
+					$queries[] = "CREATE SEQUENCE {$row['SEQUENCE_NAME']} 
+									MINVALUE {$row['MIN_VALUE']} 
+									INCREMENT BY {$row['INCREMENT_BY']} 
+									START WITH $max_val";
+				}
+			break;
+
+			case 'postgres':
+				// Get the sequences attached to the tables
+				$sql = 'SELECT column_name, table_name FROM information_schema.columns
+					WHERE table_name IN (' . implode(', ', $table_names) . ")
+						AND strpos(column_default, '_seq''::regclass') > 0";
+				$result = $this->pdo->query($sql);
+
+				$setval_queries = array();
+				while ($row = $result->fetch(PDO::FETCH_ASSOC))
+				{
+					// Get the columns used in the fixture for this table
+					$column_names = $xml_data_set->getTableMetaData($row['table_name'])->getColumns();
+
+					// Skip sequences that weren't specified in the fixture
+					if (!in_array($row['column_name'], $column_names))
+					{
+						continue;
+					}
+
+					// Get the old value if it exists, or use 1 if it doesn't
+					$sql = "SELECT COALESCE((SELECT MAX({$row['column_name']}) + 1 FROM {$row['table_name']}), 1) AS val";
+					$result_max = $this->pdo->query($sql);
+					$row_max = $result_max->fetch(PDO::FETCH_ASSOC);
+
+					if ($row_max)
+					{
+						$seq_name = $this->pdo->quote($row['table_name'] . '_seq');
+						$max_val = (int) $row_max['val'];
+
+						// The last parameter is false so that the system doesn't increment it again
+						$setval_queries[] = "SETVAL($seq_name, $max_val, false)";
+					}
+				}
+
+				// Combine all of the SETVALs into one query
+				if (sizeof($setval_queries))
+				{
+					$queries[] = 'SELECT ' . implode(', ', $setval_queries);
+				}
+			break;
+		}
+
+		foreach ($queries as $query)
+		{
+			$this->pdo->exec($query);
+		}
+	}
 }
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index b953017d0a..16e1ccaff9 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)
@@ -125,6 +126,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 		{
 			$this->extension_manager = new phpbb_extension_manager(
 				$this->get_db(),
+				new phpbb_config(array()),
 				self::$config['table_prefix'] . 'ext',
 				$phpbb_root_path,
 				".$phpEx",
@@ -198,7 +200,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));
+		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");
@@ -251,6 +253,48 @@ class phpbb_functional_test_case extends phpbb_test_case
 		}
 	}
 
+	/**
+	* Login to the ACP
+	* You must run login() before calling this.
+	*/
+	protected function admin_login()
+	{
+		$this->add_lang('acp/common');
+
+		// Requires login first!
+		if (empty($this->sid))
+		{
+			$this->fail('$this->sid is empty. Make sure you call login() before admin_login()');
+			return;
+		}
+
+		$crawler = $this->request('GET', 'adm/index.php?sid=' . $this->sid);
+		$this->assertContains($this->lang('LOGIN_ADMIN_CONFIRM'), $crawler->filter('html')->text());
+
+		$form = $crawler->selectButton($this->lang('LOGIN'))->form();
+
+		foreach ($form->getValues() as $field => $value)
+		{
+			if (strpos($field, 'password_') === 0)
+			{
+				$login = $this->client->submit($form, array('username' => 'admin', $field => 'admin'));
+
+				$cookies = $this->cookieJar->all();
+
+				// The session id is stored in a cookie that ends with _sid - we assume there is only one such cookie
+				foreach ($cookies as $cookie);
+				{
+					if (substr($cookie->getName(), -4) == '_sid')
+					{
+						$this->sid = $cookie->getValue();
+					}
+				}
+
+				break;
+			}
+		}
+	}
+
 	protected function add_lang($lang_file)
 	{
 		if (is_array($lang_file))
@@ -287,4 +331,31 @@ 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);
+	}
+
+	/**
+	* Heuristic function to check that the response is success.
+	*
+	* When php decides to die with a fatal error, it still sends 200 OK
+	* status code. This assertion tries to catch that.
+	*
+	* @return null
+	*/
+	public function assert_response_success()
+	{
+		$this->assertEquals(200, $this->client->getResponse()->getStatus());
+		$content = $this->client->getResponse()->getContent();
+		$this->assertNotContains('Fatal error:', $content);
+	}
 }
diff --git a/tests/test_framework/phpbb_search_test_case.php b/tests/test_framework/phpbb_search_test_case.php
new file mode 100644
index 0000000000..418d352c17
--- /dev/null
+++ b/tests/test_framework/phpbb_search_test_case.php
@@ -0,0 +1,29 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+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; }
+	public function get_split_words() { return \$this->split_words; }
+}
+			";
+			eval($code);
+		}
+		return $wrapped;
+	}
+}
diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index 46feef550a..fe15eded90 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($phpbb_redis_host))
+			{
+				$config['redis_host'] = $phpbb_redis_host;
+			}
+			if (isset($phpbb_redis_port))
+			{
+				$config['redis_port'] = $phpbb_redis_port;
+			}
 		}
 
 		if (isset($_SERVER['PHPBB_TEST_DBMS']))
@@ -113,6 +122,124 @@ 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;
 	}
+
+	/**
+	* Recursive directory copying function
+	*
+	* @param string $source
+	* @param string $dest
+	* @return array list of files copied
+	*/
+	public function copy_dir($source, $dest)
+	{
+		$source = (substr($source, -1) == '/') ? $source : $source . '/';
+		$dest = (substr($dest, -1) == '/') ? $dest : $dest . '/';
+
+		$copied_files = array();
+
+		if (!is_dir($dest))
+		{
+			$this->makedirs($dest);
+		}
+
+		$files = scandir($source);
+		foreach ($files as $file)
+		{
+			if ($file == '.' || $file == '..')
+			{
+				continue;
+			}
+
+			if (is_dir($source . $file))
+			{
+				$created_dir = false;
+				if (!is_dir($dest . $file))
+				{
+					$created_dir = true;
+					$this->makedirs($dest . $file);
+				}
+
+				$copied_files = array_merge($copied_files, self::copy_dir($source . $file, $dest . $file));
+
+				if ($created_dir)
+				{
+					$copied_files[] = $dest . $file;
+				}
+			}
+			else
+			{
+				if (!file_exists($dest . $file))
+				{
+					copy($source . $file, $dest . $file);
+
+					$copied_files[] = $dest . $file;
+				}
+			}
+		}
+
+		return $copied_files;
+	}
+
+	/**
+	* Remove files/directories that are listed in an array
+	* Designed for use with $this->copy_dir()
+	*
+	* @param array $file_list
+	*/
+	public function remove_files($file_list)
+	{
+		foreach ($file_list as $file)
+		{
+			if (is_dir($file))
+			{
+				rmdir($file);
+			}
+			else
+			{
+				unlink($file);
+			}
+		}
+	}
+
+	/**
+	* Empty directory (remove any subdirectories/files below)
+	*
+	* @param array $file_list
+	*/
+	public function empty_dir($path)
+	{
+		$path = (substr($path, -1) == '/') ? $path : $path . '/';
+
+		$files = scandir($path);
+		foreach ($files as $file)
+		{
+			if ($file == '.' || $file == '..')
+			{
+				continue;
+			}
+
+			if (is_dir($path . $file))
+			{
+				$this->empty_dir($path . $file);
+
+				rmdir($path . $file);
+			}
+			else
+			{
+				unlink($path . $file);
+			}
+		}
+	}
 }