Merge branch '3.2.x' into ticket/16159

author: stevendegroote <stevendegroote@gmail.com> 2019-09-17 23:15:54 +0200
committer: stevendegroote <stevendegroote@gmail.com> 2019-09-17 23:15:54 +0200
commit: f8967fec78d826ea8d9ca34f65966ff8a7674b47 (patch)
tree: f9c5f408e7764ec6343e084e7fc6d62d07e3400f /tests/dbal
parent: ce93b224107a65b43253c36812b636321eb55a78 (diff)
parent: 4db585a4cb2e5359074a82ef088574609155294b (diff)
download: forums-f8967fec78d826ea8d9ca34f65966ff8a7674b47.tar
forums-f8967fec78d826ea8d9ca34f65966ff8a7674b47.tar.gz
forums-f8967fec78d826ea8d9ca34f65966ff8a7674b47.tar.bz2
forums-f8967fec78d826ea8d9ca34f65966ff8a7674b47.tar.xz
forums-f8967fec78d826ea8d9ca34f65966ff8a7674b47.zip
10 files changed, 373 insertions, 34 deletions
diff --git a/tests/dbal/db_tools_test.php b/tests/dbal/db_tools_test.php
index f9243e7266..0365463a48 100644
--- a/tests/dbal/db_tools_test.php
+++ b/tests/dbal/db_tools_test.php
@@ -203,8 +203,15 @@ class phpbb_dbal_db_tools_test extends phpbb_database_test_case
 
 	public function test_list_columns()
 	{
+		$config = $this->get_database_config();
+		$table_columns = $this->table_data['COLUMNS'];
+
+		if (strpos($config['dbms'], 'mssql') !== false)
+		{
+			ksort($table_columns);
+		}
 		$this->assertEquals(
-			array_keys($this->table_data['COLUMNS']),
+			array_keys($table_columns),
 			array_values($this->tools->sql_list_columns('prefix_table_name'))
 		);
 	}
@@ -432,28 +439,37 @@ class phpbb_dbal_db_tools_test extends phpbb_database_test_case
 			$this->markTestIncomplete('The table prefix length is too long for proper testing of index shortening function.');
 		}
 
+		$max_index_length = 30;
+
+		if ($this->tools instanceof \phpbb\db\tools\mssql)
+		{
+			$max_length_method = new ReflectionMethod('\phpbb\db\tools\mssql', 'get_max_index_name_length');
+			$max_length_method->setAccessible(true);
+			$max_index_length = $max_length_method->invoke($this->tools);
+		}
+
 		$table_suffix = str_repeat('a', 25 - strlen($table_prefix));
 		$table_name = $table_prefix . $table_suffix;
 
 		$this->tools->sql_create_table($table_name, $this->table_data);
 
-		// Index name and table suffix and table prefix have > 30 chars in total.
-		// Index name and table suffix have <= 30 chars in total.
-		$long_index_name = str_repeat('i', 30 - strlen($table_suffix));
+		// Index name and table suffix and table prefix have > maximum index length chars in total.
+		// Index name and table suffix have <= maximum index length chars in total.
+		$long_index_name = str_repeat('i', $max_index_length - strlen($table_suffix));
 		$this->assertFalse($this->tools->sql_index_exists($table_name, $long_index_name));
 		$this->assertTrue($this->tools->sql_create_index($table_name, $long_index_name, array('c_timestamp')));
 		$this->assertTrue($this->tools->sql_index_exists($table_name, $long_index_name));
 
-		// Index name and table suffix have > 30 chars in total.
-		$very_long_index_name = str_repeat('i', 30);
+		// Index name and table suffix have > maximum index length chars in total.
+		$very_long_index_name = str_repeat('i', $max_index_length);
 		$this->assertFalse($this->tools->sql_index_exists($table_name, $very_long_index_name));
 		$this->assertTrue($this->tools->sql_create_index($table_name, $very_long_index_name, array('c_timestamp')));
 		$this->assertTrue($this->tools->sql_index_exists($table_name, $very_long_index_name));
 
 		$this->tools->sql_table_drop($table_name);
 
-		// Index name has > 30 chars - that should not be possible.
-		$too_long_index_name = str_repeat('i', 31);
+		// Index name has > maximum index length chars - that should not be possible.
+		$too_long_index_name = str_repeat('i', $max_index_length + 1);
 		$this->assertFalse($this->tools->sql_index_exists('prefix_table_name', $too_long_index_name));
 		$this->setExpectedTriggerError(E_USER_ERROR);
 		$this->tools->sql_create_index('prefix_table_name', $too_long_index_name, array('c_timestamp'));
diff --git a/tests/dbal/ext/foo/bar/acp/acp_test_info.php b/tests/dbal/ext/foo/bar/acp/acp_test_info.php
new file mode 100644
index 0000000000..ac92623c3a
--- /dev/null
+++ b/tests/dbal/ext/foo/bar/acp/acp_test_info.php
@@ -0,0 +1,37 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace foo\bar\acp;
+
+class acp_test_info
+{
+	public function module()
+	{
+		return array(
+			'filename'	=> '\foo\bar\acp\acp_test_module',
+			'title'		=> 'ACP_NEW_MODULE',
+			'modes'		=> array(
+				'mode_1' => array(
+					'title'	=> 'ACP_NEW_MODULE_MODE_1',
+					'auth'	=> '',
+					'cat'	=> array('ACP_NEW_MODULE'),
+				),
+				'mode_2' => array(
+					'title'	=> 'ACP_NEW_MODULE_MODE_2',
+					'auth'	=> '',
+					'cat'	=> array('ACP_NEW_MODULE'),
+				),
+			),
+		);
+	}
+}
diff --git a/tests/dbal/ext/foo/bar/acp/acp_test_module.php b/tests/dbal/ext/foo/bar/acp/acp_test_module.php
new file mode 100644
index 0000000000..01ce5c17dc
--- /dev/null
+++ b/tests/dbal/ext/foo/bar/acp/acp_test_module.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace foo\bar\acp;
+
+class acp_test_module
+{
+	var $u_action;
+
+	function main($id, $mode)
+	{
+		$this->tpl_name = 'foobar';
+		$this->page_title = 'Bertie';
+	}
+}
diff --git a/tests/dbal/ext/foo/bar/composer.json b/tests/dbal/ext/foo/bar/composer.json
new file mode 100644
index 0000000000..2edfd43d84
--- /dev/null
+++ b/tests/dbal/ext/foo/bar/composer.json
@@ -0,0 +1,24 @@
+{
+	"name": "foo/bar",
+	"type": "phpbb-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",
+	"license": "GNU GPL v2",
+	"authors": [{
+			"name": "John Smith",
+			"username": "JohnSmith27",
+			"email": "email@phpbb.com",
+			"homepage": "http://phpbb.com",
+			"role": "N/A"
+		}],
+	"require": {
+		"php": ">=5.4.7"
+	},
+	"extra": {
+		"display-name": "phpBB BarFoo Extension",
+		"soft-require": {
+			"phpbb/phpbb": "3.2.*@dev"
+		}
+	}
+}
diff --git a/tests/dbal/ext/foo/bar/ucp/ucp_test_info.php b/tests/dbal/ext/foo/bar/ucp/ucp_test_info.php
new file mode 100644
index 0000000000..d3489af832
--- /dev/null
+++ b/tests/dbal/ext/foo/bar/ucp/ucp_test_info.php
@@ -0,0 +1,37 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace foo\bar\ucp;
+
+class ucp_test_info
+{
+	public function module()
+	{
+		return array(
+			'filename'	=> '\foo\bar\ucp\ucp_test_module',
+			'title'		=> 'UCP_NEW_MODULE',
+			'modes'		=> array(
+				'mode_1' => array(
+					'title'	=> 'UCP_NEW_MODULE_MODE_1',
+					'auth'	=> '',
+					'cat'	=> array('UCP_NEW_MODULE'),
+				),
+				'mode_2' => array(
+					'title'	=> 'UCP_NEW_MODULE_MODE_2',
+					'auth'	=> '',
+					'cat'	=> array('UCP_NEW_MODULE'),
+				),
+			),
+		);
+	}
+}
diff --git a/tests/dbal/ext/foo/bar/ucp/ucp_test_module.php b/tests/dbal/ext/foo/bar/ucp/ucp_test_module.php
new file mode 100644
index 0000000000..b06b3238b6
--- /dev/null
+++ b/tests/dbal/ext/foo/bar/ucp/ucp_test_module.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace foo\bar\ucp;
+
+class ucp_test_module
+{
+	var $u_action;
+
+	function main($id, $mode)
+	{
+		$this->tpl_name = 'foobar';
+		$this->page_title = 'Bertie';
+	}
+}
diff --git a/tests/dbal/fixtures/boolean_processor.xml b/tests/dbal/fixtures/boolean_processor.xml
index c5da677116..d31d679f45 100644
--- a/tests/dbal/fixtures/boolean_processor.xml
+++ b/tests/dbal/fixtures/boolean_processor.xml
@@ -60,25 +60,31 @@
 	<table name="phpbb_user_group">
 		<column>user_id</column>
 		<column>group_id</column>
+		<column>group_leader</column>
 		<row>
 			<value>1</value>
 			<value>1</value>
+			<value>2</value>
 		</row>
 		<row>
 			<value>2</value>
 			<value>1</value>
+			<value>2</value>
 		</row>
 		<row>
 			<value>3</value>
 			<value>1</value>
+			<value>2</value>
 		</row>
 		<row>
 			<value>4</value>
 			<value>2</value>
+			<value>2</value>
 		</row>
 		<row>
 			<value>5</value>
 			<value>2</value>
+			<value>2</value>
 		</row>
 	</table>
 </dataset>
diff --git a/tests/dbal/migrator_tool_module_test.php b/tests/dbal/migrator_tool_module_test.php
index 29b21166b6..e34ee7b59c 100644
--- a/tests/dbal/migrator_tool_module_test.php
+++ b/tests/dbal/migrator_tool_module_test.php
@@ -11,6 +11,9 @@
 *
 */
 
+require_once dirname(__FILE__) . '/ext/foo/bar/acp/acp_test_info.php';
+require_once dirname(__FILE__) . '/ext/foo/bar/ucp/ucp_test_info.php';
+
 class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
 {
 	public function getDataSet()
@@ -39,6 +42,9 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
 		$auth = $this->getMock('\phpbb\auth\auth');
 		$phpbb_log = new \phpbb\log\log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE);
 
+		// Correctly set the root path for this test to this directory, so the classes can be found
+		$phpbb_root_path = dirname(__FILE__) . '/';
+
 		$phpbb_extension_manager = new phpbb_mock_extension_manager($phpbb_root_path);
 		$module_manager = new \phpbb\module\module_manager($cache, $this->db, $phpbb_extension_manager, MODULES_TABLE, $phpbb_root_path, $phpEx);
 
@@ -52,11 +58,39 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
 			array(
 				'',
 				'ACP_CAT',
+				false,
 				true,
 			),
 			array(
 				0,
 				'ACP_CAT',
+				false,
+				true,
+			),
+			array(
+				false,
+				'ACP_CAT',
+				false,
+				true,
+			),
+
+			// Test the existing category lazily
+			array(
+				'',
+				'ACP_CAT',
+				true,
+				true,
+			),
+			array(
+				0,
+				'ACP_CAT',
+				true,
+				true,
+			),
+			array(
+				false,
+				'ACP_CAT',
+				true,
 				true,
 			),
 
@@ -65,16 +99,39 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
 				'',
 				'ACP_MODULE',
 				false,
+				false,
+			),
+			array(
+				false,
+				'ACP_MODULE',
+				false,
+				true,
+			),
+			array(
+				'ACP_CAT',
+				'ACP_MODULE',
+				false,
+				true,
+			),
+
+			// Test the existing module lazily
+			array(
+				'',
+				'ACP_MODULE',
+				true,
+				false,
 			),
 			array(
 				false,
 				'ACP_MODULE',
 				true,
+				true,
 			),
 			array(
 				'ACP_CAT',
 				'ACP_MODULE',
 				true,
+				true,
 			),
 
 			// Test for non-existant modules
@@ -82,10 +139,38 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
 				'',
 				'ACP_NON_EXISTANT_CAT',
 				false,
+				false,
+			),
+			array(
+				false,
+				'ACP_NON_EXISTANT_CAT',
+				false,
+				false,
+			),
+			array(
+				'ACP_CAT',
+				'ACP_NON_EXISTANT_MODULE',
+				false,
+				false,
+			),
+
+			// Test for non-existant modules lazily
+			array(
+				'',
+				'ACP_NON_EXISTANT_CAT',
+				true,
+				false,
+			),
+			array(
+				false,
+				'ACP_NON_EXISTANT_CAT',
+				true,
+				false,
 			),
 			array(
 				'ACP_CAT',
 				'ACP_NON_EXISTANT_MODULE',
+				true,
 				false,
 			),
 		);
@@ -94,9 +179,9 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
 	/**
 	* @dataProvider exists_data_acp
 	*/
-	public function test_exists_acp($parent, $module, $expected)
+	public function test_exists_acp($parent, $module, $lazy, $expected)
 	{
-		$this->assertEquals($expected, $this->tool->exists('acp', $parent, $module));
+		$this->assertEquals($expected, $this->tool->exists('acp', $parent, $module, $lazy));
 	}
 
 	public function exists_data_ucp()
@@ -106,12 +191,40 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
 			array(
 				'',
 				'UCP_MAIN_CAT',
+				false,
+				true,
+			),
+			array(
+				0,
+				'UCP_MAIN_CAT',
+				false,
+				true,
+			),
+			array(
+				false,
+				'UCP_MAIN_CAT',
+				false,
+				true,
+			),
+
+			// Test the existing category lazily
+			array(
+				'',
+				'UCP_MAIN_CAT',
+				true,
 				true,
 			),
 			array(
 				0,
 				'UCP_MAIN_CAT',
 				true,
+				true,
+			),
+			array(
+				false,
+				'UCP_MAIN_CAT',
+				true,
+				true,
 			),
 
 			// Test the existing module
@@ -119,21 +232,51 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
 				'',
 				'UCP_SUBCATEGORY',
 				false,
+				false,
+			),
+			array(
+				false,
+				'UCP_SUBCATEGORY',
+				false,
+				true,
+			),
+			array(
+				'UCP_MAIN_CAT',
+				'UCP_SUBCATEGORY',
+				false,
+				true,
+			),
+			array(
+				'UCP_SUBCATEGORY',
+				'UCP_MODULE',
+				false,
+				true,
+			),
+
+			// Test the existing module lazily
+			array(
+				'',
+				'UCP_SUBCATEGORY',
+				true,
+				false,
 			),
 			array(
 				false,
 				'UCP_SUBCATEGORY',
 				true,
+				true,
 			),
 			array(
 				'UCP_MAIN_CAT',
 				'UCP_SUBCATEGORY',
 				true,
+				true,
 			),
 			array(
 				'UCP_SUBCATEGORY',
 				'UCP_MODULE',
 				true,
+				true,
 			),
 
 			// Test for non-existant modules
@@ -141,10 +284,26 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
 				'',
 				'UCP_NON_EXISTANT_CAT',
 				false,
+				false,
+			),
+			array(
+				'UCP_MAIN_CAT',
+				'UCP_NON_EXISTANT_MODULE',
+				false,
+				false,
+			),
+
+			// Test for non-existant modules lazily
+			array(
+				'',
+				'UCP_NON_EXISTANT_CAT',
+				true,
+				false,
 			),
 			array(
 				'UCP_MAIN_CAT',
 				'UCP_NON_EXISTANT_MODULE',
+				true,
 				false,
 			),
 		);
@@ -153,9 +312,9 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
 	/**
 	* @dataProvider exists_data_ucp
 	*/
-	public function test_exists_ucp($parent, $module, $expected)
+	public function test_exists_ucp($parent, $module, $lazy, $expected)
 	{
-		$this->assertEquals($expected, $this->tool->exists('ucp', $parent, $module));
+		$this->assertEquals($expected, $this->tool->exists('ucp', $parent, $module, $lazy));
 	}
 
 	public function test_add()
@@ -195,25 +354,6 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
 
 		// Test adding module when plural parent module_langname exists
 		// PHPBB3-14703
-		// Adding fail
-		try
-		{
-			$this->tool->add('acp', 'ACP_FORUM_BASED_PERMISSIONS', array(
-				'module_basename'	=> 'acp_new_permissions_module',
-				'module_langname'	=> 'ACP_NEW_PERMISSIONS_MODULE',
-				'module_mode'		=> 'test',
-				'module_auth'		=> '',
-			));
-			$this->fail('Exception not thrown');
-		}
-		catch (Exception $e)
-		{
-			$this->assertEquals('phpbb\db\migration\exception', get_class($e));
-			$this->assertEquals('MODULE_EXIST_MULTIPLE', $e->getMessage());
-		}
-
-		// Test adding module when plural parent module_langname exists
-		// PHPBB3-14703
 		// Adding success
 		try
 		{
@@ -269,6 +409,35 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
 			$this->fail($e);
 		}
 		$this->assertEquals(true, $this->tool->exists('ucp', 'UCP_NEW_SUBCAT', 'UCP_NEW_MODULE'));
+
+		// Test adding new UCP module the automatic way, single mode
+		try
+		{
+			$this->tool->add('ucp', 'UCP_NEW_CAT', array(
+				'module_basename'	=> '\foo\bar\ucp\ucp_test_module',
+				'modes'				=> array('mode_1'),
+			));
+		}
+		catch (Exception $e)
+		{
+			$this->fail($e);
+		}
+		$this->assertEquals(true, $this->tool->exists('ucp', 'UCP_NEW_CAT', 'UCP_NEW_MODULE_MODE_1'));
+		$this->assertEquals(false, $this->tool->exists('ucp', 'UCP_NEW_CAT', 'UCP_NEW_MODULE_MODE_2'));
+
+		// Test adding new ACP module the automatic way, all modes
+		try
+		{
+			$this->tool->add('acp', 'ACP_NEW_CAT', array(
+				'module_basename' => '\foo\bar\acp\acp_test_module',
+			));
+		}
+		catch (Exception $e)
+		{
+			$this->fail($e);
+		}
+		$this->assertEquals(true, $this->tool->exists('acp', 'ACP_NEW_CAT', 'ACP_NEW_MODULE_MODE_1'));
+		$this->assertEquals(true, $this->tool->exists('acp', 'ACP_NEW_CAT', 'ACP_NEW_MODULE_MODE_2'));
 	}
 
 	public function test_remove()
diff --git a/tests/dbal/migrator_tool_permission_test.php b/tests/dbal/migrator_tool_permission_test.php
index d84f6a68ff..ccad6a1387 100644
--- a/tests/dbal/migrator_tool_permission_test.php
+++ b/tests/dbal/migrator_tool_permission_test.php
@@ -163,7 +163,7 @@ class phpbb_dbal_migrator_tool_permission_test extends phpbb_database_test_case
 		$this->assertFalse($this->tool->exists('global_test', true));
 	}
 
-	public function test_permission_set_data()
+	public function data_test_permission_set()
 	{
 		return array(
 			array(
@@ -188,7 +188,7 @@ class phpbb_dbal_migrator_tool_permission_test extends phpbb_database_test_case
 	}
 
 	/**
-	* @dataProvider test_permission_set_data
+	* @dataProvider data_test_permission_set
 	*/
 	public function test_permission_set($group_name, $auth_option, $type, $has_permission)
 	{
diff --git a/tests/dbal/write_test.php b/tests/dbal/write_test.php
index 98709fb043..4fa5cc37a2 100644
--- a/tests/dbal/write_test.php
+++ b/tests/dbal/write_test.php
@@ -67,7 +67,7 @@ class phpbb_dbal_write_test extends phpbb_database_test_case
 		$result = $db->sql_query($sql);
 		$rows = $db->sql_fetchrowset($result);
 
-		$this->assertEquals(1, sizeof($rows));
+		$this->assertEquals(1, count($rows));
 		$this->assertEquals('config2', $rows[0]['config_name']);
 
 		$db->sql_freeresult($result);
author	stevendegroote <stevendegroote@gmail.com>	2019-09-17 23:15:54 +0200
committer	stevendegroote <stevendegroote@gmail.com>	2019-09-17 23:15:54 +0200
commit	f8967fec78d826ea8d9ca34f65966ff8a7674b47 (patch)
tree	f9c5f408e7764ec6343e084e7fc6d62d07e3400f /tests/dbal
parent	ce93b224107a65b43253c36812b636321eb55a78 (diff)
parent	4db585a4cb2e5359074a82ef088574609155294b (diff)
download	forums-f8967fec78d826ea8d9ca34f65966ff8a7674b47.tar forums-f8967fec78d826ea8d9ca34f65966ff8a7674b47.tar.gz forums-f8967fec78d826ea8d9ca34f65966ff8a7674b47.tar.bz2 forums-f8967fec78d826ea8d9ca34f65966ff8a7674b47.tar.xz forums-f8967fec78d826ea8d9ca34f65966ff8a7674b47.zip