10 files changed, 471 insertions, 154 deletions
diff --git a/tests/avatar/manager_test.php b/tests/avatar/manager_test.php
index f01ea47c25..cb895b521a 100644
--- a/tests/avatar/manager_test.php
+++ b/tests/avatar/manager_test.php
@@ -1,90 +1,160 @@
-<?php
-/**
-*
-* @package testing
-* @version $Id$
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-require_once dirname(__FILE__) . '/driver/foobar.php';
-
-class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase
-{
-	public function setUp()
-	{
-		global $phpbb_root_path, $phpEx;
-
-		// Mock phpbb_container
-		$this->phpbb_container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
-		$this->phpbb_container->expects($this->any())
-			->method('get')
-			->with('avatar.driver.foobar')->will($this->returnValue('avatar.driver.foobar'));
-
-		// Prepare dependencies for avatar manager and driver
-		$config = new phpbb_config(array());
-		$request = $this->getMock('phpbb_request');
-		$cache = $this->getMock('phpbb_cache_driver_interface');
-
-		$this->avatar_foobar = $this->getMock('phpbb_avatar_driver_foobar', array('get_name'), array($config, $phpbb_root_path, $phpEx, $cache));
-		$this->avatar_foobar->expects($this->any())
-            ->method('get_name')
-            ->will($this->returnValue('avatar.driver.foobar'));
-		$this->avatar_barfoo = $this->getMock('phpbb_avatar_driver_barfoo', array('get_name'));
-		$this->avatar_barfoo->expects($this->any())
-            ->method('get_name')
-            ->will($this->returnValue('avatar.driver.barfoo'));
-
-		$avatar_drivers = array($this->avatar_foobar, $this->avatar_barfoo);
-
-		$config['allow_avatar_' . get_class($this->avatar_foobar)] = true;
-		$config['allow_avatar_' . get_class($this->avatar_barfoo)] = false;
-
-		// Set up avatar manager
-		$this->manager = new phpbb_avatar_manager($config, $avatar_drivers, $this->phpbb_container);
-	}
-
-	public function test_get_driver()
-	{
-		$driver = $this->manager->get_driver('avatar.driver.foobar', false);
-		$this->assertEquals('avatar.driver.foobar', $driver);
-
-		$driver = $this->manager->get_driver('avatar.driver.foo_wrong', false);
-		$this->assertNull($driver);
-
-		$driver = $this->manager->get_driver('avatar.driver.foobar');
-		$this->assertEquals('avatar.driver.foobar', $driver);
-
-		$driver = $this->manager->get_driver('avatar.driver.foo_wrong');
-		$this->assertNull($driver);
-	}
-
-	public function test_get_all_drivers()
-	{
-		$drivers = $this->manager->get_all_drivers();
-		$this->assertArrayHasKey('avatar.driver.foobar', $drivers);
-		$this->assertArrayHasKey('avatar.driver.barfoo', $drivers);
-		$this->assertEquals('avatar.driver.foobar', $drivers['avatar.driver.foobar']);
-		$this->assertEquals('avatar.driver.barfoo', $drivers['avatar.driver.barfoo']);
-	}
-
-	public function test_get_enabled_drivers()
-	{
-		$drivers = $this->manager->get_enabled_drivers();
-		$this->assertArrayHasKey('avatar.driver.foobar', $drivers);
-		$this->assertArrayNotHasKey('avatar.driver.barfoo', $drivers);
-		$this->assertEquals('avatar.driver.foobar', $drivers['avatar.driver.foobar']);
-	}
-
-	public function test_get_avatar_settings()
-	{
-		$avatar_settings = $this->manager->get_avatar_settings($this->avatar_foobar);
-
-		$expected_settings = array(
-			'allow_avatar_' . get_class($this->avatar_foobar)	=> array('lang' => 'ALLOW_' . strtoupper(get_class($this->avatar_foobar)), 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
-		);
-
-		$this->assertEquals($expected_settings, $avatar_settings);
-	}
-}
+<?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__) . '/driver/foobar.php';
+
+class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase
+{
+	public function setUp()
+	{
+		global $phpbb_root_path, $phpEx;
+
+		// Mock phpbb_container
+		$this->phpbb_container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+		$this->phpbb_container->expects($this->any())
+			->method('get')
+			->with('avatar.driver.foobar')->will($this->returnValue('avatar.driver.foobar'));
+
+		// Prepare dependencies for avatar manager and driver
+		$config = new phpbb_config(array());
+		$request = $this->getMock('phpbb_request');
+		$cache = $this->getMock('phpbb_cache_driver_interface');
+
+		$this->avatar_foobar = $this->getMock('phpbb_avatar_driver_foobar', array('get_name'), array($config, $phpbb_root_path, $phpEx, $cache));
+		$this->avatar_foobar->expects($this->any())
+            ->method('get_name')
+            ->will($this->returnValue('avatar.driver.foobar'));
+		$this->avatar_barfoo = $this->getMock('phpbb_avatar_driver_barfoo', array('get_name'));
+		$this->avatar_barfoo->expects($this->any())
+            ->method('get_name')
+            ->will($this->returnValue('avatar.driver.barfoo'));
+
+		$avatar_drivers = array($this->avatar_foobar, $this->avatar_barfoo);
+
+		$config['allow_avatar_' . get_class($this->avatar_foobar)] = true;
+		$config['allow_avatar_' . get_class($this->avatar_barfoo)] = false;
+
+		// Set up avatar manager
+		$this->manager = new phpbb_avatar_manager($config, $avatar_drivers, $this->phpbb_container);
+	}
+
+	public function test_get_driver()
+	{
+		$driver = $this->manager->get_driver('avatar.driver.foobar', false);
+		$this->assertEquals('avatar.driver.foobar', $driver);
+
+		$driver = $this->manager->get_driver('avatar.driver.foo_wrong', false);
+		$this->assertNull($driver);
+
+		$driver = $this->manager->get_driver('avatar.driver.foobar');
+		$this->assertEquals('avatar.driver.foobar', $driver);
+
+		$driver = $this->manager->get_driver('avatar.driver.foo_wrong');
+		$this->assertNull($driver);
+	}
+
+	public function test_get_all_drivers()
+	{
+		$drivers = $this->manager->get_all_drivers();
+		$this->assertArrayHasKey('avatar.driver.foobar', $drivers);
+		$this->assertArrayHasKey('avatar.driver.barfoo', $drivers);
+		$this->assertEquals('avatar.driver.foobar', $drivers['avatar.driver.foobar']);
+		$this->assertEquals('avatar.driver.barfoo', $drivers['avatar.driver.barfoo']);
+	}
+
+	public function test_get_enabled_drivers()
+	{
+		$drivers = $this->manager->get_enabled_drivers();
+		$this->assertArrayHasKey('avatar.driver.foobar', $drivers);
+		$this->assertArrayNotHasKey('avatar.driver.barfoo', $drivers);
+		$this->assertEquals('avatar.driver.foobar', $drivers['avatar.driver.foobar']);
+	}
+
+	public function test_get_avatar_settings()
+	{
+		$avatar_settings = $this->manager->get_avatar_settings($this->avatar_foobar);
+
+		$expected_settings = array(
+			'allow_avatar_' . get_class($this->avatar_foobar)	=> array('lang' => 'ALLOW_' . strtoupper(get_class($this->avatar_foobar)), 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
+		);
+
+		$this->assertEquals($expected_settings, $avatar_settings);
+	}
+
+	public function database_row_data()
+	{
+		return array(
+			array(
+				array(
+					'user_avatar'			=> '',
+					'user_avatar_type'		=> '',
+					'user_avatar_width'		=> '',
+					'user_avatar_height'	=> '',
+				),
+				array(
+					'avatar'			=> '',
+					'avatar_type'		=> '',
+					'avatar_width'		=> '',
+					'avatar_height'		=> '',
+				),
+			),
+			array(
+				array(
+					'group_avatar'			=> '',
+					'group_avatar_type'		=> '',
+					'group_avatar_width'	=> '',
+					'group_avatar_height'	=> '',
+				),
+				array(
+					'avatar'			=> '',
+					'avatar_type'		=> '',
+					'avatar_width'		=> '',
+					'avatar_height'		=> '',
+				),
+			),
+			array(
+				array(),
+				array(
+					'avatar'			=> '',
+					'avatar_type'		=> '',
+					'avatar_width'		=> '',
+					'avatar_height'		=> '',
+				),
+			),
+			array(
+				array(
+					'foobar_avatar'			=> '',
+					'foobar_avatar_type'	=> '',
+					'foobar_avatar_width'	=> '',
+					'foobar_avatar_height'	=> '',
+				),
+				array(
+					'foobar_avatar'			=> '',
+					'foobar_avatar_type'	=> '',
+					'foobar_avatar_width'	=> '',
+					'foobar_avatar_height'	=> '',
+				),
+			),
+		);
+	}
+
+	/**
+	* @dataProvider database_row_data
+	*/
+	public function test_clean_row(array $input, array $output)
+	{
+		$cleaned_row = array();
+
+		$cleaned_row = phpbb_avatar_manager::clean_row($input);
+		foreach ($output as $key => $null)
+		{
+			$this->assertArrayHasKey($key, $cleaned_row);
+		}
+	}
+}
diff --git a/tests/dbal/migrator_tool_module.php b/tests/dbal/migrator_tool_module_test.php
index 6937b6f8c5..3303086b26 100644
--- a/tests/dbal/migrator_tool_module.php
+++ b/tests/dbal/migrator_tool_module_test.php
@@ -21,7 +21,7 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
 	public function setup()
 	{
 		// Need global $db, $user for delete_module function in acp_modules
-		global $phpbb_root_path, $phpEx, $skip_add_log, $db, $user;
+		global $phpbb_root_path, $phpEx, $skip_add_log, $db, $user, $phpbb_log;
 
 		parent::setup();
 
@@ -32,6 +32,11 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
 		$this->cache = new phpbb_cache_service(new phpbb_cache_driver_null(), new phpbb_config(array()), $this->db, $phpbb_root_path, $phpEx);
 		$user = $this->user = new phpbb_user();
 
+		$cache = new phpbb_mock_cache;
+		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
+		$auth = $this->getMock('phpbb_auth');
+		$phpbb_log = new phpbb_log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE);
+
 		$this->tool = new phpbb_db_migration_tool_module($this->db, $this->cache, $this->user, $phpbb_root_path, $phpEx, 'phpbb_modules');
 	}
 
diff --git a/tests/dbal/migrator_tool_permission.php b/tests/dbal/migrator_tool_permission_test.php
index 438ab2b28e..438ab2b28e 100644
--- a/tests/dbal/migrator_tool_permission.php
+++ b/tests/dbal/migrator_tool_permission_test.php
diff --git a/tests/dbal/sql_insert_buffer_test.php b/tests/dbal/sql_insert_buffer_test.php
new file mode 100644
index 0000000000..45339a6b50
--- /dev/null
+++ b/tests/dbal/sql_insert_buffer_test.php
@@ -0,0 +1,116 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_dbal_sql_insert_buffer_test extends phpbb_database_test_case
+{
+	protected $db;
+	protected $buffer;
+
+	public function setUp()
+	{
+		parent::setUp();
+
+		$this->db = $this->new_dbal();
+		$this->buffer = new phpbb_db_sql_insert_buffer($this->db, 'phpbb_config', 2);
+		$this->assert_config_count(2);
+	}
+
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml');
+	}
+
+	public function test_multi_insert_disabled_insert_and_flush()
+	{
+		$this->db->multi_insert = false;
+		$this->assertTrue($this->buffer->insert($this->get_row(1)));
+		$this->assert_config_count(3);
+		$this->assertFalse($this->buffer->flush());
+		$this->assert_config_count(3);
+	}
+
+	public function test_multi_insert_enabled_insert_and_flush()
+	{
+		$this->check_multi_insert_support();
+		$this->assertFalse($this->buffer->insert($this->get_row(1)));
+		$this->assert_config_count(2);
+		$this->assertTrue($this->buffer->flush());
+		$this->assert_config_count(3);
+	}
+
+	public function test_multi_insert_disabled_insert_with_flush()
+	{
+		$this->db->multi_insert = false;
+		$this->assertTrue($this->buffer->insert($this->get_row(1)));
+		$this->assert_config_count(3);
+		$this->assertTrue($this->buffer->insert($this->get_row(2)));
+		$this->assert_config_count(4);
+	}
+
+	public function test_multi_insert_enabled_insert_with_flush()
+	{
+		$this->check_multi_insert_support();
+		$this->assertFalse($this->buffer->insert($this->get_row(1)));
+		$this->assert_config_count(2);
+		$this->assertTrue($this->buffer->insert($this->get_row(2)));
+		$this->assert_config_count(4);
+	}
+
+	public function test_multi_insert_disabled_insert_all_and_flush()
+	{
+		$this->db->multi_insert = false;
+		$this->assertTrue($this->buffer->insert_all($this->get_rows(3)));
+		$this->assert_config_count(5);
+	}
+
+	public function test_multi_insert_enabled_insert_all_and_flush()
+	{
+		$this->check_multi_insert_support();
+		$this->assertTrue($this->buffer->insert_all($this->get_rows(3)));
+		$this->assert_config_count(4);
+		$this->assertTrue($this->buffer->flush());
+		$this->assert_config_count(5);
+	}
+
+	protected function assert_config_count($num_configs)
+	{
+		$sql = 'SELECT COUNT(*) AS num_configs
+			FROM phpbb_config';
+		$result = $this->db->sql_query($sql);
+		$this->assertEquals($num_configs, $this->db->sql_fetchfield('num_configs'));
+		$this->db->sql_freeresult($result);
+	}
+
+	protected function check_multi_insert_support()
+	{
+		if (!$this->db->multi_insert)
+		{
+			$this->markTestSkipped('Database does not support multi_insert');
+		}
+	}
+
+	protected function get_row($rownum)
+	{
+		return array(
+			'config_name'	=> "name$rownum",
+			'config_value'	=> "value$rownum",
+			'is_dynamic'	=> '0',
+		);
+	}
+
+	protected function get_rows($n)
+	{
+		$result = array();
+		for ($i = 0; $i < $n; ++$i)
+		{
+			$result[] = $this->get_row($i);
+		}
+		return $result;
+	}
+}
diff --git a/tests/functional/notification_test.php b/tests/functional/notification_test.php
new file mode 100644
index 0000000000..ec495da602
--- /dev/null
+++ b/tests/functional/notification_test.php
@@ -0,0 +1,56 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @group functional
+*/
+class phpbb_functional_notification_test extends phpbb_functional_test_case
+{
+	static public function user_subscription_data()
+	{
+		return array(
+			// Rows inserted by phpBB/install/schemas/schema_data.sql
+			// Also see PHPBB3-11460
+			array('post_notification', true),
+			array('topic_notification', true),
+			array('post_email', true),
+			array('topic_email', true),
+
+			// Default behaviour for in-board notifications:
+			// If user did not opt-out, in-board notifications are on.
+			array('bookmark_notification', true),
+			array('quote_notification', true),
+
+			// Default behaviour for email notifications:
+			// If user did not opt-in, email notifications are off.
+			array('bookmark_email', false),
+			array('quote_email', false),
+		);
+	}
+
+	/**
+	* @dataProvider user_subscription_data
+	*/
+	public function test_user_subscriptions($checkbox_name, $expected_status)
+	{
+		$this->login();
+		$crawler = $this->request('GET', 'ucp.php?i=ucp_notifications&mode=notification_options');
+		$this->assert_response_success();
+
+		$cplist = $crawler->filter('.cplist');
+		if ($expected_status)
+		{
+			$this->assert_checkbox_is_checked($cplist, $checkbox_name);
+		}
+		else
+		{
+			$this->assert_checkbox_is_unchecked($cplist, $checkbox_name);
+		}
+	}
+}
diff --git a/tests/notification/notification.php b/tests/notification/notification_test.php
index 13c868a0c7..beccf55371 100644
--- a/tests/notification/notification.php
+++ b/tests/notification/notification_test.php
@@ -22,11 +22,6 @@ class phpbb_notification_test extends phpbb_database_test_case
 
 		global $phpbb_root_path, $phpEx;
 
-		if (!function_exists('set_var'))
-		{
-			include($phpbb_root_path . 'includes/functions.' . $phpEx);
-		}
-
 		include_once(__DIR__ . '/ext/test/notification/type/test.' . $phpEx);
 
 		$this->db = $this->new_dbal();
diff --git a/tests/template/template_test.php b/tests/template/template_test.php
index f43157775a..56cc7a9de5 100644
--- a/tests/template/template_test.php
+++ b/tests/template/template_test.php
@@ -197,8 +197,6 @@ class phpbb_template_template_test extends phpbb_template_template_test_case
 				array('loop'),
 				'',
 			),
-			/* Currently fail on develop:
-			http://tracker.phpbb.com/browse/PHPBB3-11323
 			array(
 				'include_define_variable.html',
 				array('VARIABLE' => 'variable.html'),
@@ -213,7 +211,6 @@ class phpbb_template_template_test extends phpbb_template_template_test_case
 				array(),
 				'value',
 			),
-			*/
 			/* no top level nested loops
 			array(
 				'loop_vars.html',
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 887dfea3b5..a411d9c98a 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -196,12 +196,12 @@ class phpbb_functional_test_case extends phpbb_test_case
 		$parseURL = parse_url(self::$config['phpbb_functional_url']);
 
 		$data = array_merge($data, array(
-			'email_enable'		=> false,
-			'smtp_delivery'		=> false,
-			'smtp_host'		=> '',
-			'smtp_auth'		=> '',
-			'smtp_user'		=> '',
-			'smtp_pass'		=> '',
+			'email_enable'		=> true,
+			'smtp_delivery'		=> true,
+			'smtp_host'			=> 'nxdomain.phpbb.com',
+			'smtp_auth'			=> '',
+			'smtp_user'			=> 'nxuser',
+			'smtp_pass'			=> 'nxpass',
 			'cookie_secure'		=> false,
 			'force_server_vars'	=> false,
 			'server_protocol'	=> $parseURL['scheme'] . '://',
@@ -463,4 +463,68 @@ class phpbb_functional_test_case extends phpbb_test_case
 		$this->assertGreaterThan(0, count($nodes), $msg);
 		return $nodes;
 	}
+
+	/**
+	* Asserts that exactly one checkbox with name $name exists within the scope
+	* of $crawler and that the checkbox is checked.
+	*
+	* @param Symfony\Component\DomCrawler\Crawler $crawler
+	* @param string $name
+	* @param string $message
+	*
+	* @return null
+	*/
+	public function assert_checkbox_is_checked($crawler, $name, $message = '')
+	{
+		$this->assertSame(
+			'checked',
+			$this->assert_find_one_checkbox($crawler, $name)->attr('checked'),
+			$message ?: "Failed asserting that checkbox $name is checked."
+		);
+	}
+
+	/**
+	* Asserts that exactly one checkbox with name $name exists within the scope
+	* of $crawler and that the checkbox is unchecked.
+	*
+	* @param Symfony\Component\DomCrawler\Crawler $crawler
+	* @param string $name
+	* @param string $message
+	*
+	* @return null
+	*/
+	public function assert_checkbox_is_unchecked($crawler, $name, $message = '')
+	{
+		$this->assertSame(
+			'',
+			$this->assert_find_one_checkbox($crawler, $name)->attr('checked'),
+			$message ?: "Failed asserting that checkbox $name is unchecked."
+		);
+	}
+
+	/**
+	* Searches for an input element of type checkbox with the name $name using
+	* $crawler. Contains an assertion that only one such checkbox exists within
+	* the scope of $crawler.
+	*
+	* @param Symfony\Component\DomCrawler\Crawler $crawler
+	* @param string $name
+	* @param string $message
+	*
+	* @return Symfony\Component\DomCrawler\Crawler
+	*/
+	public function assert_find_one_checkbox($crawler, $name, $message = '')
+	{
+		$query = sprintf('//input[@type="checkbox" and @name="%s"]', $name);
+		$result = $crawler->filterXPath($query);
+
+		$this->assertEquals(
+			1,
+			sizeof($result),
+			$message ?: 'Failed asserting that exactly one checkbox with name' .
+				" $name exists in crawler scope."
+		);
+
+		return $result;
+	}
 }
diff --git a/tests/user/user_loader.php b/tests/user/user_loader.php
deleted file mode 100644
index 0beb804729..0000000000
--- a/tests/user/user_loader.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-include_once(__DIR__ . '/../../phpBB/includes/utf/utf_tools.php');
-
-class phpbb_user_lang_test extends phpbb_database_test_case
-{
-	public function getDataSet()
-	{
-		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/user_loader.xml');
-	}
-
-	public function test_user_loader()
-	{
-		$db = $this->new_dbal();
-
-		$user_loader = new phpbb_user_loader($db, __DIR__ . '/../../phpBB/', 'php', 'phpbb_users');
-
-		$user_loader->load_users(array(2));
-
-		$user = $user_loader->get_user(1);
-		$this->assertEquals(1, $user['user_id']);
-		$this->assertEquals('Guest', $user['username']);
-
-		$user = $user_loader->get_user(2);
-		$this->assertEquals(2, $user['user_id']);
-		$this->assertEquals('Admin', $user['username']);
-
-		// Not loaded
-		$user = $user_loader->get_user(3);
-		$this->assertEquals(1, $user['user_id']);
-		$this->assertEquals('Guest', $user['username']);
-
-		$user = $user_loader->get_user(3, true);
-		$this->assertEquals(3, $user['user_id']);
-		$this->assertEquals('Test', $user['username']);
-
-		$user_id = $user_loader->load_user_by_username('Test');
-		$user = $user_loader->get_user($user_id);
-		$this->assertEquals(3, $user['user_id']);
-		$this->assertEquals('Test', $user['username']);
-	}
-}
diff --git a/tests/user/user_loader_test.php b/tests/user/user_loader_test.php
new file mode 100644
index 0000000000..5cdb654b18
--- /dev/null
+++ b/tests/user/user_loader_test.php
@@ -0,0 +1,63 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+include_once(__DIR__ . '/../../phpBB/includes/utf/utf_tools.php');
+
+class phpbb_user_loader_test extends phpbb_database_test_case
+{
+	protected $db;
+	protected $user_loader;
+
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/user_loader.xml');
+	}
+
+	public function setUp()
+	{
+		parent::setUp();
+
+		$this->db = $this->new_dbal();
+		$this->user_loader = new phpbb_user_loader($this->db, __DIR__ . '/../../phpBB/', 'php', 'phpbb_users');
+	}
+
+	public function test_load_get()
+	{
+		$this->user_loader->load_users(array(2));
+
+		$user = $this->user_loader->get_user(1);
+		$this->assertEquals(1, $user['user_id']);
+		$this->assertEquals('Guest', $user['username']);
+
+		$user = $this->user_loader->get_user(2);
+		$this->assertEquals(2, $user['user_id']);
+		$this->assertEquals('Admin', $user['username']);
+	}
+
+	public function test_load_get_unloaded()
+	{
+		$this->user_loader->load_users(array(2));
+
+		$user = $this->user_loader->get_user(3);
+		$this->assertEquals(1, $user['user_id']);
+		$this->assertEquals('Guest', $user['username']);
+
+		$user = $this->user_loader->get_user(3, true);
+		$this->assertEquals(3, $user['user_id']);
+		$this->assertEquals('Test', $user['username']);
+	}
+
+	public function test_load_user_by_username()
+	{
+		$user_id = $this->user_loader->load_user_by_username('Test');
+		$user = $this->user_loader->get_user($user_id);
+		$this->assertEquals(3, $user['user_id']);
+		$this->assertEquals('Test', $user['username']);
+	}
+}