4 files changed, 242 insertions, 11 deletions
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_test.php b/tests/notification/notification_test.php
index 13c868a0c7..beccf55371 100644
--- a/tests/notification/notification_test.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/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;
+	}
 }