13 files changed, 414 insertions, 68 deletions
diff --git a/tests/RUNNING_TESTS.txt b/tests/RUNNING_TESTS.txt
index 59197acc0f..b976545c22 100644
--- a/tests/RUNNING_TESTS.txt
+++ b/tests/RUNNING_TESTS.txt
@@ -21,12 +21,13 @@ the following PHP extensions must be installed and enabled to run unit tests:
 
 Database Tests
 --------------
+
 By default all tests requiring a database connection will use sqlite. If you
 do not have sqlite installed the tests will be skipped. If you wish to run the
 tests on a different database you have to create a test_config.php file within
-your tests directory following the same format as phpBB's config.php. An example
-for mysqli can be found below. More information on configuration options can be
-found on the wiki (see below).
+your tests directory following the same format as phpBB's config.php. An
+example for mysqli can be found below. More information on configuration
+options can be found on the wiki (see below).
 
     <?php
     $dbms = 'mysqli';
@@ -36,8 +37,15 @@ found on the wiki (see below).
     $dbuser = 'user';
     $dbpasswd = 'password';
 
-Alternatively you can specify parameters in the environment, so e.g. the following
-will run phpunit with the same parameters as in the shown test_config.php file:
+It is possible to have multiple test_config.php files, for example if you
+are testing on multiple databases. You can specify which test_config.php file
+to use in the environment as follows:
+
+    $ PHPBB_TEST_CONFIG=tests/test_config.php phpunit
+
+Alternatively you can specify parameters in the environment, so e.g. the
+following will run phpunit with the same parameters as in the shown
+test_config.php file:
 
     $ PHPBB_TEST_DBMS='mysqli' PHPBB_TEST_DBHOST='localhost' \
       PHPBB_TEST_DBNAME='database' PHPBB_TEST_DBUSER='user' \
@@ -46,16 +54,18 @@ will run phpunit with the same parameters as in the shown test_config.php file:
 Running
 =======
 
-Once the prerequisites are installed, run the tests from the project root directory (above phpBB):
+Once the prerequisites are installed, run the tests from the project root
+directory (above phpBB):
 
     $ phpunit
 
 Slow tests
 --------------
+
 Certain tests, such as the UTF-8 normalizer or the DNS tests tend to be slow.
 Thus these tests are in the `slow` group, which is excluded by default. You can
-enable slow tests by copying the phpunit.xml.all file to phpunit.xml. If you only
-want the slow tests, run:
+enable slow tests by copying the phpunit.xml.all file to phpunit.xml. If you
+only want the slow tests, run:
 
     $ phpunit --group slow
 
@@ -63,4 +73,4 @@ More Information
 ================
 
 Further information is available on phpbb wiki:
-http://wiki.phpbb.com/display/DEV/Unit+Tests
+http://wiki.phpbb.com/Unit_Tests
diff --git a/tests/dbal/auto_increment_test.php b/tests/dbal/auto_increment_test.php
new file mode 100644
index 0000000000..e87fc1c6bd
--- /dev/null
+++ b/tests/dbal/auto_increment_test.php
@@ -0,0 +1,100 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/db/db_tools.php';
+
+class phpbb_dbal_auto_increment_test extends phpbb_database_test_case
+{
+	protected $db;
+	protected $tools;
+	protected $table_exists;
+	protected $table_data;
+
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml');
+	}
+
+	protected function setUp()
+	{
+		parent::setUp();
+
+		$this->db = $this->new_dbal();
+		$this->tools = new phpbb_db_tools($this->db);
+
+		$this->table_data = array(
+			'COLUMNS'		=> array(
+				'c_id'				=> array('UINT', NULL, 'auto_increment'),
+				'c_uint'				=> array('UINT', 4),
+			),
+			'PRIMARY_KEY'	=> 'c_id',
+		);
+		$this->tools->sql_create_table('prefix_table_name', $this->table_data);
+		$this->table_exists = true;
+	}
+
+	protected function tearDown()
+	{
+		if ($this->table_exists)
+		{
+			$this->tools->sql_table_drop('prefix_table_name');
+		}
+
+		parent::tearDown();
+	}
+
+	static protected function get_default_values()
+	{
+		return array(
+			'c_uint' => 0,
+		);
+	}
+
+	public function test_auto_increment()
+	{
+		$sql = 'DELETE FROM prefix_table_name';
+		$result = $this->db->sql_query($sql);
+
+		$row1 = array_merge(self::get_default_values(), array(
+			'c_uint' => 1,
+		));
+		$row2 = array_merge(self::get_default_values(), array(
+			'c_uint' => 2,
+		));
+
+		$sql = 'INSERT INTO prefix_table_name ' . $this->db->sql_build_array('INSERT', $row1);
+		$result = $this->db->sql_query($sql);
+		$id1 = $this->db->sql_nextid();
+
+		$sql = 'INSERT INTO prefix_table_name ' . $this->db->sql_build_array('INSERT', $row2);
+		$result = $this->db->sql_query($sql);
+		$id2 = $this->db->sql_nextid();
+
+		$this->assertGreaterThan($id1, $id2, 'Auto increment should increase the id value');
+
+		$sql = "SELECT *
+			FROM prefix_table_name WHERE c_id = $id1";
+		$result = $this->db->sql_query($sql);
+		$row_actual = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		$row1['c_id'] = $id1;
+		$this->assertEquals($row1, $row_actual);
+
+		$sql = "SELECT *
+			FROM prefix_table_name WHERE c_id = $id2";
+		$result = $this->db->sql_query($sql);
+		$row_actual = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		$row2['c_id'] = $id2;
+		$this->assertEquals($row2, $row_actual);
+	}
+}
diff --git a/tests/dbal/db_tools_test.php b/tests/dbal/db_tools_test.php
index c7ddb88ce8..c20e46011f 100644
--- a/tests/dbal/db_tools_test.php
+++ b/tests/dbal/db_tools_test.php
@@ -106,7 +106,7 @@ class phpbb_dbal_db_tools_test extends phpbb_database_test_case
 			'c_bool' => 0,
 			'c_vchar' => '',
 			'c_vchar_size' => '',
-			'c_char_size' => '',
+			'c_char_size' => 'abcd',
 			'c_xstext' => '',
 			'c_stext' => '',
 			'c_text' => '',
@@ -165,6 +165,11 @@ class phpbb_dbal_db_tools_test extends phpbb_database_test_case
 	*/
 	public function test_created_column($column_name, $column_value)
 	{
+		if ($column_name === 'c_varbinary' && stripos(get_class($this->db), 'mysql') === false)
+		{
+			$this->markTestIncomplete('Binary handling is not implemented properly on non-MySQL DBMSes.');
+		}
+
 		$row_insert = self::get_default_values();
 		$row_insert[$column_name] = $column_value;
 
@@ -189,51 +194,6 @@ class phpbb_dbal_db_tools_test extends phpbb_database_test_case
 		$this->assertEquals($row_expect[$column_name], $row_actual[$column_name], "Column $column_name of type $type should have equal return and input value.");
 	}
 
-	public function test_auto_increment()
-	{
-		$sql = 'DELETE FROM prefix_table_name';
-		$result = $this->db->sql_query($sql);
-
-		$row1 = array_merge(self::get_default_values(), array(
-			'c_uint' => 1,
-			'c_vchar' => '1', // these values are necessary to avoid unique index issues
-			'c_vchar_size' => '1',
-		));
-		$row2 = array_merge(self::get_default_values(), array(
-			'c_uint' => 2,
-			'c_vchar' => '2',
-			'c_vchar_size' => '2',
-		));
-
-		$sql = 'INSERT INTO prefix_table_name ' . $this->db->sql_build_array('INSERT', $row1);
-		$result = $this->db->sql_query($sql);
-		$id1 = $this->db->sql_nextid();
-
-		$sql = 'INSERT INTO prefix_table_name ' . $this->db->sql_build_array('INSERT', $row2);
-		$result = $this->db->sql_query($sql);
-		$id2 = $this->db->sql_nextid();
-
-		$this->assertGreaterThan($id1, $id2, 'Auto increment should increase the id value');
-
-		$sql = "SELECT *
-			FROM prefix_table_name WHERE c_id = $id1";
-		$result = $this->db->sql_query($sql);
-		$row_actual = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
-		$row1['c_id'] = $id1;
-		$this->assertEquals($row1, $row_actual);
-
-		$sql = "SELECT *
-			FROM prefix_table_name WHERE c_id = $id2";
-		$result = $this->db->sql_query($sql);
-		$row_actual = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
-		$row2['c_id'] = $id2;
-		$this->assertEquals($row2, $row_actual);
-	}
-
 	public function test_list_columns()
 	{
 		$this->assertEquals(
diff --git a/tests/dbal/select_test.php b/tests/dbal/select_test.php
index df888d9824..bd524100a2 100644
--- a/tests/dbal/select_test.php
+++ b/tests/dbal/select_test.php
@@ -375,7 +375,9 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
 	{
 		$db = $this->new_dbal();
 
-		$sql = 'SELECT * FROM (SELECT 1) AS TBL WHERE 1 = 0';
+		$sql = 'SELECT user_id
+			FROM phpbb_users
+			WHERE 1 = 0';
 		$result = $db->sql_query($sql);
 
 		$row = $db->sql_fetchrow($result);
diff --git a/tests/functional/auth_test.php b/tests/functional/auth_test.php
new file mode 100644
index 0000000000..e955dcb4df
--- /dev/null
+++ b/tests/functional/auth_test.php
@@ -0,0 +1,40 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @group functional
+*/
+class phpbb_functional_auth_test extends phpbb_functional_test_case
+{
+	public function test_login()
+	{
+		$this->login();
+
+		// check for logout link
+		$crawler = $this->request('GET', 'index.php');
+		$this->assertContains($this->lang('LOGOUT_USER', 'admin'), $crawler->filter('.navbar')->text());
+	}
+
+	/**
+	* @depends test_login
+	*/
+	public function test_logout()
+	{
+		$this->login();
+		$this->add_lang('ucp');
+
+		// logout
+		$crawler = $this->request('GET', 'ucp.php?sid=' . $this->sid . '&mode=logout');
+		$this->assertContains($this->lang('LOGOUT_REDIRECT'), $crawler->filter('#message')->text());
+
+		// look for a register link, which should be visible only when logged out
+		$crawler = $this->request('GET', 'index.php');
+		$this->assertContains($this->lang('REGISTER'), $crawler->filter('.navbar')->text());
+	}
+}
diff --git a/tests/functional/browse_test.php b/tests/functional/browse_test.php
index 723cf93232..26c18c4c1f 100644
--- a/tests/functional/browse_test.php
+++ b/tests/functional/browse_test.php
@@ -23,4 +23,10 @@ class phpbb_functional_browse_test extends phpbb_functional_test_case
 		$crawler = $this->request('GET', 'viewforum.php?f=2');
 		$this->assertGreaterThan(0, $crawler->filter('.topiclist')->count());
 	}
+
+	public function test_viewtopic()
+	{
+		$crawler = $this->request('GET', 'viewtopic.php?t=1');
+		$this->assertGreaterThan(0, $crawler->filter('.postbody')->count());
+	}
 }
diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php
index 4ee0e68718..e9409d9d3f 100644
--- a/tests/functional/extension_controller_test.php
+++ b/tests/functional/extension_controller_test.php
@@ -65,15 +65,6 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 		}
 	}
 
-	public static function tearDownAfterClass()
-	{
-		$phpbb_root_path = self::$config['phpbb_functional_path'];
-
-		// @todo delete the fixtures from the $phpbb_root_path board
-		// Note that it might be best to find a public domain function
-		// and port it into here instead of writing it from scratch
-	}
-
 	public function setUp()
 	{
 		parent::setUp();
diff --git a/tests/functional/lang_test.php b/tests/functional/lang_test.php
new file mode 100644
index 0000000000..053806a431
--- /dev/null
+++ b/tests/functional/lang_test.php
@@ -0,0 +1,45 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @group functional
+*/
+class phpbb_functional_lang_test extends phpbb_functional_test_case
+{
+	public function test_lang()
+	{
+		// Test a language string present in the common language file
+		$this->assertEquals('Board index', $this->lang('FORUM_INDEX'));
+	}
+
+	/**
+	* @expectedException RuntimeException
+	*/
+	public function test_lang_missing()
+	{
+		$this->assertEquals('Your account has now been activated. Thank you for registering.', $this->lang('ACCOUNT_ACTIVE'));
+	}
+
+	public function test_add_lang()
+	{
+		$this->add_lang('ucp');
+
+		// Test a language string present only in the UCP language file
+		$this->assertEquals('Your account has now been activated. Thank you for registering.', $this->lang('ACCOUNT_ACTIVE'));
+	}
+
+	public function test_add_langs()
+	{
+		$this->add_lang(array('groups', 'memberlist'));
+
+		// Test a language string from each UCP and memberlist
+		$this->assertEquals('The selected group is already your default group.', $this->lang('ALREADY_DEFAULT_GROUP'));
+		$this->assertEquals('Profile', $this->lang('ABOUT_USER'));
+	}
+}
diff --git a/tests/regex/email_test.php b/tests/regex/email_test.php
index 17f93259c3..b4ea5b23aa 100644
--- a/tests/regex/email_test.php
+++ b/tests/regex/email_test.php
@@ -28,6 +28,8 @@ class phpbb_regex_email_test extends phpbb_test_case
 			array('alice_foo@bar.phpbb.com'),
 			array('alice+tag@foo.phpbb.com'),
 			array('alice&amp;tag@foo.phpbb.com'),
+			array('alice@phpbb.australia'),
+			array('alice@phpbb.topZlevelZdomainZnamesZcanZbeZupZtoZsixtyZthreeZcharactersZlong'),
 
 			//array('"John Doe"@example.com'),
 			//array('Alice@[192.168.2.1]'),		// IPv4
@@ -96,6 +98,7 @@ class phpbb_regex_email_test extends phpbb_test_case
 			array('! "#$%(),/;<>[]`|@invalidCharsInLocal.org'),
 			array('invalidCharsInDomain@! "#$%(),/;<>_[]`|.org'),
 			array('local@SecondLevelDomainNamesAreInvalidIfTheyAreLongerThan64Charactersss.org'),
+			array('alice@phpbb.topZlevelZdomainZnamesZcanZbeZupZtoZsixtyZthreeZcharactersZlongZ'),
 		);
 	}
 
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 69c62af297..76650feb02 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -6,6 +6,7 @@
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
+use Symfony\Component\BrowserKit\CookieJar;
 
 require_once __DIR__ . '/../../phpBB/includes/functions_install.php';
 
@@ -18,6 +19,18 @@ class phpbb_functional_test_case extends phpbb_test_case
 	protected $db = null;
 	protected $extension_manager = null;
 
+	/**
+	* Session ID for current test's session (each test makes its own)
+	* @var string
+	*/
+	protected $sid;
+
+	/**
+	* Language array used by phpBB
+	* @var array
+	*/
+	protected $lang = array();
+
 	static protected $config = array();
 	static protected $already_installed = false;
 
@@ -38,8 +51,13 @@ class phpbb_functional_test_case extends phpbb_test_case
 			$this->markTestSkipped('phpbb_functional_url was not set in test_config and wasn\'t set as PHPBB_FUNCTIONAL_URL environment variable either.');
 		}
 
-		$this->client = new Goutte\Client();
+		$this->cookieJar = new CookieJar;
+		$this->client = new Goutte\Client(array(), array(), null, $this->cookieJar);
 		$this->root_url = self::$config['phpbb_functional_url'];
+		// Clear the language array so that things
+		// that were added in other tests are gone
+		$this->lang = array();
+		$this->add_lang('common');
 	}
 
 	public function request($method, $path)
@@ -219,4 +237,63 @@ class phpbb_functional_test_case extends phpbb_test_case
 		$db_conn_mgr = new phpbb_database_test_connection_manager($config);
 		$db_conn_mgr->recreate_db();
 	}
+
+	protected function login()
+	{
+		$this->add_lang('ucp');
+
+		$crawler = $this->request('GET', 'ucp.php');
+		$this->assertContains($this->lang('LOGIN_EXPLAIN_UCP'), $crawler->filter('html')->text());
+
+		$form = $crawler->selectButton($this->lang('LOGIN'))->form();
+		$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 $key => $cookie);
+		{
+			if (substr($key, -4) == '_sid')
+			{
+				$this->sid = $cookie->getValue();
+			}
+		}
+	}
+
+	protected function add_lang($lang_file)
+	{
+		if (is_array($lang_file))
+		{
+			foreach ($lang_file as $file)
+			{
+				$this->add_lang($file);
+			}
+		}
+
+		$lang_path = __DIR__ . "/../../phpBB/language/en/$lang_file.php";
+
+		$lang = array();
+
+		if (file_exists($lang_path))
+		{
+			include($lang_path);
+		}
+
+		$this->lang = array_merge($this->lang, $lang);
+	}
+
+	protected function lang()
+	{
+		$args = func_get_args();
+		$key = $args[0];
+
+		if (empty($this->lang[$key]))
+		{
+			throw new RuntimeException('Language key "' . $key . '" could not be found.');
+		}
+
+		$args[0] = $this->lang[$key];
+
+		return call_user_func_array('sprintf', $args);
+	}
 }
diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index 9c91778cb0..329af2c537 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -63,9 +63,19 @@ class phpbb_test_case_helpers
 			));
 		}
 
-		if (file_exists(dirname(__FILE__) . '/../test_config.php'))
+		if (isset($_SERVER['PHPBB_TEST_CONFIG']))
 		{
-			include(dirname(__FILE__) . '/../test_config.php');
+			// Could be an absolute path
+			$test_config = $_SERVER['PHPBB_TEST_CONFIG'];
+		}
+		else
+		{
+			$test_config = dirname(__FILE__) . '/../test_config.php';
+		}
+
+		if (file_exists($test_config))
+		{
+			include($test_config);
 
 			$config = array_merge($config, array(
 				'dbms'		=> $dbms,
diff --git a/tests/wrapper/phpbb_php_ini_fake.php b/tests/wrapper/phpbb_php_ini_fake.php
new file mode 100644
index 0000000000..49bc5936e5
--- /dev/null
+++ b/tests/wrapper/phpbb_php_ini_fake.php
@@ -0,0 +1,16 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_php_ini_fake extends phpbb_php_ini
+{
+	function get($varname)
+	{
+		return $varname;
+	}
+}
diff --git a/tests/wrapper/phpbb_php_ini_test.php b/tests/wrapper/phpbb_php_ini_test.php
new file mode 100644
index 0000000000..8e08d5c204
--- /dev/null
+++ b/tests/wrapper/phpbb_php_ini_test.php
@@ -0,0 +1,86 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/phpbb_php_ini_fake.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+
+class phpbb_wrapper_phpbb_php_ini_test extends phpbb_test_case
+{
+	protected $php_ini;
+
+	public function setUp()
+	{
+		$this->php_ini = new phpbb_php_ini_fake;
+	}
+
+	public function test_get_string()
+	{
+		$this->assertSame(false, $this->php_ini->get_string(false));
+		$this->assertSame('phpbb', $this->php_ini->get_string(' phpbb '));
+	}
+
+	public function test_get_bool()
+	{
+		$this->assertSame(true, $this->php_ini->get_bool('ON'));
+		$this->assertSame(true, $this->php_ini->get_bool('on'));
+		$this->assertSame(true, $this->php_ini->get_bool('1'));
+
+		$this->assertSame(false, $this->php_ini->get_bool('OFF'));
+		$this->assertSame(false, $this->php_ini->get_bool('off'));
+		$this->assertSame(false, $this->php_ini->get_bool('0'));
+		$this->assertSame(false, $this->php_ini->get_bool(''));
+	}
+
+	public function test_get_int()
+	{
+		$this->assertSame(1234, $this->php_ini->get_int('1234'));
+		$this->assertSame(-12345, $this->php_ini->get_int('-12345'));
+		$this->assertSame(false, $this->php_ini->get_int('phpBB'));
+	}
+
+	public function test_get_float()
+	{
+		$this->assertSame(1234.0, $this->php_ini->get_float('1234'));
+		$this->assertSame(-12345.0, $this->php_ini->get_float('-12345'));
+		$this->assertSame(false, $this->php_ini->get_float('phpBB'));
+	}
+
+	public function test_get_bytes_invalid()
+	{
+		$this->assertSame(false, $this->php_ini->get_bytes(false));
+		$this->assertSame(false, $this->php_ini->get_bytes('phpBB'));
+		$this->assertSame(false, $this->php_ini->get_bytes('k'));
+		$this->assertSame(false, $this->php_ini->get_bytes('-k'));
+		$this->assertSame(false, $this->php_ini->get_bytes('M'));
+		$this->assertSame(false, $this->php_ini->get_bytes('-M'));
+	}
+
+	/**
+	* @dataProvider get_bytes_data
+	*/
+	public function test_get_bytes($expected, $value)
+	{
+		$actual = $this->php_ini->get_bytes($value);
+
+		$this->assertTrue(is_float($actual) || is_int($actual));
+		$this->assertEquals($expected, $actual);
+	}
+
+	static public function get_bytes_data()
+	{
+		return array(
+			array(32 * pow(2, 20),		'32m'),
+			array(- 32 * pow(2, 20),	'-32m'),
+			array(8 * pow(2, 30),		'8G'),
+			array(- 8 * pow(2, 30),		'-8G'),
+			array(1234,					'1234'),
+			array(-12345,				'-12345'),
+		);
+	}
+}