9 files changed, 609 insertions, 7 deletions
diff --git a/tests/functional/search/base.php b/tests/functional/search/base.php
index 28327da914..0bd9bf01ab 100644
--- a/tests/functional/search/base.php
+++ b/tests/functional/search/base.php
@@ -12,11 +12,11 @@
 */
 abstract class phpbb_functional_search_base extends phpbb_functional_test_case
 {
-	protected function assert_search_found($keywords)
+	protected function assert_search_found($keywords, $posts_found, $words_highlighted)
 	{
 		$crawler = self::request('GET', 'search.php?keywords=' . $keywords);
-		$this->assertEquals(1, $crawler->filter('.postbody')->count());
-		$this->assertEquals(3, $crawler->filter('.posthilit')->count());
+		$this->assertEquals($posts_found, $crawler->filter('.postbody')->count());
+		$this->assertEquals($words_highlighted, $crawler->filter('.posthilit')->count());
 	}
 
 	protected function assert_search_not_found($keywords)
@@ -32,6 +32,8 @@ abstract class phpbb_functional_search_base extends phpbb_functional_test_case
 		$this->login();
 		$this->admin_login();
 
+		$post = $this->create_topic(2, 'Test Topic 1 foosubject', 'This is a test topic posted by the barsearch testing framework.');
+
 		$crawler = self::request('GET', 'adm/index.php?i=acp_search&mode=settings&sid=' . $this->sid);
 		$form = $crawler->selectButton('Submit')->form();
 		$values = $form->getValues();
@@ -49,18 +51,21 @@ abstract class phpbb_functional_search_base extends phpbb_functional_test_case
 			// check if search backend is not supported
 			if ($crawler->filter('.errorbox')->count() > 0)
 			{
+				$this->delete_topic($post['topic_id']);
 				$this->markTestSkipped("Search backend is not supported/running");
 			}
 			$this->create_search_index();
 		}
 
 		$this->logout();
-		$this->assert_search_found('phpbb3+installation');
+		$this->assert_search_found('phpbb3+installation', 1, 3);
+		$this->assert_search_found('foosubject+barsearch', 1, 2);
 		$this->assert_search_not_found('loremipsumdedo');
 
 		$this->login();
 		$this->admin_login();
 		$this->delete_search_index();
+		$this->delete_topic($post['topic_id']);
 	}
 
 	protected function create_search_index()
diff --git a/tests/functional/ucp_pm_test.php b/tests/functional/ucp_pm_test.php
new file mode 100644
index 0000000000..09521cc9f4
--- /dev/null
+++ b/tests/functional/ucp_pm_test.php
@@ -0,0 +1,48 @@
+<?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_ucp_pm_test extends phpbb_functional_test_case
+{
+	public function setUp()
+	{
+		parent::setUp();
+		$this->login();
+		$this->admin_login();
+	}
+
+	public function test_pm_enabled()
+	{
+		$crawler = self::request('GET', 'ucp.php');
+		$this->assertContainsLang('PRIVATE_MESSAGES', $crawler->filter('html')->text());
+	}
+
+	public function test_pm_disabled()
+	{
+		$this->set_allow_pm(0);
+		$crawler = self::request('GET', 'ucp.php');
+		$this->assertNotContainsLang('PRIVATE_MESSAGES', $crawler->filter('html')->text());
+		$this->set_allow_pm(1);
+	}
+
+	protected function set_allow_pm($enable_pm)
+	{
+		$crawler = self::request('GET', 'adm/index.php?sid=' . $this->sid . '&i=acp_board&mode=message');
+
+		$form = $crawler->selectButton('Submit')->form();
+		$values = $form->getValues();
+
+		$values["config[allow_privmsg]"] = $enable_pm;
+		$form->setValues($values);
+		$crawler = self::submit($form);
+		$this->assertGreaterThan(0, $crawler->filter('.successbox')->count());
+	}
+}
diff --git a/tests/functions/parse_cfg_file_test.php b/tests/functions/parse_cfg_file_test.php
new file mode 100644
index 0000000000..69000ddf72
--- /dev/null
+++ b/tests/functions/parse_cfg_file_test.php
@@ -0,0 +1,103 @@
+<?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.php';
+
+class phpbb_functions_parse_cfg_file extends phpbb_test_case
+{
+	public function parse_cfg_file_data()
+	{
+		return array(
+			array(
+				array(
+					'#',
+					'# phpBB Style Configuration File',
+					'#',
+					'# @package phpBB3',
+					'# @copyright (c) 2005 phpBB Group',
+					'# @license http://opensource.org/licenses/gpl-license.php GNU Public License',
+					'#',
+					'#',
+					'# At the left is the name, please do not change this',
+					'# At the right the value is entered',
+					'# For on/off options the valid values are on, off, 1, 0, true and false',
+					'#',
+					'# Values get trimmed, if you want to add a space in front or at the end of',
+					'# the value, then enclose the value with single or double quotes.',
+					'# Single and double quotes do not need to be escaped.',
+					'#',
+					'',
+					'# General Information about this style',
+					'name = prosilver',
+					'copyright = © phpBB Group, 2007',
+					'version = 3.0.12',
+				),
+				array(
+					'name'		=> 'prosilver',
+					'copyright'	=> '© phpBB Group, 2007',
+					'version'	=> '3.0.12',
+				),
+			),
+			array(
+				array(
+					'name = subsilver2',
+					'copyright = © 2005 phpBB Group',
+					'version = 3.0.12',
+				),
+				array(
+					'name'		=> 'subsilver2',
+					'copyright'	=> '© 2005 phpBB Group',
+					'version'	=> '3.0.12',
+				),
+			),
+			array(
+				array(
+					'foo = on',
+					'foo1 = true',
+					'foo2 = 1',
+					'bar = off',
+					'bar1 = false',
+					'bar2 = 0',
+					'foobar =',
+					'foobar1 = "asdf"',
+					'foobar2 = \'qwer\'',
+				),
+				array(
+					'foo'		=> true,
+					'foo1'		=> true,
+					'foo2'		=> true,
+					'bar'		=> false,
+					'bar1'		=> false,
+					'bar2'		=> false,
+					'foobar'	=> '',
+					'foobar1'	=> 'asdf',
+					'foobar2'	=> 'qwer',
+				),
+			),
+			array(
+				array(
+					'foo = &amp; bar',
+					'bar = <a href="test">Test</a>',
+				),
+				array(
+					'foo'		=> '&amp;amp; bar',
+					'bar'		=> '&lt;a href=&quot;test&quot;&gt;Test&lt;/a&gt;',
+				),
+			),
+		);
+	}
+
+	/**
+	* @dataProvider parse_cfg_file_data
+	*/
+	public function test_parse_cfg_file($file_contents, $expected)
+	{
+		$this->assertEquals($expected, parse_cfg_file(false, $file_contents));
+	}
+}
diff --git a/tests/template/template_test.php b/tests/template/template_test.php
index aaf55fd15c..2b7be9746e 100644
--- a/tests/template/template_test.php
+++ b/tests/template/template_test.php
@@ -306,6 +306,13 @@ class phpbb_template_template_test extends phpbb_template_template_test_case
 				array(),
 				"nonexistent = 0\n! nonexistent\n\nempty = 0\n! empty\nloop\n\nin loop",
 			),
+			array(
+				'loop_include.html',
+				array(),
+				array('test_loop' => array(array('foo' => 'bar'), array('foo' => 'bar1'))),
+				array(),
+				"barbarbar1bar1",
+			),
 			/* Does not pass with the current implementation.
 			array(
 				'loop_reuse.html',
diff --git a/tests/template/templates/loop_include.html b/tests/template/templates/loop_include.html
new file mode 100644
index 0000000000..7bbdfc4248
--- /dev/null
+++ b/tests/template/templates/loop_include.html
@@ -0,0 +1,4 @@
+<!-- BEGIN test_loop -->
+{test_loop.foo}
+	<!-- INCLUDE loop_include1.html -->
+<!-- END test_loop -->
diff --git a/tests/template/templates/loop_include1.html b/tests/template/templates/loop_include1.html
new file mode 100644
index 0000000000..851f6e6e75
--- /dev/null
+++ b/tests/template/templates/loop_include1.html
@@ -0,0 +1 @@
+{test_loop.foo}
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 411d97b590..d6eb4a632f 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -726,15 +726,27 @@ class phpbb_functional_test_case extends phpbb_test_case
 	/**
 	 * assertContains for language strings
 	 *
-	 * @param string $needle Search string
-	 * @param string $haystack Search this
-	 * @param string $message Optional failure message
+	 * @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);
 	}
 
+	/**
+	* assertNotContains for language strings
+	*
+	* @param string $needle		Search string
+	* @param string $haystack	Search this
+	* @param string $message	Optional failure message
+	*/
+	public function assertNotContainsLang($needle, $haystack, $message = null)
+	{
+		$this->assertNotContains(html_entity_decode($this->lang($needle), ENT_QUOTES), $haystack, $message);
+	}
+
 	/*
 	* Perform some basic assertions for the page
 	*
@@ -992,6 +1004,52 @@ class phpbb_functional_test_case extends phpbb_test_case
 	}
 
 	/**
+	* Deletes a topic
+	*
+	* Be sure to login before creating
+	*
+	* @param int $topic_id
+	* @return null
+	*/
+	public function delete_topic($topic_id)
+	{
+		$crawler = self::request('GET', "viewtopic.php?t={$topic_id}&sid={$this->sid}");
+
+		$this->add_lang('posting');
+		$form = $crawler->selectButton('Go')->eq(1)->form();
+		$form['action']->select('delete_topic');
+		$crawler = self::submit($form);
+		$this->assertContainsLang('DELETE_PERMANENTLY', $crawler->text());
+
+		$this->add_lang('mcp');
+		$form = $crawler->selectButton('Yes')->form();
+		$form['delete_permanent'] = 1;
+		$crawler = self::submit($form);
+		$this->assertContainsLang('TOPIC_DELETED_SUCCESS', $crawler->text());
+	}
+
+	/**
+	* Deletes a post
+	*
+	* Be sure to login before creating
+	*
+	* @param int $forum_id
+	* @param int $topic_id
+	* @return null
+	*/
+	public function delete_post($forum_id, $post_id)
+	{
+		$this->add_lang('posting');
+		$crawler = self::request('GET', "posting.php?mode=delete&f={$forum_id}&p={$post_id}&sid={$this->sid}");
+		$this->assertContainsLang('DELETE_PERMANENTLY', $crawler->text());
+
+		$form = $crawler->selectButton('Yes')->form();
+		$form['delete_permanent'] = 1;
+		$crawler = self::submit($form);
+		$this->assertContainsLang('POST_DELETED', $crawler->text());
+	}
+
+	/**
 	* Returns the requested parameter from a URL
 	*
 	* @param	string	$url
diff --git a/tests/version/version_fetch_test.php b/tests/version/version_fetch_test.php
new file mode 100644
index 0000000000..7b3ba5e717
--- /dev/null
+++ b/tests/version/version_fetch_test.php
@@ -0,0 +1,58 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/*
+* @group slow
+*/
+class phpbb_version_helper_fetch_test extends phpbb_test_case
+{
+	public function setUp()
+	{
+		parent::setUp();
+
+		global $phpbb_root_path, $phpEx;
+
+		include_once($phpbb_root_path . 'includes/functions.' . $phpEx);
+
+		$this->cache = $this->getMockBuilder('\phpbb\cache\service')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$this->version_helper = new \phpbb\version_helper(
+			$this->cache,
+			new \phpbb\config\config(array(
+				'version'	=> '3.1.0',
+			)),
+			new \phpbb\user()
+		);
+	}
+
+	public function test_version_phpbb_com()
+	{
+		global $phpbb_root_path, $phpEx;
+		include_once($phpbb_root_path . 'includes/functions.' . $phpEx);
+
+		if (!phpbb_checkdnsrr('version.phpbb.com', 'A'))
+		{
+			$this->markTestSkipped(sprintf(
+				'Could not find a DNS record for hostname %s. ' .
+				'Assuming network is down.',
+				'version.phpbb.com'
+			));
+		}
+
+		$this->version_helper->get_versions();
+
+		// get_versions checks to make sure we got a valid versions file or
+		// throws an exception if we did not. We don't need to test anything
+		// here, but adding an assertion so we do not get a warning about no
+		// assertions in this test
+		$this->assertSame(true, true);
+	}
+}
diff --git a/tests/version/version_test.php b/tests/version/version_test.php
new file mode 100644
index 0000000000..2e2398bd45
--- /dev/null
+++ b/tests/version/version_test.php
@@ -0,0 +1,318 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_version_helper_test extends phpbb_test_case
+{
+	public function setUp()
+	{
+		parent::setUp();
+
+		global $phpbb_root_path, $phpEx;
+
+		include_once($phpbb_root_path . 'includes/functions.' . $phpEx);
+
+		$this->cache = $this->getMockBuilder('\phpbb\cache\service')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$this->version_helper = new \phpbb\version_helper(
+			$this->cache,
+			new \phpbb\config\config(array(
+				'version'	=> '3.1.0',
+			)),
+			new \phpbb\user()
+		);
+	}
+
+	public function is_stable_data()
+	{
+		return array(
+			array(
+				'3.0.0-a1',
+				false,
+			),
+			array(
+				'3.0.0-b1',
+				false,
+			),
+			array(
+				'3.0.0-rc1',
+				false,
+			),
+			array(
+				'3.0.0-RC1',
+				false,
+			),
+			array(
+				'3.0.0',
+				true,
+			),
+			array(
+				'3.0.0-pl1',
+				true,
+			),
+			array(
+				'3.0.0.1-pl1',
+				true,
+			),
+			array(
+				'3.1-dev',
+				false,
+			),
+			array(
+				'foobar',
+				false,
+			),
+		);
+	}
+
+	/**
+	* @dataProvider is_stable_data
+	*/
+	public function test_is_stable($version, $expected)
+	{
+		$this->assertSame($expected, $this->version_helper->is_stable($version));
+	}
+
+	public function get_suggested_updates_data()
+	{
+		return array(
+			array(
+				'1.0.0',
+				array(
+					'1.0'	=> array(
+						'current'		=> '1.0.1',
+					),
+					'1.1'	=> array(
+						'current'		=> '1.1.1',
+					),
+				),
+				array(
+					'1.0'	=> array(
+						'current'		=> '1.0.1',
+					),
+					'1.1'	=> array(
+						'current'		=> '1.1.1',
+					),
+				),
+			),
+			array(
+				'1.0.1',
+				array(
+					'1.0'	=> array(
+						'current'		=> '1.0.1',
+					),
+					'1.1'	=> array(
+						'current'		=> '1.1.1',
+					),
+				),
+				array(
+					'1.1'	=> array(
+						'current'		=> '1.1.1',
+					),
+				),
+			),
+			array(
+				'1.0.1-a1',
+				array(
+					'1.0'	=> array(
+						'current'		=> '1.0.1-a2',
+					),
+					'1.1'	=> array(
+						'current'		=> '1.1.0',
+					),
+				),
+				array(
+					'1.0'	=> array(
+						'current'		=> '1.0.1-a2',
+					),
+					'1.1'	=> array(
+						'current'		=> '1.1.0',
+					),
+				),
+			),
+			array(
+				'1.1.0',
+				array(
+					'1.0'	=> array(
+						'current'		=> '1.0.1',
+					),
+					'1.1'	=> array(
+						'current'		=> '1.1.1',
+					),
+				),
+				array(
+					'1.1'	=> array(
+						'current'		=> '1.1.1',
+					),
+				),
+			),
+			array(
+				'1.1.1',
+				array(
+					'1.0'	=> array(
+						'current'		=> '1.0.1',
+					),
+					'1.1'	=> array(
+						'current'		=> '1.1.1',
+					),
+				),
+				array(),
+			),
+			array(
+				'1.1.0-a1',
+				array(
+					'1.0'	=> array(
+						'current'		=> '1.0.1',
+					),
+					'1.1'	=> array(
+						'current'		=> '1.1.0-a2',
+					),
+				),
+				array(
+					'1.1'	=> array(
+						'current'		=> '1.1.0-a2',
+					),
+				),
+			),
+		);
+	}
+
+	/**
+	* @dataProvider get_suggested_updates_data
+	*/
+	public function test_get_suggested_updates($current_version, $versions, $expected)
+	{
+		$version_helper = $this
+			->getMockBuilder('\phpbb\version_helper')
+			->setMethods(array(
+				'get_versions_matching_stability',
+			))
+			->setConstructorArgs(array(
+				$this->cache,
+				new \phpbb\config\config(array(
+					'version'	=> $current_version,
+				)),
+				new \phpbb\user(),
+			))
+			->getMock()
+		;
+
+		$version_helper->expects($this->any())
+			->method('get_versions_matching_stability')
+			->will($this->returnValue($versions));
+
+		$this->assertSame($expected, $version_helper->get_suggested_updates());
+	}
+
+	public function get_latest_on_current_branch_data()
+	{
+		return array(
+			array(
+				'1.0.0',
+				array(
+					'1.0'	=> array(
+						'current'		=> '1.0.1',
+					),
+					'1.1'	=> array(
+						'current'		=> '1.1.1',
+					),
+				),
+				'1.0.1',
+			),
+			array(
+				'1.0.1',
+				array(
+					'1.0'	=> array(
+						'current'		=> '1.0.1',
+					),
+					'1.1'	=> array(
+						'current'		=> '1.1.1',
+					),
+				),
+				'1.0.1',
+			),
+			array(
+				'1.0.1-a1',
+				array(
+					'1.0'	=> array(
+						'current'		=> '1.0.1-a2',
+					),
+					'1.1'	=> array(
+						'current'		=> '1.1.0',
+					),
+				),
+				'1.0.1-a2',
+			),
+			array(
+				'1.1.0',
+				array(
+					'1.0'	=> array(
+						'current'		=> '1.0.1',
+					),
+					'1.1'	=> array(
+						'current'		=> '1.1.1',
+					),
+				),
+				'1.1.1',
+			),
+			array(
+				'1.1.1',
+				array(
+					'1.0'	=> array(
+						'current'		=> '1.0.1',
+					),
+					'1.1'	=> array(
+						'current'		=> '1.1.1',
+					),
+				),
+				'1.1.1',
+			),
+			array(
+				'1.1.0-a1',
+				array(
+					'1.0'	=> array(
+						'current'		=> '1.0.1',
+					),
+					'1.1'	=> array(
+						'current'		=> '1.1.0-a2',
+					),
+				),
+				'1.1.0-a2',
+			),
+		);
+	}
+
+	/**
+	* @dataProvider get_latest_on_current_branch_data
+	*/
+	public function test_get_latest_on_current_branch($current_version, $versions, $expected)
+	{
+		$version_helper = $this
+			->getMockBuilder('\phpbb\version_helper')
+			->setMethods(array(
+				'get_versions_matching_stability',
+			))
+			->setConstructorArgs(array(
+				$this->cache,
+				new \phpbb\config\config(array(
+					'version'	=> $current_version,
+				)),
+				new \phpbb\user(),
+			))
+			->getMock()
+		;
+
+		$version_helper->expects($this->any())
+			->method('get_versions_matching_stability')
+			->will($this->returnValue($versions));
+
+		$this->assertSame($expected, $version_helper->get_latest_on_current_branch());
+	}
+}