From 7275cdd15249a72ca95a54b33384ab614464ba65 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Wed, 27 Oct 2021 00:15:46 +0700
Subject: [PATCH] [ticket/16895] Adjust test

PHPBB3-16895
---
 phpBB/phpbb/db/migration/tool/permission.php    |  2 +-
 .../dbal/migrator_tool_permission_role_test.php | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/phpBB/phpbb/db/migration/tool/permission.php b/phpBB/phpbb/db/migration/tool/permission.php
index 8af3e411ac..8c86d0b7f2 100644
--- a/phpBB/phpbb/db/migration/tool/permission.php
+++ b/phpBB/phpbb/db/migration/tool/permission.php
@@ -21,7 +21,7 @@ class permission implements \phpbb\db\migration\tool\tool_interface
 	/** @var \phpbb\auth\auth */
 	protected $auth;
 
-	/** @var \includes\acp\acp_auth */
+	/** @var \includes\acp\auth\auth_admin */
 	protected $auth_admin;
 
 	/** @var \phpbb\cache\service */
diff --git a/tests/dbal/migrator_tool_permission_role_test.php b/tests/dbal/migrator_tool_permission_role_test.php
index 2573a5bb1d..48e45bf2d5 100644
--- a/tests/dbal/migrator_tool_permission_role_test.php
+++ b/tests/dbal/migrator_tool_permission_role_test.php
@@ -16,7 +16,7 @@ class phpbb_dbal_migrator_tool_permission_role_test extends phpbb_database_test_
 	/** @var \phpbb\auth\auth */
 	protected $auth;
 
-	/** @var \acp\auth\auth_admin */
+	/** @var \includes\acp\auth\auth_admin */
 	protected $auth_admin;
 
 	/** @var \phpbb\db\migration\tool\permission */
@@ -171,19 +171,26 @@ class phpbb_dbal_migrator_tool_permission_role_test extends phpbb_database_test_
 		$group_id = (int) $this->group_ids[$group_name];
 		$role_id = (int) $this->new_role_ids[$role_name];
 
+		$sql = 'SELECT agt.auth_role_id
+			FROM ' . ACL_GROUPS_TABLE . ' agt, ' . ACL_ROLES_TABLE . ' art
+			WHERE agt.auth_role_id = art.role_id
+				AND art.role_id = ' . $role_id;
+
 		// Set auth options for each role
 		$this->tool->permission_set($role_name, $auth_option, 'role', true);
 
 		// Assign roles to groups
 		$this->auth_admin->acl_set($ug_type, $forum_id, $group_id, $auth, $role_id);
 
+		// Check if the role is assigned to the group
+		$result = $this->db->sql_query($sql);
+		$this->assertEquals($role_id, $this->db->sql_fetchfield('auth_role_id'));
+		$this->db->sql_freeresult($result);
+
 		$this->tool->role_remove($role_name);
 		$this->assertFalse((bool) $this->tool->role_exists($role_name));
 
-		$sql = 'SELECT agt.auth_role_id
-			FROM ' . ACL_GROUPS_TABLE . ' agt, ' . ACL_ROLES_TABLE . ' art
-			WHERE agt.auth_role_id = art.role_id
-				AND art.role_id = ' . $role_id;
+		// Check if the role is unassigned
 		$result = $this->db->sql_query($sql);
 		$this->assertFalse($this->db->sql_fetchfield('auth_role_id'));
 		$this->db->sql_freeresult($result);