From 66a9765f505ff776d95cfaff2b922869102b6580 Mon Sep 17 00:00:00 2001
From: Nick Liu <deltik@gmx.com>
Date: Fri, 17 Jan 2020 19:05:26 +0100
Subject: [PATCH] Corrected subset check in
 user_classTest::testGetUsersInClass()

---
 e107_tests/tests/unit/user_classTest.php | 67 ++++++++++++------------
 1 file changed, 33 insertions(+), 34 deletions(-)

diff --git a/e107_tests/tests/unit/user_classTest.php b/e107_tests/tests/unit/user_classTest.php
index 537d045b7..4c3ae289b 100644
--- a/e107_tests/tests/unit/user_classTest.php
+++ b/e107_tests/tests/unit/user_classTest.php
@@ -86,47 +86,46 @@
 */
 		public function testGetUsersInClass()
 		{
-
 			$result = $this->uc->getUsersInClass(e_UC_MEMBER);
-			$expected = array (
-				  1 =>
-				  array (
-				    'user_id' => '1',
-				    'user_name' => 'e107',
-				    'user_loginname' => 'e107',
-				  ),
-				);
+			$expected = [
+				'user_id' => '1',
+				'user_name' => 'e107',
+				'user_loginname' => 'e107',
+			];
 
-			$matched = array_intersect_assoc($expected,$result);
-			$this->assertNotEmpty($matched);
+			$passed = false;
+			foreach ($result as $user)
+			{
+				if ($user == $expected) $passed = true;
+			}
+			$this->assertTrue($passed, "Expected user not found");
 
+			$result = $this->uc->getUsersInClass(e_UC_ADMIN . ",5,4,3", 'user_perms');
+			$expected = [
+				'user_id' => '1',
+				'user_perms' => '0',
+			];
 
-
-			$result = $this->uc->getUsersInClass(e_UC_ADMIN.",5,4,3", 'user_perms');
-			$expected = array (
-			  1 =>
-			  array (
-			    'user_id' => '1',
-			    'user_perms' => '0',
-			  ),
-			);
-
-			$matched = array_intersect_assoc($expected,$result);
-			$this->assertNotEmpty($matched);
+			$passed = false;
+			foreach ($result as $user)
+			{
+				if ($user == $expected) $passed = true;
+			}
+			$this->assertTrue($passed, "Expected user not found");
 
 			$result = $this->uc->getUsersInClass(e_UC_MAINADMIN);
-			$expected = array (
-				  1 =>
-				  array (
-				    'user_id' => '1',
-				    'user_name' => 'e107',
-				    'user_loginname' => 'e107',
-				  ),
-				);
-
-			$matched = array_intersect_assoc($expected,$result);
-			$this->assertNotEmpty($matched);
+			$expected = [
+				'user_id' => '1',
+				'user_name' => 'e107',
+				'user_loginname' => 'e107',
+			];
 
+			$passed = false;
+			foreach ($result as $user)
+			{
+				if ($user == $expected) $passed = true;
+			}
+			$this->assertTrue($passed, "Expected user not found");
 		}
 /*
 		public function testGet_editable_classes()