7 files changed, 398 insertions, 16 deletions
diff --git a/tests/functional/jumpbox_test.php b/tests/functional/jumpbox_test.php
new file mode 100644
index 0000000000..b987d2b99b
--- /dev/null
+++ b/tests/functional/jumpbox_test.php
@@ -0,0 +1,33 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @group functional
+*/
+class phpbb_functional_jumpbox_test extends phpbb_functional_test_case
+{
+	public function test_jumpbox()
+	{
+		$this->login();
+
+		$crawler = self::request('GET', "viewtopic.php?t=1&sid={$this->sid}");
+		$form = $crawler->filter('#quickmodform')->selectButton($this->lang('GO'))->form(array(
+			'action'	=> 'merge_topic',
+		));
+
+		$crawler = self::submit($form);
+		$this->assertContains($this->lang('FORUM') . ': Your first forum', $crawler->filter('#cp-main h2')->text());
+		$form = $crawler->filter('#jumpbox')->selectButton($this->lang('GO'))->form(array(
+			'f'	=> 1,
+		));
+
+		$crawler = self::submit($form);
+		$this->assertContains($this->lang('FORUM') . ': Your first category', $crawler->filter('#cp-main h2')->text());
+	}
+}
diff --git a/tests/functions/build_url_test.php b/tests/functions/build_url_test.php
new file mode 100644
index 0000000000..795427ffe8
--- /dev/null
+++ b/tests/functions/build_url_test.php
@@ -0,0 +1,77 @@
+<?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_build_url_test extends phpbb_test_case
+{
+	protected function setUp()
+	{
+		global $user, $phpbb_dispatcher, $phpbb_container, $phpbb_root_path, $phpbb_path_helper;
+
+		parent::setUp();
+
+		$phpbb_container = new phpbb_mock_container_builder();
+		$user = new phpbb_mock_user();
+		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
+
+		$phpbb_path_helper = new \phpbb\path_helper(
+			new \phpbb\symfony_request(
+				new phpbb_mock_request()
+			),
+			new \phpbb\filesystem(),
+			$phpbb_root_path,
+			'php'
+		);
+		$phpbb_container->set('path_helper', $path_helper);
+	}
+	public function build_url_test_data()
+	{
+		return array(
+			array(
+				'index.php',
+				false,
+				'phpBB/index.php?',
+			),
+			array(
+				'index.php',
+				't',
+				'phpBB/index.php?',
+			),
+			array(
+				'viewtopic.php?f=2&style=1&t=6',
+				'f',
+				'phpBB/viewtopic.php?style=1&amp;t=6',
+			),
+			array(
+				'viewtopic.php?f=2&style=1&t=6',
+				array('f', 'style', 't'),
+				'phpBB/viewtopic.php?',
+			),
+			array(
+				'http://test.phpbb.com/viewtopic.php?f=2&style=1&t=6',
+				array('f', 'style', 't'),
+				'http://test.phpbb.com/viewtopic.php?',
+			),
+		);
+	}
+
+	/**
+	* @dataProvider build_url_test_data
+	*/
+	public function test_build_url($page, $strip_vars, $expected)
+	{
+		global $user, $phpbb_root_path;
+
+		$user->page['page'] = $page;
+		$output = build_url($strip_vars);
+
+		$this->assertEquals($expected, $output);
+	}
+}
diff --git a/tests/functions/fixtures/banned_users.xml b/tests/functions/fixtures/banned_users.xml
new file mode 100644
index 0000000000..cec3f4e51f
--- /dev/null
+++ b/tests/functions/fixtures/banned_users.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_banlist">
+		<column>ban_userid</column>
+		<column>ban_exclude</column>
+		<column>ban_end</column>
+		<row>
+			<value>1</value>
+			<value>1</value>
+			<value>0</value>
+		</row>
+		<row>
+			<value>2</value>
+			<value>0</value>
+			<value>0</value>
+		</row>
+		<row>
+			<value>3</value>
+			<value>0</value>
+			<value>0</value>
+		</row>
+		<row>
+			<value>4</value>
+			<value>0</value>
+			<value>2</value>
+		</row>
+		<row>
+			<value>5</value>
+			<value>0</value>
+			<value>999999999999999999999</value>
+		</row>
+		<row>
+			<value>6</value>
+			<value>0</value>
+			<value>3</value>
+		</row>
+	</table>
+</dataset>
diff --git a/tests/functions/phpbb_get_banned_user_ids.php b/tests/functions/phpbb_get_banned_user_ids.php
new file mode 100644
index 0000000000..96de5c5767
--- /dev/null
+++ b/tests/functions/phpbb_get_banned_user_ids.php
@@ -0,0 +1,58 @@
+<?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_user.php';
+
+class phpbb_get_banned_user_ids_test extends phpbb_database_test_case
+{
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/banned_users.xml');
+	}
+
+	public function phpbb_get_banned_user_ids_data()
+	{
+		return array(
+			// Input to phpbb_get_banned_user_ids (user_id list, ban_end)
+			// Expected output
+			array(
+				// True to get users currently banned
+				array(array(1, 2, 4, 5, 6), true),
+				array(2 => 2, 5 => 5),
+			),
+			array(
+				// False to only get permanently banned users
+				array(array(1, 2, 4, 5, 6), false),
+				array(2 => 2),
+			),
+			array(
+				// Unix timestamp to get users banned until that time
+				array(array(1, 2, 4, 5, 6), 2),
+				array(2 => 2, 5 => 5, 6 => 6),
+			),
+		);
+	}
+
+	public function setUp()
+	{
+		global $db;
+
+		$db = $this->new_dbal();
+
+		return parent::setUp();
+	}
+
+	/**
+	* @dataProvider phpbb_get_banned_user_ids_data
+	*/
+	public function test_phpbb_get_banned_user_ids($input, $expected)
+	{
+		$this->assertEquals($expected, call_user_func_array('phpbb_get_banned_user_ids', $input));
+	}
+}
diff --git a/tests/migrator/fixtures/convert_timezones.xml b/tests/migrator/fixtures/convert_timezones.xml
index ce941d8b74..b02cf8393c 100644
--- a/tests/migrator/fixtures/convert_timezones.xml
+++ b/tests/migrator/fixtures/convert_timezones.xml
@@ -6,8 +6,6 @@
 		<column>username_clean</column>
 		<column>user_permissions</column>
 		<column>user_sig</column>
-		<column>user_occ</column>
-		<column>user_interests</column>
 		<column>user_timezone</column>
 		<column>user_dst</column>
 		<row>
@@ -16,8 +14,6 @@
 			<value>1</value>
 			<value></value>
 			<value></value>
-			<value></value>
-			<value></value>
 			<value>-12</value>
 			<value>0</value>
 		</row>
@@ -27,8 +23,6 @@
 			<value>2</value>
 			<value></value>
 			<value></value>
-			<value></value>
-			<value></value>
 			<value>-12</value>
 			<value>1</value>
 		</row>
@@ -38,8 +32,6 @@
 			<value>3</value>
 			<value></value>
 			<value></value>
-			<value></value>
-			<value></value>
 			<value>3</value>
 			<value>0</value>
 		</row>
@@ -49,8 +41,6 @@
 			<value>4</value>
 			<value></value>
 			<value></value>
-			<value></value>
-			<value></value>
 			<value>3</value>
 			<value>1</value>
 		</row>
@@ -60,8 +50,6 @@
 			<value>5</value>
 			<value></value>
 			<value></value>
-			<value></value>
-			<value></value>
 			<value>-3.5</value>
 			<value>0</value>
 		</row>
@@ -71,8 +59,6 @@
 			<value>6</value>
 			<value></value>
 			<value></value>
-			<value></value>
-			<value></value>
 			<value>8.75</value>
 			<value>0</value>
 		</row>
diff --git a/tests/mimetype/guesser_test.php b/tests/mimetype/guesser_test.php
index 9f0371262b..7c58340a7a 100644
--- a/tests/mimetype/guesser_test.php
+++ b/tests/mimetype/guesser_test.php
@@ -19,7 +19,9 @@ function function_exists($name)
 
 class guesser_test extends \phpbb_test_case
 {
-	public static $function_exists = true;
+	public static $function_exists = false;
+
+	protected $fileinfo_supported = false;
 
 	public function setUp()
 	{
@@ -28,7 +30,16 @@ class guesser_test extends \phpbb_test_case
 		$guessers = array(
 			new \Symfony\Component\HttpFoundation\File\MimeType\FileinfoMimeTypeGuesser(),
 			new \Symfony\Component\HttpFoundation\File\MimeType\FileBinaryMimeTypeGuesser(),
+			new \phpbb\mimetype\extension_guesser,
+			new \phpbb\mimetype\content_guesser,
 		);
+
+		// Check if any guesser except the extension_guesser is available
+		$this->fileinfo_supported = $guessers[0]->isSupported() | $guessers[1]->isSupported() | $guessers[3]->is_supported();
+
+		// Also create a guesser that emulates not having fileinfo available
+		$this->guesser_no_fileinfo = new \phpbb\mimetype\guesser(array($guessers[2]));
+
 		$this->guesser = new \phpbb\mimetype\guesser($guessers);
 		$this->path = dirname(__FILE__);
 		$this->jpg_file = $this->path . '/fixtures/jpg';
@@ -52,9 +63,32 @@ class guesser_test extends \phpbb_test_case
 	*/
 	public function test_guess_files($expected, $file)
 	{
+		// We will always get application/octet-stream as mimetype if only the
+		// extension guesser is supported
+		if (!$this->fileinfo_supported)
+		{
+			$this->markTestSkipped('Unable to run tests depending on fileinfo if it is not available');
+		}
 		$this->assertEquals($expected, $this->guesser->guess($this->path . '/../upload/fixture/' . $file));
 	}
 
+	public function data_guess_files_no_fileinfo()
+	{
+		return array(
+			array('application/octet-stream', 'gif'),
+			array('application/octet-stream', 'txt'),
+			array(false, 'foobar'),
+		);
+	}
+
+	/**
+	* @dataProvider data_guess_files_no_fileinfo
+	*/
+	public function test_guess_files_no_fileinfo($expected, $file)
+	{
+		$this->assertEquals($expected, $this->guesser_no_fileinfo->guess($this->path . '/../upload/fixture/' . $file));
+	}
+
 	public function test_file_not_readable()
 	{
 		@chmod($this->jpg_file, 0000);
@@ -130,6 +164,11 @@ class guesser_test extends \phpbb_test_case
 		$supported = false;
 		self::$function_exists = !$overload;
 
+		if (!\function_exists('mime_content_type'))
+		{
+			$this->markTestSkipped('Emulating supported mime_content_type() when it is not supported will cause a fatal error');
+		}
+
 		// Cover possible LogicExceptions
 		foreach ($guessers as $cur_guesser)
 		{
diff --git a/tests/path_helper/web_root_path_test.php b/tests/path_helper/path_helper_test.php
index ec04135997..724f26956c 100644
--- a/tests/path_helper/web_root_path_test.php
+++ b/tests/path_helper/path_helper_test.php
@@ -7,7 +7,7 @@
 *
 */
 
-class phpbb_path_helper_web_root_path_test extends phpbb_test_case
+class phpbb_path_helper_test extends phpbb_test_case
 {
 	protected $path_helper;
 	protected $phpbb_root_path = '';
@@ -176,4 +176,155 @@ class phpbb_path_helper_web_root_path_test extends phpbb_test_case
 	{
 		$this->assertEquals($expected, $this->path_helper->clean_url($input));
 	}
+
+	public function glue_url_params_data()
+	{
+		return array(
+			array(
+				array(),
+				'',
+			),
+			array(
+				array('test' => 'xyz'),
+				'test=xyz',
+			),
+			array(
+				array('test' => 'xyz', 'var' => 'value'),
+				'test=xyz&amp;var=value',
+			),
+		);
+	}
+
+	/**
+	* @dataProvider glue_url_params_data
+	*/
+	public function test_glue_url_params($params, $expected)
+	{
+		$this->assertEquals($expected, $this->path_helper->glue_url_params($params));
+	}
+
+	public function get_url_parts_data()
+	{
+		return array(
+			array(
+				'viewtopic.php',
+				true,
+				array('base' => 'viewtopic.php', 'params' => array()),
+			),
+			array(
+				'./viewtopic.php?t=5&amp;f=6',
+				true,
+				array('base' => './viewtopic.php', 'params' => array('t' => '5', 'f' => '6')),
+			),
+			array(
+				'viewtopic.php?t=5&f=6',
+				false,
+				array('base' => 'viewtopic.php', 'params' => array('t' => '5', 'f' => '6')),
+			),
+			array(
+				'https://phpbb.com/community/viewtopic.php?t=5&amp;f=6',
+				true,
+				array('base' => 'https://phpbb.com/community/viewtopic.php', 'params' => array('t' => '5', 'f' => '6')),
+			),
+			array(
+				'test.php?topic=post=5&amp;f=3',
+				true,
+				array('base' => 'test.php', 'params' => array('topic' => 'post=5', 'f' => '3')),
+			),
+			array(
+				'mcp.php?&amp;t=4&amp;f=3',
+				true,
+				array('base' => 'mcp.php', 'params' => array('t' => '4', 'f' => '3')),
+			),
+			array(
+				'mcp.php?=4&amp;f=3',
+				true,
+				array('base' => 'mcp.php', 'params' => array('f' => '3')),
+			),
+		);
+	}
+
+	/**
+	* @dataProvider get_url_parts_data
+	*/
+	public function test_get_url_parts($url, $is_amp, $expected)
+	{
+		$this->assertEquals($expected, $this->path_helper->get_url_parts($url, $is_amp));
+	}
+
+	public function strip_url_params_data()
+	{
+		return array(
+			array(
+				'viewtopic.php',
+				'sid',
+				false,
+				'viewtopic.php',
+			),
+			array(
+				'./viewtopic.php?t=5&amp;f=6',
+				'f',
+				true,
+				'./viewtopic.php?t=5',
+			),
+			array(
+				'viewtopic.php?t=5&f=6&sid=19adc288814103cbb4625e74e77455aa',
+				array('t'),
+				false,
+				'viewtopic.php?f=6&amp;sid=19adc288814103cbb4625e74e77455aa',
+			),
+			array(
+				'https://phpbb.com/community/viewtopic.php?t=5&amp;f=6',
+				array('t', 'f'),
+				true,
+				'https://phpbb.com/community/viewtopic.php',
+			),
+		);
+	}
+
+	/**
+	* @dataProvider strip_url_params_data
+	*/
+	public function test_strip_url_params($url, $strip, $is_amp, $expected)
+	{
+		$this->assertEquals($expected, $this->path_helper->strip_url_params($url, $strip, $is_amp));
+	}
+
+	public function append_url_params_data()
+	{
+		return array(
+			array(
+				'viewtopic.php',
+				array(),
+				false,
+				'viewtopic.php',
+			),
+			array(
+				'./viewtopic.php?t=5&amp;f=6',
+				array('t' => '7'),
+				true,
+				'./viewtopic.php?t=7&amp;f=6',
+			),
+			array(
+				'viewtopic.php?t=5&f=6&sid=19adc288814103cbb4625e74e77455aa',
+				array('p' => '5'),
+				false,
+				'viewtopic.php?t=5&amp;f=6&amp;p=5&amp;sid=19adc288814103cbb4625e74e77455aa',
+			),
+			array(
+				'https://phpbb.com/community/viewtopic.php',
+				array('t' => '7', 'f' => '8'),
+				true,
+				'https://phpbb.com/community/viewtopic.php?t=7&amp;f=8',
+			),
+		);
+	}
+
+	/**
+	* @dataProvider append_url_params_data
+	*/
+	public function test_append_url_params($url, $params, $is_amp, $expected)
+	{
+		$this->assertEquals($expected, $this->path_helper->append_url_params($url, $params, $is_amp));
+	}
 }