4 files changed, 286 insertions, 0 deletions
diff --git a/tests/functions/generate_string_list.php b/tests/functions/generate_string_list.php
new file mode 100644
index 0000000000..60269b5656
--- /dev/null
+++ b/tests/functions/generate_string_list.php
@@ -0,0 +1,60 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_display.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+
+class phpbb_generate_string_list_test extends phpbb_test_case
+{
+	public $user;
+
+	public function setUp()
+	{
+		parent::setUp();
+
+		$this->user = new \phpbb\user();
+		$this->user->data = array('user_lang' => 'en');
+		$this->user->add_lang('common');
+	}
+
+	public function generate_string_list_data()
+	{
+		return array(
+			array(
+				array(),
+				'',
+			),
+			array(
+				array('A'),
+				'A',	
+			),
+			array(
+				array(2 => 'A', 3 => 'B'),
+				'A and B',
+			),
+			array(
+				array('A' => 'A', 'B' => 'B', 'C' => 'C'),
+				'A, B, and C',
+			),
+			array(
+				array('A', 'B', 'C', 'D'),
+				'A, B, C, and D',
+			)
+		);
+	}
+
+	/**
+	* @dataProvider generate_string_list_data
+	*/
+	public function test_generate_string_list($items, $expected_result)
+	{
+		$result = phpbb_generate_string_list($items, $this->user);
+		$this->assertEquals($expected_result, $result);
+	}
+}
diff --git a/tests/mock/notification_type_post.php b/tests/mock/notification_type_post.php
new file mode 100644
index 0000000000..80f2afbae0
--- /dev/null
+++ b/tests/mock/notification_type_post.php
@@ -0,0 +1,36 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+class phpbb_mock_notification_type_post extends \phpbb\notification\type\post
+{
+	public function __construct($user_loader, $db, $cache, $user, $auth, $config, $phpbb_root_path, $php_ext, $notification_types_table, $notifications_table, $user_notifications_table)
+	{
+		$this->user_loader = $user_loader;
+		$this->db = $db;
+		$this->cache = $cache;
+		$this->user = $user;
+		$this->auth = $auth;
+		$this->config = $config;
+
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $php_ext;
+
+		$this->notification_types_table = $notification_types_table;
+		$this->notifications_table = $notifications_table;
+		$this->user_notifications_table = $user_notifications_table;	
+	}
+}
diff --git a/tests/notification/fixtures/user_list_trim.xml b/tests/notification/fixtures/user_list_trim.xml
new file mode 100644
index 0000000000..4f708714da
--- /dev/null
+++ b/tests/notification/fixtures/user_list_trim.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_users">
+		<column>user_id</column>
+		<column>username</column>
+		<column>username_clean</column>
+		<column>user_colour</column>
+		<column>user_permissions</column>
+		<column>user_sig</column>
+		<row>
+			<value>2</value>
+			<value>A</value>
+			<value>a</value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>3</value>
+			<value>B</value>
+			<value>b</value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>4</value>
+			<value>C</value>
+			<value>c</value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>5</value>
+			<value>D</value>
+			<value>d</value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>6</value>
+			<value>E</value>
+			<value>e</value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+	</table>
+</dataset>
diff --git a/tests/notification/user_list_trim_test.php b/tests/notification/user_list_trim_test.php
new file mode 100644
index 0000000000..a8422f80b5
--- /dev/null
+++ b/tests/notification/user_list_trim_test.php
@@ -0,0 +1,139 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+
+class phpbb_notification_user_list_trim_test extends phpbb_database_test_case
+{
+	protected $notification;
+
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/user_list_trim.xml');
+	}
+
+	public function setUp()
+	{
+		global $phpbb_root_path, $phpEx, $phpbb_dispatcher, $user, $cache, $auth;
+
+		parent::setUp();
+
+		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
+		$db = $this->new_dbal();
+
+		$config = new \phpbb\config\config(array());
+		set_config(null, null, null, $config);
+		set_config_count(null, null, null, $config);
+
+		$cache = new \phpbb\cache\service(
+			new \phpbb\cache\driver\null(),
+			$config,
+			$db,
+			$phpbb_root_path,
+			$phpEx
+		);
+
+		$auth = $this->getMock('\phpbb\auth\auth');
+		$auth->expects($this->any())
+			->method('acl_get')
+			->with($this->stringContains('_'),
+				$this->anything())
+			->will($this->returnValueMap(array(
+				array('u_viewprofile', 1, false),
+			)));
+
+		$user = new \phpbb\user();
+		$user->data = array('user_lang' => 'en');
+		$user->add_lang('common');
+
+		$user_loader = new phpbb\user_loader($db, $phpbb_root_path, $phpEx, USERS_TABLE);
+		$user_loader->load_users(array(2, 3, 4, 5, 6));
+
+		$this->notification = new phpbb_mock_notification_type_post(
+			$user_loader, null, null, $user, null, null, $phpbb_root_path, $phpEx, null, null, null
+		);
+	}
+
+	public function user_list_trim_data()
+	{
+		return array(
+			array(
+				array(
+					'topic_title'	=> 'Test',
+					'poster_id'		=> 2,
+					'post_username'	=> 'A',
+					'responders'	=> null,			
+				),
+				'A replied to the topic “Test”.',
+			),
+			array(
+				array(
+					'topic_title'	=> 'Test',
+					'poster_id'		=> 2,
+					'post_username'	=> 'A',
+					'responders'	=> array(
+						array('username' => '', 'poster_id' => 3),
+					),			
+				),
+				'A and B replied to the topic “Test”.',
+			),
+			array(
+				array(
+					'topic_title'	=> 'Test',
+					'poster_id'		=> 2,
+					'post_username'	=> 'A',
+					'responders'	=> array(
+						array('username' => '', 'poster_id' => 3),
+						array('username' => '', 'poster_id' => 4),
+					),			
+				),
+				'A, B, and C replied to the topic “Test”.',
+			),
+			array(
+				array(
+					'topic_title'	=> 'Test',
+					'poster_id'		=> 2,
+					'post_username'	=> 'A',
+					'responders'	=> array(
+						array('username' => '', 'poster_id' => 3),
+						array('username' => '', 'poster_id' => 4),
+						array('username' => '', 'poster_id' => 5),
+					),			
+				),
+				'A, B, C, and D replied to the topic “Test”.',
+			),
+			array(
+				array(
+					'topic_title'	=> 'Test',
+					'poster_id'		=> 2,
+					'post_username'	=> 'A',
+					'responders'	=> array(
+						array('username' => '', 'poster_id' => 3),
+						array('username' => '', 'poster_id' => 4),
+						array('username' => '', 'poster_id' => 5),
+						array('username' => '', 'poster_id' => 6),
+					),			
+				),
+				'A, B, C, and 2 others replied to the topic “Test”.',
+			),
+		);
+	}
+
+	/**
+	* @dataProvider user_list_trim_data
+	*/
+	public function test_user_list_trim($data, $expected_result)
+	{
+		$data = array('notification_data' => serialize($data));
+		$this->notification->set_initial_data($data);
+
+		$this->assertEquals($expected_result, $this->notification->get_title());
+	}
+}