diff options
Diffstat (limited to 'tests')
312 files changed, 17118 insertions, 666 deletions
diff --git a/tests/RUNNING_TESTS.md b/tests/RUNNING_TESTS.md index 23c74f4411..f2688ab675 100644 --- a/tests/RUNNING_TESTS.md +++ b/tests/RUNNING_TESTS.md @@ -24,6 +24,7 @@ the following PHP extensions must be installed and enabled to run unit tests:  - ctype (also a PHPUnit dependency)  - dom (PHPUnit dependency) +- json (also a phpBB dependency)  Some of the functionality in phpBB and/or the test suite uses additional  PHP extensions. If these extensions are not loaded, respective tests @@ -34,8 +35,10 @@ will be skipped:  - interbase, pdo_firebird (Firebird database driver)  - mysql, pdo_mysql (MySQL database driver)  - mysqli, pdo_mysql (MySQLi database driver) +- pcntl (flock class)  - pdo (any database tests)  - pgsql, pdo_pgsql (PostgreSQL database driver) +- redis (https://github.com/nicolasff/phpredis, Redis cache driver)  - simplexml (any database tests)  - sqlite, pdo_sqlite (SQLite database driver, requires SQLite 2.x support    in pdo_sqlite) @@ -54,7 +57,7 @@ found below. More information on configuration options can be found on the  wiki (see below).      <?php -    $dbms = 'mysqli'; +    $dbms = 'phpbb_db_driver_mysqli';      $dbhost = 'localhost';      $dbport = '';      $dbname = 'database'; @@ -98,6 +101,21 @@ to connect to that database in phpBB.  Additionally, you will need to be running the DbUnit fork from  https://github.com/phpbb/dbunit/tree/phpbb. +Redis +----- + +In order to run tests for the Redis cache driver, at least one of Redis host +or port must be specified in test configuration. This can be done via +test_config.php as follows: + +    <?php +    $phpbb_redis_host = 'localhost'; +    $phpbb_redis_port = 6379; + +Or via environment variables as follows: + +    $ PHPBB_TEST_REDIS_HOST=localhost PHPBB_TEST_REDIS_PORT=6379 phpunit +  Running  ======= diff --git a/tests/auth/fixtures/user.xml b/tests/auth/fixtures/user.xml new file mode 100644 index 0000000000..34584babbf --- /dev/null +++ b/tests/auth/fixtures/user.xml @@ -0,0 +1,33 @@ +<?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_password</column> +		<column>user_passchg</column> +		<column>user_pass_convert</column> +		<column>user_email</column> +		<column>user_type</column> +		<column>user_login_attempts</column> +		<column>user_permissions</column> +		<column>user_sig</column> +		<column>user_occ</column> +		<column>user_interests</column> +		<row> +			<value>1</value> +			<value>foobar</value> +			<value>foobar</value> +			<value>$H$9E45lK6J8nLTSm9oJE5aNCSTFK9wqa/</value> +			<value>0</value> +			<value>0</value> +			<value>example@example.com</value> +			<value>0</value> +			<value>0</value> +			<value></value> +			<value></value> +			<value></value> +			<value></value> +		</row> +	</table> +</dataset> diff --git a/tests/auth/provider_apache_test.php b/tests/auth/provider_apache_test.php new file mode 100644 index 0000000000..0ca6ef763e --- /dev/null +++ b/tests/auth/provider_apache_test.php @@ -0,0 +1,206 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2013 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_auth_provider_apache_test extends phpbb_database_test_case +{ +	protected $provider; +	protected $user; +	protected $request; + +	protected function setup() +	{ +		parent::setUp(); + +		global $phpbb_root_path, $phpEx; + +		$db = $this->new_dbal(); +		$config = new phpbb_config(array()); +		$this->request = $this->getMock('phpbb_request'); +		$this->user = $this->getMock('phpbb_user'); + +		$this->provider = new phpbb_auth_provider_apache($db, $config, $this->request, $this->user, $phpbb_root_path, $phpEx); +	} + +	public function getDataSet() +	{ +		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/user.xml'); +	} + +	/** +	 * Test to see if a user is identified to Apache. Expects false if they are. +	 */ +	public function test_init() +	{ +		$this->user->data['username'] = 'foobar'; +		$this->request->expects($this->once()) +			->method('is_set') +			->with('PHP_AUTH_USER', +				phpbb_request_interface::SERVER) +			->will($this->returnValue(true)); +		$this->request->expects($this->once()) +			->method('server') +			->with('PHP_AUTH_USER') +			->will($this->returnValue('foobar')); + +		$this->assertFalse($this->provider->init()); +	} + +	public function test_login() +	{ +		$username = 'foobar'; +		$password = 'example'; + +		$this->request->expects($this->once()) +			->method('is_set') +			->with('PHP_AUTH_USER', +				phpbb_request_interface::SERVER) +			->will($this->returnValue(true)); +		$this->request->expects($this->at(1)) +			->method('server') +			->with('PHP_AUTH_USER') +			->will($this->returnValue('foobar')); +		$this->request->expects($this->at(2)) +			->method('server') +			->with('PHP_AUTH_PW') +			->will($this->returnValue('example')); + +		$expected = array( +			'status'		=> LOGIN_SUCCESS, +			'error_msg'		=> false, +			'user_row'		=> array( +				'user_id' 				=> '1', +				'username' 				=> 'foobar', +				'user_password'			=> '$H$9E45lK6J8nLTSm9oJE5aNCSTFK9wqa/', +				'user_passchg' 			=> '0', +				'user_email' 			=> 'example@example.com', +				'user_type' 			=> '0', +				), +		); + +		$this->assertEquals($expected, $this->provider->login($username, $password)); +	} + +	public function test_autologin() +	{ +		$this->request->expects($this->once()) +			->method('is_set') +			->with('PHP_AUTH_USER', +				phpbb_request_interface::SERVER) +			->will($this->returnValue(true)); +		$this->request->expects($this->at(1)) +			->method('server') +			->with('PHP_AUTH_USER') +			->will($this->returnValue('foobar')); +		$this->request->expects($this->at(2)) +			->method('server') +			->with('PHP_AUTH_PW') +			->will($this->returnValue('example')); + +		$expected = array( +			'user_id' => '1', +			'user_type' => '0', +			'group_id' => '3', +			'user_permissions' => '', +			'user_perm_from' => '0', +			'user_ip' => '', +			'user_regdate' => '0', +			'username' => 'foobar', +			'username_clean' => 'foobar', +			'user_password' => '$H$9E45lK6J8nLTSm9oJE5aNCSTFK9wqa/', +			'user_passchg' => '0', +			'user_pass_convert' => '0', +			'user_email' => 'example@example.com', +			'user_email_hash' => '0', +			'user_birthday' => '', +			'user_lastvisit' => '0', +			'user_lastmark' => '0', +			'user_lastpost_time' => '0', +			'user_lastpage' => '', +			'user_last_confirm_key' => '', +			'user_last_search' => '0', +			'user_warnings' => '0', +			'user_last_warning' => '0', +			'user_login_attempts' => '0', +			'user_inactive_reason' => '0', +			'user_inactive_time' => '0', +			'user_posts' => '0', +			'user_lang' => '', +			'user_timezone' => 'UTC', +			'user_dateformat' => 'd M Y H:i', +			'user_style' => '0', +			'user_rank' => '0', +			'user_colour' => '', +			'user_new_privmsg' => '0', +			'user_unread_privmsg' => '0', +			'user_last_privmsg' => '0', +			'user_message_rules' => '0', +			'user_full_folder' => '-3', +			'user_emailtime' => '0', +			'user_topic_show_days' => '0', +			'user_topic_sortby_type' => 't', +			'user_topic_sortby_dir' => 'd', +			'user_post_show_days' => '0', +			'user_post_sortby_type' => 't', +			'user_post_sortby_dir' => 'a', +			'user_notify' => '0', +			'user_notify_pm' => '1', +			'user_notify_type' => '0', +			'user_allow_pm' => '1', +			'user_allow_viewonline' => '1', +			'user_allow_viewemail' => '1', +			'user_allow_massemail' => '1', +			'user_options' => '230271', +			'user_avatar' => '', +			'user_avatar_type' => '', +			'user_avatar_width' => '0', +			'user_avatar_height' => '0', +			'user_sig' => '', +			'user_sig_bbcode_uid' => '', +			'user_sig_bbcode_bitfield' => '', +			'user_from' => '', +			'user_icq' => '', +			'user_aim' => '', +			'user_yim' => '', +			'user_msnm' => '', +			'user_jabber' => '', +			'user_website' => '', +			'user_occ' => '', +			'user_interests' => '', +			'user_actkey' => '', +			'user_newpasswd' => '', +			'user_form_salt' => '', +			'user_new' => '1', +			'user_reminded' => '0', +			'user_reminded_time' => '0', +		); + +		$this->assertEquals($expected, $this->provider->autologin()); +	} + +	public function test_validate_session() +	{ +		$user = array( +			'username'	=> 'foobar', +			'user_type' +			); +		$this->request->expects($this->once()) +			->method('is_set') +			->with('PHP_AUTH_USER', +				phpbb_request_interface::SERVER) +			->will($this->returnValue(true)); +		$this->request->expects($this->once()) +			->method('server') +			->with('PHP_AUTH_USER') +			->will($this->returnValue('foobar')); + +		$this->assertTrue($this->provider->validate_session($user)); +	} +} diff --git a/tests/auth/provider_db_test.php b/tests/auth/provider_db_test.php new file mode 100644 index 0000000000..d876683f84 --- /dev/null +++ b/tests/auth/provider_db_test.php @@ -0,0 +1,50 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2013 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_auth_provider_db_test extends phpbb_database_test_case +{ +	public function getDataSet() +	{ +		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/user.xml'); +	} + +	public function test_login() +	{ +		global $phpbb_root_path, $phpEx; + +		$db = $this->new_dbal(); +		$config = new phpbb_config(array( +			'ip_login_limit_max'			=> 0, +			'ip_login_limit_use_forwarded' 	=> 0, +			'max_login_attempts' 			=> 0, +			)); +		$request = $this->getMock('phpbb_request'); +		$user = $this->getMock('phpbb_user'); +		$provider = new phpbb_auth_provider_db($db, $config, $request, $user, $phpbb_root_path, $phpEx); + +		$expected = array( +			'status'		=> LOGIN_SUCCESS, +			'error_msg'		=> false, +			'user_row'		=> array( +				'user_id' 				=> '1', +				'username' 				=> 'foobar', +				'user_password'			=> '$H$9E45lK6J8nLTSm9oJE5aNCSTFK9wqa/', +				'user_passchg' 			=> '0', +				'user_pass_convert' 	=> '0', +				'user_email' 			=> 'example@example.com', +				'user_type' 			=> '0', +				'user_login_attempts' 	=> '0', +				), +		); + +		$this->assertEquals($expected, $provider->login('foobar', 'example')); +	} +} diff --git a/tests/avatar/driver/barfoo.php b/tests/avatar/driver/barfoo.php new file mode 100644 index 0000000000..0b701a4d70 --- /dev/null +++ b/tests/avatar/driver/barfoo.php @@ -0,0 +1,19 @@ +<?php
 +
 +class phpbb_avatar_driver_barfoo extends phpbb_avatar_driver
 +{
 +	public function get_data($row)
 +	{
 +		return array();
 +	}
 +
 +	public function prepare_form($request, $template, $user, $row, &$error)
 +	{
 +		return false;
 +	}
 +
 +	public function process_form($request, $template, $user, $row, &$error)
 +	{
 +		return false;
 +	}
 +}
 diff --git a/tests/avatar/driver/foobar.php b/tests/avatar/driver/foobar.php new file mode 100644 index 0000000000..995f35818b --- /dev/null +++ b/tests/avatar/driver/foobar.php @@ -0,0 +1,19 @@ +<?php
 +
 +class phpbb_avatar_driver_foobar extends phpbb_avatar_driver
 +{
 +	public function get_data($row)
 +	{
 +		return array();
 +	}
 +
 +	public function prepare_form($request, $template, $user, $row, &$error)
 +	{
 +		return false;
 +	}
 +
 +	public function process_form($request, $template, $user, $row, &$error)
 +	{
 +		return false;
 +	}
 +}
 diff --git a/tests/avatar/manager_test.php b/tests/avatar/manager_test.php new file mode 100644 index 0000000000..cb895b521a --- /dev/null +++ b/tests/avatar/manager_test.php @@ -0,0 +1,160 @@ +<?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/bbcode/parser_test.php b/tests/bbcode/parser_test.php new file mode 100644 index 0000000000..d0dcce5bbf --- /dev/null +++ b/tests/bbcode/parser_test.php @@ -0,0 +1,265 @@ +<?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.php'; +require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php'; +require_once dirname(__FILE__) . '/../../phpBB/includes/bbcode.php'; +require_once dirname(__FILE__) . '/../../phpBB/includes/message_parser.php'; + +class phpbb_bbcode_parser_test extends PHPUnit_Framework_TestCase +{ +	public function bbcode_firstpass_data() +	{ +		return array( +			// Default bbcodes from in their simplest way +			array( +				'Test default bbcodes: simple bold', +				'[b]bold[/b]', +				'[b:]bold[/b:]', +			), +			array( +				'Test default bbcodes: simple underlined', +				'[u]underlined[/u]', +				'[u:]underlined[/u:]', +			), +			array( +				'Test default bbcodes: simple italic', +				'[i]italic[/i]', +				'[i:]italic[/i:]', +			), +			array( +				'Test default bbcodes: simple color rgb', +				'[color=#FF0000]colored[/color]', +				'[color=#FF0000:]colored[/color:]', +			), +			array( +				'Test default bbcodes: simple color name', +				'[color=red]colored[/color]', +				'[color=red:]colored[/color:]', +			), +			array( +				'Test default bbcodes: simple size', +				'[size=75]smaller[/size]', +				'[size=75:]smaller[/size:]', +			), +			array( +				'Test default bbcodes: simple quote', +				'[quote]quoted[/quote]', +				'[quote:]quoted[/quote:]', +			), +			array( +				'Test default bbcodes: simple quote with username', +				'[quote="username"]quoted[/quote]', +				'[quote="username":]quoted[/quote:]', +			), +			array( +				'Test default bbcodes: simple code', +				'[code]unparsed code[/code]', +				'[code:]unparsed code[/code:]', +			), +			array( +				'Test default bbcodes: simple php code', +				'[code=php]unparsed code[/code]', +				'[code=php:]<span class="syntaxdefault">unparsed code</span>[/code:]', +			), +			array( +				'Test default bbcodes: simple list', +				'[list]no item[/list]', +				'[list:]no item[/list:u:]', +			), +			array( +				'Test default bbcodes: simple list-item only', +				'[*]unparsed', +				'[*]unparsed', +			), +			array( +				'Test default bbcodes: simple list-item', +				'[list][*]item[/list]', +				'[list:][*:]item[/*:m:][/list:u:]', +			), +			array( +				'Test default bbcodes: simple list-item closed', +				'[list][*]item[/*][/list]', +				'[list:][*:]item[/*:][/list:u:]', +			), +			array( +				'Test default bbcodes: simple list-item numbered', +				'[list=1][*]item[/list]', +				'[list=1:][*:]item[/*:m:][/list:o:]', +			), +			array( +				'Test default bbcodes: simple list-item alpha', +				'[list=a][*]item[/list]', +				'[list=a:][*:]item[/*:m:][/list:o:]', +			), +			array( +				'Test default bbcodes: simple list-item roman', +				'[list=i][*]item[/list]', +				'[list=i:][*:]item[/*:m:][/list:o:]', +			), +			array( +				'Test default bbcodes: simple list-item disc', +				'[list=disc][*]item[/list]', +				'[list=disc:][*:]item[/*:m:][/list:u:]', +			), +			array( +				'Test default bbcodes: simple list-item circle', +				'[list=circle][*]item[/list]', +				'[list=circle:][*:]item[/*:m:][/list:u:]', +			), +			array( +				'Test default bbcodes: simple list-item square', +				'[list=square][*]item[/list]', +				'[list=square:][*:]item[/*:m:][/list:u:]', +			), +			array( +				'Test default bbcodes: simple img', +				'[img]https://area51.phpbb.com/images/area51.png[/img]', +				'[img:]https://area51.phpbb.com/images/area51.png[/img:]', +			), +			array( +				'Test default bbcodes: simple url', +				'[url]https://area51.phpbb.com/[/url]', +				'[url:]https://area51.phpbb.com/[/url:]', +			), +			array( +				'Test default bbcodes: simple url with description', +				'[url=https://area51.phpbb.com/]Area51[/url]', +				'[url=https://area51.phpbb.com/:]Area51[/url:]', +			), +			array( +				'Test default bbcodes: simple email', +				'[email]bbcode-test@phpbb.com[/email]', +				'[email:]bbcode-test@phpbb.com[/email:]', +			), +			array( +				'Test default bbcodes: simple email with description', +				'[email=bbcode-test@phpbb.com]Email[/email]', +				'[email=bbcode-test@phpbb.com:]Email[/email:]', +			), +			array( +				'Test default bbcodes: simple attachment', +				'[attachment=0]filename[/attachment]', +				'[attachment=0:]<!-- ia0 -->filename<!-- ia0 -->[/attachment:]', +			), + +			// Special cases for quote which were reported as bugs before +			array( +				'PHPBB3-1401 - correct: parsed', +				'[quote="[test]test"]test [ test[/quote]', +				'[quote="[test]test":]test [ test[/quote:]', +			), +			array( +				'PHPBB3-6117 - correct: parsed', +				'[quote]test[/quote] test ] and [ test [quote]test[/quote]', +				'[quote:]test[/quote:] test ] and [ test [quote:]test[/quote:]', +			), +			array( +				'PHPBB3-6200 - correct: parsed', +				'[quote="["]test[/quote]', +				'[quote="[":]test[/quote:]', +			), +			array( +				'PHPBB3-9364 - quoted: "test[/[/b]quote] test" / non-quoted: "[/quote] test" - also failed if layout distorted', +				'[quote]test[/[/b]quote] test [/quote][/quote] test', +				'[quote:]test[/[/b]quote] test [/quote:][/quote] test', +			), +			array( +				'PHPBB3-8096 - first quote tag parsed, second quote tag unparsed', +				'[quote="a"]a[/quote][quote="a]a[/quote]', +				'[quote="a":]a[/quote:][quote="a]a[/quote]', +			), + +			// Simple bbcodes nesting +			array( +				'Allow textual bbcodes in textual bbcodes', +				'[b]bold [i]bold + italic[/i][/b]', +				'[b:]bold [i:]bold + italic[/i:][/b:]', +			), +			array( +				'Allow textual bbcodes in url with description', +				'[url=https://area51.phpbb.com/]Area51 [i]italic[/i][/url]', +				'[url=https://area51.phpbb.com/:]Area51 [i:]italic[/i:][/url:]', +			), +			array( +				'Allow url with description in textual bbcodes', +				'[i]italic [url=https://area51.phpbb.com/]Area51[/url][/i]', +				'[i:]italic [url=https://area51.phpbb.com/:]Area51[/url:][/i:]', +			), + +			// Nesting bbcodes into quote usernames +			array( +				'Allow textual bbcodes in usernames', +				'[quote="[i]test[/i]"]test[/quote]', +				'[quote="[i:]test[/i:]":]test[/quote:]', +			), +			array( +				'Allow links bbcodes in usernames', +				'[quote="[url=https://area51.phpbb.com/]test[/url]"]test[/quote]', +				'[quote="[url=https://area51.phpbb.com/:]test[/url:]":]test[/quote:]', +			), +			array( +				'Allow img bbcodes in usernames - Username displayed the image', +				'[quote="[img]https://area51.phpbb.com/images/area51.png[/img]"]test[/quote]', +				'[quote="[img:]https://area51.phpbb.com/images/area51.png[/img:]":]test[/quote:]', +			), +			array( +				'Disallow flash bbcodes in usernames - Username displayed as [flash]http://www.phpbb.com/[/flash]', +				'[quote="[flash]http://www.phpbb.com/[/flash]"]test[/quote]', +				'[quote="[flash]http://www.phpbb.com/[/flash]":]test[/quote:]', +			), +			array( +				'Disallow quote bbcodes in usernames - Username displayed as [quote]test[/quote]', +				'[quote="[quote]test[/quote]"]test[/quote]', +				'[quote="[quote]test[/quote]":]test[/quote:]', +			), + +			// Do not parse bbcodes in code boxes +			array( +				'Do not parse textual bbcodes in code', +				'[code]unparsed code [b]bold [i]bold + italic[/i][/b][/code]', +				'[code:]unparsed code [b]bold [i]bold + italic[/i][/b][/code:]', +			), +			array( +				'Do not parse quote bbcodes in code', +				'[code]unparsed code [quote="username"]quoted[/quote][/code]', +				'[code:]unparsed code [quote="username"]quoted[/quote][/code:]', +			), + +			// New user friendly mixed nesting +			array( +				'Textual bbcode nesting into textual bbcode', +				'[b]bold [i]bold + italic[/b] italic[/i]', +				'[b:]bold [i:]bold + italic[/b:] italic[/i:]', +				'Incomplete test case: secondpass parses as [b:]bold [i:]bold + italic[/i:] italic[/b:]', +			), +		); +	} + +	/** +	* @dataProvider bbcode_firstpass_data +	*/ +	public function test_bbcode_firstpass($description, $message, $expected, $incomplete = false) +	{ +		if ($incomplete) +		{ +			$this->markTestIncomplete($incomplete); +		} + +		global $user, $request; +		$user = new phpbb_mock_user; +		$request = new phpbb_mock_request; + +		$bbcode = new bbcode_firstpass(); +		$bbcode->message = $message; +		$bbcode->bbcode_init(false); +		$bbcode->parse_bbcode(); +		$this->assertEquals($expected, $bbcode->message); +	} +} diff --git a/tests/bbcode/url_bbcode_test.php b/tests/bbcode/url_bbcode_test.php index 6b5afe5808..d5df386714 100644 --- a/tests/bbcode/url_bbcode_test.php +++ b/tests/bbcode/url_bbcode_test.php @@ -11,7 +11,6 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';  require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php';  require_once dirname(__FILE__) . '/../../phpBB/includes/bbcode.php';  require_once dirname(__FILE__) . '/../../phpBB/includes/message_parser.php'; -require_once dirname(__FILE__) . '/../mock/user.php';  class phpbb_url_bbcode_test extends phpbb_test_case  { @@ -51,8 +50,9 @@ class phpbb_url_bbcode_test extends phpbb_test_case  	*/  	public function test_url($description, $message, $expected)  	{ -		global $user; +		global $user, $request;  		$user = new phpbb_mock_user; +		$request = new phpbb_mock_request;  		$bbcode = new bbcode_firstpass();  		$bbcode->message = $message; diff --git a/tests/bootstrap.php b/tests/bootstrap.php index d687db622a..a38740c82d 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -14,28 +14,17 @@ require_once $phpbb_root_path . 'includes/startup.php';  $table_prefix = 'phpbb_';  require_once $phpbb_root_path . 'includes/constants.php'; +require_once $phpbb_root_path . 'includes/class_loader.' . $phpEx; + +$phpbb_class_loader_mock = new phpbb_class_loader('phpbb_mock_', $phpbb_root_path . '../tests/mock/', "php"); +$phpbb_class_loader_mock->register(); +$phpbb_class_loader_ext = new phpbb_class_loader('phpbb_ext_', $phpbb_root_path . 'ext/', "php"); +$phpbb_class_loader_ext->register(); +$phpbb_class_loader = new phpbb_class_loader('phpbb_', $phpbb_root_path . 'includes/', "php"); +$phpbb_class_loader->register();  require_once 'test_framework/phpbb_test_case_helpers.php';  require_once 'test_framework/phpbb_test_case.php';  require_once 'test_framework/phpbb_database_test_case.php';  require_once 'test_framework/phpbb_database_test_connection_manager.php'; - -if (version_compare(PHP_VERSION, '5.3.0-dev', '>=')) -{ -	if (getenv('PHPBB_NO_COMPOSER_AUTOLOAD')) -	{ -		if (getenv('PHPBB_AUTOLOAD')) -		{ -			require(getenv('PHPBB_AUTOLOAD')); -		} -	} -	else -	{ -		if (!file_exists($phpbb_root_path . 'vendor/autoload.php')) -		{ -			trigger_error('You have not set up composer dependencies. See http://getcomposer.org/.', E_USER_ERROR); -		} -		require($phpbb_root_path . 'vendor/autoload.php'); -	} -	require_once 'test_framework/phpbb_functional_test_case.php'; -} +require_once 'test_framework/phpbb_functional_test_case.php'; diff --git a/tests/cache/apc_driver_test.php b/tests/cache/apc_driver_test.php new file mode 100644 index 0000000000..3380762878 --- /dev/null +++ b/tests/cache/apc_driver_test.php @@ -0,0 +1,53 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2012 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +// Important: apc.enable_cli=1 must be in php.ini. +// http://forums.devshed.com/php-development-5/apc-problem-561290.html +// http://php.net/manual/en/apc.configuration.php + +require_once dirname(__FILE__) . '/common_test_case.php'; + +class phpbb_cache_apc_driver_test extends phpbb_cache_common_test_case +{ +	protected static $config; +	protected $driver; + +	public function getDataSet() +	{ +		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml'); +	} + +	static public function setUpBeforeClass() +	{ +		if (!extension_loaded('apc')) +		{ +			self::markTestSkipped('APC extension is not loaded'); +		} + +		$php_ini = new phpbb_php_ini; + +		if (!$php_ini->get_bool('apc.enabled')) +		{ +			self::markTestSkipped('APC is not enabled. Make sure apc.enabled=1 in php.ini'); +		} + +		if (PHP_SAPI == 'cli' && !$php_ini->get_bool('apc.enable_cli')) +		{ +			self::markTestSkipped('APC is not enabled for CLI. Set apc.enable_cli=1 in php.ini'); +		} +	} + +	protected function setUp() +	{ +		parent::setUp(); + +		$this->driver = new phpbb_cache_driver_apc; +		$this->driver->purge(); +	} +} diff --git a/tests/cache/common_test_case.php b/tests/cache/common_test_case.php new file mode 100644 index 0000000000..a5bc2bfda9 --- /dev/null +++ b/tests/cache/common_test_case.php @@ -0,0 +1,98 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2012 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +abstract class phpbb_cache_common_test_case extends phpbb_database_test_case +{ +	public function test_get_put_exists() +	{ +		$this->assertFalse($this->driver->_exists('test_key')); +		$this->assertSame(false, $this->driver->get('test_key')); + +		$this->driver->put('test_key', 'test_value'); + +		$this->assertTrue($this->driver->_exists('test_key')); +		$this->assertEquals( +			'test_value', +			$this->driver->get('test_key'), +			'File ACM put and get' +		); +	} + +	public function test_purge() +	{ +		$this->driver->put('test_key', 'test_value'); + +		$this->assertEquals( +			'test_value', +			$this->driver->get('test_key'), +			'File ACM put and get' +		); + +		$this->driver->purge(); + +		$this->assertSame(false, $this->driver->get('test_key')); +	} + +	public function test_destroy() +	{ +		$this->driver->put('first_key', 'first_value'); +		$this->driver->put('second_key', 'second_value'); + +		$this->assertEquals( +			'first_value', +			$this->driver->get('first_key') +		); +		$this->assertEquals( +			'second_value', +			$this->driver->get('second_key') +		); + +		$this->driver->destroy('first_key'); + +		$this->assertFalse($this->driver->_exists('first_key')); +		$this->assertEquals( +			'second_value', +			$this->driver->get('second_key') +		); +	} + +	public function test_cache_sql() +	{ +		global $db, $cache, $phpbb_root_path, $phpEx; +		$config = new phpbb_config(array()); +		$db = $this->new_dbal(); +		$cache = new phpbb_cache_service($this->driver, $config, $db, $phpbb_root_path, $phpEx); + +		$sql = "SELECT * FROM phpbb_config +			WHERE config_name = 'foo'"; + +		$result = $db->sql_query($sql, 300); +		$first_result = $db->sql_fetchrow($result); +		$expected = array('config_name' => 'foo', 'config_value' => '23', 'is_dynamic' => 0); +		$this->assertEquals($expected, $first_result); + +		$sql = 'DELETE FROM phpbb_config'; +		$result = $db->sql_query($sql); + +		$sql = "SELECT * FROM phpbb_config +			WHERE config_name = 'foo'"; +		$result = $db->sql_query($sql, 300); + +		$this->assertEquals($expected, $db->sql_fetchrow($result)); + +		$sql = "SELECT * FROM phpbb_config +			WHERE config_name = 'foo'"; +		$result = $db->sql_query($sql); + +		$no_cache_result = $db->sql_fetchrow($result); +		$this->assertSame(false, $no_cache_result); + +		$db->sql_close(); +	} +} diff --git a/tests/cache/file_driver_test.php b/tests/cache/file_driver_test.php new file mode 100644 index 0000000000..745c6bb081 --- /dev/null +++ b/tests/cache/file_driver_test.php @@ -0,0 +1,69 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2010 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +require_once dirname(__FILE__) . '/common_test_case.php'; + +class phpbb_cache_file_driver_test extends phpbb_cache_common_test_case +{ +	private $cache_dir; +	protected $driver; + +	public function __construct() +	{ +		$this->cache_dir = dirname(__FILE__) . '/../tmp/cache/'; +	} + +	public function getDataSet() +	{ +		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml'); +	} + +	protected function setUp() +	{ +		parent::setUp(); + +		if (file_exists($this->cache_dir)) +		{ +			// cache directory possibly left after aborted +			// or failed run earlier +			$this->remove_cache_dir(); +		} +		$this->create_cache_dir(); + +		$this->driver = new phpbb_cache_driver_file($this->cache_dir); +	} + +	protected function tearDown() +	{ +		if (file_exists($this->cache_dir)) +		{ +			$this->remove_cache_dir(); +		} + +		parent::tearDown(); +	} + +	private function create_cache_dir() +	{ +		$this->get_test_case_helpers()->makedirs($this->cache_dir); +	} + +	private function remove_cache_dir() +	{ +		$iterator = new DirectoryIterator($this->cache_dir); +		foreach ($iterator as $file) +		{ +			if ($file != '.' && $file != '..') +			{ +				unlink($this->cache_dir . '/' . $file); +			} +		} +		rmdir($this->cache_dir); +	} +} diff --git a/tests/cache/fixtures/config.xml b/tests/cache/fixtures/config.xml new file mode 100644 index 0000000000..9d395b685c --- /dev/null +++ b/tests/cache/fixtures/config.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<dataset> +	<table name="phpbb_config"> +		<column>config_name</column> +		<column>config_value</column> +		<column>is_dynamic</column> +		<row> +			<value>foo</value> +			<value>23</value> +			<value>0</value> +		</row> +		<row> +			<value>bar</value> +			<value>42</value> +			<value>1</value> +		</row> +	</table> +</dataset> diff --git a/tests/cache/null_driver_test.php b/tests/cache/null_driver_test.php new file mode 100644 index 0000000000..43a0cc806c --- /dev/null +++ b/tests/cache/null_driver_test.php @@ -0,0 +1,75 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2012 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +class phpbb_cache_null_driver_test extends phpbb_database_test_case +{ +	protected $driver; + +	public function getDataSet() +	{ +		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml'); +	} + +	protected function setUp() +	{ +		parent::setUp(); + +		$this->driver = new phpbb_cache_driver_null; +	} + +	public function test_get_put() +	{ +		$this->assertSame(false, $this->driver->get('key')); + +		$this->driver->put('key', 'value'); + +		// null driver does not cache +		$this->assertSame(false, $this->driver->get('key')); +	} + +	public function test_purge() +	{ +		// does nothing +		$this->driver->purge(); +	} + +	public function test_destroy() +	{ +		// does nothing +		$this->driver->destroy('foo'); +	} + +	public function test_cache_sql() +	{ +		global $db, $cache, $phpbb_root_path, $phpEx; +		$config = new phpbb_config(array()); +		$db = $this->new_dbal(); +		$cache = new phpbb_cache_service($this->driver, $config, $db, $phpbb_root_path, $phpEx); + +		$sql = "SELECT * FROM phpbb_config +			WHERE config_name = 'foo'"; +		$result = $db->sql_query($sql, 300); +		$first_result = $db->sql_fetchrow($result); +		$expected = array('config_name' => 'foo', 'config_value' => '23', 'is_dynamic' => 0); +		$this->assertEquals($expected, $first_result); + +		$sql = 'DELETE FROM phpbb_config'; +		$result = $db->sql_query($sql); + +		// As null cache driver does not actually cache, +		// this should return no results +		$sql = "SELECT * FROM phpbb_config +			WHERE config_name = 'foo'"; +		$result = $db->sql_query($sql, 300); + +		$this->assertSame(false, $db->sql_fetchrow($result)); + +		$db->sql_close(); +	} +} diff --git a/tests/cache/redis_driver_test.php b/tests/cache/redis_driver_test.php new file mode 100644 index 0000000000..1308519a18 --- /dev/null +++ b/tests/cache/redis_driver_test.php @@ -0,0 +1,49 @@ +<?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__) . '/common_test_case.php'; + +class phpbb_cache_redis_driver_test extends phpbb_cache_common_test_case +{ +	protected static $config; +	protected $driver; + +	public function getDataSet() +	{ +		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml'); +	} + +	static public function setUpBeforeClass() +	{ +		if (!extension_loaded('redis')) +		{ +			self::markTestSkipped('redis extension is not loaded'); +		} + +		$config = phpbb_test_case_helpers::get_test_config(); +		if (isset($config['redis_host']) || isset($config['redis_port'])) +		{ +			$host = isset($config['redis_host']) ? $config['redis_host'] : 'localhost'; +			$port = isset($config['redis_port']) ? $config['redis_port'] : 6379; +			self::$config = array('host' => $host, 'port' => $port); +		} +		else +		{ +			self::markTestSkipped('Test redis host/port is not specified'); +		} +	} + +	protected function setUp() +	{ +		parent::setUp(); + +		$this->driver = new phpbb_cache_driver_redis(self::$config['host'], self::$config['port']); +		$this->driver->purge(); +	} +} diff --git a/tests/class_loader/class_loader_test.php b/tests/class_loader/class_loader_test.php new file mode 100644 index 0000000000..bf27c7c217 --- /dev/null +++ b/tests/class_loader/class_loader_test.php @@ -0,0 +1,103 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2011 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +class phpbb_class_loader_test extends PHPUnit_Framework_TestCase +{ +	public function setUp() +	{ +		global $phpbb_class_loader; +		$phpbb_class_loader->unregister(); + +		global $phpbb_class_loader_ext; +		$phpbb_class_loader_ext->unregister(); +	} + +	public function tearDown() +	{ +		global $phpbb_class_loader_ext; +		$phpbb_class_loader_ext->register(); + +		global $phpbb_class_loader; +		$phpbb_class_loader->register(); +	} + +	public function test_resolve_path() +	{ +		$prefix = dirname(__FILE__) . '/'; +		$class_loader = new phpbb_class_loader('phpbb_', $prefix . 'includes/'); + +		$prefix .= 'includes/'; + +		$this->assertEquals( +			'', +			$class_loader->resolve_path('phpbb_dir'), +			'Class with same name as a directory is unloadable' +		); + +		$this->assertEquals( +			$prefix . 'class_name.php', +			$class_loader->resolve_path('phpbb_class_name'), +			'Top level class' +		); +		$this->assertEquals( +			$prefix . 'dir/class_name.php', +			$class_loader->resolve_path('phpbb_dir_class_name'), +			'Class in a directory' +		); +		$this->assertEquals( +			$prefix . 'dir/subdir/class_name.php', +			$class_loader->resolve_path('phpbb_dir_subdir_class_name'), +			'Class in a sub-directory' +		); +		$this->assertEquals( +			$prefix . 'dir2/dir2.php', +			$class_loader->resolve_path('phpbb_dir2'), +			'Class with name of dir within dir (short class name)' +		); +	} + +	public function test_resolve_cached() +	{ +		$cache_map = array( +			'class_loader_phpbb_' => array('phpbb_a_cached_name' => 'a/cached_name'), +			'class_loader_phpbb_ext_' => array('phpbb_ext_foo' => 'foo'), +		); +		$cache = new phpbb_mock_cache($cache_map); + +		$prefix = dirname(__FILE__) . '/'; +		$class_loader = new phpbb_class_loader('phpbb_', $prefix . 'includes/', 'php', $cache); +		$class_loader_ext = new phpbb_class_loader('phpbb_ext_', $prefix . 'includes/', 'php', $cache); + +		$prefix .= 'includes/'; + +		$this->assertEquals( +			$prefix . 'dir/class_name.php', +			$class_loader->resolve_path('phpbb_dir_class_name'), +			'Class in a directory' +		); + +		$this->assertFalse($class_loader->resolve_path('phpbb_ext_foo')); +		$this->assertFalse($class_loader_ext->resolve_path('phpbb_a_cached_name')); + +		$this->assertEquals( +			$prefix . 'a/cached_name.php', +			$class_loader->resolve_path('phpbb_a_cached_name'), +			'Cached class found' +		); + +		$this->assertEquals( +			$prefix . 'foo.php', +			$class_loader_ext->resolve_path('phpbb_ext_foo'), +			'Cached class found in alternative loader' +		); + +		$cache_map['class_loader_phpbb_']['phpbb_dir_class_name'] = 'dir/class_name'; +		$cache->check($this, $cache_map); +	} +} diff --git a/tests/class_loader/includes/class_name.php b/tests/class_loader/includes/class_name.php new file mode 100644 index 0000000000..e941173cdd --- /dev/null +++ b/tests/class_loader/includes/class_name.php @@ -0,0 +1,6 @@ +<?php + +class phpbb_class_name +{ +} + diff --git a/tests/class_loader/includes/dir.php b/tests/class_loader/includes/dir.php new file mode 100644 index 0000000000..1c8930d8e7 --- /dev/null +++ b/tests/class_loader/includes/dir.php @@ -0,0 +1,6 @@ +<?php + +class phpbb_dir +{ +} + diff --git a/tests/class_loader/includes/dir/class_name.php b/tests/class_loader/includes/dir/class_name.php new file mode 100644 index 0000000000..0675aa8fc5 --- /dev/null +++ b/tests/class_loader/includes/dir/class_name.php @@ -0,0 +1,6 @@ +<?php + +class phpbb_dir_class_name +{ +} + diff --git a/tests/class_loader/includes/dir/subdir/class_name.php b/tests/class_loader/includes/dir/subdir/class_name.php new file mode 100644 index 0000000000..7321a609cc --- /dev/null +++ b/tests/class_loader/includes/dir/subdir/class_name.php @@ -0,0 +1,6 @@ +<?php + +class phpbb_dir_subdir_class_name +{ +} + diff --git a/tests/class_loader/includes/dir2/dir2.php b/tests/class_loader/includes/dir2/dir2.php new file mode 100644 index 0000000000..01cf4086ff --- /dev/null +++ b/tests/class_loader/includes/dir2/dir2.php @@ -0,0 +1,6 @@ +<?php + +class phpbb_dir2 +{ +} + diff --git a/tests/compress/compress_test.php b/tests/compress/compress_test.php index ce193cf3ba..6623f7ed8a 100644 --- a/tests/compress/compress_test.php +++ b/tests/compress/compress_test.php @@ -25,6 +25,12 @@ class phpbb_compress_test extends phpbb_test_case  		'dir/subdir/4.txt',  	); +	protected $conflicts = array( +		'1_1.txt', +		'1_2.txt', +		'dir/2_1.txt', +	); +  	protected function setUp()  	{  		// Required for compress::add_file @@ -88,6 +94,11 @@ class phpbb_compress_test extends phpbb_test_case  		);  		$compress->add_custom_file($this->path . 'dir/3.txt', 'dir/3.txt');  		$compress->add_data(file_get_contents($this->path . 'dir/subdir/4.txt'), 'dir/subdir/4.txt'); + +		// Add multiples of the same file to check conflicts are handled +		$compress->add_file($this->path . '1.txt', $this->path); +		$compress->add_file($this->path . '1.txt', $this->path); +		$compress->add_file($this->path . 'dir/2.txt', $this->path);  	}  	protected function valid_extraction($extra = array()) @@ -150,7 +161,7 @@ class phpbb_compress_test extends phpbb_test_case  		$compress->mode = 'r';  		$compress->open();  		$compress->extract('tests/compress/' . self::EXTRACT_DIR); -		$this->valid_extraction(); +		$this->valid_extraction($this->conflicts);  	}  	/** @@ -168,6 +179,6 @@ class phpbb_compress_test extends phpbb_test_case  		$compress = new compress_zip('r', $zip);  		$compress->extract('tests/compress/' . self::EXTRACT_DIR); -		$this->valid_extraction(); +		$this->valid_extraction($this->conflicts);  	}  } diff --git a/tests/config/config_test.php b/tests/config/config_test.php new file mode 100644 index 0000000000..5845cc4590 --- /dev/null +++ b/tests/config/config_test.php @@ -0,0 +1,120 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2010 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +class phpbb_config_test extends phpbb_test_case +{ +	public function test_offset_exists() +	{ +		$config = new phpbb_config(array('foo' => 'bar')); + +		$this->assertTrue(isset($config['foo'])); +		$this->assertFalse(isset($config['foobar'])); +	} + +	public function test_offset_get() +	{ +		$config = new phpbb_config(array('foo' => 'bar')); +		$this->assertEquals('bar', $config['foo']); +	} + +	public function test_offset_get_missing() +	{ +		$config = new phpbb_config(array()); +		$this->assertEquals('', $config['foo']); +	} + +	public function test_offset_set() +	{ +		$config = new phpbb_config(array()); +		$config['foo'] = 'x'; +		$this->assertEquals('x', $config['foo']); +	} + +	public function test_offset_unset_fails() +	{ +		$this->setExpectedTriggerError(E_USER_ERROR); +		$config = new phpbb_config(array('foo' => 'x')); +		unset($config['foo']); +	} + +	public function test_count() +	{ +		$config = new phpbb_config(array('foo' => 'bar')); +		$this->assertEquals(1, count($config)); +	} + +	public function test_iterate() +	{ +		$vars = array('foo' => '23', 'bar' => '42'); +		$config = new phpbb_config($vars); + +		$count = 0; +		foreach ($config as $key => $value) +		{ +			$this->assertTrue(isset($vars[$key])); +			$this->assertEquals($vars[$key], $value); + +			$count++; +		} + +		$this->assertEquals(count($vars), $count); +	} + +	public function test_set_overwrite() +	{ +		$config = new phpbb_config(array('foo' => 'x')); +		$config->set('foo', 'bar'); +		$this->assertEquals('bar', $config['foo']); +	} + +	public function test_set_new() +	{ +		$config = new phpbb_config(array()); +		$config->set('foo', 'bar'); +		$this->assertEquals('bar', $config['foo']); +	} + +	public function test_set_atomic_overwrite() +	{ +		$config = new phpbb_config(array('foo' => 'bar')); +		$this->assertTrue($config->set_atomic('foo', 'bar', '23')); +		$this->assertEquals('23', $config['foo']); +	} + +	public function test_set_atomic_new() +	{ +		$config = new phpbb_config(array()); +		$this->assertTrue($config->set_atomic('foo', false, '23')); +		$this->assertEquals('23', $config['foo']); +	} + +	public function test_set_atomic_failure() +	{ +		$config = new phpbb_config(array('foo' => 'bar')); +		$this->assertFalse($config->set_atomic('foo', 'wrong', '23')); +		$this->assertEquals('bar', $config['foo']); +	} + +	public function test_increment() +	{ +		$config = new phpbb_config(array('foo' => '23')); +		$config->increment('foo', 3); +		$this->assertEquals(26, $config['foo']); +		$config->increment('foo', 1); +		$this->assertEquals(27, $config['foo']); +	} + +	public function test_delete() +	{ +		$config = new phpbb_config(array('foo' => 'bar')); + +		$config->delete('foo'); +		$this->assertFalse(isset($config['foo'])); +	} +} diff --git a/tests/config/db_test.php b/tests/config/db_test.php new file mode 100644 index 0000000000..0b8f73d53a --- /dev/null +++ b/tests/config/db_test.php @@ -0,0 +1,164 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2010 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +class phpbb_config_db_test extends phpbb_database_test_case +{ +	private $cache; +	private $db; +	private $config; + +	public function getDataSet() +	{ +		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml'); +	} + +	public function setUp() +	{ +		parent::setUp(); + +		$this->cache = new phpbb_mock_cache; +		$this->db = $this->new_dbal(); +		$this->config = new phpbb_config_db($this->db, $this->cache, 'phpbb_config'); +	} + +	public function test_load_config() +	{ +		$this->assertEquals('23', $this->config['foo']); +		$this->assertEquals('42', $this->config['bar']); +	} + +	public function test_load_cached() +	{ +		$cache = new phpbb_mock_cache(array('config' => array('x' => 'y'))); +		$this->config = new phpbb_config_db($this->db, $cache, 'phpbb_config'); + +		$this->assertTrue(!isset($this->config['foo'])); +		$this->assertEquals('42', $this->config['bar']); + +		$this->assertEquals('y', $this->config['x']); +	} + +	public function test_offset_set() +	{ +		$this->config['foo'] = 'x'; // temporary set +		$this->assertEquals('x', $this->config['foo']); + +		$config2 = new phpbb_config_db($this->db, $this->cache, 'phpbb_config'); +		$this->assertEquals('23', $config2['foo']); +	} + +	public function test_set_overwrite() +	{ +		$this->config->set('foo', '17'); +		$this->assertEquals('17', $this->config['foo']); + +		// re-read config and populate cache +		$config2 = new phpbb_config_db($this->db, $this->cache, 'phpbb_config'); +		$this->cache->checkVar($this, 'config', array('foo' => '17')); +	} + +	public function test_set_overwrite_uncached() +	{ +		$this->config->set('bar', '17', false); + +		// re-read config and populate cache +		$config2 = new phpbb_config_db($this->db, $this->cache, 'phpbb_config'); +		$this->cache->checkVar($this, 'config', array('foo' => '23')); +	} + +	public function test_set_new() +	{ +		$this->config->set('foobar', '5'); +		$this->assertEquals('5', $this->config['foobar']); + +		// re-read config and populate cache +		$config2 = new phpbb_config_db($this->db, $this->cache, 'phpbb_config'); +		$this->cache->checkVar($this, 'config', array('foo' => '23', 'foobar' => '5')); +	} + +	public function test_set_new_uncached() +	{ +		$this->config->set('foobar', '5', false); +		$this->assertEquals('5', $this->config['foobar']); + +		// re-read config and populate cache +		$config2 = new phpbb_config_db($this->db, $this->cache, 'phpbb_config'); +		$this->cache->checkVar($this, 'config', array('foo' => '23')); +	} + +	public function test_set_atomic_overwrite() +	{ +		$this->assertTrue($this->config->set_atomic('foo', '23', '17')); +		$this->assertEquals('17', $this->config['foo']); +	} + +	public function test_set_atomic_new() +	{ +		$this->assertTrue($this->config->set_atomic('foobar', false, '5')); +		$this->assertEquals('5', $this->config['foobar']); +	} + +	public function test_set_atomic_failure() +	{ +		$this->assertFalse($this->config->set_atomic('foo', 'wrong', '17')); +		$this->assertEquals('23', $this->config['foo']); +	} + +	public function test_increment() +	{ +		$this->config->increment('foo', 3); +		$this->assertEquals(26, $this->config['foo']); +		$this->config->increment('foo', 1); +		$this->assertEquals(27, $this->config['foo']); +	} + +	public function test_increment_new() +	{ +		$this->config->increment('foobar', 3); +		$this->assertEquals(3, $this->config['foobar']);; +	} + +	public function test_delete() +	{ +		$this->assertTrue(isset($this->config['foo'])); +		$this->config->delete('foo'); +		$this->cache->checkVarUnset($this, 'foo'); +		$this->assertFalse(isset($this->config['foo'])); + +		// re-read config and populate cache +		$cache2 = new phpbb_mock_cache; +		$config2 = new phpbb_config_db($this->db, $cache2, 'phpbb_config'); +		$cache2->checkVarUnset($this, 'foo'); +		$this->assertFalse(isset($config2['foo'])); +	} + +	public function test_delete_write_read_not_cacheable() +	{ +		// bar is dynamic +		$this->assertTrue(isset($this->config['bar'])); +		$this->config->delete('bar'); +		$this->cache->checkVarUnset($this, 'bar'); +		$this->assertFalse(isset($this->config['bar'])); +		 +		$this->config->set('bar', 'new bar', false); +		$this->assertEquals('new bar', $this->config['bar']); +	} + +	public function test_delete_write_read_cacheable() +	{ +		// foo is not dynamic +		$this->assertTrue(isset($this->config['foo'])); +		$this->config->delete('foo'); +		$this->cache->checkVarUnset($this, 'foo'); +		$this->assertFalse(isset($this->config['foo'])); +		 +		$this->config->set('foo', 'new foo', true); +		$this->assertEquals('new foo', $this->config['foo']); +	} +} diff --git a/tests/config/db_text_test.php b/tests/config/db_text_test.php new file mode 100644 index 0000000000..4818bba8c9 --- /dev/null +++ b/tests/config/db_text_test.php @@ -0,0 +1,115 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +class phpbb_config_db_text_test extends phpbb_database_test_case +{ +	private $db; +	private $config_text; + +	public function getDataSet() +	{ +		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config_text.xml'); +	} + +	public function setUp() +	{ +		parent::setUp(); + +		$this->db = $this->new_dbal(); +		$this->config_text = new phpbb_config_db_text($this->db, 'phpbb_config_text'); +	} + +	public function test_get() +	{ +		$this->assertSame('23', $this->config_text->get('foo')); +		$this->assertSame('string-de-ding', $this->config_text->get('meh')); +	} + +	public function test_get_nonexisting() +	{ +		$this->assertNull($this->config_text->get('noooooo')); +	} + +	public function test_set_new_get() +	{ +		$this->config_text->set('barz', 'phpbb'); +		$this->assertSame('phpbb', $this->config_text->get('barz')); +	} + +	public function test_set_replace_get() +	{ +		$this->config_text->set('foo', '24'); +		$this->assertSame('24', $this->config_text->get('foo')); +	} + +	public function test_set_get_long_string() +	{ +		$expected = str_repeat('ABC', 10000); +		$this->config_text->set('long', $expected); +		$this->assertSame($expected, $this->config_text->get('long')); +	} + +	public function test_delete_get() +	{ +		$this->config_text->delete('foo'); +		$this->assertNull($this->config_text->get('foo')); + +		$this->assertSame('42', $this->config_text->get('bar')); +		$this->assertSame('string-de-ding', $this->config_text->get('meh')); +	} + +	public function test_get_array_empty() +	{ +		$this->assertEmpty($this->config_text->get_array(array('key1', 'key2'))); +	} + +	public function test_get_array_subset() +	{ +		$expected = array( +			'bar' => '42', +			'foo' => '23', +		); + +		$actual = $this->config_text->get_array(array_keys($expected)); +		ksort($actual); + +		$this->assertSame($expected, $actual); +	} + +	public function test_set_array_get_array_subset() +	{ +		$set_array_param = array( +			// New entry +			'baby' => 'phpBB', +			// Entry update +			'bar' => '64', +		); + +		$this->config_text->set_array($set_array_param); + +		$expected = array_merge($set_array_param, array( +			'foo' => '23', +		)); + +		$actual = $this->config_text->get_array(array_keys($expected)); +		ksort($actual); + +		$this->assertSame($expected, $actual); +	} + +	public function test_delete_array_get_remaining() +	{ +		$this->config_text->delete_array(array('foo', 'bar')); + +		$this->assertNull($this->config_text->get('bar')); +		$this->assertNull($this->config_text->get('foo')); + +		$this->assertSame('string-de-ding', $this->config_text->get('meh')); +	} +} diff --git a/tests/config/fixtures/config.xml b/tests/config/fixtures/config.xml new file mode 100644 index 0000000000..9d395b685c --- /dev/null +++ b/tests/config/fixtures/config.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<dataset> +	<table name="phpbb_config"> +		<column>config_name</column> +		<column>config_value</column> +		<column>is_dynamic</column> +		<row> +			<value>foo</value> +			<value>23</value> +			<value>0</value> +		</row> +		<row> +			<value>bar</value> +			<value>42</value> +			<value>1</value> +		</row> +	</table> +</dataset> diff --git a/tests/config/fixtures/config_text.xml b/tests/config/fixtures/config_text.xml new file mode 100644 index 0000000000..5acac13ea3 --- /dev/null +++ b/tests/config/fixtures/config_text.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<dataset> +	<table name="phpbb_config_text"> +		<column>config_name</column> +		<column>config_value</column> +		<row> +			<value>foo</value> +			<value>23</value> +		</row> +		<row> +			<value>bar</value> +			<value>42</value> +		</row> +		<row> +			<value>meh</value> +			<value>string-de-ding</value> +		</row> +	</table> +</dataset> diff --git a/tests/controller/config/routing.yml b/tests/controller/config/routing.yml new file mode 100644 index 0000000000..175b11f130 --- /dev/null +++ b/tests/controller/config/routing.yml @@ -0,0 +1,3 @@ +core_controller: +    pattern: /core_foo +    defaults: { _controller: core_foo.controller:bar } diff --git a/tests/controller/config/services.yml b/tests/controller/config/services.yml new file mode 100644 index 0000000000..f1bd047489 --- /dev/null +++ b/tests/controller/config/services.yml @@ -0,0 +1,3 @@ +services: +    core_foo.controller: +        class: phpbb_controller_foo diff --git a/tests/controller/controller_test.php b/tests/controller/controller_test.php new file mode 100644 index 0000000000..c06bf7d548 --- /dev/null +++ b/tests/controller/controller_test.php @@ -0,0 +1,76 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2012 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\Routing\Route; +use Symfony\Component\Routing\RouteCollection; +use Symfony\Component\Config\FileLocator; +use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; + +class phpbb_controller_controller_test extends phpbb_test_case +{ +	public function setUp() +	{ +		$this->extension_manager = new phpbb_mock_extension_manager( +			dirname(__FILE__) . '/', +			array( +				'foo' => array( +					'ext_name' => 'foo', +					'ext_active' => '1', +					'ext_path' => 'ext/foo/', +				), +			)); +	} + +	public function test_provider() +	{ +		$provider = new phpbb_controller_provider; +		$routes = $provider +			->import_paths_from_finder($this->extension_manager->get_finder()) +			->find('./tests/controller/'); + +		// This will need to be updated if any new routes are defined +		$this->assertEquals(2, sizeof($routes)); +	} + +	public function test_controller_resolver() +	{ +		$container = new ContainerBuilder(); +		// YamlFileLoader only uses one path at a time, so we need to loop +		// through all of the ones we are using. +		foreach (array(__DIR__.'/config', __DIR__.'/ext/foo/config') as $path) +		{ +			$loader = new YamlFileLoader($container, new FileLocator($path)); +			$loader->load('services.yml'); +		} + +		// Autoloading classes within the tests folder does not work +		// so I'll include them manually. +		if (!class_exists('phpbb_ext_foo_controller')) +		{ +			include(__DIR__.'/ext/foo/controller.php'); +		} +		if (!class_exists('phpbb_controller_foo')) +		{ +			include(__DIR__.'/includes/controller/foo.php'); +		} + +		$resolver = new phpbb_controller_resolver(new phpbb_user, $container); +		$symfony_request = new Request(); +		$symfony_request->attributes->set('_controller', 'foo.controller:handle'); + +		$this->assertEquals($resolver->getController($symfony_request), array(new phpbb_ext_foo_controller, 'handle')); + +		$symfony_request = new Request(); +		$symfony_request->attributes->set('_controller', 'core_foo.controller:bar'); + +		$this->assertEquals($resolver->getController($symfony_request), array(new phpbb_controller_foo, 'bar')); +	} +} diff --git a/tests/controller/ext/foo/config/routing.yml b/tests/controller/ext/foo/config/routing.yml new file mode 100644 index 0000000000..4799fec37d --- /dev/null +++ b/tests/controller/ext/foo/config/routing.yml @@ -0,0 +1,3 @@ +controller1: +    pattern: /foo +    defaults: { _controller: foo.controller:handle } diff --git a/tests/controller/ext/foo/config/services.yml b/tests/controller/ext/foo/config/services.yml new file mode 100644 index 0000000000..ce0e18c610 --- /dev/null +++ b/tests/controller/ext/foo/config/services.yml @@ -0,0 +1,3 @@ +services: +    foo.controller: +        class: phpbb_ext_foo_controller diff --git a/tests/controller/ext/foo/controller.php b/tests/controller/ext/foo/controller.php new file mode 100644 index 0000000000..cfc5c20622 --- /dev/null +++ b/tests/controller/ext/foo/controller.php @@ -0,0 +1,16 @@ +<?php + +use Symfony\Component\HttpFoundation\Response; + +class phpbb_ext_foo_controller +{ +	/** +	* Handle method +	* +	* @return null +	*/ +	public function handle() +	{ +		return new Response('Test', 200); +	} +} diff --git a/tests/controller/helper_url_test.php b/tests/controller/helper_url_test.php new file mode 100644 index 0000000000..6686b77e8f --- /dev/null +++ b/tests/controller/helper_url_test.php @@ -0,0 +1,61 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2013 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_controller_helper_url_test extends phpbb_test_case +{ + +	public function helper_url_data() +	{ +		return array( +			array('foo/bar?t=1&f=2', false, true, false, 'app.php?t=1&f=2&controller=foo/bar', 'parameters in url-argument'), +			array('foo/bar', 't=1&f=2', true, false, 'app.php?controller=foo/bar&t=1&f=2', 'parameters in params-argument using amp'), +			array('foo/bar', 't=1&f=2', false, false, 'app.php?controller=foo/bar&t=1&f=2', 'parameters in params-argument using &'), +			array('foo/bar', array('t' => 1, 'f' => 2), true, false, 'app.php?controller=foo/bar&t=1&f=2', 'parameters in params-argument as array'), + +			// Custom sid parameter +			array('foo/bar', 't=1&f=2', true, 'custom-sid', 'app.php?controller=foo/bar&t=1&f=2&sid=custom-sid', 'using session_id'), + +			// Testing anchors +			array('foo/bar?t=1&f=2#anchor', false, true, false, 'app.php?t=1&f=2&controller=foo/bar#anchor', 'anchor in url-argument'), +			array('foo/bar', 't=1&f=2#anchor', true, false, 'app.php?controller=foo/bar&t=1&f=2#anchor', 'anchor in params-argument'), +			array('foo/bar', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, 'app.php?controller=foo/bar&t=1&f=2#anchor', 'anchor in params-argument (array)'), + +			// Anchors and custom sid +			array('foo/bar?t=1&f=2#anchor', false, true, 'custom-sid', 'app.php?t=1&f=2&controller=foo/bar&sid=custom-sid#anchor', 'anchor in url-argument using session_id'), +			array('foo/bar', 't=1&f=2#anchor', true, 'custom-sid', 'app.php?controller=foo/bar&t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument using session_id'), +			array('foo/bar', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', 'app.php?controller=foo/bar&t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), + +			// Empty parameters should not append the & +			array('foo/bar', false, true, false, 'app.php?controller=foo/bar', 'no params using bool false'), +			array('foo/bar', '', true, false, 'app.php?controller=foo/bar', 'no params using empty string'), +			array('foo/bar', array(), true, false, 'app.php?controller=foo/bar', 'no params using empty array'), +		); +	} + +	/** +	* @dataProvider helper_url_data +	*/ +	public function test_helper_url($route, $params, $is_amp, $session_id, $expected, $description) +	{ +		global $phpbb_dispatcher, $phpbb_root_path, $phpEx; + +		$phpbb_dispatcher = new phpbb_mock_event_dispatcher; +		$this->style_resource_locator = new phpbb_style_resource_locator(); +		$this->user = $this->getMock('phpbb_user'); +		$this->template = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $this->user, new phpbb_template_context()); +		$this->style_resource_locator = new phpbb_style_resource_locator(); +		$this->style_provider = new phpbb_style_path_provider(); +		$this->style = new phpbb_style($phpbb_root_path, $phpEx, new phpbb_config(array()), $this->user, $this->style_resource_locator, $this->style_provider, $this->template); + +		$helper = new phpbb_controller_helper($this->template, $this->user, '', 'php'); +		$this->assertEquals($helper->url($route, $params, $is_amp, $session_id), $expected); +	} +} diff --git a/tests/controller/includes/controller/foo.php b/tests/controller/includes/controller/foo.php new file mode 100644 index 0000000000..04576e16c4 --- /dev/null +++ b/tests/controller/includes/controller/foo.php @@ -0,0 +1,16 @@ +<?php + +use Symfony\Component\HttpFoundation\Response; + +class phpbb_controller_foo +{ +	/** +	* Bar method +	* +	* @return null +	*/ +	public function bar() +	{ +		return new Response('bar()', 200); +	} +} diff --git a/tests/cron/ext/testext/cron/dummy_task.php b/tests/cron/ext/testext/cron/dummy_task.php new file mode 100644 index 0000000000..3e81db1895 --- /dev/null +++ b/tests/cron/ext/testext/cron/dummy_task.php @@ -0,0 +1,28 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2010 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +class phpbb_ext_testext_cron_dummy_task extends phpbb_cron_task_base +{ +	static public $was_run = 0; + +	public function get_name() +	{ +		return get_class($this); +	} + +	public function run() +	{ +		self::$was_run++; +	} + +	public function should_run() +	{ +		return true; +	} +} diff --git a/tests/cron/includes/cron/task/core/dummy_task.php b/tests/cron/includes/cron/task/core/dummy_task.php new file mode 100644 index 0000000000..c94455603f --- /dev/null +++ b/tests/cron/includes/cron/task/core/dummy_task.php @@ -0,0 +1,28 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2010 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +class phpbb_cron_task_core_dummy_task extends phpbb_cron_task_base +{ +	static public $was_run = 0; + +	public function get_name() +	{ +		return get_class($this); +	} + +	public function run() +	{ +		self::$was_run++; +	} + +	public function should_run() +	{ +		return true; +	} +} diff --git a/tests/cron/includes/cron/task/core/second_dummy_task.php b/tests/cron/includes/cron/task/core/second_dummy_task.php new file mode 100644 index 0000000000..77ef6f70ed --- /dev/null +++ b/tests/cron/includes/cron/task/core/second_dummy_task.php @@ -0,0 +1,28 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2010 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +class phpbb_cron_task_core_second_dummy_task extends phpbb_cron_task_base +{ +	static public $was_run = 0; + +	public function get_name() +	{ +		return get_class($this); +	} + +	public function run() +	{ +		self::$was_run++; +	} + +	public function should_run() +	{ +		return true; +	} +} diff --git a/tests/cron/manager_test.php b/tests/cron/manager_test.php new file mode 100644 index 0000000000..3c541be2a6 --- /dev/null +++ b/tests/cron/manager_test.php @@ -0,0 +1,76 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2010 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +require_once dirname(__FILE__) . '/includes/cron/task/core/dummy_task.php'; +require_once dirname(__FILE__) . '/includes/cron/task/core/second_dummy_task.php'; +require_once dirname(__FILE__) . '/ext/testext/cron/dummy_task.php'; +require_once dirname(__FILE__) . '/tasks/simple_ready.php'; +require_once dirname(__FILE__) . '/tasks/simple_not_runnable.php'; +require_once dirname(__FILE__) . '/tasks/simple_should_not_run.php'; + +class phpbb_cron_manager_test extends PHPUnit_Framework_TestCase +{ +	public function setUp() +	{ +		$this->manager = $this->create_cron_manager(array( +			new phpbb_cron_task_core_dummy_task(), +			new phpbb_cron_task_core_second_dummy_task(), +			new phpbb_ext_testext_cron_dummy_task(), +		)); +		$this->task_name = 'phpbb_cron_task_core_dummy_task'; +	} + +	public function test_manager_finds_shipped_task_by_name() +	{ +		$task = $this->manager->find_task($this->task_name); +		$this->assertInstanceOf('phpbb_cron_task_wrapper', $task); +		$this->assertEquals($this->task_name, $task->get_name()); +	} + +	public function test_manager_finds_all_ready_tasks() +	{ +		$tasks = $this->manager->find_all_ready_tasks(); +		$this->assertEquals(3, sizeof($tasks)); +	} + +	public function test_manager_finds_one_ready_task() +	{ +		$task = $this->manager->find_one_ready_task(); +		$this->assertInstanceOf('phpbb_cron_task_wrapper', $task); +	} + +	public function test_manager_finds_only_ready_tasks() +	{ +		$manager = $this->create_cron_manager(array( +			new phpbb_cron_task_core_simple_ready(), +			new phpbb_cron_task_core_simple_not_runnable(), +			new phpbb_cron_task_core_simple_should_not_run(), +		)); +		$tasks = $manager->find_all_ready_tasks(); +		$task_names = $this->tasks_to_names($tasks); +		$this->assertEquals(array('phpbb_cron_task_core_simple_ready'), $task_names); +	} + +	private function tasks_to_names($tasks) +	{ +		$names = array(); +		foreach ($tasks as $task) +		{ +			$names[] = $task->get_name(); +		} +		return $names; +	} + +	private function create_cron_manager($tasks) +	{ +		global $phpbb_root_path, $phpEx; + +		return new phpbb_cron_manager($tasks, $phpbb_root_path, $phpEx); +	} +} diff --git a/tests/cron/tasks/simple_not_runnable.php b/tests/cron/tasks/simple_not_runnable.php new file mode 100644 index 0000000000..56d484eacd --- /dev/null +++ b/tests/cron/tasks/simple_not_runnable.php @@ -0,0 +1,18 @@ +<?php + +class phpbb_cron_task_core_simple_not_runnable extends phpbb_cron_task_base +{ +	public function get_name() +	{ +		return get_class($this); +	} + +	public function run() +	{ +	} + +	public function is_runnable() +	{ +		return false; +	} +} diff --git a/tests/cron/tasks/simple_ready.php b/tests/cron/tasks/simple_ready.php new file mode 100644 index 0000000000..8aa0507406 --- /dev/null +++ b/tests/cron/tasks/simple_ready.php @@ -0,0 +1,13 @@ +<?php + +class phpbb_cron_task_core_simple_ready extends phpbb_cron_task_base +{ +	public function get_name() +	{ +		return get_class($this); +	} + +	public function run() +	{ +	} +} diff --git a/tests/cron/tasks/simple_should_not_run.php b/tests/cron/tasks/simple_should_not_run.php new file mode 100644 index 0000000000..58f6df2616 --- /dev/null +++ b/tests/cron/tasks/simple_should_not_run.php @@ -0,0 +1,18 @@ +<?php + +class phpbb_cron_task_core_simple_should_not_run extends phpbb_cron_task_base +{ +	public function get_name() +	{ +		return get_class($this); +	} + +	public function run() +	{ +	} + +	public function should_run() +	{ +		return false; +	} +} diff --git a/tests/datetime/from_format_test.php b/tests/datetime/from_format_test.php new file mode 100644 index 0000000000..c28925272e --- /dev/null +++ b/tests/datetime/from_format_test.php @@ -0,0 +1,57 @@ +<?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/session.php'; +require_once dirname(__FILE__) . '/../../phpBB/includes/user.php'; +require_once dirname(__FILE__) . '/../../phpBB/includes/datetime.php'; +require_once dirname(__FILE__) . '/../mock/lang.php'; + +class phpbb_datetime_from_format_test extends phpbb_test_case +{ +	public function from_format_data() +	{ +		return array( +			array( +				'UTC', +				'Y-m-d', +				'2012-06-08', +			), + +			array( +				'Europe/Berlin', +				'Y-m-d H:i:s', +				'2012-06-08 14:01:02', +			), +		); +	} + +	/** +	* @dataProvider from_format_data() +	*/ +	public function test_from_format($timezone, $format, $expected) +	{ +		global $user; + +		$user = new phpbb_user(); +		$user->timezone = new DateTimeZone($timezone); +		$user->lang['datetime'] = array( +			'TODAY'		=> 'Today', +			'TOMORROW'	=> 'Tomorrow', +			'YESTERDAY'	=> 'Yesterday', +			'AGO'		=> array( +				0		=> 'less than a minute ago', +				1		=> '%d minute ago', +				2		=> '%d minutes ago', +			), +		); + +		$timestamp = $user->get_timestamp_from_format($format, $expected, new DateTimeZone($timezone)); +		$this->assertEquals($expected, $user->format_date($timestamp, $format, true)); +	} +} diff --git a/tests/dbal/case_test.php b/tests/dbal/case_test.php new file mode 100644 index 0000000000..57a1729a39 --- /dev/null +++ b/tests/dbal/case_test.php @@ -0,0 +1,69 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2012 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +class phpbb_dbal_case_test extends phpbb_database_test_case +{ +	public function getDataSet() +	{ +		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/config.xml'); +	} + +	public function test_case_int() +	{ +		$db = $this->new_dbal(); + +		$sql = 'SELECT ' . $db->sql_case('1 = 1', '1', '2') . ' AS test_num +			FROM phpbb_config'; +		$result = $db->sql_query_limit($sql, 1); + +		$this->assertEquals(1, (int) $db->sql_fetchfield('test_num')); + +		$sql = 'SELECT ' . $db->sql_case('1 = 0', '1', '2') . ' AS test_num +			FROM phpbb_config'; +		$result = $db->sql_query_limit($sql, 1); + +		$this->assertEquals(2, (int) $db->sql_fetchfield('test_num')); +	} + +	public function test_case_string() +	{ +		$db = $this->new_dbal(); + +		$sql = 'SELECT ' . $db->sql_case('1 = 1', "'foo'", "'bar'") . ' AS test_string +			FROM phpbb_config'; +		$result = $db->sql_query_limit($sql, 1); + +		$this->assertEquals('foo', $db->sql_fetchfield('test_string')); + +		$sql = 'SELECT ' . $db->sql_case('1 = 0', "'foo'", "'bar'") . ' AS test_string +			FROM phpbb_config'; +		$result = $db->sql_query_limit($sql, 1); + +		$this->assertEquals('bar', $db->sql_fetchfield('test_string')); +	} + +	public function test_case_column() +	{ +		$db = $this->new_dbal(); + +		$sql = 'SELECT ' . $db->sql_case("config_name = 'config1'", 'config_name', 'config_value') . " AS test_string +			FROM phpbb_config +			WHERE config_name = 'config1'"; +		$result = $db->sql_query_limit($sql, 1); + +		$this->assertEquals('config1', $db->sql_fetchfield('test_string')); + +		$sql = 'SELECT ' . $db->sql_case("config_name = 'config1'", 'config_name', 'config_value') . " AS test_string +			FROM phpbb_config +			WHERE config_value = 'bar'"; +		$result = $db->sql_query_limit($sql, 1); + +		$this->assertEquals('bar', $db->sql_fetchfield('test_string')); +	} +} diff --git a/tests/dbal/concatenate_test.php b/tests/dbal/concatenate_test.php new file mode 100644 index 0000000000..0891fa58a0 --- /dev/null +++ b/tests/dbal/concatenate_test.php @@ -0,0 +1,64 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2012 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +class phpbb_dbal_concatenate_test extends phpbb_database_test_case +{ +	public function getDataSet() +	{ +		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/config.xml'); +	} + +	public function test_concatenate_string() +	{ +		$db = $this->new_dbal(); + +		$sql = 'SELECT config_name, ' . $db->sql_concatenate('config_name', "'" . $db->sql_escape('append') . "'") . ' AS string +			FROM phpbb_config'; +		$result = $db->sql_query($sql); + +		$db->sql_return_on_error(false); + +		$this->assertEquals(array( +				array( +					'config_name'	=> 'config1', +					'string'		=> 'config1append', +				), +				array( +					'config_name'	=> 'config2', +					'string'		=> 'config2append', +				), +			), +			$db->sql_fetchrowset($result) +		); +	} + +	public function test_concatenate_statement() +	{ +		$db = $this->new_dbal(); + +		$sql = 'SELECT config_name, ' . $db->sql_concatenate('config_name', 'config_value') . ' AS string +			FROM phpbb_config'; +		$result = $db->sql_query($sql); + +		$db->sql_return_on_error(false); + +		$this->assertEquals(array( +				array( +					'config_name'	=> 'config1', +					'string'		=> 'config1foo', +				), +				array( +					'config_name'	=> 'config2', +					'string'		=> 'config2bar', +				), +			), +			$db->sql_fetchrowset($result) +		); +	} +} diff --git a/tests/dbal/connect_test.php b/tests/dbal/connect_test.php index 505ce28fa1..1e352d6b03 100644 --- a/tests/dbal/connect_test.php +++ b/tests/dbal/connect_test.php @@ -22,9 +22,7 @@ class phpbb_dbal_connect_test extends phpbb_database_test_case  		$config = $this->get_database_config(); -		require_once dirname(__FILE__) . '/../../phpBB/includes/db/' . $config['dbms'] . '.php'; -		$dbal = 'dbal_' . $config['dbms']; -		$db = new $dbal(); +		$db = new $config['dbms']();  		// Failure to connect results in a trigger_error call in dbal.  		// phpunit converts triggered errors to exceptions. diff --git a/tests/dbal/fixtures/migrator.xml b/tests/dbal/fixtures/migrator.xml new file mode 100644 index 0000000000..25be4d4129 --- /dev/null +++ b/tests/dbal/fixtures/migrator.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<dataset> +	<table name="phpbb_migrations"> +		<column>migration_name</column> +		<column>migration_depends_on</column> +		<column>migration_schema_done</column> +		<column>migration_data_done</column> +		<column>migration_data_state</column> +		<column>migration_start_time</column> +		<column>migration_end_time</column> +		<row> +			<value>installed_migration</value> +			<value></value> +			<value>1</value> +			<value>1</value> +			<value></value> +			<value>1234</value> +			<value>5678</value> +		</row> +	</table> +	<table name="phpbb_config"> +		<column>config_name</column> +		<column>config_value</column> +		<row> +			<value>foo</value> +			<value>bar</value> +		</row> +	</table> +</dataset> diff --git a/tests/dbal/fixtures/migrator_module.xml b/tests/dbal/fixtures/migrator_module.xml new file mode 100644 index 0000000000..32afe7e6f3 --- /dev/null +++ b/tests/dbal/fixtures/migrator_module.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<dataset> +	<table name="phpbb_modules"> +		<column>module_id</column> +		<column>module_enabled</column> +		<column>module_display</column> +		<column>module_basename</column> +		<column>module_class</column> +		<column>parent_id</column> +		<column>left_id</column> +		<column>right_id</column> +		<column>module_langname</column> +		<column>module_mode</column> +		<column>module_auth</column> +		<row> +			<value>1</value> +			<value>1</value> +			<value>1</value> +			<value></value> +			<value>acp</value> +			<value>0</value> +			<value>1</value> +			<value>4</value> +			<value>ACP_CAT</value> +			<value></value> +			<value></value> +		</row> +		<row> +			<value>2</value> +			<value>1</value> +			<value>1</value> +			<value>acp_test</value> +			<value>acp</value> +			<value>1</value> +			<value>2</value> +			<value>3</value> +			<value>ACP_MODULE</value> +			<value>test</value> +			<value></value> +		</row> +	</table> +</dataset> diff --git a/tests/dbal/fixtures/migrator_permission.xml b/tests/dbal/fixtures/migrator_permission.xml new file mode 100644 index 0000000000..08cec42a42 --- /dev/null +++ b/tests/dbal/fixtures/migrator_permission.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<dataset> +	<table name="phpbb_acl_options"> +		<column>auth_option_id</column> +		<column>auth_option</column> +		<column>is_global</column> +		<column>is_local</column> +		<column>founder_only</column> +		<row> +			<value>1</value> +			<value>global</value> +			<value>1</value> +			<value>0</value> +			<value>0</value> +		</row> +		<row> +			<value>2</value> +			<value>local</value> +			<value>0</value> +			<value>1</value> +			<value>0</value> +		</row> +		<row> +			<value>3</value> +			<value>both</value> +			<value>1</value> +			<value>1</value> +			<value>0</value> +		</row> +	</table> +</dataset> diff --git a/tests/dbal/fixtures/styles.xml b/tests/dbal/fixtures/styles.xml index 47b384c47f..dcbe39d3b0 100644 --- a/tests/dbal/fixtures/styles.xml +++ b/tests/dbal/fixtures/styles.xml @@ -5,35 +5,39 @@  		<column>style_name</column>  		<column>style_copyright</column>  		<column>style_active</column> -		<column>template_id</column> -		<column>theme_id</column> -		<column>imageset_id</column> +		<column>style_path</column> +		<column>bbcode_bitfield</column> +		<column>style_parent_id</column> +		<column>style_parent_tree</column>  		<row>  			<value>1</value>  			<value>prosilver</value>  			<value>&copy; phpBB Group</value>  			<value>1</value> -			<value>1</value> -			<value>1</value> -			<value>1</value> +			<value>prosilver</value> +			<value>kNg=</value> +			<value>0</value> +			<value></value>  		</row>  		<row>  			<value>2</value>  			<value>prosilver2</value>  			<value>&copy; phpBB Group</value>  			<value>0</value> -			<value>2</value> -			<value>2</value> -			<value>2</value> +			<value>prosilver2</value> +			<value>kNg=</value> +			<value>0</value> +			<value></value>  		</row>  		<row>  			<value>3</value>  			<value>Prosilver1</value>  			<value>&copy; phpBB Group</value>  			<value>0</value> -			<value>3</value> -			<value>3</value> -			<value>3</value> +			<value>prosilver1</value> +			<value>kNg=</value> +			<value>1</value> +			<value>prosilver</value>  		</row>  	</table>  </dataset> diff --git a/tests/dbal/migration/dummy.php b/tests/dbal/migration/dummy.php new file mode 100644 index 0000000000..0ac6e733a1 --- /dev/null +++ b/tests/dbal/migration/dummy.php @@ -0,0 +1,27 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2011 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* +*/ + +class phpbb_dbal_migration_dummy extends phpbb_db_migration +{ +	static public function depends_on() +	{ +		return array('installed_migration'); +	} + +	function update_schema() +	{ +		return array( +			'add_columns' => array( +				'phpbb_config' => array( +					'extra_column' => array('UINT', 1), +				), +			), +		); +	} +} diff --git a/tests/dbal/migration/fail.php b/tests/dbal/migration/fail.php new file mode 100644 index 0000000000..f88d8169f5 --- /dev/null +++ b/tests/dbal/migration/fail.php @@ -0,0 +1,41 @@ +<?php +/** +* +* @package migration +* @copyright (c) 2012 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2 +* +*/ + +class phpbb_dbal_migration_fail extends phpbb_db_migration +{ +	function update_schema() +	{ +		return array( +			'add_columns' => array( +				$this->table_prefix . 'config' => array( +					'test_column' => array('BOOL', 1), +				), +			), +		); +	} + +	function revert_schema() +	{ +		return array( +			'drop_columns' => array( +				$this->table_prefix . 'config' => array( +					'test_column', +				), +			), +		); +	} + +	function update_data() +	{ +		return array( +			array('config.add', array('foobar3', true)), +			array('config.update', array('does_not_exist', true)), +		); +	} +} diff --git a/tests/dbal/migration/if.php b/tests/dbal/migration/if.php new file mode 100644 index 0000000000..83fe21bd21 --- /dev/null +++ b/tests/dbal/migration/if.php @@ -0,0 +1,44 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2011 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* +*/ + +class phpbb_dbal_migration_if extends phpbb_db_migration +{ +	function update_schema() +	{ +		return array(); +	} + +	function update_data() +	{ +		return array( +			array('if', array( +				true, +				array('custom', array(array(&$this, 'test_true'))), +			)), +			array('if', array( +				false, +				array('custom', array(array(&$this, 'test_false'))), +			)), +		); +	} + +	function test_true() +	{ +		global $migrator_test_if_true_failed; + +		$migrator_test_if_true_failed = false; +	} + +	function test_false() +	{ +		global $migrator_test_if_false_failed; + +		$migrator_test_if_false_failed = true; +	} +} diff --git a/tests/dbal/migration/installed.php b/tests/dbal/migration/installed.php new file mode 100644 index 0000000000..01829f7a99 --- /dev/null +++ b/tests/dbal/migration/installed.php @@ -0,0 +1,30 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2011 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* +*/ + +class phpbb_dbal_migration_installed extends phpbb_db_migration +{ +	function effectively_installed() +	{ +		return true; +	} + +	function update_data() +	{ +		return array( +			array('custom', array(array(&$this, 'test'))), +		); +	} + +	function test() +	{ +		global $migrator_test_installed_failed; + +		$migrator_test_installed_failed = true; +	} +} diff --git a/tests/dbal/migration/recall.php b/tests/dbal/migration/recall.php new file mode 100644 index 0000000000..6c2f04bf08 --- /dev/null +++ b/tests/dbal/migration/recall.php @@ -0,0 +1,38 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2011 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* +*/ + +class phpbb_dbal_migration_recall extends phpbb_db_migration +{ +	function update_schema() +	{ +		return array(); +	} + +	function update_data() +	{ +		return array( +			array('custom', array(array(&$this, 'test_call'))), +		); +	} + +	// This function should be called 10 times +	function test_call($input) +	{ +		global $migrator_test_call_input; + +		$migrator_test_call_input = (int) $input; + +		if ($migrator_test_call_input < 10) +		{ +			return ($migrator_test_call_input + 1); +		} + +		return; +	} +} diff --git a/tests/dbal/migration/revert.php b/tests/dbal/migration/revert.php new file mode 100644 index 0000000000..ac01987cd4 --- /dev/null +++ b/tests/dbal/migration/revert.php @@ -0,0 +1,40 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2011 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* +*/ + +class phpbb_dbal_migration_revert extends phpbb_db_migration +{ +	function update_schema() +	{ +		return array( +			'add_columns' => array( +				'phpbb_config' => array( +					'bar_column' => array('UINT', 1), +				), +			), +		); +	} + +	function revert_schema() +	{ +		return array( +			'drop_columns' => array( +				'phpbb_config' => array( +					'bar_column', +				), +			), +		); +	} + +	function update_data() +	{ +		return array( +			array('config.add', array('foobartest', 0)), +		); +	} +} diff --git a/tests/dbal/migration/revert_with_dependency.php b/tests/dbal/migration/revert_with_dependency.php new file mode 100644 index 0000000000..ca2c070e8c --- /dev/null +++ b/tests/dbal/migration/revert_with_dependency.php @@ -0,0 +1,16 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2011 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* +*/ + +class phpbb_dbal_migration_revert_with_dependency extends phpbb_db_migration +{ +	static public function depends_on() +	{ +		return array('phpbb_dbal_migration_revert'); +	} +} diff --git a/tests/dbal/migration/unfulfillable.php b/tests/dbal/migration/unfulfillable.php new file mode 100644 index 0000000000..6d375e6880 --- /dev/null +++ b/tests/dbal/migration/unfulfillable.php @@ -0,0 +1,26 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2011 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* +*/ + +class phpbb_dbal_migration_unfulfillable extends phpbb_db_migration +{ +	static public function depends_on() +	{ +		return array('installed_migration', 'phpbb_dbal_migration_dummy', 'non_existant_migration'); +	} + +	function update_schema() +	{ +		trigger_error('Schema update of migration with unfulfillable dependency was run!'); +	} + +	function update_data() +	{ +		trigger_error('Data update of migration with unfulfillable dependency was run!'); +	} +} diff --git a/tests/dbal/migrator_test.php b/tests/dbal/migrator_test.php new file mode 100644 index 0000000000..1e40c9c6d6 --- /dev/null +++ b/tests/dbal/migrator_test.php @@ -0,0 +1,274 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2011 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* +*/ + +require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; +require_once dirname(__FILE__) . '/../../phpBB/includes/db/migrator.php'; +require_once dirname(__FILE__) . '/../../phpBB/includes/db/migration/migration.php'; +require_once dirname(__FILE__) . '/../../phpBB/includes/db/db_tools.php'; + +require_once dirname(__FILE__) . '/migration/dummy.php'; +require_once dirname(__FILE__) . '/migration/unfulfillable.php'; +require_once dirname(__FILE__) . '/migration/if.php'; +require_once dirname(__FILE__) . '/migration/recall.php'; +require_once dirname(__FILE__) . '/migration/revert.php'; +require_once dirname(__FILE__) . '/migration/revert_with_dependency.php'; +require_once dirname(__FILE__) . '/migration/fail.php'; +require_once dirname(__FILE__) . '/migration/installed.php'; + +class phpbb_dbal_migrator_test extends phpbb_database_test_case +{ +	protected $db; +	protected $db_tools; +	protected $migrator; + +	public function getDataSet() +	{ +		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/migrator.xml'); +	} + +	public function setUp() +	{ +		parent::setUp(); + +		$this->db = $this->new_dbal(); +		$this->db_tools = new phpbb_db_tools($this->db); + +		$this->config = new phpbb_config_db($this->db, new phpbb_mock_cache, 'phpbb_config'); + +		$tools = array( +			new phpbb_db_migration_tool_config($this->config), +		); + +		$this->migrator = new phpbb_db_migrator( +			$this->config, +			$this->db, +			$this->db_tools, +			'phpbb_migrations', +			dirname(__FILE__) . '/../../phpBB/', +			'php', +			'phpbb_', +			$tools +		); + +		$container = new phpbb_mock_container_builder(); +		$container->set('migrator', $migrator); + +		$this->extension_manager = new phpbb_extension_manager( +			$container, +			$this->db, +			$this->config, +			new phpbb_filesystem(), +			'phpbb_ext', +			dirname(__FILE__) . '/../../phpBB/', +			'php', +			null +		); +	} + +	public function test_update() +	{ +		$this->migrator->set_migrations(array('phpbb_dbal_migration_dummy')); + +		// schema +		$this->migrator->update(); +		$this->assertFalse($this->migrator->finished()); + +		$this->assertSqlResultEquals( +			array(array('success' => '1')), +			"SELECT 1 as success +				FROM phpbb_migrations +				WHERE migration_name = 'phpbb_dbal_migration_dummy' +					AND migration_start_time >= " . (time() - 1) . " +					AND migration_start_time <= " . (time() + 1), +			'Start time set correctly' +		); + +		// data +		$this->migrator->update(); +		$this->assertTrue($this->migrator->finished()); + +		$this->assertSqlResultEquals( +			array(array('extra_column' => '1')), +			"SELECT extra_column FROM phpbb_config WHERE config_name = 'foo'", +			'Dummy migration created extra_column with value 1 in all rows.' +		); + +		$this->assertSqlResultEquals( +			array(array('success' => '1')), +			"SELECT 1 as success +				FROM phpbb_migrations +				WHERE migration_name = 'phpbb_dbal_migration_dummy' +					AND migration_start_time <= migration_end_time +					AND migration_end_time >= " . (time() - 1) . " +					AND migration_end_time <= " . (time() + 1), +			'End time set correctly' +		); + +		// cleanup +		$this->db_tools->sql_column_remove('phpbb_config', 'extra_column'); +	} + +	public function test_unfulfillable() +	{ +		$this->migrator->set_migrations(array('phpbb_dbal_migration_unfulfillable', 'phpbb_dbal_migration_dummy')); + +		while (!$this->migrator->finished()) +		{ +			$this->migrator->update(); +		} + +		$this->assertTrue($this->migrator->finished()); + +		$this->assertSqlResultEquals( +			array(array('extra_column' => '1')), +			"SELECT extra_column FROM phpbb_config WHERE config_name = 'foo'", +			'Dummy migration was run, even though an unfulfillable migration was found.' +		); + +		$this->db_tools->sql_column_remove('phpbb_config', 'extra_column'); +	} + +	public function test_if() +	{ +		$this->migrator->set_migrations(array('phpbb_dbal_migration_if')); + +		// Don't like this, but I'm not sure there is any other way to do this +		global $migrator_test_if_true_failed, $migrator_test_if_false_failed; +		$migrator_test_if_true_failed = true; +		$migrator_test_if_false_failed = false; + +		while (!$this->migrator->finished()) +		{ +			$this->migrator->update(); +		} + +		$this->assertFalse($migrator_test_if_true_failed, 'True test failed'); +		$this->assertFalse($migrator_test_if_false_failed, 'False test failed'); +	} + +	public function test_recall() +	{ +		$this->migrator->set_migrations(array('phpbb_dbal_migration_recall')); + +		global $migrator_test_call_input; + +		// Run the schema first +		$this->migrator->update(); + +		$i = 0; +		while (!$this->migrator->finished()) +		{ +			$this->migrator->update(); + +			$this->assertSame($i, $migrator_test_call_input); + +			$i++; +		} + +		$this->assertSame(10, $migrator_test_call_input); +	} + +	public function test_revert() +	{ +		// Make sure there are no other migrations in the db, this could cause issues +		$this->db->sql_query("DELETE FROM phpbb_migrations"); +		$this->migrator->load_migration_state(); + +		$this->migrator->set_migrations(array('phpbb_dbal_migration_revert', 'phpbb_dbal_migration_revert_with_dependency')); + +		$this->assertFalse($this->migrator->migration_state('phpbb_dbal_migration_revert')); +		$this->assertFalse($this->migrator->migration_state('phpbb_dbal_migration_revert_with_dependency')); + +		// Install the migration first +		while (!$this->migrator->finished()) +		{ +			$this->migrator->update(); +		} + +		$this->assertTrue($this->migrator->migration_state('phpbb_dbal_migration_revert') !== false); +		$this->assertTrue($this->migrator->migration_state('phpbb_dbal_migration_revert_with_dependency') !== false); + +		$this->assertSqlResultEquals( +			array(array('bar_column' => '1')), +			"SELECT bar_column FROM phpbb_config WHERE config_name = 'foo'", +			'Installing revert migration failed to create bar_column.' +		); + +		$this->assertTrue(isset($this->config['foobartest'])); + +		while ($this->migrator->migration_state('phpbb_dbal_migration_revert') !== false) +		{ +			$this->migrator->revert('phpbb_dbal_migration_revert'); +		} + +		$this->assertFalse($this->migrator->migration_state('phpbb_dbal_migration_revert')); +		$this->assertFalse($this->migrator->migration_state('phpbb_dbal_migration_revert_with_dependency')); + +		$this->assertFalse(isset($this->config['foobartest'])); + +		$sql = 'SELECT * FROM phpbb_config'; +		$result = $this->db->sql_query_limit($sql, 1); +		$row = $this->db->sql_fetchrow($result); +		$this->db->sql_freeresult($result); + +		if (isset($row['bar_column'])) +		{ +			$this->fail('Revert did not remove test_column.'); +		} +	} + +	public function test_fail() +	{ +		$this->migrator->set_migrations(array('phpbb_dbal_migration_fail')); + +		$this->assertFalse(isset($this->config['foobar3'])); + +		try +		{ +			while (!$this->migrator->finished()) +			{ +				$this->migrator->update(); +			} +		} +		catch (phpbb_db_migration_exception $e) {} + +		// Failure should have caused an automatic roll-back, so this should not exist. +		$this->assertFalse(isset($this->config['foobar3'])); + +		$sql = 'SELECT * FROM phpbb_config'; +		$result = $this->db->sql_query_limit($sql, 1); +		$row = $this->db->sql_fetchrow($result); +		$this->db->sql_freeresult($result); + +		if (isset($row['test_column'])) +		{ +			$this->fail('Revert did not remove test_column.'); +		} +	} + +	public function test_installed() +	{ +		$this->migrator->set_migrations(array('phpbb_dbal_migration_installed')); + +		global $migrator_test_installed_failed; +		$migrator_test_installed_failed = false; + +		while (!$this->migrator->finished()) +		{ +			$this->migrator->update(); +		} + +		$this->assertTrue($this->migrator->migration_state('phpbb_dbal_migration_installed') !== false); + +		if ($migrator_test_installed_failed) +		{ +			$this->fail('Installed test failed'); +		} +	} +} diff --git a/tests/dbal/migrator_tool_config_test.php b/tests/dbal/migrator_tool_config_test.php new file mode 100644 index 0000000000..7d582f230b --- /dev/null +++ b/tests/dbal/migrator_tool_config_test.php @@ -0,0 +1,124 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2011 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* +*/ + +require_once dirname(__FILE__) . '/../../phpBB/includes/db/migration/tool/config.php'; +require_once dirname(__FILE__) . '/../../phpBB/includes/db/migration/exception.php'; + +class phpbb_dbal_migrator_tool_config_test extends phpbb_test_case +{ +	public function setup() +	{ +		$this->config = new phpbb_config(array()); + +		$this->tool = new phpbb_db_migration_tool_config($this->config); + +		parent::setup(); +	} + +	public function test_add() +	{ +		try +		{ +			$this->tool->add('foo', 'bar'); +		} +		catch (Exception $e) +		{ +			$this->fail($e); +		} +		$this->assertEquals('bar', $this->config['foo']); + +		try +		{ +			$this->tool->add('foo', 'bar'); +			$this->fail('Exception not thrown'); +		} +		catch (Exception $e) {} +	} + +	public function test_update() +	{ +		$this->config->set('foo', 'bar'); +		try +		{ +			$this->tool->update('foo', 'bar2'); +		} +		catch (Exception $e) +		{ +			$this->fail($e); +		} +		$this->assertEquals('bar2', $this->config['foo']); +	} + +	public function test_update_if_equals() +	{ +		$this->config->set('foo', 'bar'); + +		try +		{ +			$this->tool->update_if_equals('', 'foo', 'bar2'); +		} +		catch (Exception $e) +		{ +			$this->fail($e); +		} +		$this->assertEquals('bar', $this->config['foo']); + +		try +		{ +			$this->tool->update_if_equals('bar', 'foo', 'bar2'); +		} +		catch (Exception $e) +		{ +			$this->fail($e); +		} +		$this->assertEquals('bar2', $this->config['foo']); +	} + +	public function test_remove() +	{ +		$this->config->set('foo', 'bar'); + +		try +		{ +			$this->tool->remove('foo'); +		} +		catch (Exception $e) +		{ +			$this->fail($e); +		} +		$this->assertFalse(isset($this->config['foo'])); +	} + +	public function test_reverse() +	{ +		$this->config->set('foo', 'bar'); + +		try +		{ +			$this->tool->reverse('add', 'foo'); +		} +		catch (Exception $e) +		{ +			$this->fail($e); +		} +		$this->assertFalse(isset($this->config['foo'])); + +		$this->config->set('foo', 'bar'); + +		try +		{ +			$this->tool->reverse('update_if_equals', 'test', 'foo', 'bar'); +		} +		catch (Exception $e) +		{ +			$this->fail($e); +		} +		$this->assertEquals('test', $this->config['foo']); +	} +} diff --git a/tests/dbal/migrator_tool_module_test.php b/tests/dbal/migrator_tool_module_test.php new file mode 100644 index 0000000000..3303086b26 --- /dev/null +++ b/tests/dbal/migrator_tool_module_test.php @@ -0,0 +1,155 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2011 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* +*/ + +require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; +require_once dirname(__FILE__) . '/../../phpBB/includes/db/migration/tool/module.php'; +require_once dirname(__FILE__) . '/../../phpBB/includes/db/migration/exception.php'; + +class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case +{ +	public function getDataSet() +	{ +		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/migrator_module.xml'); +	} + +	public function setup() +	{ +		// Need global $db, $user for delete_module function in acp_modules +		global $phpbb_root_path, $phpEx, $skip_add_log, $db, $user, $phpbb_log; + +		parent::setup(); + +		// Force add_log function to not be used +		$skip_add_log = true; + +		$db = $this->db = $this->new_dbal(); +		$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'); +	} + +	public function exists_data() +	{ +		return array( +			// Test the category +			array( +				'', +				'ACP_CAT', +				true, +			), +			array( +				0, +				'ACP_CAT', +				true, +			), + +			// Test the module +			array( +				'', +				'ACP_MODULE', +				false, +			), +			array( +				false, +				'ACP_MODULE', +				true, +			), +			array( +				'ACP_CAT', +				'ACP_MODULE', +				true, +			), +		); +	} + +	/** +	* @dataProvider exists_data +	*/ +	public function test_exists($parent, $module, $expected) +	{ +		$this->assertEquals($expected, $this->tool->exists('acp', $parent, $module)); +	} + +	public function test_add() +	{ +		try +		{ +			$this->tool->add('acp', 0, 'ACP_NEW_CAT'); +		} +		catch (Exception $e) +		{ +			$this->fail($e); +		} +		$this->assertEquals(true, $this->tool->exists('acp', 0, 'ACP_NEW_CAT')); + +		// Should throw an exception when trying to add a module that already exists +		try +		{ +			$this->tool->add('acp', 0, 'ACP_NEW_CAT'); +			$this->fail('Exception not thrown'); +		} +		catch (Exception $e) {} + +		try +		{ +			$this->tool->add('acp', 'ACP_NEW_CAT', array( +				'module_basename'	=> 'acp_new_module', +				'module_langname'	=> 'ACP_NEW_MODULE', +				'module_mode'		=> 'test', +				'module_auth'		=> '', +			)); +		} +		catch (Exception $e) +		{ +			$this->fail($e); +		} +		$this->assertEquals(true, $this->tool->exists('acp', 'ACP_NEW_CAT', 'ACP_NEW_MODULE')); +	} + +	public function test_remove() +	{ +		try +		{ +			$this->tool->remove('acp', 'ACP_CAT', 'ACP_MODULE'); +		} +		catch (Exception $e) +		{ +			$this->fail($e); +		} +		$this->assertEquals(false, $this->tool->exists('acp', 'ACP_CAT', 'ACP_MODULE')); +	} + +	public function test_reverse() +	{ +		try +		{ +			$this->tool->add('acp', 0, 'ACP_NEW_CAT'); +		} +		catch (Exception $e) +		{ +			$this->fail($e); +		} + +		try +		{ +			$this->tool->reverse('add', 'acp', 0, 'ACP_NEW_CAT'); +		} +		catch (Exception $e) +		{ +			$this->fail($e); +		} +		$this->assertFalse($this->tool->exists('acp', 0, 'ACP_NEW_CAT')); +	} +} diff --git a/tests/dbal/migrator_tool_permission_test.php b/tests/dbal/migrator_tool_permission_test.php new file mode 100644 index 0000000000..438ab2b28e --- /dev/null +++ b/tests/dbal/migrator_tool_permission_test.php @@ -0,0 +1,159 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2011 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* +*/ + +require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; +require_once dirname(__FILE__) . '/../../phpBB/includes/db/migration/tool/permission.php'; +require_once dirname(__FILE__) . '/../../phpBB/includes/db/migration/exception.php'; + +class phpbb_dbal_migrator_tool_permission_test extends phpbb_database_test_case +{ +	public function getDataSet() +	{ +		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/migrator_permission.xml'); +	} + +	public function setup() +	{ +		// Global $db and $cache are needed in acp/auth.php constructor +		global $phpbb_root_path, $phpEx, $db, $cache; + +		parent::setup(); + +		$db = $this->db = $this->new_dbal(); +		$cache = $this->cache = new phpbb_cache_service(new phpbb_cache_driver_null(), new phpbb_config(array()), $this->db, $phpbb_root_path, $phpEx); +		$this->auth = new phpbb_auth(); + +		$this->tool = new phpbb_db_migration_tool_permission($this->db, $this->cache, $this->auth, $phpbb_root_path, $phpEx); +	} + +	public function exists_data() +	{ +		return array( +			array( +				'global', +				true, +				true, +			), +			array( +				'local', +				false, +				true, +			), +			array( +				'both', +				true, +				true, +			), +			array( +				'both', +				false, +				true, +			), +			array( +				'does_not_exist', +				true, +				false, +			), +		); +	} + +	/** +	* @dataProvider exists_data +	*/ +	public function test_exists($auth_option, $global, $expected) +	{ +		$this->assertEquals($expected, $this->tool->exists($auth_option, $global)); +	} + +	public function test_add() +	{ +		try +		{ +			$this->tool->add('new', true); +		} +		catch (Exception $e) +		{ +			$this->fail($e); +		} +		$this->assertEquals(true, $this->tool->exists('new', true)); +		$this->assertEquals(false, $this->tool->exists('new', false)); + +		try +		{ +			$this->tool->add('new', false); +		} +		catch (Exception $e) +		{ +			$this->fail($e); +		} +		$this->assertEquals(true, $this->tool->exists('new', false)); + +		// Should fail (duplicate) +		try +		{ +			$this->tool->add('new', true); +			$this->fail('Did not throw exception on duplicate'); +		} +		catch (Exception $e) {} +	} + +	public function test_remove() +	{ +		try +		{ +			$this->tool->remove('global', true); +		} +		catch (Exception $e) +		{ +			$this->fail($e); +		} +		$this->assertEquals(false, $this->tool->exists('global', true)); + +		try +		{ +			$this->tool->remove('both', false); +		} +		catch (Exception $e) +		{ +			$this->fail($e); +		} +		$this->assertEquals(false, $this->tool->exists('both', false)); + +		// Should fail (does not exist) +		try +		{ +			$this->tool->remove('new', true); +			$this->fail('Did not throw exception on duplicate'); +		} +		catch (Exception $e) {} +	} + +	public function test_reverse() +	{ +		try +		{ +			$this->tool->reverse('remove', 'global_test', true); +		} +		catch (Exception $e) +		{ +			$this->fail($e); +		} +		$this->assertTrue($this->tool->exists('global_test', true)); + +		try +		{ +			$this->tool->reverse('add', 'global_test', true); +		} +		catch (Exception $e) +		{ +			$this->fail($e); +		} +		$this->assertFalse($this->tool->exists('global_test', true)); +	} +} diff --git a/tests/dbal/order_lower_test.php b/tests/dbal/order_lower_test.php index e17295a4ea..d826765681 100644 --- a/tests/dbal/order_lower_test.php +++ b/tests/dbal/order_lower_test.php @@ -38,27 +38,30 @@ class phpbb_dbal_order_lower_test extends phpbb_database_test_case  					'style_name'		=> 'prosilver',  					'style_copyright'	=> '© phpBB Group',  					'style_active'		=> 1, -					'template_id'		=> 1, -					'theme_id'			=> 1, -					'imageset_id'		=> 1 +					'style_path'		=> 'prosilver', +					'bbcode_bitfield'	=> 'kNg=', +					'style_parent_id'	=> 0, +					'style_parent_tree'	=> '',  				),  				array(  					'style_id' 			=> 3,  					'style_name'		=> 'Prosilver1',  					'style_copyright'	=> '© phpBB Group',  					'style_active'		=> 0, -					'template_id'		=> 3, -					'theme_id'			=> 3, -					'imageset_id'		=> 3 +					'style_path'		=> 'prosilver1', +					'bbcode_bitfield'	=> 'kNg=', +					'style_parent_id'	=> 1, +					'style_parent_tree'	=> 'prosilver',  				),  				array(  					'style_id' 			=> 2,  					'style_name'		=> 'prosilver2',  					'style_copyright'	=> '© phpBB Group',  					'style_active'		=> 0, -					'template_id'		=> 2, -					'theme_id'			=> 2, -					'imageset_id'		=> 2 +					'style_path'		=> 'prosilver2', +					'bbcode_bitfield'	=> 'kNg=', +					'style_parent_id'	=> 0, +					'style_parent_tree'	=> '',  				)  			),  			$db->sql_fetchrowset($result) diff --git a/tests/dbal/schema_test.php b/tests/dbal/schema_test.php new file mode 100644 index 0000000000..2a332fddba --- /dev/null +++ b/tests/dbal/schema_test.php @@ -0,0 +1,38 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2011 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_dbal_schema_test extends phpbb_database_test_case +{ +	public function getDataSet() +	{ +		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/config.xml'); +	} + +	public function test_config_value_multibyte() +	{ +		$db = $this->new_dbal(); + +		$value = str_repeat("\xC3\x84", 255); +		$sql = "INSERT INTO phpbb_config +			(config_name, config_value) +			VALUES ('name', '$value')"; +		$result = $db->sql_query($sql); + +		$sql = "SELECT config_value +			FROM phpbb_config +			WHERE config_name = 'name'"; +		$result = $db->sql_query_limit($sql, 1); +		$row = $db->sql_fetchrow($result); +		$db->sql_freeresult($result); + +		$this->assertEquals($value, $row['config_value']); +	} +} diff --git a/tests/dbal/select_test.php b/tests/dbal/select_test.php index 6dbab05a41..c8cfad04e0 100644 --- a/tests/dbal/select_test.php +++ b/tests/dbal/select_test.php @@ -17,7 +17,7 @@ class phpbb_dbal_select_test extends phpbb_database_test_case  		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/three_users.xml');  	} -	static public function return_on_error_select_data() +	public function return_on_error_select_data()  	{  		return array(  			array('phpbb_users', "username_clean = 'bertie'", array(array('username_clean' => 'bertie'))), @@ -44,7 +44,7 @@ class phpbb_dbal_select_test extends phpbb_database_test_case  		$this->assertEquals($expected, $db->sql_fetchrowset($result));  	} -	static public function fetchrow_data() +	public function fetchrow_data()  	{  		return array(  			array('', array(array('username_clean' => 'barfoo'), @@ -95,7 +95,7 @@ class phpbb_dbal_select_test extends phpbb_database_test_case  		$db->sql_freeresult($result);  	} -	static public function fetchfield_data() +	public function fetchfield_data()  	{  		return array(  			array('', array('barfoo', 'foobar', 'bertie')), @@ -192,7 +192,7 @@ class phpbb_dbal_select_test extends phpbb_database_test_case  		$this->assertEquals($expected, $ary);  	} -	static public function like_expression_data() +	public function like_expression_data()  	{  		// * = any_char; # = one_char  		return array( @@ -229,7 +229,7 @@ class phpbb_dbal_select_test extends phpbb_database_test_case  		$db->sql_freeresult($result);  	} -	static public function in_set_data() +	public function in_set_data()  	{  		return array(  			array('user_id', 3, false, false, array(array('username_clean' => 'bertie'))), @@ -303,7 +303,7 @@ class phpbb_dbal_select_test extends phpbb_database_test_case  		$db->sql_freeresult($result);  	} -	static public function build_array_data() +	public function build_array_data()  	{  		return array(  			array(array('username_clean' => 'barfoo'), array(array('username_clean' => 'barfoo'))), 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/dbal/write_sequence_test.php b/tests/dbal/write_sequence_test.php index 8975cfbfb1..f382a971a5 100644 --- a/tests/dbal/write_sequence_test.php +++ b/tests/dbal/write_sequence_test.php @@ -33,6 +33,10 @@ class phpbb_dbal_write_sequence_test extends phpbb_database_test_case  	{  		$db = $this->new_dbal(); +		// dbal uses cache +		global $cache; +		$cache = new phpbb_mock_cache(); +  		$sql = 'INSERT INTO phpbb_users ' . $db->sql_build_array('INSERT', array(  			'username'			=> $username,  			'username_clean'	=> $username, diff --git a/tests/dbal/write_test.php b/tests/dbal/write_test.php index ecfd774896..987161a831 100644 --- a/tests/dbal/write_test.php +++ b/tests/dbal/write_test.php @@ -16,7 +16,7 @@ class phpbb_dbal_write_test extends phpbb_database_test_case  		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/config.xml');  	} -	static public function build_array_insert_data() +	public function build_array_insert_data()  	{  		return array(  			array(array( @@ -104,7 +104,7 @@ class phpbb_dbal_write_test extends phpbb_database_test_case  		$db->sql_freeresult($result);  	} -	static public function update_data() +	public function update_data()  	{  		return array(  			array( diff --git a/tests/di/create_container_test.php b/tests/di/create_container_test.php new file mode 100644 index 0000000000..6de8803df9 --- /dev/null +++ b/tests/di/create_container_test.php @@ -0,0 +1,71 @@ +<?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.php'; +require_once dirname(__FILE__) . '/../../phpBB/includes/functions_container.php'; + +class phpbb_di_container_test extends phpbb_test_case +{ +    public function test_phpbb_create_container() +    { +        $phpbb_root_path = __DIR__ . '/../../phpBB/'; +        $extensions = array( +            new phpbb_di_extension_config(__DIR__ . '/fixtures/config.php'), +            new phpbb_di_extension_core($phpbb_root_path), +        ); +        $container = phpbb_create_container($extensions, $phpbb_root_path, 'php'); + +        $this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container); +    } + +    public function test_phpbb_create_install_container() +    { +        $phpbb_root_path = __DIR__ . '/../../phpBB/'; +        $extensions = array( +            new phpbb_di_extension_config(__DIR__ . '/fixtures/config.php'), +            new phpbb_di_extension_core($phpbb_root_path), +        ); +        $container = phpbb_create_install_container($phpbb_root_path, 'php'); + +        $this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container); +        $this->assertTrue($container->isFrozen()); +    } + +    public function test_phpbb_create_compiled_container() +    { +        $phpbb_root_path = __DIR__ . '/../../phpBB/'; +        $extensions = array( +            new phpbb_di_extension_config(__DIR__ . '/fixtures/config.php'), +            new phpbb_di_extension_core($phpbb_root_path), +        ); +        $container = phpbb_create_compiled_container($extensions, array(), $phpbb_root_path, 'php'); + +        $this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container); +        $this->assertTrue($container->isFrozen()); +    } +} + +class phpbb_db_driver_container_mock extends phpbb_db_driver +{ +    public function sql_connect() +    { +    } + +    public function sql_query() +    { +    } + +    public function sql_fetchrow() +    { +    } + +    public function sql_freeresult() +    { +    } +} diff --git a/tests/di/fixtures/config.php b/tests/di/fixtures/config.php new file mode 100644 index 0000000000..5033d2dc9f --- /dev/null +++ b/tests/di/fixtures/config.php @@ -0,0 +1,11 @@ +<?php +// phpBB 3.1.x auto-generated configuration file +// Do not change anything in this file! +$dbms = 'container_mock'; +$dbhost = '127.0.0.1'; +$dbport = ''; +$dbname = 'phpbb'; +$dbuser = 'root'; +$dbpasswd = ''; +$table_prefix = 'phpbb_'; +$acm_type = 'phpbb_cache_driver_null'; diff --git a/tests/download/http_byte_range_test.php b/tests/download/http_byte_range_test.php new file mode 100644 index 0000000000..23b9169fe3 --- /dev/null +++ b/tests/download/http_byte_range_test.php @@ -0,0 +1,64 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2010 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +require_once dirname(__FILE__) . '/../../phpBB/includes/functions_download.php'; + +class phpbb_download_http_byte_range_test extends phpbb_test_case +{ +	public function test_find_range_request() +	{ +		// Missing 'bytes=' prefix +		$GLOBALS['request'] = new phpbb_mock_request(); +		$GLOBALS['request']->set_header('Range', 'bztes='); +		$this->assertEquals(false, phpbb_find_range_request()); +		unset($GLOBALS['request']); + +		$GLOBALS['request'] = new phpbb_mock_request(); +		$_ENV['HTTP_RANGE'] = 'bztes='; +		$this->assertEquals(false, phpbb_find_range_request()); +		unset($_ENV['HTTP_RANGE']); + +		$GLOBALS['request'] = new phpbb_mock_request(); +		$GLOBALS['request']->set_header('Range', 'bytes=0-0,123-125'); +		$this->assertEquals(array('0-0', '123-125'), phpbb_find_range_request()); +		unset($GLOBALS['request']); +	} + +	/** +	* @dataProvider parse_range_request_data() +	*/ +	public function test_parse_range_request($request_array, $filesize, $expected) +	{ +		$this->assertEquals($expected, phpbb_parse_range_request($request_array, $filesize)); +	} + +	public function parse_range_request_data() +	{ +		return array( +			// Does not read until the end of file. +			array( +				array('3-4'), +				10, +				false, +			), + +			// Valid request, handle second range. +			array( +				array('0-0', '120-125'), +				125, +				array( +					'byte_pos_start'	=> 120, +					'byte_pos_end'		=> 124, +					'bytes_requested'	=> 5, +					'bytes_total'		=> 125, +				) +			), +		); +	} +} diff --git a/tests/download/http_user_agent_test.php b/tests/download/http_user_agent_test.php new file mode 100644 index 0000000000..166a186913 --- /dev/null +++ b/tests/download/http_user_agent_test.php @@ -0,0 +1,130 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +require_once dirname(__FILE__) . '/../../phpBB/includes/functions_download.php'; + +class phpbb_download_http_user_agent_test extends phpbb_test_case +{ +	public function user_agents_check_greater_ie_version() +	{ +		return array( +			// user agent +			// IE version +			// expected +			array( +				'Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)', +				7, +				true, +			), +			array( +				'Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)', +				7, +				true, +			), +			array( +				'Mozilla/5.0 (compatible; MSIE 8.0; Windows NT 6.1; Trident/4.0; GTB7.4; InfoPath.2; SV1; .NET CLR 3.3.69573; WOW64; en-US)', +				7, +				true, +			), +			array( +				'Mozilla/5.0 (Windows; U; MSIE 7.0; Windows NT 6.0; en-US)', +				7, +				false, +			), +			array( +				'Mozilla/4.0 (compatible; MSIE 6.1; Windows XP; .NET CLR 1.1.4322; .NET CLR 2.0.50727)', +				7, +				false, +			), +			array( +				'Mozilla/4.0 (compatible; MSIE 6.01; Windows NT 6.0)', +				7, +				false, +			), +			array( +				'Mozilla/5.0 (Windows; U; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 2.0.50727)', +				7, +				false, +			), +			array( +				'Mozilla/5.0 (Windows NT 6.2; Win64; x64;) Gecko/20100101 Firefox/20.0', +				7, +				false, +			), +			array( +				'Mozilla/5.0 (Windows NT 6.2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1464.0 Safari/537.36', +				7, +				false, +			), +			array( +				'Googlebot-Image/1.0', +				7, +				false, +			), +			array( +				'Googlebot/2.1 ( http://www.google.com/bot.html)', +				7, +				false, +			), +			array( +				'Lynx/2.8.3dev.9 libwww-FM/2.14 SSL-MM/1.4.1 OpenSSL/0.9.6', +				7, +				false, +			), +			array( +				'Links (0.9x; Linux 2.4.7-10 i686)', +				7, +				false, +			), +			array( +				'Opera/9.60 (Windows NT 5.1; U; de) Presto/2.1.1', +				7, +				false, +			), +			array( +				'Mozilla/4.0 (compatible; MSIE 5.0; Windows NT;)', +				7, +				false, +			), +			array( +				'Mozilla/4.0 (compatible; MSIE 5.0; Windows NT 4.0) Opera 6.01 [en]', +				7, +				false, +			), +			array( +				'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; en) Opera 9.24', +				7, +				false, +			), +			array( +				'Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)', +				8, +				true, +			), +			array( +				'Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)', +				9, +				true, +			), +			array( +				'Mozilla/5.0 (compatible; MSIE 8.0; Windows NT 6.1; Trident/4.0; GTB7.4; InfoPath.2; SV1; .NET CLR 3.3.69573; WOW64; en-US)', +				10, +				false, +			), +		); +	} + +	/** +	* @dataProvider user_agents_check_greater_ie_version +	*/ +	public function test_is_greater_ie_version($user_agent, $version, $expected) +	{ +		$this->assertEquals($expected, phpbb_is_greater_ie_version($user_agent, $version)); +	} +} diff --git a/tests/event/dispatcher_test.php b/tests/event/dispatcher_test.php new file mode 100644 index 0000000000..9b9203e06a --- /dev/null +++ b/tests/event/dispatcher_test.php @@ -0,0 +1,29 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2012 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +class phpbb_event_dispatcher_test extends phpbb_test_case +{ +    public function test_trigger_event() +    { +        $dispatcher = new phpbb_event_dispatcher(new phpbb_mock_container_builder()); + +        $dispatcher->addListener('core.test_event', function (phpbb_event_data $event) { +            $event['foo'] = $event['foo'] . '2'; +            $event['bar'] = $event['bar'] . '2'; +        }); + +        $foo = 'foo'; +        $bar = 'bar'; + +        $vars = array('foo', 'bar'); +        $result = $dispatcher->trigger_event('core.test_event', compact($vars)); + +        $this->assertSame(array('foo' => 'foo2', 'bar' => 'bar2'), $result); +    } +} diff --git a/tests/extension/ext/bar/ext.php b/tests/extension/ext/bar/ext.php new file mode 100644 index 0000000000..5585edf9ac --- /dev/null +++ b/tests/extension/ext/bar/ext.php @@ -0,0 +1,24 @@ +<?php + +class phpbb_ext_bar_ext extends phpbb_extension_base +{ +	static public $state; + +	public function enable_step($old_state) +	{ +		// run 4 steps, then quit +		if ($old_state === 4) +		{ +			return false; +		} + +		if ($old_state === false) +		{ +			$old_state = 0; +		} + +		self::$state = ++$old_state; + +		return self::$state; +	} +} diff --git a/tests/extension/ext/bar/my/hidden_class.php b/tests/extension/ext/bar/my/hidden_class.php new file mode 100644 index 0000000000..0261d7c59a --- /dev/null +++ b/tests/extension/ext/bar/my/hidden_class.php @@ -0,0 +1,5 @@ +<?php + +class phpbb_ext_bar_my_hidden_class +{ +} diff --git a/tests/extension/ext/bar/styles/prosilver/template/foobar_body.html b/tests/extension/ext/bar/styles/prosilver/template/foobar_body.html new file mode 100644 index 0000000000..00c2a84a18 --- /dev/null +++ b/tests/extension/ext/bar/styles/prosilver/template/foobar_body.html @@ -0,0 +1 @@ +bertie rules! diff --git a/tests/extension/ext/barfoo/acp/a_info.php b/tests/extension/ext/barfoo/acp/a_info.php new file mode 100644 index 0000000000..cd7e4e574b --- /dev/null +++ b/tests/extension/ext/barfoo/acp/a_info.php @@ -0,0 +1,16 @@ +<?php + +class phpbb_ext_barfoo_acp_a_info +{ +	public function module() +	{ +		return array( +			'filename'	=> 'phpbb_ext_barfoo_acp_a_module', +			'title'		=> 'Barfoo', +			'version'	=> '3.1.0-dev', +			'modes'		=> array( +				'config'		=> array('title' => 'Config',	'auth' => '', 'cat' => array('ACP_MODS')), +			), +		); +	} +} diff --git a/tests/extension/ext/barfoo/acp/a_module.php b/tests/extension/ext/barfoo/acp/a_module.php new file mode 100644 index 0000000000..5bedb49645 --- /dev/null +++ b/tests/extension/ext/barfoo/acp/a_module.php @@ -0,0 +1,5 @@ +<?php + +class phpbb_ext_barfoo_acp_a_module +{ +} diff --git a/tests/extension/ext/barfoo/ext.php b/tests/extension/ext/barfoo/ext.php new file mode 100644 index 0000000000..2e11ece8d1 --- /dev/null +++ b/tests/extension/ext/barfoo/ext.php @@ -0,0 +1,5 @@ +<?php + +class phpbb_ext_barfoo_ext extends phpbb_extension_base +{ +} diff --git a/tests/extension/ext/foo/a_class.php b/tests/extension/ext/foo/a_class.php new file mode 100644 index 0000000000..b7be1ad654 --- /dev/null +++ b/tests/extension/ext/foo/a_class.php @@ -0,0 +1,5 @@ +<?php + +class phpbb_ext_foo_a_class +{ +} diff --git a/tests/extension/ext/foo/acp/a_info.php b/tests/extension/ext/foo/acp/a_info.php new file mode 100644 index 0000000000..3e9bbffaca --- /dev/null +++ b/tests/extension/ext/foo/acp/a_info.php @@ -0,0 +1,16 @@ +<?php + +class phpbb_ext_foo_acp_a_info +{ +	public function module() +	{ +		return array( +			'filename'	=> 'phpbb_ext_foo_acp_a_module', +			'title'		=> 'Foobar', +			'version'	=> '3.1.0-dev', +			'modes'		=> array( +				'config'		=> array('title' => 'Config',	'auth' => '', 'cat' => array('ACP_MODS')), +			), +		); +	} +} diff --git a/tests/extension/ext/foo/acp/a_module.php b/tests/extension/ext/foo/acp/a_module.php new file mode 100644 index 0000000000..093b4b1ad7 --- /dev/null +++ b/tests/extension/ext/foo/acp/a_module.php @@ -0,0 +1,5 @@ +<?php + +class phpbb_ext_foo_acp_a_module +{ +} diff --git a/tests/extension/ext/foo/acp/fail_info.php b/tests/extension/ext/foo/acp/fail_info.php new file mode 100644 index 0000000000..99aa09551e --- /dev/null +++ b/tests/extension/ext/foo/acp/fail_info.php @@ -0,0 +1,19 @@ +<?php +/* +* Due to the mismatch between the class name and the file name, this module +* file shouldn't be found by the extension finder +*/ +class phpbb_ext_foo_acp_foo_info +{ +	public function module() +	{ +		return array( +			'filename'	=> 'phpbb_ext_foo_acp_fail_module', +			'title'		=> 'Foobar', +			'version'	=> '3.1.0-dev', +			'modes'		=> array( +				'config'		=> array('title' => 'Config',	'auth' => '', 'cat' => array('ACP_MODS')), +			), +		); +	} +} diff --git a/tests/extension/ext/foo/acp/fail_module.php b/tests/extension/ext/foo/acp/fail_module.php new file mode 100644 index 0000000000..a200d92d2f --- /dev/null +++ b/tests/extension/ext/foo/acp/fail_module.php @@ -0,0 +1,8 @@ +<?php +/* +* Due to the mismatch between the class name and the file name of the module +* info file, this module's info file shouldn't be found +*/ +class phpbb_ext_foo_acp_fail_module +{ +} diff --git a/tests/extension/ext/foo/b_class.php b/tests/extension/ext/foo/b_class.php new file mode 100644 index 0000000000..4645266122 --- /dev/null +++ b/tests/extension/ext/foo/b_class.php @@ -0,0 +1,5 @@ +<?php + +class phpbb_ext_foo_b_class +{ +} diff --git a/tests/extension/ext/foo/composer.json b/tests/extension/ext/foo/composer.json new file mode 100644 index 0000000000..744f7be625 --- /dev/null +++ b/tests/extension/ext/foo/composer.json @@ -0,0 +1,22 @@ +{ +	"name": "foo/example", +	"type": "phpbb3-extension", +	"description": "An example/sample extension to be used for testing purposes in phpBB Development.", +	"version": "1.0.0", +	"time": "2012-02-15 01:01:01", +	"licence": "GPL-2.0", +	"authors": [{ +			"name": "Nathan Guse", +			"username": "EXreaction", +			"email": "email@phpbb.com", +			"homepage": "http://lithiumstudios.org", +			"role": "N/A" +		}], +	"require": { +		"php": ">=5.3", +		"phpbb": "3.1.0-dev" +	}, +	"extra": { +		"display-name": "phpBB Foo Extension" +	} +} diff --git a/tests/extension/ext/foo/ext.php b/tests/extension/ext/foo/ext.php new file mode 100644 index 0000000000..60b3ad1f16 --- /dev/null +++ b/tests/extension/ext/foo/ext.php @@ -0,0 +1,13 @@ +<?php + +class phpbb_ext_foo_ext extends phpbb_extension_base +{ +	static public $disabled; + +	public function disable_step($old_state) +	{ +		self::$disabled = true; + +		return false; +	} +} diff --git a/tests/extension/ext/foo/mcp/a_info.php b/tests/extension/ext/foo/mcp/a_info.php new file mode 100644 index 0000000000..84a36b9134 --- /dev/null +++ b/tests/extension/ext/foo/mcp/a_info.php @@ -0,0 +1,16 @@ +<?php + +class phpbb_ext_foo_mcp_a_info +{ +	public function module() +	{ +		return array( +			'filename'	=> 'phpbb_ext_foo_mcp_a_module', +			'title'		=> 'Foobar', +			'version'	=> '3.1.0-dev', +			'modes'		=> array( +				'config'		=> array('title' => 'Config',	'auth' => '', 'cat' => array('MCP_MAIN')), +			), +		); +	} +} diff --git a/tests/extension/ext/foo/mcp/a_module.php b/tests/extension/ext/foo/mcp/a_module.php new file mode 100644 index 0000000000..59d9f8cc6f --- /dev/null +++ b/tests/extension/ext/foo/mcp/a_module.php @@ -0,0 +1,5 @@ +<?php + +class phpbb_ext_foo_mcp_a_module +{ +} diff --git a/tests/extension/ext/foo/sub/type/alternative.php b/tests/extension/ext/foo/sub/type/alternative.php new file mode 100644 index 0000000000..2ea7353f4b --- /dev/null +++ b/tests/extension/ext/foo/sub/type/alternative.php @@ -0,0 +1,5 @@ +<?php + +class phpbb_ext_foo_sub_type_alternative +{ +} diff --git a/tests/extension/ext/foo/type/alternative.php b/tests/extension/ext/foo/type/alternative.php new file mode 100644 index 0000000000..404b66b965 --- /dev/null +++ b/tests/extension/ext/foo/type/alternative.php @@ -0,0 +1,5 @@ +<?php + +class phpbb_ext_foo_type_alternative +{ +} diff --git a/tests/extension/ext/foo/type/dummy/empty.txt b/tests/extension/ext/foo/type/dummy/empty.txt new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/tests/extension/ext/foo/type/dummy/empty.txt diff --git a/tests/extension/ext/foo/typewrong/error.php b/tests/extension/ext/foo/typewrong/error.php new file mode 100644 index 0000000000..ba22cfae9a --- /dev/null +++ b/tests/extension/ext/foo/typewrong/error.php @@ -0,0 +1,5 @@ +<?php + +class phpbb_ext_foo_typewrong_error +{ +} diff --git a/tests/extension/ext/vendor/moo/composer.json b/tests/extension/ext/vendor/moo/composer.json new file mode 100644 index 0000000000..c91a5e027b --- /dev/null +++ b/tests/extension/ext/vendor/moo/composer.json @@ -0,0 +1,22 @@ +{ +	"name": "moo/example", +	"type": "phpbb3-extension", +	"description": "An example/sample extension to be used for testing purposes in phpBB Development.", +	"version": "1.0.0", +	"time": "2012-02-15 01:01:01", +	"licence": "GNU GPL v2", +	"authors": [{ +			"name": "Nathan Guse", +			"username": "EXreaction", +			"email": "email@phpbb.com", +			"homepage": "http://lithiumstudios.org", +			"role": "N/A" +		}], +	"require": { +		"php": ">=5.3", +		"phpbb": "3.1.0-dev" +	}, +	"extra": { +		"display-name": "phpBB Moo Extension" +	} +} diff --git a/tests/extension/ext/vendor/moo/ext.php b/tests/extension/ext/vendor/moo/ext.php new file mode 100644 index 0000000000..e0ac1a22cc --- /dev/null +++ b/tests/extension/ext/vendor/moo/ext.php @@ -0,0 +1,13 @@ +<?php + +class phpbb_ext_vendor_moo_ext extends phpbb_extension_base +{ +	static public $purged; + +	public function purge_step($old_state) +	{ +		self::$purged = true; + +		return false; +	} +} diff --git a/tests/extension/ext/vendor/moo/feature_class.php b/tests/extension/ext/vendor/moo/feature_class.php new file mode 100644 index 0000000000..c3bcc4451c --- /dev/null +++ b/tests/extension/ext/vendor/moo/feature_class.php @@ -0,0 +1,5 @@ +<?php + +class phpbb_ext_vendor_moo_feature_class +{ +} diff --git a/tests/extension/finder_test.php b/tests/extension/finder_test.php new file mode 100644 index 0000000000..6f3cebbd7c --- /dev/null +++ b/tests/extension/finder_test.php @@ -0,0 +1,245 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2011 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_extension_finder_test extends phpbb_test_case +{ +	protected $extension_manager; +	protected $finder; + +	public function setUp() +	{ +		$this->extension_manager = new phpbb_mock_extension_manager( +			dirname(__FILE__) . '/', +			array( +				'foo' => array( +					'ext_name' => 'foo', +					'ext_active' => '1', +					'ext_path' => 'ext/foo/', +				), +				'bar' => array( +					'ext_name' => 'bar', +					'ext_active' => '1', +					'ext_path' => 'ext/bar/', +				), +			)); + +		$this->finder = $this->extension_manager->get_finder(); +	} + +	public function test_suffix_get_classes() +	{ +		$classes = $this->finder +			->core_path('includes/default/') +			->extension_suffix('_class') +			->get_classes(); + +		sort($classes); +		$this->assertEquals( +			array( +				'phpbb_default_implementation', +				'phpbb_ext_bar_my_hidden_class', +				'phpbb_ext_foo_a_class', +				'phpbb_ext_foo_b_class', +			), +			$classes +		); +	} + +	public function test_get_directories() +	{ +		$dirs = $this->finder +			->directory('/type') +			->get_directories(); + +		sort($dirs); +		$this->assertEquals(array( +			dirname(__FILE__) . '/ext/foo/type/', +		), $dirs); +	} + +	public function test_prefix_get_directories() +	{ +		$dirs = $this->finder +            ->prefix('ty') +			->get_directories(); + +		sort($dirs); +		$this->assertEquals(array( +			dirname(__FILE__) . '/ext/foo/sub/type/', +			dirname(__FILE__) . '/ext/foo/type/', +			dirname(__FILE__) . '/ext/foo/typewrong/', +		), $dirs); +	} + +	public function test_prefix_get_classes() +	{ +		$classes = $this->finder +			->core_path('includes/default/') +			->extension_prefix('hidden_') +			->get_classes(); + +		sort($classes); +		$this->assertEquals( +			array( +				'phpbb_default_implementation', +				'phpbb_ext_bar_my_hidden_class', +			), +			$classes +		); +	} + +	public function test_directory_get_classes() +	{ +		$classes = $this->finder +			->core_path('includes/default/') +			->extension_directory('type') +			->get_classes(); + +		sort($classes); +		$this->assertEquals( +			array( +				'phpbb_default_implementation', +				'phpbb_ext_foo_sub_type_alternative', +				'phpbb_ext_foo_type_alternative', +			), +			$classes +		); +	} + +	public function test_absolute_directory_get_classes() +	{ +		$classes = $this->finder +			->directory('/type/') +			->get_classes(); + +		sort($classes); +		$this->assertEquals( +			array( +				'phpbb_ext_foo_type_alternative', +			), +			$classes +		); +	} + +	public function test_sub_directory_get_classes() +	{ +		$classes = $this->finder +			->directory('/sub/type') +			->get_classes(); + +		sort($classes); +		$this->assertEquals( +			array( +				'phpbb_ext_foo_sub_type_alternative', +			), +			$classes +		); +	} + +	public function test_uncleansub_directory_get_classes() +	{ +		$classes = $this->finder +			->directory('/sub/../sub/type') +			->get_classes(); + +		sort($classes); +		$this->assertEquals( +			array( +				'phpbb_ext_foo_sub_type_alternative', +			), +			$classes +		); +	} + +	public function test_find_from_extension() +	{ +		$files = $this->finder +			->extension_directory('/type') +			->find_from_extension('foo', dirname(__FILE__) . '/ext/foo/'); +		$classes = $this->finder->get_classes_from_files($files); + +		sort($classes); +		$this->assertEquals( +			array( +				'phpbb_ext_foo_type_alternative', +				'phpbb_ext_foo_type_dummy_empty', +			), +			$classes +		); +	} + +	/** +	* These do not work because of changes with PHPBB3-11386 +	* They do not seem neccessary to me, so I am commenting them out for now +	public function test_get_classes_create_cache() +	{ +		$cache = new phpbb_mock_cache; +		$finder = new phpbb_extension_finder($this->extension_manager, new phpbb_filesystem(), dirname(__FILE__) . '/', $cache, 'php', '_custom_cache_name'); +		$files = $finder->suffix('_class.php')->get_files(); + +		$expected_files = array( +			'ext/bar/my/hidden_class.php' => 'bar', +			'ext/foo/a_class.php' => 'foo', +			'ext/foo/b_class.php' => 'foo', +		); + +		$query = array( +			'core_path' => false, +			'core_suffix' => '_class.php', +			'core_prefix' => false, +			'core_directory' => false, +			'extension_suffix' => '_class.php', +			'extension_prefix' => false, +			'extension_directory' => false, +			'is_dir' => false, +		); + +		$cache->checkAssociativeVar($this, '_custom_cache_name', array( +			md5(serialize($query)) => $expected_files, +		), false); +	} + +	public function test_cached_get_files() +	{ +		$query = array( +			'core_path' => 'includes/foo', +			'core_suffix' => false, +			'core_prefix' => false, +			'core_directory' => 'bar', +			'extension_suffix' => false, +			'extension_prefix' => false, +			'extension_directory' => false, +			'is_dir' => false, +		); + +		$finder = new phpbb_extension_finder( +			$this->extension_manager, +			new phpbb_filesystem(), +			dirname(__FILE__) . '/', +			new phpbb_mock_cache(array( +				'_ext_finder' => array( +					md5(serialize($query)) => array('file_name' => 'extension'), +				), +			)) +		); + +		$classes = $finder +			->core_path($query['core_path']) +			->core_directory($query['core_directory']) +			->get_files(); + +		sort($classes); +		$this->assertEquals( +			array(dirname(__FILE__) . '/file_name'), +			$classes +		); +	} +	*/ +} diff --git a/tests/extension/fixtures/extensions.xml b/tests/extension/fixtures/extensions.xml new file mode 100644 index 0000000000..6eb6fd11a5 --- /dev/null +++ b/tests/extension/fixtures/extensions.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<dataset> +	<table name="phpbb_ext"> +		<column>ext_name</column> +		<column>ext_active</column> +		<column>ext_state</column> +		<row> +			<value>foo</value> +			<value>1</value> +			<value></value> +		</row> +		<row> +			<value>vendor/moo</value> +			<value>0</value> +			<value></value> +		</row> +	</table> +</dataset> diff --git a/tests/extension/includes/acp/acp_foobar.php b/tests/extension/includes/acp/acp_foobar.php new file mode 100644 index 0000000000..c256a432e2 --- /dev/null +++ b/tests/extension/includes/acp/acp_foobar.php @@ -0,0 +1,28 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +/** +* @ignore +*/ +if (!defined('IN_PHPBB')) +{ +	exit; +} + +/** +* @package acp +*/ +class acp_foobar +{ +	var $u_action; + +	function main($id, $mode) +	{ +	} +} diff --git a/tests/extension/includes/acp/info/acp_foobar.php b/tests/extension/includes/acp/info/acp_foobar.php new file mode 100644 index 0000000000..b89cfb9574 --- /dev/null +++ b/tests/extension/includes/acp/info/acp_foobar.php @@ -0,0 +1,26 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +/** +* @package module_install +*/ +class acp_foobar_info +{ +	function module() +	{ +		return array( +			'filename'	=> 'acp_foobar', +			'title'		=> 'ACP Foobar', +			'version'	=> '3.1.0-dev', +			'modes'		=> array( +				'test'		=> array('title' => 'Test', 'auth' => '', 'cat' => array('ACP_GENERAL')), +			), +		); +	} +} diff --git a/tests/extension/includes/default/implementation.php b/tests/extension/includes/default/implementation.php new file mode 100644 index 0000000000..91d5f8aa2f --- /dev/null +++ b/tests/extension/includes/default/implementation.php @@ -0,0 +1,5 @@ +<?php + +class phpbb_default_impl_class implements phpbb_default_interface +{ +} diff --git a/tests/extension/manager_test.php b/tests/extension/manager_test.php new file mode 100644 index 0000000000..a23e5a18d9 --- /dev/null +++ b/tests/extension/manager_test.php @@ -0,0 +1,124 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2011 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +require_once dirname(__FILE__) . '/ext/bar/ext.php'; +require_once dirname(__FILE__) . '/ext/foo/ext.php'; +require_once dirname(__FILE__) . '/ext/vendor/moo/ext.php'; + +class phpbb_extension_manager_test extends phpbb_database_test_case +{ +	protected $extension_manager; +	protected $class_loader; + +	public function getDataSet() +	{ +		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/extensions.xml'); +	} + +	protected function setUp() +	{ +		parent::setUp(); + +		$this->extension_manager = $this->create_extension_manager(); +	} + +	public function test_available() +	{ +		$this->assertEquals(array('bar', 'barfoo', 'foo', 'vendor/moo'), array_keys($this->extension_manager->all_available())); +	} + +	public function test_enabled() +	{ +		$this->assertEquals(array('foo'), array_keys($this->extension_manager->all_enabled())); +	} + +	public function test_configured() +	{ +		$this->assertEquals(array('foo', 'vendor/moo'), array_keys($this->extension_manager->all_configured())); +	} + +	public function test_enable() +	{ +		phpbb_ext_bar_ext::$state = 0; + +		$this->assertEquals(array('foo'), array_keys($this->extension_manager->all_enabled())); +		$this->extension_manager->enable('bar'); +		$this->assertEquals(array('bar', 'foo'), array_keys($this->extension_manager->all_enabled())); +		$this->assertEquals(array('bar', 'foo', 'vendor/moo'), array_keys($this->extension_manager->all_configured())); + +		$this->assertEquals(4, phpbb_ext_bar_ext::$state); +	} + +	public function test_disable() +	{ +		phpbb_ext_foo_ext::$disabled = false; + +		$this->assertEquals(array('foo'), array_keys($this->extension_manager->all_enabled())); +		$this->extension_manager->disable('foo'); +		$this->assertEquals(array(), array_keys($this->extension_manager->all_enabled())); +		$this->assertEquals(array('foo', 'vendor/moo'), array_keys($this->extension_manager->all_configured())); + +		$this->assertTrue(phpbb_ext_foo_ext::$disabled); +	} + +	public function test_purge() +	{ +		phpbb_ext_vendor_moo_ext::$purged = false; + +		$this->assertEquals(array('foo'), array_keys($this->extension_manager->all_enabled())); +		$this->assertEquals(array('foo', 'vendor/moo'), array_keys($this->extension_manager->all_configured())); +		$this->extension_manager->purge('vendor/moo'); +		$this->assertEquals(array('foo'), array_keys($this->extension_manager->all_enabled())); +		$this->assertEquals(array('foo'), array_keys($this->extension_manager->all_configured())); + +		$this->assertTrue(phpbb_ext_vendor_moo_ext::$purged); +	} + +	public function test_enabled_no_cache() +	{ +		$extension_manager = $this->create_extension_manager(false); + +		$this->assertEquals(array('foo'), array_keys($extension_manager->all_enabled())); +	} + +	protected function create_extension_manager($with_cache = true) +	{ + +		$config = new phpbb_config(array()); +		$db = $this->new_dbal(); +		$db_tools = new phpbb_db_tools($db); +		$phpbb_root_path = __DIR__ . './../../phpBB/'; +		$php_ext = 'php'; +		$table_prefix = 'phpbb_'; + +		$migrator = new phpbb_db_migrator( +			$config, +			$db, +			$db_tools, +			'phpbb_migrations', +			$phpbb_root_path, +			$php_ext, +			$table_prefix, +			array() +		); +		$container = new phpbb_mock_container_builder(); +		$container->set('migrator', $migrator); + +		return new phpbb_extension_manager( +			$container, +			$db, +			$config, +			new phpbb_filesystem(), +			'phpbb_ext', +			dirname(__FILE__) . '/', +			$php_ext, +			($with_cache) ? new phpbb_mock_cache() : null +		); +	} +} diff --git a/tests/extension/metadata_manager_test.php b/tests/extension/metadata_manager_test.php new file mode 100644 index 0000000000..bd88f396d9 --- /dev/null +++ b/tests/extension/metadata_manager_test.php @@ -0,0 +1,434 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2011 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +require_once dirname(__FILE__) . '/../../phpBB/includes/db/db_tools.php'; + +class phpbb_extension_metadata_manager_test extends phpbb_database_test_case +{ +	protected $class_loader; +	protected $extension_manager; + +	protected $cache; +	protected $config; +	protected $db; +	protected $phpbb_root_path; +	protected $phpEx; +	protected $template; +	protected $user; + +	public function getDataSet() +	{ +		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/extensions.xml'); +	} + +	protected function setUp() +	{ +		parent::setUp(); + +		$this->cache = new phpbb_mock_cache(); +		$this->config = new phpbb_config(array( +			'version'		=> '3.1.0', +		)); +		$this->db = $this->new_dbal(); +		$this->db_tools = new phpbb_db_tools($this->db); +		$this->phpbb_root_path = dirname(__FILE__) . '/'; +		$this->phpEx = 'php'; +		$this->user = new phpbb_user(); +		$this->table_prefix = 'phpbb_'; + +		$this->template = new phpbb_template_twig( +			$this->phpbb_root_path, +			$this->phpEx, +			$this->config, +			$this->user, +			new phpbb_template_context() +		); + +		$this->migrator = new phpbb_db_migrator( +			$this->config, +			$this->db, +			$this->db_tools, +			'phpbb_migrations', +			$this->phpbb_root_path, +			'php', +			$this->table_prefix, +			array() +		); +		$container = new phpbb_mock_container_builder(); +		$container->set('migrator', $migrator); + +		$this->extension_manager = new phpbb_extension_manager( +			$container, +			$this->db, +			$this->config, +			new phpbb_filesystem(), +			'phpbb_ext', +			$this->phpbb_root_path, +			$this->phpEx, +			$this->cache +		); +	} + +	// Should fail from missing composer.json +	public function test_bar() +	{ +		$ext_name = 'bar'; + +		$manager = $this->get_metadata_manager($ext_name); + +		try +		{ +			$manager->get_metadata(); +		} +		catch(phpbb_extension_exception $e){} + +		$this->assertEquals((string) $e, 'The required file does not exist: ' . $this->phpbb_root_path . $this->extension_manager->get_extension_path($ext_name) . 'composer.json'); +	} + +	// Should be the same as a direct json_decode of the composer.json file +	public function test_foo() +	{ +		$ext_name = 'foo'; + +		$manager = $this->get_metadata_manager($ext_name); + +		try +		{ +			$metadata = $manager->get_metadata(); +		} +		catch(phpbb_extension_exception $e) +		{ +			$this->fail($e); +		} + +		$json = json_decode(file_get_contents($this->phpbb_root_path . 'ext/foo/composer.json'), true); + +		$this->assertEquals($metadata, $json); +	} + +	public function test_validator_non_existant() +	{ +		$ext_name = 'validator'; + +		$manager = $this->get_metadata_manager($ext_name); + +		// Non-existant data +		try +		{ +			$manager->validate('name'); + +			$this->fail('Exception not triggered'); +		} +		catch(phpbb_extension_exception $e) +		{ +			$this->assertEquals((string) $e, 'Required meta field \'name\' has not been set.'); +		} + +		try +		{ +			$manager->validate('type'); + +			$this->fail('Exception not triggered'); +		} +		catch(phpbb_extension_exception $e) +		{ +			$this->assertEquals((string) $e, 'Required meta field \'type\' has not been set.'); +		} + +		try +		{ +			$manager->validate('licence'); + +			$this->fail('Exception not triggered'); +		} +		catch(phpbb_extension_exception $e) +		{ +			$this->assertEquals((string) $e, 'Required meta field \'licence\' has not been set.'); +		} + +		try +		{ +			$manager->validate('version'); + +			$this->fail('Exception not triggered'); +		} +		catch(phpbb_extension_exception $e) +		{ +			$this->assertEquals((string) $e, 'Required meta field \'version\' has not been set.'); +		} + +		try +		{ +			$manager->validate_authors(); + +			$this->fail('Exception not triggered'); +		} +		catch(phpbb_extension_exception $e) +		{ +			$this->assertEquals((string) $e, 'Required meta field \'authors\' has not been set.'); +		} + +		$manager->merge_metadata(array( +			'authors'	=> array( +				array(), +			), +		)); + +		try +		{ +			$manager->validate_authors(); + +			$this->fail('Exception not triggered'); +		} +		catch(phpbb_extension_exception $e) +		{ +			$this->assertEquals((string) $e, 'Required meta field \'author name\' has not been set.'); +		} +	} + + +	public function test_validator_invalid() +	{ +		$ext_name = 'validator'; + +		$manager = $this->get_metadata_manager($ext_name); + +		// Invalid data +		$manager->set_metadata(array( +			'name'		=> 'asdf', +			'type'		=> 'asdf', +			'licence'	=> '', +			'version'	=> '', +		)); + +		try +		{ +			$manager->validate('name'); + +			$this->fail('Exception not triggered'); +		} +		catch(phpbb_extension_exception $e) +		{ +			$this->assertEquals((string) $e, 'Meta field \'name\' is invalid.'); +		} + +		try +		{ +			$manager->validate('type'); + +			$this->fail('Exception not triggered'); +		} +		catch(phpbb_extension_exception $e) +		{ +			$this->assertEquals((string) $e, 'Meta field \'type\' is invalid.'); +		} + +		try +		{ +			$manager->validate('licence'); + +			$this->fail('Exception not triggered'); +		} +		catch(phpbb_extension_exception $e) +		{ +			$this->assertEquals((string) $e, 'Meta field \'licence\' is invalid.'); +		} + +		try +		{ +			$manager->validate('version'); + +			$this->fail('Exception not triggered'); +		} +		catch(phpbb_extension_exception $e) +		{ +			$this->assertEquals((string) $e, 'Meta field \'version\' is invalid.'); +		} +	} + +	public function test_validator_valid() +	{ +		$ext_name = 'validator'; + +		$manager = $this->get_metadata_manager($ext_name); + +		// Valid data +		$manager->set_metadata(array( +			'name'		=> 'test/foo', +			'type'		=> 'phpbb3-extension', +			'licence'	=> 'GPL v2', +			'version'	=> '1.0.0', +		)); + +		try +		{ +			$this->assertEquals(true, $manager->validate('enable')); +		} +		catch(phpbb_extension_exception $e) +		{ +			$this->fail($e); +		} +	} + + +	public function test_validator_requirements() +	{ +		$ext_name = 'validator'; + +		$manager = $this->get_metadata_manager($ext_name); +		// Too high of requirements +		$manager->merge_metadata(array( +			'require'		=> array( +				'php'		=> '10.0.0', +				'phpbb'		=> '3.2.0', // config is set to 3.1.0 +			), +		)); + +		try +		{ +			$this->assertEquals(false, $manager->validate_require_php()); +			$this->assertEquals(false, $manager->validate_require_phpbb()); +		} +		catch(phpbb_extension_exception $e) +		{ +			$this->fail($e); +		} + + +		// Too high of requirements +		$manager->merge_metadata(array( +			'require'		=> array( +				'php'		=> '5.3.0', +				'phpbb'		=> '3.1.0-beta', // config is set to 3.1.0 +			), +		)); + +		try +		{ +			$this->assertEquals(true, $manager->validate_require_php()); +			$this->assertEquals(true, $manager->validate_require_phpbb()); +		} +		catch(phpbb_extension_exception $e) +		{ +			$this->fail($e); +		} + + +		// Too high of requirements +		$manager->merge_metadata(array( +			'require'		=> array( +				'php'		=> '>' . phpversion(), +				'phpbb'		=> '>3.1.0', // config is set to 3.1.0 +			), +		)); + +		try +		{ +			$this->assertEquals(false, $manager->validate_require_php()); +			$this->assertEquals(false, $manager->validate_require_phpbb()); +		} +		catch(phpbb_extension_exception $e) +		{ +			$this->fail($e); +		} + + +		// Too high of current install +		$manager->merge_metadata(array( +			'require'		=> array( +				'php'		=> '<' . phpversion(), +				'phpbb'		=> '<3.1.0', // config is set to 3.1.0 +			), +		)); + +		try +		{ +			$this->assertEquals(false, $manager->validate_require_php()); +			$this->assertEquals(false, $manager->validate_require_phpbb()); +		} +		catch(phpbb_extension_exception $e) +		{ +			$this->fail($e); +		} + + +		// Matching requirements +		$manager->merge_metadata(array( +			'require'		=> array( +				'php'		=> phpversion(), +				'phpbb'		=> '3.1.0', // config is set to 3.1.0 +			), +		)); + +		try +		{ +			$this->assertEquals(true, $manager->validate_require_php()); +			$this->assertEquals(true, $manager->validate_require_phpbb()); +		} +		catch(phpbb_extension_exception $e) +		{ +			$this->fail($e); +		} + + +		// Matching requirements +		$manager->merge_metadata(array( +			'require'		=> array( +				'php'		=> '>=' . phpversion(), +				'phpbb'		=> '>=3.1.0', // config is set to 3.1.0 +			), +		)); + +		try +		{ +			$this->assertEquals(true, $manager->validate_require_php()); +			$this->assertEquals(true, $manager->validate_require_phpbb()); +		} +		catch(phpbb_extension_exception $e) +		{ +			$this->fail($e); +		} + + +		// Matching requirements +		$manager->merge_metadata(array( +			'require'		=> array( +				'php'		=> '<=' . phpversion(), +				'phpbb'		=> '<=3.1.0', // config is set to 3.1.0 +			), +		)); + +		try +		{ +			$this->assertEquals(true, $manager->validate_require_php()); +			$this->assertEquals(true, $manager->validate_require_phpbb()); +		} +		catch(phpbb_extension_exception $e) +		{ +			$this->fail($e); +		} +	} + +	/** +	* Get an instance of the metadata manager +	* +	* @param string $ext_name +	* @return phpbb_mock_metadata_manager +	*/ +	private function get_metadata_manager($ext_name) +	{ +		return new phpbb_mock_metadata_manager( +			$ext_name, +			$this->config, +			$this->extension_manager, +			$this->template, +			$this->phpbb_root_path +		); +	} +} diff --git a/tests/extension/modules_test.php b/tests/extension/modules_test.php new file mode 100644 index 0000000000..fe71747c5d --- /dev/null +++ b/tests/extension/modules_test.php @@ -0,0 +1,192 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +require_once dirname(__FILE__) . '/ext/foo/acp/a_info.php'; +require_once dirname(__FILE__) . '/ext/foo/mcp/a_info.php'; +require_once dirname(__FILE__) . '/ext/foo/acp/fail_info.php'; +require_once dirname(__FILE__) . '/ext/barfoo/acp/a_info.php'; +require_once dirname(__FILE__) . '/../../phpBB/includes/acp/acp_modules.php'; + +class phpbb_extension_modules_test extends phpbb_test_case +{ +	protected $extension_manager; +	protected $finder; + +	public function setUp() +	{ +		global $phpbb_extension_manager; + +		$this->extension_manager = new phpbb_mock_extension_manager( +			dirname(__FILE__) . '/', +			array( +				'foo' => array( +					'ext_name' => 'foo', +					'ext_active' => '1', +					'ext_path' => 'ext/foo/', +				), +				'bar' => array( +					'ext_name' => 'bar', +					'ext_active' => '1', +					'ext_path' => 'ext/bar/', +				), +			)); +		$phpbb_extension_manager = $this->extension_manager; + +		$this->acp_modules = new acp_modules(); +	} + +	public function test_get_module_infos() +	{ +		global $phpbb_root_path; + +		// Correctly set the root path for this test to this directory, so the classes can be found +		$phpbb_root_path = dirname(__FILE__) . '/'; + +		// Find acp module info files +		$this->acp_modules->module_class = 'acp'; +		$acp_modules = $this->acp_modules->get_module_infos(); +		$this->assertEquals(array( +				'phpbb_ext_foo_acp_a_module' => array( +					'filename'	=> 'phpbb_ext_foo_acp_a_module', +					'title'		=> 'Foobar', +					'version'	=> '3.1.0-dev', +					'modes'		=> array( +						'config'		=> array('title' => 'Config',	'auth' => '', 'cat' => array('ACP_MODS')), +					), +				), +				'acp_foobar' => array( +					'filename'	=> 'acp_foobar', +					'title'		=> 'ACP Foobar', +					'version'	=> '3.1.0-dev', +					'modes'		=> array( +						'test'		=> array('title' => 'Test', 'auth' => '', 'cat' => array('ACP_GENERAL')), +					), +				), +			), $acp_modules); + +		// Find mcp module info files +		$this->acp_modules->module_class = 'mcp'; +		$acp_modules = $this->acp_modules->get_module_infos(); +		$this->assertEquals(array( +				'phpbb_ext_foo_mcp_a_module' => array( +					'filename'	=> 'phpbb_ext_foo_mcp_a_module', +					'title'		=> 'Foobar', +					'version'	=> '3.1.0-dev', +					'modes'		=> array( +						'config'		=> array('title' => 'Config',	'auth' => '', 'cat' => array('MCP_MAIN')), +					), +				), +			), $acp_modules); + +		// Find a specific module info file (mcp_a_module) +		$this->acp_modules->module_class = 'mcp'; +		$acp_modules = $this->acp_modules->get_module_infos('mcp_a_module'); +		$this->assertEquals(array( +				'phpbb_ext_foo_mcp_a_module' => array( +					'filename'	=> 'phpbb_ext_foo_mcp_a_module', +					'title'		=> 'Foobar', +					'version'	=> '3.1.0-dev', +					'modes'		=> array( +						'config'		=> array('title' => 'Config',	'auth' => '', 'cat' => array('MCP_MAIN')), +					), +				), +			), $acp_modules); + +		// Find a specific module info file (mcp_a_module) with passing the module_class +		$this->acp_modules->module_class = ''; +		$acp_modules = $this->acp_modules->get_module_infos('mcp_a_module', 'mcp'); +		$this->assertEquals(array( +				'phpbb_ext_foo_mcp_a_module' => array( +					'filename'	=> 'phpbb_ext_foo_mcp_a_module', +					'title'		=> 'Foobar', +					'version'	=> '3.1.0-dev', +					'modes'		=> array( +						'config'		=> array('title' => 'Config',	'auth' => '', 'cat' => array('MCP_MAIN')), +					), +				), +			), $acp_modules); + +		// The mcp module info file we're looking for shouldn't exist +		$this->acp_modules->module_class = 'mcp'; +		$acp_modules = $this->acp_modules->get_module_infos('mcp_a_fail'); +		$this->assertEquals(array(), $acp_modules); + +		// As there are no ucp modules we shouldn't find any +		$this->acp_modules->module_class = 'ucp'; +		$acp_modules = $this->acp_modules->get_module_infos(); +		$this->assertEquals(array(), $acp_modules); + +		// Get module info of specified extension module +		$this->acp_modules->module_class = 'acp'; +		$acp_modules = $this->acp_modules->get_module_infos('phpbb_ext_foo_acp_a_module'); +		$this->assertEquals(array( +				'phpbb_ext_foo_acp_a_module' => array ( +					'filename' => 'phpbb_ext_foo_acp_a_module', +					'title' => 'Foobar', +					'version' => '3.1.0-dev', +					'modes' => array ( +						'config'		=> array ('title' => 'Config', 'auth' => '', 'cat' => array ('ACP_MODS')), +					), +				), +			), $acp_modules); + +		// No specific module and module class set to an incorrect name +		$acp_modules = $this->acp_modules->get_module_infos('', 'wcp', true); +		$this->assertEquals(array(), $acp_modules); + +		// No specific module, no module_class set in the function parameter, and an incorrect module class +		$this->acp_modules->module_class = 'wcp'; +		$acp_modules = $this->acp_modules->get_module_infos(); +		$this->assertEquals(array(), $acp_modules); + +		// No specific module, module class set to false (will default to the above acp) +		// Setting $use_all_available will cause get_module_infos() to also load not enabled extensions (barfoo) +		$this->acp_modules->module_class = 'acp'; +		$acp_modules = $this->acp_modules->get_module_infos('', false, true); +		$this->assertEquals(array( +				'phpbb_ext_foo_acp_a_module' => array( +					'filename'	=> 'phpbb_ext_foo_acp_a_module', +					'title'		=> 'Foobar', +					'version'	=> '3.1.0-dev', +					'modes'		=> array( +						'config'		=> array('title' => 'Config',	'auth' => '', 'cat' => array('ACP_MODS')), +					), +				), +				'acp_foobar' => array( +					'filename'	=> 'acp_foobar', +					'title'		=> 'ACP Foobar', +					'version'	=> '3.1.0-dev', +					'modes'		=> array( +						'test'		=> array('title' => 'Test', 'auth' => '', 'cat' => array('ACP_GENERAL')), +					), +				), +				'phpbb_ext_barfoo_acp_a_module' => array( +					'filename'	=> 'phpbb_ext_barfoo_acp_a_module', +					'title'		=> 'Barfoo', +					'version'	=> '3.1.0-dev', +					'modes'		=> array( +						'config'		=> array('title' => 'Config',	'auth' => '', 'cat' => array('ACP_MODS')), +					), +				) +			), $acp_modules); + +		// Specific module set to disabled extension +		$acp_modules = $this->acp_modules->get_module_infos('phpbb_ext_barfoo_acp_a_module', 'acp', true); +		$this->assertEquals(array( +				'phpbb_ext_barfoo_acp_a_module' => array( +					'filename'	=> 'phpbb_ext_barfoo_acp_a_module', +					'title'		=> 'Barfoo', +					'version'	=> '3.1.0-dev', +					'modes'		=> array( +						'config'		=> array('title' => 'Config',	'auth' => '', 'cat' => array('ACP_MODS')), +					), +				) +			), $acp_modules); +	} +} diff --git a/tests/extension/style_path_provider_test.php b/tests/extension/style_path_provider_test.php new file mode 100644 index 0000000000..e1021c20ac --- /dev/null +++ b/tests/extension/style_path_provider_test.php @@ -0,0 +1,50 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2013 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_extension_style_path_provider_test extends phpbb_test_case +{ +	protected $relative_root_path; +	protected $root_path; + +	public function setUp() +	{ +		$this->relative_root_path = './'; +		$this->root_path = dirname(__FILE__) . '/'; +	} + +	public function test_find() +	{ +		$phpbb_style_path_provider = new phpbb_style_path_provider(); +		$phpbb_style_path_provider->set_styles(array($this->relative_root_path . 'styles/prosilver')); +		$phpbb_style_extension_path_provider = new phpbb_style_extension_path_provider(new phpbb_mock_extension_manager( +			$this->root_path, +			array( +				'foo' => array( +					'ext_name' => 'foo', +					'ext_active' => '1', +					'ext_path' => 'ext/foo/', +				), +				'bar' => array( +					'ext_name' => 'bar', +					'ext_active' => '1', +					'ext_path' => 'ext/bar/', +				), +			)), $phpbb_style_path_provider, $this->relative_root_path); + +		$this->assertEquals(array( +			'style' => array( +				$this->relative_root_path . 'styles/prosilver', +			), +			'bar' => array( +				$this->root_path . 'ext/bar/styles/prosilver', +			), +		), $phpbb_style_extension_path_provider->find()); +	} +} diff --git a/tests/extension/subdir/style_path_provider_test.php b/tests/extension/subdir/style_path_provider_test.php new file mode 100644 index 0000000000..1b5ce62e5f --- /dev/null +++ b/tests/extension/subdir/style_path_provider_test.php @@ -0,0 +1,18 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ +require_once dirname(__FILE__) . '/../style_path_provider_test.php'; + +class phpbb_extension_subdir_style_path_provider_test extends phpbb_extension_style_path_provider_test +{ +	public function setUp() +	{ +		$this->relative_root_path = '../'; +		$this->root_path = dirname(__FILE__) . '/../'; +	} +} diff --git a/tests/functions/clean_path_test.php b/tests/filesystem/clean_path_test.php index bcbe9838d9..50951fc88c 100644 --- a/tests/functions/clean_path_test.php +++ b/tests/filesystem/clean_path_test.php @@ -7,11 +7,17 @@  *  */ -require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; - -class phpbb_clean_path_test extends phpbb_test_case +class phpbb_filesystem_clean_path_test extends phpbb_test_case  { -	public function clean_path_test_data() +	protected $filesystem; + +	public function setUp() +	{ +		parent::setUp(); +		$this->filesystem = new phpbb_filesystem(); +	} + +	public function clean_path_data()  	{  		return array(  			array('foo', 'foo'), @@ -33,12 +39,10 @@ class phpbb_clean_path_test extends phpbb_test_case  	}  	/** -	* @dataProvider clean_path_test_data +	* @dataProvider clean_path_data  	*/  	public function test_clean_path($input, $expected)  	{ -		$output = phpbb_clean_path($input); - -		$this->assertEquals($expected, $output); +		$this->assertEquals($expected, $this->filesystem->clean_path($input));  	}  } diff --git a/tests/functional/acp_groups_test.php b/tests/functional/acp_groups_test.php index 3d8cabb086..cdf8bf5117 100644 --- a/tests/functional/acp_groups_test.php +++ b/tests/functional/acp_groups_test.php @@ -14,8 +14,107 @@ require_once dirname(__FILE__) . '/common_groups_test.php';  */  class phpbb_functional_acp_groups_test extends phpbb_functional_common_groups_test  { +	protected $form_data; +  	protected function get_url()  	{  		return 'adm/index.php?i=groups&mode=manage&action=edit';  	} + +	public function acp_group_test_data() +	{ +		return array( +			'both_yes' => array( +				5, +				true, +				true, +			), +			'legend_no_teampage' => array( +				5, +				true, +				false, +			), +			'no_legend_teampage' => array( +				5, +				false, +				true, +			), +			'both_no' => array( +				5, +				false, +				false, +			), +			'no_change' => array( +				5, +				NULL, +				NULL, +			), +			'back_to_default' => array( +				5, +				true, +				true, +			), +			// Remove and add moderators back in order to reset +			// group order to default one +			'mods_both_no' => array( +				4, +				false, +				false, +			), +			'mods_back_to_default' => array( +				4, +				true, +				true, +			), +		); +	} + +	/** +	* @dataProvider acp_group_test_data +	*/ +	public function test_acp_groups_teampage($group_id, $tick_legend, $tick_teampage) +	{ +		$this->group_manage_login(); + +		// Manage Administrators group +		$form = $this->get_group_manage_form($group_id); +		$this->form_data[0] = $form->getValues(); + +		if (isset($tick_legend) && isset($tick_teampage)) +		{ +			if ($tick_legend) +			{ +				$form['group_legend']->tick(); +			} +			else +			{ +				$form['group_legend']->untick(); +			} + +			if ($tick_teampage) +			{ +				$form['group_teampage']->tick(); +			} +			else +			{ +				$form['group_teampage']->untick(); +			} +		} +		$crawler = self::submit($form); +		$this->assertContains($this->lang('GROUP_UPDATED'), $crawler->text()); + +		$form = $this->get_group_manage_form($group_id); +		if (!isset($tick_legend) && !isset($tick_teampage)) +		{ +			$this->form_data[1] = $form->getValues(); +			unset($this->form_data[0]['creation_time'], $this->form_data[0]['form_token'], $this->form_data[1]['creation_time'], $this->form_data[1]['form_token']); +			$this->assertEquals($this->form_data[0], $this->form_data[1]); +		} +		else +		{ +			$this->form_data = $form->getValues(); +			$this->assertEquals($tick_legend, $this->form_data['group_legend']); +			$this->assertEquals($tick_teampage, $this->form_data['group_teampage']); +		} +	}  } diff --git a/tests/functional/acp_permissions_test.php b/tests/functional/acp_permissions_test.php new file mode 100644 index 0000000000..a3d272906f --- /dev/null +++ b/tests/functional/acp_permissions_test.php @@ -0,0 +1,123 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2012 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +/** +* @group functional +*/ +class phpbb_functional_acp_permissions_test extends phpbb_functional_test_case +{ +	public function setUp() +	{ +		parent::setUp(); + +		$this->login(); +		$this->admin_login(); +		$this->add_lang('acp/permissions'); +	} + +	public function test_permissions_tab() +	{ +		// Permissions tab +		// XXX hardcoded id +		$crawler = self::request('GET', 'adm/index.php?i=16&sid=' . $this->sid); +		// these language strings are html +		$this->assertContains($this->lang('ACP_PERMISSIONS_EXPLAIN'), $this->get_content()); +	} + +	public function test_select_user() +	{ +		// User permissions +		$crawler = self::request('GET', 'adm/index.php?i=acp_permissions&icat=16&mode=setting_user_global&sid=' . $this->sid); +		$this->assertContains($this->lang('ACP_USERS_PERMISSIONS_EXPLAIN'), $this->get_content()); + +		// Select admin +		$form = $crawler->selectButton($this->lang('SUBMIT'))->form(); +		$data = array('username[0]' => 'admin'); +		$form->setValues($data); +		$crawler = self::submit($form); +		$this->assertContains($this->lang('ACL_SET'), $crawler->filter('h1')->eq(1)->text()); +	} + +	public function permissions_data() +	{ +		return array( +			// description +			// permission type +			// permission name +			// mode +			// object name +			// object id +			array( +				'user permission', +				'u_', +				'u_hideonline', +				'setting_user_global', +				'user_id', +				2, +			), +			array( +				'moderator permission', +				'm_', +				'm_ban', +				'setting_mod_global', +				'group_id', +				4, +			), +			/* Admin does not work yet, probably because founder can do everything +			array( +				'admin permission', +				'a_', +				'a_forum', +				'setting_admin_global', +				'group_id', +				5, +			), +			*/ +		); +	} + +	/** +	* @dataProvider permissions_data +	*/ +	public function test_change_permission($description, $permission_type, $permission, $mode, $object_name, $object_id) +	{ +		// Get the form +		$crawler = self::request('GET', "adm/index.php?i=acp_permissions&icat=16&mode=$mode&${object_name}[0]=$object_id&type=$permission_type&sid=" . $this->sid); +		$this->assertContains($this->lang('ACL_SET'), $crawler->filter('h1')->eq(1)->text()); + +		// XXX globals for phpbb_auth, refactor it later +		global $db, $cache; +		$db = $this->get_db(); +		$cache = new phpbb_mock_null_cache; + +		$auth = new phpbb_auth; +		// XXX hardcoded id +		$user_data = $auth->obtain_user_data(2); +		$auth->acl($user_data); +		$this->assertEquals(1, $auth->acl_get($permission)); + +		// Set u_hideonline to never +		$form = $crawler->selectButton($this->lang('APPLY_PERMISSIONS'))->form(); +		// initially it should be a yes +		$values = $form->getValues(); +		$this->assertEquals(1, $values["setting[$object_id][0][$permission]"]); +		// set to never +		$data = array("setting[$object_id][0][$permission]" => '0'); +		$form->setValues($data); +		$crawler = self::submit($form); +		$this->assertContains($this->lang('AUTH_UPDATED'), $crawler->text()); + +		// check acl again +		$auth = new phpbb_auth; +		// XXX hardcoded id +		$user_data = $auth->obtain_user_data(2); +		$auth->acl($user_data); +		$this->assertEquals(0, $auth->acl_get($permission)); +	} +} diff --git a/tests/functional/auth_test.php b/tests/functional/auth_test.php index afb4f15fc2..ff4d3ced5c 100644 --- a/tests/functional/auth_test.php +++ b/tests/functional/auth_test.php @@ -45,4 +45,14 @@ class phpbb_functional_auth_test extends phpbb_functional_test_case  		$crawler = self::request('GET', 'index.php');  		$this->assertContains($this->lang('REGISTER'), $crawler->filter('.navbar')->text());  	} + +	public function test_acp_login() +	{ +		$this->login(); +		$this->admin_login(); + +		// check that we are logged in +		$crawler = self::request('GET', 'adm/index.php?sid=' . $this->sid); +		$this->assertContains($this->lang('ADMIN_PANEL'), $crawler->filter('h1')->text()); +	}  } diff --git a/tests/functional/common_groups_test.php b/tests/functional/common_groups_test.php index 7c88ec900d..8c014aebed 100644 --- a/tests/functional/common_groups_test.php +++ b/tests/functional/common_groups_test.php @@ -14,6 +14,28 @@ abstract class phpbb_functional_common_groups_test extends phpbb_functional_test  {  	abstract protected function get_url(); +	/** +	* Get group_manage form +	* @param int $group_id ID of the group that should be managed +	*/ +	protected function get_group_manage_form($group_id = 5) +	{ +		// Manage Administrators group +		$crawler = self::request('GET', $this->get_url() . "&g=$group_id&sid=" . $this->sid); +		$form = $crawler->selectButton($this->lang('SUBMIT'))->form(); +		return $form; +	} + +	/** +	* Execute login calls and add_lang() calls for tests +	*/ +	protected function group_manage_login() +	{ +		$this->login(); +		$this->admin_login(); +		$this->add_lang(array('ucp', 'acp/groups')); +	} +  	public function groups_manage_test_data()  	{  		return array( @@ -30,13 +52,10 @@ abstract class phpbb_functional_common_groups_test extends phpbb_functional_test  	*/  	public function test_groups_manage($input, $expected)  	{ -		$this->login(); -		$this->admin_login(); -		$this->add_lang(array('ucp', 'acp/groups')); +		$this->group_manage_login();  		// Manage Administrators group -		$crawler = self::request('GET', $this->get_url() . '&g=5&sid=' . $this->sid); -		$form = $crawler->selectButton($this->lang('SUBMIT'))->form(); +		$form = $this->get_group_manage_form();  		$form['group_colour']->setValue($input);  		$crawler = self::submit($form);  		$this->assertContains($this->lang($expected), $crawler->text()); diff --git a/tests/functional/extension_acp_test.php b/tests/functional/extension_acp_test.php new file mode 100644 index 0000000000..8614c0c963 --- /dev/null +++ b/tests/functional/extension_acp_test.php @@ -0,0 +1,187 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2011 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +/** +* @group functional +*/ +class phpbb_functional_extension_acp_test extends phpbb_functional_test_case +{ +	static private $helper; + +	static protected $fixtures = array( +		'./', +	); + +	static public function setUpBeforeClass() +	{ +		parent::setUpBeforeClass(); + +		self::$helper = new phpbb_test_case_helpers(self); +		self::$helper->copy_ext_fixtures(dirname(__FILE__) . '/../extension/ext/', self::$fixtures); +	} + +	static public function tearDownAfterClass() +	{ +		parent::tearDownAfterClass(); + +		self::$helper->restore_original_ext_dir(); +	} + +	public function setUp() +	{ +		parent::setUp(); + +		$this->get_db(); + +		// Clear the phpbb_ext table +		$this->db->sql_query('DELETE FROM phpbb_ext'); + +		// Insert our base data +		$insert_rows = array( +			array( +				'ext_name'		=> 'foo', +				'ext_active'	=> true, +				'ext_state'		=> 'b:0;', +			), +			array( +				'ext_name'		=> 'vendor/moo', +				'ext_active'	=> false, +				'ext_state'		=> 'b:0;', +			), + +			// do not exist +			array( +				'ext_name'		=> 'test2', +				'ext_active'	=> true, +				'ext_state'		=> 'b:0;', +			), +			array( +				'ext_name'		=> 'test3', +				'ext_active'	=> false, +				'ext_state'		=> 'b:0;', +			), +		); +		$this->db->sql_multi_insert('phpbb_ext', $insert_rows); + +		$this->login(); +		$this->admin_login(); + +		$this->add_lang('acp/extensions'); +	} + +	public function test_list() +	{ +        $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid); + +        $this->assertCount(1, $crawler->filter('.ext_enabled')); +        $this->assertCount(5, $crawler->filter('.ext_disabled')); + +        $this->assertContains('phpBB Foo Extension', $crawler->filter('.ext_enabled')->eq(0)->text()); +        $this->assertContainsLang('PURGE', $crawler->filter('.ext_enabled')->eq(0)->text()); + +        $this->assertContains('The "test2" extension is not valid.', $crawler->filter('.ext_disabled')->eq(0)->text()); + +        $this->assertContains('The "test3" extension is not valid.', $crawler->filter('.ext_disabled')->eq(1)->text()); + +        $this->assertContains('phpBB Moo Extension', $crawler->filter('.ext_disabled')->eq(2)->text()); +        $this->assertContainsLang('DETAILS', $crawler->filter('.ext_disabled')->eq(2)->text()); +        $this->assertContainsLang('ENABLE', $crawler->filter('.ext_disabled')->eq(2)->text()); +        $this->assertContainsLang('PURGE', $crawler->filter('.ext_disabled')->eq(2)->text()); + +        $this->assertContains('The "bar" extension is not valid.', $crawler->filter('.ext_disabled')->eq(3)->text()); +	} + +	public function test_details() +	{ +        $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=details&ext_name=foo&sid=' . $this->sid); + +        $validation = array( +        	'DISPLAY_NAME'		=> 'phpBB Foo Extension', +        	'CLEAN_NAME'		=> 'foo/example', +        	'DESCRIPTION'		=> 'An example/sample extension to be used for testing purposes in phpBB Development.', +        	'VERSION'	  		=> '1.0.0', +        	'TIME'				=> '2012-02-15 01:01:01', +        	'LICENCE'			=> 'GPL-2.0', +        	'PHPBB_VERSION'		=> '3.1.0-dev', +        	'PHP_VERSION'		=> '>=5.3', +        	'AUTHOR_NAME'		=> 'Nathan Guse', +        	'AUTHOR_EMAIL'		=> 'email@phpbb.com', +        	'AUTHOR_HOMEPAGE'	=> 'http://lithiumstudios.org', +        	'AUTHOR_ROLE'		=> 'N/A', +        ); + +        for ($i = 0; $i < $crawler->filter('dl')->count(); $i++) +        { +        	$text = $crawler->filter('dl')->eq($i)->text(); + +        	$match = false; + +        	foreach ($validation as $language_key => $expected) +        	{ +        		if (strpos($text, $this->lang($language_key)) === 0) +        		{ +        			$match = true; + +        			$this->assertContains($expected, $text); +				} +			} + +			if (!$match) +			{ +				$this->fail('Unexpected field: "' . $text . '"'); +			} +		} +	} + +	public function test_enable_pre() +	{ +		// Foo is already enabled (redirect to list) +        $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=enable_pre&ext_name=foo&sid=' . $this->sid); +        $this->assertContainsLang('EXTENSION_NAME', $crawler->filter('html')->text()); +        $this->assertContainsLang('EXTENSION_OPTIONS', $crawler->filter('html')->text()); +        $this->assertContainsLang('EXTENSION_ACTIONS', $crawler->filter('html')->text()); + +        $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=enable_pre&ext_name=vendor%2Fmoo&sid=' . $this->sid); +        $this->assertContainsLang('ENABLE_CONFIRM', $crawler->filter('html')->text()); +	} + +	public function test_disable_pre() +	{ +        // Moo is not enabled (redirect to list) +        $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=disable_pre&ext_name=vendor%2Fmoo&sid=' . $this->sid); +        $this->assertContainsLang('EXTENSION_NAME', $crawler->filter('html')->text()); +        $this->assertContainsLang('EXTENSION_OPTIONS', $crawler->filter('html')->text()); +        $this->assertContainsLang('EXTENSION_ACTIONS', $crawler->filter('html')->text()); + +        $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=disable_pre&ext_name=foo&sid=' . $this->sid); +        $this->assertContainsLang('DISABLE_CONFIRM', $crawler->filter('html')->text()); +	} + +	public function test_purge_pre() +	{ +        // test2 is not available (error) +        $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=purge_pre&ext_name=test2&sid=' . $this->sid); +        $this->assertContains('The required file does not exist', $crawler->filter('html')->text()); + +        $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=purge_pre&ext_name=foo&sid=' . $this->sid); +        $this->assertContainsLang('PURGE_CONFIRM', $crawler->filter('html')->text()); +	} + +	public function test_actions() +	{ +        $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=enable&ext_name=vendor%2Fmoo&sid=' . $this->sid); +        $this->assertContainsLang('ENABLE_SUCCESS', $crawler->filter('html')->text()); + +        $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=disable&ext_name=vendor%2Fmoo&sid=' . $this->sid); +        $this->assertContainsLang('DISABLE_SUCCESS', $crawler->filter('html')->text()); + +        $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=purge&ext_name=vendor%2Fmoo&sid=' . $this->sid); +        $this->assertContainsLang('PURGE_SUCCESS', $crawler->filter('html')->text()); +	} +}
\ No newline at end of file diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php new file mode 100644 index 0000000000..9ddf1e3e5c --- /dev/null +++ b/tests/functional/extension_controller_test.php @@ -0,0 +1,113 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2011 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ +require_once dirname(__FILE__) . '/../../phpBB/includes/db/db_tools.php'; + +/** +* @group functional +*/ +class phpbb_functional_extension_controller_test extends phpbb_functional_test_case +{ +	protected $phpbb_extension_manager; + +	static private $helper; + +	static protected $fixtures = array( +		'foo/bar/config/', +		'foo/bar/controller/', +		'foo/bar/styles/prosilver/template/', +	); + +	static public function setUpBeforeClass() +	{ +		parent::setUpBeforeClass(); + +		self::$helper = new phpbb_test_case_helpers(self); +		self::$helper->copy_ext_fixtures(dirname(__FILE__) . '/fixtures/ext/', self::$fixtures); +	} + +	static public function tearDownAfterClass() +	{ +		parent::tearDownAfterClass(); + +		self::$helper->restore_original_ext_dir(); +	} + +	public function setUp() +	{ +		parent::setUp(); + +		$this->phpbb_extension_manager = $this->get_extension_manager(); + +		$this->purge_cache(); +	} + +	/** +	* Check a controller for extension foo/bar. +	*/ +	public function test_foo_bar() +	{ +		$this->phpbb_extension_manager->enable('foo/bar'); +		$crawler = self::request('GET', 'app.php?controller=foo/bar', array(), false); +		self::assert_response_status_code(); +		$this->assertContains("foo/bar controller handle() method", $crawler->filter('body')->text()); +		$this->phpbb_extension_manager->purge('foo/bar'); +	} + +	/** +	* Check the output of a controller using the template system +	*/ +	public function test_controller_with_template() +	{ +		$this->phpbb_extension_manager->enable('foo/bar'); +		$crawler = self::request('GET', 'app.php?controller=foo/template'); +		$this->assertContains("I am a variable", $crawler->filter('#content')->text()); +		$this->phpbb_extension_manager->purge('foo/bar'); +	} + +	/** +	* Check the error produced by calling a controller without a required +	* argument. +	*/ +	public function test_missing_argument() +	{ +		$this->phpbb_extension_manager->enable('foo/bar'); +		$crawler = self::request('GET', 'app.php?controller=foo/baz', array(), false); +		$this->assert_response_html(500); +		$this->assertContains('Missing value for argument #1: test in class phpbb_ext_foo_bar_controller:baz', $crawler->filter('body')->text()); +		$this->phpbb_extension_manager->purge('foo/bar'); +	} + +	/** +	* Check the status code resulting from an exception thrown by a controller +	*/ +	public function test_exception_should_result_in_500_status_code() +	{ +		$this->phpbb_extension_manager->enable('foo/bar'); +		$crawler = self::request('GET', 'app.php?controller=foo/exception', array(), false); +		$this->assert_response_html(500); +		$this->assertContains('Exception thrown from foo/exception route', $crawler->filter('body')->text()); +		$this->phpbb_extension_manager->purge('foo/bar'); +	} + +	/** +	* Check the error produced by extension at ./ext/does/not/exist. +	* +	* If an extension is disabled, its routes are not loaded. Because we +	* are not looking for a controller based on a specified extension, +	* we don't know the difference between a route in a disabled +	* extension and a route that is not defined anyway; it is the same +	* error message. +	*/ +	public function test_error_ext_disabled_or_404() +	{ +		$crawler = self::request('GET', 'app.php?controller=does/not/exist', array(), false); +		$this->assert_response_html(404); +		$this->assertContains('No route found for "GET /does/not/exist"', $crawler->filter('body')->text()); +	} +} diff --git a/tests/functional/extension_module_test.php b/tests/functional/extension_module_test.php new file mode 100644 index 0000000000..c573ea5410 --- /dev/null +++ b/tests/functional/extension_module_test.php @@ -0,0 +1,99 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +require_once dirname(__FILE__) . '/../../phpBB/includes/db/db_tools.php'; +require_once dirname(__FILE__) . '/../../phpBB/includes/acp/acp_modules.php'; + +/** +* @group functional +*/ +class phpbb_functional_extension_module_test extends phpbb_functional_test_case +{ +	protected $phpbb_extension_manager; + +	static private $helper; + +	static protected $fixtures = array( +		'./', +	); + +	static public function setUpBeforeClass() +	{ +		parent::setUpBeforeClass(); + +		self::$helper = new phpbb_test_case_helpers(self); +		self::$helper->copy_ext_fixtures(dirname(__FILE__) . '/fixtures/ext/', self::$fixtures); +	} + +	static public function tearDownAfterClass() +	{ +		parent::tearDownAfterClass(); + +		self::$helper->restore_original_ext_dir(); +	} + +	public function setUp() +	{ +		global $db; + +		parent::setUp(); + +		$this->phpbb_extension_manager = $this->get_extension_manager(); +		$this->phpbb_extension_manager->enable('foo/bar'); + +		$modules = new acp_modules(); +		$db = $this->get_db(); + +		$sql = 'SELECT module_id +			FROM ' . MODULES_TABLE . " +			WHERE module_langname = 'acp' +				AND module_class = 'ACP_CAT_DOT_MODS'"; +		$result = $db->sql_query($sql); +		$module_id = (int) $db->sql_fetchfield('module_id'); +		$db->sql_freeresult($result); + +		$parent_data = array( +			'module_basename'	=> '', +			'module_enabled'	=> 1, +			'module_display'	=> 1, +			'parent_id'			=> $module_id, +			'module_class'		=> 'acp', +			'module_langname'	=> 'ACP_FOOBAR_TITLE', +			'module_mode'		=> '', +			'module_auth'		=> '', +		); +		$modules->update_module_data($parent_data, true); + +		$module_data = array( +			'module_basename'	=> 'phpbb_ext_foo_bar_acp_main_module', +			'module_enabled'	=> 1, +			'module_display'	=> 1, +			'parent_id'			=> $parent_data['module_id'], +			'module_class'		=> 'acp', +			'module_langname'	=> 'ACP_FOOBAR_TITLE', +			'module_mode'		=> 'mode', +			'module_auth'		=> '', +		); +		$modules->update_module_data($module_data, true); + +		$this->purge_cache(); +	} + +	/** +	* Check a controller for extension foo/bar. +	*/ +	public function test_foo_bar() +	{ +		$this->login(); +		$this->admin_login(); +		$crawler = self::request('GET', 'adm/index.php?i=phpbb_ext_foo_bar_acp_main_module&mode=mode&sid=' . $this->sid); +		$this->assertContains("Bertie rulez!", $crawler->filter('#main')->text()); +		$this->phpbb_extension_manager->purge('foo/bar'); +	} +} diff --git a/tests/functional/extension_permission_lang_test.php b/tests/functional/extension_permission_lang_test.php new file mode 100644 index 0000000000..6c1720735c --- /dev/null +++ b/tests/functional/extension_permission_lang_test.php @@ -0,0 +1,80 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2012 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +/** +* @group functional +*/ +class phpbb_functional_extension_permission_lang_test extends phpbb_functional_test_case +{ +	protected $phpbb_extension_manager; + +	static private $helper; + +	static protected $fixtures = array( +		'foo/bar/language/en/', +	); + +	static public function setUpBeforeClass() +	{ +		parent::setUpBeforeClass(); + +		self::$helper = new phpbb_test_case_helpers(self); +		self::$helper->copy_ext_fixtures(dirname(__FILE__) . '/fixtures/ext/', self::$fixtures); +	} + +	static public function tearDownAfterClass() +	{ +		parent::tearDownAfterClass(); + +		self::$helper->restore_original_ext_dir(); +	} + +	public function setUp() +	{ +		parent::setUp(); +		 +		$this->get_db(); +		 +		$acl_ary = array( +			'auth_option'	=> 'u_foo', +			'is_global'		=> 1, +		); + +		$sql = 'INSERT INTO phpbb_acl_options ' . $this->db->sql_build_array('INSERT', $acl_ary); +		$this->db->sql_query($sql); + +		$this->phpbb_extension_manager = $this->get_extension_manager(); + +		$this->purge_cache(); + +		$this->login(); +		$this->admin_login(); +		$this->add_lang('acp/permissions'); +	} + +	public function test_auto_include_permission_lang_from_extensions() +	{ +		$this->phpbb_extension_manager->enable('foo/bar'); + +		// User permissions +		$crawler = self::request('GET', 'adm/index.php?i=acp_permissions&icat=16&mode=setting_user_global&sid=' . $this->sid); + +		// Select admin +		$form = $crawler->selectButton($this->lang('SUBMIT'))->form(); +		$data = array('username[0]' => 'admin'); +		$form->setValues($data); +		$crawler = self::submit($form); + +		// language from language/en/acp/permissions_phpbb.php +		$this->assertContains('Can attach files', $crawler->filter('body')->text()); + +		// language from ext/foo/bar/language/en/permissions_foo.php +		$this->assertContains('Can view foo', $crawler->filter('body')->text()); +	} +} diff --git a/tests/functional/fileupload_form_test.php b/tests/functional/fileupload_form_test.php new file mode 100644 index 0000000000..998c402fa3 --- /dev/null +++ b/tests/functional/fileupload_form_test.php @@ -0,0 +1,73 @@ +<?php +/** + * + * @package testing + * @copyright (c) 2012 phpBB Group + * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 + * + */ + +/** + * @group functional + */ +class phpbb_functional_fileupload_form_test extends phpbb_functional_test_case +{ +	private $path; + +	public function setUp() +	{ +		parent::setUp(); +		$this->path = __DIR__ . '/fixtures/files/'; +		$this->add_lang('posting'); +		$this->login(); +	} + +	private function upload_file($filename, $mimetype) +	{ +		$file = array( +			'tmp_name' => $this->path . $filename, +			'name' => $filename, +			'type' => $mimetype, +			'size' => filesize($this->path . $filename), +			'error' => UPLOAD_ERR_OK, +		); + +		$crawler = self::$client->request( +			'POST', +			'posting.php?mode=reply&f=2&t=1&sid=' . $this->sid, +			array('add_file' => $this->lang('ADD_FILE')), +			array('fileupload' => $file) +		); + +		return $crawler; +	} + +	public function test_empty_file() +	{ +		$this->markTestIncomplete('Test fails intermittently.'); +		$crawler = $this->upload_file('empty.png', 'image/png'); +		$this->assertEquals($this->lang('ATTACHED_IMAGE_NOT_IMAGE'), $this->assert_filter($crawler, 'div#message p')->text()); +	} + +	public function test_invalid_extension() +	{ +		$crawler = $this->upload_file('illegal-extension.bif', 'application/octet-stream'); +		$this->assertEquals($this->lang('DISALLOWED_EXTENSION', 'bif'), $crawler->filter('p.error')->text()); +	} + +	public function test_too_large() +	{ +		$this->markTestIncomplete('Functional tests use an admin account which ignores maximum upload size.'); +		$crawler = $this->upload_file('too-large.png', 'image/png'); +		$this->assertEquals($this->lang('WRONG_FILESIZE', '256', 'KiB'), $crawler->filter('p.error')->text()); +	} + +	public function test_valid_file() +	{ +		$this->markTestIncomplete('Test fails intermittently.'); +		$crawler = $this->upload_file('valid.jpg', 'image/jpeg'); +		// ensure there was no error message rendered +		$this->assertNotContains('<h2>' . $this->lang('INFORMATION') . '</h2>', $this->get_content()); +		$this->assertContains($this->lang('POSTED_ATTACHMENTS'), $crawler->filter('#postform h3')->eq(1)->text()); +	} +} diff --git a/tests/functional/fileupload_remote_test.php b/tests/functional/fileupload_remote_test.php new file mode 100644 index 0000000000..8e361ab77b --- /dev/null +++ b/tests/functional/fileupload_remote_test.php @@ -0,0 +1,73 @@ +<?php +/** + * + * @package testing + * @copyright (c) 2012 phpBB Group + * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 + * + */ + +/** + * @group functional + */ +class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case +{ +	public function setUp() +	{ +		parent::setUp(); +		// Only doing this within the functional framework because we need a +		// URL + +		// Global $config required by unique_id +		// Global $user required by fileupload::remote_upload +		global $config, $user; + +		if (!is_array($config)) +		{ +			$config = array(); +		} + +		$config['rand_seed'] = ''; +		$config['rand_seed_last_update'] = time() + 600; + +		$user = new phpbb_mock_user(); +		$user->lang = new phpbb_mock_lang(); +	} + +	public function tearDown() +	{ +		global $config, $user; +		$user = null; +		$config = array(); +	} + +	public function test_invalid_extension() +	{ +		$upload = new fileupload('', array('jpg'), 100); +		$file = $upload->remote_upload('http://example.com/image.gif'); +		$this->assertEquals('URL_INVALID', $file->error[0]); +	} + +	public function test_non_existant() +	{ +		$upload = new fileupload('', array('jpg'), 100); +		$file = $upload->remote_upload('http://example.com/image.jpg'); +		$this->assertEquals('EMPTY_REMOTE_DATA', $file->error[0]); +	} + +	public function test_successful_upload() +	{ +		$upload = new fileupload('', array('gif'), 1000); +		$file = $upload->remote_upload(self::$root_url . 'styles/prosilver/theme/images/forum_read.gif'); +		$this->assertEquals(0, sizeof($file->error)); +		$this->assertTrue(file_exists($file->filename)); +	} + +	public function test_too_large() +	{ +		$upload = new fileupload('', array('gif'), 100); +		$file = $upload->remote_upload(self::$root_url . 'styles/prosilver/theme/images/forum_read.gif'); +		$this->assertEquals(1, sizeof($file->error)); +		$this->assertEquals('WRONG_FILESIZE', $file->error[0]); +	} +} diff --git a/tests/functional/fixtures/ext/foo/bar/acp/main_info.php b/tests/functional/fixtures/ext/foo/bar/acp/main_info.php new file mode 100644 index 0000000000..21e38b09b5 --- /dev/null +++ b/tests/functional/fixtures/ext/foo/bar/acp/main_info.php @@ -0,0 +1,32 @@ +<?php + +/** +* +* @package testing +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +/** +* @ignore +*/ +if (!defined('IN_PHPBB')) +{ +	exit; +} + +class phpbb_ext_foo_bar_acp_main_info +{ +	function module() +	{ +		return array( +			'filename'	=> 'phpbb_ext_foo_bar_acp_main_module', +			'title'		=> 'ACP_FOOBAR_TITLE', +			'version'	=> '1.0.0', +			'modes'		=> array( +				'mode'		=> array('title' => 'ACP_FOOBAR_MODE', 'auth' => '', 'cat' => array('ACP_FOOBAR_TITLE')), +			), +		); +	} +} diff --git a/tests/functional/fixtures/ext/foo/bar/acp/main_module.php b/tests/functional/fixtures/ext/foo/bar/acp/main_module.php new file mode 100644 index 0000000000..c4ab69fb38 --- /dev/null +++ b/tests/functional/fixtures/ext/foo/bar/acp/main_module.php @@ -0,0 +1,28 @@ +<?php + +/** +* +* @package testing +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +/** +* @ignore +*/ +if (!defined('IN_PHPBB')) +{ +	exit; +} + +class phpbb_ext_foo_bar_acp_main_module +{ +	var $u_action; + +	function main($id, $mode) +	{ +		$this->tpl_name = 'foobar'; +		$this->page_title = 'Bertie'; +	} +} diff --git a/tests/functional/fixtures/ext/foo/bar/adm/style/foobar.html b/tests/functional/fixtures/ext/foo/bar/adm/style/foobar.html new file mode 100644 index 0000000000..3cb45c269c --- /dev/null +++ b/tests/functional/fixtures/ext/foo/bar/adm/style/foobar.html @@ -0,0 +1,3 @@ +<!-- INCLUDE overall_header.html --> +Bertie rulez! +<!-- INCLUDE overall_footer.html --> diff --git a/tests/functional/fixtures/ext/foo/bar/composer.json b/tests/functional/fixtures/ext/foo/bar/composer.json new file mode 100644 index 0000000000..067a9d38eb --- /dev/null +++ b/tests/functional/fixtures/ext/foo/bar/composer.json @@ -0,0 +1,23 @@ +{ +	"name": "foo/bar", +	"type": "phpbb3-extension", +	"description": "Testing extensions", +	"homepage": "", +	"version": "1.0.0", +	"time": "2013-03-21 01:01:01", +	"licence": "GPL-2.0", +	"authors": [{ +		"name": "Joas Schilling", +		"username": "nickvergessen", +		"email": "nickvergessen@phpbb.com", +		"homepage": "http://www.phpbb.com", +		"role": "Developer" +	}], +	"require": { +		"php": ">=5.3", +		"phpbb": ">=3.1.0-dev" +	}, +	"extra": { +		"display-name": "phpBB 3.1 Extension Testing" +	} +} diff --git a/tests/functional/fixtures/ext/foo/bar/config/routing.yml b/tests/functional/fixtures/ext/foo/bar/config/routing.yml new file mode 100644 index 0000000000..09a30a8c67 --- /dev/null +++ b/tests/functional/fixtures/ext/foo/bar/config/routing.yml @@ -0,0 +1,15 @@ +foo_bar_controller: +    pattern: /foo/bar +    defaults: { _controller: foo_bar.controller:handle } + +foo_baz_controller: +    pattern: /foo/baz +    defaults: { _controller: foo_bar.controller:baz } + +foo_template_controller: +    pattern: /foo/template +    defaults: { _controller: foo_bar.controller:template } + +foo_exception_controller: +    pattern: /foo/exception +    defaults: { _controller: foo_bar.controller:exception } diff --git a/tests/functional/fixtures/ext/foo/bar/config/services.yml b/tests/functional/fixtures/ext/foo/bar/config/services.yml new file mode 100644 index 0000000000..33ced55af9 --- /dev/null +++ b/tests/functional/fixtures/ext/foo/bar/config/services.yml @@ -0,0 +1,6 @@ +services: +    foo_bar.controller: +        class: phpbb_ext_foo_bar_controller +        arguments: +            - @controller.helper +            - @template diff --git a/tests/functional/fixtures/ext/foo/bar/controller/controller.php b/tests/functional/fixtures/ext/foo/bar/controller/controller.php new file mode 100644 index 0000000000..5a91b5f681 --- /dev/null +++ b/tests/functional/fixtures/ext/foo/bar/controller/controller.php @@ -0,0 +1,35 @@ +<?php +use Symfony\Component\HttpFoundation\Response; + +class phpbb_ext_foo_bar_controller +{ +	protected $template; + +	public function __construct(phpbb_controller_helper $helper, phpbb_template $template) +	{ +		$this->template = $template; +		$this->helper = $helper; +	} + +	public function handle() +	{ +		return new Response('foo/bar controller handle() method', 200); +	} + +	public function baz($test) +	{ +		return new Response('Value of "test" URL argument is: ' . $test); +	} + +	public function template() +	{ +		$this->template->assign_var('A_VARIABLE', 'I am a variable'); + +		return $this->helper->render('foo_bar_body.html'); +	} + +	public function exception() +	{ +		throw new phpbb_controller_exception('Exception thrown from foo/exception route'); +	} +} diff --git a/tests/functional/fixtures/ext/foo/bar/ext.php b/tests/functional/fixtures/ext/foo/bar/ext.php new file mode 100644 index 0000000000..74359d51ab --- /dev/null +++ b/tests/functional/fixtures/ext/foo/bar/ext.php @@ -0,0 +1,6 @@ +<?php + +class phpbb_ext_foo_bar_ext extends phpbb_extension_base +{ + +} diff --git a/tests/functional/fixtures/ext/foo/bar/language/en/permissions_foo.php b/tests/functional/fixtures/ext/foo/bar/language/en/permissions_foo.php new file mode 100644 index 0000000000..cd4b9a32d1 --- /dev/null +++ b/tests/functional/fixtures/ext/foo/bar/language/en/permissions_foo.php @@ -0,0 +1,6 @@ +<?php + +// Admin Permissions +$lang = array_merge($lang, array( +    'acl_u_foo'    => array('lang' => 'Can view foo', 'cat' => 'misc'), +)); diff --git a/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/foo_bar_body.html b/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/foo_bar_body.html new file mode 100644 index 0000000000..8fb6994d3d --- /dev/null +++ b/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/foo_bar_body.html @@ -0,0 +1,3 @@ +<!-- INCLUDE overall_header.html --> +<div id="content">{A_VARIABLE}</div> +<!-- INCLUDE overall_footer.html --> diff --git a/tests/functional/fixtures/files/empty.png b/tests/functional/fixtures/files/empty.png new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/tests/functional/fixtures/files/empty.png diff --git a/tests/functional/fixtures/files/illegal-extension.bif b/tests/functional/fixtures/files/illegal-extension.bif Binary files differnew file mode 100644 index 0000000000..3cd5038e38 --- /dev/null +++ b/tests/functional/fixtures/files/illegal-extension.bif diff --git a/tests/functional/fixtures/files/too-large.png b/tests/functional/fixtures/files/too-large.png Binary files differnew file mode 100644 index 0000000000..ed4b0abd80 --- /dev/null +++ b/tests/functional/fixtures/files/too-large.png diff --git a/tests/functional/fixtures/files/valid.jpg b/tests/functional/fixtures/files/valid.jpg Binary files differnew file mode 100644 index 0000000000..95a87ddbdf --- /dev/null +++ b/tests/functional/fixtures/files/valid.jpg diff --git a/tests/functional/forgot_password_test.php b/tests/functional/forgot_password_test.php new file mode 100644 index 0000000000..906224efbb --- /dev/null +++ b/tests/functional/forgot_password_test.php @@ -0,0 +1,44 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2012 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +/** +* @group functional +*/ +class phpbb_functional_forgot_password_test extends phpbb_functional_test_case +{ +	public function test_forgot_password_enabled() +	{ +		global $config; +		$this->add_lang('ucp'); +		$crawler = self::request('GET', 'ucp.php?mode=sendpassword'); +		$this->assertEquals($this->lang('SEND_PASSWORD'), $crawler->filter('h2')->text()); +	} + +	public function test_forgot_password_disabled() +	{ +		$this->login(); +		$this->admin_login(); +		$this->add_lang('ucp'); +		$crawler = self::request('GET', 'adm/index.php?sid=' . $this->sid . '&i=acp_board&mode=security'); + +		$form = $crawler->selectButton('Submit')->form(); +		$values = $form->getValues(); + +		$values["config[allow_password_reset]"] = 0; +		$form->setValues($values); +		$crawler = self::submit($form); + +		$this->logout(); + +		$crawler = self::request('GET', 'ucp.php?mode=sendpassword'); +		$this->assertContains($this->lang('UCP_PASSWORD_RESET_DISABLED', '', ''), $crawler->text()); + +	} + +} diff --git a/tests/functional/memberlist_test.php b/tests/functional/memberlist_test.php new file mode 100644 index 0000000000..738ec4f9dd --- /dev/null +++ b/tests/functional/memberlist_test.php @@ -0,0 +1,105 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2012 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +/** +* @group functional +*/ +class phpbb_functional_memberlist_test extends phpbb_functional_test_case +{ +	public function test_memberlist() +	{ +		$this->create_user('memberlist-test-user'); +		// logs in as admin +		$this->login(); +		$crawler = self::request('GET', 'memberlist.php?sid=' . $this->sid); +		$this->assertContains('memberlist-test-user', $crawler->text()); + +		// restrict by first character +		$crawler = self::request('GET', 'memberlist.php?first_char=m&sid=' . $this->sid); +		$this->assertContains('memberlist-test-user', $crawler->text()); + +		// make sure results for wrong character are not returned +		$crawler = self::request('GET', 'memberlist.php?first_char=a&sid=' . $this->sid); +		$this->assertNotContains('memberlist-test-user', $crawler->text()); +	} + +	public function test_viewprofile() +	{ +		$this->login(); +		// XXX hardcoded user id +		$crawler = self::request('GET', 'memberlist.php?mode=viewprofile&u=2&sid=' . $this->sid); +		$this->assertContains('admin', $crawler->filter('h2')->text()); +	} + +	protected function get_memberlist_leaders_table_crawler() +	{ +		$crawler = self::request('GET', 'memberlist.php?mode=leaders&sid=' . $this->sid); +		return $crawler->filter('.forumbg-table'); +	} + +	public function test_leaders() +	{ +		$this->login(); +		$this->create_user('memberlist-test-moderator'); + +		$crawler = $this->get_memberlist_leaders_table_crawler(); + +		// Admin in admin group, but not in moderators +		$this->assertContains('admin', $crawler->eq(0)->text()); +		$this->assertNotContains('admin', $crawler->eq(1)->text()); + +		// memberlist-test-user in neither group +		$this->assertNotContains('memberlist-test-user', $crawler->eq(0)->text()); +		$this->assertNotContains('memberlist-test-user', $crawler->eq(1)->text()); + +		// memberlist-test-moderator in neither group +		$this->assertNotContains('memberlist-test-moderator', $crawler->eq(0)->text()); +		$this->assertNotContains('memberlist-test-moderator', $crawler->eq(1)->text()); +	} + +	public function test_leaders_remove_users() +	{ +		$this->login(); + +		// Remove admin from admins, but is now in moderators +		$this->remove_user_group('ADMINISTRATORS', array('admin')); +		$crawler = $this->get_memberlist_leaders_table_crawler(); +		$this->assertNotContains('admin', $crawler->eq(0)->text()); +		$this->assertContains('admin', $crawler->eq(1)->text()); + +		// Remove admin from moderators, should not be visible anymore +		$this->remove_user_group('GLOBAL_MODERATORS', array('admin')); +		$crawler = $this->get_memberlist_leaders_table_crawler(); +		$this->assertNotContains('admin', $crawler->eq(0)->text()); +		$this->assertNotContains('admin', $crawler->eq(1)->text()); +	} + +	public function test_leaders_add_users() +	{ +		$this->login(); + +		// Add memberlist-test-moderator to moderators +		$this->add_user_group('GLOBAL_MODERATORS', array('memberlist-test-moderator')); +		$crawler = $this->get_memberlist_leaders_table_crawler(); +		$this->assertNotContains('memberlist-test-moderator', $crawler->eq(0)->text()); +		$this->assertContains('memberlist-test-moderator', $crawler->eq(1)->text()); + +		// Add admin to moderators, should be visible as moderator +		$this->add_user_group('GLOBAL_MODERATORS', array('admin'), true); +		$crawler = $this->get_memberlist_leaders_table_crawler(); +		$this->assertNotContains('admin', $crawler->eq(0)->text()); +		$this->assertContains('admin', $crawler->eq(1)->text()); + +		// Add admin to admins as leader, should be visible as admin, not moderator +		$this->add_user_group('ADMINISTRATORS', array('admin'), true, true); +		$crawler = $this->get_memberlist_leaders_table_crawler(); +		$this->assertContains('admin', $crawler->eq(0)->text()); +		$this->assertNotContains('admin', $crawler->eq(1)->text()); +	} +} diff --git a/tests/functional/metadata_manager_test.php b/tests/functional/metadata_manager_test.php new file mode 100644 index 0000000000..c55e7373ea --- /dev/null +++ b/tests/functional/metadata_manager_test.php @@ -0,0 +1,85 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +require_once dirname(__FILE__) . '/../../phpBB/includes/db/db_tools.php'; + +/** +* @group functional +*/ +class phpbb_functional_metadata_manager_test extends phpbb_functional_test_case +{ +	protected $phpbb_extension_manager; + +	static private $helper; + +	static protected $fixtures = array( +		'foo/bar/', +	); + +	static public function setUpBeforeClass() +	{ +		parent::setUpBeforeClass(); + +		self::$helper = new phpbb_test_case_helpers(self); +		self::$helper->copy_ext_fixtures(dirname(__FILE__) . '/fixtures/ext/', self::$fixtures); +	} + +	static public function tearDownAfterClass() +	{ +		parent::tearDownAfterClass(); + +		self::$helper->restore_original_ext_dir(); +	} + +	public function setUp() +	{ +		parent::setUp(); + +		$this->phpbb_extension_manager = $this->get_extension_manager(); + +		$this->purge_cache(); +		$this->phpbb_extension_manager->enable('foo/bar'); + +		$this->login(); +		$this->admin_login(); +		$this->add_lang('acp/extensions'); +	} + +	public function test_extensions_list() +	{ +		$crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid); +		$this->assertContains($this->lang('EXTENSIONS_EXPLAIN'), $crawler->filter('#main')->text()); +		$this->assertContains('phpBB 3.1 Extension Testing', $crawler->filter('#main')->text()); +		$this->assertContains('Details', $crawler->filter('#main')->text()); +	} + +	public function test_extensions_details() +	{ +		$crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=details&ext_name=foo%2Fbar&sid=' . $this->sid); + +		// Test whether the details are displayed +		$this->assertContains($this->lang('CLEAN_NAME'), $crawler->filter('#main')->text()); +		$this->assertContains('foo/bar', $crawler->filter('#meta_name')->text()); + +		$this->assertContains($this->lang('PHP_VERSION'), $crawler->filter('#main')->text()); +		$this->assertContains('>=5.3', $crawler->filter('#require_php')->text()); +		// Details should be html escaped +		// However, text() only returns the displayed text, so HTML Special Chars are decoded. +		// So we test this directly on the content of the response. +		$this->assertContains('<p id="require_php">>=5.3</p>', $this->get_content()); +	} + +	public function test_extensions_details_notexists() +	{ +		$crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=details&ext_name=not%2Fexists&sid=' . $this->sid); + +		// Error message because the files do not exist +		$this->assertContains('The required file does not exist:', $crawler->filter('#main')->text()); +	} +} diff --git a/tests/functional/notification_test.php b/tests/functional/notification_test.php new file mode 100644 index 0000000000..7f33ad1859 --- /dev/null +++ b/tests/functional/notification_test.php @@ -0,0 +1,55 @@ +<?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 = self::request('GET', 'ucp.php?i=ucp_notifications&mode=notification_options'); + +		$cplist = $crawler->filter('.table1'); +		if ($expected_status) +		{ +			$this->assert_checkbox_is_checked($cplist, $checkbox_name); +		} +		else +		{ +			$this->assert_checkbox_is_unchecked($cplist, $checkbox_name); +		} +	} +} diff --git a/tests/functional/paging_test.php b/tests/functional/paging_test.php new file mode 100644 index 0000000000..d5adc6ad0a --- /dev/null +++ b/tests/functional/paging_test.php @@ -0,0 +1,39 @@ +<?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_paging_test extends phpbb_functional_test_case +{ + +	public function test_pagination() +	{ +		$this->login(); + +		$post = $this->create_topic(2, 'Test Topic 1', 'This is a test topic posted by the testing framework.'); +		for ($post_id = 1; $post_id < 20; $post_id++) +		{ +			$this->create_post(2, $post['topic_id'], 'Re: Test Topic 1', 'This is a test post no' . $post_id . ' posted by the testing framework.'); +		} +		$crawler = self::request('GET', "viewtopic.php?t={$post['topic_id']}&sid={$this->sid}"); +		$this->assertContains('post no9', $crawler->text()); +		$this->assertNotContains('post no19', $crawler->text()); + +		$next_link = $crawler->filter('#viewtopic > fieldset > a.arrow-right')->attr('href'); +		$crawler = self::request('GET', $next_link); +		$this->assertContains('post no19', $crawler->text()); +		$this->assertNotContains('post no9', $crawler->text()); + +		$prev_link = $crawler->filter('#viewtopic > fieldset > a.arrow-left')->attr('href'); +		$crawler = self::request('GET', $prev_link); +		$this->assertContains('post no9', $crawler->text()); +		$this->assertNotContains('post no19', $crawler->text()); +	} +} diff --git a/tests/functional/posting_test.php b/tests/functional/posting_test.php index 9bcfcc2fda..7fd1e4fdcf 100644 --- a/tests/functional/posting_test.php +++ b/tests/functional/posting_test.php @@ -32,105 +32,4 @@ class phpbb_functional_posting_test extends phpbb_functional_test_case  		$crawler = self::request('GET', "posting.php?mode=quote&f=2&t={$post2['topic_id']}&p={$post2['post_id']}&sid={$this->sid}");  		$this->assertContains('This is a test post posted by the testing framework.', $crawler->filter('html')->text());  	} - -	/** -	* Creates a topic -	*  -	* Be sure to login before creating -	*  -	* @param int $forum_id -	* @param string $subject -	* @param string $message -	* @param array $additional_form_data Any additional form data to be sent in the request -	* @return array post_id, topic_id -	*/ -	public function create_topic($forum_id, $subject, $message, $additional_form_data = array()) -	{ -		$posting_url = "posting.php?mode=post&f={$forum_id}&sid={$this->sid}"; - -		$form_data = array_merge(array( -			'subject'		=> $subject, -			'message'		=> $message, -			'post'			=> true, -		), $additional_form_data); - -		return self::submit_post($posting_url, 'POST_TOPIC', $form_data); -	} - -	/** -	* Creates a post -	*  -	* Be sure to login before creating -	*  -	* @param int $forum_id -	* @param string $subject -	* @param string $message -	* @param array $additional_form_data Any additional form data to be sent in the request -	* @return array post_id, topic_id -	*/ -	public function create_post($forum_id, $topic_id, $subject, $message, $additional_form_data = array()) -	{ -		$posting_url = "posting.php?mode=reply&f={$forum_id}&t={$topic_id}&sid={$this->sid}"; - -		$form_data = array_merge(array( -			'subject'		=> $subject, -			'message'		=> $message, -			'post'			=> true, -		), $additional_form_data); - -		return self::submit_post($posting_url, 'POST_REPLY', $form_data); -	} -	 -	/** -	* Helper for submitting posts -	*  -	* @param string $posting_url -	* @param string $posting_contains -	* @param array $form_data -	* @return array post_id, topic_id -	*/ -	protected function submit_post($posting_url, $posting_contains, $form_data) -	{ -		$this->add_lang('posting'); - -		$crawler = self::request('GET', $posting_url); -		$this->assertContains($this->lang($posting_contains), $crawler->filter('html')->text()); - -		$hidden_fields = array( -			$crawler->filter('[type="hidden"]')->each(function ($node, $i) { -				return array('name' => $node->getAttribute('name'), 'value' => $node->getAttribute('value')); -			}), -		); - -		foreach ($hidden_fields as $fields) -		{ -			foreach($fields as $field) -			{ -				$form_data[$field['name']] = $field['value']; -			} -		} - -		// Bypass time restriction that said that if the lastclick time (i.e. time when the form was opened) -		// is not at least 2 seconds before submission, cancel the form -		$form_data['lastclick'] = 0; - -		// I use a request because the form submission method does not allow you to send data that is not -		// contained in one of the actual form fields that the browser sees (i.e. it ignores "hidden" inputs) -		// Instead, I send it as a request with the submit button "post" set to true. -		$crawler = self::request('POST', $posting_url, $form_data); -		$this->assertContains($this->lang('POST_STORED'), $crawler->filter('html')->text()); - -		$url = $crawler->selectLink($this->lang('VIEW_MESSAGE', '', ''))->link()->getUri(); -		 -		$matches = $topic_id = $post_id = false; -		preg_match_all('#&t=([0-9]+)(&p=([0-9]+))?#', $url, $matches); -		 -		$topic_id = (int) (isset($matches[1][0])) ? $matches[1][0] : 0; -		$post_id = (int) (isset($matches[3][0])) ? $matches[3][0] : 0; - -		return array( -			'topic_id'	=> $topic_id, -			'post_id'	=> $post_id, -		); -	}  } diff --git a/tests/functional/ucp_groups_test.php b/tests/functional/ucp_groups_test.php index 0d9ef22798..1f9749ec15 100644 --- a/tests/functional/ucp_groups_test.php +++ b/tests/functional/ucp_groups_test.php @@ -14,11 +14,43 @@ require_once dirname(__FILE__) . '/common_groups_test.php';  */  class phpbb_functional_ucp_groups_test extends phpbb_functional_common_groups_test  { +	protected $db; +  	protected function get_url()  	{  		return 'ucp.php?i=groups&mode=manage&action=edit';  	} +	protected function get_teampage_settings() +	{ +		if (!isset($this->db)) +		{ +			$this->db = $this->get_db(); +		} +		$sql = 'SELECT g.group_legend AS group_legend, t.teampage_position AS group_teampage +			FROM ' . GROUPS_TABLE . ' g +			LEFT JOIN ' . TEAMPAGE_TABLE . ' t +				ON (t.group_id = g.group_id) +			WHERE g.group_id = 5'; +		$result = $this->db->sql_query($sql); +		$group_row = $this->db->sql_fetchrow($result); +		$this->db->sql_freeresult($result); +		return $group_row; +	} + +	public function test_ucp_groups_teampage() +	{ +		$this->group_manage_login(); + +		// Test if group_legend or group_teampage are modified while +		// submitting the ucp_group_manage page +		$form = $this->get_group_manage_form(); +		$teampage_settings = $this->get_teampage_settings(); +		$crawler = self::submit($form); +		$this->assertContains($this->lang('GROUP_UPDATED'), $crawler->text()); +		$this->assertEquals($teampage_settings, $this->get_teampage_settings()); +	} +  	// Enable all avatars in the ACP  	private function enable_all_avatars()  	{ diff --git a/tests/functions/build_hidden_fields_for_query_params_test.php b/tests/functions/build_hidden_fields_for_query_params_test.php new file mode 100644 index 0000000000..ef2f5744d3 --- /dev/null +++ b/tests/functions/build_hidden_fields_for_query_params_test.php @@ -0,0 +1,71 @@ +<?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.php'; + +class phpbb_build_hidden_fields_for_query_params_test extends phpbb_test_case +{ +	public function build_hidden_fields_for_query_params_test_data() +	{ +		return array( +			// get +			// post +			// exclude +			// expected +			array( +				array('foo' => 'bar'), +				array(), +				array(), +				"<input type='hidden' name=\"foo\" value=\"bar\" />", +			), +			array( +				array('foo' => 'bar', 'a' => 'b'), +				array(), +				array(), +				"<input type='hidden' name=\"foo\" value=\"bar\" /><input type='hidden' name=\"a\" value=\"b\" />", +			), +			array( +				array('a' => 'quote"', 'b' => '<less>'), +				array(), +				array(), +				"<input type='hidden' name=\"a\" value='quote\"' /><input type='hidden' name=\"b\" value=\"<less>\" />", +			), +			array( +				array('a' => "quotes'\""), +				array(), +				array(), +				"<input type='hidden' name=\"a\" value=\"quotes'"\" />", +			), +			array( +				array('foo' => 'bar', 'a' => 'b'), +				array('a' => 'c'), +				array(), +				"<input type='hidden' name=\"foo\" value=\"bar\" />", +			), +			// strict equality check +			array( +				array('foo' => 'bar', 'a' => '0'), +				array('a' => ''), +				array(), +				"<input type='hidden' name=\"foo\" value=\"bar\" />", +			), +		); +	} + +	/** +	* @dataProvider build_hidden_fields_for_query_params_test_data +	*/ +	public function test_build_hidden_fields_for_query_params($get, $post, $exclude, $expected) +	{ +		$request = new phpbb_mock_request($get, $post); +		$result = phpbb_build_hidden_fields_for_query_params($request, $exclude); + +		$this->assertEquals($expected, $result); +	} +} diff --git a/tests/functions/convert_30_dbms_to_31_test.php b/tests/functions/convert_30_dbms_to_31_test.php new file mode 100644 index 0000000000..d08bf87f15 --- /dev/null +++ b/tests/functions/convert_30_dbms_to_31_test.php @@ -0,0 +1,40 @@ +<?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.php'; + +class phpbb_convert_30_dbms_to_31_test extends phpbb_test_case +{ +	public function convert_30_dbms_to_31_data() +	{ +		return array( +			array('firebird'), +			array('mssql'), +			array('mssql_odbc'), +			array('mssqlnative'), +			array('mysql'), +			array('mysqli'), +			array('oracle'), +			array('postgres'), +			array('sqlite'), +		); +	} + +	/** +	* @dataProvider convert_30_dbms_to_31_data +	*/ +	public function test_convert_30_dbms_to_31($input) +	{ +		$expected = "phpbb_db_driver_$input"; + +		$output = phpbb_convert_30_dbms_to_31($input); + +		$this->assertEquals($expected, $output); +	} +} diff --git a/tests/functions/fixtures/style_select.xml b/tests/functions/fixtures/style_select.xml index 12d6392ab5..ca95f94461 100644 --- a/tests/functions/fixtures/style_select.xml +++ b/tests/functions/fixtures/style_select.xml @@ -4,20 +4,24 @@  		<column>style_id</column>  		<column>style_name</column>  		<column>style_active</column> +		<column>style_parent_tree</column>  		<row>  			<value>1</value>  			<value>prosilver</value>  			<value>1</value> +			<value></value>  		</row>  		<row>  			<value>2</value>  			<value>subsilver2</value>  			<value>1</value> +			<value></value>  		</row>  		<row>  			<value>3</value>  			<value>zoo</value>  			<value>0</value> +			<value></value>  		</row>  	</table>  </dataset> diff --git a/tests/functions/is_absolute_test.php b/tests/functions/is_absolute_test.php index 7630b7c58c..6d26793d82 100644 --- a/tests/functions/is_absolute_test.php +++ b/tests/functions/is_absolute_test.php @@ -51,6 +51,6 @@ class phpbb_functions_is_absolute_test extends phpbb_test_case  	*/  	public function test_is_absolute($path, $expected)  	{ -		$this->assertEquals($expected, is_absolute($path)); +		$this->assertEquals($expected, phpbb_is_absolute($path));  	}  } diff --git a/tests/functions/obtain_online_test.php b/tests/functions/obtain_online_test.php index b3beb55a96..fe372431a9 100644 --- a/tests/functions/obtain_online_test.php +++ b/tests/functions/obtain_online_test.php @@ -9,7 +9,6 @@  require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';  require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php'; -require_once dirname(__FILE__) . '/../../phpBB/includes/auth.php';  class phpbb_functions_obtain_online_test extends phpbb_database_test_case  { @@ -125,27 +124,27 @@ class phpbb_functions_obtain_online_test extends phpbb_database_test_case  		return array(  			array(0, false, array(  				'online_userlist'	=> 'REGISTERED_USERS 2, 3', -				'l_online_users'	=> 'ONLINE_USERS_TOTAL 5REG_USERS_TOTAL_AND 2HIDDEN_USERS_TOTAL 3', +				'l_online_users'	=> 'ONLINE_USERS_TOTAL 5 REG_USERS_TOTAL 2 HIDDEN_USERS_TOTAL 3',  			)),  			array(0, true, array(  				'online_userlist'	=> 'REGISTERED_USERS 2, 3', -				'l_online_users'	=> 'ONLINE_USERS_TOTAL 7REG_USERS_TOTAL 2HIDDEN_USERS_TOTAL_AND 3GUEST_USERS_TOTAL 2', +				'l_online_users'	=> 'ONLINE_USERS_TOTAL_GUESTS 7 REG_USERS_TOTAL 2 HIDDEN_USERS_TOTAL 3 GUEST_USERS_TOTAL 2',  			)),  			array(1, false, array(  				'online_userlist'	=> 'BROWSING_FORUM 3', -				'l_online_users'	=> 'ONLINE_USERS_TOTAL 2REG_USER_TOTAL_AND 1HIDDEN_USER_TOTAL 1', +				'l_online_users'	=> 'ONLINE_USERS_TOTAL 2 REG_USERS_TOTAL 1 HIDDEN_USERS_TOTAL 1',  			)),  			array(1, true, array( -				'online_userlist'	=> 'BROWSING_FORUM_GUEST 3 1', -				'l_online_users'	=> 'ONLINE_USERS_TOTAL 3REG_USER_TOTAL 1HIDDEN_USER_TOTAL_AND 1GUEST_USER_TOTAL 1', +				'online_userlist'	=> 'BROWSING_FORUM_GUESTS 1 3', +				'l_online_users'	=> 'ONLINE_USERS_TOTAL_GUESTS 3 REG_USERS_TOTAL 1 HIDDEN_USERS_TOTAL 1 GUEST_USERS_TOTAL 1',  			)),  			array(2, false, array(  				'online_userlist'	=> 'BROWSING_FORUM NO_ONLINE_USERS', -				'l_online_users'	=> 'ONLINE_USERS_ZERO_TOTAL 0REG_USERS_ZERO_TOTAL_AND 0HIDDEN_USERS_ZERO_TOTAL 0', +				'l_online_users'	=> 'ONLINE_USERS_TOTAL 0 REG_USERS_TOTAL 0 HIDDEN_USERS_TOTAL 0',  			)),  			array(2, true, array( -				'online_userlist'	=> 'BROWSING_FORUM_GUESTS NO_ONLINE_USERS 0', -				'l_online_users'	=> 'ONLINE_USERS_ZERO_TOTAL 0REG_USERS_ZERO_TOTAL 0HIDDEN_USERS_ZERO_TOTAL_AND 0GUEST_USERS_ZERO_TOTAL 0', +				'online_userlist'	=> 'BROWSING_FORUM_GUESTS 0 NO_ONLINE_USERS', +				'l_online_users'	=> 'ONLINE_USERS_TOTAL_GUESTS 0 REG_USERS_TOTAL 0 HIDDEN_USERS_TOTAL 0 GUEST_USERS_TOTAL 0',  			)),  		);  	} @@ -157,18 +156,21 @@ class phpbb_functions_obtain_online_test extends phpbb_database_test_case  	{  		$this->db->sql_query('DELETE FROM phpbb_sessions'); -		global $config, $user, $auth; +		global $config, $user, $auth, $phpbb_dispatcher;  		$config['load_online_guests'] = $display_guests; +		$user = new phpbb_mock_lang();  		$user->lang = $this->load_language(); -		$auth = $this->getMock('auth'); +		$auth = $this->getMock('phpbb_auth');  		$acl_get_map = array(  			array('u_viewonline', true), +			array('u_viewprofile', true),  		);  		$auth->expects($this->any())  			->method('acl_get')  			->with($this->stringContains('_'),  				$this->anything())  			->will($this->returnValueMap($acl_get_map)); +		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();  		$time = time();  		$this->create_guest_sessions($time); @@ -214,25 +216,12 @@ class phpbb_functions_obtain_online_test extends phpbb_database_test_case  	protected function load_language()  	{ -		$lang = array( +		return array(  			'NO_ONLINE_USERS'	=> 'NO_ONLINE_USERS',  			'REGISTERED_USERS'	=> 'REGISTERED_USERS',  			'BROWSING_FORUM'	=> 'BROWSING_FORUM %s',  			'BROWSING_FORUM_GUEST'	=> 'BROWSING_FORUM_GUEST %s %d',  			'BROWSING_FORUM_GUESTS'	=> 'BROWSING_FORUM_GUESTS %s %d',  		); -		$vars_online = array('ONLINE', 'REG', 'HIDDEN', 'GUEST'); -		foreach ($vars_online as $online) -		{ -			$lang = array_merge($lang, array( -				$online . '_USERS_ZERO_TOTAL'	=> $online . '_USERS_ZERO_TOTAL %d', -				$online . '_USER_TOTAL'			=> $online . '_USER_TOTAL %d', -				$online . '_USERS_TOTAL'		=> $online . '_USERS_TOTAL %d', -				$online . '_USERS_ZERO_TOTAL_AND'	=> $online . '_USERS_ZERO_TOTAL_AND %d', -				$online . '_USER_TOTAL_AND'			=> $online . '_USER_TOTAL_AND %d', -				$online . '_USERS_TOTAL_AND'		=> $online . '_USERS_TOTAL_AND %d', -			)); -		} -		return $lang;  	}  } diff --git a/tests/functions/quoteattr_test.php b/tests/functions/quoteattr_test.php new file mode 100644 index 0000000000..9d2a7d470e --- /dev/null +++ b/tests/functions/quoteattr_test.php @@ -0,0 +1,44 @@ +<?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.php'; + +class phpbb_quoteattr_test extends phpbb_test_case +{ +	public function quoteattr_test_data() +	{ +		return array( +			array('foo', null, '"foo"'), +			array('', null, '""'), +			array(' ', null, '" "'), +			array('<a>', null, '"<a>"'), +			array('&', null, '"&amp;"'), +			array('"hello"', null, "'\"hello\"'"), +			array("'hello'", null, "\"'hello'\""), +			array("\"'", null, "\""'\""), +			array("a\nb", null, '"a
b"'), +			array("a\r\nb", null, '"a
b"'), +			array("a\tb", null, '"a	b"'), +			array('a b', null, '"a b"'), +			array('"a<b"', null, "'\"a<b\"'"), +			array('foo', array('f' => 'z'), '"zoo"'), +			array('<a>', array('a' => '&'), '"<&>"'), +		); +	} + +	/** +	* @dataProvider quoteattr_test_data +	*/ +	public function test_quoteattr($input, $entities, $expected) +	{ +		$output = phpbb_quoteattr($input, $entities); + +		$this->assertEquals($expected, $output); +	} +} diff --git a/tests/functions_acp/build_cfg_template_test.php b/tests/functions_acp/build_cfg_template_test.php new file mode 100644 index 0000000000..acf4da1bd6 --- /dev/null +++ b/tests/functions_acp/build_cfg_template_test.php @@ -0,0 +1,237 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2010 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +require_once dirname(__FILE__) . '/../../phpBB/includes/functions_acp.php'; + +class phpbb_functions_acp_build_cfg_template_test extends phpbb_test_case +{ +	public function build_cfg_template_text_data() +	{ +		return array( +			array( +				array('text', 20, 255), +				'key_name', +				array('config_key_name'	=> '1'), +				'config_key_name', +				array(), +				'<input id="key_name" type="text" size="20" maxlength="255" name="config[config_key_name]" value="1" />', +			), +			array( +				array('password', 20, 128), +				'key_name', +				array('config_key_name'	=> '2'), +				'config_key_name', +				array(), +				'<input id="key_name" type="password" size="20" maxlength="128" name="config[config_key_name]" value="2" autocomplete="off" />', +			), +			array( +				array('text', 0, 255), +				'key_name', +				array('config_key_name'	=> '3'), +				'config_key_name', +				array(), +				'<input id="key_name" type="text" maxlength="255" name="config[config_key_name]" value="3" />', +			), +		); +	} + +	/** +	* @dataProvider build_cfg_template_text_data +	*/ +	public function test_build_cfg_template_text($tpl_type, $key, $new, $config_key, $vars, $expected) +	{ +		global $user, $phpbb_dispatcher; + +		$phpbb_dispatcher = new phpbb_mock_event_dispatcher(); +		$user = new phpbb_mock_user(); +		$user->lang = new phpbb_mock_lang(); + +		$this->assertEquals($expected, build_cfg_template($tpl_type, $key, $new, $config_key, $vars)); +	} + +	public function build_cfg_template_dimension_data() +	{ +		return array( +			array( +				array('dimension', 5, 15), +				'number_key_name', +				array('config_key_name_width' => 10, 'config_key_name_height' => 20), +				'config_key_name', +				array(), +				'<input id="number_key_name" type="number" size="2" maxlength="2" min="5" max="15" name="config[config_key_name_width]" value="10" /> x <input type="number" size="2" maxlength="2" min="5" max="15" name="config[config_key_name_height]" value="20" />', +			), +			array( +				array('dimension', 0, 15), +				'number_key_name', +				array('config_key_name_width' => 10, 'config_key_name_height' => 20), +				'config_key_name', +				array(), +				'<input id="number_key_name" type="number" size="2" maxlength="2" min="0" max="15" name="config[config_key_name_width]" value="10" /> x <input type="number" size="2" maxlength="2" min="0" max="15" name="config[config_key_name_height]" value="20" />', +			), +		); +	} + +	/** +	* @dataProvider build_cfg_template_dimension_data +	*/ +	public function test_build_cfg_template_dimension($tpl_type, $key, $new, $config_key, $vars, $expected) +	{ +		global $user, $phpbb_dispatcher; + +		$phpbb_dispatcher = new phpbb_mock_event_dispatcher(); +		$user = new phpbb_mock_user(); +		$user->lang = new phpbb_mock_lang(); + +		$this->assertEquals($expected, build_cfg_template($tpl_type, $key, $new, $config_key, $vars)); +	} + +	public function build_cfg_template_number_data() +	{ +		return array( +			array( +				array('number', 5, 15), +				'number_key_name', +				array('config_key_name' => 10), +				'config_key_name', +				array(), +				'<input id="number_key_name" type="number" maxlength="2" min="5" max="15" name="config[config_key_name]" value="10" />', +			), +			array( +				array('number', -1, 9999), +				'number_key_name', +				array('config_key_name' => 10), +				'config_key_name', +				array(), +				'<input id="number_key_name" type="number" maxlength="4" min="-1" max="9999" name="config[config_key_name]" value="10" />', +			), +		); +	} + +	/** +	* @dataProvider build_cfg_template_number_data +	*/ +	public function test_build_cfg_template_number($tpl_type, $key, $new, $config_key, $vars, $expected) +	{ +		global $user, $phpbb_dispatcher; + +		$phpbb_dispatcher = new phpbb_mock_event_dispatcher(); +		$user = new phpbb_mock_user(); +		$user->lang = new phpbb_mock_lang(); + +		$this->assertEquals($expected, build_cfg_template($tpl_type, $key, $new, $config_key, $vars)); +	} + +	public function build_cfg_template_textarea_data() +	{ +		return array( +			array( +				array('textarea', 5, 30), +				'key_name', +				array('config_key_name' => 'phpBB'), +				'config_key_name', +				array(), +				'<textarea id="key_name" name="config[config_key_name]" rows="5" cols="30">phpBB</textarea>', +			), +		); +	} + +	/** +	* @dataProvider build_cfg_template_textarea_data +	*/ +	public function test_build_cfg_template_textarea($tpl_type, $key, $new, $config_key, $vars, $expected) +	{ +		global $user, $phpbb_dispatcher; + +		$phpbb_dispatcher = new phpbb_mock_event_dispatcher(); +		$user = new phpbb_mock_user(); +		$user->lang = new phpbb_mock_lang(); + +		$this->assertEquals($expected, build_cfg_template($tpl_type, $key, $new, $config_key, $vars)); +	} + +	public function build_cfg_template_radio_data() +	{ +		return array( +			array( +				array('radio', 'enabled_disabled'), +				'key_name', +				array('config_key_name'	=> '0'), +				'config_key_name', +				array(), +				'<label><input type="radio" id="key_name" name="config[config_key_name]" value="1" class="radio" /> ENABLED</label><label><input type="radio" name="config[config_key_name]" value="0" checked="checked" class="radio" /> DISABLED</label>', +			), +			array( +				array('radio', 'enabled_disabled'), +				'key_name', +				array('config_key_name'	=> '1'), +				'config_key_name', +				array(), +				'<label><input type="radio" id="key_name" name="config[config_key_name]" value="1" checked="checked" class="radio" /> ENABLED</label><label><input type="radio" name="config[config_key_name]" value="0" class="radio" /> DISABLED</label>', +			), +			array( +				array('radio', 'yes_no'), +				'key_name', +				array('config_key_name'	=> '0'), +				'config_key_name', +				array(), +				'<label><input type="radio" id="key_name" name="config[config_key_name]" value="1" class="radio" /> YES</label><label><input type="radio" name="config[config_key_name]" value="0" checked="checked" class="radio" /> NO</label>', +			), +			array( +				array('radio', 'yes_no'), +				'key_name', +				array('config_key_name'	=> '1'), +				'config_key_name', +				array(), +				'<label><input type="radio" id="key_name" name="config[config_key_name]" value="1" checked="checked" class="radio" /> YES</label><label><input type="radio" name="config[config_key_name]" value="0" class="radio" /> NO</label>', +			), +		); +	} + +	/** +	* @dataProvider build_cfg_template_radio_data +	*/ +	public function test_build_cfg_template_radio($tpl_type, $key, $new, $config_key, $vars, $expected) +	{ +		global $user, $phpbb_dispatcher; + +		$phpbb_dispatcher = new phpbb_mock_event_dispatcher(); +		$user = new phpbb_mock_user(); +		$user->lang = new phpbb_mock_lang(); + +		$this->assertEquals($expected, build_cfg_template($tpl_type, $key, $new, $config_key, $vars)); +	} + +	public function build_cfg_template_append_data() +	{ +		return array( +			array( +				array('textarea', 5, 30), +				'key_name', +				array('config_key_name' => 'phpBB'), +				'config_key_name', +				array('append' => 'Bertie is cool!'), +				'<textarea id="key_name" name="config[config_key_name]" rows="5" cols="30">phpBB</textarea>Bertie is cool!', +			), +		); +	} + +	/** +	* @dataProvider build_cfg_template_append_data +	*/ +	public function test_build_cfg_template_append($tpl_type, $key, $new, $config_key, $vars, $expected) +	{ +		global $user, $phpbb_dispatcher; + +		$phpbb_dispatcher = new phpbb_mock_event_dispatcher(); +		$user = new phpbb_mock_user(); +		$user->lang = new phpbb_mock_lang(); + +		$this->assertEquals($expected, build_cfg_template($tpl_type, $key, $new, $config_key, $vars)); +	} +} diff --git a/tests/functions_acp/build_select_test.php b/tests/functions_acp/build_select_test.php new file mode 100644 index 0000000000..aca49b7655 --- /dev/null +++ b/tests/functions_acp/build_select_test.php @@ -0,0 +1,55 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2010 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +require_once dirname(__FILE__) . '/../../phpBB/includes/functions_acp.php'; + +class phpbb_functions_acp_built_select_test extends phpbb_test_case +{ +	public function build_select_data() +	{ +		return array( +			array( +				array( +					'test'		=> 'TEST', +					'second'	=> 'SEC_OPTION', +				), +				false, +				'<option value="test">TEST</option><option value="second">SEC_OPTION</option>', +			), +			array( +				array( +					'test'		=> 'TEST', +					'second'	=> 'SEC_OPTION', +				), +				'test', +				'<option value="test" selected="selected">TEST</option><option value="second">SEC_OPTION</option>', +			), +			array( +				array( +					'test'		=> 'TEST', +					'second'	=> 'SEC_OPTION', +				), +				'second', +				'<option value="test">TEST</option><option value="second" selected="selected">SEC_OPTION</option>', +			), +		); +	} + +	/** +	* @dataProvider build_select_data +	*/ +	public function test_build_select($option_ary, $option_default, $expected) +	{ +		global $user; + +		$user->lang = new phpbb_mock_lang(); + +		$this->assertEquals($expected, build_select($option_ary, $option_default)); +	} +} diff --git a/tests/functions_acp/h_radio_test.php b/tests/functions_acp/h_radio_test.php new file mode 100644 index 0000000000..a61f2e8975 --- /dev/null +++ b/tests/functions_acp/h_radio_test.php @@ -0,0 +1,120 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2010 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +require_once dirname(__FILE__) . '/../../phpBB/includes/functions_acp.php'; + +class phpbb_functions_acp_h_radio_test extends phpbb_test_case +{ +	public function h_radio_data() +	{ +		return array( +			array( +				'test_name', +				array( +					'test'		=> 'TEST', +					'second'	=> 'SEC_OPTION', +				), +				false, +				false, +				false, +				'<label><input type="radio" name="test_name" value="test" class="radio" /> TEST</label><label><input type="radio" name="test_name" value="second" class="radio" /> SEC_OPTION</label>', +			), +			array( +				'test_name', +				array( +					'test'		=> 'TEST', +					'second'	=> 'SEC_OPTION', +				), +				'test', +				false, +				false, +				'<label><input type="radio" name="test_name" value="test" checked="checked" class="radio" /> TEST</label><label><input type="radio" name="test_name" value="second" class="radio" /> SEC_OPTION</label>', +			), +			array( +				'test_name', +				array( +					'test'		=> 'TEST', +					'second'	=> 'SEC_OPTION', +				), +				false, +				'test_id', +				false, +				'<label><input type="radio" name="test_name" id="test_id" value="test" class="radio" /> TEST</label><label><input type="radio" name="test_name" value="second" class="radio" /> SEC_OPTION</label>', +			), +			array( +				'test_name', +				array( +					'test'		=> 'TEST', +					'second'	=> 'SEC_OPTION', +				), +				'test', +				'test_id', +				false, +				'<label><input type="radio" name="test_name" id="test_id" value="test" checked="checked" class="radio" /> TEST</label><label><input type="radio" name="test_name" value="second" class="radio" /> SEC_OPTION</label>', +			), + +			array( +				'test_name', +				array( +					'test'		=> 'TEST', +					'second'	=> 'SEC_OPTION', +				), +				false, +				false, +				'k', +				'<label><input type="radio" name="test_name" value="test" accesskey="k" class="radio" /> TEST</label><label><input type="radio" name="test_name" value="second" accesskey="k" class="radio" /> SEC_OPTION</label>', +			), +			array( +				'test_name', +				array( +					'test'		=> 'TEST', +					'second'	=> 'SEC_OPTION', +				), +				'test', +				false, +				'k', +				'<label><input type="radio" name="test_name" value="test" checked="checked" accesskey="k" class="radio" /> TEST</label><label><input type="radio" name="test_name" value="second" accesskey="k" class="radio" /> SEC_OPTION</label>', +			), +			array( +				'test_name', +				array( +					'test'		=> 'TEST', +					'second'	=> 'SEC_OPTION', +				), +				false, +				'test_id', +				'k', +				'<label><input type="radio" name="test_name" id="test_id" value="test" accesskey="k" class="radio" /> TEST</label><label><input type="radio" name="test_name" value="second" accesskey="k" class="radio" /> SEC_OPTION</label>', +			), +			array( +				'test_name', +				array( +					'test'		=> 'TEST', +					'second'	=> 'SEC_OPTION', +				), +				'test', +				'test_id', +				'k', +				'<label><input type="radio" name="test_name" id="test_id" value="test" checked="checked" accesskey="k" class="radio" /> TEST</label><label><input type="radio" name="test_name" value="second" accesskey="k" class="radio" /> SEC_OPTION</label>', +			), +		); +	} + +	/** +	* @dataProvider h_radio_data +	*/ +	public function test_h_radio($name, $input_ary, $input_default, $id, $key, $expected) +	{ +		global $user; + +		$user->lang = new phpbb_mock_lang(); + +		$this->assertEquals($expected, h_radio($name, $input_ary, $input_default, $id, $key)); +	} +} diff --git a/tests/functions_acp/validate_config_vars_test.php b/tests/functions_acp/validate_config_vars_test.php new file mode 100644 index 0000000000..7cd7fa3892 --- /dev/null +++ b/tests/functions_acp/validate_config_vars_test.php @@ -0,0 +1,158 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2010 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +require_once dirname(__FILE__) . '/../../phpBB/includes/functions_acp.php'; + +class phpbb_functions_acp_validate_config_vars_test extends phpbb_test_case +{ +	/** +	* Data sets that don't throw an error. +	*/ +	public function validate_config_vars_fit_data() +	{ +		return array( +			array( +				array( +					'test_bool'				=> array('lang' => 'TEST_BOOL',			'validate' => 'bool'), +					'test_string'			=> array('lang' => 'TEST_STRING',		'validate' => 'string'), +					'test_string'			=> array('lang' => 'TEST_STRING',		'validate' => 'string'), +					'test_string_128'		=> array('lang' => 'TEST_STRING_128',	'validate' => 'string:128'), +					'test_string_128'		=> array('lang' => 'TEST_STRING_128',	'validate' => 'string:128'), +					'test_string_32_64'		=> array('lang' => 'TEST_STRING_32_64',	'validate' => 'string:32:64'), +					'test_string_32_64'		=> array('lang' => 'TEST_STRING_32_64',	'validate' => 'string:32:64'), +					'test_int'				=> array('lang' => 'TEST_INT',			'validate' => 'int'), +					'test_int_32'			=> array('lang' => 'TEST_INT',			'validate' => 'int:32'), +					'test_int_32_64'		=> array('lang' => 'TEST_INT',			'validate' => 'int:32:64'), +					'test_lang'				=> array('lang' => 'TEST_LANG',			'validate' => 'lang'), +					/* +					'test_sp'				=> array('lang' => 'TEST_SP',			'validate' => 'script_path'), +					'test_rpath'			=> array('lang' => 'TEST_RPATH',		'validate' => 'rpath'), +					'test_rwpath'			=> array('lang' => 'TEST_RWPATH',		'validate' => 'rwpath'), +					'test_path'				=> array('lang' => 'TEST_PATH',			'validate' => 'path'), +					'test_wpath'			=> array('lang' => 'TEST_WPATH',		'validate' => 'wpath'), +					*/ +				), +				array( +					'test_bool'			=> true, +					'test_string'		=> str_repeat('a', 255), +					'test_string'		=> str_repeat("\xC3\x84", 255), +					'test_string_128'	=> str_repeat('a', 128), +					'test_string_128'	=> str_repeat("\xC3\x84", 128), +					'test_string_32_64'	=> str_repeat('a', 48), +					'test_string_32_64'	=> str_repeat("\xC3\x84", 48), +					'test_int'			=> 128, +					'test_int_32'		=> 32, +					'test_int_32_64'	=> 48, +					'test_lang'			=> 'en', +				), +			), +		); +	} + +	/** +	* @dataProvider validate_config_vars_fit_data +	*/ +	public function test_validate_config_vars_fit($test_data, $cfg_array) +	{ +		global $user; + +		$user->lang = new phpbb_mock_lang(); + +		$phpbb_error = array(); +		validate_config_vars($test_data, $cfg_array, $phpbb_error); + +		$this->assertEquals(array(), $phpbb_error); +	} + +	/** +	* Data sets that throw the error. +	*/ +	public function validate_config_vars_error_data() +	{ +		return array( +			array( +				array('test_string_32_64'		=> array('lang' => 'TEST_STRING_32_64',	'validate' => 'string:32:64')), +				array('test_string_32_64'	=> str_repeat('a', 20)), +				array('SETTING_TOO_SHORT'), +			), +			array( +				array('test_string_32_64'		=> array('lang' => 'TEST_STRING_32_64',	'validate' => 'string:32:64')), +				array('test_string_32_64'	=> str_repeat("\xC3\x84", 20)), +				array('SETTING_TOO_SHORT'), +			), +			array( +				array('test_string'		=> array('lang' => 'TEST_STRING',	'validate' => 'string')), +				array('test_string'		=> str_repeat('a', 256)), +				array('SETTING_TOO_LONG'), +			), +			array( +				array('test_string'		=> array('lang' => 'TEST_STRING',	'validate' => 'string')), +				array('test_string'		=> str_repeat("\xC3\x84", 256)), +				array('SETTING_TOO_LONG'), +			), +			array( +				array('test_string_32_64'	=> array('lang' => 'TEST_STRING_32_64',	'validate' => 'string:32:64')), +				array('test_string_32_64'	=> str_repeat('a', 65)), +				array('SETTING_TOO_LONG'), +			), +			array( +				array('test_string_32_64'	=> array('lang' => 'TEST_STRING_32_64',	'validate' => 'string:32:64')), +				array('test_string_32_64'	=> str_repeat("\xC3\x84", 65)), +				array('SETTING_TOO_LONG'), +			), + +			array( +				array('test_int_32'		=> array('lang' => 'TEST_INT',			'validate' => 'int:32')), +				array('test_int_32'		=> 31), +				array('SETTING_TOO_LOW'), +			), +			array( +				array('test_int_32_64'	=> array('lang' => 'TEST_INT',			'validate' => 'int:32:64')), +				array('test_int_32_64'	=> 31), +				array('SETTING_TOO_LOW'), +			), +			array( +				array('test_int_32_64'	=> array('lang' => 'TEST_INT',			'validate' => 'int:32:64')), +				array('test_int_32_64'	=> 65), +				array('SETTING_TOO_BIG'), +			), +			array( +				array( +					'test_int_min'	=> array('lang' => 'TEST_INT_MIN',		'validate' => 'int:32:64'), +					'test_int_max'	=> array('lang' => 'TEST_INT_MAX',		'validate' => 'int:32:64'), +				), +				array( +					'test_int_min'	=> 52, +					'test_int_max'	=> 48, +				), +				array('SETTING_TOO_LOW'), +			), +			array( +				array('test_lang'		=> array('lang' => 'TEST_LANG',			'validate' => 'lang')), +				array('test_lang'		=> 'this_is_no_language'), +				array('WRONG_DATA_LANG'), +			), +		); +	} + +	/** +	* @dataProvider validate_config_vars_error_data +	*/ +	public function test_validate_config_vars_error($test_data, $cfg_array, $expected) +	{ +		global $user; + +		$user->lang = new phpbb_mock_lang(); + +		$phpbb_error = array(); +		validate_config_vars($test_data, $cfg_array, $phpbb_error); + +		$this->assertEquals($expected, $phpbb_error); +	} +} diff --git a/tests/functions_acp/validate_range_test.php b/tests/functions_acp/validate_range_test.php new file mode 100644 index 0000000000..8606158251 --- /dev/null +++ b/tests/functions_acp/validate_range_test.php @@ -0,0 +1,170 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2010 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php'; +require_once dirname(__FILE__) . '/../../phpBB/includes/functions_acp.php'; + +class phpbb_functions_acp_validate_range_test extends phpbb_test_case +{ +	/** +	* Data sets that don't throw an error. +	*/ +	public function validate_range_data_fit() +	{ +		return array( +			array(array(array('column_type' => 'BOOL', 'lang' => 'TEST', 'value' => 0))), +			array(array(array('column_type' => 'BOOL', 'lang' => 'TEST', 'value' => 1))), + +			array(array(array('column_type' => 'USINT', 'lang' => 'TEST', 'value' => 0))), +			array(array(array('column_type' => 'USINT', 'lang' => 'TEST', 'value' => 65535))), +			array(array(array('column_type' => 'USINT:32:128', 'lang' => 'TEST', 'value' => 35))), + +			array(array(array('column_type' => 'UINT', 'lang' => 'TEST', 'value' => 0))), +			array(array(array('column_type' => 'UINT', 'lang' => 'TEST', 'value' => (int) 0x7fffffff))), +			array(array(array('column_type' => 'UINT:32:128', 'lang' => 'TEST', 'value' => 35))), + +			array(array(array('column_type' => 'INT', 'lang' => 'TEST', 'value' => (int) -2147483648))), +			array(array(array('column_type' => 'INT', 'lang' => 'TEST', 'value' => (int) 0x7fffffff))), +			array(array(array('column_type' => 'INT:-32:128', 'lang' => 'TEST', 'value' => -28))), +			array(array(array('column_type' => 'INT:-32:128', 'lang' => 'TEST', 'value' => 35))), + +			array(array(array('column_type' => 'TINT', 'lang' => 'TEST', 'value' => -128))), +			array(array(array('column_type' => 'TINT', 'lang' => 'TEST', 'value' => 127))), +			array(array(array('column_type' => 'TINT:-32:64', 'lang' => 'TEST', 'value' => -16))), +			array(array(array('column_type' => 'TINT:-32:64', 'lang' => 'TEST', 'value' => 16))), + +			array(array(array('column_type' => 'VCHAR', 'lang' => 'TEST', 'value' => ''))), +			array(array(array('column_type' => 'VCHAR', 'lang' => 'TEST', 'value' => str_repeat('a', 255)))), +			array(array(array('column_type' => 'VCHAR', 'lang' => 'TEST', 'value' => str_repeat("\xC3\x84", 255)))), +			array(array(array('column_type' => 'VCHAR:128', 'lang' => 'TEST', 'value' => str_repeat('a', 128)))), +			array(array(array('column_type' => 'VCHAR:128', 'lang' => 'TEST', 'value' => str_repeat("\xC3\x84", 128)))), +		); +	} + +	/** +	* @dataProvider validate_range_data_fit +	*/ +	public function test_validate_range_fit($test_data) +	{ +		global $user; + +		$user->lang = new phpbb_mock_lang(); + +		$phpbb_error = array(); +		validate_range($test_data, $phpbb_error); + +		$this->assertEquals(array(), $phpbb_error); +	} + +	/** +	* Data sets that throw the SETTING_TOO_LOW-error. +	*/ +	public function validate_range_data_too_low() +	{ +		return array( +			array(array(array('column_type' => 'BOOL', 'lang' => 'TEST', 'value' => -1))), + +			array(array(array('column_type' => 'USINT', 'lang' => 'TEST', 'value' => -1))), +			array(array(array('column_type' => 'USINT:32:128', 'lang' => 'TEST', 'value' => 31))), + +			array(array(array('column_type' => 'UINT', 'lang' => 'TEST', 'value' => -1))), +			array(array(array('column_type' => 'UINT:32:128', 'lang' => 'TEST', 'value' => 31))), + +			array(array(array('column_type' => 'INT', 'lang' => 'TEST', 'value' => ((int) -2147483648) - 1))), +			array(array(array('column_type' => 'INT:32:128', 'lang' => 'TEST', 'value' => 31))), +			array(array(array('column_type' => 'INT:-32:128', 'lang' => 'TEST', 'value' => -33))), + +			array(array(array('column_type' => 'TINT', 'lang' => 'TEST', 'value' => -129))), +			array(array(array('column_type' => 'TINT:32:64', 'lang' => 'TEST', 'value' => 31))), +			array(array(array('column_type' => 'TINT:-32:64', 'lang' => 'TEST', 'value' => -33))), +		); +	} + +	/** +	* @dataProvider validate_range_data_too_low +	*/ +	public function test_validate_range_too_low($test_data) +	{ +		global $user; + +		$user->lang = new phpbb_mock_lang(); + +		$phpbb_error = array(); +		validate_range($test_data, $phpbb_error); + +		$this->assertEquals(array('SETTING_TOO_LOW'), $phpbb_error); +	} + +	/** +	* Data sets that throw the SETTING_TOO_BIG-error. +	*/ +	public function validate_range_data_too_big() +	{ +		return array( +			array(array(array('column_type' => 'BOOL', 'lang' => 'TEST', 'value' => 2))), + +			array(array(array('column_type' => 'USINT', 'lang' => 'TEST', 'value' => 65536))), +			array(array(array('column_type' => 'USINT:32:128', 'lang' => 'TEST', 'value' => 129))), + +			array(array(array('column_type' => 'UINT', 'lang' => 'TEST', 'value' => ((int) 0x7fffffff) + 1))), +			array(array(array('column_type' => 'UINT:32:128', 'lang' => 'TEST', 'value' => 129))), + +			array(array(array('column_type' => 'INT', 'lang' => 'TEST', 'value' => ((int) 0x7fffffff) + 1))), +			array(array(array('column_type' => 'INT:-32:-16', 'lang' => 'TEST', 'value' => -15))), +			array(array(array('column_type' => 'INT:-32:128', 'lang' => 'TEST', 'value' => 129))), + +			array(array(array('column_type' => 'TINT', 'lang' => 'TEST', 'value' => 128))), +			array(array(array('column_type' => 'TINT:-32:-16', 'lang' => 'TEST', 'value' => -15))), +			array(array(array('column_type' => 'TINT:-32:64', 'lang' => 'TEST', 'value' => 65))), +		); +	} + +	/** +	* @dataProvider validate_range_data_too_big +	*/ +	public function test_validate_range_too_big($test_data) +	{ +		global $user; + +		$user->lang = new phpbb_mock_lang(); + +		$phpbb_error = array(); +		validate_range($test_data, $phpbb_error); + +		$this->assertEquals(array('SETTING_TOO_BIG'), $phpbb_error); +	} + +	/** +	* Data sets that throw the SETTING_TOO_LONG-error. +	*/ +	public function validate_range_data_too_long() +	{ +		return array( +			array(array(array('column_type' => 'VCHAR', 'lang' => 'TEST', 'value' => str_repeat('a', 256)))), +			array(array(array('column_type' => 'VCHAR', 'lang' => 'TEST', 'value' => str_repeat("\xC3\x84", 256)))), +			array(array(array('column_type' => 'VCHAR:128', 'lang' => 'TEST', 'value' => str_repeat('a', 129)))), +			array(array(array('column_type' => 'VCHAR:128', 'lang' => 'TEST', 'value' => str_repeat("\xC3\x84", 129)))), +		); +	} + +	/** +	* @dataProvider validate_range_data_too_long +	*/ +	public function test_validate_range_too_long($test_data) +	{ +		global $user; + +		$user->lang = new phpbb_mock_lang(); + +		$phpbb_error = array(); +		validate_range($test_data, $phpbb_error); + +		$this->assertEquals(array('SETTING_TOO_LONG'), $phpbb_error); +	} +} diff --git a/tests/functions_user/fixtures/group_user_attributes.xml b/tests/functions_user/fixtures/group_user_attributes.xml new file mode 100644 index 0000000000..f4edbdca49 --- /dev/null +++ b/tests/functions_user/fixtures/group_user_attributes.xml @@ -0,0 +1,121 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<dataset> +	<table name="phpbb_groups"> +		<column>group_id</column> +		<column>group_avatar</column> +		<column>group_rank</column> +		<column>group_desc</column> +		<row> +			<value>1</value> +			<value>default</value> +			<value>1</value> +			<value></value> +		</row> +		<row> +			<value>2</value> +			<value></value> +			<value>0</value> +			<value></value> +		</row> +		<row> +			<value>3</value> +			<value>default2</value> +			<value>3</value> +			<value></value> +		</row> +	</table> +	<table name="phpbb_users"> +		<column>user_id</column> +		<column>group_id</column> +		<column>user_avatar</column> +		<column>user_rank</column> +		<column>username_clean</column> +		<column>user_permissions</column> +		<column>user_sig</column> +		<column>user_occ</column> +		<column>user_interests</column> +		<row> +			<value>1</value> +			<value>1</value> +			<value></value> +			<value>0</value> +			<value>barfoo</value> +			<value></value> +			<value></value> +			<value></value> +			<value></value> +		</row> +		<row> +			<value>2</value> +			<value>1</value> +			<value>default</value> +			<value>1</value> +			<value>foobar</value> +			<value></value> +			<value></value> +			<value></value> +			<value></value> +		</row> +		<row> +			<value>3</value> +			<value>1</value> +			<value>custom</value> +			<value>2</value> +			<value>bertie</value> +			<value></value> +			<value></value> +			<value></value> +			<value></value> +		</row> +	</table> +	<table name="phpbb_user_group"> +		<column>user_id</column> +		<column>group_id</column> +		<column>user_pending</column> +		<row> +			<value>1</value> +			<value>1</value> +			<value>0</value> +		</row> +		<row> +			<value>1</value> +			<value>2</value> +			<value>0</value> +		</row> +		<row> +			<value>1</value> +			<value>3</value> +			<value>0</value> +		</row> +		<row> +			<value>2</value> +			<value>1</value> +			<value>0</value> +		</row> +		<row> +			<value>2</value> +			<value>2</value> +			<value>0</value> +		</row> +		<row> +			<value>2</value> +			<value>3</value> +			<value>0</value> +		</row> +		<row> +			<value>3</value> +			<value>1</value> +			<value>0</value> +		</row> +		<row> +			<value>3</value> +			<value>2</value> +			<value>0</value> +		</row> +		<row> +			<value>3</value> +			<value>3</value> +			<value>0</value> +		</row> +	</table> +</dataset> diff --git a/tests/functions_user/group_user_attributes_test.php b/tests/functions_user/group_user_attributes_test.php new file mode 100644 index 0000000000..4336fd894e --- /dev/null +++ b/tests/functions_user/group_user_attributes_test.php @@ -0,0 +1,157 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2008 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; +require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php'; +require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php'; + +class phpbb_functions_user_group_user_attributes_test extends phpbb_database_test_case +{ +	public function getDataSet() +	{ +		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/group_user_attributes.xml'); +	} + +	public function group_user_attributes_data() +	{ +		return array( +			array( +				'Setting new default group without settings for user with no settings - no change', +				1, +				2, +				array( +					'group_avatar'	=> '', +					'group_avatar_type'		=> 0, +					'group_avatar_height'	=> 0, +					'group_avatar_width'	=> 0, +					'group_rank'	=> 0, +				), +				array( +					'user_avatar'	=> '', +					'user_rank'		=> 0, +				), +			), +			array( +				'Setting new default group without settings for user with default settings - user settings overwritten', +				2, +				2, +				array( +					'group_avatar'	=> '', +					'group_avatar_type'		=> 0, +					'group_avatar_height'	=> 0, +					'group_avatar_width'	=> 0, +					'group_rank'	=> 0, +				), +				array( +					'user_avatar'	=> '', +					'user_rank'		=> 0, +				), +			), +			array( +				'Setting new default group without settings for user with custom settings - no change', +				3, +				2, +				array( +					'group_avatar'	=> '', +					'group_avatar_type'		=> 0, +					'group_avatar_height'	=> 0, +					'group_avatar_width'	=> 0, +					'group_rank'	=> 0, +				), +				array( +					'user_avatar'	=> 'custom', +					'user_rank'		=> 2, +				), +			), +			array( +				'Setting new default group with settings for user with no settings - user settings overwritten', +				1, +				3, +				array( +					'group_avatar'	=> 'default2', +					'group_avatar_type'		=> 1, +					'group_avatar_height'	=> 1, +					'group_avatar_width'	=> 1, +					'group_rank'	=> 3, +				), +				array( +					'user_avatar'	=> 'default2', +					'user_rank'		=> 3, +				), +			), +			array( +				'Setting new default group with settings for user with default settings - user settings overwritten', +				2, +				3, +				array( +					'group_avatar'	=> 'default2', +					'group_avatar_type'		=> 1, +					'group_avatar_height'	=> 1, +					'group_avatar_width'	=> 1, +					'group_rank'	=> 3, +				), +				array( +					'user_avatar'	=> 'default2', +					'user_rank'		=> 3, +				), +			), +			array( +				'Setting new default group with settings for user with custom settings - no change', +				3, +				3, +				array( +					'group_avatar'	=> 'default2', +					'group_avatar_type'		=> 1, +					'group_avatar_height'	=> 1, +					'group_avatar_width'	=> 1, +					'group_rank'	=> 3, +				), +				array( +					'user_avatar'	=> 'custom', +					'user_rank'		=> 2, +				), +			), +		); +	} + +	/** +	* @dataProvider group_user_attributes_data +	*/ +	public function test_group_user_attributes($description, $user_id, $group_id, $group_row, $expected) +	{ +		global $auth, $cache, $db, $phpbb_dispatcher, $user, $phpbb_container, $phpbb_log, $phpbb_root_path, $phpEx; + +		$user->ip = ''; +		$cache = new phpbb_mock_cache; +		$db = $this->new_dbal(); +		$phpbb_dispatcher = new phpbb_mock_event_dispatcher(); +		$auth = $this->getMock('phpbb_auth'); +		$auth->expects($this->any()) +			->method('acl_clear_prefetch'); +		$cache_driver = new phpbb_cache_driver_null(); +		$phpbb_container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface'); +		$phpbb_container +			->expects($this->any()) +			->method('get') +			->with('cache.driver') +			->will($this->returnValue($cache_driver)); +		$phpbb_log = new phpbb_log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE); + +		group_user_attributes('default', $group_id, array($user_id), false, 'group_name', $group_row); + +		$sql = 'SELECT user_avatar, user_rank +			FROM ' . USERS_TABLE . ' +			WHERE user_id = ' . $user_id; +		$result = $db->sql_query($sql); + +		$this->assertEquals(array($expected), $db->sql_fetchrowset($result)); + +		$db->sql_freeresult($result); +	} +} diff --git a/tests/groupposition/fixtures/legend.xml b/tests/groupposition/fixtures/legend.xml new file mode 100644 index 0000000000..a9209309bd --- /dev/null +++ b/tests/groupposition/fixtures/legend.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<dataset> +	<table name="phpbb_groups"> +		<column>group_id</column> +		<column>group_legend</column> +		<column>group_desc</column> +		<row> +			<value>1</value> +			<value>0</value> +			<value></value> +		</row> +		<row> +			<value>2</value> +			<value>1</value> +			<value></value> +		</row> +		<row> +			<value>3</value> +			<value>2</value> +			<value></value> +		</row> +	</table> +</dataset> diff --git a/tests/groupposition/fixtures/teampage.xml b/tests/groupposition/fixtures/teampage.xml new file mode 100644 index 0000000000..b6c39045e3 --- /dev/null +++ b/tests/groupposition/fixtures/teampage.xml @@ -0,0 +1,102 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<dataset> +	<table name="phpbb_groups"> +		<column>group_id</column> +		<column>group_desc</column> +		<row> +			<value>1</value> +			<value></value> +		</row> +		<row> +			<value>2</value> +			<value></value> +		</row> +		<row> +			<value>3</value> +			<value></value> +		</row> +		<row> +			<value>4</value> +			<value></value> +		</row> +		<row> +			<value>5</value> +			<value></value> +		</row> +		<row> +			<value>6</value> +			<value></value> +		</row> +		<row> +			<value>7</value> +			<value></value> +		</row> +		<row> +			<value>8</value> +			<value></value> +		</row> +	</table> +	<table name="phpbb_teampage"> +		<column>teampage_id</column> +		<column>group_id</column> +		<column>teampage_name</column> +		<column>teampage_position</column> +		<column>teampage_parent</column> +		<row> +			<value>1</value> +			<value>1</value> +			<value></value> +			<value>1</value> +			<value>0</value> +		</row> +		<row> +			<value>2</value> +			<value>0</value> +			<value>category - 2 children</value> +			<value>2</value> +			<value>0</value> +		</row> +		<row> +			<value>3</value> +			<value>2</value> +			<value></value> +			<value>3</value> +			<value>2</value> +		</row> +		<row> +			<value>4</value> +			<value>3</value> +			<value></value> +			<value>4</value> +			<value>2</value> +		</row> +		<row> +			<value>5</value> +			<value>0</value> +			<value>category2 - 2 children</value> +			<value>5</value> +			<value>0</value> +		</row> +		<row> +			<value>6</value> +			<value>4</value> +			<value></value> +			<value>6</value> +			<value>5</value> +		</row> +		<row> +			<value>7</value> +			<value>5</value> +			<value></value> +			<value>7</value> +			<value>5</value> +		</row> +		<row> +			<value>8</value> +			<value>6</value> +			<value></value> +			<value>8</value> +			<value>0</value> +		</row> +	</table> +</dataset> diff --git a/tests/groupposition/legend_test.php b/tests/groupposition/legend_test.php new file mode 100644 index 0000000000..16e33b390c --- /dev/null +++ b/tests/groupposition/legend_test.php @@ -0,0 +1,403 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2012 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + + +class phpbb_groupposition_legend_test extends phpbb_database_test_case +{ +	public function getDataSet() +	{ +		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/legend.xml'); +	} + +	public function get_group_value_data() +	{ +		return array( +			array(1, 0, ''), +			array(3, 2, ''), +			array(4, 0, 'phpbb_groupposition_exception'), +		); +	} + +	/** +	* @dataProvider get_group_value_data +	*/ +	public function test_get_group_value($group_id, $expected, $throws_exception) +	{ +		global $cache; + +		$cache = new phpbb_mock_cache; +		$db = $this->new_dbal(); +		$user = new phpbb_user; +		$user->lang = array(); + +		if ($throws_exception) +		{ +			$this->setExpectedException($throws_exception); +		} + +		$test_class = new phpbb_groupposition_legend($db, $user); +		$this->assertEquals($expected, $test_class->get_group_value($group_id)); +	} + +	public function test_get_group_count() +	{ +		global $cache; + +		$cache = new phpbb_mock_cache; +		$db = $this->new_dbal(); +		$user = new phpbb_user; +		$user->lang = array(); + +		$test_class = new phpbb_groupposition_legend($db, $user); +		$this->assertEquals(2, $test_class->get_group_count()); +	} + +	public function add_group_data() +	{ +		return array( +			array( +				1, +				true, +				array( +					array('group_id' => 1, 'group_legend' => 3), +					array('group_id' => 2, 'group_legend' => 1), +					array('group_id' => 3, 'group_legend' => 2), +				), +			), +			array( +				2, +				false, +				array( +					array('group_id' => 1, 'group_legend' => 0), +					array('group_id' => 2, 'group_legend' => 1), +					array('group_id' => 3, 'group_legend' => 2), +				), +			), +		); +	} + +	/** +	* @dataProvider add_group_data +	*/ +	public function test_add_group($group_id, $expected_added, $expected) +	{ +		global $cache; + +		$cache = new phpbb_mock_cache; +		$db = $this->new_dbal(); +		$user = new phpbb_user; +		$user->lang = array(); + +		$test_class = new phpbb_groupposition_legend($db, $user); +		$this->assertEquals($expected_added, $test_class->add_group($group_id)); + +		$result = $db->sql_query('SELECT group_id, group_legend +			FROM ' . GROUPS_TABLE . ' +			ORDER BY group_id ASC'); + +		$this->assertEquals($expected, $db->sql_fetchrowset($result)); +	} + +	public function delete_group_data() +	{ +		return array( +			array( +				1, +				false, +				false, +				array( +					array('group_id' => 1, 'group_legend' => 0), +					array('group_id' => 2, 'group_legend' => 1), +					array('group_id' => 3, 'group_legend' => 2), +				), +			), +			array( +				2, +				false, +				true, +				array( +					array('group_id' => 1, 'group_legend' => 0), +					array('group_id' => 2, 'group_legend' => 0), +					array('group_id' => 3, 'group_legend' => 1), +				), +			), +			array( +				3, +				false, +				true, +				array( +					array('group_id' => 1, 'group_legend' => 0), +					array('group_id' => 2, 'group_legend' => 1), +					array('group_id' => 3, 'group_legend' => 0), +				), +			), +			array( +				1, +				true, +				false, +				array( +					array('group_id' => 1, 'group_legend' => 0), +					array('group_id' => 2, 'group_legend' => 1), +					array('group_id' => 3, 'group_legend' => 2), +				), +			), +			array( +				2, +				true, +				true, +				array( +					array('group_id' => 1, 'group_legend' => 0), +					array('group_id' => 2, 'group_legend' => 1), +					array('group_id' => 3, 'group_legend' => 1), +				), +			), +			array( +				3, +				true, +				true, +				array( +					array('group_id' => 1, 'group_legend' => 0), +					array('group_id' => 2, 'group_legend' => 1), +					array('group_id' => 3, 'group_legend' => 2), +				), +			), +		); +	} + +	/** +	* @dataProvider delete_group_data +	*/ +	public function test_delete_group($group_id, $skip_group, $expected_deleted, $expected) +	{ +		global $cache; + +		$cache = new phpbb_mock_cache; +		$db = $this->new_dbal(); +		$user = new phpbb_user; +		$user->lang = array(); + +		$test_class = new phpbb_groupposition_legend($db, $user); +		$this->assertEquals($expected_deleted, $test_class->delete_group($group_id, $skip_group)); + +		$result = $db->sql_query('SELECT group_id, group_legend +			FROM ' . GROUPS_TABLE . ' +			ORDER BY group_id ASC'); + +		$this->assertEquals($expected, $db->sql_fetchrowset($result)); +	} + +	public function move_up_data() +	{ +		return array( +			array( +				1, +				false, +				array( +					array('group_id' => 1, 'group_legend' => 0), +					array('group_id' => 2, 'group_legend' => 1), +					array('group_id' => 3, 'group_legend' => 2), +				), +			), +			array( +				2, +				false, +				array( +					array('group_id' => 1, 'group_legend' => 0), +					array('group_id' => 2, 'group_legend' => 1), +					array('group_id' => 3, 'group_legend' => 2), +				), +			), +			array( +				3, +				true, +				array( +					array('group_id' => 1, 'group_legend' => 0), +					array('group_id' => 2, 'group_legend' => 2), +					array('group_id' => 3, 'group_legend' => 1), +				), +			), +		); +	} + +	/** +	* @dataProvider move_up_data +	*/ +	public function test_move_up($group_id, $excepted_moved, $expected) +	{ +		global $cache; + +		$cache = new phpbb_mock_cache; +		$db = $this->new_dbal(); +		$user = new phpbb_user; +		$user->lang = array(); + +		$test_class = new phpbb_groupposition_legend($db, $user); +		$this->assertEquals($excepted_moved, $test_class->move_up($group_id)); + +		$result = $db->sql_query('SELECT group_id, group_legend +			FROM ' . GROUPS_TABLE . ' +			ORDER BY group_id ASC'); + +		$this->assertEquals($expected, $db->sql_fetchrowset($result)); +	} + +	public function move_down_data() +	{ +		return array( +			array( +				1, +				false, +				array( +					array('group_id' => 1, 'group_legend' => 0), +					array('group_id' => 2, 'group_legend' => 1), +					array('group_id' => 3, 'group_legend' => 2), +				), +			), +			array( +				2, +				true, +				array( +					array('group_id' => 1, 'group_legend' => 0), +					array('group_id' => 2, 'group_legend' => 2), +					array('group_id' => 3, 'group_legend' => 1), +				), +			), +			array( +				3, +				false, +				array( +					array('group_id' => 1, 'group_legend' => 0), +					array('group_id' => 2, 'group_legend' => 1), +					array('group_id' => 3, 'group_legend' => 2), +				), +			), +		); +	} + +	/** +	* @dataProvider move_down_data +	*/ +	public function test_move_down($group_id, $excepted_moved, $expected) +	{ +		global $cache; + +		$cache = new phpbb_mock_cache; +		$db = $this->new_dbal(); +		$user = new phpbb_user; +		$user->lang = array(); + +		$test_class = new phpbb_groupposition_legend($db, $user); +		$this->assertEquals($excepted_moved, $test_class->move_down($group_id)); + +		$result = $db->sql_query('SELECT group_id, group_legend +			FROM ' . GROUPS_TABLE . ' +			ORDER BY group_id ASC'); + +		$this->assertEquals($expected, $db->sql_fetchrowset($result)); +	} + +	public function move_data() +	{ +		return array( +			array( +				1, +				1, +				false, +				array( +					array('group_id' => 1, 'group_legend' => 0), +					array('group_id' => 2, 'group_legend' => 1), +					array('group_id' => 3, 'group_legend' => 2), +				), +			), +			array( +				1, +				-1, +				false, +				array( +					array('group_id' => 1, 'group_legend' => 0), +					array('group_id' => 2, 'group_legend' => 1), +					array('group_id' => 3, 'group_legend' => 2), +				), +			), +			array( +				3, +				3, +				true, +				array( +					array('group_id' => 1, 'group_legend' => 0), +					array('group_id' => 2, 'group_legend' => 2), +					array('group_id' => 3, 'group_legend' => 1), +				), +			), +			array( +				2, +				0, +					false, +				array( +					array('group_id' => 1, 'group_legend' => 0), +					array('group_id' => 2, 'group_legend' => 1), +					array('group_id' => 3, 'group_legend' => 2), +				), +			), +			array( +				2, +				-1, +				true, +				array( +					array('group_id' => 1, 'group_legend' => 0), +					array('group_id' => 2, 'group_legend' => 2), +					array('group_id' => 3, 'group_legend' => 1), +				), +			), +			array( +				2, +				-3, +				true, +				array( +					array('group_id' => 1, 'group_legend' => 0), +					array('group_id' => 2, 'group_legend' => 2), +					array('group_id' => 3, 'group_legend' => 1), +				), +			), +			array( +				3, +				-1, +				false, +				array( +					array('group_id' => 1, 'group_legend' => 0), +					array('group_id' => 2, 'group_legend' => 1), +					array('group_id' => 3, 'group_legend' => 2), +				), +			), +		); +	} + +	/** +	* @dataProvider move_data +	*/ +	public function test_move($group_id, $increment, $excepted_moved, $expected) +	{ +		global $cache; + +		$cache = new phpbb_mock_cache; +		$db = $this->new_dbal(); +		$user = new phpbb_user; +		$user->lang = array(); + +		$test_class = new phpbb_groupposition_legend($db, $user); +		$this->assertEquals($excepted_moved, $test_class->move($group_id, $increment)); + +		$result = $db->sql_query('SELECT group_id, group_legend +			FROM ' . GROUPS_TABLE . ' +			ORDER BY group_id ASC'); + +		$this->assertEquals($expected, $db->sql_fetchrowset($result)); +	} +} + diff --git a/tests/groupposition/teampage_test.php b/tests/groupposition/teampage_test.php new file mode 100644 index 0000000000..db26cd09d5 --- /dev/null +++ b/tests/groupposition/teampage_test.php @@ -0,0 +1,641 @@ +<?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/utf/utf_tools.php'; +require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php'; + +class phpbb_groupposition_teampage_test extends phpbb_database_test_case +{ +	public function getDataSet() +	{ +		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/teampage.xml'); +	} + +	public function get_group_value_data() +	{ +		return array( +			array(2, 3, ''), +			array(6, 8, ''), +			array(10, 0, 'phpbb_groupposition_exception'), +		); +	} + +	/** +	* @dataProvider get_group_value_data +	*/ +	public function test_get_group_value($group_id, $expected, $throws_exception) +	{ +		global $cache; + +		$cache = new phpbb_mock_cache; +		$db = $this->new_dbal(); +		$user = new phpbb_user; +		$user->lang = array(); + +		if ($throws_exception) +		{ +			$this->setExpectedException($throws_exception); +		} + +		$test_class = new phpbb_groupposition_teampage($db, $user, $cache); +		$this->assertEquals($expected, $test_class->get_group_value($group_id)); +	} + +	public function test_get_group_count() +	{ +		global $cache; + +		$cache = new phpbb_mock_cache; +		$db = $this->new_dbal(); +		$user = new phpbb_user; +		$user->lang = array(); + +		$test_class = new phpbb_groupposition_teampage($db, $user, $cache); +		$this->assertEquals(8, $test_class->get_group_count()); +	} + +	public function add_group_teampage_data() +	{ +		return array( +			array( +				1, +				2, +				false, +				array( +					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''), +					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'), +					array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'), +					array('teampage_position' => 6, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 7, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''), +				), +			), +			array( +				6, +				2, +				false, +				array( +					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''), +					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'), +					array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'), +					array('teampage_position' => 6, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 7, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''), +				), +			), +			array( +				7, +				2, +				true, +				array( +					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''), +					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'), +					array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 5, 'group_id' => 7, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 6, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'), +					array('teampage_position' => 7, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 8, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 9, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''), +				), +			), +			array( +				7, +				0, +				true, +				array( +					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''), +					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'), +					array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'), +					array('teampage_position' => 6, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 7, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''), +					array('teampage_position' => 9, 'group_id' => 7, 'teampage_parent' => 0, 'teampage_name' => ''), +				), +			), +		); +	} + +	/** +	* @dataProvider add_group_teampage_data +	*/ +	public function test_add_group_teampage($group_id, $parent_id, $expected_added, $expected) +	{ +		global $cache; + +		$cache = new phpbb_mock_cache; +		$db = $this->new_dbal(); +		$user = new phpbb_user; +		$user->lang = array(); + +		$test_class = new phpbb_groupposition_teampage($db, $user, $cache); +		$this->assertEquals($expected_added, $test_class->add_group_teampage($group_id, $parent_id)); + +		$result = $db->sql_query('SELECT teampage_position, group_id, teampage_parent, teampage_name +			FROM ' . TEAMPAGE_TABLE . ' +			ORDER BY teampage_position ASC'); + +		$this->assertEquals($expected, $db->sql_fetchrowset($result)); +	} + +	public function add_category_teampage_data() +	{ +		return array( +			array( +				'new', +				true, +				array( +					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''), +					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'), +					array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'), +					array('teampage_position' => 6, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 7, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''), +					array('teampage_position' => 9, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'new'), +				), +			), +		); +	} + +	/** +	* @dataProvider add_category_teampage_data +	*/ +	public function test_add_category_teampage($group_name, $expected_added, $expected) +	{ +		global $cache; + +		$cache = new phpbb_mock_cache; +		$db = $this->new_dbal(); +		$user = new phpbb_user; +		$user->lang = array(); + +		$test_class = new phpbb_groupposition_teampage($db, $user, $cache); +		$this->assertEquals($expected_added, $test_class->add_category_teampage($group_name)); + +		$result = $db->sql_query('SELECT teampage_position, group_id, teampage_parent, teampage_name +			FROM ' . TEAMPAGE_TABLE . ' +			ORDER BY teampage_position ASC'); + +		$this->assertEquals($expected, $db->sql_fetchrowset($result)); +	} + +	public function delete_group_data() +	{ +		return array( +			array( +				1, +				true, +				array( +					array('teampage_position' => 1, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'), +					array('teampage_position' => 2, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 3, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 4, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'), +					array('teampage_position' => 5, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 6, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 7, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''), +				), +			), +			array( +				2, +				true, +				array( +					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''), +					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'), +					array('teampage_position' => 3, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 4, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'), +					array('teampage_position' => 5, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 6, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 7, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''), +				), +			), +			array( +				6, +				true, +				array( +					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''), +					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'), +					array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'), +					array('teampage_position' => 6, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 7, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''), +				), +			), +		); +	} + +	/** +	* @dataProvider delete_group_data +	*/ +	public function test_delete_group($group_id, $expected_deleted, $expected) +	{ +		global $cache; + +		$cache = new phpbb_mock_cache; +		$db = $this->new_dbal(); +		$user = new phpbb_user; +		$user->lang = array(); + +		$test_class = new phpbb_groupposition_teampage($db, $user, $cache); +		$this->assertEquals($expected_deleted, $test_class->delete_group($group_id, false)); + +		$result = $db->sql_query('SELECT teampage_position, group_id, teampage_parent, teampage_name +			FROM ' . TEAMPAGE_TABLE . ' +			ORDER BY teampage_position ASC'); + +		$this->assertEquals($expected, $db->sql_fetchrowset($result)); +	} + +	public function delete_teampage_data() +	{ +		return array( +			array( +				1, +				true, +				array( +					array('teampage_position' => 1, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'), +					array('teampage_position' => 2, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 3, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 4, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'), +					array('teampage_position' => 5, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 6, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 7, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''), +				), +			), +			array( +				2, +				true, +				array( +					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''), +					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'), +					array('teampage_position' => 3, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 4, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 5, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''), +				), +			), +		); +	} + +	/** +	* @dataProvider delete_teampage_data +	*/ +	public function test_delete_teampage($teampage_id, $expected_deleted, $expected) +	{ +		global $cache; + +		$cache = new phpbb_mock_cache; +		$db = $this->new_dbal(); +		$user = new phpbb_user; +		$user->lang = array(); + +		$test_class = new phpbb_groupposition_teampage($db, $user, $cache); +		$this->assertEquals($expected_deleted, $test_class->delete_teampage($teampage_id, false)); + +		$result = $db->sql_query('SELECT teampage_position, group_id, teampage_parent, teampage_name +			FROM ' . TEAMPAGE_TABLE . ' +			ORDER BY teampage_position ASC'); + +		$this->assertEquals($expected, $db->sql_fetchrowset($result)); +	} + +	public function move_data() +	{ +		return array( +			array( +				1, +				1, +				false, +				array( +					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''), +					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'), +					array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'), +					array('teampage_position' => 6, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 7, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''), +				), +			), +			array( +				2, +				1, +				false, +				array( +					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''), +					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'), +					array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'), +					array('teampage_position' => 6, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 7, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''), +				), +			), +			array( +				5, +				1, +				true, +				array( +					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''), +					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'), +					array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'), +					array('teampage_position' => 6, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 7, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''), +				), +			), +			array( +				6, +				1, +				true, +				array( +					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''), +					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'), +					array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 5, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''), +					array('teampage_position' => 6, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'), +					array('teampage_position' => 7, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 8, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''), +				), +			), +			array( +				1, +				-1, +				true, +				array( +					array('teampage_position' => 1, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'), +					array('teampage_position' => 2, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 3, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 4, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''), +					array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'), +					array('teampage_position' => 6, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 7, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''), +				), +			), +			array( +				2, +				-1, +				true, +				array( +					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''), +					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'), +					array('teampage_position' => 3, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 4, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'), +					array('teampage_position' => 6, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 7, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''), +				), +			), +			array( +				5, +				-1, +				false, +				array( +					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''), +					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'), +					array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'), +					array('teampage_position' => 6, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 7, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''), +				), +			), +			array( +				6, +				-1, +				false, +				array( +					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''), +					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'), +					array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'), +					array('teampage_position' => 6, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 7, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''), +				), +			), +			array( +				6, +				3, +				true, +				array( +					array('teampage_position' => 1, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''), +					array('teampage_position' => 2, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''), +					array('teampage_position' => 3, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'), +					array('teampage_position' => 4, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 5, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 6, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'), +					array('teampage_position' => 7, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 8, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''), +				), +			), +		); +	} + +	/** +	* @dataProvider move_data +	*/ +	public function test_move($group_id, $move_delta, $excepted_moved, $expected) +	{ +		global $cache; + +		$cache = new phpbb_mock_cache; +		$db = $this->new_dbal(); +		$user = new phpbb_user; +		$user->lang = array(); + +		$test_class = new phpbb_groupposition_teampage($db, $user, $cache); +		$this->assertEquals($excepted_moved, $test_class->move($group_id, $move_delta)); + +		$result = $db->sql_query('SELECT teampage_position, group_id, teampage_parent, teampage_name +			FROM ' . TEAMPAGE_TABLE . ' +			ORDER BY teampage_position ASC'); + +		$this->assertEquals($expected, $db->sql_fetchrowset($result)); +	} + +	public function move_teampage_data() +	{ +		return array( +			array( +				1, +				1, +				false, +				array( +					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''), +					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'), +					array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'), +					array('teampage_position' => 6, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 7, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''), +				), +			), +			array( +				2, +				1, +				true, +				array( +					array('teampage_position' => 1, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'), +					array('teampage_position' => 2, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 3, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 4, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''), +					array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'), +					array('teampage_position' => 6, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 7, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''), +				), +			), +			array( +				5, +				1, +				true, +				array( +					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''), +					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'), +					array('teampage_position' => 3, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 4, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'), +					array('teampage_position' => 6, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 7, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''), +				), +			), +			array( +				6, +				1, +				false, +				array( +					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''), +					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'), +					array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'), +					array('teampage_position' => 6, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 7, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''), +				), +			), +			array( +				1, +				-1, +				true, +				array( +					array('teampage_position' => 1, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'), +					array('teampage_position' => 2, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 3, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 4, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''), +					array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'), +					array('teampage_position' => 6, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 7, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''), +				), +			), +			array( +				2, +				-1, +				true, +				array( +					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''), +					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'), +					array('teampage_position' => 3, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 4, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'), +					array('teampage_position' => 6, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 7, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''), +				), +			), +			array( +				5, +				-1, +				true, +				array( +					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''), +					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'), +					array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 5, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''), +					array('teampage_position' => 6, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'), +					array('teampage_position' => 7, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 8, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''), +				), +			), +			array( +				6, +				-1, +				true, +				array( +					array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''), +					array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'), +					array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'), +					array('teampage_position' => 6, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 7, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''), +				), +			), +			array( +				8, +				3, +				true, +				array( +					array('teampage_position' => 1, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''), +					array('teampage_position' => 2, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''), +					array('teampage_position' => 3, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'), +					array('teampage_position' => 4, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 5, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''), +					array('teampage_position' => 6, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'), +					array('teampage_position' => 7, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''), +					array('teampage_position' => 8, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''), +				), +			), +		); +	} + +	/** +	* @dataProvider move_teampage_data +	*/ +	public function test_move_teampage($teampage_id, $move_delta, $excepted_moved, $expected) +	{ +		global $cache; + +		$cache = new phpbb_mock_cache; +		$db = $this->new_dbal(); +		$user = new phpbb_user; +		$user->lang = array(); + +		$test_class = new phpbb_groupposition_teampage($db, $user, $cache); +		$this->assertEquals($excepted_moved, $test_class->move_teampage($teampage_id, $move_delta)); + +		$result = $db->sql_query('SELECT teampage_position, group_id, teampage_parent, teampage_name +			FROM ' . TEAMPAGE_TABLE . ' +			ORDER BY teampage_position ASC'); + +		$this->assertEquals($expected, $db->sql_fetchrowset($result)); +	} +} + diff --git a/tests/lock/db_test.php b/tests/lock/db_test.php new file mode 100644 index 0000000000..de7a23fd05 --- /dev/null +++ b/tests/lock/db_test.php @@ -0,0 +1,97 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2010 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_lock_db_test extends phpbb_database_test_case +{ +	private $db; +	private $config; +	private $lock; + +	public function getDataSet() +	{ +		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/config.xml'); +	} + +	public function setUp() +	{ +		global $db, $config; + +		$db = $this->db = $this->new_dbal(); +		$config = $this->config = new phpbb_config(array('rand_seed' => '', 'rand_seed_last_update' => '0')); +		set_config(null, null, null, $this->config); +		$this->lock = new phpbb_lock_db('test_lock', $this->config, $this->db); +	} + +	public function test_new_lock() +	{ +		$this->assertFalse($this->lock->owns_lock()); + +		$this->assertTrue($this->lock->acquire()); +		$this->assertTrue($this->lock->owns_lock()); +		$this->assertTrue(isset($this->config['test_lock']), 'Lock was created'); + +		$lock2 = new phpbb_lock_db('test_lock', $this->config, $this->db); +		$this->assertFalse($lock2->acquire()); +		$this->assertFalse($lock2->owns_lock()); + +		$this->lock->release(); +		$this->assertFalse($this->lock->owns_lock()); +		$this->assertEquals('0', $this->config['test_lock'], 'Lock was released'); +	} + +	public function test_expire_lock() +	{ +		$lock = new phpbb_lock_db('foo_lock', $this->config, $this->db); +		$this->assertTrue($lock->acquire()); +	} + +	public function test_double_lock() +	{ +		$this->assertFalse($this->lock->owns_lock()); + +		$this->assertTrue($this->lock->acquire()); +		$this->assertTrue($this->lock->owns_lock()); +		$this->assertTrue(isset($this->config['test_lock']), 'Lock was created'); + +		$value = $this->config['test_lock']; + +		$this->assertFalse($this->lock->acquire()); +		$this->assertTrue($this->lock->owns_lock()); +		$this->assertEquals($value, $this->config['test_lock'], 'Second lock failed'); + +		$this->lock->release(); +		$this->assertFalse($this->lock->owns_lock()); +		$this->assertEquals('0', $this->config['test_lock'], 'Lock was released'); +	} + +	public function test_double_unlock() +	{ +		$this->assertTrue($this->lock->acquire()); +		$this->assertTrue($this->lock->owns_lock()); +		$this->assertFalse(empty($this->config['test_lock']), 'First lock is acquired'); + +		$this->lock->release(); +		$this->assertFalse($this->lock->owns_lock()); +		$this->assertEquals('0', $this->config['test_lock'], 'First lock is released'); + +		$lock2 = new phpbb_lock_db('test_lock', $this->config, $this->db); +		$this->assertTrue($lock2->acquire()); +		$this->assertTrue($lock2->owns_lock()); +		$this->assertFalse(empty($this->config['test_lock']), 'Second lock is acquired'); + +		$this->lock->release(); +		$this->assertTrue($lock2->owns_lock()); +		$this->assertFalse(empty($this->config['test_lock']), 'Double release of first lock is ignored'); + +		$lock2->release(); +		$this->assertEquals('0', $this->config['test_lock'], 'Second lock is released'); +	} +} diff --git a/tests/lock/fixtures/config.xml b/tests/lock/fixtures/config.xml new file mode 100644 index 0000000000..f36c8b929a --- /dev/null +++ b/tests/lock/fixtures/config.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<dataset> +	<table name="phpbb_config"> +		<column>config_name</column> +		<column>config_value</column> +		<column>is_dynamic</column> +		<row> +			<value>foo_lock</value> +			<value>1 abcd</value> +			<value>1</value> +		</row> +	</table> +</dataset> diff --git a/tests/lock/flock_test.php b/tests/lock/flock_test.php new file mode 100644 index 0000000000..8f0b866ab3 --- /dev/null +++ b/tests/lock/flock_test.php @@ -0,0 +1,120 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2012 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +class phpbb_lock_flock_test extends phpbb_test_case +{ +	public function test_lock() +	{ +		$path = __DIR__ . '/../tmp/precious'; + +		$lock = new phpbb_lock_flock($path); +		$ok = $lock->acquire(); +		$this->assertTrue($ok); +		$lock->release(); +	} + +	public function test_consecutive_locking() +	{ +		$path = __DIR__ . '/../tmp/precious'; + +		$lock = new phpbb_lock_flock($path); +		$ok = $lock->acquire(); +		$this->assertTrue($ok); +		$this->assertTrue($lock->owns_lock()); +		$lock->release(); +		$this->assertFalse($lock->owns_lock()); + +		$ok = $lock->acquire(); +		$this->assertTrue($ok); +		$this->assertTrue($lock->owns_lock()); +		$lock->release(); +		$this->assertFalse($lock->owns_lock()); + +		$ok = $lock->acquire(); +		$this->assertTrue($ok); +		$this->assertTrue($lock->owns_lock()); +		$lock->release(); +		$this->assertFalse($lock->owns_lock()); +	} + +	/* This hangs the process. +	public function test_concurrent_locking_fail() +	{ +		$path = __DIR__ . '/../tmp/precious'; + +		$lock1 = new phpbb_lock_flock($path); +		$ok = $lock1->acquire(); +		$this->assertTrue($ok); + +		$lock2 = new phpbb_lock_flock($path); +		$ok = $lock2->acquire(); +		$this->assertFalse($ok); + +		$lock->release(); +		$ok = $lock2->acquire(); +		$this->assertTrue($ok); +	} +	*/ + +	public function test_concurrent_locking() +	{ +		if (!function_exists('pcntl_fork')) +		{ +			$this->markTestSkipped('pcntl extension and pcntl_fork are required for this test'); +		} + +		$path = __DIR__ . '/../tmp/precious'; + +		$pid = pcntl_fork(); +		if ($pid) +		{ +			// parent +			// wait 0.5 s, acquire the lock, note how long it took +			sleep(1); + +			$lock = new phpbb_lock_flock($path); +			$start = time(); +			$ok = $lock->acquire(); +			$delta = time() - $start; +			$this->assertTrue($ok); +			$this->assertTrue($lock->owns_lock()); +			$this->assertGreaterThan(0.5, $delta, 'First lock acquired too soon'); + +			$lock->release(); +			$this->assertFalse($lock->owns_lock()); + +			// acquire again, this should be instantaneous +			$start = time(); +			$ok = $lock->acquire(); +			$delta = time() - $start; +			$this->assertTrue($ok); +			$this->assertTrue($lock->owns_lock()); +			$this->assertLessThan(0.1, $delta, 'Second lock not acquired instantaneously'); + +			// reap the child +			$status = null; +			pcntl_waitpid($pid, $status); +		} +		else +		{ +			// child +			// immediately acquire the lock and sleep for 2 s +			$lock = new phpbb_lock_flock($path); +			$ok = $lock->acquire(); +			$this->assertTrue($ok); +			$this->assertTrue($lock->owns_lock()); +			sleep(2); +			$lock->release(); +			$this->assertFalse($lock->owns_lock()); + +			// and go away silently +			pcntl_exec('/usr/bin/env', array('true')); +		} +	} +} diff --git a/tests/log/add_test.php b/tests/log/add_test.php new file mode 100644 index 0000000000..a5f93232f2 --- /dev/null +++ b/tests/log/add_test.php @@ -0,0 +1,88 @@ +<?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.php'; + +class phpbb_log_add_test extends phpbb_database_test_case +{ +	public function getDataSet() +	{ +		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/empty_log.xml'); +	} + +	public function test_log_enabled() +	{ +		global $phpbb_root_path, $phpEx, $db, $phpbb_dispatcher; + +		$db = $this->new_dbal(); +		$cache = new phpbb_mock_cache; +		$phpbb_dispatcher = new phpbb_mock_event_dispatcher(); +		$user = $this->getMock('phpbb_user'); +		$auth = $this->getMock('phpbb_auth'); + +		$log = new phpbb_log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE); + +		$this->assertTrue($log->is_enabled(), 'Initialise failed'); + +		$log->disable(); +		$this->assertFalse($log->is_enabled(), 'Disable all failed'); + +		$log->enable(); +		$this->assertTrue($log->is_enabled(), 'Enable all failed'); + +		$log->disable('admin'); +		$this->assertFalse($log->is_enabled('admin'), 'Disable admin failed'); +		$this->assertTrue($log->is_enabled('user'), 'User should be enabled, is disabled'); +		$this->assertTrue($log->is_enabled(), 'Disable admin disabled all'); + +		$log->enable('admin'); +		$this->assertTrue($log->is_enabled('admin'), 'Enable admin failed'); +	} + +	public function test_log_add() +	{ +		global $phpbb_root_path, $phpEx, $db, $phpbb_dispatcher; + +		$db = $this->new_dbal(); +		$cache = new phpbb_mock_cache; +		$phpbb_dispatcher = new phpbb_mock_event_dispatcher(); +		$user = $this->getMock('phpbb_user'); +		$auth = $this->getMock('phpbb_auth'); + +		$log = new phpbb_log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE); + +		$mode = 'critical'; +		$user_id = ANONYMOUS; +		$log_ip = 'user_ip'; +		$log_time = time(); +		$log_operation = 'LOG_OPERATION'; +		$additional_data = array(); + +		// Add an entry successful +		$this->assertEquals(1, $log->add($mode, $user_id, $log_ip, $log_operation, $log_time)); + +		// Disable logging for all types +		$log->disable(); +		$this->assertFalse($log->add($mode, $user_id, $log_ip, $log_operation, $log_time), 'Disable for all types failed'); +		$log->enable(); + +		// Disable logging for same type +		$log->disable('critical'); +		$this->assertFalse($log->add($mode, $user_id, $log_ip, $log_operation, $log_time), 'Disable for same type failed'); +		$log->enable(); + +		// Disable logging for different type +		$log->disable('admin'); +		$this->assertEquals(2, $log->add($mode, $user_id, $log_ip, $log_operation, $log_time), 'Disable for different types failed'); +		$log->enable(); + +		// Invalid mode specified +		$this->assertFalse($log->add('mode_does_not_exist', $user_id, $log_ip, $log_operation, $log_time)); +	} +} diff --git a/tests/log/fixtures/empty_log.xml b/tests/log/fixtures/empty_log.xml new file mode 100644 index 0000000000..261b6a622a --- /dev/null +++ b/tests/log/fixtures/empty_log.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<dataset> +	<table name="phpbb_log"> +		<column>log_id</column> +		<column>log_type</column> +		<column>user_id</column> +		<column>forum_id</column> +		<column>topic_id</column> +		<column>reportee_id</column> +		<column>log_ip</column> +		<column>log_time</column> +		<column>log_operation</column> +		<column>log_data</column> +	</table> +</dataset> diff --git a/tests/log/fixtures/full_log.xml b/tests/log/fixtures/full_log.xml new file mode 100644 index 0000000000..2ce2643d26 --- /dev/null +++ b/tests/log/fixtures/full_log.xml @@ -0,0 +1,166 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<dataset> +	<table name="phpbb_log"> +		<column>log_id</column> +		<column>log_type</column> +		<column>user_id</column> +		<column>forum_id</column> +		<column>topic_id</column> +		<column>reportee_id</column> +		<column>log_ip</column> +		<column>log_time</column> +		<column>log_operation</column> +		<column>log_data</column> +		<row> +			<value>1</value> +			<value>0</value> +			<value>1</value> +			<value>0</value> +			<value>0</value> +			<value>0</value> +			<value>127.0.0.1</value> +			<value>1</value> +			<value>LOG_INSTALL_INSTALLED</value> +			<value>a:1:{i:0;s:9:"3.1.0-dev";}</value> +		</row> +		<row> +			<value>2</value> +			<value>0</value> +			<value>1</value> +			<value>0</value> +			<value>0</value> +			<value>0</value> +			<value>127.0.0.1</value> +			<value>1</value> +			<value>LOG_KEY_NOT_EXISTS</value> +			<value>a:1:{i:0;s:15:"additional_data";}</value> +		</row> +		<row> +			<value>3</value> +			<value>2</value> +			<value>1</value> +			<value>0</value> +			<value>0</value> +			<value>0</value> +			<value>127.0.0.1</value> +			<value>1</value> +			<value>LOG_CRITICAL</value> +			<value>a:1:{i:0;s:13:"critical data";}</value> +		</row> +		<row> +			<value>4</value> +			<value>1</value> +			<value>1</value> +			<value>12</value> +			<value>34</value> +			<value>0</value> +			<value>127.0.0.1</value> +			<value>1</value> +			<value>LOG_MOD</value> +			<value></value> +		</row> +		<row> +			<value>5</value> +			<value>1</value> +			<value>1</value> +			<value>12</value> +			<value>45</value> +			<value>0</value> +			<value>127.0.0.1</value> +			<value>1</value> +			<value>LOG_MOD</value> +			<value></value> +		</row> +		<row> +			<value>6</value> +			<value>1</value> +			<value>1</value> +			<value>23</value> +			<value>56</value> +			<value>0</value> +			<value>127.0.0.1</value> +			<value>1</value> +			<value>LOG_MOD</value> +			<value></value> +		</row> +		<row> +			<value>7</value> +			<value>1</value> +			<value>1</value> +			<value>12</value> +			<value>45</value> +			<value>0</value> +			<value>127.0.0.1</value> +			<value>1</value> +			<value>LOG_MOD2</value> +			<value></value> +		</row> +		<row> +			<value>8</value> +			<value>3</value> +			<value>1</value> +			<value>0</value> +			<value>0</value> +			<value>2</value> +			<value>127.0.0.1</value> +			<value>1</value> +			<value>LOG_USER</value> +			<value>a:1:{i:0;s:5:"admin";}</value> +		</row> +		<row> +			<value>9</value> +			<value>3</value> +			<value>1</value> +			<value>0</value> +			<value>0</value> +			<value>1</value> +			<value>127.0.0.1</value> +			<value>1</value> +			<value>LOG_USER</value> +			<value>a:1:{i:0;s:5:"guest";}</value> +		</row> +	</table> +	<table name="phpbb_users"> +		<column>user_id</column> +		<column>username</column> +		<column>username_clean</column> +		<column>user_permissions</column> +		<column>user_sig</column> +		<column>user_occ</column> +		<column>user_interests</column> +		<row> +			<value>1</value> +			<value>Anonymous</value> +			<value>Anonymous</value> +			<value></value> +			<value></value> +			<value></value> +			<value></value> +		</row> +		<row> +			<value>2</value> +			<value>admin</value> +			<value>admin</value> +			<value></value> +			<value></value> +			<value></value> +			<value></value> +		</row> +	</table> +	<table name="phpbb_topics"> +		<column>topic_id</column> +		<column>forum_id</column> +		<row> +			<value>34</value> +			<value>12</value> +		</row> +		<row> +			<value>45</value> +			<value>12</value> +		</row> +		<row> +			<value>56</value> +			<value>23</value> +		</row> +	</table> +</dataset> diff --git a/tests/log/function_add_log_test.php b/tests/log/function_add_log_test.php new file mode 100644 index 0000000000..7aa42be6df --- /dev/null +++ b/tests/log/function_add_log_test.php @@ -0,0 +1,193 @@ +<?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.php'; + +class phpbb_log_function_add_log_test extends phpbb_database_test_case +{ +	public function getDataSet() +	{ +		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/empty_log.xml'); +	} + +	public static function add_log_function_data() +	{ +		return array( +			/** +			* Case documentation +			array( +				// Row that is in the database afterwards +				array( +					'user_id'		=> ANONYMOUS, +					'log_type'		=> LOG_MOD, +					'log_operation'	=> 'LOG_MOD_ADDITIONAL', +					// log_data will be serialized +					'log_data'		=> array( +						'argument3', +					), +					'reportee_id'	=> 0, +					'forum_id'		=> 56, +					'topic_id'		=> 78, +				), +				// user_id		Can also be false, then ANONYMOUS is used +				false, +				// log_mode		Used to determine the log_type +				'mod', +				// Followed by some additional arguments +				// forum_id, topic_id and reportee_id are specified before log_operation +				// The rest is specified afterwards. +				56, +				78, +				'LOG_MOD_ADDITIONAL', // log_operation +				'argument3', +			), +			*/ +			array( +				array( +					'user_id'		=> 2, +					'log_type'		=> LOG_CRITICAL, +					'log_operation'	=> 'LOG_NO_ADDITIONAL', +					'log_data'		=> '', +					'reportee_id'	=> 0, +					'forum_id'		=> 0, +					'topic_id'		=> 0, +				), +				2, 'critical', 'LOG_NO_ADDITIONAL', +			), +			array( +				array( +					'user_id'		=> 2, +					'log_type'		=> LOG_CRITICAL, +					'log_operation'	=> 'LOG_ONE_ADDITIONAL', +					'log_data'		=> array( +						'argument1', +					), +					'reportee_id'	=> 0, +					'forum_id'		=> 0, +					'topic_id'		=> 0, +				), +				2, 'critical', 'LOG_ONE_ADDITIONAL', 'argument1', +			), +			array( +				array( +					'user_id'		=> ANONYMOUS, +					'log_type'		=> LOG_ADMIN, +					'log_operation'	=> 'LOG_TWO_ADDITIONAL', +					'log_data'		=> array( +						'argument1', +						'argument2', +					), +					'reportee_id'	=> 0, +					'forum_id'		=> 0, +					'topic_id'		=> 0, +				), +				false, 'admin', 'LOG_TWO_ADDITIONAL', 'argument1', 'argument2', +			), +			array( +				array( +					'user_id'		=> ANONYMOUS, +					'log_type'		=> LOG_USERS, +					'log_operation'	=> 'LOG_USERS_ADDITIONAL', +					'log_data'		=> array( +						'argument2', +					), +					'reportee_id'	=> 2, +					'forum_id'		=> 0, +					'topic_id'		=> 0, +				), +				false, 'user', 2, 'LOG_USERS_ADDITIONAL', 'argument2', +			), +			array( +				array( +					'user_id'		=> ANONYMOUS, +					'log_type'		=> LOG_MOD, +					'log_operation'	=> 'LOG_MOD_TOPIC_AND_FORUM', +					'log_data'		=> '', +					'reportee_id'	=> 0, +					'forum_id'		=> 12, +					'topic_id'		=> 34, +				), +				false, 'mod', 12, 34, 'LOG_MOD_TOPIC_AND_FORUM', +			), +			array( +				array( +					'user_id'		=> ANONYMOUS, +					'log_type'		=> LOG_MOD, +					'log_operation'	=> 'LOG_MOD_ADDITIONAL', +					'log_data'		=> array( +						'argument3', +					), +					'reportee_id'	=> 0, +					'forum_id'		=> 56, +					'topic_id'		=> 78, +				), +				false, 'mod', 56, 78, 'LOG_MOD_ADDITIONAL', 'argument3', +			), +			array( +				array( +				), +				false, 'mode_does_not_exist', 'LOG_MOD_ADDITIONAL', 'argument1', +			), +		); +	} + +	/** +	* @dataProvider add_log_function_data +	*/ +	public function test_add_log_function($expected, $user_id, $mode, $required1, $additional1 = null, $additional2 = null, $additional3 = null) +	{ +		global $db, $cache, $user, $phpbb_log, $phpbb_dispatcher, $phpbb_root_path, $phpEx; + +		if ($expected) +		{ +			// Serialize the log data if we have some +			if (is_array($expected['log_data'])) +			{ +				$expected['log_data'] = serialize($expected['log_data']); +			} +			$expected = array($expected); +		} + +		$db = $this->new_dbal(); +		$cache = new phpbb_mock_cache; +		$phpbb_dispatcher = new phpbb_mock_event_dispatcher(); +		$user = $this->getMock('phpbb_user'); +		$auth = $this->getMock('phpbb_auth'); + +		$phpbb_log = new phpbb_log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE); + +		$user->ip = 'user_ip'; +		if ($user_id) +		{ +			$user->data['user_id'] = $user_id; +		} + +		if ($additional3 != null) +		{ +			add_log($mode, $required1, $additional1, $additional2, $additional3); +		} +		else if ($additional2 != null) +		{ +			add_log($mode, $required1, $additional1, $additional2); +		} +		else if ($additional1 != null) +		{ +			add_log($mode, $required1, $additional1); +		} +		else +		{ +			add_log($mode, $required1); +		} + +		$result = $db->sql_query('SELECT user_id, log_type, log_operation, log_data, reportee_id, forum_id, topic_id +			FROM ' . LOG_TABLE); + +		$this->assertEquals($expected, $db->sql_fetchrowset($result)); +	} +} diff --git a/tests/log/function_view_log_test.php b/tests/log/function_view_log_test.php new file mode 100644 index 0000000000..1ab9488568 --- /dev/null +++ b/tests/log/function_view_log_test.php @@ -0,0 +1,344 @@ +<?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.php'; +require_once dirname(__FILE__) . '/../../phpBB/includes/functions_admin.php'; +require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php'; +require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php'; +require_once dirname(__FILE__) . '/../../phpBB/includes/session.php'; +require_once dirname(__FILE__) . '/../mock/user.php'; +require_once dirname(__FILE__) . '/../mock/cache.php'; + +class phpbb_log_function_view_log_test extends phpbb_database_test_case +{ +	public function getDataSet() +	{ +		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/full_log.xml'); +	} + +	public static function view_log_function_data() +	{ +		global $phpEx, $phpbb_dispatcher; +		$phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + +		$expected_data_sets = array( +			1 => array( +				'id'				=> 1, + +				'reportee_id'			=> 0, +				'reportee_username'		=> '', +				'reportee_username_full'=> '', + +				'user_id'			=> 1, +				'username'			=> 'Anonymous', +				'username_full'		=> 'Anonymous', + +				'ip'				=> '127.0.0.1', +				'time'				=> 1, +				'forum_id'			=> 0, +				'topic_id'			=> 0, + +				'viewforum'			=> '', +				'action'			=> 'installed: 3.1.0-dev', +			), +			2 => array( +				'id'				=> 2, + +				'reportee_id'			=> 0, +				'reportee_username'		=> '', +				'reportee_username_full'=> '', + +				'user_id'			=> 1, +				'username'			=> 'Anonymous', +				'username_full'		=> 'Anonymous', + +				'ip'				=> '127.0.0.1', +				'time'				=> 1, +				'forum_id'			=> 0, +				'topic_id'			=> 0, + +				'viewforum'			=> '', +				'action'			=> '{LOG KEY NOT EXISTS}<br />additional_data', +			), +			3 => array( +				'id'				=> 3, + +				'reportee_id'			=> 0, +				'reportee_username'		=> '', +				'reportee_username_full'=> '', + +				'user_id'			=> 1, +				'username'			=> 'Anonymous', +				'username_full'		=> 'Anonymous', + +				'ip'				=> '127.0.0.1', +				'time'				=> 1, +				'forum_id'			=> 0, +				'topic_id'			=> 0, + +				'viewforum'			=> '', +				'action'			=> '{LOG CRITICAL}<br />critical data', +			), +			4 => array( +				'id'				=> 4, + +				'reportee_id'			=> 0, +				'reportee_username'		=> '', +				'reportee_username_full'=> '', + +				'user_id'			=> 1, +				'username'			=> 'Anonymous', +				'username_full'		=> 'Anonymous', + +				'ip'				=> '127.0.0.1', +				'time'				=> 1, +				'forum_id'			=> 12, +				'topic_id'			=> 34, + +				'viewforum'			=> '', +				'action'			=> '{LOG MOD}', +				'viewtopic'			=> '', +				'viewlogs'			=> '', +			), +			5 => array( +				'id'				=> 5, + +				'reportee_id'			=> 0, +				'reportee_username'		=> '', +				'reportee_username_full'=> '', + +				'user_id'			=> 1, +				'username'			=> 'Anonymous', +				'username_full'		=> 'Anonymous', + +				'ip'				=> '127.0.0.1', +				'time'				=> 1, +				'forum_id'			=> 12, +				'topic_id'			=> 45, + +				'viewforum'			=> '', +				'action'			=> '{LOG MOD}', +				'viewtopic'			=> '', +				'viewlogs'			=> '', +			), +			6 => array( +				'id'				=> 6, + +				'reportee_id'			=> 0, +				'reportee_username'		=> '', +				'reportee_username_full'=> '', + +				'user_id'			=> 1, +				'username'			=> 'Anonymous', +				'username_full'		=> 'Anonymous', + +				'ip'				=> '127.0.0.1', +				'time'				=> 1, +				'forum_id'			=> 23, +				'topic_id'			=> 56, + +				'viewforum'			=> append_sid("phpBB/viewforum.$phpEx", 'f=23'), +				'action'			=> '{LOG MOD}', +				'viewtopic'			=> append_sid("phpBB/viewtopic.$phpEx", 'f=23&t=56'), +				'viewlogs'			=> append_sid("phpBB/mcp.$phpEx", 'i=logs&mode=topic_logs&t=56'), +			), +			7 => array( +				'id'				=> 7, + +				'reportee_id'			=> 0, +				'reportee_username'		=> '', +				'reportee_username_full'=> '', + +				'user_id'			=> 1, +				'username'			=> 'Anonymous', +				'username_full'		=> 'Anonymous', + +				'ip'				=> '127.0.0.1', +				'time'				=> 1, +				'forum_id'			=> 12, +				'topic_id'			=> 45, + +				'viewforum'			=> '', +				'action'			=> '{LOG MOD2}', +				'viewtopic'			=> '', +				'viewlogs'			=> '', +			), +			8 => array( +				'id'				=> 8, + +				'reportee_id'			=> 2, +				'reportee_username'		=> 'admin', +				'reportee_username_full'=> 'admin', + +				'user_id'			=> 1, +				'username'			=> 'Anonymous', +				'username_full'		=> 'Anonymous', + +				'ip'				=> '127.0.0.1', +				'time'				=> 1, +				'forum_id'			=> 0, +				'topic_id'			=> 0, + +				'viewforum'			=> '', +				'action'			=> '{LOG USER}<br />admin', +			), +			9 => array( +				'id'				=> 9, + +				'reportee_id'			=> 1, +				'reportee_username'		=> 'Anonymous', +				'reportee_username_full'=> 'Anonymous', + +				'user_id'			=> 1, +				'username'			=> 'Anonymous', +				'username_full'		=> 'Anonymous', + +				'ip'				=> '127.0.0.1', +				'time'				=> 1, +				'forum_id'			=> 0, +				'topic_id'			=> 0, + +				'viewforum'			=> '', +				'action'			=> '{LOG USER}<br />guest', +			), +		); + +		$test_cases = array( +			/** +			* Case documentation +			array( +				// Array of datasets that should be in $log after running the function +				'expected'			=> array(5, 7), +				// Offset that will be returned from the function +				'expected_returned'	=> 0, +				// view_log parameters (see includes/functions_admin.php for docblock) +				// $log is ommited! +				'mod', 5, 0, 12, 45, +			), +			*/ +			array( +				'expected'			=> array(1, 2), +				'expected_returned'	=> 0, +				'admin', false, +			), +			array( +				'expected'			=> array(1), +				'expected_returned'	=> 0, +				'admin', false, 1, +			), +			array( +				'expected'			=> array(2), +				'expected_returned'	=> 1, +				'admin', false, 1, 1, +			), +			array( +				'expected'			=> array(2), +				'expected_returned'	=> 1, +				'admin', 0, 1, 1, +			), +			array( +				'expected'			=> array(2), +				'expected_returned'	=> 1, +				'admin', 0, 1, 5, +			), +			array( +				'expected'			=> array(3), +				'expected_returned'	=> 0, +				'critical', false, +			), +			array( +				'expected'			=> array(), +				'expected_returned'	=> null, +				'mode_does_not_exist', false, +			), +			array( +				'expected'			=> array(4, 5, 7), +				'expected_returned'	=> 0, +				'mod', 0, 5, 0, 12, +			), +			array( +				'expected'			=> array(5, 7), +				'expected_returned'	=> 0, +				'mod', 0, 5, 0, 12, 45, +			), +			array( +				'expected'			=> array(6), +				'expected_returned'	=> 0, +				'mod', 0, 5, 0, 23, +			), +			array( +				'expected'			=> array(8), +				'expected_returned'	=> 0, +				'user', 0, 5, 0, 0, 0, 2, +			), +			array( +				'expected'			=> array(8, 9), +				'expected_returned'	=> 0, +				'users', 0, +			), +		); + +		foreach ($test_cases as $case => $case_data) +		{ +			foreach ($case_data['expected'] as $data_set => $expected) +			{ +				$test_cases[$case]['expected'][$data_set] = $expected_data_sets[$expected]; +			} +		} + +		return $test_cases; +	} + +	/** +	* @dataProvider view_log_function_data +	*/ +	public function test_view_log_function($expected, $expected_returned, $mode, $log_count, $limit = 5, $offset = 0, $forum_id = 0, $topic_id = 0, $user_id = 0, $limit_days = 0, $sort_by = 'l.log_id ASC', $keywords = '') +	{ +		global $cache, $db, $user, $auth, $phpbb_log, $phpbb_dispatcher, $phpbb_root_path, $phpEx; + +		$db = $this->new_dbal(); +		$cache = new phpbb_mock_cache; +		$phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + +		// Create auth mock +		$auth = $this->getMock('phpbb_auth'); +		$acl_get_map = array( +			array('f_read', 23, true), +			array('m_', 23, true), +		); +		$acl_gets_map = array( +			array('a_', 'm_', 23, true), +		); + +		$auth->expects($this->any()) +			->method('acl_get') +			->with($this->stringContains('_'), +				$this->anything()) +			->will($this->returnValueMap($acl_get_map)); +		$auth->expects($this->any()) +			->method('acl_gets') +			->with($this->stringContains('_'), +				$this->anything()) +			->will($this->returnValueMap($acl_gets_map)); + +		$user = new phpbb_mock_user; +		$user->optionset('viewcensors', false); +		// Test sprintf() of the data into the action +		$user->lang = array( +			'LOG_INSTALL_INSTALLED'		=> 'installed: %s', +		); + +		$phpbb_log = new phpbb_log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE); + +		$log = array(); +		$this->assertEquals($expected_returned, view_log($mode, $log, $log_count, $limit, $offset, $forum_id, $topic_id, $user_id, $limit_days, $sort_by, $keywords)); + +		$this->assertEquals($expected, $log); +	} +} diff --git a/tests/mock/cache.php b/tests/mock/cache.php index acf4288319..440592665a 100644 --- a/tests/mock/cache.php +++ b/tests/mock/cache.php @@ -2,21 +2,18 @@  /**  *  * @package testing -* @copyright (c) 2008 phpBB Group +* @copyright (c) 2011 phpBB Group  * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2  *  */ -class phpbb_mock_cache +class phpbb_mock_cache implements phpbb_cache_driver_interface  { +	protected $data; +  	public function __construct($data = array())  	{  		$this->data = $data; - -		if (!isset($this->data['_bots'])) -		{ -			$this->data['_bots'] = array(); -		}  	}  	public function get($var_name) @@ -34,24 +31,6 @@ class phpbb_mock_cache  		$this->data[$var_name] = $var;  	} -	public function destroy($var_name, $table = '') -	{ -		if ($table) -		{ -			throw new Exception('Destroying tables is not implemented yet'); -		} - -		unset($this->data[$var_name]); -	} - -	/** -	* Obtain active bots -	*/ -	public function obtain_bots() -	{ -		return $this->data['_bots']; -	} -  	/**  	 * Obtain list of word censors. We don't need to parse them here,  	 * that is tested elsewhere. @@ -89,17 +68,32 @@ class phpbb_mock_cache  		}  	} -	public function set_bots($bots) +	public function checkVar(PHPUnit_Framework_Assert $test, $var_name, $data)  	{ -		$this->data['_bots'] = $bots; +		$test->assertTrue(isset($this->data[$var_name])); +		$test->assertEquals($data, $this->data[$var_name]);  	} -	public function checkVar(PHPUnit_Framework_Assert $test, $var_name, $data) +	public function checkAssociativeVar(PHPUnit_Framework_Assert $test, $var_name, $data, $sort = true)  	{  		$test->assertTrue(isset($this->data[$var_name])); + +		if ($sort) +		{ +			foreach ($this->data[$var_name] as &$content) +			{ +				sort($content); +			} +		} +  		$test->assertEquals($data, $this->data[$var_name]);  	} +	public function checkVarUnset(PHPUnit_Framework_Assert $test, $var_name) +	{ +		$test->assertFalse(isset($this->data[$var_name])); +	} +  	public function check(PHPUnit_Framework_Assert $test, $data, $ignore_db_info = true)  	{  		$cache_data = $this->data; @@ -116,5 +110,58 @@ class phpbb_mock_cache  		$test->assertEquals($data, $cache_data);  	} -} +	function load() +	{ +	} +	function unload() +	{ +	} +	function save() +	{ +	} +	function tidy() +	{ +	} +	function purge() +	{ +	} +	function destroy($var_name, $table = '') +	{ +		unset($this->data[$var_name]); +	} +	public function _exists($var_name) +	{ +	} +	public function sql_load($query) +	{ +	} + +	/** +	* {@inheritDoc} +	*/ +	public function sql_save(phpbb_db_driver $db, $query, $query_result, $ttl) +	{ +		return $query_result; +	} +	public function sql_exists($query_id) +	{ +	} +	public function sql_fetchrow($query_id) +	{ +	} +	public function sql_fetchfield($query_id, $field) +	{ +	} +	public function sql_rowseek($rownum, $query_id) +	{ +	} +	public function sql_freeresult($query_id) +	{ +	} + +	public function obtain_bots() +	{ +		return isset($this->data['_bots']) ? $this->data['_bots'] : array(); +	} +} diff --git a/tests/mock/container_builder.php b/tests/mock/container_builder.php new file mode 100644 index 0000000000..734d3e1741 --- /dev/null +++ b/tests/mock/container_builder.php @@ -0,0 +1,179 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2012 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ +use Symfony\Component\DependencyInjection\ContainerInterface; +use Symfony\Component\DependencyInjection\ScopeInterface; + +class phpbb_mock_container_builder implements ContainerInterface +{ +	protected $services = array(); +	protected $parameters = array(); + +	/** +	* Sets a service. +	* +	* @param string $id      The service identifier +	* @param object $service The service instance +	* @param string $scope   The scope of the service +	* +	* @api +	*/ +	public function set($id, $service, $scope = self::SCOPE_CONTAINER) +	{ +		$this->services[$id] = $service; +	} + +	/** +	* Gets a service. +	* +	* @param string $id              The service identifier +	* @param int    $invalidBehavior The behavior when the service does not exist +	* +	* @return object The associated service +	* +	* @throws InvalidArgumentException if the service is not defined +	* @throws ServiceCircularReferenceException When a circular reference is detected +	* @throws ServiceNotFoundException When the service is not defined +	* +	* @see Reference +	* +	* @api +	*/ +	public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE) +	{ +		if ($this->has($id)) +		{ +			return $this->services[$id]; +		} + +		throw new Exception('Could not find service: ' . $id); +	} + +	/** +	* Returns true if the given service is defined. +	* +	* @param string $id The service identifier +	* +	* @return Boolean true if the service is defined, false otherwise +	* +	* @api +	*/ +	public function has($id) +	{ +		return isset($this->services[$id]); +	} + +	/** +	* Gets a parameter. +	* +	* @param string $name The parameter name +	* +	* @return mixed  The parameter value +	* +	* @throws InvalidArgumentException if the parameter is not defined +	* +	* @api +	*/ +	public function getParameter($name) +	{ +		if ($this->hasParameter($name)) +		{ +			return $this->parameters[$name]; +		} + +		throw new Exception('Could not find parameter: ' . $name); +	} + +	/** +	* Checks if a parameter exists. +	* +	* @param string $name The parameter name +	* +	* @return Boolean The presence of parameter in container +	* +	* @api +	*/ +	public function hasParameter($name) +	{ +		return isset($this->parameters[$name]); +	} + +	/** +	* Sets a parameter. +	* +	* @param string $name  The parameter name +	* @param mixed  $value The parameter value +	* +	* @api +	*/ +	public function setParameter($name, $value) +	{ +		$this->parameters[$name] = $value; +	} + +	/** +	* Enters the given scope +	* +	* @param string $name +	* +	* @api +	*/ +	public function enterScope($name) +	{ +	} + +	/** +	* Leaves the current scope, and re-enters the parent scope +	* +	* @param string $name +	* +	* @api +	*/ +	public function leaveScope($name) +	{ +	} + +	/** +	* Adds a scope to the container +	* +	* @param ScopeInterface $scope +	* +	* @api +	*/ +	public function addScope(ScopeInterface $scope) +	{ +	} + +	/** +	* Whether this container has the given scope +	* +	* @param string $name +	* +	* @return Boolean +	* +	* @api +	*/ +	public function hasScope($name) +	{ +	} + +	/** +	* Determines whether the given scope is currently active. +	* +	* It does however not check if the scope actually exists. +	* +	* @param string $name +	* +	* @return Boolean +	* +	* @api +	*/ +	public function isScopeActive($name) +	{ +	} +} diff --git a/tests/mock/event_dispatcher.php b/tests/mock/event_dispatcher.php new file mode 100644 index 0000000000..8887b16163 --- /dev/null +++ b/tests/mock/event_dispatcher.php @@ -0,0 +1,16 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2012 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +class phpbb_mock_event_dispatcher +{ +	public function trigger_event($eventName, $data) +	{ +		return array(); +	} +} diff --git a/tests/mock/extension_manager.php b/tests/mock/extension_manager.php new file mode 100644 index 0000000000..10b3595206 --- /dev/null +++ b/tests/mock/extension_manager.php @@ -0,0 +1,19 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2011 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +class phpbb_mock_extension_manager extends phpbb_extension_manager +{ +	public function __construct($phpbb_root_path, $extensions = array()) +	{ +		$this->phpbb_root_path = $phpbb_root_path; +		$this->php_ext = 'php'; +		$this->extensions = $extensions; +		$this->filesystem = new phpbb_filesystem(); +	} +} diff --git a/tests/mock/filespec.php b/tests/mock/filespec.php new file mode 100644 index 0000000000..9d2a5c84de --- /dev/null +++ b/tests/mock/filespec.php @@ -0,0 +1,32 @@ +<?php +/** + * + * @package testing + * @copyright (c) 2012 phpBB Group + * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 + * + */ + +/** + * Mock filespec class with some basic values to help with testing the + * fileupload class + */ +class phpbb_mock_filespec +{ +	public $filesize; +	public $realname; +	public $extension; +	public $width; +	public $height; +	public $error = array(); + +	public function check_content($disallowed_content) +	{ +		return true; +	} + +	public function get($property) +	{ +		return $this->$property; +	} +} diff --git a/tests/mock/filesystem_extension_manager.php b/tests/mock/filesystem_extension_manager.php new file mode 100644 index 0000000000..c5a51bbb3f --- /dev/null +++ b/tests/mock/filesystem_extension_manager.php @@ -0,0 +1,32 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2012 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +class phpbb_mock_filesystem_extension_manager extends phpbb_mock_extension_manager +{ +	public function __construct($phpbb_root_path) +	{ +		$extensions = array(); +		$iterator = new DirectoryIterator($phpbb_root_path . 'ext/'); +		foreach ($iterator as $fileinfo) +		{ +			if ($fileinfo->isDir() && substr($fileinfo->getFilename(), 0, 1) != '.') +			{ +				$name = $fileinfo->getFilename(); +				$extension = array( +					'ext_name' => $name, +					'ext_active' => true, +					'ext_path' => 'ext/' . $name . '/', +				); +				$extensions[$name] = $extension; +			} +		} +		ksort($extensions); +		parent::__construct($phpbb_root_path, $extensions); +	} +} diff --git a/tests/mock/fileupload.php b/tests/mock/fileupload.php new file mode 100644 index 0000000000..cbcbf4a6ab --- /dev/null +++ b/tests/mock/fileupload.php @@ -0,0 +1,23 @@ +<?php +/** + * + * @package testing + * @copyright (c) 2012 phpBB Group + * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 + * + */ + +/** + * Mock fileupload class with some basic values to help with testing the + * filespec class + */ +class phpbb_mock_fileupload +{ +	public $max_filesize = 100; +	public $error_prefix = ''; + +	public function valid_dimensions($filespec) +	{ +		return true; +	} +} diff --git a/tests/mock/lang.php b/tests/mock/lang.php new file mode 100644 index 0000000000..ac814b45db --- /dev/null +++ b/tests/mock/lang.php @@ -0,0 +1,38 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2010 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +/** +* phpbb_mock_lang +* mock a user with some language-keys specified +*/ +class phpbb_mock_lang implements ArrayAccess +{ +	public function offsetExists($offset) +	{ +		return true; +	} + +	public function offsetGet($offset) +	{ +		return $offset; +	} + +	public function offsetSet($offset, $value) +	{ +	} + +	public function offsetUnset($offset) +	{ +	} + +	public function lang() +	{ +		return implode(' ', func_get_args()); +	} +} diff --git a/tests/mock/metadata_manager.php b/tests/mock/metadata_manager.php new file mode 100644 index 0000000000..a7fbf0681c --- /dev/null +++ b/tests/mock/metadata_manager.php @@ -0,0 +1,21 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +class phpbb_mock_metadata_manager extends phpbb_extension_metadata_manager +{ +	public function set_metadata($metadata) +	{ +		$this->metadata = $metadata; +	} + +	public function merge_metadata($metadata) +	{ +		$this->metadata = array_merge($this->metadata, $metadata); +	} +} diff --git a/tests/mock/notification_manager.php b/tests/mock/notification_manager.php new file mode 100644 index 0000000000..47fe30730f --- /dev/null +++ b/tests/mock/notification_manager.php @@ -0,0 +1,94 @@ +<?php +/** +* +* @package notifications +* @copyright (c) 2012 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +/** +* @ignore +*/ +if (!defined('IN_PHPBB')) +{ +	exit; +} + +/** +* Notifications service class +* @package notifications +*/ +class phpbb_mock_notification_manager +{ +	public function load_notifications() +	{ +		return array( +			'notifications'		=> array(), +			'unread_count'		=> 0, +		); +	} + +	public function mark_notifications_read() +	{ +	} + +	public function mark_notifications_read_by_parent() +	{ +	} + +	public function mark_notifications_read_by_id() +	{ +	} + + +	public function add_notifications() +	{ +		return array(); +	} + +	public function add_notifications_for_users() +	{ +	} + +	public function update_notifications() +	{ +	} + +	public function delete_notifications() +	{ +	} + +	public function get_subscription_types() +	{ +		return array(); +	} + +	public function get_subscription_methods() +	{ +		return array(); +	} + + +	public function get_global_subscriptions() +	{ +		return array(); +	} + +	public function add_subscription() +	{ +	} + +	public function delete_subscription() +	{ +	} + +	public function load_users() +	{ +	} + +	public function get_user() +	{ +		return null; +	} +} diff --git a/tests/mock/notifications_auth.php b/tests/mock/notifications_auth.php new file mode 100644 index 0000000000..d960acb81a --- /dev/null +++ b/tests/mock/notifications_auth.php @@ -0,0 +1,40 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2012 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +class phpbb_mock_notifications_auth extends phpbb_auth +{ +	function acl_get_list($user_id = false, $opts = false, $forum_id = false) +	{ +		$user_id = (!is_array($user_id)) ? array($user_id) : $user_id; +		$opts = (!is_array($opts)) ? array($opts) : $opts; +		$forum_id = (!is_array($forum_id)) ? array($forum_id) : $forum_id; + +		$auth_list = array(); + +		foreach ($forum_id as $fid) +		{ +			foreach ($opts as $opt) +			{ +				$auth_list[$fid][$opt] = array(); + +				foreach ($user_id as $uid) +				{ +					$auth_list[$fid][$opt][] = $uid; +				} +			} +		} + +		return $auth_list; +	} + +	function acl_get($opt, $f = 0) +	{ +		return true; +	} +} diff --git a/tests/mock/null_cache.php b/tests/mock/null_cache.php index aca20ca77b..7bd33b441b 100644 --- a/tests/mock/null_cache.php +++ b/tests/mock/null_cache.php @@ -39,4 +39,9 @@ class phpbb_mock_null_cache  	public function set_bots($bots)  	{  	} + +	public function sql_exists($query_id) +	{ +		return false; +	}  } diff --git a/tests/mock/request.php b/tests/mock/request.php new file mode 100644 index 0000000000..2a272fc03b --- /dev/null +++ b/tests/mock/request.php @@ -0,0 +1,89 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2011 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +class phpbb_mock_request implements phpbb_request_interface +{ +	protected $data; + +	public function __construct($get = array(), $post = array(), $cookie = array(), $server = array(), $request = false, $files = array()) +	{ +		$this->data[phpbb_request_interface::GET] = $get; +		$this->data[phpbb_request_interface::POST] = $post; +		$this->data[phpbb_request_interface::COOKIE] = $cookie; +		$this->data[phpbb_request_interface::REQUEST] = ($request === false) ? $post + $get : $request; +		$this->data[phpbb_request_interface::SERVER] = $server; +		$this->data[phpbb_request_interface::FILES] = $files; +	} + +	public function overwrite($var_name, $value, $super_global = phpbb_request_interface::REQUEST) +	{ +		$this->data[$super_global][$var_name] = $value; +	} + +	public function variable($var_name, $default, $multibyte = false, $super_global = phpbb_request_interface::REQUEST) +	{ +		return isset($this->data[$super_global][$var_name]) ? $this->data[$super_global][$var_name] : $default; +	} + +	public function server($var_name, $default = '') +	{ +		$super_global = phpbb_request_interface::SERVER; +		return isset($this->data[$super_global][$var_name]) ? $this->data[$super_global][$var_name] : $default; +	} + +	public function header($header_name, $default = '') +	{ +		$var_name = 'HTTP_' . str_replace('-', '_', strtoupper($header_name)); +		return $this->server($var_name, $default); +	} + +	public function file($form_name) +	{ +		$super_global = phpbb_request_interface::FILES; +		return isset($this->data[$super_global][$form_name]) ? $this->data[$super_global][$form_name] : array(); +	} + +	public function is_set_post($name) +	{ +		return $this->is_set($name, phpbb_request_interface::POST); +	} + +	public function is_set($var, $super_global = phpbb_request_interface::REQUEST) +	{ +		return isset($this->data[$super_global][$var]); +	} + +	public function is_ajax() +	{ +		return false; +	} + +	public function is_secure() +	{ +		return false; +	} + +	public function variable_names($super_global = phpbb_request_interface::REQUEST) +	{ +		return array_keys($this->data[$super_global]); +	} + +	/* custom methods */ + +	public function set_header($header_name, $value) +	{ +		$var_name = 'HTTP_' . str_replace('-', '_', strtoupper($header_name)); +		$this->data[phpbb_request_interface::SERVER][$var_name] = $value; +	} + +	public function merge($super_global = phpbb_request_interface::REQUEST, $values) +	{ +		$this->data[$super_global] = array_merge($this->data[$super_global], $values); +	} +} diff --git a/tests/mock/session_testable.php b/tests/mock/session_testable.php index 70a58fb6cc..56ff8c8b32 100644 --- a/tests/mock/session_testable.php +++ b/tests/mock/session_testable.php @@ -8,7 +8,6 @@  */  require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; -require_once dirname(__FILE__) . '/../../phpBB/includes/session.php';  /**  * Extends the session class to overwrite the setting of cookies. @@ -17,7 +16,7 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/session.php';  * test it without warnings about sent headers. This class only stores cookie  * data for later verification.  */ -class phpbb_mock_session_testable extends session +class phpbb_mock_session_testable extends phpbb_session  {  	private $_cookies = array(); diff --git a/tests/network/inet_ntop_pton_test.php b/tests/network/inet_ntop_pton_test.php new file mode 100644 index 0000000000..a59c2103bd --- /dev/null +++ b/tests/network/inet_ntop_pton_test.php @@ -0,0 +1,54 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2010 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_network_inet_ntop_pton_test extends phpbb_test_case +{ +	public function data_provider() +	{ +		return array( +			array('127.0.0.1',						'7f000001'), +			array('192.232.131.223',				'c0e883df'), +			array('13.1.68.3',						'0d014403'), +			array('129.144.52.38',					'81903426'), + +			array('2001:280:0:10::5',				'20010280000000100000000000000005'), +			array('fe80::200:4cff:fefe:172f',		'fe8000000000000002004cfffefe172f'), + +			array('::',								'00000000000000000000000000000000'), +			array('::1',							'00000000000000000000000000000001'), +			array('1::',							'00010000000000000000000000000000'), + +			array('1:1:0:0:1::',					'00010001000000000001000000000000'), + +			array('0:2:3:4:5:6:7:8',				'00000002000300040005000600070008'), +			array('1:2:0:4:5:6:7:8',				'00010002000000040005000600070008'), +			array('1:2:3:4:5:6:7:0',				'00010002000300040005000600070000'), + +			array('2001:0:0:1::1',					'20010000000000010000000000000001'), +		); +	} + +	/** +	* @dataProvider data_provider +	*/ +	public function test_inet_ntop($address, $hex) +	{ +		$this->assertEquals($address, phpbb_inet_ntop(pack('H*', $hex))); +	} + +	/** +	* @dataProvider data_provider +	*/ +	public function test_inet_pton($address, $hex) +	{ +		$this->assertEquals($hex, bin2hex(phpbb_inet_pton($address))); +	} +} diff --git a/tests/network/ip_normalise_test.php b/tests/network/ip_normalise_test.php new file mode 100644 index 0000000000..28059f376a --- /dev/null +++ b/tests/network/ip_normalise_test.php @@ -0,0 +1,64 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2010 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_network_ip_normalise_test extends phpbb_test_case +{ +	public function data_provider() +	{ +		return array( +			// From: A Recommendation for IPv6 Address Text Representation +			// http://tools.ietf.org/html/draft-ietf-6man-text-addr-representation-07 + +			// Section 4: A Recommendation for IPv6 Text Representation +			// Section 4.1: Handling Leading Zeros in a 16 Bit Field +			array('2001:0db8::0001', '2001:db8::1'), + +			// Section 4.2: "::" Usage +			// Section 4.2.1: Shorten As Much As Possible +			array('2001:db8::0:1', '2001:db8::1'), + +			// Section 4.2.2: Handling One 16 Bit 0 Field +			array('2001:db8::1:1:1:1:1', '2001:db8:0:1:1:1:1:1'), + +			// Section 4.2.3: Choice in Placement of "::" +			array('2001:db8:0:0:1:0:0:1', '2001:db8::1:0:0:1'), + +			// Section 4.3: Lower Case +			array('2001:DB8::1', '2001:db8::1'), + +			// Section 5: Text Representation of Special Addresses +			// We want to show IPv4-mapped addresses as plain IPv4 addresses, though. +			array('::ffff:192.168.0.1',			'192.168.0.1'), +			array('0000::0000:ffff:c000:0280',	'192.0.2.128'), + +			// IPv6 addresses with the last 32-bit written in dotted-quad notation +			// should be converted to hex-only IPv6 addresses. +			array('2001:db8::192.0.2.128', '2001:db8::c000:280'), + +			// Any string not passing the IPv4 or IPv6 regular expression +			// is supposed to result in false being returned. +			// Valid and invalid IP addresses are tested in  +			// tests/regex/ipv4.php and tests/regex/ipv6.php. +			array('', false), +			array('192.168.1.256', false), +			array('::ffff:192.168.255.256', false), +			array('::1111:2222:3333:4444:5555:6666::', false), +		); +	} + +	/** +	* @dataProvider data_provider +	*/ +	public function test_ip_normalise($ip_address, $expected) +	{ +		$this->assertEquals($expected, phpbb_ip_normalise($ip_address)); +	} +} diff --git a/tests/notification/ext/test/notification/type/test.php b/tests/notification/ext/test/notification/type/test.php new file mode 100644 index 0000000000..0d0c584e0d --- /dev/null +++ b/tests/notification/ext/test/notification/type/test.php @@ -0,0 +1,85 @@ +<?php +/** +* +* @package notifications +* @copyright (c) 2012 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +/** +* @ignore +*/ +if (!defined('IN_PHPBB')) +{ +	exit; +} + +class phpbb_notification_type_test extends phpbb_notification_type_base +{ +	public function get_type() +	{ +		return 'test'; +	} + +	public static function get_item_id($post) +	{ +		return (int) $post['post_id']; +	} + +	public static function get_item_parent_id($post) +	{ +		return (int) $post['topic_id']; +	} + +	public function find_users_for_notification($post, $options = array()) +	{ +		return $this->check_user_notification_options(array(0), $options); +	} + +	public function create_insert_array($post, $pre_create_data = array()) +	{ +		$this->notification_time = $post['post_time']; + +		return parent::create_insert_array($post, $pre_create_data); +	} + +	public function create_update_array($type_data) +	{ +		$data = $this->create_insert_array($type_data); + +		// Unset data unique to each row +		unset( +			$data['notification_id'], +			$data['notification_read'], +			$data['user_id'] +		); + +		return $data; +	} + +	public function get_title() +	{ +		return 'test title'; +	} + +	public function users_to_query() +	{ +		return array(); +	} + +	public function get_url() +	{ +		return ''; +	} + +	public function get_email_template() +	{ +		return false; +	} + +	public function get_email_template_variables() +	{ +		return array(); +	} +} diff --git a/tests/notification/fixtures/notification.xml b/tests/notification/fixtures/notification.xml new file mode 100644 index 0000000000..c7b2d03ff1 --- /dev/null +++ b/tests/notification/fixtures/notification.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<dataset> +	<table name="phpbb_bookmarks"> +	</table> +	<table name="phpbb_notifications"> +	</table> +	<table name="phpbb_notification_types"> +	</table> +	<table name="phpbb_topics_watch"> +	</table> +	<table name="phpbb_user_notifications"> +	</table> +</dataset> diff --git a/tests/notification/fixtures/submit_post_bookmark.xml b/tests/notification/fixtures/submit_post_bookmark.xml new file mode 100644 index 0000000000..d4bf8df73f --- /dev/null +++ b/tests/notification/fixtures/submit_post_bookmark.xml @@ -0,0 +1,175 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<dataset> +	<table name="phpbb_bookmarks"> +		<column>topic_id</column> +		<column>user_id</column> +		<row> +			<value>1</value> +			<value>2</value> +		</row> +		<row> +			<value>1</value> +			<value>3</value> +		</row> +		<row> +			<value>1</value> +			<value>4</value> +		</row> +		<row> +			<value>1</value> +			<value>5</value> +		</row> +		<row> +			<value>1</value> +			<value>6</value> +		</row> +		<row> +			<value>1</value> +			<value>7</value> +		</row> +	</table> +	<table name="phpbb_notifications"> +		<column>notification_type_id</column> +		<column>user_id</column> +		<column>item_id</column> +		<column>item_parent_id</column> +		<column>notification_read</column> +		<column>notification_data</column> +		<row> +			<value>1</value> +			<value>5</value> +			<value>1</value> +			<value>1</value> +			<value>0</value> +			<value></value> +		</row> +	</table> +	<table name="phpbb_notification_types"> +		<column>notification_type_id</column> +		<column>notification_type_name</column> +		<column>notification_type_enabled</column> +		<row> +			<value>1</value> +			<value>bookmark</value> +			<value>1</value> +		</row> +	</table> +	<table name="phpbb_posts"> +		<column>post_id</column> +		<column>topic_id</column> +		<column>forum_id</column> +		<column>post_text</column> +		<row> +			<value>1</value> +			<value>1</value> +			<value>1</value> +			<value></value> +		</row> +	</table> +	<table name="phpbb_topics"> +		<column>topic_id</column> +		<column>forum_id</column> +		<row> +			<value>1</value> +			<value>1</value> +		</row> +	</table> +	<table name="phpbb_users"> +		<column>user_id</column> +		<column>username_clean</column> +		<column>user_permissions</column> +		<column>user_sig</column> +		<column>user_occ</column> +		<column>user_interests</column> +		<row> +			<value>2</value> +			<value>poster</value> +			<value></value> +			<value></value> +			<value></value> +			<value></value> +		</row> +		<row> +			<value>3</value> +			<value>test</value> +			<value></value> +			<value></value> +			<value></value> +			<value></value> +		</row> +		<row> +			<value>4</value> +			<value>unauthorized</value> +			<value></value> +			<value></value> +			<value></value> +			<value></value> +		</row> +		<row> +			<value>5</value> +			<value>notified</value> +			<value></value> +			<value></value> +			<value></value> +			<value></value> +		</row> +		<row> +			<value>6</value> +			<value>disabled</value> +			<value></value> +			<value></value> +			<value></value> +			<value></value> +		</row> +		<row> +			<value>7</value> +			<value>default</value> +			<value></value> +			<value></value> +			<value></value> +			<value></value> +		</row> +	</table> +	<table name="phpbb_user_notifications"> +		<column>item_type</column> +		<column>item_id</column> +		<column>user_id</column> +		<column>method</column> +		<column>notify</column> +		<row> +			<value>bookmark</value> +			<value>0</value> +			<value>2</value> +			<value></value> +			<value>1</value> +		</row> +		<row> +			<value>bookmark</value> +			<value>0</value> +			<value>3</value> +			<value></value> +			<value>1</value> +		</row> +		<row> +			<value>bookmark</value> +			<value>0</value> +			<value>4</value> +			<value></value> +			<value>1</value> +		</row> +		<row> +			<value>bookmark</value> +			<value>0</value> +			<value>5</value> +			<value></value> +			<value>1</value> +		</row> +		<row> +			<value>bookmark</value> +			<value>0</value> +			<value>6</value> +			<value></value> +			<value>0</value> +		</row> +	</table> +</dataset> diff --git a/tests/notification/fixtures/submit_post_post.xml b/tests/notification/fixtures/submit_post_post.xml new file mode 100644 index 0000000000..b0ffa042c5 --- /dev/null +++ b/tests/notification/fixtures/submit_post_post.xml @@ -0,0 +1,219 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<dataset> +	<table name="phpbb_forums_watch"> +		<column>forum_id</column> +		<column>user_id</column> +		<column>notify_status</column> +		<row> +			<value>1</value> +			<value>6</value> +			<value>0</value> +		</row> +		<row> +			<value>1</value> +			<value>7</value> +			<value>0</value> +		</row> +		<row> +			<value>1</value> +			<value>8</value> +			<value>0</value> +		</row> +	</table> +	<table name="phpbb_notifications"> +		<column>notification_type_id</column> +		<column>user_id</column> +		<column>item_id</column> +		<column>item_parent_id</column> +		<column>notification_read</column> +		<column>notification_data</column> +		<row> +			<value>1</value> +			<value>5</value> +			<value>1</value> +			<value>1</value> +			<value>0</value> +			<value></value> +		</row> +		<row> +			<value>1</value> +			<value>8</value> +			<value>1</value> +			<value>1</value> +			<value>0</value> +			<value></value> +		</row> +	</table> +	<table name="phpbb_notification_types"> +		<column>notification_type_id</column> +		<column>notification_type_name</column> +		<column>notification_type_enabled</column> +		<row> +			<value>1</value> +			<value>post</value> +			<value>1</value> +		</row> +	</table> +	<table name="phpbb_posts"> +		<column>post_id</column> +		<column>topic_id</column> +		<column>forum_id</column> +		<column>post_text</column> +		<row> +			<value>1</value> +			<value>1</value> +			<value>1</value> +			<value></value> +		</row> +	</table> +	<table name="phpbb_topics"> +		<column>topic_id</column> +		<column>forum_id</column> +		<row> +			<value>1</value> +			<value>1</value> +		</row> +	</table> +	<table name="phpbb_topics_watch"> +		<column>topic_id</column> +		<column>user_id</column> +		<column>notify_status</column> +		<row> +			<value>1</value> +			<value>2</value> +			<value>0</value> +		</row> +		<row> +			<value>1</value> +			<value>3</value> +			<value>0</value> +		</row> +		<row> +			<value>1</value> +			<value>4</value> +			<value>0</value> +		</row> +		<row> +			<value>1</value> +			<value>5</value> +			<value>0</value> +		</row> +		<row> +			<value>1</value> +			<value>6</value> +			<value>0</value> +		</row> +	</table> +	<table name="phpbb_users"> +		<column>user_id</column> +		<column>username_clean</column> +		<column>user_permissions</column> +		<column>user_sig</column> +		<column>user_occ</column> +		<column>user_interests</column> +		<row> +			<value>2</value> +			<value>poster</value> +			<value></value> +			<value></value> +			<value></value> +			<value></value> +		</row> +		<row> +			<value>3</value> +			<value>test</value> +			<value></value> +			<value></value> +			<value></value> +			<value></value> +		</row> +		<row> +			<value>4</value> +			<value>unauthorized</value> +			<value></value> +			<value></value> +			<value></value> +			<value></value> +		</row> +		<row> +			<value>5</value> +			<value>notified</value> +			<value></value> +			<value></value> +			<value></value> +			<value></value> +		</row> +		<row> +			<value>6</value> +			<value>disabled</value> +			<value></value> +			<value></value> +			<value></value> +			<value></value> +		</row> +		<row> +			<value>7</value> +			<value>default</value> +			<value></value> +			<value></value> +			<value></value> +			<value></value> +		</row> +	</table> +	<table name="phpbb_user_notifications"> +		<column>item_type</column> +		<column>item_id</column> +		<column>user_id</column> +		<column>method</column> +		<column>notify</column> +		<row> +			<value>post</value> +			<value>0</value> +			<value>2</value> +			<value></value> +			<value>1</value> +		</row> +		<row> +			<value>post</value> +			<value>0</value> +			<value>3</value> +			<value></value> +			<value>1</value> +		</row> +		<row> +			<value>post</value> +			<value>0</value> +			<value>4</value> +			<value></value> +			<value>1</value> +		</row> +		<row> +			<value>post</value> +			<value>0</value> +			<value>5</value> +			<value></value> +			<value>1</value> +		</row> +		<row> +			<value>post</value> +			<value>0</value> +			<value>6</value> +			<value></value> +			<value>1</value> +		</row> +		<row> +			<value>post</value> +			<value>0</value> +			<value>7</value> +			<value></value> +			<value>1</value> +		</row> +		<row> +			<value>post</value> +			<value>0</value> +			<value>8</value> +			<value></value> +			<value>1</value> +		</row> +	</table> +</dataset> diff --git a/tests/notification/fixtures/submit_post_post_in_queue.xml b/tests/notification/fixtures/submit_post_post_in_queue.xml new file mode 100644 index 0000000000..090e90ea49 --- /dev/null +++ b/tests/notification/fixtures/submit_post_post_in_queue.xml @@ -0,0 +1,177 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<dataset> +	<table name="phpbb_notifications"> +		<column>notification_type_id</column> +		<column>user_id</column> +		<column>item_id</column> +		<column>item_parent_id</column> +		<column>notification_read</column> +		<column>notification_data</column> +		<row> +			<value>1</value> +			<value>6</value> +			<value>1</value> +			<value>1</value> +			<value>0</value> +			<value></value> +		</row> +	</table> +	<table name="phpbb_notification_types"> +		<column>notification_type_id</column> +		<column>notification_type_name</column> +		<column>notification_type_enabled</column> +		<row> +			<value>1</value> +			<value>post_in_queue</value> +			<value>1</value> +		</row> +	</table> +	<table name="phpbb_posts"> +		<column>post_id</column> +		<column>topic_id</column> +		<column>forum_id</column> +		<column>post_text</column> +		<row> +			<value>1</value> +			<value>1</value> +			<value>1</value> +			<value></value> +		</row> +	</table> +	<table name="phpbb_topics"> +		<column>topic_id</column> +		<column>forum_id</column> +		<row> +			<value>1</value> +			<value>1</value> +		</row> +	</table> +	<table name="phpbb_users"> +		<column>user_id</column> +		<column>username_clean</column> +		<column>user_permissions</column> +		<column>user_sig</column> +		<column>user_occ</column> +		<column>user_interests</column> +		<row> +			<value>2</value> +			<value>poster</value> +			<value></value> +			<value></value> +			<value></value> +			<value></value> +		</row> +		<row> +			<value>3</value> +			<value>test</value> +			<value></value> +			<value></value> +			<value></value> +			<value></value> +		</row> +		<row> +			<value>4</value> +			<value>unauthorized-mod</value> +			<value></value> +			<value></value> +			<value></value> +			<value></value> +		</row> +		<row> +			<value>5</value> +			<value>unauthorized-read</value> +			<value></value> +			<value></value> +			<value></value> +			<value></value> +		</row> +		<row> +			<value>6</value> +			<value>notified</value> +			<value></value> +			<value></value> +			<value></value> +			<value></value> +		</row> +		<row> +			<value>7</value> +			<value>disabled</value> +			<value></value> +			<value></value> +			<value></value> +			<value></value> +		</row> +		<row> +			<value>8</value> +			<value>default</value> +			<value></value> +			<value></value> +			<value></value> +			<value></value> +		</row> +		<row> +			<value>9</value> +			<value>test glboal-permissions</value> +			<value></value> +			<value></value> +			<value></value> +			<value></value> +		</row> +	</table> +	<table name="phpbb_user_notifications"> +		<column>item_type</column> +		<column>item_id</column> +		<column>user_id</column> +		<column>method</column> +		<column>notify</column> +		<row> +			<value>needs_approval</value> +			<value>0</value> +			<value>2</value> +			<value></value> +			<value>1</value> +		</row> +		<row> +			<value>needs_approval</value> +			<value>0</value> +			<value>3</value> +			<value></value> +			<value>1</value> +		</row> +		<row> +			<value>needs_approval</value> +			<value>0</value> +			<value>4</value> +			<value></value> +			<value>1</value> +		</row> +		<row> +			<value>needs_approval</value> +			<value>0</value> +			<value>5</value> +			<value></value> +			<value>1</value> +		</row> +		<row> +			<value>needs_approval</value> +			<value>0</value> +			<value>6</value> +			<value></value> +			<value>1</value> +		</row> +		<row> +			<value>needs_approval</value> +			<value>0</value> +			<value>7</value> +			<value></value> +			<value>0</value> +		</row> +		<row> +			<value>needs_approval</value> +			<value>0</value> +			<value>9</value> +			<value></value> +			<value>1</value> +		</row> +	</table> +</dataset> diff --git a/tests/notification/fixtures/submit_post_quote.xml b/tests/notification/fixtures/submit_post_quote.xml new file mode 100644 index 0000000000..f22ed97d91 --- /dev/null +++ b/tests/notification/fixtures/submit_post_quote.xml @@ -0,0 +1,147 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<dataset> +	<table name="phpbb_notifications"> +		<column>notification_type_id</column> +		<column>user_id</column> +		<column>item_id</column> +		<column>item_parent_id</column> +		<column>notification_read</column> +		<column>notification_data</column> +		<row> +			<value>1</value> +			<value>5</value> +			<value>1</value> +			<value>1</value> +			<value>0</value> +			<value></value> +		</row> +	</table> +	<table name="phpbb_notification_types"> +		<column>notification_type_id</column> +		<column>notification_type_name</column> +		<column>notification_type_enabled</column> +		<row> +			<value>1</value> +			<value>quote</value> +			<value>1</value> +		</row> +	</table> +	<table name="phpbb_posts"> +		<column>post_id</column> +		<column>topic_id</column> +		<column>forum_id</column> +		<column>post_text</column> +		<row> +			<value>1</value> +			<value>1</value> +			<value>1</value> +			<value></value> +		</row> +	</table> +	<table name="phpbb_topics"> +		<column>topic_id</column> +		<column>forum_id</column> +		<row> +			<value>1</value> +			<value>1</value> +		</row> +	</table> +	<table name="phpbb_users"> +		<column>user_id</column> +		<column>username_clean</column> +		<column>user_permissions</column> +		<column>user_sig</column> +		<column>user_occ</column> +		<column>user_interests</column> +		<row> +			<value>2</value> +			<value>poster</value> +			<value></value> +			<value></value> +			<value></value> +			<value></value> +		</row> +		<row> +			<value>3</value> +			<value>test</value> +			<value></value> +			<value></value> +			<value></value> +			<value></value> +		</row> +		<row> +			<value>4</value> +			<value>unauthorized</value> +			<value></value> +			<value></value> +			<value></value> +			<value></value> +		</row> +		<row> +			<value>5</value> +			<value>notified</value> +			<value></value> +			<value></value> +			<value></value> +			<value></value> +		</row> +		<row> +			<value>6</value> +			<value>disabled</value> +			<value></value> +			<value></value> +			<value></value> +			<value></value> +		</row> +		<row> +			<value>7</value> +			<value>default</value> +			<value></value> +			<value></value> +			<value></value> +			<value></value> +		</row> +	</table> +	<table name="phpbb_user_notifications"> +		<column>item_type</column> +		<column>item_id</column> +		<column>user_id</column> +		<column>method</column> +		<column>notify</column> +		<row> +			<value>quote</value> +			<value>0</value> +			<value>2</value> +			<value></value> +			<value>1</value> +		</row> +		<row> +			<value>quote</value> +			<value>0</value> +			<value>3</value> +			<value></value> +			<value>1</value> +		</row> +		<row> +			<value>quote</value> +			<value>0</value> +			<value>4</value> +			<value></value> +			<value>1</value> +		</row> +		<row> +			<value>quote</value> +			<value>0</value> +			<value>5</value> +			<value></value> +			<value>1</value> +		</row> +		<row> +			<value>quote</value> +			<value>0</value> +			<value>6</value> +			<value></value> +			<value>0</value> +		</row> +	</table> +</dataset> diff --git a/tests/notification/manager_helper.php b/tests/notification/manager_helper.php new file mode 100644 index 0000000000..7a794f922f --- /dev/null +++ b/tests/notification/manager_helper.php @@ -0,0 +1,67 @@ +<?php +/** +* +* @package notifications +* @copyright (c) 2012 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +/** +* @ignore +*/ +if (!defined('IN_PHPBB')) +{ +	exit; +} + +/** +* Notifications service class +* @package notifications +*/ +class phpbb_notification_manager_helper extends phpbb_notification_manager +{ +	public function set_var($name, $value) +	{ +		$this->$name = $value; +	} + +	// Extra dependencies for get_*_class functions +	protected $auth = null; +	protected $config = null; +	public function setDependencies($auth, $config) +	{ +		$this->auth = $auth; +		$this->config = $config; +	} + +	/** +	* Helper to get the notifications item type class and set it up +	*/ +	public function get_item_type_class($item_type, $data = array()) +	{ +		$item_type = 'phpbb_notification_type_' . $item_type; + +		$item = new $item_type($this->user_loader, $this->db, $this->cache->get_driver(), $this->user, $this->auth, $this->config, $this->phpbb_root_path, $this->php_ext, $this->notification_types_table, $this->notifications_table, $this->user_notifications_table); + +		$item->set_notification_manager($this); + +		$item->set_initial_data($data); + +		return $item; +	} + +	/** +	* Helper to get the notifications method class and set it up +	*/ +	public function get_method_class($method_name) +	{ +		$method_name = 'phpbb_notification_method_' . $method_name; + +		$method = new $method_name($this->user_loader, $this->db, $this->cache->get_driver(), $this->user, $this->auth, $this->config, $this->phpbb_root_path, $this->php_ext, $this->notification_types_table, $this->notifications_table, $this->user_notifications_table); + +		$method->set_notification_manager($this); + +		return $method; +	} +} diff --git a/tests/notification/notification_test.php b/tests/notification/notification_test.php new file mode 100644 index 0000000000..8f7eb3b8a8 --- /dev/null +++ b/tests/notification/notification_test.php @@ -0,0 +1,432 @@ +<?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__) . '/manager_helper.php'; + +class phpbb_notification_test extends phpbb_database_test_case +{ +	protected $notifications, $db, $container, $user, $config, $auth, $cache; + +	public function getDataSet() +	{ +		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/notification.xml'); +	} + +	protected function setUp() +	{ +		parent::setUp(); + +		global $phpbb_root_path, $phpEx; + +		include_once(__DIR__ . '/ext/test/notification/type/test.' . $phpEx); + +		$this->db = $this->new_dbal(); +		$this->config = new phpbb_config(array( +			'allow_privmsg'			=> true, +			'allow_bookmarks'		=> true, +			'allow_topic_notify'	=> true, +			'allow_forum_notify'	=> true, +		)); +		$this->user = new phpbb_user(); +		$this->user_loader = new phpbb_user_loader($this->db, $phpbb_root_path, $phpEx, 'phpbb_users'); +		$this->auth = new phpbb_mock_notifications_auth(); +		$this->cache = new phpbb_cache_service( +			new phpbb_cache_driver_null(), +			$this->config, +			$this->db, +			$phpbb_root_path, +			$phpEx +		); + +		$this->container = new phpbb_mock_container_builder(); + +		$this->notifications = new phpbb_notification_manager_helper( +			array(), +			array(), +			$this->container, +			$this->user_loader, +			$this->db, +			$this->cache, +			$this->user, +			$phpbb_root_path, +			$phpEx, +			'phpbb_notification_types', +			'phpbb_notifications', +			'phpbb_user_notifications' +		); + +		$this->notifications->setDependencies($this->auth, $this->config); + +		$types = array(); +		foreach (array( +			'test', +			'approve_post', +			'approve_topic', +			'bookmark', +			'disapprove_post', +			'disapprove_topic', +			'pm', +			'post', +			'post_in_queue', +			'quote', +			'report_pm', +			'report_pm_closed', +			'report_post', +			'report_post_closed', +			'topic', +			'topic_in_queue', +		) as $type) +		{ +			$class = $this->build_type('phpbb_notification_type_' . $type); + +			$types[$type] = $class; +			$this->container->set('notification.type.' . $type, $class); +		} + +		$this->notifications->set_var('notification_types', $types); +	} + +	protected function build_type($type) +	{ +		global $phpbb_root_path, $phpEx; + +		return new $type($this->user_loader, $this->db, $this->cache->get_driver(), $this->user, $this->auth, $this->config, $phpbb_root_path, $phpEx, 'phpbb_notification_types', 'phpbb_notifications', 'phpbb_user_notifications'); +	} + +	public function test_get_notification_type_id() +	{ +		// They should be inserted the first time +		$this->assertEquals(1, $this->notifications->get_notification_type_id('post')); +		$this->assertEquals(2, $this->notifications->get_notification_type_id('quote')); +		$this->assertEquals(3, $this->notifications->get_notification_type_id('test')); + +		$this->assertEquals(array( +				'test'	=> 3, +				'quote'	=> 2, +				'post'	=> 1, +			), +			$this->notifications->get_notification_type_ids(array( +				'test', +				'quote', +				'post', +			) +		)); +		$this->assertEquals(2, $this->notifications->get_notification_type_id('quote')); + +		try +		{ +			$this->assertEquals(3, $this->notifications->get_notification_type_id('fail')); + +			$this->fail('Non-existent type should throw an exception'); +		} +		catch (Exception $e) {} +	} + +	public function test_get_subscription_types() +	{ +		$subscription_types = $this->notifications->get_subscription_types(); + +		$this->assertArrayHasKey('NOTIFICATION_GROUP_MISCELLANEOUS', $subscription_types); +		$this->assertArrayHasKey('NOTIFICATION_GROUP_POSTING', $subscription_types); + +		$this->assertArrayHasKey('bookmark', $subscription_types['NOTIFICATION_GROUP_POSTING']); +		$this->assertArrayHasKey('post', $subscription_types['NOTIFICATION_GROUP_POSTING']); +		$this->assertArrayHasKey('quote', $subscription_types['NOTIFICATION_GROUP_POSTING']); +		$this->assertArrayHasKey('topic', $subscription_types['NOTIFICATION_GROUP_POSTING']); + +		$this->assertArrayHasKey('pm', $subscription_types['NOTIFICATION_GROUP_MISCELLANEOUS']); + +		//get_subscription_types +		//get_subscription_methods +	} + +	public function test_subscriptions() +	{ +		$this->notifications->delete_subscription('post', 0, '', 2); + +		$this->assertArrayNotHasKey('post', $this->notifications->get_global_subscriptions(2)); + +		$this->notifications->add_subscription('post', 0, '', 2); + +		$this->assertArrayHasKey('post', $this->notifications->get_global_subscriptions(2)); +	} + +	public function test_notifications() +	{ +		$this->db->sql_query('DELETE FROM phpbb_notification_types'); + +		$types = array('quote', 'bookmark', 'post', 'test'); +		foreach ($types as $id => $type) +		{ +			$this->db->sql_query('INSERT INTO phpbb_notification_types ' . +				$this->db->sql_build_array('INSERT', array( +					'notification_type_id'		=> ($id + 1), +					'notification_type_name'	=> $type, +					'notification_type_enabled'	=> 1, +				)) +			); +		} + +		// Used to test post notifications later +		$this->db->sql_query('INSERT INTO ' . TOPICS_WATCH_TABLE . ' ' . $this->db->sql_build_array('INSERT', array( +			'topic_id'			=> 2, +			'notify_status'		=> NOTIFY_YES, +			'user_id'			=> 0, +		))); + +		$this->assertEquals(array( +				'notifications'		=> array(), +				'unread_count'		=> 0, +				'total_count'		=> 0, +		), $this->notifications->load_notifications(array( +			'count_unread'	=> true, +		))); + +		$this->notifications->add_notifications('test', array( +			'post_id'		=> '1', +			'topic_id'		=> '1', +			'post_time'		=> 1349413321, +		)); + +		$this->notifications->add_notifications('test', array( +			'post_id'		=> '2', +			'topic_id'		=> '2', +			'post_time'		=> 1349413322, +		)); + +		$this->notifications->add_notifications('test', array( +			'post_id'		=> '3', +			'topic_id'		=> '2', +			'post_time'		=> 1349413323, +		)); + +		$this->notifications->add_notifications(array('quote', 'bookmark', 'post', 'test'), array( +			'post_id'		=> '4', +			'topic_id'		=> '2', +			'post_time'		=> 1349413324, +			'poster_id'		=> 2, +			'topic_title'	=> 'test-title', +			'post_subject'	=> 'Re: test-title', +			'forum_id'		=> 2, +			'forum_name'	=> 'Your first forum', +		)); + +		$this->db->sql_query('INSERT INTO ' . BOOKMARKS_TABLE . ' ' . $this->db->sql_build_array('INSERT', array( +			'topic_id'			=> 2, +			'user_id'			=> 0, +		))); + +		$this->notifications->add_notifications(array('quote', 'bookmark', 'post', 'test'), array( +			'post_id'		=> '5', +			'topic_id'		=> '2', +			'post_time'		=> 1349413325, +			'poster_id'		=> 2, +			'topic_title'	=> 'test-title', +			'post_subject'	=> 'Re: test-title', +			'forum_id'		=> 2, +			'forum_name'	=> 'Your first forum', +		)); + +		$this->notifications->delete_subscription('test'); + +		$this->notifications->add_notifications('test', array( +			'post_id'		=> '6', +			'topic_id'		=> '2', +			'post_time'		=> 1349413326, +		)); + +		$notifications = $this->notifications->load_notifications(array( +			'count_unread'	=> true, +		)); + +		$expected = array( +			1 => array( +				'notification_type_id'	=> 4, +				'item_id'			=> 1, +				'item_parent_id'	=> 1, +				'user_id'	   		=> 0, +				'notification_read'				=> 0, +				'notification_time'	   			=> 1349413321, +				'notification_data'			   	=> array(), +			), +			2 => array( +				'notification_type_id'	=> 4, +				'item_id'			=> 2, +				'item_parent_id'	=> 2, +				'user_id'	   		=> 0, +				'notification_read'				=> 0, +				'notification_time'	   			=> 1349413322, +				'notification_data'				=> array(), +			), +			3 => array( +				'notification_type_id'	=> 4, +				'item_id'			=> 3, +				'item_parent_id'	=> 2, +				'user_id'	   		=> 0, +				'notification_read'				=> 0, +				'notification_time'	   			=> 1349413323, +				'notification_data'			   	=> array(), +			), +			4 => array( +				'notification_type_id'	=> 3, +				'item_id'			=> 4, +				'item_parent_id'	=> 2, +				'user_id'	   		=> 0, +				'notification_read'				=> 0, +				'notification_time'	   			=> 1349413324, +				'notification_data'			   	=> array( +					'poster_id'		=> 2, +					'topic_title'	=> 'test-title', +					'post_subject'	=> 'Re: test-title', +					'post_username'	=> '', +					'forum_id'		=> 2, +					'forum_name'	=> 'Your first forum', +				), +			), +			5 => array( +				'notification_type_id'	=> 2, +				'item_id'			=> 5, +				'item_parent_id'	=> 2, +				'user_id'	   		=> 0, +				'notification_read'				=> 0, +				'notification_time'	   			=> 1349413325, +				'notification_data'			   	=> array( +					'poster_id'		=> 2, +					'topic_title'	=> 'test-title', +					'post_subject'	=> 'Re: test-title', +					'post_username'	=> '', +					'forum_id'		=> 2, +					'forum_name'	=> 'Your first forum', +				), +			), +		); + +		$this->assertEquals(sizeof($expected), $notifications['unread_count']); + +		$notifications = $notifications['notifications']; + +		foreach ($expected as $notification_id => $notification_data) +		{ +			//echo $notifications[$notification_id]; + +			$this->assertEquals($notification_id, $notifications[$notification_id]->notification_id, 'notification_id'); + +			foreach ($notification_data as $key => $value) +			{ +				$this->assertEquals($value, $notifications[$notification_id]->$key, $key . ' ' . $notification_id); +			} +		} + +		// Now test updating ------------------------------- + +		$this->notifications->update_notifications('test', array( +			'post_id'		=> '1', +			'topic_id'		=> '2', // change parent_id +			'post_time'		=> 1349413321, +		)); + +		$this->notifications->update_notifications('test', array( +			'post_id'		=> '3', +			'topic_id'		=> '2', +			'post_time'		=> 1234, // change time +		)); + +		$this->notifications->update_notifications(array('quote', 'bookmark', 'post', 'test'), array( +			'post_id'		=> '5', +			'topic_id'		=> '2', +			'poster_id'		=> 2, +			'topic_title'	=> 'test-title2', // change topic_title +			'post_subject'	=> 'Re: test-title2', // change post_subject +			'forum_id'		=> 3, // change forum_id +			'forum_name'	=> 'Your second forum', // change forum_name +		)); + +		$notifications = $this->notifications->load_notifications(array( +			'count_unread'	=> true, +		)); + +		$expected = array( +			1 => array( +				'notification_type_id'	=> 4, +				'item_id'			=> 1, +				'item_parent_id'	=> 2, +				'user_id'	   		=> 0, +				'notification_read'	=> 0, +				'notification_time'	=> 1349413321, +				'notification_data'	=> array(), +			), +			2 => array( +				'notification_type_id'	=> 4, +				'item_id'			=> 2, +				'item_parent_id'	=> 2, +				'user_id'	   		=> 0, +				'notification_read'	=> 0, +				'notification_time'	=> 1349413322, +				'notification_data'	=> array(), +			), +			3 => array( +				'notification_type_id'	=> 4, +				'item_id'			=> 3, +				'item_parent_id'	=> 2, +				'user_id'	   		=> 0, +				'notification_read'	=> 0, +				'notification_time'	=> 1234, +				'notification_data'	=> array(), +			), +			4 => array( +				'notification_type_id'	=> 3, +				'item_id'			=> 4, +				'item_parent_id'	=> 2, +				'user_id'	   		=> 0, +				'notification_read'	=> 0, +				'notification_time'	=> 1349413324, +				'notification_data'	=> array( +					'poster_id'		=> 2, +					'topic_title'	=> 'test-title', +					'post_subject'	=> 'Re: test-title', +					'post_username'	=> '', +					'forum_id'		=> 2, +					'forum_name'	=> 'Your first forum', +				), +			), +			5 => array( +				'notification_type_id'	=> 2, +				'item_id'			=> 5, +				'item_parent_id'	=> 2, +				'user_id'	   		=> 0, +				'notification_read'	=> 0, +				'notification_time'	=> 1349413325, +				'notification_data'	=> array( +					'poster_id'		=> 2, +					'topic_title'	=> 'test-title2', +					'post_subject'	=> 'Re: test-title2', +					'post_username'	=> '', +					'forum_id'		=> 3, +					'forum_name'	=> 'Your second forum', +				), +			), +		); + +		$this->assertEquals(sizeof($expected), $notifications['unread_count']); + +		$notifications = $notifications['notifications']; + +		foreach ($expected as $notification_id => $notification_data) +		{ +			//echo $notifications[$notification_id]; + +			$this->assertEquals($notification_id, $notifications[$notification_id]->notification_id, 'notification_id'); + +			foreach ($notification_data as $key => $value) +			{ +				$this->assertEquals($value, $notifications[$notification_id]->$key, $key . ' ' . $notification_id); +			} +		} +	} +} diff --git a/tests/notification/submit_post_base.php b/tests/notification/submit_post_base.php new file mode 100644 index 0000000000..59daf6c9cb --- /dev/null +++ b/tests/notification/submit_post_base.php @@ -0,0 +1,153 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; +require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php'; +require_once dirname(__FILE__) . '/../../phpBB/includes/functions_posting.php'; +require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php'; + +class phpbb_notification_submit_post_base extends phpbb_database_test_case +{ +	protected $notifications, $db, $container, $user, $config, $auth, $cache; + +	protected $item_type = ''; + +	protected $poll_data = array(); +	protected $post_data = array( +		'forum_id'		=> 1, +		'topic_id'		=> 1, +		'topic_title'	=> 'topic_title', +		'icon_id'		=> 0, +		'enable_bbcode'		=> 0, +		'enable_smilies'	=> 0, +		'enable_urls'		=> 0, +		'enable_sig'		=> 0, +		'message'			=> '', +		'message_md5'		=> '', +		'attachment_data'	=> array(), +		'bbcode_bitfield'	=> '', +		'bbcode_uid'		=> '', +		'post_edit_locked'	=> false, +		//'force_approved_state'	=> 1, +	); + +	public function getDataSet() +	{ +		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/submit_post_' . $this->item_type . '.xml'); +	} + +	public function setUp() +	{ +		parent::setUp(); + +		global $auth, $cache, $config, $db, $phpbb_container, $phpbb_dispatcher, $user, $request, $phpEx, $phpbb_root_path; + +		// Database +		$this->db = $this->new_dbal(); +		$db = $this->db; + +		// Auth +		$auth = $this->getMock('phpbb_auth'); +		$auth->expects($this->any()) +			->method('acl_get') +			->with($this->stringContains('_'), +				$this->anything()) +			->will($this->returnValueMap(array( +				array('f_noapprove', 1, true), +				array('f_postcount', 1, true), +				array('m_edit', 1, false), +			))); + +		// Config +		$config = new phpbb_config(array('num_topics' => 1,'num_posts' => 1,)); +		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 +		); + +		// Event dispatcher +		$phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + +		// User +		$user = $this->getMock('phpbb_user'); +		$user->ip = ''; +		$user->data = array( +			'user_id'		=> 2, +			'username'		=> 'user-name', +			'is_registered'	=> true, +			'user_colour'	=> '', +		); + +		// Request +		$type_cast_helper = $this->getMock('phpbb_request_type_cast_helper_interface'); +		$request = $this->getMock('phpbb_request'); + +		// Container +		$phpbb_container = new phpbb_mock_container_builder(); + +		$user_loader = new phpbb_user_loader($db, $phpbb_root_path, $phpEx, USERS_TABLE); + +		// Notification Types +		$notification_types = array('quote', 'bookmark', 'post', 'post_in_queue', 'topic', 'approve_topic', 'approve_post'); +		$notification_types_array = array(); +		foreach ($notification_types as $type) +		{ +			$class_name = 'phpbb_notification_type_' . $type; +			$class = new $class_name( +				$user_loader, $db, $cache->get_driver(), $user, $auth, $config, +				$phpbb_root_path, $phpEx, +				NOTIFICATION_TYPES_TABLE, NOTIFICATIONS_TABLE, USER_NOTIFICATIONS_TABLE); + +			$phpbb_container->set('notification.type.' . $type, $class); + +			$notification_types_array['notification.type.' . $type] = $class; +		} + +		// Notification Manager +		$phpbb_notifications = new phpbb_notification_manager($notification_types_array, array(), +			$phpbb_container, $user_loader, $db, $cache, $user, +			$phpbb_root_path, $phpEx, +			NOTIFICATION_TYPES_TABLE, NOTIFICATIONS_TABLE, USER_NOTIFICATIONS_TABLE); +		$phpbb_container->set('notification_manager', $phpbb_notifications); +	} + +	/** +	* @dataProvider submit_post_data +	*/ +	public function test_submit_post($additional_post_data, $expected_before, $expected_after) +	{ +		$sql = 'SELECT user_id, item_id, item_parent_id +			FROM ' . NOTIFICATIONS_TABLE . ' n, ' . NOTIFICATION_TYPES_TABLE . " nt +			WHERE nt.notification_type_name = '" . $this->item_type . "' +				AND n.notification_type_id = nt.notification_type_id +			ORDER BY user_id, item_id ASC"; +		$result = $this->db->sql_query($sql); +		$this->assertEquals($expected_before, $this->db->sql_fetchrowset($result)); +		$this->db->sql_freeresult($result); + +		$poll_data = $this->poll_data; +		$post_data = array_merge($this->post_data, $additional_post_data); +		submit_post('reply', '', 'poster-name', POST_NORMAL, $poll_data, $post_data, false, false); + +		$sql = 'SELECT user_id, item_id, item_parent_id +			FROM ' . NOTIFICATIONS_TABLE . ' n, ' . NOTIFICATION_TYPES_TABLE . " nt +			WHERE nt.notification_type_name = '" . $this->item_type . "' +				AND n.notification_type_id = nt.notification_type_id +			ORDER BY user_id ASC, item_id ASC"; +		$result = $this->db->sql_query($sql); +		$this->assertEquals($expected_after, $this->db->sql_fetchrowset($result)); +		$this->db->sql_freeresult($result); +	} +} diff --git a/tests/notification/submit_post_type_bookmark_test.php b/tests/notification/submit_post_type_bookmark_test.php new file mode 100644 index 0000000000..861017ff5f --- /dev/null +++ b/tests/notification/submit_post_type_bookmark_test.php @@ -0,0 +1,90 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +require_once dirname(__FILE__) . '/submit_post_base.php'; + +class phpbb_notification_submit_post_type_bookmark_test extends phpbb_notification_submit_post_base +{ +	protected $item_type = 'bookmark'; + +	public function setUp() +	{ +		parent::setUp(); + +		global $auth; + +		// Add additional permissions +		$auth->expects($this->any()) +			->method('acl_get_list') +			->with($this->anything(), +				$this->stringContains('_'), +				$this->greaterThan(0)) +			->will($this->returnValueMap(array( +				array( +					array('3', '4', '5', '6', '7'), +					'f_read', +					1, +					array( +						1 => array( +							'f_read' => array(3, 5, 6, 7), +						), +					), +				), +			))); +	} + +	/** +	* submit_post() Notifications test +	* +	* submit_post() $mode = 'reply' +	* Notification item_type = 'bookmark' +	*/ +	public function submit_post_data() +	{ +		return array( +			/** +			* Normal post +			* +			* User => State description +			*	2	=> Poster, should NOT receive a notification +			*	3	=> Bookmarked, should receive a notification +			*	4	=> Bookmarked, but unauthed to read, should NOT receive a notification +			*	5	=> Bookmarked, but already notified, should NOT receive a new notification +			*	6	=> Bookmarked, but option disabled, should NOT receive a notification +			*	7	=> Bookmarked, option set to default, should receive a notification +			*/ +			array( +				array(), +				array( +					array('user_id' => 5, 'item_id' => 1, 'item_parent_id' => 1), +				), +				array( +					array('user_id' => 3, 'item_id' => 2, 'item_parent_id' => 1), +					array('user_id' => 5, 'item_id' => 1, 'item_parent_id' => 1), +					array('user_id' => 7, 'item_id' => 2, 'item_parent_id' => 1), +				), +			), + +			/** +			* Unapproved post +			* +			* No new notifications +			*/ +			array( +				array('force_approved_state' => false), +				array( +					array('user_id' => 5, 'item_id' => 1, 'item_parent_id' => 1), +				), +				array( +					array('user_id' => 5, 'item_id' => 1, 'item_parent_id' => 1), +				), +			), +		); +	} +} diff --git a/tests/notification/submit_post_type_post_in_queue_test.php b/tests/notification/submit_post_type_post_in_queue_test.php new file mode 100644 index 0000000000..6a7ac44e39 --- /dev/null +++ b/tests/notification/submit_post_type_post_in_queue_test.php @@ -0,0 +1,107 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +require_once dirname(__FILE__) . '/submit_post_base.php'; + +class phpbb_notification_submit_post_type_post_in_queue_test extends phpbb_notification_submit_post_base +{ +	protected $item_type = 'post_in_queue'; + +	public function setUp() +	{ +		parent::setUp(); + +		global $auth; + +		// Add additional permissions +		$auth->expects($this->any()) +			->method('acl_get_list') +			->with($this->anything(), +				$this->stringContains('_'), +				$this->greaterThan(0)) +			->will($this->returnValueMap(array( +				array( +					false, +					'm_approve', +					array(1, 0), +					array( +						0 => array( +							'm_approve' => array(9), +						), +						1 => array( +							'm_approve' => array(3, 4, 6, 7, 8), +						), +					), +				), +				array( +					array(3, 4, 6, 7, 8, 9), +					'f_read', +					1, +					array( +						1 => array( +							'f_read' => array(3, 6, 7, 8, 9), +						), +					), +				), +			))); +	} + +	/** +	* submit_post() Notifications test +	* +	* submit_post() $mode = 'reply' +	* Notification item_type = 'post_in_queue' +	*/ +	public function submit_post_data() +	{ +		return array( +			/** +			* Normal post +			* +			* No new notifications +			*/ +			array( +				array(), +				array( +					array('user_id' => 6, 'item_id' => 1, 'item_parent_id' => 1), +				), +				array( +					array('user_id' => 6, 'item_id' => 1, 'item_parent_id' => 1), +				), +			), + +			/** +			* Unapproved post +			* +			* User => State description +			*	2	=> Poster, should NOT receive a notification +			*	3	=> Moderator, should receive a notification +			*	4	=> Moderator, but unauthed to read, should NOT receive a notification +			*	5	=> Moderator, but unauthed to approve, should NOT receive a notification +			*	6	=> Moderator, but already notified, should STILL receive a new notification +			*	7	=> Moderator, but option disabled, should NOT receive a notification +			*	8	=> Moderator, option set to default, should receive a notification +			*	9	=> Moderator, has only global mod permissions, should receive a notification +			*/ +			array( +				array('force_approved_state' => false), +				array( +					array('user_id' => 6, 'item_id' => 1, 'item_parent_id' => 1), +				), +				array( +					array('user_id' => 3, 'item_id' => 2, 'item_parent_id' => 1), +					array('user_id' => 6, 'item_id' => 1, 'item_parent_id' => 1), +					array('user_id' => 6, 'item_id' => 2, 'item_parent_id' => 1), +					array('user_id' => 8, 'item_id' => 2, 'item_parent_id' => 1), +					array('user_id' => 9, 'item_id' => 2, 'item_parent_id' => 1), +				), +			), +		); +	} +} diff --git a/tests/notification/submit_post_type_post_test.php b/tests/notification/submit_post_type_post_test.php new file mode 100644 index 0000000000..473247a764 --- /dev/null +++ b/tests/notification/submit_post_type_post_test.php @@ -0,0 +1,96 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +require_once dirname(__FILE__) . '/submit_post_base.php'; + +class phpbb_notification_submit_post_type_post_test extends phpbb_notification_submit_post_base +{ +	protected $item_type = 'post'; + +	public function setUp() +	{ +		parent::setUp(); + +		global $auth; + +		// Add additional permissions +		$auth->expects($this->any()) +			->method('acl_get_list') +			->with($this->anything(), +				$this->stringContains('_'), +				$this->greaterThan(0)) +			->will($this->returnValueMap(array( +				array( +					array('3', '4', '5', '6', '7', '8'), +					'f_read', +					1, +					array( +						1 => array( +							'f_read' => array(3, 5, 6, 7, 8), +						), +					), +				), +			))); +	} + +	/** +	* submit_post() Notifications test +	* +	* submit_post() $mode = 'reply' +	* Notification item_type = 'post' +	*/ +	public function submit_post_data() +	{ +		return array( +			/** +			* Normal post +			* +			* User => State description +			*	2	=> Poster, should NOT receive a notification +			*	3	=> Topic subscribed, should receive a notification +			*	4	=> Topic subscribed, but unauthed to read, should NOT receive a notification +			*	5	=> Topic subscribed, but already notified, should NOT receive a new notification +			*	6	=> Topic and forum subscribed, should receive ONE notification +			*	7	=> Forum subscribed, should receive a notification +			*	8	=> Forum subscribed, but already notified, should NOT receive a new notification +			*/ +			array( +				array(), +				array( +					array('user_id' => 5, 'item_id' => 1, 'item_parent_id' => 1), +					array('user_id' => 8, 'item_id' => 1, 'item_parent_id' => 1), +				), +				array( +					array('user_id' => 3, 'item_id' => 2, 'item_parent_id' => 1), +					array('user_id' => 5, 'item_id' => 1, 'item_parent_id' => 1), +					array('user_id' => 6, 'item_id' => 2, 'item_parent_id' => 1), +					array('user_id' => 7, 'item_id' => 2, 'item_parent_id' => 1), +					array('user_id' => 8, 'item_id' => 1, 'item_parent_id' => 1), +				), +			), + +			/** +			* Unapproved post +			* +			* No new notifications +			*/ +			array( +				array('force_approved_state' => false), +				array( +					array('user_id' => 5, 'item_id' => 1, 'item_parent_id' => 1), +					array('user_id' => 8, 'item_id' => 1, 'item_parent_id' => 1), +				), +				array( +					array('user_id' => 5, 'item_id' => 1, 'item_parent_id' => 1), +					array('user_id' => 8, 'item_id' => 1, 'item_parent_id' => 1), +				), +			), +		); +	} +} diff --git a/tests/notification/submit_post_type_quote_test.php b/tests/notification/submit_post_type_quote_test.php new file mode 100644 index 0000000000..2b66d9c6a1 --- /dev/null +++ b/tests/notification/submit_post_type_quote_test.php @@ -0,0 +1,113 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +require_once dirname(__FILE__) . '/submit_post_base.php'; + +class phpbb_notification_submit_post_type_quote_test extends phpbb_notification_submit_post_base +{ +	protected $item_type = 'quote'; + +	public function setUp() +	{ +		parent::setUp(); + +		global $auth; + +		// Add additional permissions +		$auth->expects($this->any()) +			->method('acl_get_list') +			->with($this->anything(), +				$this->stringContains('_'), +				$this->greaterThan(0)) +			->will($this->returnValueMap(array( +				array( +					array('3', '4', '5', '6', '7'), +					'f_read', +					1, +					array( +						1 => array( +							'f_read' => array(3, 5, 6, 7), +						), +					), +				), +			))); +	} + +	/** +	* submit_post() Notifications test +	* +	* submit_post() $mode = 'reply' +	* Notification item_type = 'quote' +	*/ +	public function submit_post_data() +	{ +		return array( +			/** +			* Normal post +			* +			* User => State description +			*	2	=> Poster, should NOT receive a notification +			*	3	=> Quoted, should receive a notification +			*	4	=> Quoted, but unauthed to read, should NOT receive a notification +			*	5	=> Quoted, but already notified, should NOT receive a new notification +			*	6	=> Quoted, but option disabled, should NOT receive a notification +			*	7	=> Quoted, option set to default, should receive a notification +			*/ +			array( +				array( +					'message'			=> implode(' ', array( +						'[quote="poster":uid]poster should not be notified[/quote:uid]', +						'[quote="test":uid]test should be notified[/quote:uid]', +						'[quote="unauthorized":uid]unauthorized to read, should not receive a notification[/quote:uid]', +						'[quote="notified":uid]already notified, should not receive a new notification[/quote:uid]', +						'[quote="disabled":uid]option disabled, should not receive a notification[/quote:uid]', +						'[quote="default":uid]option set to default, should receive a notification[/quote:uid]', +						'[quote="doesn\'t exist":uid]user does not exist, should not receive a notification[/quote:uid]', +					)), +					'bbcode_uid'		=> 'uid', +				), +				array( +					array('user_id' => 5, 'item_id' => 1, 'item_parent_id' => 1), +				), +				array( +					array('user_id' => 3, 'item_id' => 2, 'item_parent_id' => 1), +					array('user_id' => 5, 'item_id' => 1, 'item_parent_id' => 1), +					array('user_id' => 7, 'item_id' => 2, 'item_parent_id' => 1), +				), +			), + +			/** +			* Unapproved post +			* +			* No new notifications +			*/ +			array( +				array( +					'message'			=> implode(' ', array( +						'[quote="poster":uid]poster should not be notified[/quote:uid]', +						'[quote="test":uid]test should be notified[/quote:uid]', +						'[quote="unauthorized":uid]unauthorized to read, should not receive a notification[/quote:uid]', +						'[quote="notified":uid]already notified, should not receive a new notification[/quote:uid]', +						'[quote="disabled":uid]option disabled, should not receive a notification[/quote:uid]', +						'[quote="default":uid]option set to default, should receive a notification[/quote:uid]', +						'[quote="doesn\'t exist":uid]user does not exist, should not receive a notification[/quote:uid]', +					)), +					'bbcode_uid'		=> 'uid', +					'force_approved_state' => false, +				), +				array( +					array('user_id' => 5, 'item_id' => 1, 'item_parent_id' => 1), +				), +				array( +					array('user_id' => 5, 'item_id' => 1, 'item_parent_id' => 1), +				), +			), +		); +	} +} diff --git a/tests/privmsgs/delete_user_pms_test.php b/tests/privmsgs/delete_user_pms_test.php index f705825262..92ee7c5f2a 100644 --- a/tests/privmsgs/delete_user_pms_test.php +++ b/tests/privmsgs/delete_user_pms_test.php @@ -81,10 +81,13 @@ class phpbb_privmsgs_delete_user_pms_test extends phpbb_database_test_case  	*/  	public function test_delete_user_pms($delete_user, $remaining_privmsgs, $remaining_privmsgs_to)  	{ -		global $db; +		global $db, $phpbb_container;  		$db = $this->new_dbal(); +		$phpbb_container = new phpbb_mock_container_builder(); +		$phpbb_container->set('notification_manager', new phpbb_mock_notification_manager()); +  		phpbb_delete_user_pms($delete_user);  		$sql = 'SELECT msg_id diff --git a/tests/request/deactivated_super_global_test.php b/tests/request/deactivated_super_global_test.php new file mode 100644 index 0000000000..2e19928a5a --- /dev/null +++ b/tests/request/deactivated_super_global_test.php @@ -0,0 +1,22 @@ +<?php +/** +* +* @package testing +* @version $Id$ +* @copyright (c) 2009 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +class phpbb_deactivated_super_global_test extends phpbb_test_case +{ +	/** +	* Checks that on write access the correct error is thrown +	*/ +	public function test_write_triggers_error() +	{ +		$this->setExpectedTriggerError(E_USER_ERROR); +		$obj = new phpbb_request_deactivated_super_global($this->getMock('phpbb_request_interface'), 'obj', phpbb_request_interface::POST); +		$obj->offsetSet(0, 0); +	} +} diff --git a/tests/request/request_test.php b/tests/request/request_test.php new file mode 100644 index 0000000000..52c21abd2a --- /dev/null +++ b/tests/request/request_test.php @@ -0,0 +1,168 @@ +<?php +/** +* +* @package testing +* @version $Id$ +* @copyright (c) 2009 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +class phpbb_request_test extends phpbb_test_case +{ +	private $type_cast_helper; +	private $request; + +	protected function setUp() +	{ +		// populate super globals +		$_POST['test'] = 1; +		$_GET['test'] = 2; +		$_COOKIE['test'] = 3; +		$_REQUEST['test'] = 3; +		$_GET['unset'] = ''; +		$_FILES['test'] = array( +			'name' => 'file', +			'tmp_name' => 'tmp', +			'size' => 256, +			'type' => 'application/octet-stream', +			'error' => UPLOAD_ERR_OK, +		); + +		$_SERVER['HTTP_HOST'] = 'example.com'; +		$_SERVER['HTTP_ACCEPT'] = 'application/json'; +		$_SERVER['HTTP_SOMEVAR'] = '<value>'; + +		$this->type_cast_helper = $this->getMock('phpbb_request_type_cast_helper_interface'); +		$this->request = new phpbb_request($this->type_cast_helper); +	} + +	public function test_toggle_super_globals() +	{ +		$this->assertTrue($this->request->super_globals_disabled(), 'Superglobals were not disabled'); + +		$this->request->enable_super_globals(); + +		$this->assertFalse($this->request->super_globals_disabled(), 'Superglobals were not enabled'); + +		$this->assertEquals(1, $_POST['test'], 'Checking $_POST after enable_super_globals'); +		$this->assertEquals(2, $_GET['test'], 'Checking $_GET after enable_super_globals'); +		$this->assertEquals(3, $_COOKIE['test'], 'Checking $_COOKIE after enable_super_globals'); +		$this->assertEquals(3, $_REQUEST['test'], 'Checking $_REQUEST after enable_super_globals'); +		$this->assertEquals(256, $_FILES['test']['size']); + +		$_POST['x'] = 2; +		$this->assertEquals($_POST, $GLOBALS['_POST'], 'Checking whether $_POST can still be accessed via $GLOBALS[\'_POST\']'); +	} + +	public function test_server() +	{ +		$this->assertEquals('example.com', $this->request->server('HTTP_HOST')); +	} + +	public function test_server_escaping() +	{ +		$this->type_cast_helper +			->expects($this->once()) +			->method('recursive_set_var') +			->with( +				$this->anything(), +				'', +				true +			); + +		$this->request->server('HTTP_SOMEVAR'); +	} + +	public function test_header() +	{ +		$this->assertEquals('application/json', $this->request->header('Accept')); +	} + +	public function test_header_escaping() +	{ +		$this->type_cast_helper +			->expects($this->once()) +			->method('recursive_set_var') +			->with( +				$this->anything(), +				'', +				true +			); + +		$this->request->header('SOMEVAR'); +	} + +	public function test_file() +	{ +		$file = $this->request->file('test'); +		$this->assertEquals('file', $file['name']); +		$this->assertEquals('tmp', $file['tmp_name']); +		$this->assertEquals(256, $file['size']); +		$this->assertEquals('application/octet-stream', $file['type']); +		$this->assertEquals(UPLOAD_ERR_OK, $file['error']); +	} + +	public function test_file_not_exists() +	{ +		$file = $this->request->file('404'); +		$this->assertTrue(is_array($file)); +		$this->assertTrue(empty($file)); +	} + +	/** +	* Checks that directly accessing $_POST will trigger +	* an error. +	*/ +	public function test_disable_post_super_global() +	{ +		$this->setExpectedTriggerError(E_USER_ERROR); +		$_POST['test'] = 3; +	} + +	public function test_is_set_post() +	{ +		$this->assertTrue($this->request->is_set_post('test')); +		$this->assertFalse($this->request->is_set_post('unset')); +	} + +	public function test_is_ajax_without_ajax() +	{ +		$this->assertFalse($this->request->is_ajax()); +	} + +	public function test_is_ajax_with_ajax() +	{ +		$this->request->enable_super_globals(); +		$_SERVER['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'; +		$this->request = new phpbb_request($this->type_cast_helper); + +		$this->assertTrue($this->request->is_ajax()); +	} + +	public function test_is_secure() +	{ +		$this->assertFalse($this->request->is_secure()); + +		$this->request->enable_super_globals(); +		$_SERVER['HTTPS'] = 'on'; +		$this->request = new phpbb_request($this->type_cast_helper); + +		$this->assertTrue($this->request->is_secure()); +	} + +	public function test_variable_names() +	{ +		$expected = array('test', 'unset'); +		$result = $this->request->variable_names(); +		$this->assertEquals($expected, $result); +	} + +	/** +	* Makes sure super globals work properly after these tests +	*/ +	protected function tearDown() +	{ +		$this->request->enable_super_globals(); +	} +} diff --git a/tests/request/request_var_test.php b/tests/request/request_var_test.php index 0c07fe11a3..0e85d4694b 100644 --- a/tests/request/request_var_test.php +++ b/tests/request/request_var_test.php @@ -10,9 +10,18 @@  require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';  require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php'; -class phpbb_request_request_var_test extends phpbb_test_case +class phpbb_request_var_test extends phpbb_test_case  {  	/** +	* Makes sure request_var has its standard behaviour. +	*/ +	protected function setUp() +	{ +		parent::setUp(); +		request_var(false, false, false, false, false); +	} + +	/**  	* @dataProvider request_variables  	*/  	public function test_post($variable_value, $default, $multibyte, $expected) @@ -73,7 +82,48 @@ class phpbb_request_request_var_test extends phpbb_test_case  		unset($_GET[$var], $_POST[$var], $_REQUEST[$var], $_COOKIE[$var]);  	} -	static public function request_variables() +	/** +	* @dataProvider deep_access +	* Only possible with 3.1.x (later) +	*/ +	public function test_deep_multi_dim_array_access($path, $default, $expected) +	{ +		$this->unset_variables('var'); + +		// cannot set $_REQUEST directly because in phpbb_request implementation +		// $_REQUEST = $_POST + $_GET +		$_POST['var'] = array( +			0 => array( +				'b' => array( +					true => array( +						5 => 'c', +						6 => 'd', +					), +				), +			), +			2 => array( +				3 => array( +					false => 5, +				), +			), +		); + +		$result = request_var($path, $default); +		$this->assertEquals($expected, $result, 'Testing deep access to multidimensional input arrays: ' . $path); +	} + +	public function deep_access() +	{ +		return array( +			// array(path, default, expected result) +			array(array('var', 0, 'b', true, 5), '', 'c'), +			array(array('var', 0, 'b', true, 6), '', 'd'), +			array(array('var', 2, 3, false), 0, 5), +			array(array('var', 0, 'b', true), array(0 => ''), array(5 => 'c', 6 => 'd')), +		); +	} + +	public function request_variables()  	{  		return array(  			// strings @@ -173,6 +223,50 @@ class phpbb_request_request_var_test extends phpbb_test_case  					'abc' => array()  				)  			), +			array( +				// input: +				array( +					0 => array(0 => array(3, '4', 'ab'), 1 => array()), +					1 => array(array(3, 4)), +				), +				// default: +				array(0 => array(0 => array(0))), +				false, +				// expected: +				array( +					0 => array(0 => array(3, 4, 0), 1 => array()), +					1 => array(array(3, 4)) +				) +			), +			array( +				// input: +				array( +					'ü' => array(array('c' => 'd')), +					'ä' => array(4 => array('a' => 2, 'ö' => 3)), +				), +				// default: +				array('' => array(0 => array('' => 0))), +				false, +				// expected: +				array( +					'??' => array(4 => array('a' => 2, '??' => 3)), +				) +			), +			array( +				// input: +				array( +					'ü' => array(array('c' => 'd')), +					'ä' => array(4 => array('a' => 2, 'ö' => 3)), +				), +				// default: +				array('' => array(0 => array('' => 0))), +				true, +				// expected: +				array( +					'ü' => array(array('c' => 0)), +					'ä' => array(4 => array('a' => 2, 'ö' => 3)), +				) +			),  		);  	} diff --git a/tests/request/type_cast_helper_test.php b/tests/request/type_cast_helper_test.php new file mode 100644 index 0000000000..f41db005af --- /dev/null +++ b/tests/request/type_cast_helper_test.php @@ -0,0 +1,71 @@ +<?php +/** +* +* @package testing +* @version $Id$ +* @copyright (c) 2009 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php'; + +class phpbb_type_cast_helper_test extends phpbb_test_case +{ +	private $type_cast_helper; + +	protected function setUp() +	{ +		$this->type_cast_helper = new phpbb_request_type_cast_helper(); +	} + +	public function test_addslashes_recursively() +	{ +		$data = array('some"string' => array('that"' => 'really"', 'needs"' => '"escaping')); +		$expected = array('some\\"string' => array('that\\"' => 'really\\"', 'needs\\"' => '\\"escaping')); + +		$this->type_cast_helper->addslashes_recursively($data); + +		$this->assertEquals($expected, $data); +	} + +	public function test_simple_recursive_set_var() +	{ +		$data = 'eviL<3'; +		$expected = 'eviL<3'; + +		$this->type_cast_helper->recursive_set_var($data, '', true); + +		$this->assertEquals($expected, $data); +	} + +	public function test_nested_recursive_set_var() +	{ +		$data = array('eviL<3'); +		$expected = array('eviL<3'); + +		$this->type_cast_helper->recursive_set_var($data, array(0 => ''), true); + +		$this->assertEquals($expected, $data); +	} + +	public function test_simple_untrimmed_recursive_set_var() +	{ +		$data = " eviL<3\t\t"; +		$expected = " eviL<3\t\t"; + +		$this->type_cast_helper->recursive_set_var($data, '', true, false); + +		$this->assertEquals($expected, $data); +	} + +	public function test_nested_untrimmed_recursive_set_var() +	{ +		$data = array(" eviL<3\t\t"); +		$expected = array(" eviL<3\t\t"); + +		$this->type_cast_helper->recursive_set_var($data, array(0 => ''), true, false); + +		$this->assertEquals($expected, $data); +	} +} diff --git a/tests/search/common_test_case.php b/tests/search/common_test_case.php new file mode 100644 index 0000000000..029637b00b --- /dev/null +++ b/tests/search/common_test_case.php @@ -0,0 +1,204 @@ +<?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__) . '/../test_framework/phpbb_search_test_case.php'; + +abstract class phpbb_search_common_test_case extends phpbb_search_test_case +{ +	public function keywords() +	{ +		return array( +			// keywords +			// terms +			// ok +			// split words +			// common words +			array( +				'fooo', +				'all', +				true, +				array('fooo'), +				array(), +			), +			array( +				'fooo baar', +				'all', +				true, +				array('fooo', 'baar'), +				array(), +			), +			// leading, trailing and multiple spaces +			array( +				'      fooo    baar   ', +				'all', +				true, +				array('fooo', 'baar'), +				array(), +			), +			// words too short +			array( +				'f', +				'all', +				false, +				null, +				// short words count as "common" words +				array('f'), +			), +			array( +				'f o o', +				'all', +				false, +				null, +				array('f', 'o', 'o'), +			), +			array( +				'f -o -o', +				'all', +				false, +				null, +				array('f', '-o', '-o'), +			), +			array( +				'fooo -baar', +				'all', +				true, +				array('-baar', 'fooo'), +				array(), +			), +			// all negative +			array( +				'-fooo', +				'all', +				true, +				array('-fooo'), +				array(), +			), +			array( +				'-fooo -baar', +				'all', +				true, +				array('-fooo', '-baar'), +				array(), +			), +			array( +				'fooo -fooo', +				'all', +				true, +				array('fooo', '-fooo'), +				array(), +			), +			array( +				'fooo fooo-', +				'all', +				true, +				array('fooo', 'fooo'), +				array(), +			), +			array( +				'-fooo fooo', +				'all', +				true, +				array('-fooo', 'fooo'), +				array(), +			), +			array( +				'fooo- fooo', +				'all', +				true, +				array('fooo', 'fooo'), +				array(), +			), +			array( +				'fooo-baar fooo', +				'all', +				true, +				array('fooo', 'baar', 'fooo'), +				array(), +			), +			array( +				'fooo-baar -fooo', +				'all', +				true, +				array('fooo', 'baar', '-fooo'), +				array(), +			), +			array( +				'fooo-baar fooo-', +				'all', +				true, +				array('fooo', 'baar', 'fooo'), +				array(), +			), +			array( +				'fooo-baar baar', +				'all', +				true, +				array('fooo', 'baar', 'baar'), +				array(), +			), +			array( +				'fooo-baar -baar', +				'all', +				true, +				array('fooo', 'baar', '-baar'), +				array(), +			), +			array( +				'fooo-baar baar-', +				'all', +				true, +				array('fooo', 'baar', 'baar'), +				array(), +			), +			array( +				'fooo-baar fooo-baar', +				'all', +				true, +				array('fooo', 'baar', 'fooo', 'baar'), +				array(), +			), +			array( +				'fooo-baar -fooo-baar', +				'all', +				true, +				array('fooo', 'baar', '-fooo', 'baar'), +				array(), +			), +			array( +				'fooo-baar fooo-baar-', +				'all', +				true, +				array('fooo', 'baar', 'fooo', 'baar'), +				array(), +			), +			array( +				'fooo-baar-baaz', +				'all', +				true, +				array('fooo', 'baar', 'baaz'), +				array(), +			), +		); +	} + +	/** +	* @dataProvider keywords +	*/ +	public function test_split_keywords($keywords, $terms, $ok, $split_words, $common) +	{ +		$rv = $this->search->split_keywords($keywords, $terms); +		$this->assertEquals($ok, $rv); +		if ($ok) +		{ +			// only check criteria if the search is going to be performed +			$this->assert_array_content_equals($split_words, $this->search->get_split_words()); +		} +		$this->assert_array_content_equals($common, $this->search->get_common_words()); +	} +} diff --git a/tests/search/fixtures/posts.xml b/tests/search/fixtures/posts.xml new file mode 100644 index 0000000000..7b249ee303 --- /dev/null +++ b/tests/search/fixtures/posts.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<dataset> +	<table name="phpbb_posts"> +		<column>post_username</column> +		<column>post_subject</column> +		<column>post_text</column> +		<row> +			<value>foo</value> +			<value>foo</value> +			<value>foo</value> +		</row> +		<row> +			<value>bar</value> +			<value>bar</value> +			<value>bar</value> +		</row> +		<row> +			<value>commonword</value> +			<value>commonword</value> +			<value>commonword</value> +		</row> +	</table> +	<table name="phpbb_search_wordlist"> +		<column>word_id</column> +		<column>word_text</column> +		<column>word_common</column> +		<row> +			<value>1</value> +			<value>foo</value> +			<value>0</value> +		</row> +		<row> +			<value>2</value> +			<value>bar</value> +			<value>0</value> +		</row> +		<row> +			<value>3</value> +			<value>commonword</value> +			<value>1</value> +		</row> +	</table> +</dataset> diff --git a/tests/search/mysql_test.php b/tests/search/mysql_test.php new file mode 100644 index 0000000000..3ad15bd806 --- /dev/null +++ b/tests/search/mysql_test.php @@ -0,0 +1,40 @@ +<?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__) . '/common_test_case.php'; + +class phpbb_search_mysql_test extends phpbb_search_common_test_case +{ +	protected $db; +	protected $search; + +	public function getDataSet() +	{ +		return $this->createXMLDataSet(dirname(__FILE__) . '/../fixtures/empty.xml'); +	} + +	protected function setUp() +	{ +		global $phpbb_root_path, $phpEx, $config, $user, $cache; + +		parent::setUp(); + +		// dbal uses cache +		$cache = new phpbb_mock_cache(); + +		//  set config values +		$config['fulltext_mysql_min_word_len'] = 4; +		$config['fulltext_mysql_max_word_len'] = 254; + +		$this->db = $this->new_dbal(); +		$error = null; +		$class = self::get_search_wrapper('phpbb_search_fulltext_mysql'); +		$this->search = new $class($error, $phpbb_root_path, $phpEx, null, $config, $this->db, $user); +	} +} diff --git a/tests/search/native_test.php b/tests/search/native_test.php new file mode 100644 index 0000000000..4a2c210013 --- /dev/null +++ b/tests/search/native_test.php @@ -0,0 +1,158 @@ +<?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__) . '/../test_framework/phpbb_search_test_case.php'; + +class phpbb_search_native_test extends phpbb_search_test_case +{ +	protected $db; +	protected $search; + +	public function getDataSet() +	{ +		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/posts.xml'); +	} + +	protected function setUp() +	{ +		global $phpbb_root_path, $phpEx, $config, $user, $cache; + +		parent::setUp(); + +		// dbal uses cache +		$cache = new phpbb_mock_cache(); + +		$this->db = $this->new_dbal(); +		$error = null; +		$class = self::get_search_wrapper('phpbb_search_fulltext_native'); +		$this->search = new $class($error, $phpbb_root_path, $phpEx, null, $config, $this->db, $user); +	} + +	public function keywords() +	{ +		return array( +			// keywords +			// terms +			// ok +			// must contain ids +			// must not contain ids +			// common words +			array( +				'foo', +				'all', +				true, +				array(1), +				array(), +				array(), +			), +			array( +				'foo bar', +				'all', +				true, +				array(1, 2), +				array(), +				array(), +			), +			// leading, trailing and multiple spaces +			array( +				'      foo    bar   ', +				'all', +				true, +				array(1, 2), +				array(), +				array(), +			), +			// words too short +			array( +				'f', +				'all', +				false, +				null, +				null, +				// short words count as "common" words +				array('f'), +			), +			array( +				'f o o', +				'all', +				false, +				null, +				null, +				array('f', 'o', 'o'), +			), +			array( +				'f -o -o', +				'all', +				false, +				null, +				null, +				array('f', 'o', 'o'), +			), +			array( +				'foo -bar', +				'all', +				true, +				array(1), +				array(2), +				array(), +			), +			// all negative +			array( +				'-foo', +				'all', +				false, +				null, +				null, +				array(), +			), +			array( +				'-foo -bar', +				'all', +				false, +				null, +				null, +				array(), +			), +			// all common +			array( +				'commonword', +				'all', +				false, +				null, +				null, +				array('commonword'), +			), +			// some common +			array( +				'commonword foo', +				'all', +				true, +				array(1), +				array(), +				array('commonword'), +			), +		); +	} + +	/** +	* @dataProvider keywords +	*/ +	public function test_split_keywords($keywords, $terms, $ok, $must_contain, $must_not_contain, $common) +	{ +		$rv = $this->search->split_keywords($keywords, $terms); +		$this->assertEquals($ok, $rv); +		if ($ok) +		{ +			// only check criteria if the search is going to be performed +			$this->assert_array_content_equals($must_contain, $this->search->get_must_contain_ids()); +			$this->assert_array_content_equals($must_not_contain, $this->search->get_must_not_contain_ids()); +		} +		$this->assert_array_content_equals($common, $this->search->get_common_words()); +	} +} diff --git a/tests/search/postgres_test.php b/tests/search/postgres_test.php new file mode 100644 index 0000000000..923af6f854 --- /dev/null +++ b/tests/search/postgres_test.php @@ -0,0 +1,40 @@ +<?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__) . '/common_test_case.php'; + +class phpbb_search_postgres_test extends phpbb_search_common_test_case +{ +	protected $db; +	protected $search; + +	public function getDataSet() +	{ +		return $this->createXMLDataSet(dirname(__FILE__) . '/../fixtures/empty.xml'); +	} + +	protected function setUp() +	{ +		global $phpbb_root_path, $phpEx, $config, $user, $cache; + +		parent::setUp(); + +		// dbal uses cache +		$cache = new phpbb_mock_cache(); + +		//  set config values +		$config['fulltext_postgres_min_word_len'] = 4; +		$config['fulltext_postgres_max_word_len'] = 254; + +		$this->db = $this->new_dbal(); +		$error = null; +		$class = self::get_search_wrapper('phpbb_search_fulltext_postgres'); +		$this->search = new $class($error, $phpbb_root_path, $phpEx, null, $config, $this->db, $user); +	} +} diff --git a/tests/security/base.php b/tests/security/base.php index 2658798237..08878ad60d 100644 --- a/tests/security/base.php +++ b/tests/security/base.php @@ -14,20 +14,20 @@ abstract class phpbb_security_test_base extends phpbb_test_case  	*/  	protected function setUp()  	{ -		global $user, $phpbb_root_path; +		global $user, $phpbb_root_path, $request;  		// Put this into a global function being run by every test to init a proper user session -		$_SERVER['HTTP_HOST']		= 'localhost'; -		$_SERVER['SERVER_NAME']		= 'localhost'; -		$_SERVER['SERVER_ADDR']		= '127.0.0.1'; -		$_SERVER['SERVER_PORT']		= 80; -		$_SERVER['REMOTE_ADDR']		= '127.0.0.1'; -		$_SERVER['QUERY_STRING']	= ''; -		$_SERVER['REQUEST_URI']		= '/tests/'; -		$_SERVER['SCRIPT_NAME']		= '/tests/index.php'; -		$_SERVER['PHP_SELF']		= '/tests/index.php'; -		$_SERVER['HTTP_USER_AGENT']	= 'Mozilla/5.0 (Windows; U; Windows NT 6.0; de; rv:1.8.1.14) Gecko/20080404 Firefox/2.0.0.14'; -		$_SERVER['HTTP_ACCEPT_LANGUAGE']	= 'de-de,de;q=0.8,en-us;q=0.5,en;q=0.3'; +		$server['HTTP_HOST']		= 'localhost'; +		$server['SERVER_NAME']		= 'localhost'; +		$server['SERVER_ADDR']		= '127.0.0.1'; +		$server['SERVER_PORT']		= 80; +		$server['REMOTE_ADDR']		= '127.0.0.1'; +		$server['QUERY_STRING']	= ''; +		$server['REQUEST_URI']		= '/tests/'; +		$server['SCRIPT_NAME']		= '/tests/index.php'; +		$server['PHP_SELF']		= '/tests/index.php'; +		$server['HTTP_USER_AGENT']	= 'Mozilla/5.0 (Windows; U; Windows NT 6.0; de; rv:1.8.1.14) Gecko/20080404 Firefox/2.0.0.14'; +		$server['HTTP_ACCEPT_LANGUAGE']	= 'de-de,de;q=0.8,en-us;q=0.5,en;q=0.3';  /*  		[HTTP_ACCEPT_ENCODING] => gzip,deflate @@ -36,14 +36,16 @@ abstract class phpbb_security_test_base extends phpbb_test_case  		[SCRIPT_FILENAME] => /var/www/tests/index.php  */ +		$request = new phpbb_mock_request(array(), array(), array(), $server); +  		// Set no user and trick a bit to circumvent errors -		$user = new user(); +		$user = new phpbb_user();  		$user->lang = true; -		$user->browser				= (!empty($_SERVER['HTTP_USER_AGENT'])) ? htmlspecialchars((string) $_SERVER['HTTP_USER_AGENT']) : ''; -		$user->referer				= (!empty($_SERVER['HTTP_REFERER'])) ? htmlspecialchars((string) $_SERVER['HTTP_REFERER']) : ''; -		$user->forwarded_for		= (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) ? (string) $_SERVER['HTTP_X_FORWARDED_FOR'] : ''; -		$user->host					= (!empty($_SERVER['HTTP_HOST'])) ? (string) strtolower($_SERVER['HTTP_HOST']) : ((!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME')); -		$user->page = session::extract_current_page($phpbb_root_path); +		$user->browser				= $server['HTTP_USER_AGENT']; +		$user->referer				= ''; +		$user->forwarded_for		= ''; +		$user->host					= $server['HTTP_HOST']; +		$user->page = phpbb_session::extract_current_page($phpbb_root_path);  	}  	protected function tearDown() diff --git a/tests/security/extract_current_page_test.php b/tests/security/extract_current_page_test.php index 0f5128884b..d77cbbcaf3 100644 --- a/tests/security/extract_current_page_test.php +++ b/tests/security/extract_current_page_test.php @@ -10,11 +10,10 @@  require_once dirname(__FILE__) . '/base.php';  require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; -require_once dirname(__FILE__) . '/../../phpBB/includes/session.php';  class phpbb_security_extract_current_page_test extends phpbb_security_test_base  { -	static public function security_variables() +	public function security_variables()  	{  		return array(  			array('http://localhost/phpBB/index.php', 'mark=forums&x="><script>alert(/XSS/);</script>', 'mark=forums&x=%22%3E%3Cscript%3Ealert(/XSS/);%3C/script%3E'), @@ -27,10 +26,14 @@ class phpbb_security_extract_current_page_test extends phpbb_security_test_base  	*/  	public function test_query_string_php_self($url, $query_string, $expected)  	{ -		$_SERVER['PHP_SELF'] = $url; -		$_SERVER['QUERY_STRING'] = $query_string; +		global $request; -		$result = session::extract_current_page('./'); +		$request->merge(phpbb_request_interface::SERVER, array( +			'PHP_SELF'	=> $url, +			'QUERY_STRING'	=> $query_string, +		)); + +		$result = phpbb_session::extract_current_page('./');  		$label = 'Running extract_current_page on ' . $query_string . ' with PHP_SELF filled.';  		$this->assertEquals($expected, $result['query_string'], $label); @@ -41,10 +44,14 @@ class phpbb_security_extract_current_page_test extends phpbb_security_test_base  	*/  	public function test_query_string_request_uri($url, $query_string, $expected)  	{ -		$_SERVER['REQUEST_URI'] = $url . '?' . $query_string; -		$_SERVER['QUERY_STRING'] = $query_string; +		global $request; + +		$request->merge(phpbb_request_interface::SERVER, array( +			'PHP_SELF'	=> $url, +			'QUERY_STRING'	=> $query_string, +		)); -		$result = session::extract_current_page('./'); +		$result = phpbb_session::extract_current_page('./');  		$label = 'Running extract_current_page on ' . $query_string . ' with REQUEST_URI filled.';  		$this->assertEquals($expected, $result['query_string'], $label); diff --git a/tests/security/redirect_test.php b/tests/security/redirect_test.php index 872a331dc7..8e36780ca4 100644 --- a/tests/security/redirect_test.php +++ b/tests/security/redirect_test.php @@ -10,27 +10,26 @@  require_once dirname(__FILE__) . '/base.php';  require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; -require_once dirname(__FILE__) . '/../../phpBB/includes/session.php';  class phpbb_security_redirect_test extends phpbb_security_test_base  { -	static public function provider() +	public function provider()  	{  		// array(Input -> redirect(), expected triggered error (else false), expected returned result url (else false))  		return array(  			array('data://x', false, 'http://localhost/phpBB'), -			array('bad://localhost/phpBB/index.php', 'Tried to redirect to potentially insecure url.', false), +			array('bad://localhost/phpBB/index.php', 'INSECURE_REDIRECT', false),  			array('http://www.otherdomain.com/somescript.php', false, 'http://localhost/phpBB'), -			array("http://localhost/phpBB/memberlist.php\n\rConnection: close", 'Tried to redirect to potentially insecure url.', false), +			array("http://localhost/phpBB/memberlist.php\n\rConnection: close", 'INSECURE_REDIRECT', false),  			array('javascript:test', false, 'http://localhost/phpBB/../javascript:test'), -			array('http://localhost/phpBB/index.php;url=', 'Tried to redirect to potentially insecure url.', false), +			array('http://localhost/phpBB/index.php;url=', 'INSECURE_REDIRECT', false),  		);  	}  	protected function setUp()  	{  		parent::setUp(); -		 +  		$GLOBALS['config'] = array(  			'force_server_vars'	=> '0',  		); @@ -57,4 +56,3 @@ class phpbb_security_redirect_test extends phpbb_security_test_base  		}  	}  } - diff --git a/tests/session/append_sid_test.php b/tests/session/append_sid_test.php index ce7bf71215..b9e9ac1aa9 100644 --- a/tests/session/append_sid_test.php +++ b/tests/session/append_sid_test.php @@ -45,6 +45,10 @@ class phpbb_session_append_sid_test extends phpbb_test_case  	*/  	public function test_append_sid($url, $params, $is_amp, $session_id, $expected, $description)  	{ +		global $phpbb_dispatcher; + +		$phpbb_dispatcher = new phpbb_mock_event_dispatcher;  		$this->assertEquals($expected, append_sid($url, $params, $is_amp, $session_id));  	}  } + diff --git a/tests/session/continue_test.php b/tests/session/continue_test.php index c4f7f8d75b..e5a7f7a4a1 100644 --- a/tests/session/continue_test.php +++ b/tests/session/continue_test.php @@ -7,7 +7,6 @@  *  */ -require_once dirname(__FILE__) . '/../mock/cache.php';  require_once dirname(__FILE__) . '/testable_factory.php';  class phpbb_session_continue_test extends phpbb_database_test_case @@ -54,7 +53,20 @@ class phpbb_session_continue_test extends phpbb_database_test_case  	*/  	public function test_session_begin_valid_session($session_id, $user_id, $user_agent, $ip, $expected_sessions, $expected_cookies, $message)  	{ +		global $phpbb_container, $phpbb_root_path, $phpEx; +  		$db = $this->new_dbal(); +		$config = new phpbb_config(array()); +		$request = $this->getMock('phpbb_request'); +		$user = $this->getMock('phpbb_user'); + +		$auth_provider = new phpbb_auth_provider_db($db, $config, $request, $user, $phpbb_root_path, $phpEx); +		$phpbb_container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface'); +		$phpbb_container->expects($this->any()) +			->method('get') +			->with('auth.provider.db') +			->will($this->returnValue($auth_provider)); +  		$session_factory = new phpbb_session_testable_factory;  		$session_factory->set_cookies(array(  			'_sid' => $session_id, diff --git a/tests/session/creation_test.php b/tests/session/creation_test.php index bef52c6554..fde76d6b06 100644 --- a/tests/session/creation_test.php +++ b/tests/session/creation_test.php @@ -7,7 +7,6 @@  *  */ -require_once dirname(__FILE__) . '/../mock/cache.php';  require_once dirname(__FILE__) . '/testable_factory.php';  class phpbb_session_creation_test extends phpbb_database_test_case @@ -21,7 +20,20 @@ class phpbb_session_creation_test extends phpbb_database_test_case  	public function test_login_session_create()  	{ +		global $phpbb_container, $phpbb_root_path, $phpEx; +  		$db = $this->new_dbal(); +		$config = new phpbb_config(array()); +		$request = $this->getMock('phpbb_request'); +		$user = $this->getMock('phpbb_user'); + +		$auth_provider = new phpbb_auth_provider_db($db, $config, $request, $user, $phpbb_root_path, $phpEx); +		$phpbb_container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface'); +		$phpbb_container->expects($this->any()) +			->method('get') +			->with('auth.provider.db') +			->will($this->returnValue($auth_provider)); +  		$session_factory = new phpbb_session_testable_factory;  		$session = $session_factory->get_session($db); diff --git a/tests/session/testable_factory.php b/tests/session/testable_factory.php index 00f79738ef..1e2b194ece 100644 --- a/tests/session/testable_factory.php +++ b/tests/session/testable_factory.php @@ -7,8 +7,6 @@  *  */ -require_once dirname(__FILE__) . '/../mock/session_testable.php'; -  /**  * This class exists to setup an instance of phpbb's session class for testing.  * @@ -24,6 +22,7 @@ class phpbb_session_testable_factory  	protected $config;  	protected $cache; +	protected $request;  	/**  	* Initialises the factory with a set of default config and cache values. @@ -60,23 +59,30 @@ class phpbb_session_testable_factory  	/**  	* Retrieve the configured session class instance  	* -	* @param dbal $dbal The database connection to use for session data +	* @param phpbb_db_driver $dbal The database connection to use for session data  	* @return phpbb_mock_session_testable A session instance  	*/ -	public function get_session(dbal $dbal) +	public function get_session(phpbb_db_driver $dbal)  	{  		// set up all the global variables used by session -		global $SID, $_SID, $db, $config, $cache; +		global $SID, $_SID, $db, $config, $cache, $request; + +		$request = $this->request = new phpbb_mock_request( +			array(), +			array(), +			$this->cookies, +			$this->server_data +		); +		request_var(null, null, null, null, $request); + +		$config = $this->config = new phpbb_config($this->get_config_data()); +		set_config(null, null, null, $config); -		$config = $this->config = $this->get_config_data();  		$db = $dbal;  		$cache = $this->cache = new phpbb_mock_cache($this->get_cache_data());  		$SID = $_SID = null; -		$_COOKIE = $this->cookies; -		$_SERVER = $this->server_data; -  		$session = new phpbb_mock_session_testable;  		return $session;  	} diff --git a/tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/test.html b/tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/test.html new file mode 100644 index 0000000000..3eb906a09e --- /dev/null +++ b/tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/test.html @@ -0,0 +1 @@ +Kappa test event in all diff --git a/tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/test.html b/tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/test.html new file mode 100644 index 0000000000..3b65d80a6d --- /dev/null +++ b/tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/test.html @@ -0,0 +1 @@ +Kappa test event in silver diff --git a/tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/test.html b/tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/test.html new file mode 100644 index 0000000000..26826d59e3 --- /dev/null +++ b/tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/test.html @@ -0,0 +1 @@ +Kappa test event in silver_inherit diff --git a/tests/template/datasets/event_inheritance/ext/omega/styles/all/template/test.html b/tests/template/datasets/event_inheritance/ext/omega/styles/all/template/test.html new file mode 100644 index 0000000000..003d193dc3 --- /dev/null +++ b/tests/template/datasets/event_inheritance/ext/omega/styles/all/template/test.html @@ -0,0 +1 @@ +Omega test event in all diff --git a/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/test.html b/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/test.html new file mode 100644 index 0000000000..6bf06f5457 --- /dev/null +++ b/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/test.html @@ -0,0 +1 @@ +Omega test event in silver diff --git a/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/two.html b/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/two.html new file mode 100644 index 0000000000..7f8058f4e4 --- /dev/null +++ b/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/two.html @@ -0,0 +1 @@ +two in silver in omega diff --git a/tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/test.html b/tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/test.html new file mode 100644 index 0000000000..5fc7e5ac12 --- /dev/null +++ b/tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/test.html @@ -0,0 +1 @@ +Zeta test event in all diff --git a/tests/template/datasets/event_inheritance/styles/silver/template/event_test.html b/tests/template/datasets/event_inheritance/styles/silver/template/event_test.html new file mode 100644 index 0000000000..4d78dddb12 --- /dev/null +++ b/tests/template/datasets/event_inheritance/styles/silver/template/event_test.html @@ -0,0 +1 @@ +<!-- EVENT test --> diff --git a/tests/template/datasets/event_inheritance/styles/silver/template/event_two.html b/tests/template/datasets/event_inheritance/styles/silver/template/event_two.html new file mode 100644 index 0000000000..fe46be3782 --- /dev/null +++ b/tests/template/datasets/event_inheritance/styles/silver/template/event_two.html @@ -0,0 +1 @@ +<!-- EVENT two --> diff --git a/tests/template/datasets/event_inheritance/styles/silver_inherit/template/event_test.html b/tests/template/datasets/event_inheritance/styles/silver_inherit/template/event_test.html new file mode 100644 index 0000000000..4d78dddb12 --- /dev/null +++ b/tests/template/datasets/event_inheritance/styles/silver_inherit/template/event_test.html @@ -0,0 +1 @@ +<!-- EVENT test --> diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event_variable_spacing.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event_variable_spacing.html new file mode 100644 index 0000000000..028f8aa0d1 --- /dev/null +++ b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event_variable_spacing.html @@ -0,0 +1,6 @@ +|{VARIABLE}| +{VARIABLE}|{VARIABLE}| + +|{VARIABLE} + +<div class="{VARIABLE}">test</div> diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/universal.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/universal.html new file mode 100644 index 0000000000..f2c5762ade --- /dev/null +++ b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/universal.html @@ -0,0 +1 @@ +Universal in trivial extension. diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/simple.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/simple.html new file mode 100644 index 0000000000..fe32a1ed3f --- /dev/null +++ b/tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/simple.html @@ -0,0 +1 @@ +Simple in trivial extension. diff --git a/tests/template/datasets/ext_trivial/styles/silver/template/event_simple.html b/tests/template/datasets/ext_trivial/styles/silver/template/event_simple.html new file mode 100644 index 0000000000..604c1acdce --- /dev/null +++ b/tests/template/datasets/ext_trivial/styles/silver/template/event_simple.html @@ -0,0 +1 @@ +<!-- EVENT simple --> diff --git a/tests/template/datasets/ext_trivial/styles/silver/template/event_universal.html b/tests/template/datasets/ext_trivial/styles/silver/template/event_universal.html new file mode 100644 index 0000000000..15425cacc3 --- /dev/null +++ b/tests/template/datasets/ext_trivial/styles/silver/template/event_universal.html @@ -0,0 +1 @@ +<!-- EVENT universal --> diff --git a/tests/template/datasets/ext_trivial/styles/silver/template/variable_spacing.html b/tests/template/datasets/ext_trivial/styles/silver/template/variable_spacing.html new file mode 100644 index 0000000000..49d8a6b873 --- /dev/null +++ b/tests/template/datasets/ext_trivial/styles/silver/template/variable_spacing.html @@ -0,0 +1 @@ +<!-- EVENT event_variable_spacing --> diff --git a/tests/template/includephp_test.php b/tests/template/includephp_test.php new file mode 100644 index 0000000000..a3dc9bd5c5 --- /dev/null +++ b/tests/template/includephp_test.php @@ -0,0 +1,56 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2011 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +require_once dirname(__FILE__) . '/template_test_case.php'; + +class phpbb_template_includephp_test extends phpbb_template_template_test_case +{ +	public function test_includephp_relative() +	{ +		$this->setup_engine(array('tpl_allow_php' => true)); + +		$this->run_template('includephp_relative.html', array(), array(), array(), "Path is relative to board root.\ntesting included php"); + +		$this->template->set_filenames(array('test' => 'includephp_relative.html')); +		$this->assertEquals("Path is relative to board root.\ntesting included php", $this->display('test'), "Testing INCLUDEPHP"); +	} + +	public function test_includephp_variables() +	{ +		$this->setup_engine(array('tpl_allow_php' => true)); + +		$this->run_template('includephp_variables.html', array('TEMPLATES' => 'templates'), array(), array(), "Path includes variables.\ntesting included php"); + +		$this->template->set_filenames(array('test' => 'includephp_variables.html')); +		$this->assertEquals("Path includes variables.\ntesting included php", $this->display('test'), "Testing INCLUDEPHP"); +	} + +	public function test_includephp_absolute() +	{ +		global $phpbb_root_path; + +		$path_to_php = str_replace('\\', '/', dirname(__FILE__)) . '/templates/_dummy_include.php.inc'; +		$this->assertTrue(phpbb_is_absolute($path_to_php)); +		$template_text = "Path is absolute.\n<!-- INCLUDEPHP $path_to_php -->"; + +		$cache_dir = dirname($phpbb_root_path . 'cache') . '/'; +		$fp = fopen($cache_dir . 'includephp_absolute.html', 'w'); +		fputs($fp, $template_text); +		fclose($fp); + +		$this->setup_engine(array('tpl_allow_php' => true)); + +		$this->style->set_custom_style('tests', $cache_dir, array(), ''); + +		$this->run_template('includephp_absolute.html', array(), array(), array(), "Path is absolute.\ntesting included php"); + +		$this->template->set_filenames(array('test' => 'includephp_absolute.html')); +		$this->assertEquals("Path is absolute.\ntesting included php", $this->display('test'), "Testing INCLUDEPHP"); +	} +} diff --git a/tests/template/parent_templates/parent_and_child.html b/tests/template/parent_templates/parent_and_child.html new file mode 100644 index 0000000000..71984b48ad --- /dev/null +++ b/tests/template/parent_templates/parent_and_child.html @@ -0,0 +1 @@ +Parent template. diff --git a/tests/template/parent_templates/parent_and_child.js b/tests/template/parent_templates/parent_and_child.js new file mode 100644 index 0000000000..6d9bb163bf --- /dev/null +++ b/tests/template/parent_templates/parent_and_child.js @@ -0,0 +1 @@ +// JavaScript file in a parent style. diff --git a/tests/template/parent_templates/parent_only.css b/tests/template/parent_templates/parent_only.css new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/tests/template/parent_templates/parent_only.css diff --git a/tests/template/parent_templates/parent_only.html b/tests/template/parent_templates/parent_only.html new file mode 100644 index 0000000000..8cfb90eca2 --- /dev/null +++ b/tests/template/parent_templates/parent_only.html @@ -0,0 +1 @@ +Only in parent. diff --git a/tests/template/parent_templates/parent_only.js b/tests/template/parent_templates/parent_only.js new file mode 100644 index 0000000000..9c3007d83f --- /dev/null +++ b/tests/template/parent_templates/parent_only.js @@ -0,0 +1 @@ +// JavaScript file only in parent style. diff --git a/tests/template/subdir/includephp_from_subdir_test.php b/tests/template/subdir/includephp_from_subdir_test.php new file mode 100644 index 0000000000..6f9bc1efa6 --- /dev/null +++ b/tests/template/subdir/includephp_from_subdir_test.php @@ -0,0 +1,27 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2011 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +require_once dirname(__FILE__) . '/../template_test_case.php'; + +class phpbb_template_subdir_includephp_from_subdir_test extends phpbb_template_template_test_case +{ +	// Exact copy of test_includephp_relatve from ../includephp_test.php. +	// Verifies that relative php inclusion works when including script +	// (and thus current working directory) is in a subdirectory of +	// board root. +	public function test_includephp_relative() +	{ +		$this->setup_engine(array('tpl_allow_php' => true)); + +		$this->run_template('includephp_relative.html', array(), array(), array(), "Path is relative to board root.\ntesting included php"); + +		$this->template->set_filenames(array('test' => 'includephp_relative.html')); +		$this->assertEquals("Path is relative to board root.\ntesting included php", $this->display('test'), "Testing INCLUDEPHP"); +	} +} diff --git a/tests/template/template_events_test.php b/tests/template/template_events_test.php new file mode 100644 index 0000000000..f7bcd2dcc6 --- /dev/null +++ b/tests/template/template_events_test.php @@ -0,0 +1,115 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2011 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +require_once dirname(__FILE__) . '/template_test_case.php'; + +class phpbb_template_template_events_test extends phpbb_template_template_test_case +{ +	public function template_data() +	{ +		return array( +			/* +			array( +				'', // Description +				'', // dataset +				array(), // style names +				'', // file +				array(), // vars +				array(), // block vars +				array(), // destroy +				'', // expected result +			), +			*/ +			array( +				'Simple template event', +				'ext_trivial', +				array(), +				'event_simple.html', +				array(), +				array(), +				array(), +				"Simple in trivial extension.", +			), +			array( +				'Universal template event ("all" style)', +				'ext_trivial', +				array(), +				'event_universal.html', +				array(), +				array(), +				array(), +				"Universal in trivial extension.", +			), +			array( +				'Template event with inheritance - parent', +				'event_inheritance', +				array('silver'), +				'event_test.html', +				array(), +				array(), +				array(), +'Kappa test event in silver +Omega test event in silver +Zeta test event in all', +			), +			array( +				'Template event with inheritance - child', +				'event_inheritance', +				array('silver_inherit', 'silver'), +				'event_test.html', +				array(), +				array(), +				array(), +'Kappa test event in silver_inherit +Omega test event in silver +Zeta test event in all', +			), +			array( +				'Definition in parent style', +				'event_inheritance', +				array('silver_inherit', 'silver'), +				'event_two.html', +				array(), +				array(), +				array(), +'two in silver in omega', +			), +		); +	} + +	/** +	* @dataProvider template_data +	*/ +	public function test_event($desc, $dataset, $style_names, $file, array $vars, array $block_vars, array $destroy, $expected) +	{ +		// Reset the engine state +		$this->setup_engine_for_events($dataset, $style_names); + +		// Run test +		$this->run_template($file, $vars, $block_vars, $destroy, $expected); +	} + +	protected function setup_engine_for_events($dataset, $style_names, array $new_config = array()) +	{ +		global $phpbb_root_path, $phpEx, $user; + +		$defaults = $this->config_defaults(); +		$config = new phpbb_config(array_merge($defaults, $new_config)); + +		$this->template_path = dirname(__FILE__) . "/datasets/$dataset/styles/silver/template"; +		$this->style_resource_locator = new phpbb_style_resource_locator(); +		$this->extension_manager = new phpbb_mock_filesystem_extension_manager( +			dirname(__FILE__) . "/datasets/$dataset/" +		); +		$this->template = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $user, new phpbb_template_context, $this->extension_manager); +		$this->style_provider = new phpbb_style_path_provider(); +		$this->style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider, $this->template); +		$this->style->set_custom_style('silver', array($this->template_path), $style_names, ''); +	} +} diff --git a/tests/template/template_includecss_test.php b/tests/template/template_includecss_test.php new file mode 100644 index 0000000000..f8999ad1a9 --- /dev/null +++ b/tests/template/template_includecss_test.php @@ -0,0 +1,28 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +require_once dirname(__FILE__) . '/template_test_case_with_tree.php'; + +class phpbb_template_template_includecss_test extends phpbb_template_template_test_case_with_tree +{ +	public function test_includecss_compilation() +	{ +		// Reset the engine state +		$this->setup_engine(array('assets_version' => 1)); + +		// Prepare correct result +		$scripts = array( +			'<link href="' . $this->test_path . '/templates/child_only.css?assets_version=1" rel="stylesheet" type="text/css" media="screen, projection" />', +			'<link href="' . $this->test_path . '/parent_templates/parent_only.css?assets_version=1" rel="stylesheet" type="text/css" media="screen, projection" />', +		); + +		// Run test +		$this->run_template('includecss.html', array(), array(), array(), implode('', $scripts)); +	} +} diff --git a/tests/template/template_includejs_test.php b/tests/template/template_includejs_test.php new file mode 100644 index 0000000000..ea5c30891b --- /dev/null +++ b/tests/template/template_includejs_test.php @@ -0,0 +1,107 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2011 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +require_once dirname(__FILE__) . '/template_test_case_with_tree.php'; + +class phpbb_template_template_includejs_test extends phpbb_template_template_test_case_with_tree +{ +	public function template_data() +	{ +		return array( +			/* +			array( +				// vars +				// expected +			), +			*/ +			array( +				array('TEST' => 1), +				'<script type="text/javascript" src="' . $this->test_path . '/templates/parent_and_child.js?assets_version=1"></script>', +			), +			array( +				array('TEST' => 2), +				'<script type="text/javascript" src="' . $this->test_path . '/templates/parent_and_child.js?assets_version=0&assets_version=1"></script>', +			), +			array( +				array('TEST' => 3), +			'<script type="text/javascript" src="' . $this->test_path . '/templates/parent_and_child.js?test=1&assets_version=0&assets_version=1"></script>', +			), +			array( +				array('TEST' => 4), +				'<script type="text/javascript" src="' . $this->test_path . '/templates/parent_and_child.js?test=1&assets_version=0&assets_version=1"></script>', +			), +			array( +				array('TEST' => 5), +				'<script type="text/javascript" src="' . $this->test_path . '/templates/parent_and_child.js?test=1;assets_version=0&assets_version=1"></script>', +			), +			array( +				array('TEST' => 6), +				'<script type="text/javascript" src="' . $this->test_path . '/parent_templates/parent_only.js?assets_version=1"></script>', +			), +			array( +				array('TEST' => 7), +				'<script type="text/javascript" src="' . $this->test_path . '/templates/child_only.js?assets_version=1"></script>', +			), +			array( +				array('TEST' => 8), +				'<script type="text/javascript" src="' . $this->test_path . '/templates/subdir/parent_only.js?assets_version=1"></script>', +			), +			array( +				array('TEST' => 9), +				'<script type="text/javascript" src="' . $this->test_path . '/templates/subdir/subsubdir/parent_only.js?assets_version=1"></script>', +			), +			array( +				array('TEST' => 10), +				'<script type="text/javascript" src="' . $this->test_path . '/templates/subdir/parent_only.js?assets_version=1"></script>', +			), +			array( +				array('TEST' => 11), +				'<script type="text/javascript" src="' . $this->test_path . '/templates/child_only.js?test1=1&test2=2&assets_version=1#test3"></script>', +			), +			array( +				array('TEST' => 12), +				'<script type="text/javascript" src="' . $this->test_path . '/parent_templates/parent_only.js?test1=1&test2=2&assets_version=1#test3"></script>', +			), +			array( +				array('TEST' => 13), +				'<script type="text/javascript" src="' . $this->test_path . '/parent_templates/parent_only.js?test1=1;test2=2&assets_version=1#test3"></script>', +			), +			array( +				array('TEST' => 14), +				'<script type="text/javascript" src="' . $this->test_path . '/parent_templates/parent_only.js?test1="&assets_version=1#test3"></script>', +			), +			array( +				array('TEST' => 15), +				'<script type="text/javascript" src="http://phpbb.com/b.js?c=d#f"></script>', +			), +			array( +				array('TEST' => 16), +				'<script type="text/javascript" src="http://phpbb.com/b.js?c=d&assets_version=1#f"></script>', +			), +			array( +				array('TEST' => 17), +				'<script type="text/javascript" src="//phpbb.com/b.js"></script>', +			), +		); +	} + +	/** +	* @dataProvider template_data +	*/ +	public function test_includejs_compilation($vars, $expected) +	{ +		// Reset the engine state +		$this->setup_engine(array('assets_version' => 1)); + +		$this->template->assign_vars($vars); + +		// Run test +		$this->run_template('includejs.html', array_merge(array('PARENT' => 'parent_only.js', 'SUBDIR' => 'subdir', 'EXT' => 'js'), $vars), array(), array(), $expected); +	} +} diff --git a/tests/template/template_inheritance_test.php b/tests/template/template_inheritance_test.php new file mode 100644 index 0000000000..cc71ff99e0 --- /dev/null +++ b/tests/template/template_inheritance_test.php @@ -0,0 +1,55 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2011 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +require_once dirname(__FILE__) . '/template_test_case_with_tree.php'; + +class phpbb_template_template_inheritance_test extends phpbb_template_template_test_case_with_tree +{ +	/** +	 * @todo put test data into templates/xyz.test +	 */ +	public function template_data() +	{ +		return array( +			// First element of the array is test name - keep them distinct +			array( +				'simple inheritance - only parent template exists', +				'parent_only.html', +				array(), +				array(), +				array(), +				"Only in parent.", +			), +			array( +				'simple inheritance - only child template exists', +				'child_only.html', +				array(), +				array(), +				array(), +				"Only in child.", +			), +			array( +				'simple inheritance - both parent and child templates exist', +				'parent_and_child.html', +				array(), +				array(), +				array(), +				"Child template.", +			), +		); +	} + +	/** +	* @dataProvider template_data +	*/ +	public function test_template($name, $file, array $vars, array $block_vars, array $destroy, $expected) +	{ +		$this->run_template($file, $vars, $block_vars, $destroy, $expected); +	} +} diff --git a/tests/template/template_test.php b/tests/template/template_test.php index fd68124c89..fedfeba33a 100644 --- a/tests/template/template_test.php +++ b/tests/template/template_test.php @@ -8,104 +8,14 @@  */  require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; -require_once dirname(__FILE__) . '/../../phpBB/includes/template.php'; +require_once dirname(__FILE__) . '/template_test_case.php'; -class phpbb_template_template_test extends phpbb_test_case +class phpbb_template_template_test extends phpbb_template_template_test_case  { -	private $template; -	private $template_path; - -	// Keep the contents of the cache for debugging? -	const PRESERVE_CACHE = true; - -	private function display($handle) -	{ -		// allow the templates to throw notices -		$error_level = error_reporting(); -		error_reporting($error_level & ~E_NOTICE); - -		ob_start(); - -		try -		{ -			$this->assertTrue($this->template->display($handle, false)); -		} -		catch (Exception $exception) -		{ -			// reset the error level even when an error occured -			// PHPUnit turns trigger_error into exceptions as well -			error_reporting($error_level); -			ob_end_clean(); -			throw $exception; -		} - -		$result = self::trim_template_result(ob_get_clean()); - -		// reset error level -		error_reporting($error_level); -		return $result; -	} - -	private static function trim_template_result($result) -	{ -		return str_replace("\n\n", "\n", implode("\n", array_map('trim', explode("\n", trim($result))))); -	} - -	private function setup_engine() -	{ -		$this->template_path = dirname(__FILE__) . '/templates'; -		$this->template = new template(); -		$this->template->set_custom_template($this->template_path, 'tests'); -	} - -	protected function setUp() -	{ -		// Test the engine can be used -		$this->setup_engine(); - -		$template_cache_dir = dirname($this->template->cachepath); -		if (!is_writable($template_cache_dir)) -		{ -			$this->markTestSkipped("Template cache directory ({$template_cache_dir}) is not writable."); -		} - -		$file_array = scandir($template_cache_dir); -		$file_prefix = basename($this->template->cachepath); -		foreach ($file_array as $file) -		{ -			if (strpos($file, $file_prefix) === 0) -			{ -				unlink($template_cache_dir . '/' . $file); -			} -		} - -		$GLOBALS['config'] = array( -			'load_tplcompile'	=> true, -			'tpl_allow_php'		=> false, -		); -	} - -	protected function tearDown() -	{ -		if (is_object($this->template)) -		{ -			$template_cache_dir = dirname($this->template->cachepath); -			$file_array = scandir($template_cache_dir); -			$file_prefix = basename($this->template->cachepath); -			foreach ($file_array as $file) -			{ -				if (strpos($file, $file_prefix) === 0) -				{ -					unlink($template_cache_dir . '/' . $file); -				} -			} -		} -	} -  	/**  	 * @todo put test data into templates/xyz.test  	 */ -	static public function template_data() +	public function template_data()  	{  		return array(  			/* @@ -122,7 +32,7 @@ class phpbb_template_template_test extends phpbb_test_case  				array(),  				array(),  				array(), -				"pass\npass\n<!-- DUMMY var -->", +				"pass\npass\npass\n<!-- DUMMY var -->",  			),  			array(  				'variable.html', @@ -136,28 +46,42 @@ class phpbb_template_template_test extends phpbb_test_case  				array(),  				array(),  				array(), -				'0', +				'03!false',  			),  			array(  				'if.html',  				array('S_VALUE' => true),  				array(),  				array(), -				"1\n0", +				'1!false',  			),  			array(  				'if.html',  				array('S_VALUE' => true, 'S_OTHER_VALUE' => true),  				array(),  				array(), -				'1', +				'1!false',  			),  			array(  				'if.html',  				array('S_VALUE' => false, 'S_OTHER_VALUE' => true),  				array(),  				array(), -				'2', +				'2!false', +			), +			array( +				'if.html', +				array('S_TEST' => false), +				array(), +				array(), +				'03false', +			), +			array( +				'if.html', +				array('S_TEST' => 0), +				array(), +				array(), +				'03!false',  			),  			array(  				'loop.html', @@ -192,22 +116,22 @@ class phpbb_template_template_test extends phpbb_test_case  				array(),  				array('loop' => array(array('VARIABLE' => 'x'))),  				array(), -				"first\n0\nx\nset\nlast", -			),/* no nested top level loops +				"first\n0 - a\nx - b\nset\nlast", +			),  			array(  				'loop_vars.html',  				array(),  				array('loop' => array(array('VARIABLE' => 'x'), array('VARIABLE' => 'y'))),  				array(), -				"first\n0\n0\n2\nx\nset\n1\n1\n2\ny\nset\nlast", +				"first\n0 - a\nx - b\nset\n1 - a\ny - b\nset\nlast",  			),  			array(  				'loop_vars.html',  				array(),  				array('loop' => array(array('VARIABLE' => 'x'), array('VARIABLE' => 'y')), 'loop.inner' => array(array(), array())),  				array(), -				"first\n0\n0\n2\nx\nset\n1\n1\n2\ny\nset\nlast\n0\n\n1\nlast inner\ninner loop", -			),*/ +				"first\n0 - a\nx - b\nset\n1 - a\ny - b\nset\nlast\n0 - c\n1 - c\nlast inner", +			),  			array(  				'loop_advanced.html',  				array(), @@ -216,18 +140,41 @@ class phpbb_template_template_test extends phpbb_test_case  				"101234561\nx\n101234561\nx\n101234561\nx\n1234561\nx\n1\nx\n101\nx\n234\nx\n10\nx\n561\nx\n561",  			),  			array( +				'loop_nested2.html', +				array(), +				array('outer' => array(array(), array()), 'outer.middle' => array(array(), array())), +				array(), +				"o0o1m01m11", +			), +			array(  				'define.html',  				array(),  				array('loop' => array(array(), array(), array(), array(), array(), array(), array()), 'test' => array(array()), 'test.deep' => array(array()), 'test.deep.defines' => array(array())),  				array(), -				"xyz\nabc", +				"xyz\nabc\nabc\nbar\nbar\nabc", +			), +			array( +				'define_advanced.html', +				array(), +				array('loop' => array(array(), array(), array(), array(), array(), array(), array()), 'test' => array(array()), 'test.deep' => array(array()), 'test.deep.defines' => array(array())), +				array(), +				"abc\nzxc\ncde\nbcd",  			),  			array(  				'expressions.html',  				array(),  				array(),  				array(), -				trim(str_repeat("pass", 39)), +				trim(str_repeat("pass\n", 10) . "\n" +					. str_repeat("pass\n", 4) . "\n" +					. str_repeat("pass\n", 2) . "\n" +					. str_repeat("pass\n", 6) . "\n" +					. str_repeat("pass\n", 2) . "\n" +					. str_repeat("pass\n", 6) . "\n" +					. str_repeat("pass\n", 2) . "\n" +					. str_repeat("pass\n", 2) . "\n" +					. str_repeat("pass\n", 3) . "\n" +					. str_repeat("pass\n", 2) . "\n"),  			),  			array(  				'php.html', @@ -251,6 +198,27 @@ class phpbb_template_template_test extends phpbb_test_case  				'value',  			),  			array( +				'include_loop.html', +				array(), +				array('loop' => array(array('NESTED_FILE' => 'include_loop1.html')), 'loop.inner' => array(array('NESTED_FILE' => 'include_loop1.html'), array('NESTED_FILE' => 'include_loop2.html'), array('NESTED_FILE' => 'include_loop3.html'))), +				array(), +				"1\n_1\n_02\n_3", +			), +			array( +				'include_variable.html', +				array('FILE' => 'variable.html', 'VARIABLE' => 'value'), +				array(), +				array(), +				'value', +			), +			array( +				'include_variables.html', +				array('SUBDIR' => 'subdir', 'VARIABLE' => 'value'), +				array(), +				array(), +				'value', +			), +			array(  				'loop_vars.html',  				array(),  				array('loop' => array(array('VARIABLE' => 'x'), array('VARIABLE' => 'y')), 'loop.inner' => array(array(), array())), @@ -280,25 +248,73 @@ class phpbb_template_template_test extends phpbb_test_case  				"first\n0\n0\n2\nx\nset\n1\n1\n2\ny\nset\nlast",  			),*/  			array( -				'lang.html', +				// Just like a regular loop but the name begins +				// with an underscore +				'loop_underscore.html',  				array(),  				array(),  				array(), -				"{ VARIABLE }\n{ VARIABLE }", +				"noloop\nnoloop",  			),  			array(  				'lang.html', -				array('L_VARIABLE' => "Value'"),  				array(),  				array(), -				"Value'\nValue\'", +				array(), +				"VARIABLE\n1_VARIABLE\nVARIABLE\n1_VARIABLE",  			),  			array(  				'lang.html', -				array('LA_VARIABLE' => "Value'"),  				array(),  				array(), -				"{ VARIABLE }\nValue'", +				array(), +				"Value'\n1 O'Clock\nValue\'\n1 O\'Clock", +				array('VARIABLE' => "Value'", '1_VARIABLE' => "1 O'Clock"), +			), +			array( +				'loop_nested_multilevel_ref.html', +				array(), +				array(), +				array(), +				"top-level content", +			), +			array( +				'loop_nested_multilevel_ref.html', +				array(), +				array('outer' => array(array('VARIABLE' => 'x'), array('VARIABLE' => 'y')), 'outer.inner' => array(array('VARIABLE' => 'z'), array('VARIABLE' => 'zz'))), +				array(), +				"top-level content\nouter x\nouter y\ninner z\nfirst row\n\ninner zz", +			), +			array( +				'loop_nested_deep_multilevel_ref.html', +				array(), +				array('outer' => array(array()), 'outer.middle' => array(array()), 'outer.middle.inner' => array(array('VARIABLE' => 'z'), array('VARIABLE' => 'zz'))), +				array(), +				"top-level content\nouter\nmiddle\ninner z\nfirst row of 2 in inner\n\ninner zz", +			), +			array( +				'loop_size.html', +				array(), +				array('loop' => array(array()), 'empty_loop' => array()), +				array(), +				"nonexistent = 0\n! nonexistent\n\nempty = 0\n! empty\nloop\n\nin loop", +			), +			/* Does not pass with the current implementation. +			array( +				'loop_reuse.html', +				array(), +				array('one' => array(array('VAR' => 'a'), array('VAR' => 'b')), 'one.one' => array(array('VAR' => 'c'), array('VAR' => 'd'))), +				array(), +				// Not entirely sure what should be outputted but the current output of "a" is most certainly wrong +				"a\nb\nc\nd", +			), +			*/ +			array( +				'twig.html', +				array('VARIABLE' => 'FOObar',), +				array(), +				array(), +				"13FOOBAR|foobar",  			),  		);  	} @@ -310,149 +326,96 @@ class phpbb_template_template_test extends phpbb_test_case  		$this->template->set_filenames(array('test' => $filename));  		$this->assertFileNotExists($this->template_path . '/' . $filename, 'Testing missing file, file cannot exist'); -		$expecting = sprintf('template->_tpl_load_file(): File %s does not exist or is empty', realpath($this->template_path . '/../') . '/templates/' . $filename); -		$this->setExpectedTriggerError(E_USER_ERROR, $expecting); +		$this->setExpectedException('Twig_Error_Loader');  		$this->display('test');  	} -	public function test_empty_file() -	{ -		$expecting = 'template->set_filenames: Empty filename specified for test'; - -		$this->setExpectedTriggerError(E_USER_ERROR, $expecting); -		$this->template->set_filenames(array('test' => '')); -	}  	public function test_invalid_handle()  	{ -		$expecting = 'template->_tpl_load(): No file specified for handle test'; -		$this->setExpectedTriggerError(E_USER_ERROR, $expecting); +		$this->setExpectedException('Twig_Error_Loader');  		$this->display('test');  	} -	private function run_template($file, array $vars, array $block_vars, array $destroy, $expected, $cache_file) -	{ -		$this->template->set_filenames(array('test' => $file)); -		$this->template->assign_vars($vars); - -		foreach ($block_vars as $block => $loops) -		{ -			foreach ($loops as $_vars) -			{ -				$this->template->assign_block_vars($block, $_vars); -			} -		} - -		foreach ($destroy as $block) -		{ -			$this->template->destroy_block_vars($block); -		} - -		try -		{ -			$this->assertEquals($expected, $this->display('test'), "Testing $file"); -			$this->assertFileExists($cache_file); -		} -		catch (ErrorException $e) -		{ -			if (file_exists($cache_file)) -			{ -				copy($cache_file, str_replace('ctpl_', 'tests_ctpl_', $cache_file)); -			} - -			throw $e; -		} - -		// For debugging -		if (self::PRESERVE_CACHE) -		{ -			copy($cache_file, str_replace('ctpl_', 'tests_ctpl_', $cache_file)); -		} -	} -  	/**  	* @dataProvider template_data  	*/ -	public function test_template($file, array $vars, array $block_vars, array $destroy, $expected) +	public function test_template($file, array $vars, array $block_vars, array $destroy, $expected, $lang_vars = array())  	{ -		$cache_file = $this->template->cachepath . str_replace('/', '.', $file) . '.php'; +		$this->run_template($file, $vars, $block_vars, $destroy, $expected, $lang_vars); +	} -		$this->assertFileNotExists($cache_file); +	public function test_assign_display() +	{ +		$this->run_template('basic.html', array(), array(), array(), "pass\npass\npass\n<!-- DUMMY var -->"); -		$this->run_template($file, $vars, $block_vars, $destroy, $expected, $cache_file); +		$this->template->set_filenames(array( +			'test'		=> 'basic.html', +			'container'	=> 'variable.html', +		)); -		// Reset the engine state -		$this->setup_engine(); +		$this->template->assign_display('test', 'VARIABLE', false); -		$this->run_template($file, $vars, $block_vars, $destroy, $expected, $cache_file); +		$this->assertEquals("pass\npass\npass\n<!-- DUMMY var -->", $this->display('container'), "Testing assign_display($file)");  	} -	/** -	* @dataProvider template_data -	*/ -	public function test_assign_display($file, array $vars, array $block_vars, array $destroy, $expected) +	public function test_append_var_without_assign_var()  	{  		$this->template->set_filenames(array( -			'test' => $file, -			'container' => 'variable.html', +			'append_var'	=> 'variable.html'  		)); -		$this->template->assign_vars($vars); -		foreach ($block_vars as $block => $loops) -		{ -			foreach ($loops as $_vars) -			{ -				$this->template->assign_block_vars($block, $_vars); -			} -		} +		$items = array('This ', 'is ', 'a ', 'test'); +		$expecting = implode('', $items); -		foreach ($destroy as $block) +		foreach ($items as $word)  		{ -			$this->template->destroy_block_vars($block); +			$this->template->append_var('VARIABLE', $word);  		} -		$error_level = error_reporting(); -		error_reporting($error_level & ~E_NOTICE); - -		$this->assertEquals($expected, self::trim_template_result($this->template->assign_display('test')), "Testing assign_display($file)"); - -		$this->template->assign_display('test', 'VARIABLE', false); - -		error_reporting($error_level); - -		$this->assertEquals($expected, $this->display('container'), "Testing assign_display($file)"); +		$this->assertEquals($expecting, $this->display('append_var'));  	} -	public function test_php() +	public function test_append_var_with_assign_var()  	{ -		$GLOBALS['config']['tpl_allow_php'] = true; - -		$cache_file = $this->template->cachepath . 'php.html.php'; +		$this->template->set_filenames(array( +			'append_var'	=> 'variable.html' +		)); -		$this->assertFileNotExists($cache_file); +		$start = 'This '; +		$items = array('is ', 'a ', 'test'); +		$expecting = $start . implode('', $items); -		$this->run_template('php.html', array(), array(), array(), 'test', $cache_file); +		$this->template->assign_var('VARIABLE', $start); +		foreach ($items as $word) +		{ +			$this->template->append_var('VARIABLE', $word); +		} -		$GLOBALS['config']['tpl_allow_php'] = false; +		$this->assertEquals($expecting, $this->display('append_var'));  	} -	public function test_includephp() +	public function test_php()  	{ -		$GLOBALS['config']['tpl_allow_php'] = true; +		global $phpbb_root_path; -		$cache_file = $this->template->cachepath . 'includephp.html.php'; +		$template_text = '<!-- PHP -->echo "test";<!-- ENDPHP -->'; -		$this->run_template('includephp.html', array(), array(), array(), 'testing included php', $cache_file); +		$cache_dir = dirname($phpbb_root_path . 'cache') . '/'; +		$fp = fopen($cache_dir . 'php.html', 'w'); +		fputs($fp, $template_text); +		fclose($fp); -		$this->template->set_filenames(array('test' => 'includephp.html')); -		$this->assertEquals('testing included php', $this->display('test'), "Testing INCLUDEPHP"); +		$this->setup_engine(array('tpl_allow_php' => true)); -		$GLOBALS['config']['tpl_allow_php'] = false; +		$this->style->set_custom_style('tests', $cache_dir, array(), ''); + +		$this->run_template('php.html', array(), array(), array(), 'test');  	} -	static public function alter_block_array_data() +	public function alter_block_array_data()  	{  		return array(  			array( @@ -555,10 +518,40 @@ EOT  		$this->template->assign_block_vars('outer.middle', array());  		$this->template->assign_block_vars('outer.middle', array()); -		$this->assertEquals("outer - 0\nmiddle - 0\nmiddle - 1\nouter - 1\nmiddle - 0\nmiddle - 1\nouter - 2\nmiddle - 0\nmiddle - 1", $this->display('test'), 'Ensuring template is built correctly before modification'); +		$this->assertEquals("outer - 0middle - 0middle - 1outer - 1middle - 0middle - 1outer - 2middle - 0middle - 1", $this->display('test'), 'Ensuring template is built correctly before modification');  		$this->template->alter_block_array($alter_block, $vararray, $key, $mode); -		$this->assertEquals($expect, $this->display('test'), $description); +		$this->assertEquals(str_replace(array("\n", "\r", "\t"), '', $expect), str_replace(array("\n", "\r", "\t"), '', $this->display('test')), $description);  	} -} +	public function test_more_alter_block_array() +	{ +		$this->template->set_filenames(array('test' => 'loop_nested.html')); + +		$this->template->assign_var('TEST_MORE', true); + +		// @todo Change this +		$this->template->assign_block_vars('outer', array()); +		$this->template->assign_block_vars('outer.middle', array()); +		$this->template->assign_block_vars('outer', array()); +		$this->template->assign_block_vars('outer.middle', array()); +		$this->template->assign_block_vars('outer.middle', array()); +		$this->template->assign_block_vars('outer', array()); +		$this->template->assign_block_vars('outer.middle', array()); +		$this->template->assign_block_vars('outer.middle', array()); +		$this->template->assign_block_vars('outer.middle', array()); + +		$expect = 'outer - 0[outer|3]middle - 0[middle|1]outer - 1[outer|3]middle - 0[middle|2]middle - 1[middle|2]outer - 2[outer|3]middle - 0[middle|3]middle - 1[middle|3]middle - 2[middle|3]'; +		$this->assertEquals($expect, str_replace(array("\n", "\r", "\t"), '', $this->display('test')), 'Ensuring template is built correctly before modification'); + +		$this->template->alter_block_array('outer', array()); + +		$expect = 'outer - 0[outer|4]outer - 1[outer|4]middle - 0[middle|1]outer - 2[outer|4]middle - 0[middle|2]middle - 1[middle|2]outer - 3[outer|4]middle - 0[middle|3]middle - 1[middle|3]middle - 2[middle|3]'; +		$this->assertEquals($expect, str_replace(array("\n", "\r", "\t"), '', $this->display('test')), 'Ensuring S_NUM_ROWS is correct after insertion'); + +		$this->template->alter_block_array('outer', array('VARIABLE' => 'test'), 2, 'change'); + +		$expect = 'outer - 0[outer|4]outer - 1[outer|4]middle - 0[middle|1]outer - 2 - test[outer|4]middle - 0[middle|2]middle - 1[middle|2]outer - 3[outer|4]middle - 0[middle|3]middle - 1[middle|3]middle - 2[middle|3]'; +		$this->assertEquals($expect, str_replace(array("\n", "\r", "\t"), '', $this->display('test')), 'Ensuring S_NUM_ROWS is correct after modification'); +	} +} diff --git a/tests/template/template_test_case.php b/tests/template/template_test_case.php new file mode 100644 index 0000000000..3e2cd5a387 --- /dev/null +++ b/tests/template/template_test_case.php @@ -0,0 +1,121 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2011 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_template_template_test_case extends phpbb_test_case +{ +	protected $style; +	protected $template; +	protected $template_path; +	protected $style_resource_locator; +	protected $style_provider; +	protected $user; + +	protected $test_path = 'tests/template'; + +	// Keep the contents of the cache for debugging? +	const PRESERVE_CACHE = true; + +	protected function display($handle) +	{ +		ob_start(); + +		try +		{ +			$this->template->display($handle, false); +		} +		catch (Exception $exception) +		{ +			// reset output buffering even when an error occured +			// PHPUnit turns trigger_error into exceptions as well +			ob_end_clean(); +			throw $exception; +		} + +		$result = self::trim_template_result(ob_get_clean()); + +		return $result; +	} + +	protected static function trim_template_result($result) +	{ +		return str_replace("\n\n", "\n", implode("\n", array_map('trim', explode("\n", trim($result))))); +	} + +	protected function config_defaults() +	{ +		$defaults = array( +			'load_tplcompile'	=> true, +			'tpl_allow_php'		=> false, +		); +		return $defaults; +	} + +	protected function setup_engine(array $new_config = array()) +	{ +		global $phpbb_root_path, $phpEx; + +		$defaults = $this->config_defaults(); +		$config = new phpbb_config(array_merge($defaults, $new_config)); +		$this->user = new phpbb_user; + +		$this->template_path = $this->test_path . '/templates'; +		$this->style_resource_locator = new phpbb_style_resource_locator(); +		$this->style_provider = new phpbb_style_path_provider(); +		$this->template = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $this->user, new phpbb_template_context()); +		$this->style = new phpbb_style($phpbb_root_path, $phpEx, $config, $this->user, $this->style_resource_locator, $this->style_provider, $this->template); +		$this->style->set_custom_style('tests', $this->template_path, array(), ''); +	} + +	protected function setUp() +	{ +		// Test the engine can be used +		$this->setup_engine(); + +		$this->template->clear_cache(); +	} + +	protected function tearDown() +	{ +		$this->template->clear_cache(); +	} + +	protected function run_template($file, array $vars, array $block_vars, array $destroy, $expected, $lang_vars = array()) +	{ +		$this->template->set_filenames(array('test' => $file)); +		$this->template->assign_vars($vars); + +		foreach ($block_vars as $block => $loops) +		{ +			foreach ($loops as $_vars) +			{ +				$this->template->assign_block_vars($block, $_vars); +			} +		} + +		foreach ($destroy as $block) +		{ +			$this->template->destroy_block_vars($block); +		} + +		// Previous functionality was $cachefile (string), which was removed, check to prevent errors +		if (is_array($lang_vars)) +		{ +			foreach ($lang_vars as $name => $value) +			{ +				$this->user->lang[$name] = $value; +			} +		} + +		$expected = str_replace(array("\n", "\r", "\t"), '', $expected); +		$output = str_replace(array("\n", "\r", "\t"), '', $this->display('test')); +		$this->assertEquals($expected, $output, "Testing $file"); +	} +} diff --git a/tests/template/template_test_case_with_tree.php b/tests/template/template_test_case_with_tree.php new file mode 100644 index 0000000000..4b8cbada45 --- /dev/null +++ b/tests/template/template_test_case_with_tree.php @@ -0,0 +1,29 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2011 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +require_once dirname(__FILE__) . '/template_test_case.php'; + +class phpbb_template_template_test_case_with_tree extends phpbb_template_template_test_case +{ +	protected function setup_engine(array $new_config = array()) +	{ +		global $phpbb_root_path, $phpEx, $user; + +		$defaults = $this->config_defaults(); +		$config = new phpbb_config(array_merge($defaults, $new_config)); + +		$this->template_path = $this->test_path . '/templates'; +		$this->parent_template_path = $this->test_path . '/parent_templates'; +		$this->style_resource_locator = new phpbb_style_resource_locator(); +		$this->style_provider = new phpbb_style_path_provider(); +		$this->template = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $user, new phpbb_template_context()); +		$this->style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider, $this->template); +		$this->style->set_custom_style('tests', array($this->template_path, $this->parent_template_path), array(), ''); +	} +} diff --git a/tests/template/templates/basic.html b/tests/template/templates/basic.html index c1dd690260..e5c6f280fb 100644 --- a/tests/template/templates/basic.html +++ b/tests/template/templates/basic.html @@ -16,5 +16,8 @@ fail  <!-- BEGINELSE -->  pass  <!-- END empty --> +<!-- IF not S_EMPTY --> +pass +<!-- ENDIF -->  <!-- DUMMY var --> diff --git a/tests/template/templates/child_only.css b/tests/template/templates/child_only.css new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/tests/template/templates/child_only.css diff --git a/tests/template/templates/child_only.html b/tests/template/templates/child_only.html new file mode 100644 index 0000000000..6121fef5c5 --- /dev/null +++ b/tests/template/templates/child_only.html @@ -0,0 +1 @@ +Only in child. diff --git a/tests/template/templates/child_only.js b/tests/template/templates/child_only.js new file mode 100644 index 0000000000..542b26526c --- /dev/null +++ b/tests/template/templates/child_only.js @@ -0,0 +1 @@ +// JavaScript file only in a child style. diff --git a/tests/template/templates/define.html b/tests/template/templates/define.html index 82237d21a3..4e6d0ee793 100644 --- a/tests/template/templates/define.html +++ b/tests/template/templates/define.html @@ -2,7 +2,8 @@  {$VALUE}  <!-- DEFINE $VALUE = 'abc' -->  {$VALUE} +<!-- INCLUDE define_include.html --> +{$INCLUDED_VALUE} +{$VALUE}  <!-- UNDEFINE $VALUE -->  {$VALUE} -<!-- DEFINE $VALUE --> - diff --git a/tests/template/templates/define_advanced.html b/tests/template/templates/define_advanced.html new file mode 100644 index 0000000000..83467a5b4b --- /dev/null +++ b/tests/template/templates/define_advanced.html @@ -0,0 +1,12 @@ +<!-- DEFINE $VALUE --> +abc +<!-- ENDDEFINE --> +{$VALUE} +<!-- DEFINE $VALUE1 --> +bcd +<!-- ENDDEFINE --> +<!-- DEFINE $VALUE2 --> +cde +<!-- ENDDEFINE --> +<!-- INCLUDE define_include2.html --> +{$INCLUDED_VALUE3} diff --git a/tests/template/templates/define_include.html b/tests/template/templates/define_include.html new file mode 100644 index 0000000000..9c470c296a --- /dev/null +++ b/tests/template/templates/define_include.html @@ -0,0 +1,3 @@ +{$VALUE} +<!-- DEFINE $INCLUDED_VALUE = 'bar' --> +{$INCLUDED_VALUE} diff --git a/tests/template/templates/define_include2.html b/tests/template/templates/define_include2.html new file mode 100644 index 0000000000..874f3e1852 --- /dev/null +++ b/tests/template/templates/define_include2.html @@ -0,0 +1,11 @@ +<!-- DEFINE $INCLUDED_VALUE1 --> +zxc +<!-- ENDDEFINE --> +<!-- DEFINE $INCLUDED_VALUE2 --> +qwe +<!-- ENDDEFINE --> +{$INCLUDED_VALUE1} +<!-- DEFINE $INCLUDED_VALUE3 --> +{$VALUE2} +{$VALUE1} +<!-- ENDDEFINE --> diff --git a/tests/template/templates/events.html b/tests/template/templates/events.html new file mode 100644 index 0000000000..c44a7469e7 --- /dev/null +++ b/tests/template/templates/events.html @@ -0,0 +1,4 @@ +<!-- EVENT child_only --> +<!-- EVENT parent_only --> +<!-- EVENT parent_and_child --> +<!-- EVENT random_event --> diff --git a/tests/template/templates/expressions.html b/tests/template/templates/expressions.html index c40d967dab..e1283f165f 100644 --- a/tests/template/templates/expressions.html +++ b/tests/template/templates/expressions.html @@ -1,86 +1,57 @@  <!-- IF 10 is even -->pass<!-- ELSE -->fail<!-- ENDIF --> -  <!-- IF 9 is even -->fail<!-- ELSE -->pass<!-- ENDIF --> -  <!-- IF not 390 is even -->fail<!-- ELSE -->pass<!-- ENDIF --> -  <!-- IF 9 is odd -->pass<!-- ELSE -->fail<!-- ENDIF --> -  <!-- IF 32 is odd -->fail<!-- ELSE -->pass<!-- ENDIF --> -  <!-- IF 32 is div by 16 -->pass<!-- ELSE -->fail<!-- ENDIF --> -  <!-- IF 10 is not even -->fail<!-- ELSE -->pass<!-- ENDIF --> -  <!-- IF 24 == 24 -->pass<!-- ELSE -->fail<!-- ENDIF --> -  <!-- IF 24 eq 24 -->pass<!-- ELSE -->fail<!-- ENDIF --> -  <!-- IF ((((((24 == 24)))))) -->pass<!-- ELSE -->fail<!-- ENDIF -->  <!-- IF 24 != 20 -->pass<!-- ELSE -->fail<!-- ENDIF --> -  <!-- IF 24 <> 20 -->pass<!-- ELSE -->fail<!-- ENDIF --> -  <!-- IF 24 ne 20 -->pass<!-- ELSE -->fail<!-- ENDIF --> -  <!-- IF 24 neq 20 -->pass<!-- ELSE -->fail<!-- ENDIF -->  <!-- IF 10 lt 20 -->pass<!-- ELSE -->fail<!-- ENDIF --> -  <!-- IF 10 < 20 -->pass<!-- ELSE -->fail<!-- ENDIF -->  <!-- IF 10 le 20 -->pass<!-- ELSE -->fail<!-- ENDIF --> -  <!-- IF 10 lte 20 -->pass<!-- ELSE -->fail<!-- ENDIF --> -  <!-- IF 10 <= 20 -->pass<!-- ELSE -->fail<!-- ENDIF --> -  <!-- IF 20 le 20 -->pass<!-- ELSE -->fail<!-- ENDIF --> -  <!-- IF 20 lte 20 -->pass<!-- ELSE -->fail<!-- ENDIF --> -  <!-- IF 20 <= 20 -->pass<!-- ELSE -->fail<!-- ENDIF -->  <!-- IF 9 gt 1 -->pass<!-- ELSE -->fail<!-- ENDIF --> -  <!-- IF 9 > 1 -->pass<!-- ELSE -->fail<!-- ENDIF -->  <!-- IF 9 >= 1 -->pass<!-- ELSE -->fail<!-- ENDIF --> -  <!-- IF 9 gte 1 -->pass<!-- ELSE -->fail<!-- ENDIF --> -  <!-- IF 9 ge 1 -->pass<!-- ELSE -->fail<!-- ENDIF --> -  <!-- IF 9 >= 9 -->pass<!-- ELSE -->fail<!-- ENDIF --> -  <!-- IF 9 gte 9 -->pass<!-- ELSE -->fail<!-- ENDIF --> -  <!-- IF 9 ge 9 -->pass<!-- ELSE -->fail<!-- ENDIF -->  <!-- IF true && (10 > 4) -->pass<!-- ELSE -->fail<!-- ENDIF --> -  <!-- IF true and (10 > 4) -->pass<!-- ELSE -->fail<!-- ENDIF -->  <!-- IF false || true -->pass<!-- ELSE -->fail<!-- ENDIF --> -  <!-- IF false or true -->pass<!-- ELSE -->fail<!-- ENDIF -->  <!-- IF !false -->pass<!-- ELSE -->fail<!-- ENDIF --> -  <!-- IF not false -->pass<!-- ELSE -->fail<!-- ENDIF --> -  <!-- IF not not not false -->pass<!-- ELSE -->fail<!-- ENDIF -->  <!-- IF 6 % 4 == 2 -->pass<!-- ELSE -->fail<!-- ENDIF --> -  <!-- IF 24 mod 12 == 0 -->pass<!-- ELSE -->fail<!-- ENDIF --> diff --git a/tests/template/templates/if.html b/tests/template/templates/if.html index c502e52f51..c010aff7fa 100644 --- a/tests/template/templates/if.html +++ b/tests/template/templates/if.html @@ -3,9 +3,17 @@  <!-- ELSEIF S_OTHER_VALUE -->  2  <!-- ELSE --> -0 +03  <!-- ENDIF --> -<!-- IF (S_VALUE > S_OTHER_VALUE) --> -0 +<!-- IF S_VALUE and S_OTHER_VALUE and (S_VALUE > S_OTHER_VALUE) --> +04 +<!-- ENDIF --> + +<!-- IF S_TEST === false --> +false +<!-- ENDIF --> + +<!-- IF S_TEST !== false --> +!false  <!-- ENDIF --> diff --git a/tests/template/templates/include_loop.html b/tests/template/templates/include_loop.html new file mode 100644 index 0000000000..d5c3d9bc82 --- /dev/null +++ b/tests/template/templates/include_loop.html @@ -0,0 +1,4 @@ +<!-- BEGIN loop --> +<!-- INCLUDE {loop.NESTED_FILE} --> +<!-- BEGIN inner -->_<!-- INCLUDE {inner.NESTED_FILE} --><!-- END inner --> +<!-- END loop --> diff --git a/tests/template/templates/include_loop1.html b/tests/template/templates/include_loop1.html new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/tests/template/templates/include_loop1.html @@ -0,0 +1 @@ +1 diff --git a/tests/template/templates/include_loop2.html b/tests/template/templates/include_loop2.html new file mode 100644 index 0000000000..9e22bcb8e3 --- /dev/null +++ b/tests/template/templates/include_loop2.html @@ -0,0 +1 @@ +02 diff --git a/tests/template/templates/include_loop3.html b/tests/template/templates/include_loop3.html new file mode 100644 index 0000000000..00750edc07 --- /dev/null +++ b/tests/template/templates/include_loop3.html @@ -0,0 +1 @@ +3 diff --git a/tests/template/templates/include_variable.html b/tests/template/templates/include_variable.html new file mode 100644 index 0000000000..b907e0b44f --- /dev/null +++ b/tests/template/templates/include_variable.html @@ -0,0 +1 @@ +<!-- INCLUDE {FILE} --> diff --git a/tests/template/templates/include_variables.html b/tests/template/templates/include_variables.html new file mode 100644 index 0000000000..8371a061b5 --- /dev/null +++ b/tests/template/templates/include_variables.html @@ -0,0 +1 @@ +<!-- INCLUDE {SUBDIR}/variable.html --> diff --git a/tests/template/templates/includecss.html b/tests/template/templates/includecss.html new file mode 100644 index 0000000000..a09e44f240 --- /dev/null +++ b/tests/template/templates/includecss.html @@ -0,0 +1,3 @@ +<!-- INCLUDECSS child_only.css --> +<!-- INCLUDECSS parent_only.css --> +{$STYLESHEETS} diff --git a/tests/template/templates/includejs.html b/tests/template/templates/includejs.html new file mode 100644 index 0000000000..3bcad76af5 --- /dev/null +++ b/tests/template/templates/includejs.html @@ -0,0 +1,38 @@ +<!-- IF TEST === 1 --> +	<!-- INCLUDEJS parent_and_child.js --> +<!-- ELSEIF TEST === 2 --> +	<!-- INCLUDEJS parent_and_child.js?assets_version=0 --> +<!-- ELSEIF TEST === 3 --> +	<!-- INCLUDEJS parent_and_child.js?test=1&assets_version=0 --> +<!-- ELSEIF TEST === 4 --> +	<!-- INCLUDEJS parent_and_child.js?test=1&assets_version=0 --> +<!-- ELSEIF TEST === 5 --> +	<!-- INCLUDEJS parent_and_child.js?test=1;assets_version=0 --> +<!-- ELSEIF TEST === 6 --> +	<!-- INCLUDEJS {PARENT} --> +<!-- ELSEIF TEST === 7 --> +	<!-- DEFINE $TEST = 'child_only.js' --> +	<!-- INCLUDEJS {$TEST} --> +<!-- ELSEIF TEST === 8 --> +	<!-- INCLUDEJS subdir/{PARENT} --> +<!-- ELSEIF TEST === 9 --> +	<!-- INCLUDEJS {SUBDIR}/subsubdir/{PARENT} --> +<!-- ELSEIF TEST === 10 --> +	<!-- INCLUDEJS {SUBDIR}/parent_only.{EXT} --> +<!-- ELSEIF TEST === 11 --> +	<!-- DEFINE $TEST = 'child_only.js?test1=1&test2=2#test3' --> +	<!-- INCLUDEJS {$TEST} --> +<!-- ELSEIF TEST === 12 --> +	<!-- INCLUDEJS parent_only.js?test1=1&test2=2#test3 --> +<!-- ELSEIF TEST === 13 --> +	<!-- INCLUDEJS parent_only.js?test1=1;test2=2#test3 --> +<!-- ELSEIF TEST === 14 --> +	<!-- INCLUDEJS parent_only.js?test1="#test3 --> +<!-- ELSEIF TEST === 15 --> +	<!-- INCLUDEJS http://phpbb.com/b.js?c=d#f --> +<!-- ELSEIF TEST === 16 --> +	<!-- INCLUDEJS http://phpbb.com/b.js?c=d&assets_version=1#f --> +<!-- ELSEIF TEST === 17 --> +	<!-- INCLUDEJS //phpbb.com/b.js --> +<!-- ENDIF --> +{$SCRIPTS} diff --git a/tests/template/templates/includephp.html b/tests/template/templates/includephp_relative.html index 70ebdac0d0..297c9efcb0 100644 --- a/tests/template/templates/includephp.html +++ b/tests/template/templates/includephp_relative.html @@ -1 +1,2 @@ +Path is relative to board root.  <!-- INCLUDEPHP ../tests/template/templates/_dummy_include.php.inc --> diff --git a/tests/template/templates/includephp_variables.html b/tests/template/templates/includephp_variables.html new file mode 100644 index 0000000000..6106efc86a --- /dev/null +++ b/tests/template/templates/includephp_variables.html @@ -0,0 +1,2 @@ +Path includes variables. +<!-- INCLUDEPHP ../tests/template/{TEMPLATES}/_dummy_include.php.inc --> diff --git a/tests/template/templates/invalid/endif_without_if.html b/tests/template/templates/invalid/endif_without_if.html new file mode 100644 index 0000000000..e371ffd150 --- /dev/null +++ b/tests/template/templates/invalid/endif_without_if.html @@ -0,0 +1 @@ +<!-- ENDIF --> diff --git a/tests/template/templates/invalid/output/endif_without_if.html b/tests/template/templates/invalid/output/endif_without_if.html new file mode 100644 index 0000000000..5f2239c964 --- /dev/null +++ b/tests/template/templates/invalid/output/endif_without_if.html @@ -0,0 +1 @@ +Parse error (fatal, destroys php runtime). diff --git a/tests/template/templates/invalid/output/include_nonexistent_file.html b/tests/template/templates/invalid/output/include_nonexistent_file.html new file mode 100644 index 0000000000..8a118d2713 --- /dev/null +++ b/tests/template/templates/invalid/output/include_nonexistent_file.html @@ -0,0 +1 @@ +style resource locator: File for handle nonexistent.html does not exist. Could not find: diff --git a/tests/template/templates/invalid/output/unknown_tag.html b/tests/template/templates/invalid/output/unknown_tag.html new file mode 100644 index 0000000000..1489e5e31a --- /dev/null +++ b/tests/template/templates/invalid/output/unknown_tag.html @@ -0,0 +1 @@ +<!-- UNKNOWNTAG variable.html --> diff --git a/tests/template/templates/lang.html b/tests/template/templates/lang.html index 2b5ea1cafe..3eecc298cb 100644 --- a/tests/template/templates/lang.html +++ b/tests/template/templates/lang.html @@ -1,3 +1,5 @@  {L_VARIABLE} +{L_1_VARIABLE}  {LA_VARIABLE} +{LA_1_VARIABLE} diff --git a/tests/template/templates/loop_expressions.html b/tests/template/templates/loop_expressions.html new file mode 100644 index 0000000000..6bff53f388 --- /dev/null +++ b/tests/template/templates/loop_expressions.html @@ -0,0 +1,11 @@ +<!-- BEGIN loop --> + +<!-- IF loop.S_ROW_NUM is even by 4 -->on<!-- ELSE -->off<!-- ENDIF --> + +<!-- END loop --> + +<!-- BEGIN loop --> + +<!-- IF loop.S_ROW_NUM is odd by 3 -->on<!-- ELSE -->off<!-- ENDIF --> + +<!-- END loop --> diff --git a/tests/template/templates/loop_nested.html b/tests/template/templates/loop_nested.html index 9b251cd453..cf099ecc15 100644 --- a/tests/template/templates/loop_nested.html +++ b/tests/template/templates/loop_nested.html @@ -1,8 +1,6 @@  <!-- BEGIN outer --> -	outer - {outer.S_ROW_COUNT}<!-- IF outer.VARIABLE --> - {outer.VARIABLE}<!-- ENDIF --> - -	<!-- BEGIN middle --> -		middle - {middle.S_ROW_COUNT}<!-- IF middle.VARIABLE --> - {middle.VARIABLE}<!-- ENDIF --> - -	<!-- END middle --> +outer - {outer.S_ROW_COUNT}<!-- IF outer.VARIABLE --> - {outer.VARIABLE}<!-- ENDIF --><!-- IF TEST_MORE -->[{outer.S_BLOCK_NAME}|{outer.S_NUM_ROWS}]<!-- ENDIF --> +<!-- BEGIN middle --> +middle - {outer.middle.S_ROW_COUNT}<!-- IF outer.middle.VARIABLE --> - {outer.middle.VARIABLE}<!-- ENDIF --><!-- IF TEST_MORE -->[{outer.middle.S_BLOCK_NAME}|{outer.middle.S_NUM_ROWS}]<!-- ENDIF --> +<!-- END middle -->  <!-- END outer --> diff --git a/tests/template/templates/loop_nested2.html b/tests/template/templates/loop_nested2.html new file mode 100644 index 0000000000..3eeeb5e36a --- /dev/null +++ b/tests/template/templates/loop_nested2.html @@ -0,0 +1,6 @@ +<!-- BEGIN outer --> +o{outer.S_ROW_COUNT} +<!-- BEGIN middle --> +m{outer.middle.S_ROW_COUNT}{outer.S_ROW_COUNT} +<!-- END middle --> +<!-- END outer --> diff --git a/tests/template/templates/loop_nested_deep_multilevel_ref.html b/tests/template/templates/loop_nested_deep_multilevel_ref.html new file mode 100644 index 0000000000..bcc2a7c07b --- /dev/null +++ b/tests/template/templates/loop_nested_deep_multilevel_ref.html @@ -0,0 +1,13 @@ +top-level content +<!-- BEGIN outer --> +	outer +	<!-- BEGIN middle --> +		{outer.middle.S_BLOCK_NAME} +		<!-- BEGIN inner --> +			inner {inner.VARIABLE} +			<!-- IF outer.middle.inner.S_FIRST_ROW --> +				first row of {outer.middle.inner.S_NUM_ROWS} in {middle.inner.S_BLOCK_NAME} +			<!-- ENDIF --> +		<!-- END inner --> +	<!-- END middle --> +<!-- END outer --> diff --git a/tests/template/templates/loop_nested_multilevel_ref.html b/tests/template/templates/loop_nested_multilevel_ref.html new file mode 100644 index 0000000000..f2f1c746ed --- /dev/null +++ b/tests/template/templates/loop_nested_multilevel_ref.html @@ -0,0 +1,10 @@ +top-level content +<!-- BEGIN outer --> +	outer {outer.VARIABLE} +	<!-- BEGIN inner --> +		inner {inner.VARIABLE} +		<!-- IF outer.inner.S_FIRST_ROW --> +			first row +		<!-- ENDIF --> +	<!-- END inner --> +<!-- END outer --> diff --git a/tests/template/templates/loop_reuse.html b/tests/template/templates/loop_reuse.html new file mode 100644 index 0000000000..bd0354ae6f --- /dev/null +++ b/tests/template/templates/loop_reuse.html @@ -0,0 +1,6 @@ +<!-- BEGIN one --> +	{one.VAR} +	<!-- BEGIN one --> +		{one.one.VAR} +	<!-- END one --> +<!-- END one --> diff --git a/tests/template/templates/loop_size.html b/tests/template/templates/loop_size.html new file mode 100644 index 0000000000..8f581cef10 --- /dev/null +++ b/tests/template/templates/loop_size.html @@ -0,0 +1,39 @@ +<!-- IF .nonexistent_loop --> +	nonexistent +<!-- ENDIF --> + +<!-- IF .nonexistent_loop == 0 --> +	nonexistent = 0 +<!-- ENDIF --> + +<!-- IF ! .nonexistent_loop --> +	! nonexistent +<!-- ENDIF --> + +<!-- IF .empty_loop --> +	empty +<!-- ENDIF --> + +<!-- IF .empty_loop == 0 --> +	empty = 0 +<!-- ENDIF --> + +<!-- IF ! .empty_loop --> +	! empty +<!-- ENDIF --> + +<!-- IF .loop --> +	loop +<!-- ENDIF --> + +<!-- IF .loop == 0 --> +	loop = 0 +<!-- ENDIF --> + +<!-- IF ! .loop --> +	! loop +<!-- ENDIF --> + +<!-- BEGIN loop --> +	in loop +<!-- END loop --> diff --git a/tests/template/templates/loop_underscore.html b/tests/template/templates/loop_underscore.html new file mode 100644 index 0000000000..4001007868 --- /dev/null +++ b/tests/template/templates/loop_underscore.html @@ -0,0 +1,21 @@ +<!-- BEGIN _underscore_loop --> +loop +<!-- BEGINELSE --> +noloop +<!-- END _underscore_loop --> + +<!-- IF ._underscore_loop --> +loop +<!-- ELSE --> +noloop +<!-- ENDIF --> + +<!-- IF ._underscore_loop == 2 --> +loop +<!-- ENDIF --> + +<!-- BEGIN _underscore_loop --> +<!-- BEGIN !block --> +loop#{loop.S_ROW_COUNT}-block#{block.S_ROW_COUNT} +<!-- END !block --> +<!-- END _underscore_loop --> diff --git a/tests/template/templates/loop_vars.html b/tests/template/templates/loop_vars.html index 4f02fd2e6c..7d86d4b7b6 100644 --- a/tests/template/templates/loop_vars.html +++ b/tests/template/templates/loop_vars.html @@ -1,21 +1,13 @@  <!-- BEGIN loop -->  <!-- IF loop.S_FIRST_ROW -->first<!-- ENDIF --> - -{loop.S_ROW_COUNT} - -{loop.VARIABLE} - +{loop.S_ROW_NUM} - a +{loop.VARIABLE} - b  <!-- IF loop.VARIABLE -->set<!-- ENDIF --> -  <!-- IF loop.S_LAST_ROW -->  last  <!-- ENDIF -->  <!-- BEGIN inner --> - -{inner.S_ROW_COUNT} - +{inner.S_ROW_NUM} - c  <!-- IF inner.S_LAST_ROW and inner.S_ROW_COUNT and inner.S_NUM_ROWS -->last inner<!-- ENDIF --> -  <!-- END inner -->  <!-- END loop --> -<!-- IF .loop.inner -->inner loop<!-- ENDIF --> diff --git a/tests/template/templates/parent_and_child.html b/tests/template/templates/parent_and_child.html new file mode 100644 index 0000000000..16223d91e7 --- /dev/null +++ b/tests/template/templates/parent_and_child.html @@ -0,0 +1 @@ +Child template. diff --git a/tests/template/templates/parent_and_child.js b/tests/template/templates/parent_and_child.js new file mode 100644 index 0000000000..d544d94d83 --- /dev/null +++ b/tests/template/templates/parent_and_child.js @@ -0,0 +1 @@ +// JavaScript file in a child style. diff --git a/tests/template/templates/subdir/parent_only.js b/tests/template/templates/subdir/parent_only.js new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/tests/template/templates/subdir/parent_only.js diff --git a/tests/template/templates/subdir/subsubdir/parent_only.js b/tests/template/templates/subdir/subsubdir/parent_only.js new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/tests/template/templates/subdir/subsubdir/parent_only.js diff --git a/tests/template/templates/subdir/variable.html b/tests/template/templates/subdir/variable.html new file mode 100644 index 0000000000..f68f91597c --- /dev/null +++ b/tests/template/templates/subdir/variable.html @@ -0,0 +1 @@ +{VARIABLE} diff --git a/tests/template/templates/trivial.html b/tests/template/templates/trivial.html new file mode 100644 index 0000000000..3a1c1c5324 --- /dev/null +++ b/tests/template/templates/trivial.html @@ -0,0 +1 @@ +This is a trivial template. diff --git a/tests/template/templates/twig.html b/tests/template/templates/twig.html new file mode 100644 index 0000000000..17b94ad8d4 --- /dev/null +++ b/tests/template/templates/twig.html @@ -0,0 +1,6 @@ +<!-- EXTENDS "twig_parent.html" --> + +<!-- BLOCK overwritten --> +3{VARIABLE|upper}|{VARIABLE|lower} +<!-- ENDBLOCK --> + diff --git a/tests/template/templates/twig_parent.html b/tests/template/templates/twig_parent.html new file mode 100644 index 0000000000..e9863221e1 --- /dev/null +++ b/tests/template/templates/twig_parent.html @@ -0,0 +1,7 @@ +<!-- BLOCK notoverwritten --> +1 +<!-- ENDBLOCK --> + +<!-- BLOCK overwritten --> +2 +<!-- ENDBLOCK --> diff --git a/tests/template/templates/variable_spacing.html b/tests/template/templates/variable_spacing.html new file mode 100644 index 0000000000..028f8aa0d1 --- /dev/null +++ b/tests/template/templates/variable_spacing.html @@ -0,0 +1,6 @@ +|{VARIABLE}| +{VARIABLE}|{VARIABLE}| + +|{VARIABLE} + +<div class="{VARIABLE}">test</div> diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php index 28d3a716f0..c72ea5f765 100644 --- a/tests/test_framework/phpbb_database_test_case.php +++ b/tests/test_framework/phpbb_database_test_case.php @@ -82,7 +82,7 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test  		$db_config = $this->get_database_config();  		// Firebird requires table and column names to be uppercase -		if ($db_config['dbms'] == 'firebird') +		if ($db_config['dbms'] == 'phpbb_db_driver_firebird')  		{  			$xml_data = file_get_contents($path);  			$xml_data = preg_replace_callback('/(?:(<table name="))([a-z_]+)(?:(">))/', 'phpbb_database_test_case::to_upper', $xml_data); @@ -151,9 +151,7 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test  		$config = $this->get_database_config(); -		require_once dirname(__FILE__) . '/../../phpBB/includes/db/' . $config['dbms'] . '.php'; -		$dbal = 'dbal_' . $config['dbms']; -		$db = new $dbal(); +		$db = new $config['dbms']();  		$db->sql_connect($config['dbhost'], $config['dbuser'], $config['dbpasswd'], $config['dbname'], $config['dbport']);  		$this->db_connections[] = $db; @@ -194,4 +192,20 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test  	{  		return $matches[1] . strtoupper($matches[2]) . $matches[3];  	} + +	public function assert_array_content_equals($one, $two) +	{ +		// http://stackoverflow.com/questions/3838288/phpunit-assert-two-arrays-are-equal-but-order-of-elements-not-important +		// but one array_diff is not enough! +		if (sizeof(array_diff($one, $two)) || sizeof(array_diff($two, $one))) +		{ +			// get a nice error message +			$this->assertEquals($one, $two); +		} +		else +		{ +			// increase assertion count +			$this->assertTrue(true); +		} +	}  } diff --git a/tests/test_framework/phpbb_database_test_connection_manager.php b/tests/test_framework/phpbb_database_test_connection_manager.php index 30f1fa6589..c93a777701 100644 --- a/tests/test_framework/phpbb_database_test_connection_manager.php +++ b/tests/test_framework/phpbb_database_test_connection_manager.php @@ -108,7 +108,7 @@ class phpbb_database_test_connection_manager  		// These require different connection strings on the phpBB side than they do in PDO  		// so you must provide a DSN string for ODBC separately -		if (!empty($this->config['custom_dsn']) && ($this->config['dbms'] == 'mssql' || $this->config['dbms'] == 'firebird')) +		if (!empty($this->config['custom_dsn']) && ($this->config['dbms'] == 'phpbb_db_driver_mssql' || $this->config['dbms'] == 'phpbb_db_driver_firebird'))  		{  			$dsn = 'odbc:' . $this->config['custom_dsn'];  		} @@ -117,12 +117,12 @@ class phpbb_database_test_connection_manager  		{  			switch ($this->config['dbms'])  			{ -				case 'mssql': -				case 'mssql_odbc': +				case 'phpbb_db_driver_mssql': +				case 'phpbb_db_driver_mssql_odbc':  					$this->pdo = new phpbb_database_connection_odbc_pdo_wrapper('mssql', 0, $dsn, $this->config['dbuser'], $this->config['dbpasswd']);  				break; -				case 'firebird': +				case 'phpbb_db_driver_firebird':  					if (!empty($this->config['custom_dsn']))  					{  						$this->pdo = new phpbb_database_connection_odbc_pdo_wrapper('firebird', 0, $dsn, $this->config['dbuser'], $this->config['dbpasswd']); @@ -145,8 +145,8 @@ class phpbb_database_test_connection_manager  		switch ($this->config['dbms'])  		{ -			case 'mysql': -			case 'mysqli': +			case 'phpbb_db_driver_mysql': +			case 'phpbb_db_driver_mysqli':  				$this->pdo->exec('SET NAMES utf8');  				/* @@ -187,8 +187,8 @@ class phpbb_database_test_connection_manager  	{  		switch ($this->config['dbms'])  		{ -			case 'sqlite': -			case 'firebird': +			case 'phpbb_db_driver_sqlite': +			case 'phpbb_db_driver_firebird':  				$this->connect();  				// Drop all of the tables  				foreach ($this->get_tables() as $table) @@ -198,7 +198,7 @@ class phpbb_database_test_connection_manager  				$this->purge_extras();  			break; -			case 'oracle': +			case 'phpbb_db_driver_oracle':  				$this->connect();  				// Drop all of the tables  				foreach ($this->get_tables() as $table) @@ -208,7 +208,7 @@ class phpbb_database_test_connection_manager  				$this->purge_extras();  			break; -			case 'postgres': +			case 'phpbb_db_driver_postgres':  				$this->connect();  				// Drop all of the tables  				foreach ($this->get_tables() as $table) @@ -258,39 +258,38 @@ class phpbb_database_test_connection_manager  		switch ($this->config['dbms'])  		{ -			case 'mysql': -			case 'mysql4': -			case 'mysqli': +			case 'phpbb_db_driver_mysql': +			case 'phpbb_db_driver_mysqli':  				$sql = 'SHOW TABLES';  			break; -			case 'sqlite': +			case 'phpbb_db_driver_sqlite':  				$sql = 'SELECT name  					FROM sqlite_master  					WHERE type = "table"';  			break; -			case 'mssql': -			case 'mssql_odbc': -			case 'mssqlnative': +			case 'phpbb_db_driver_mssql': +			case 'phpbb_db_driver_mssql_odbc': +			case 'phpbb_db_driver_mssqlnative':  				$sql = "SELECT name  					FROM sysobjects  					WHERE type='U'";  			break; -			case 'postgres': +			case 'phpbb_db_driver_postgres':  				$sql = 'SELECT relname  					FROM pg_stat_user_tables';  			break; -			case 'firebird': +			case 'phpbb_db_driver_firebird':  				$sql = 'SELECT rdb$relation_name  					FROM rdb$relations  					WHERE rdb$view_source is null  						AND rdb$system_flag = 0';  			break; -			case 'oracle': +			case 'phpbb_db_driver_oracle':  				$sql = 'SELECT table_name  					FROM USER_TABLES';  			break; @@ -326,7 +325,7 @@ class phpbb_database_test_connection_manager  	{  		$schema = $this->dbms['SCHEMA']; -		if ($this->config['dbms'] == 'mysql') +		if ($this->config['dbms'] == 'phpbb_db_driver_mysql')  		{  			$sth = $this->pdo->query('SELECT VERSION() AS version');  			$row = $sth->fetch(PDO::FETCH_ASSOC); @@ -360,47 +359,47 @@ class phpbb_database_test_connection_manager  	protected function get_dbms_data($dbms)  	{  		$available_dbms = array( -			'firebird'	=> array( +			'phpbb_db_driver_firebird'	=> array(  				'SCHEMA'		=> 'firebird',  				'DELIM'			=> ';;',  				'PDO'			=> 'firebird',  			), -			'mysqli'	=> array( +			'phpbb_db_driver_mysqli'	=> array(  				'SCHEMA'		=> 'mysql_41',  				'DELIM'			=> ';',  				'PDO'			=> 'mysql',  			), -			'mysql'		=> array( +			'phpbb_db_driver_mysql'		=> array(  				'SCHEMA'		=> 'mysql',  				'DELIM'			=> ';',  				'PDO'			=> 'mysql',  			), -			'mssql'		=> array( +			'phpbb_db_driver_mssql'		=> array(  				'SCHEMA'		=> 'mssql',  				'DELIM'			=> 'GO',  				'PDO'			=> 'odbc',  			), -			'mssql_odbc'=>	array( +			'phpbb_db_driver_mssql_odbc'=>	array(  				'SCHEMA'		=> 'mssql',  				'DELIM'			=> 'GO',  				'PDO'			=> 'odbc',  			), -			'mssqlnative'		=> array( +			'phpbb_db_driver_mssqlnative'		=> array(  				'SCHEMA'		=> 'mssql',  				'DELIM'			=> 'GO',  				'PDO'			=> 'sqlsrv',  			), -			'oracle'	=>	array( +			'phpbb_db_driver_oracle'	=>	array(  				'SCHEMA'		=> 'oracle',  				'DELIM'			=> '/',  				'PDO'			=> 'oci',  			), -			'postgres' => array( +			'phpbb_db_driver_postgres' => array(  				'SCHEMA'		=> 'postgres',  				'DELIM'			=> ';',  				'PDO'			=> 'pgsql',  			), -			'sqlite'		=> array( +			'phpbb_db_driver_sqlite'		=> array(  				'SCHEMA'		=> 'sqlite',  				'DELIM'			=> ';',  				'PDO'			=> 'sqlite2', @@ -429,7 +428,7 @@ class phpbb_database_test_connection_manager  		switch ($this->config['dbms'])  		{ -			case 'firebird': +			case 'phpbb_db_driver_firebird':  				$sql = 'SELECT RDB$GENERATOR_NAME  					FROM RDB$GENERATORS  					WHERE RDB$SYSTEM_FLAG = 0'; @@ -441,7 +440,7 @@ class phpbb_database_test_connection_manager  				}  			break; -			case 'oracle': +			case 'phpbb_db_driver_oracle':  				$sql = 'SELECT sequence_name  					FROM USER_SEQUENCES';  				$result = $this->pdo->query($sql); @@ -452,7 +451,7 @@ class phpbb_database_test_connection_manager  				}  			break; -			case 'postgres': +			case 'phpbb_db_driver_postgres':  				$sql = 'SELECT sequence_name  					FROM information_schema.sequences';  				$result = $this->pdo->query($sql); @@ -510,7 +509,7 @@ class phpbb_database_test_connection_manager  		switch ($this->config['dbms'])  		{ -			case 'oracle': +			case 'phpbb_db_driver_oracle':  				// Get all of the information about the sequences  				$sql = "SELECT t.table_name, tc.column_name, d.referenced_name as sequence_name, s.increment_by, s.min_value  					FROM USER_TRIGGERS t @@ -552,7 +551,7 @@ class phpbb_database_test_connection_manager  				}  			break; -			case 'postgres': +			case 'phpbb_db_driver_postgres':  				// Get the sequences attached to the tables  				$sql = 'SELECT column_name, table_name FROM information_schema.columns  					WHERE table_name IN (' . implode(', ', $table_names) . ") diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index 684d7a84cb..f27e339bb7 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -9,8 +9,6 @@  use Symfony\Component\BrowserKit\CookieJar;  require_once __DIR__ . '/../../phpBB/includes/functions_install.php'; -require_once __DIR__ . '/../../phpBB/includes/acm/acm_file.php'; -require_once __DIR__ . '/../../phpBB/includes/cache.php';  class phpbb_functional_test_case extends phpbb_test_case  { @@ -20,6 +18,7 @@ class phpbb_functional_test_case extends phpbb_test_case  	protected $cache = null;  	protected $db = null; +	protected $extension_manager = null;  	/**  	* Session ID for current test's session (each test makes its own) @@ -43,6 +42,12 @@ class phpbb_functional_test_case extends phpbb_test_case  		self::$config = phpbb_test_case_helpers::get_test_config();  		self::$root_url = self::$config['phpbb_functional_url']; +		// Important: this is used both for installation and by +		// test cases for querying the tables. +		// Therefore table prefix must be set before a board is +		// installed, and also before each test case is run. +		self::$config['table_prefix'] = 'phpbb_'; +  		if (!isset(self::$config['phpbb_functional_url']))  		{  			self::markTestSkipped('phpbb_functional_url was not set in test_config and wasn\'t set as PHPBB_FUNCTIONAL_URL environment variable either.'); @@ -132,18 +137,23 @@ class phpbb_functional_test_case extends phpbb_test_case  	{  	} +	public function __construct($name = NULL, array $data = array(), $dataName = '') +	{ +		parent::__construct($name, $data, $dataName); + +		$this->backupStaticAttributesBlacklist += array( +			'phpbb_functional_test_case' => array('config', 'already_installed'), +		); +	} +  	protected function get_db()  	{  		global $phpbb_root_path, $phpEx;  		// so we don't reopen an open connection -		if (!($this->db instanceof dbal)) +		if (!($this->db instanceof phpbb_db_driver))  		{ -			if (!class_exists('dbal_' . self::$config['dbms'])) -			{ -				include($phpbb_root_path . 'includes/db/' . self::$config['dbms'] . ".$phpEx"); -			} -			$sql_db = 'dbal_' . self::$config['dbms']; -			$this->db = new $sql_db(); +			$dbms = self::$config['dbms']; +			$this->db = new $dbms();  			$this->db->sql_connect(self::$config['dbhost'], self::$config['dbuser'], self::$config['dbpasswd'], self::$config['dbname'], self::$config['dbport']);  		}  		return $this->db; @@ -153,7 +163,7 @@ class phpbb_functional_test_case extends phpbb_test_case  	{  		if (!$this->cache)  		{ -			$this->cache = new cache(); +			$this->cache = new phpbb_cache_driver_file;  		}  		return $this->cache; @@ -168,20 +178,45 @@ class phpbb_functional_test_case extends phpbb_test_case  		$cache->load();  	} -	public function __construct($name = NULL, array $data = array(), $dataName = '') +	protected function get_extension_manager()  	{ -		parent::__construct($name, $data, $dataName); +		global $phpbb_root_path, $phpEx; -		$this->backupStaticAttributesBlacklist += array( -			'phpbb_functional_test_case' => array('config', 'already_installed'), +		$config = new phpbb_config(array()); +		$db = $this->get_db(); +		$db_tools = new phpbb_db_tools($db); + +		$migrator = new phpbb_db_migrator( +			$config, +			$db, +			$db_tools, +			self::$config['table_prefix'] . 'migrations', +			$phpbb_root_path, +			$php_ext, +			self::$config['table_prefix'], +			array()  		); +		$container = new phpbb_mock_container_builder(); +		$container->set('migrator', $migrator); + +		$extension_manager = new phpbb_extension_manager( +			$container, +			$db, +			$config, +			new phpbb_filesystem(), +			self::$config['table_prefix'] . 'ext', +			dirname(__FILE__) . '/', +			$php_ext, +			$this->get_cache_driver() +		); + +		return $extension_manager;  	}  	static protected function install_board()  	{  		global $phpbb_root_path, $phpEx; -		self::$config['table_prefix'] = 'phpbb_';  		self::recreate_database(self::$config);  		$config_file = $phpbb_root_path . "config.$phpEx"; @@ -252,8 +287,7 @@ class phpbb_functional_test_case extends phpbb_test_case  			'admin_name'	=> 'admin',  			'admin_pass1'	=> 'adminadmin',  			'admin_pass2'	=> 'adminadmin', -			'board_email1'	=> 'nobody@example.com', -			'board_email2'	=> 'nobody@example.com', +			'board_email'	=> 'nobody@example.com',  		));  		// install/index.php?mode=install&sub=administrator @@ -265,7 +299,7 @@ class phpbb_functional_test_case extends phpbb_test_case  		// because that step will create a config.php file if phpBB has the  		// permission to do so. We have to create the config file on our own  		// in order to get the DEBUG constants defined. -		$config_php_data = phpbb_create_config_file_data(self::$config, self::$config['dbms'], array(), true, true); +		$config_php_data = phpbb_create_config_file_data(self::$config, self::$config['dbms'], true, true);  		$config_created = file_put_contents($config_file, $config_php_data) !== false;  		if (!$config_created)  		{ @@ -336,51 +370,67 @@ class phpbb_functional_test_case extends phpbb_test_case  		global $phpbb_root_path;  		$db = $this->get_db(); -		$sql = 'INSERT INTO ' . STYLES_TABLE . ' ' . $db->sql_build_array('INSERT', array( -			'style_id' => $style_id, -			'style_name' => $style_path, -			'style_copyright' => '', -			'style_active' => 1, -			'template_id' => $style_id, -			'theme_id' => $style_id, -			'imageset_id' => $style_id, -		)); -		$db->sql_query($sql); - -		$sql = 'INSERT INTO ' . STYLES_IMAGESET_TABLE . ' ' . $db->sql_build_array('INSERT', array( -			'imageset_id' => $style_id, -			'imageset_name' => $style_path, -			'imageset_copyright' => '', -			'imageset_path' => $style_path, -		)); -		$db->sql_query($sql); - -		$sql = 'INSERT INTO ' . STYLES_TEMPLATE_TABLE . ' ' . $db->sql_build_array('INSERT', array( -			'template_id' => $style_id, -			'template_name' => $style_path, -			'template_copyright' => '', -			'template_path' => $style_path, -			'bbcode_bitfield' => 'kNg=', -			'template_inherits_id' => $parent_style_id, -			'template_inherit_path' => $parent_style_path, -		)); -		$db->sql_query($sql); - -		$sql = 'INSERT INTO ' . STYLES_THEME_TABLE . ' ' . $db->sql_build_array('INSERT', array( -			'theme_id' => $style_id, -			'theme_name' => $style_path, -			'theme_copyright' => '', -			'theme_path' => $style_path, -			'theme_storedb' => 0, -			'theme_mtime' => 0, -			'theme_data' => '', -		)); -		$db->sql_query($sql); - -		if ($style_path != 'prosilver' && $style_path != 'subsilver2') +		if (version_compare(PHPBB_VERSION, '3.1.0-dev', '<')) +		{ +			$sql = 'INSERT INTO ' . STYLES_TABLE . ' ' . $db->sql_build_array('INSERT', array( +				'style_id' => $style_id, +				'style_name' => $style_path, +				'style_copyright' => '', +				'style_active' => 1, +				'template_id' => $style_id, +				'theme_id' => $style_id, +				'imageset_id' => $style_id, +			)); +			$db->sql_query($sql); + +			$sql = 'INSERT INTO ' . STYLES_IMAGESET_TABLE . ' ' . $db->sql_build_array('INSERT', array( +				'imageset_id' => $style_id, +				'imageset_name' => $style_path, +				'imageset_copyright' => '', +				'imageset_path' => $style_path, +			)); +			$db->sql_query($sql); + +			$sql = 'INSERT INTO ' . STYLES_TEMPLATE_TABLE . ' ' . $db->sql_build_array('INSERT', array( +				'template_id' => $style_id, +				'template_name' => $style_path, +				'template_copyright' => '', +				'template_path' => $style_path, +				'bbcode_bitfield' => 'kNg=', +				'template_inherits_id' => $parent_style_id, +				'template_inherit_path' => $parent_style_path, +			)); +			$db->sql_query($sql); + +			$sql = 'INSERT INTO ' . STYLES_THEME_TABLE . ' ' . $db->sql_build_array('INSERT', array( +				'theme_id' => $style_id, +				'theme_name' => $style_path, +				'theme_copyright' => '', +				'theme_path' => $style_path, +				'theme_storedb' => 0, +				'theme_mtime' => 0, +				'theme_data' => '', +			)); +			$db->sql_query($sql); + +			if ($style_path != 'prosilver' && $style_path != 'subsilver2') +			{ +				@mkdir($phpbb_root_path . 'styles/' . $style_path, 0777); +				@mkdir($phpbb_root_path . 'styles/' . $style_path . '/template', 0777); +			} +		} +		else  		{ -			@mkdir($phpbb_root_path . 'styles/' . $style_path, 0777); -			@mkdir($phpbb_root_path . 'styles/' . $style_path . '/template', 0777); +			$db->sql_multi_insert(STYLES_TABLE, array( +				'style_id' => $style_id, +				'style_name' => $style_path, +				'style_copyright' => '', +				'style_active' => 1, +				'style_path' => $style_path, +				'bbcode_bitfield' => 'kNg=', +				'style_parent_id' => $parent_style_id, +				'style_parent_tree' => $parent_style_path, +			));  		}  	} @@ -396,14 +446,17 @@ class phpbb_functional_test_case extends phpbb_test_case  		$db = $this->get_db();  		$db->sql_query('DELETE FROM ' . STYLES_TABLE . ' WHERE style_id = ' . $style_id); -		$db->sql_query('DELETE FROM ' . STYLES_IMAGESET_TABLE . ' WHERE imageset_id = ' . $style_id); -		$db->sql_query('DELETE FROM ' . STYLES_TEMPLATE_TABLE . ' WHERE template_id = ' . $style_id); -		$db->sql_query('DELETE FROM ' . STYLES_THEME_TABLE . ' WHERE theme_id = ' . $style_id); - -		if ($style_path != 'prosilver' && $style_path != 'subsilver2') +		if (version_compare(PHPBB_VERSION, '3.1.0-dev', '<'))  		{ -			@rmdir($phpbb_root_path . 'styles/' . $style_path . '/template'); -			@rmdir($phpbb_root_path . 'styles/' . $style_path); +			$db->sql_query('DELETE FROM ' . STYLES_IMAGESET_TABLE . ' WHERE imageset_id = ' . $style_id); +			$db->sql_query('DELETE FROM ' . STYLES_TEMPLATE_TABLE . ' WHERE template_id = ' . $style_id); +			$db->sql_query('DELETE FROM ' . STYLES_THEME_TABLE . ' WHERE theme_id = ' . $style_id); + +			if ($style_path != 'prosilver' && $style_path != 'subsilver2') +			{ +				@rmdir($phpbb_root_path . 'styles/' . $style_path . '/template'); +				@rmdir($phpbb_root_path . 'styles/' . $style_path); +			}  		}  	} @@ -418,16 +471,12 @@ class phpbb_functional_test_case extends phpbb_test_case  		// Required by unique_id  		global $config; -		if (!is_array($config)) -		{ -			$config = array(); -		} - +		$config = new phpbb_config(array());  		$config['rand_seed'] = '';  		$config['rand_seed_last_update'] = time() + 600;  		// Required by user_add -		global $db, $cache; +		global $db, $cache, $phpbb_dispatcher, $phpbb_container;  		$db = $this->get_db();  		if (!function_exists('phpbb_mock_null_cache'))  		{ @@ -435,6 +484,14 @@ class phpbb_functional_test_case extends phpbb_test_case  		}  		$cache = new phpbb_mock_null_cache; +		$cache_driver = new phpbb_cache_driver_null(); +		$phpbb_container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface'); +		$phpbb_container +			->expects($this->any()) +			->method('get') +			->with('cache.driver') +			->will($this->returnValue($cache_driver)); +  		if (!function_exists('utf_clean_string'))  		{  			require_once(__DIR__ . '/../../phpBB/includes/utf/utf_tools.php'); @@ -443,6 +500,9 @@ class phpbb_functional_test_case extends phpbb_test_case  		{  			require_once(__DIR__ . '/../../phpBB/includes/functions_user.php');  		} +		set_config(null, null, null, $config); +		set_config_count(null, null, null, $config); +		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();  		$user_row = array(  			'username' => $username, @@ -457,6 +517,90 @@ class phpbb_functional_test_case extends phpbb_test_case  		return user_add($user_row);  	} +	protected function remove_user_group($group_name, $usernames) +	{ +		global $db, $cache, $auth, $config, $phpbb_dispatcher, $phpbb_log, $phpbb_container, $phpbb_root_path, $phpEx; + +		$config = new phpbb_config(array()); +		$config['coppa_enable'] = 0; + +		$db = $this->get_db(); +		$phpbb_dispatcher = new phpbb_mock_event_dispatcher(); +		$user = $this->getMock('phpbb_user'); +		$auth = $this->getMock('phpbb_auth'); + +		$phpbb_log = new phpbb_log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE); +		$cache = new phpbb_mock_null_cache; + +		$cache_driver = new phpbb_cache_driver_null(); +		$phpbb_container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface'); +		$phpbb_container +			->expects($this->any()) +			->method('get') +			->with('cache.driver') +			->will($this->returnValue($cache_driver)); + +		if (!function_exists('utf_clean_string')) +		{ +			require_once(__DIR__ . '/../../phpBB/includes/utf/utf_tools.php'); +		} +		if (!function_exists('group_user_del')) +		{ +			require_once(__DIR__ . '/../../phpBB/includes/functions_user.php'); +		} + +		$sql = 'SELECT group_id +			FROM ' . GROUPS_TABLE . " +			WHERE group_name = '" . $db->sql_escape($group_name) . "'"; +		$result = $db->sql_query($sql); +		$group_id = (int) $db->sql_fetchfield('group_id'); +		$db->sql_freeresult($result); + +		return group_user_del($group_id, false, $usernames, $group_name); +	} + +	protected function add_user_group($group_name, $usernames, $default = false, $leader = false) +	{ +		global $db, $cache, $auth, $config, $phpbb_dispatcher, $phpbb_log, $phpbb_container, $phpbb_root_path, $phpEx; + +		$config = new phpbb_config(array()); +		$config['coppa_enable'] = 0; + +		$db = $this->get_db(); +		$phpbb_dispatcher = new phpbb_mock_event_dispatcher(); +		$user = $this->getMock('phpbb_user'); +		$auth = $this->getMock('phpbb_auth'); + +		$phpbb_log = new phpbb_log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE); +		$cache = new phpbb_mock_null_cache; + +		$cache_driver = new phpbb_cache_driver_null(); +		$phpbb_container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface'); +		$phpbb_container +			->expects($this->any()) +			->method('get') +			->with('cache.driver') +			->will($this->returnValue($cache_driver)); + +		if (!function_exists('utf_clean_string')) +		{ +			require_once(__DIR__ . '/../../phpBB/includes/utf/utf_tools.php'); +		} +		if (!function_exists('group_user_del')) +		{ +			require_once(__DIR__ . '/../../phpBB/includes/functions_user.php'); +		} + +		$sql = 'SELECT group_id +			FROM ' . GROUPS_TABLE . " +			WHERE group_name = '" . $db->sql_escape($group_name) . "'"; +		$result = $db->sql_query($sql); +		$group_id = (int) $db->sql_fetchfield('group_id'); +		$db->sql_freeresult($result); + +		return group_user_add($group_id, false, $usernames, $group_name, $default, $leader); +	} +  	protected function login($username = 'admin')  	{  		$this->add_lang('ucp'); @@ -480,6 +624,16 @@ class phpbb_functional_test_case extends phpbb_test_case  		}  	} +	protected function logout() +	{ +		$this->add_lang('ucp'); + +		$crawler = self::request('GET', 'ucp.php?sid=' . $this->sid . '&mode=logout'); +		$this->assertContains($this->lang('LOGOUT_REDIRECT'), $crawler->filter('#message')->text()); +		unset($this->sid); + +	} +  	/**  	* Login to the ACP  	* You must run login() before calling this. @@ -561,6 +715,18 @@ 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 +	 */ +	public function assertContainsLang($needle, $haystack, $message = null) +	{ +		$this->assertContains(html_entity_decode($this->lang($needle), ENT_QUOTES), $haystack, $message); +	} + +	/*  	* Perform some basic assertions for the page  	*  	* Checks for debug/error output before the actual page content and the status code @@ -593,4 +759,185 @@ class phpbb_functional_test_case extends phpbb_test_case  	{  		self::assertEquals($status_code, self::$client->getResponse()->getStatus());  	} + +	public function assert_filter($crawler, $expr, $msg = null) +	{ +		$nodes = $crawler->filter($expr); +		if ($msg) +		{ +			$msg .= "\n"; +		} +		else +		{ +			$msg = ''; +		} +		$msg .= "`$expr` not found in DOM."; +		$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; +	} + +	/** +	* Creates a topic +	* +	* Be sure to login before creating +	* +	* @param int $forum_id +	* @param string $subject +	* @param string $message +	* @param array $additional_form_data Any additional form data to be sent in the request +	* @return array post_id, topic_id +	*/ +	public function create_topic($forum_id, $subject, $message, $additional_form_data = array()) +	{ +		$posting_url = "posting.php?mode=post&f={$forum_id}&sid={$this->sid}"; + +		$form_data = array_merge(array( +			'subject'		=> $subject, +			'message'		=> $message, +			'post'			=> true, +		), $additional_form_data); + +		return self::submit_post($posting_url, 'POST_TOPIC', $form_data); +	} + +	/** +	* Creates a post +	* +	* Be sure to login before creating +	* +	* @param int $forum_id +	* @param string $subject +	* @param string $message +	* @param array $additional_form_data Any additional form data to be sent in the request +	* @return array post_id, topic_id +	*/ +	public function create_post($forum_id, $topic_id, $subject, $message, $additional_form_data = array()) +	{ +		$posting_url = "posting.php?mode=reply&f={$forum_id}&t={$topic_id}&sid={$this->sid}"; + +		$form_data = array_merge(array( +			'subject'		=> $subject, +			'message'		=> $message, +			'post'			=> true, +		), $additional_form_data); + +		return self::submit_post($posting_url, 'POST_REPLY', $form_data); +	} + +	/** +	* Helper for submitting posts +	* +	* @param string $posting_url +	* @param string $posting_contains +	* @param array $form_data +	* @return array post_id, topic_id +	*/ +	protected function submit_post($posting_url, $posting_contains, $form_data) +	{ +		$this->add_lang('posting'); + +		$crawler = self::request('GET', $posting_url); +		$this->assertContains($this->lang($posting_contains), $crawler->filter('html')->text()); + +		$hidden_fields = array( +			$crawler->filter('[type="hidden"]')->each(function ($node, $i) { +				return array('name' => $node->getAttribute('name'), 'value' => $node->getAttribute('value')); +			}), +		); + +		foreach ($hidden_fields as $fields) +		{ +			foreach($fields as $field) +			{ +				$form_data[$field['name']] = $field['value']; +			} +		} + +		// Bypass time restriction that said that if the lastclick time (i.e. time when the form was opened) +		// is not at least 2 seconds before submission, cancel the form +		$form_data['lastclick'] = 0; + +		// I use a request because the form submission method does not allow you to send data that is not +		// contained in one of the actual form fields that the browser sees (i.e. it ignores "hidden" inputs) +		// Instead, I send it as a request with the submit button "post" set to true. +		$crawler = self::request('POST', $posting_url, $form_data); +		$this->assertContains($this->lang('POST_STORED'), $crawler->filter('html')->text()); + +		$url = $crawler->selectLink($this->lang('VIEW_MESSAGE', '', ''))->link()->getUri(); + +		$matches = $topic_id = $post_id = false; +		preg_match_all('#&t=([0-9]+)(&p=([0-9]+))?#', $url, $matches); + +		$topic_id = (int) (isset($matches[1][0])) ? $matches[1][0] : 0; +		$post_id = (int) (isset($matches[3][0])) ? $matches[3][0] : 0; + +		return array( +			'topic_id'	=> $topic_id, +			'post_id'	=> $post_id, +		); +	}  } diff --git a/tests/test_framework/phpbb_search_test_case.php b/tests/test_framework/phpbb_search_test_case.php new file mode 100644 index 0000000000..418d352c17 --- /dev/null +++ b/tests/test_framework/phpbb_search_test_case.php @@ -0,0 +1,29 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2012 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +abstract class phpbb_search_test_case extends phpbb_database_test_case +{ +	static protected function get_search_wrapper($class) +	{ +		$wrapped = $class . '_wrapper'; +		if (!class_exists($wrapped)) +		{ +			$code = " +class $wrapped extends $class +{ +	public function get_must_contain_ids() { return \$this->must_contain_ids; } +	public function get_must_not_contain_ids() { return \$this->must_not_contain_ids; } +	public function get_split_words() { return \$this->split_words; } +} +			"; +			eval($code); +		} +		return $wrapped; +	} +} diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php index 29adfc6817..50b2bf03ec 100644 --- a/tests/test_framework/phpbb_test_case_helpers.php +++ b/tests/test_framework/phpbb_test_case_helpers.php @@ -18,6 +18,56 @@ class phpbb_test_case_helpers  		$this->test_case = $test_case;  	} +	/** +	* This should only be called once before the tests are run. +	* This is used to copy the fixtures to the phpBB install +	*/ +	public function copy_ext_fixtures($fixtures_dir, $fixtures) +	{ +		global $phpbb_root_path; + +		if (file_exists($phpbb_root_path . 'ext/')) +		{ +			// First, move any extensions setup on the board to a temp directory +			$this->copy_dir($phpbb_root_path . 'ext/', $phpbb_root_path . 'store/temp_ext/'); + +			// Then empty the ext/ directory on the board (for accurate test cases) +			$this->empty_dir($phpbb_root_path . 'ext/'); +		} + +		// Copy our ext/ files from the test case to the board +		foreach ($fixtures as $fixture) +		{ +			$this->copy_dir($fixtures_dir . $fixture, $phpbb_root_path . 'ext/' . $fixture); +		} +	} + +	/** +	* This should only be called once after the tests are run. +	* This is used to remove the fixtures from the phpBB install +	*/ +	public function restore_original_ext_dir() +	{ +		global $phpbb_root_path; + +		// Remove all of the files we copied from test ext -> board ext +		$this->empty_dir($phpbb_root_path . 'ext/'); + +		// Copy back the board installed extensions from the temp directory +		if (file_exists($phpbb_root_path . 'store/temp_ext/')) +		{ +			$this->copy_dir($phpbb_root_path . 'store/temp_ext/', $phpbb_root_path . 'ext/'); + +			// Remove all of the files we copied from board ext -> temp_ext +			$this->empty_dir($phpbb_root_path . 'store/temp_ext/'); +		} + +		if (file_exists($phpbb_root_path . 'store/temp_ext/')) +		{ +			$this->empty_dir($phpbb_root_path . 'store/temp_ext/'); +		} +	} +  	public function setExpectedTriggerError($errno, $message = '')  	{  		$exceptionName = ''; @@ -42,6 +92,11 @@ class phpbb_test_case_helpers  		$this->test_case->setExpectedException($exceptionName, (string) $message, $errno);  	} +	public function makedirs($path) +	{ +		mkdir($path, 0777, true); +	} +  	static public function get_test_config()  	{  		$config = array(); @@ -49,7 +104,7 @@ class phpbb_test_case_helpers  		if (extension_loaded('sqlite') && version_compare(PHPUnit_Runner_Version::id(), '3.4.15', '>='))  		{  			$config = array_merge($config, array( -				'dbms'		=> 'sqlite', +				'dbms'		=> 'phpbb_db_driver_sqlite',  				'dbhost'	=> dirname(__FILE__) . '/../phpbb_unit_tests.sqlite2', // filename  				'dbport'	=> '',  				'dbname'	=> '', @@ -72,8 +127,13 @@ class phpbb_test_case_helpers  		{  			include($test_config); +			if (!function_exists('phpbb_convert_30_dbms_to_31')) +			{ +				require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; +			} +  			$config = array_merge($config, array( -				'dbms'		=> $dbms, +				'dbms'		=> phpbb_convert_30_dbms_to_31($dbms),  				'dbhost'	=> $dbhost,  				'dbport'	=> $dbport,  				'dbname'	=> $dbname, @@ -86,12 +146,26 @@ class phpbb_test_case_helpers  			{  				$config['phpbb_functional_url'] = $phpbb_functional_url;  			} + +			if (isset($phpbb_redis_host)) +			{ +				$config['redis_host'] = $phpbb_redis_host; +			} +			if (isset($phpbb_redis_port)) +			{ +				$config['redis_port'] = $phpbb_redis_port; +			}  		}  		if (isset($_SERVER['PHPBB_TEST_DBMS']))  		{ +			if (!function_exists('phpbb_convert_30_dbms_to_31')) +			{ +				require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; +			} +  			$config = array_merge($config, array( -				'dbms'		=> isset($_SERVER['PHPBB_TEST_DBMS']) ? $_SERVER['PHPBB_TEST_DBMS'] : '', +				'dbms'		=> isset($_SERVER['PHPBB_TEST_DBMS']) ? phpbb_convert_30_dbms_to_31($_SERVER['PHPBB_TEST_DBMS']) : '',  				'dbhost'	=> isset($_SERVER['PHPBB_TEST_DBHOST']) ? $_SERVER['PHPBB_TEST_DBHOST'] : '',  				'dbport'	=> isset($_SERVER['PHPBB_TEST_DBPORT']) ? $_SERVER['PHPBB_TEST_DBPORT'] : '',  				'dbname'	=> isset($_SERVER['PHPBB_TEST_DBNAME']) ? $_SERVER['PHPBB_TEST_DBNAME'] : '', @@ -108,6 +182,103 @@ class phpbb_test_case_helpers  			));  		} +		if (isset($_SERVER['PHPBB_TEST_REDIS_HOST'])) +		{ +			$config['redis_host'] = $_SERVER['PHPBB_TEST_REDIS_HOST']; +		} + +		if (isset($_SERVER['PHPBB_TEST_REDIS_PORT'])) +		{ +			$config['redis_port'] = $_SERVER['PHPBB_TEST_REDIS_PORT']; +		} +  		return $config;  	} + +	/** +	* Recursive directory copying function +	* +	* @param string $source +	* @param string $dest +	* @return array list of files copied +	*/ +	public function copy_dir($source, $dest) +	{ +		$source = (substr($source, -1) == '/') ? $source : $source . '/'; +		$dest = (substr($dest, -1) == '/') ? $dest : $dest . '/'; + +		$copied_files = array(); + +		if (!is_dir($dest)) +		{ +			$this->makedirs($dest); +		} + +		$files = scandir($source); +		foreach ($files as $file) +		{ +			if ($file == '.' || $file == '..') +			{ +				continue; +			} + +			if (is_dir($source . $file)) +			{ +				$created_dir = false; +				if (!is_dir($dest . $file)) +				{ +					$created_dir = true; +					$this->makedirs($dest . $file); +				} + +				$copied_files = array_merge($copied_files, self::copy_dir($source . $file, $dest . $file)); + +				if ($created_dir) +				{ +					$copied_files[] = $dest . $file; +				} +			} +			else +			{ +				if (!file_exists($dest . $file)) +				{ +					copy($source . $file, $dest . $file); + +					$copied_files[] = $dest . $file; +				} +			} +		} + +		return $copied_files; +	} + +	/** +	* Empty directory (remove any subdirectories/files below) +	* +	* @param array $file_list +	*/ +	public function empty_dir($path) +	{ +		$path = (substr($path, -1) == '/') ? $path : $path . '/'; + +		$files = scandir($path); +		foreach ($files as $file) +		{ +			if ($file == '.' || $file == '..') +			{ +				continue; +			} + +			if (is_dir($path . $file)) +			{ +				$this->empty_dir($path . $file); + +				rmdir($path . $file); +			} +			else +			{ +				unlink($path . $file); +			} +		} +	}  } diff --git a/tests/text_processing/censor_text_test.php b/tests/text_processing/censor_text_test.php index f0e13638a5..043d8eb27d 100644 --- a/tests/text_processing/censor_text_test.php +++ b/tests/text_processing/censor_text_test.php @@ -9,8 +9,6 @@  require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';  require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php'; -require_once dirname(__FILE__) . '/../mock/user.php'; -require_once dirname(__FILE__) . '/../mock/cache.php';  class phpbb_text_processing_censor_text_test extends phpbb_test_case  { @@ -19,7 +17,7 @@ class phpbb_text_processing_censor_text_test extends phpbb_test_case  		global $cache, $user;  		$cache = new phpbb_mock_cache;  		$user = new phpbb_mock_user; -		 +  		$user->optionset('viewcensors', false);  		return array( @@ -61,7 +59,7 @@ class phpbb_text_processing_censor_text_test extends phpbb_test_case  			array('badword1 badword2 badword3 badword4', 'replacement1 replacement2 replacement3 replacement4'),  			array('badword1 badword2 badword3 badword4d', 'replacement1 replacement2 replacement3 badword4d'),  			array('abadword1 badword2 badword3 badword4', 'replacement1 replacement2 replacement3 replacement4'), -			 +  			array("new\nline\ntest", "new\nline\ntest"),  			array("tab\ttest\t", "tab\ttest\t"),  			array('öäü', 'öäü'), diff --git a/tests/text_processing/make_clickable_test.php b/tests/text_processing/make_clickable_test.php index db0812319d..d94fac2ae4 100644 --- a/tests/text_processing/make_clickable_test.php +++ b/tests/text_processing/make_clickable_test.php @@ -12,7 +12,7 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php';  class phpbb_text_processing_make_clickable_test extends phpbb_test_case  { -	static public function make_clickable_data() +	public function make_clickable_data()  	{  		// value => whether it should work  		$prefix_texts = array( diff --git a/tests/tree/fixtures/phpbb_forums.xml b/tests/tree/fixtures/phpbb_forums.xml new file mode 100644 index 0000000000..8f133078a9 --- /dev/null +++ b/tests/tree/fixtures/phpbb_forums.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<dataset> +	<table name="phpbb_forums"> +		<column>forum_id</column> +		<column>parent_id</column> +		<column>left_id</column> +		<column>right_id</column> +		<column>forum_parents</column> +		<column>forum_name</column> +		<column>forum_desc</column> +		<column>forum_rules</column> +	</table> +</dataset> diff --git a/tests/tree/nestedset_forum_base.php b/tests/tree/nestedset_forum_base.php new file mode 100644 index 0000000000..43680609f8 --- /dev/null +++ b/tests/tree/nestedset_forum_base.php @@ -0,0 +1,115 @@ +<?php +/** +* +* @package tree +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +class phpbb_tests_tree_nestedset_forum_base extends phpbb_database_test_case +{ +	public function getDataSet() +	{ +		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/phpbb_forums.xml'); +	} + +	protected $forum_data = array( +		// \__/ +		1	=> array('forum_id' => 1, 'parent_id' => 0, 'user_id' => 0, 'left_id' => 1, 'right_id' => 6, 'forum_parents' => 'a:0:{}'), +		2	=> array('forum_id' => 2, 'parent_id' => 1, 'user_id' => 0, 'left_id' => 2, 'right_id' => 3, 'forum_parents' => 'a:0:{}'), +		3	=> array('forum_id' => 3, 'parent_id' => 1, 'user_id' => 0, 'left_id' => 4, 'right_id' => 5, 'forum_parents' => 'a:0:{}'), + +		// \  / +		//  \/ +		4	=> array('forum_id' => 4, 'parent_id' => 0, 'user_id' => 0, 'left_id' => 7, 'right_id' => 12, 'forum_parents' => 'a:0:{}'), +		5	=> array('forum_id' => 5, 'parent_id' => 4, 'user_id' => 0, 'left_id' => 8, 'right_id' => 11, 'forum_parents' => 'a:0:{}'), +		6	=> array('forum_id' => 6, 'parent_id' => 5, 'user_id' => 0, 'left_id' => 9, 'right_id' => 10, 'forum_parents' => 'a:0:{}'), + +		// \_  _/ +		//   \/ +		7	=> array('forum_id' => 7, 'parent_id' => 0, 'user_id' => 0, 'left_id' => 13, 'right_id' => 22, 'forum_parents' => 'a:0:{}'), +		8	=> array('forum_id' => 8, 'parent_id' => 7, 'user_id' => 0, 'left_id' => 14, 'right_id' => 15, 'forum_parents' => 'a:0:{}'), +		9	=> array('forum_id' => 9, 'parent_id' => 7, 'user_id' => 0, 'left_id' => 16, 'right_id' => 19, 'forum_parents' => 'a:0:{}'), +		10	=> array('forum_id' => 10, 'parent_id' => 9, 'user_id' => 0, 'left_id' => 17, 'right_id' => 18, 'forum_parents' => 'a:0:{}'), +		11	=> array('forum_id' => 11, 'parent_id' => 7, 'user_id' => 0, 'left_id' => 20, 'right_id' => 21, 'forum_parents' => 'a:0:{}'), + +		// Non-existent forums +		0	=> array('forum_id' => 0, 'parent_id' => 0, 'user_id' => 0, 'left_id' => 0, 'right_id' => 0, 'forum_parents' => 'a:0:{}'), +		200	=> array('forum_id' => 200, 'parent_id' => 0, 'user_id' => 0, 'left_id' => 0, 'right_id' => 0, 'forum_parents' => 'a:0:{}'), +	); + +	protected $set, +		$config, +		$lock, +		$db; + +	public function setUp() +	{ +		parent::setUp(); + +		$this->db = $this->new_dbal(); + +		global $config; + +		$config = $this->config = new phpbb_config(array('nestedset_forum_lock' => 0)); +		set_config(null, null, null, $this->config); + +		$this->lock = new phpbb_lock_db('nestedset_forum_lock', $this->config, $this->db); +		$this->set = new phpbb_tree_nestedset_forum($this->db, $this->lock, 'phpbb_forums'); + +		$this->set_up_forums(); +	} + +	protected function set_up_forums() +	{ +		static $forums; + +		if (empty($forums)) +		{  +			$this->create_forum('Parent with two flat children'); +			$this->create_forum('Flat child #1', 1); +			$this->create_forum('Flat child #2', 1); + +			$this->create_forum('Parent with two nested children'); +			$this->create_forum('Nested child #1', 4); +			$this->create_forum('Nested child #2', 5); + +			$this->create_forum('Parent with flat and nested children'); +			$this->create_forum('Mixed child #1', 7); +			$this->create_forum('Mixed child #2', 7); +			$this->create_forum('Nested child #1 of Mixed child #2', 9); +			$this->create_forum('Mixed child #3', 7); + +			// Updating forum_parents column here so it's not empty +			// This is required, so we can see whether the methods +			// correctly clear the values.  +			$sql = "UPDATE phpbb_forums +				SET forum_parents = 'a:0:{}'"; +			$this->db->sql_query($sql); + +			// Copy the forums into a static array, so we can reuse the list later +			$sql = 'SELECT * +				FROM phpbb_forums'; +			$result = $this->db->sql_query($sql); +			$forums = $this->db->sql_fetchrowset($result); +			$this->db->sql_freeresult($result); +		} +		else +		{ +			$buffer = new phpbb_db_sql_insert_buffer($this->db, 'phpbb_forums'); +			$buffer->insert_all($forums); +			$buffer->flush(); + +			$this->database_synchronisation(array( +				'phpbb_forums'	=> array('forum_id'), +			)); +		}  +	} + +	protected function create_forum($name, $parent_id = 0) +	{ +		$forum = $this->set->insert(array('forum_name' => $name, 'forum_desc' => '', 'forum_rules' => '')); +		$this->set->change_parent($forum['forum_id'], $parent_id); +	} +} diff --git a/tests/tree/nestedset_forum_get_data_test.php b/tests/tree/nestedset_forum_get_data_test.php new file mode 100644 index 0000000000..ca1863e55e --- /dev/null +++ b/tests/tree/nestedset_forum_get_data_test.php @@ -0,0 +1,119 @@ +<?php +/** +* +* @package tree +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +require_once dirname(__FILE__) . '/nestedset_forum_base.php'; + +class phpbb_tests_tree_nestedset_forum_get_data_test extends phpbb_tests_tree_nestedset_forum_base +{ +	public function get_path_and_subtree_data_data() +	{ +		return array( +			array(1, true, true, array(1, 2, 3)), +			array(1, true, false, array(2, 3)), +			array(1, false, true, array(3, 2, 1)), +			array(1, false, false, array(3, 2)), + +			array(2, true, true, array(1, 2)), +			array(2, true, false, array(1)), +			array(2, false, true, array(2, 1)), +			array(2, false, false, array(1)), + +			array(5, true, true, array(4, 5, 6)), +			array(5, true, false, array(4, 6)), +			array(5, false, true, array(6, 5, 4)), +			array(5, false, false, array(6, 4)), +		); +	} + +	/** +	* @dataProvider get_path_and_subtree_data_data +	*/ +	public function test_get_path_and_subtree_data($forum_id, $order_asc, $include_item, $expected) +	{ +		$this->assertEquals($expected, array_keys($this->set->get_path_and_subtree_data($forum_id, $order_asc, $include_item))); +	} + +	public function get_path_data_data() +	{ +		return array( +			array(1, true, true, array(1)), +			array(1, true, false, array()), +			array(1, false, true, array(1)), +			array(1, false, false, array()), + +			array(2, true, true, array(1, 2)), +			array(2, true, false, array(1)), +			array(2, false, true, array(2, 1)), +			array(2, false, false, array(1)), + +			array(5, true, true, array(4, 5)), +			array(5, true, false, array(4)), +			array(5, false, true, array(5, 4)), +			array(5, false, false, array(4)), +		); +	} + +	/** +	* @dataProvider get_path_data_data +	*/ +	public function test_get_path_data($forum_id, $order_asc, $include_item, $expected) +	{ +		$this->assertEquals($expected, array_keys($this->set->get_path_data($forum_id, $order_asc, $include_item))); +	} + +	public function get_subtree_data_data() +	{ +		return array( +			array(1, true, true, array(1, 2, 3)), +			array(1, true, false, array(2, 3)), +			array(1, false, true, array(3, 2, 1)), +			array(1, false, false, array(3, 2)), + +			array(2, true, true, array(2)), +			array(2, true, false, array()), +			array(2, false, true, array(2)), +			array(2, false, false, array()), + +			array(5, true, true, array(5, 6)), +			array(5, true, false, array(6)), +			array(5, false, true, array(6, 5)), +			array(5, false, false, array(6)), +		); +	} + +	/** +	* @dataProvider get_subtree_data_data +	*/ +	public function test_get_subtree_data($forum_id, $order_asc, $include_item, $expected) +	{ +		$this->assertEquals($expected, array_keys($this->set->get_subtree_data($forum_id, $order_asc, $include_item))); +	} + +	public function get_path_basic_data_data() +	{ +		return array( +			array(1, '', array()), +			array(1, serialize(array()), array()), +			array(2, '', array(1)), +			array(2, serialize(array(1 => array())), array(1)), +			array(10, '', array(7, 9)), +			array(10, serialize(array(7 => array(), 9 => array())), array(7, 9)), +		); +	} + +	/** +	* @dataProvider get_path_basic_data_data +	*/ +	public function test_get_path_basic_data($forum_id, $forum_parents, $expected) +	{ +		$forum_data = $this->forum_data[$forum_id]; +		$forum_data['forum_parents'] = $forum_parents; +		$this->assertEquals($expected, array_keys($this->set->get_path_basic_data($forum_data))); +	} +} diff --git a/tests/tree/nestedset_forum_insert_delete_test.php b/tests/tree/nestedset_forum_insert_delete_test.php new file mode 100644 index 0000000000..d0e9e02c2e --- /dev/null +++ b/tests/tree/nestedset_forum_insert_delete_test.php @@ -0,0 +1,120 @@ +<?php +/** +* +* @package tree +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +require_once dirname(__FILE__) . '/nestedset_forum_base.php'; + +class phpbb_tests_tree_nestedset_forum_add_remove_test extends phpbb_tests_tree_nestedset_forum_base +{ +	public function delete_data() +	{ +		return array( +			array(1, array(1, 2, 3), array( +				array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6), +				array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 2, 'right_id' => 5), +				array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 3, 'right_id' => 4), +				array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 16), +				array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 8, 'right_id' => 9), +				array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 10, 'right_id' => 13), +				array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 11, 'right_id' => 12), +				array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 15), +			)), +			array(2, array(2), array( +				array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 4), +				array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 2, 'right_id' => 3), +				array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 5, 'right_id' => 10), +				array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 6, 'right_id' => 9), +				array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 7, 'right_id' => 8), +				array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 11, 'right_id' => 20), +				array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 12, 'right_id' => 13), +				array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 17), +				array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 15, 'right_id' => 16), +				array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 18, 'right_id' => 19), +			)), +		); +	} + +	/** +	* @dataProvider delete_data +	*/ +	public function test_delete($forum_id, $expected_deleted, $expected) +	{ +		$this->assertEquals($expected_deleted, $this->set->delete($forum_id)); + +		$result = $this->db->sql_query("SELECT forum_id, parent_id, left_id, right_id +			FROM phpbb_forums +			ORDER BY left_id, forum_id ASC"); +		$this->assertEquals($expected, $this->db->sql_fetchrowset($result)); +	} + +	public function delete_throws_data() +	{ +		return array( +			array('Not an item', 0), +			array('Item does not exist', 200), +		); +	} + +	/** +	* @dataProvider delete_throws_data +	* +	* @expectedException			OutOfBoundsException +	* @expectedExceptionMessage		FORUM_NESTEDSET_INVALID_ITEM +	*/ +	public function test_delete_throws($explain, $forum_id) +	{ +		$this->set->delete($forum_id); +	} + +	public function insert_data() +	{ +		return array( +			array(array( +				'forum_desc'	=> '', +				'forum_rules'	=> '', +				'forum_id'		=> 12, +				'parent_id'		=> 0, +				'left_id'		=> 23, +				'right_id'		=> 24, +				'forum_parents'	=> '', +			), array( +				array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6), +				array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 2, 'right_id' => 3), +				array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 4, 'right_id' => 5), + +				array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 12), +				array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 8, 'right_id' => 11), +				array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 9, 'right_id' => 10), + +				array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 13, 'right_id' => 22), +				array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 15), +				array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 16, 'right_id' => 19), +				array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 17, 'right_id' => 18), +				array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 20, 'right_id' => 21), + +				array('forum_id' => 12, 'parent_id' => 0, 'left_id' => 23, 'right_id' => 24), +			)), +		); +	} + +	/** +	* @dataProvider insert_data +	*/ +	public function test_insert($expected_data, $expected) +	{ +		$this->assertEquals($expected_data, $this->set->insert(array( +			'forum_desc'	=> '', +			'forum_rules'	=> '', +		))); + +		$result = $this->db->sql_query('SELECT forum_id, parent_id, left_id, right_id +			FROM phpbb_forums +			ORDER BY left_id, forum_id ASC'); +		$this->assertEquals($expected, $this->db->sql_fetchrowset($result)); +	} +} diff --git a/tests/tree/nestedset_forum_move_test.php b/tests/tree/nestedset_forum_move_test.php new file mode 100644 index 0000000000..fe506c8278 --- /dev/null +++ b/tests/tree/nestedset_forum_move_test.php @@ -0,0 +1,569 @@ +<?php +/** +* +* @package tree +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +require_once dirname(__FILE__) . '/nestedset_forum_base.php'; + +class phpbb_tests_tree_nestedset_forum_move_test extends phpbb_tests_tree_nestedset_forum_base +{ +	public function move_data() +	{ +		return array( +			array('Move first item up', +				1, 1, false, array( +				array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6), +				array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 2, 'right_id' => 3), +				array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 4, 'right_id' => 5), +				array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 12), +				array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 8, 'right_id' => 11), +				array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 9, 'right_id' => 10), +				array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 13, 'right_id' => 22), +				array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 15), +				array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 16, 'right_id' => 19), +				array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 17, 'right_id' => 18), +				array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 20, 'right_id' => 21), +			)), +			array('Move last item down', +				7, -1, false, array( +				array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6), +				array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 2, 'right_id' => 3), +				array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 4, 'right_id' => 5), +				array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 12), +				array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 8, 'right_id' => 11), +				array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 9, 'right_id' => 10), +				array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 13, 'right_id' => 22), +				array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 15), +				array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 16, 'right_id' => 19), +				array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 17, 'right_id' => 18), +				array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 20, 'right_id' => 21), +			)), +			array('Move first item down', +				1, -1, true, array( +				array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6), +				array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 2, 'right_id' => 5), +				array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 3, 'right_id' => 4), +				array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 12), +				array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 8, 'right_id' => 9), +				array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 10, 'right_id' => 11), +				array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 13, 'right_id' => 22), +				array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 15), +				array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 16, 'right_id' => 19), +				array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 17, 'right_id' => 18), +				array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 20, 'right_id' => 21), +			)), +			array('Move second item up', +				4, 1, true, array( +				array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6), +				array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 2, 'right_id' => 5), +				array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 3, 'right_id' => 4), +				array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 12), +				array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 8, 'right_id' => 9), +				array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 10, 'right_id' => 11), +				array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 13, 'right_id' => 22), +				array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 15), +				array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 16, 'right_id' => 19), +				array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 17, 'right_id' => 18), +				array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 20, 'right_id' => 21), +			)), +			array('Move last item up', +				7, 1, true, array( +				array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6), +				array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 2, 'right_id' => 3), +				array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 4, 'right_id' => 5), +				array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 16), +				array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 8, 'right_id' => 9), +				array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 10, 'right_id' => 13), +				array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 11, 'right_id' => 12), +				array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 15), +				array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 17, 'right_id' => 22), +				array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 18, 'right_id' => 21), +				array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 19, 'right_id' => 20), +			)), +			array('Move last item up by 2', +				7, 2, true, array( +				array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 10), +				array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 2, 'right_id' => 3), +				array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 4, 'right_id' => 7), +				array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 5, 'right_id' => 6), +				array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 8, 'right_id' => 9), +				array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 11, 'right_id' => 16), +				array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 12, 'right_id' => 13), +				array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 14, 'right_id' => 15), +				array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 17, 'right_id' => 22), +				array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 18, 'right_id' => 21), +				array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 19, 'right_id' => 20), +			)), +			array('Move last item up by 100', +				7, 100, true, array( +				array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 10), +				array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 2, 'right_id' => 3), +				array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 4, 'right_id' => 7), +				array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 5, 'right_id' => 6), +				array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 8, 'right_id' => 9), +				array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 11, 'right_id' => 16), +				array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 12, 'right_id' => 13), +				array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 14, 'right_id' => 15), +				array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 17, 'right_id' => 22), +				array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 18, 'right_id' => 21), +				array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 19, 'right_id' => 20), +			)), +		); +	} + +	/** +	* @dataProvider move_data +	*/ +	public function test_move($explain, $forum_id, $delta, $expected_moved, $expected) +	{ +		$this->assertEquals($expected_moved, $this->set->move($forum_id, $delta)); + +		$result = $this->db->sql_query("SELECT forum_id, parent_id, left_id, right_id +			FROM phpbb_forums +			ORDER BY left_id, forum_id ASC"); +		$this->assertEquals($expected, $this->db->sql_fetchrowset($result)); +	} + +	public function move_down_data() +	{ +		return array( +			array('Move last item down', +				7, false, array( +				array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6), +				array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 2, 'right_id' => 3), +				array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 4, 'right_id' => 5), +				array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 12), +				array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 8, 'right_id' => 11), +				array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 9, 'right_id' => 10), +				array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 13, 'right_id' => 22), +				array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 15), +				array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 16, 'right_id' => 19), +				array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 17, 'right_id' => 18), +				array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 20, 'right_id' => 21), +			)), +			array('Move first item down', +				1, true, array( +				array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6), +				array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 2, 'right_id' => 5), +				array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 3, 'right_id' => 4), +				array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 12), +				array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 8, 'right_id' => 9), +				array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 10, 'right_id' => 11), +				array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 13, 'right_id' => 22), +				array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 15), +				array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 16, 'right_id' => 19), +				array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 17, 'right_id' => 18), +				array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 20, 'right_id' => 21), +			)), +		); +	} + +	/** +	* @dataProvider move_down_data +	*/ +	public function test_move_down($explain, $forum_id, $expected_moved, $expected) +	{ +		$this->assertEquals($expected_moved, $this->set->move_down($forum_id)); + +		$result = $this->db->sql_query("SELECT forum_id, parent_id, left_id, right_id +			FROM phpbb_forums +			ORDER BY left_id, forum_id ASC"); +		$this->assertEquals($expected, $this->db->sql_fetchrowset($result)); +	} + +	public function move_up_data() +	{ +		return array( +			array('Move first item up', +				1, false, array( +				array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6), +				array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 2, 'right_id' => 3), +				array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 4, 'right_id' => 5), +				array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 12), +				array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 8, 'right_id' => 11), +				array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 9, 'right_id' => 10), +				array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 13, 'right_id' => 22), +				array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 15), +				array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 16, 'right_id' => 19), +				array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 17, 'right_id' => 18), +				array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 20, 'right_id' => 21), +			)), +			array('Move second item up', +				4, true, array( +				array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6), +				array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 2, 'right_id' => 5), +				array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 3, 'right_id' => 4), +				array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 12), +				array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 8, 'right_id' => 9), +				array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 10, 'right_id' => 11), +				array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 13, 'right_id' => 22), +				array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 15), +				array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 16, 'right_id' => 19), +				array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 17, 'right_id' => 18), +				array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 20, 'right_id' => 21), +			)), +		); +	} + +	/** +	* @dataProvider move_up_data +	*/ +	public function test_move_up($explain, $forum_id, $expected_moved, $expected) +	{ +		$this->assertEquals($expected_moved, $this->set->move_up($forum_id)); + +		$result = $this->db->sql_query("SELECT forum_id, parent_id, left_id, right_id +			FROM phpbb_forums +			ORDER BY left_id, forum_id ASC"); +		$this->assertEquals($expected, $this->db->sql_fetchrowset($result)); +	} + +	public function move_children_data() +	{ +		return array( +			array('Item has no children', +				2, 1, false, array( +				array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 2, 'right_id' => 3, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 4, 'right_id' => 5, 'forum_parents' => 'a:0:{}'), + +				array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 12, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 8, 'right_id' => 11, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 9, 'right_id' => 10, 'forum_parents' => 'a:0:{}'), + +				array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 13, 'right_id' => 22, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 15, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 16, 'right_id' => 19, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 17, 'right_id' => 18, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 20, 'right_id' => 21, 'forum_parents' => 'a:0:{}'), +			)), +			array('Move to same parent', +				4, 4, false, array( +				array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 2, 'right_id' => 3, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 4, 'right_id' => 5, 'forum_parents' => 'a:0:{}'), + +				array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 12, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 8, 'right_id' => 11, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 9, 'right_id' => 10, 'forum_parents' => 'a:0:{}'), + +				array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 13, 'right_id' => 22, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 15, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 16, 'right_id' => 19, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 17, 'right_id' => 18, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 20, 'right_id' => 21, 'forum_parents' => 'a:0:{}'), +			)), +			array('Move single child up', +				5, 1, true, array( +				array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 8, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 2, 'right_id' => 3, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 4, 'right_id' => 5, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 6, 'parent_id' => 1, 'left_id' => 6, 'right_id' => 7, 'forum_parents' => ''), + +				array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 9, 'right_id' => 12, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 10, 'right_id' => 11, 'forum_parents' => 'a:0:{}'), + +				array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 13, 'right_id' => 22, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 15, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 16, 'right_id' => 19, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 17, 'right_id' => 18, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 20, 'right_id' => 21, 'forum_parents' => 'a:0:{}'), +			)), +			array('Move nested children up', +				4, 1, true, array( +				array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 10, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 2, 'right_id' => 3, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 4, 'right_id' => 5, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 5, 'parent_id' => 1, 'left_id' => 6, 'right_id' => 9, 'forum_parents' => ''), +				array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 7, 'right_id' => 8, 'forum_parents' => ''), + +				array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 11, 'right_id' => 12, 'forum_parents' => 'a:0:{}'), + +				array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 13, 'right_id' => 22, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 15, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 16, 'right_id' => 19, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 17, 'right_id' => 18, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 20, 'right_id' => 21, 'forum_parents' => 'a:0:{}'), +			)), +			array('Move single child down', +				5, 7, true, array( +				array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 2, 'right_id' => 3, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 4, 'right_id' => 5, 'forum_parents' => 'a:0:{}'), + +				array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 10, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 8, 'right_id' => 9, 'forum_parents' => 'a:0:{}'), + +				array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 11, 'right_id' => 22, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 12, 'right_id' => 13, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 17, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 15, 'right_id' => 16, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 18, 'right_id' => 19, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 6, 'parent_id' => 7, 'left_id' => 20, 'right_id' => 21, 'forum_parents' => ''), + +			)), +			array('Move nested children down', +				4, 7, true, array( +				array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 2, 'right_id' => 3, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 4, 'right_id' => 5, 'forum_parents' => 'a:0:{}'), + +				array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 8, 'forum_parents' => 'a:0:{}'), + +				array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 9, 'right_id' => 22, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 10, 'right_id' => 11, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 12, 'right_id' => 15, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 13, 'right_id' => 14, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 16, 'right_id' => 17, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 5, 'parent_id' => 7, 'left_id' => 18, 'right_id' => 21, 'forum_parents' => ''), +				array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 19, 'right_id' => 20, 'forum_parents' => ''), +			)), +			array('Move single child to parent 0', +				5, 0, true, array( +				array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 2, 'right_id' => 3, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 4, 'right_id' => 5, 'forum_parents' => 'a:0:{}'), + +				array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 10, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 8, 'right_id' => 9, 'forum_parents' => 'a:0:{}'), + +				array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 11, 'right_id' => 20, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 12, 'right_id' => 13, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 17, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 15, 'right_id' => 16, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 18, 'right_id' => 19, 'forum_parents' => 'a:0:{}'), + +				array('forum_id' => 6, 'parent_id' => 0, 'left_id' => 21, 'right_id' => 22, 'forum_parents' => ''), +			)), +			array('Move nested children to parent 0', +				4, 0, true, array( +				array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 2, 'right_id' => 3, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 4, 'right_id' => 5, 'forum_parents' => 'a:0:{}'), + +				array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 8, 'forum_parents' => 'a:0:{}'), + +				array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 9, 'right_id' => 18, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 10, 'right_id' => 11, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 12, 'right_id' => 15, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 13, 'right_id' => 14, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 16, 'right_id' => 17, 'forum_parents' => 'a:0:{}'), + +				array('forum_id' => 5, 'parent_id' => 0, 'left_id' => 19, 'right_id' => 22, 'forum_parents' => ''), +				array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 20, 'right_id' => 21, 'forum_parents' => ''), +			)), +		); +	} + +	/** +	* @dataProvider move_children_data +	*/ +	public function test_move_children($explain, $forum_id, $target_id, $expected_moved, $expected) +	{ +		$this->assertEquals($expected_moved, $this->set->move_children($forum_id, $target_id)); + +		$result = $this->db->sql_query("SELECT forum_id, parent_id, left_id, right_id, forum_parents +			FROM phpbb_forums +			ORDER BY left_id, forum_id ASC"); +		$this->assertEquals($expected, $this->db->sql_fetchrowset($result)); +	} + +	public function move_children_throws_item_data() +	{ +		return array( +			array('Item 0 does not exist', 0, 5), +			array('Item does not exist', 200, 5), +		); +	} + +	/** +	* @dataProvider move_children_throws_item_data +	* +	* @expectedException			OutOfBoundsException +	* @expectedExceptionMessage		FORUM_NESTEDSET_INVALID_ITEM +	*/ +	public function test_move_children_throws_item($explain, $forum_id, $target_id) +	{ +		$this->set->move_children($forum_id, $target_id); +	} + +	public function move_children_throws_parent_data() +	{ +		return array( +			array('New parent is child', 4, 5), +			array('New parent is child 2', 7, 9), +			array('New parent does not exist', 1, 200), +		); +	} + +	/** +	* @dataProvider move_children_throws_parent_data +	* +	* @expectedException			OutOfBoundsException +	* @expectedExceptionMessage		FORUM_NESTEDSET_INVALID_PARENT +	*/ +	public function test_move_children_throws_parent($explain, $forum_id, $target_id) +	{ +		$this->set->move_children($forum_id, $target_id); +	} + +	public function change_parent_data() +	{ +		return array( +			array('Move single child up', +				6, 1, true, array( +				array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 8, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 2, 'right_id' => 3, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 4, 'right_id' => 5, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 6, 'parent_id' => 1, 'left_id' => 6, 'right_id' => 7, 'forum_parents' => ''), + +				array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 9, 'right_id' => 12, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 10, 'right_id' => 11, 'forum_parents' => 'a:0:{}'), + +				array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 13, 'right_id' => 22, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 15, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 16, 'right_id' => 19, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 17, 'right_id' => 18, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 20, 'right_id' => 21, 'forum_parents' => 'a:0:{}'), +			)), +			array('Move nested children up', +				5, 1, true, array( +				array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 10, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 2, 'right_id' => 3, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 4, 'right_id' => 5, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 5, 'parent_id' => 1, 'left_id' => 6, 'right_id' => 9, 'forum_parents' => ''), +				array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 7, 'right_id' => 8, 'forum_parents' => ''), + +				array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 11, 'right_id' => 12, 'forum_parents' => 'a:0:{}'), + +				array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 13, 'right_id' => 22, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 15, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 16, 'right_id' => 19, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 17, 'right_id' => 18, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 20, 'right_id' => 21, 'forum_parents' => 'a:0:{}'), +			)), +			array('Move single child down', +				6, 7, true, array( +				array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 2, 'right_id' => 3, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 4, 'right_id' => 5, 'forum_parents' => 'a:0:{}'), + +				array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 10, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 8, 'right_id' => 9, 'forum_parents' => 'a:0:{}'), + +				array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 11, 'right_id' => 22, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 12, 'right_id' => 13, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 17, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 15, 'right_id' => 16, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 18, 'right_id' => 19, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 6, 'parent_id' => 7, 'left_id' => 20, 'right_id' => 21, 'forum_parents' => ''), +			)), +			array('Move nested children down', +				5, 7, true, array( +				array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 2, 'right_id' => 3, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 4, 'right_id' => 5, 'forum_parents' => 'a:0:{}'), + +				array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 8, 'forum_parents' => 'a:0:{}'), + +				array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 9, 'right_id' => 22, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 10, 'right_id' => 11, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 12, 'right_id' => 15, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 13, 'right_id' => 14, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 16, 'right_id' => 17, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 5, 'parent_id' => 7, 'left_id' => 18, 'right_id' => 21, 'forum_parents' => ''), +				array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 19, 'right_id' => 20, 'forum_parents' => ''), +			)), +			array('Move single child to parent 0', +				6, 0, true, array( +				array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 2, 'right_id' => 3, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 4, 'right_id' => 5, 'forum_parents' => 'a:0:{}'), + +				array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 10, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 8, 'right_id' => 9, 'forum_parents' => 'a:0:{}'), + +				array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 11, 'right_id' => 20, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 12, 'right_id' => 13, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 17, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 15, 'right_id' => 16, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 18, 'right_id' => 19, 'forum_parents' => 'a:0:{}'), + +				array('forum_id' => 6, 'parent_id' => 0, 'left_id' => 21, 'right_id' => 22, 'forum_parents' => ''), +			)), +			array('Move nested children to parent 0', +				5, 0, true, array( +				array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 2, 'right_id' => 3, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 4, 'right_id' => 5, 'forum_parents' => 'a:0:{}'), + +				array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 8, 'forum_parents' => 'a:0:{}'), + +				array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 9, 'right_id' => 18, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 10, 'right_id' => 11, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 12, 'right_id' => 15, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 13, 'right_id' => 14, 'forum_parents' => 'a:0:{}'), +				array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 16, 'right_id' => 17, 'forum_parents' => 'a:0:{}'), + +				array('forum_id' => 5, 'parent_id' => 0, 'left_id' => 19, 'right_id' => 22, 'forum_parents' => ''), +				array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 20, 'right_id' => 21, 'forum_parents' => ''), +			)), +		); +	} + +	/** +	* @dataProvider change_parent_data +	*/ +	public function test_change_parent($explain, $forum_id, $target_id, $expected_moved, $expected) +	{ +		$this->assertEquals($expected_moved, $this->set->change_parent($forum_id, $target_id)); + +		$result = $this->db->sql_query("SELECT forum_id, parent_id, left_id, right_id, forum_parents +			FROM phpbb_forums +			ORDER BY left_id, forum_id ASC"); +		$this->assertEquals($expected, $this->db->sql_fetchrowset($result)); +	} + +	public function change_parent_throws_item_data() +	{ +		return array( +			array('Item 0 does not exist', 0, 5), +			array('Item does not exist', 200, 5), +		); +	} + +	/** +	* @dataProvider change_parent_throws_item_data +	* +	* @expectedException			OutOfBoundsException +	* @expectedExceptionMessage		FORUM_NESTEDSET_INVALID_ITEM +	*/ +	public function test_change_parent_throws_item($explain, $forum_id, $target_id) +	{ +		$this->set->change_parent($forum_id, $target_id); +	} + +	public function change_parent_throws_parent_data() +	{ +		return array( +			array('New parent is child', 4, 5), +			array('New parent is child 2', 7, 9), +			array('New parent does not exist', 1, 200), +		); +	} + +	/** +	* @dataProvider change_parent_throws_parent_data +	* +	* @expectedException			OutOfBoundsException +	* @expectedExceptionMessage		FORUM_NESTEDSET_INVALID_PARENT +	*/ +	public function test_change_parent_throws_parent($explain, $forum_id, $target_id) +	{ +		$this->set->change_parent($forum_id, $target_id); +	} +} diff --git a/tests/tree/nestedset_forum_regenerate_test.php b/tests/tree/nestedset_forum_regenerate_test.php new file mode 100644 index 0000000000..38338dbc4d --- /dev/null +++ b/tests/tree/nestedset_forum_regenerate_test.php @@ -0,0 +1,72 @@ +<?php +/** +* +* @package tree +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +require_once dirname(__FILE__) . '/nestedset_forum_base.php'; + +class phpbb_tests_tree_nestedset_forum_regenerate_test extends phpbb_tests_tree_nestedset_forum_base +{ +	protected $fixed_set = array( +		array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6, 'forum_parents' => ''), +		array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 2, 'right_id' => 3, 'forum_parents' => ''), +		array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 4, 'right_id' => 5, 'forum_parents' => ''), + +		array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 12, 'forum_parents' => ''), +		array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 8, 'right_id' => 11, 'forum_parents' => ''), +		array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 9, 'right_id' => 10, 'forum_parents' => ''), + +		array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 13, 'right_id' => 22, 'forum_parents' => ''), +		array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 15, 'forum_parents' => ''), +		array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 16, 'right_id' => 19, 'forum_parents' => ''), +		array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 17, 'right_id' => 18, 'forum_parents' => ''), +		array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 20, 'right_id' => 21, 'forum_parents' => ''), +	); + +	public function regenerate_left_right_ids_data() +	{ +		return array( +			array('UPDATE phpbb_forums +				SET left_id = 0, +					right_id = 0', false), +			array('UPDATE phpbb_forums +				SET left_id = 28, +					right_id = 28 +				WHERE left_id > 12', false), +			array('UPDATE phpbb_forums +				SET left_id = left_id * 2, +					right_id = right_id * 2', false), +			array('UPDATE phpbb_forums +				SET left_id = left_id * 2, +					right_id = right_id * 2 +				WHERE left_id > 12', false), +			array('UPDATE phpbb_forums +				SET left_id = left_id - 4, +					right_id = right_id * 4 +				WHERE left_id > 4', false), +			array('UPDATE phpbb_forums +				SET left_id = 0, +					right_id = 0 +				WHERE left_id > 12', true), +		); +	} + +	/** +	* @dataProvider regenerate_left_right_ids_data +	*/ +	public function test_regenerate_left_right_ids($breaking_query, $reset_ids) +	{ +		$result = $this->db->sql_query($breaking_query); + +		$this->assertEquals(23, $this->set->regenerate_left_right_ids(1, 0, $reset_ids)); + +		$result = $this->db->sql_query('SELECT forum_id, parent_id, left_id, right_id, forum_parents +			FROM phpbb_forums +			ORDER BY left_id, forum_id ASC'); +		$this->assertEquals($this->fixed_set, $this->db->sql_fetchrowset($result)); +	} +} diff --git a/tests/tree/nestedset_forum_test.php b/tests/tree/nestedset_forum_test.php new file mode 100644 index 0000000000..516c794ffc --- /dev/null +++ b/tests/tree/nestedset_forum_test.php @@ -0,0 +1,116 @@ +<?php +/** +* +* @package tree +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +require_once dirname(__FILE__) . '/nestedset_forum_base.php'; + +class pphpbb_tests_tree_nestedset_forum_test extends phpbb_tests_tree_nestedset_forum_base +{ +	public function forum_constructor_data() +	{ +		return array( +			array(array( +				array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6), +				array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 2, 'right_id' => 3), +				array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 4, 'right_id' => 5), + +				array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 12), +				array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 8, 'right_id' => 11), +				array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 9, 'right_id' => 10), + +				array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 13, 'right_id' => 22), +				array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 15), +				array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 16, 'right_id' => 19), +				array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 17, 'right_id' => 18), +				array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 20, 'right_id' => 21), +			)), +		); +	} + +	/** +	* @dataProvider forum_constructor_data +	*/ +	public function test_forum_constructor($expected) +	{ +		$result = $this->db->sql_query('SELECT forum_id, parent_id, left_id, right_id +			FROM phpbb_forums +			ORDER BY left_id, forum_id ASC'); +		$this->assertEquals($expected, $this->db->sql_fetchrowset($result)); +	} + +	public function get_sql_where_data() +	{ +		return array( +			array('SELECT forum_id +				FROM phpbb_forums +				%s +				ORDER BY forum_id ASC', +				'WHERE', '', array( +				array('forum_id' => 1), +				array('forum_id' => 2), +				array('forum_id' => 3), + +				array('forum_id' => 4), +				array('forum_id' => 5), +				array('forum_id' => 6), + +				array('forum_id' => 7), +				array('forum_id' => 8), +				array('forum_id' => 9), +				array('forum_id' => 10), +				array('forum_id' => 11), +			)), +			array('SELECT f.forum_id +				FROM phpbb_forums f +				%s +				ORDER BY f.forum_id ASC', +				'WHERE', 'f.', array( +				array('forum_id' => 1), +				array('forum_id' => 2), +				array('forum_id' => 3), + +				array('forum_id' => 4), +				array('forum_id' => 5), +				array('forum_id' => 6), + +				array('forum_id' => 7), +				array('forum_id' => 8), +				array('forum_id' => 9), +				array('forum_id' => 10), +				array('forum_id' => 11), +			)), +			array('SELECT forum_id +				FROM phpbb_forums +				WHERE forum_id < 4 %s +				ORDER BY forum_id ASC', +				'AND', '', array( +				array('forum_id' => 1), +				array('forum_id' => 2), +				array('forum_id' => 3), +			)), +			array('SELECT f.forum_id +				FROM phpbb_forums f +				WHERE f.forum_id < 4 %s +				ORDER BY f.forum_id ASC', +				'AND', 'f.', array( +				array('forum_id' => 1), +				array('forum_id' => 2), +				array('forum_id' => 3), +			)), +		); +	} + +	/** +	* @dataProvider get_sql_where_data +	*/ +	public function test_get_sql_where($sql_query, $operator, $column_prefix, $expected) +	{ +		$result = $this->db->sql_query(sprintf($sql_query, $this->set->get_sql_where($operator, $column_prefix))); +		$this->assertEquals($expected, $this->db->sql_fetchrowset($result)); +	} +} diff --git a/tests/upload/filespec_test.php b/tests/upload/filespec_test.php new file mode 100644 index 0000000000..87cd00197f --- /dev/null +++ b/tests/upload/filespec_test.php @@ -0,0 +1,274 @@ +<?php +/** + * + * @package testing + * @copyright (c) 2012 phpBB Group + * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 + * + */ + +require_once __DIR__ . '/../../phpBB/includes/functions.php'; +require_once __DIR__ . '/../../phpBB/includes/utf/utf_tools.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_upload.php'; + +class phpbb_filespec_test extends phpbb_test_case +{ +	const TEST_COUNT = 100; +	const PREFIX = 'phpbb_'; +	const MAX_STR_LEN = 50; +	const UPLOAD_MAX_FILESIZE = 1000; + +	private $config; +	public $path; + +	protected function setUp() +	{ +		// Global $config required by unique_id +		// Global $user required by filespec::additional_checks and +		// filespec::move_file +		global $config, $user; + +		if (!is_array($config)) +		{ +			$config = array(); +		} + +		$config['rand_seed'] = ''; +		$config['rand_seed_last_update'] = time() + 600; +		// This config value is normally pulled from the database which is set +		// to this value at install time. +		// See: phpBB/install/schemas/schema_data.sql +		$config['mime_triggers'] = 'body|head|html|img|plaintext|a href|pre|script|table|title'; + +		$user = new phpbb_mock_user(); +		$user->lang = new phpbb_mock_lang(); + +		$this->config = &$config; +		$this->path = __DIR__ . '/fixture/'; + +		// Create copies of the files for use in testing move_file +		$iterator = new DirectoryIterator($this->path); +		foreach ($iterator as $fileinfo) +		{ +			if ($fileinfo->isDot() || $fileinfo->isDir()) +			{ +				continue; +			} + +			copy($fileinfo->getPathname(), $this->path . 'copies/' . $fileinfo->getFilename() . '_copy'); +			if ($fileinfo->getFilename() === 'txt') +			{ +				copy($fileinfo->getPathname(), $this->path . 'copies/' . $fileinfo->getFilename() . '_copy_2'); +			} +		} +	} + +	private function get_filespec($override = array()) +	{ +		// Initialise a blank filespec object for use with trivial methods +		$upload_ary = array( +			'name' => '', +			'type' => '', +			'size' => '', +			'tmp_name' => '', +			'error' => '', +		); + +		return new filespec(array_merge($upload_ary, $override), null); +	} + +	protected function tearDown() +	{ +		global $user; +		$this->config = array(); +		$user = null; + +		$iterator = new DirectoryIterator($this->path . 'copies'); +		foreach ($iterator as $fileinfo) +		{ +			$name = $fileinfo->getFilename(); +			if ($name[0] !== '.') +			{ +				unlink($fileinfo->getPathname()); +			} +		} +	} + +	public function additional_checks_variables() +	{ +		// False here just indicates the file is too large and fails the +		// filespec::additional_checks method because of it. All other code +		// paths in that method are covered elsewhere. +		return array( +			array('gif', true), +			array('jpg', false), +			array('png', true), +			array('tif', false), +			array('txt', false), +		); +	} + +	/** +	 * @dataProvider additional_checks_variables +	 */ +	public function test_additional_checks($filename, $expected) +	{ +		$upload = new phpbb_mock_fileupload(); +		$filespec = $this->get_filespec(); +		$filespec->upload = $upload; +		$filespec->file_moved = true; +		$filespec->filesize = $filespec->get_filesize($this->path . $filename); + +		$this->assertEquals($expected, $filespec->additional_checks()); +	} + +	public function check_content_variables() +	{ +		// False here indicates that a file is non-binary and contains +		// disallowed content that makes IE report the mimetype incorrectly. +		return array( +			array('gif', true), +			array('jpg', true), +			array('png', true), +			array('tif', true), +			array('txt', false), +		); +	} + +	/** +	 * @dataProvider check_content_variables +	 */ +	public function test_check_content($filename, $expected) +	{ +		$disallowed_content = explode('|', $this->config['mime_triggers']); +		$filespec = $this->get_filespec(array('tmp_name' => $this->path . $filename)); +		$this->assertEquals($expected, $filespec->check_content($disallowed_content)); +	} + +	public function clean_filename_variables() +	{ +		$chunks = str_split('abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\'\\" /:*?<>|[];(){},#+=-_`', 8); +		return array( +			array($chunks[0] . $chunks[7]), +			array($chunks[1] . $chunks[8]), +			array($chunks[2] . $chunks[9]), +			array($chunks[3] . $chunks[4]), +			array($chunks[5] . $chunks[6]), +		); +	} + +	/** +	 * @dataProvider clean_filename_variables +	 */ +	public function test_clean_filename_real($filename) +	{ +		$bad_chars = array("'", "\\", ' ', '/', ':', '*', '?', '"', '<', '>', '|'); +		$filespec = $this->get_filespec(array('name' => $filename)); +		$filespec->clean_filename('real', self::PREFIX); +		$name = $filespec->realname; + +		$this->assertEquals(0, preg_match('/%(\w{2})/', $name)); +		foreach ($bad_chars as $char) +		{ +			$this->assertFalse(strpos($name, $char)); +		} +	} + +	public function test_clean_filename_unique() +	{ +		$filenames = array(); +		for ($tests = 0; $tests < self::TEST_COUNT; $tests++) +		{ +			$filespec = $this->get_filespec(); +			$filespec->clean_filename('unique', self::PREFIX); +			$name = $filespec->realname; +			 +			$this->assertEquals(strlen($name), 32 + strlen(self::PREFIX)); +			$this->assertRegExp('#^[A-Za-z0-9]+$#', substr($name, strlen(self::PREFIX))); +			$this->assertFalse(isset($filenames[$name])); +			$filenames[$name] = true; +		} +	} + +	public function get_extension_variables() +	{ +		return array( +			array('file.png', 'png'), +			array('file.phpbb.gif', 'gif'), +			array('file..', ''), +			array('.file..jpg.webp', 'webp'), +		); +	} + +	/** +	 * @dataProvider get_extension_variables +	 */ +	public function test_get_extension($filename, $expected) +	{ +		$this->assertEquals($expected, filespec::get_extension($filename)); +	} + +	public function is_image_variables() +	{ +		return array( +			array('gif', 'image/gif', true), +			array('jpg', 'image/jpg', true), +			array('png', 'image/png', true), +			array('tif', 'image/tif', true), +			array('txt', 'text/plain', false), +		); +	} + +	/** +	 * @dataProvider is_image_variables +	 */ +	public function test_is_image($filename, $mimetype, $expected) +	{ +		$filespec = $this->get_filespec(array('tmp_name' => $this->path . $filename, 'type' => $mimetype)); +		$this->assertEquals($expected, $filespec->is_image()); +	} + +	public function move_file_variables() +	{ +		return array( +			array('gif_copy', 'gif_moved', 'image/gif', 'gif', false, true), +			array('non_existant', 'still_non_existant', 'text/plain', 'txt', 'GENERAL_UPLOAD_ERROR', false), +			array('txt_copy', 'txt_as_img', 'image/jpg', 'txt', false, true), +			array('txt_copy_2', 'txt_moved', 'text/plain', 'txt', false, true), +			array('jpg_copy', 'jpg_moved', 'image/png', 'jpg', false, true), +			array('png_copy', 'png_moved', 'image/png', 'jpg', 'IMAGE_FILETYPE_MISMATCH', true), +		); +	} + +	/** +	 * @dataProvider move_file_variables +	 */ +	public function test_move_file($tmp_name, $realname, $mime_type, $extension, $error, $expected) +	{ +		// Global $phpbb_root_path and $phpEx are required by phpbb_chmod +		global $phpbb_root_path, $phpEx; +		$phpbb_root_path = ''; +		$phpEx = 'php'; + +		$upload = new phpbb_mock_fileupload(); +		$upload->max_filesize = self::UPLOAD_MAX_FILESIZE; + +		$filespec = $this->get_filespec(array( +			'tmp_name' => $this->path . 'copies/' . $tmp_name, +			'name' => $realname, +			'type' => $mime_type, +		)); +		$filespec->extension = $extension; +		$filespec->upload = $upload; +		$filespec->local = true; + +		$this->assertEquals($expected, $filespec->move_file($this->path . 'copies')); +		$this->assertEquals($filespec->file_moved, file_exists($this->path . 'copies/' . $realname)); +		if ($error) +		{ +			$this->assertEquals($error, $filespec->error[0]); +		} + +		$phpEx = ''; +	} +} diff --git a/tests/upload/fileupload_test.php b/tests/upload/fileupload_test.php new file mode 100644 index 0000000000..1665c493be --- /dev/null +++ b/tests/upload/fileupload_test.php @@ -0,0 +1,119 @@ +<?php +/** + * + * @package testing + * @copyright (c) 2012 phpBB Group + * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 + * + */ + +require_once __DIR__ . '/../../phpBB/includes/functions.php'; +require_once __DIR__ . '/../../phpBB/includes/utf/utf_tools.php'; +require_once __DIR__ . '/../../phpBB/includes/functions_upload.php'; + +class phpbb_fileupload_test extends phpbb_test_case +{ +	private $path; + +	protected function setUp() +	{ +		// Global $config required by unique_id +		// Global $user required by several functions dealing with translations +		// Global $request required by form_upload, local_upload and is_valid +		global $config, $user, $request; + +		if (!is_array($config)) +		{ +			$config = array(); +		} + +		$config['rand_seed'] = ''; +		$config['rand_seed_last_update'] = time() + 600; + +		$user = new phpbb_mock_user(); +		$user->lang = new phpbb_mock_lang(); + +		$request = new phpbb_mock_request(); + +		$this->path = __DIR__ . '/fixture/'; +	} + +	private function gen_valid_filespec() +	{ +		$filespec = new phpbb_mock_filespec(); +		$filespec->filesize = 1; +		$filespec->extension = 'jpg'; +		$filespec->realname = 'valid'; +		$filespec->width = 2; +		$filespec->height = 2; + +		return $filespec; +	} + +	protected function tearDown() +	{ +		// Clear globals +		global $config, $user; +		$config = array(); +		$user = null; +	} + +	public function test_common_checks_invalid_extension() +	{ +		$upload = new fileupload('', array('png'), 100); +		$file = $this->gen_valid_filespec(); +		$upload->common_checks($file); +		$this->assertEquals('DISALLOWED_EXTENSION', $file->error[0]); +	} + +	public function test_common_checks_invalid_filename() +	{ +		$upload = new fileupload('', array('jpg'), 100); +		$file = $this->gen_valid_filespec(); +		$file->realname = 'invalid?'; +		$upload->common_checks($file); +		$this->assertEquals('INVALID_FILENAME', $file->error[0]); +	} + +	public function test_common_checks_too_large() +	{ +		$upload = new fileupload('', array('jpg'), 100); +		$file = $this->gen_valid_filespec(); +		$file->filesize = 1000; +		$upload->common_checks($file); +		$this->assertEquals('WRONG_FILESIZE', $file->error[0]); +	} + +	public function test_common_checks_valid_file() +	{ +		$upload = new fileupload('', array('jpg'), 1000); +		$file = $this->gen_valid_filespec(); +		$upload->common_checks($file); +		$this->assertEquals(0, sizeof($file->error)); +	} + +	public function test_local_upload() +	{ +		$upload = new fileupload('', array('jpg'), 1000); + +		copy($this->path . 'jpg', $this->path . 'jpg.jpg'); +		$file = $upload->local_upload($this->path . 'jpg.jpg'); +		$this->assertEquals(0, sizeof($file->error)); +		unlink($this->path . 'jpg.jpg'); +	} + +	public function test_valid_dimensions() +	{ +		$upload = new fileupload('', false, false, 1, 1, 100, 100); + +		$file1 = $this->gen_valid_filespec(); +		$file2 = $this->gen_valid_filespec(); +		$file2->height = 101; +		$file3 = $this->gen_valid_filespec(); +		$file3->width = 0; + +		$this->assertTrue($upload->valid_dimensions($file1)); +		$this->assertFalse($upload->valid_dimensions($file2)); +		$this->assertFalse($upload->valid_dimensions($file3)); +	} +} diff --git a/tests/upload/fixture/copies/.gitkeep b/tests/upload/fixture/copies/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/tests/upload/fixture/copies/.gitkeep diff --git a/tests/upload/fixture/gif b/tests/upload/fixture/gif Binary files differnew file mode 100644 index 0000000000..b636f4b8df --- /dev/null +++ b/tests/upload/fixture/gif diff --git a/tests/upload/fixture/jpg b/tests/upload/fixture/jpg Binary files differnew file mode 100644 index 0000000000..3cd5038e38 --- /dev/null +++ b/tests/upload/fixture/jpg diff --git a/tests/upload/fixture/png b/tests/upload/fixture/png Binary files differnew file mode 100644 index 0000000000..5514ad40e9 --- /dev/null +++ b/tests/upload/fixture/png diff --git a/tests/upload/fixture/tif b/tests/upload/fixture/tif Binary files differnew file mode 100644 index 0000000000..248b50f9cb --- /dev/null +++ b/tests/upload/fixture/tif diff --git a/tests/upload/fixture/txt b/tests/upload/fixture/txt new file mode 100644 index 0000000000..a78c858f5c --- /dev/null +++ b/tests/upload/fixture/txt @@ -0,0 +1,2 @@ +<HTML>mime trigger</HTML> +The HTML tags should remain uppercase so that case-insensitivity can be checked. diff --git a/tests/user/fixtures/user_loader.xml b/tests/user/fixtures/user_loader.xml new file mode 100644 index 0000000000..1fed8b5838 --- /dev/null +++ b/tests/user/fixtures/user_loader.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<dataset> +	<table name="phpbb_users"> +		<column>user_id</column> +		<column>user_permissions</column> +		<column>username</column> +		<column>username_clean</column> +		<column>user_sig</column> +		<column>user_occ</column> +		<column>user_interests</column> +		<row> +			<value>1</value> +			<value></value> +			<value>Guest</value> +			<value>guest</value> +			<value></value> +			<value></value> +			<value></value> +		</row> +		<row> +			<value>2</value> +			<value></value> +			<value>Admin</value> +			<value>admin</value> +			<value></value> +			<value></value> +			<value></value> +		</row> +		<row> +			<value>3</value> +			<value></value> +			<value>Test</value> +			<value>test</value> +			<value></value> +			<value></value> +			<value></value> +		</row> +	</table> +</dataset> diff --git a/tests/user/lang_test.php b/tests/user/lang_test.php index d33f430955..d7ff451a70 100644 --- a/tests/user/lang_test.php +++ b/tests/user/lang_test.php @@ -7,13 +7,11 @@  *  */ -require_once dirname(__FILE__) . '/../../phpBB/includes/session.php'; -  class phpbb_user_lang_test extends phpbb_test_case  {  	public function test_user_lang_sprintf()  	{ -		$user = new user; +		$user = new phpbb_user;  		$user->lang = array(  			'FOO'		=> 'BAR',  			'BARZ'		=> 'PENG', @@ -26,6 +24,26 @@ class phpbb_user_lang_test extends phpbb_test_case  				1		=> '1 post',		// 1  				2		=> '%d posts',		// 2+  			), +			'ARRY_NO_ZERO'	=> array( +				1		=> '1 post',		// 1 +				2		=> '%d posts',		// 0, 2+ +			), +			'ARRY_MISSING'	=> array( +				1		=> '%d post',		// 1 +				//Missing second plural +			), +			'ARRY_FLOAT'	=> array( +				1		=> '1 post',		// 1.x +				2		=> '%1$.1f posts',	// 0.x, 2+.x +			), +			'ARRY_EMPTY'	=> array( +			), +			'dateformat'	=> array( +				'AGO'	=> array( +					1	=> '%d second', +					2	=> '%d seconds', +				), +			),  		);  		// No param @@ -51,8 +69,45 @@ class phpbb_user_lang_test extends phpbb_test_case  		$this->assertEquals($user->lang('ARRY', 2), '2 posts');  		$this->assertEquals($user->lang('ARRY', 123), '123 posts'); -		// Bug PHPBB3-9949 +		// Empty array returns the language key +		$this->assertEquals($user->lang('ARRY_EMPTY', 123), 'ARRY_EMPTY'); + +		// No 0 key defined +		$this->assertEquals($user->lang('ARRY_NO_ZERO', 0), '0 posts'); +		$this->assertEquals($user->lang('ARRY_NO_ZERO', 1), '1 post'); +		$this->assertEquals($user->lang('ARRY_NO_ZERO', 2), '2 posts'); + +		// Array with missing keys +		$this->assertEquals($user->lang('ARRY_MISSING', 2), '2 post'); + +		// Floats as array key +		$this->assertEquals($user->lang('ARRY_FLOAT', 1.3), '1 post'); +		$this->assertEquals($user->lang('ARRY_FLOAT', 2.0), '2.0 posts'); +		$this->assertEquals($user->lang('ARRY_FLOAT', 2.51), '2.5 posts'); + +		// Use sub key, if first paramenter is an array +		$this->assertEquals($user->lang(array('dateformat', 'AGO'), 2), '2 seconds'); + +		// ticket PHPBB3-9949 - use first int to determinate the plural-form to use  		$this->assertEquals($user->lang('ARRY', 1, 2), '1 post');  		$this->assertEquals($user->lang('ARRY', 1, 's', 2), '1 post'); + +		// ticket PHPBB3-10345 - different plural rules, not just 0/1/2+ +		$user = new phpbb_user; +		$user->lang = array( +			'PLURAL_RULE'		=> 13, +			'ARRY'		=> array( +				0		=> '%d is 0',						// 0 +				1		=> '%d is 1',						// 1 +				2		=> '%d ends with 01-10',			// ending with 01-10 +				3		=> '%d ends with 11-19',			// ending with 11-19 +				4		=> '%d is part of the last rule',	// everything else +			), +		); +		$this->assertEquals($user->lang('ARRY', 0), '0 is 0'); +		$this->assertEquals($user->lang('ARRY', 1), '1 is 1'); +		$this->assertEquals($user->lang('ARRY', 103), '103 ends with 01-10'); +		$this->assertEquals($user->lang('ARRY', 15), '15 ends with 11-19'); +		$this->assertEquals($user->lang('ARRY', 300), '300 is part of the last rule');  	}  } 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']); +	} +} diff --git a/tests/utf/utf8_clean_string_test.php b/tests/utf/utf8_clean_string_test.php index 5ebf6409af..ae11e00fbd 100644 --- a/tests/utf/utf8_clean_string_test.php +++ b/tests/utf/utf8_clean_string_test.php @@ -11,7 +11,7 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php';  class phpbb_utf_utf8_clean_string_test extends phpbb_test_case  { -	static public function cleanable_strings() +	public function cleanable_strings()  	{  		return array(  			array('MiXed CaSe', 'mixed case', 'Checking case folding'), diff --git a/tests/wrapper/phpbb_php_ini_fake.php b/tests/wrapper/phpbb_php_ini_fake.php new file mode 100644 index 0000000000..49bc5936e5 --- /dev/null +++ b/tests/wrapper/phpbb_php_ini_fake.php @@ -0,0 +1,16 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2011 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +class phpbb_php_ini_fake extends phpbb_php_ini +{ +	function get($varname) +	{ +		return $varname; +	} +} diff --git a/tests/wrapper/phpbb_php_ini_test.php b/tests/wrapper/phpbb_php_ini_test.php new file mode 100644 index 0000000000..8e08d5c204 --- /dev/null +++ b/tests/wrapper/phpbb_php_ini_test.php @@ -0,0 +1,86 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2011 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +require_once dirname(__FILE__) . '/phpbb_php_ini_fake.php'; +require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; + +class phpbb_wrapper_phpbb_php_ini_test extends phpbb_test_case +{ +	protected $php_ini; + +	public function setUp() +	{ +		$this->php_ini = new phpbb_php_ini_fake; +	} + +	public function test_get_string() +	{ +		$this->assertSame(false, $this->php_ini->get_string(false)); +		$this->assertSame('phpbb', $this->php_ini->get_string(' phpbb ')); +	} + +	public function test_get_bool() +	{ +		$this->assertSame(true, $this->php_ini->get_bool('ON')); +		$this->assertSame(true, $this->php_ini->get_bool('on')); +		$this->assertSame(true, $this->php_ini->get_bool('1')); + +		$this->assertSame(false, $this->php_ini->get_bool('OFF')); +		$this->assertSame(false, $this->php_ini->get_bool('off')); +		$this->assertSame(false, $this->php_ini->get_bool('0')); +		$this->assertSame(false, $this->php_ini->get_bool('')); +	} + +	public function test_get_int() +	{ +		$this->assertSame(1234, $this->php_ini->get_int('1234')); +		$this->assertSame(-12345, $this->php_ini->get_int('-12345')); +		$this->assertSame(false, $this->php_ini->get_int('phpBB')); +	} + +	public function test_get_float() +	{ +		$this->assertSame(1234.0, $this->php_ini->get_float('1234')); +		$this->assertSame(-12345.0, $this->php_ini->get_float('-12345')); +		$this->assertSame(false, $this->php_ini->get_float('phpBB')); +	} + +	public function test_get_bytes_invalid() +	{ +		$this->assertSame(false, $this->php_ini->get_bytes(false)); +		$this->assertSame(false, $this->php_ini->get_bytes('phpBB')); +		$this->assertSame(false, $this->php_ini->get_bytes('k')); +		$this->assertSame(false, $this->php_ini->get_bytes('-k')); +		$this->assertSame(false, $this->php_ini->get_bytes('M')); +		$this->assertSame(false, $this->php_ini->get_bytes('-M')); +	} + +	/** +	* @dataProvider get_bytes_data +	*/ +	public function test_get_bytes($expected, $value) +	{ +		$actual = $this->php_ini->get_bytes($value); + +		$this->assertTrue(is_float($actual) || is_int($actual)); +		$this->assertEquals($expected, $actual); +	} + +	static public function get_bytes_data() +	{ +		return array( +			array(32 * pow(2, 20),		'32m'), +			array(- 32 * pow(2, 20),	'-32m'), +			array(8 * pow(2, 30),		'8G'), +			array(- 8 * pow(2, 30),		'-8G'), +			array(1234,					'1234'), +			array(-12345,				'-12345'), +		); +	} +}  | 
