From 51ef1ae346c08863d188e723ba41720e744a2fbd Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sun, 23 Oct 2016 22:44:47 +0700
Subject: [ticket/14831] Add more tests, better name for $e placeholder

PHPBB3-14831
---
 tests/dbal/migrator_tool_module_test.php | 59 +++++++++++++++++++++++++++++---
 1 file changed, 55 insertions(+), 4 deletions(-)

(limited to 'tests')

diff --git a/tests/dbal/migrator_tool_module_test.php b/tests/dbal/migrator_tool_module_test.php
index 49dff8b929..462b521f1a 100644
--- a/tests/dbal/migrator_tool_module_test.php
+++ b/tests/dbal/migrator_tool_module_test.php
@@ -42,10 +42,10 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
 		$this->tool = new \phpbb\db\migration\tool\module($this->db, $this->cache, $this->user, $phpbb_root_path, $phpEx, 'phpbb_modules');
 	}
 
-	public function exists_data()
+	public function exists_data_acp()
 	{
 		return array(
-			// Test the category
+			// Test the existing category
 			array(
 				'',
 				'ACP_CAT',
@@ -57,7 +57,7 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
 				true,
 			),
 
-			// Test the module
+			// Test the existing module
 			array(
 				'',
 				'ACP_MODULE',
@@ -73,11 +73,23 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
 				'ACP_MODULE',
 				true,
 			),
+
+			// Test for non-existant modules
+			array(
+				'',
+				'ACP_NON_EXISTANT_CAT',
+				false,
+			),
+			array(
+				'ACP_CAT',
+				'ACP_NON_EXISTANT_MODULE',
+				false,
+			),
 		);
 	}
 
 	/**
-	* @dataProvider exists_data
+	* @dataProvider exists_data_acp
 	*/
 	public function test_exists($parent, $module, $expected)
 	{
@@ -156,6 +168,45 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
 			$this->fail($e);
 		}
 		$this->assertEquals(true, $this->tool->exists('acp', 'ACP_FORUM_BASED_PERMISSIONS', 'ACP_NEW_PERMISSIONS_MODULE'));
+
+		// Test adding UCP modules
+		// Test adding new UCP category
+		try
+		{
+			$this->tool->add('ucp', 0, 'UCP_NEW_CAT');
+		}
+		catch (Exception $e)
+		{
+			$this->fail($e);
+		}
+		$this->assertEquals(true, $this->tool->exists('ucp', 0, 'UCP_NEW_CAT'));
+
+		// Test adding new UCP subcategory
+		try
+		{
+			$this->tool->add('ucp', 'UCP_NEW_CAT', 'UCP_NEW_SUBCAT');
+		}
+		catch (Exception $e)
+		{
+			$this->fail($e);
+		}
+		$this->assertEquals(true, $this->tool->exists('ucp', 'UCP_NEW_CAT', 'UCP_NEW_SUBCAT'));
+
+		// Test adding new UCP module
+		try
+		{
+			$this->tool->add('ucp', 'UCP_NEW_SUBCAT', array(
+				'module_basename'	=> 'ucp_new_module',
+				'module_langname'	=> 'UCP_NEW_MODULE',
+				'module_mode'		=> 'ucp_test',
+				'module_auth'		=> '',
+			));
+		}
+		catch (Exception $e)
+		{
+			$this->fail($e);
+		}
+		$this->assertEquals(true, $this->tool->exists('ucp', 'UCP_NEW_SUBCAT', 'UCP_NEW_MODULE'));
 	}
 
 	public function test_remove()
-- 
cgit v1.2.1


From 849cd74700bc1425245ae9a8c5ec5f126d7a61ff Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sun, 23 Oct 2016 23:33:03 +0700
Subject: [ticket/14831] Add more tests against UCP modules

PHPBB3-14831
---
 tests/dbal/fixtures/migrator_module.xml  | 39 ++++++++++++++++++++
 tests/dbal/migrator_tool_module_test.php | 61 +++++++++++++++++++++++++++++++-
 2 files changed, 99 insertions(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/dbal/fixtures/migrator_module.xml b/tests/dbal/fixtures/migrator_module.xml
index e172d7a145..e85c43ee25 100644
--- a/tests/dbal/fixtures/migrator_module.xml
+++ b/tests/dbal/fixtures/migrator_module.xml
@@ -90,5 +90,44 @@
 			<value></value>
 			<value></value>
 		</row>
+		<row>
+			<value>7</value>
+			<value>1</value>
+			<value>1</value>
+			<value></value>
+			<value>ucp</value>
+			<value>0</value>
+			<value>13</value>
+			<value>18</value>
+			<value>UCP_MAIN_CAT</value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>8</value>
+			<value>1</value>
+			<value>1</value>
+			<value>ucp_subcat</value>
+			<value>ucp</value>
+			<value>7</value>
+			<value>14</value>
+			<value>17</value>
+			<value>UCP_SUBCATEGORY</value>
+			<value>ucp_test</value>
+			<value></value>
+		</row>
+		<row>
+			<value>9</value>
+			<value>1</value>
+			<value>1</value>
+			<value>ucp_module</value>
+			<value>ucp</value>
+			<value>8</value>
+			<value>15</value>
+			<value>16</value>
+			<value>UCP_MODULE</value>
+			<value>ucp_module_test</value>
+			<value></value>
+		</row>
 	</table>
 </dataset>
diff --git a/tests/dbal/migrator_tool_module_test.php b/tests/dbal/migrator_tool_module_test.php
index 462b521f1a..bbe543f347 100644
--- a/tests/dbal/migrator_tool_module_test.php
+++ b/tests/dbal/migrator_tool_module_test.php
@@ -91,11 +91,70 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
 	/**
 	* @dataProvider exists_data_acp
 	*/
-	public function test_exists($parent, $module, $expected)
+	public function test_exists_acp($parent, $module, $expected)
 	{
 		$this->assertEquals($expected, $this->tool->exists('acp', $parent, $module));
 	}
 
+	public function exists_data_ucp()
+	{
+		return array(
+			// Test the existing category
+			array(
+				'',
+				'UCP_MAIN_CAT',
+				true,
+			),
+			array(
+				0,
+				'UCP_MAIN_CAT',
+				true,
+			),
+
+			// Test the existing module
+			array(
+				'',
+				'UCP_SUBCATEGORY',
+				false,
+			),
+			array(
+				false,
+				'UCP_SUBCATEGORY',
+				true,
+			),
+			array(
+				'UCP_MAIN_CAT',
+				'UCP_SUBCATEGORY',
+				true,
+			),
+			array(
+				'UCP_SUBCATEGORY',
+				'UCP_MODULE',
+				true,
+			),
+
+			// Test for non-existant modules
+			array(
+				'',
+				'UCP_NON_EXISTANT_CAT',
+				false,
+			),
+			array(
+				'UCP_MAIN_CAT',
+				'UCP_NON_EXISTANT_MODULE',
+				false,
+			),
+		);
+	}
+
+	/**
+	* @dataProvider exists_data_ucp
+	*/
+	public function test_exists_ucp($parent, $module, $expected)
+	{
+		$this->assertEquals($expected, $this->tool->exists('ucp', $parent, $module));
+	}
+
 	public function test_add()
 	{
 		try
-- 
cgit v1.2.1