Merge pull request #37310 from owncloud/use-assertContainsEquals

[Tests-Only] Use assertContainsEquals to compare status codes that could be in string or int form

tests/acceptance/features/bootstrap/FeatureContext.php

@@ -1221,7 +1221,7 @@ public function theHTTPStatusCodeShouldBe($expectedStatusCode, $message = "") {
 				$message = "HTTP status code $actualStatusCode is not one of the expected values";
 			}
 
-			Assert::assertContains(
+			Assert::assertContainsEquals(
 				$actualStatusCode, $expectedStatusCode,
 				$message
 			);

tests/acceptance/features/bootstrap/OCSContext.php

@@ -571,7 +571,7 @@ public function theOCSStatusCodeShouldBe($statusCode, $message = "") {
 			$this->featureContext->getResponse()
 		);
 		if (\is_array($statusCode)) {
-			Assert::assertContains(
+			Assert::assertContainsEquals(
 				$responseStatusCode, $statusCode,
 				$message
 			);

tests/acceptance/features/bootstrap/Provisioning.php

@@ -3309,8 +3309,8 @@ public function theUsersShouldBe($usersList) {
 		$users = $usersList->getRows();
 		$usersSimplified = $this->simplifyArray($users);
 		$respondedArray = $this->getArrayOfUsersResponded($this->response);
-		Assert::assertEquals(
-			$usersSimplified, $respondedArray, "", 0.0, 10, true
+		Assert::assertEqualsCanonicalizing(
+			$usersSimplified, $respondedArray
 		);
 	}
 
@@ -3326,8 +3326,8 @@ public function theGroupsShouldBe($groupsList) {
 		$groups = $groupsList->getRows();
 		$groupsSimplified = $this->simplifyArray($groups);
 		$respondedArray = $this->getArrayOfGroupsResponded($this->response);
-		Assert::assertEquals(
-			$groupsSimplified, $respondedArray, "", 0.0, 10, true
+		Assert::assertEqualsCanonicalizing(
+			$groupsSimplified, $respondedArray
 		);
 	}
 
@@ -3377,8 +3377,8 @@ public function checkSubadminGroupsOrUsersTable($groupsOrUsersList) {
 		$tableRows = $groupsOrUsersList->getRows();
 		$simplifiedTableRows = $this->simplifyArray($tableRows);
 		$respondedArray = $this->getArrayOfSubadminsResponded($this->response);
-		Assert::assertEquals(
-			$simplifiedTableRows, $respondedArray, "", 0.0, 10, true
+		Assert::assertEqualsCanonicalizing(
+			$simplifiedTableRows, $respondedArray
 		);
 	}
 

tests/acceptance/features/bootstrap/Sharing.php

@@ -2033,12 +2033,19 @@ function (&$value, $key) {
 			);
 		}
 
-		// check if attributes received from table is subset of actualAttributes
-		Assert::assertArraySubset(
-			$attributes,
-			$actualAttributesArray,
-			"The additional sharing attributes did not include the expected attributes. See the differences below."
-		);
+		// check if the expected attributes received from table match actualAttributes
+		foreach (['scope', 'key', 'enabled'] as $key) {
+			Assert::assertArrayHasKey(
+				$key,
+				$actualAttributesArray,
+				"the additional sharing attributes in the last response did not have key '$key'"
+			);
+			Assert::assertEquals(
+				$attributes[$key],
+				$actualAttributesArray[$key],
+				"the additional sharing attribute '$key' had value " . $actualAttributesArray[$key] . " but was expected to have value " . $actualAttributesArray[$key]
+			);
+		}
 	}
 
 	/**
@@ -2418,13 +2425,8 @@ public function assertSharesOfUserAreInState($user, $state, TableNode $table) {
 			$row['path'] = "/" . \trim($row['path'], "/");
 			foreach ($usersShares as $share) {
 				try {
-					Assert::assertArraySubset(
-						$row,
-						$share,
-						"Expected '"
-						. \ implode(', ', $row)
-						. "' was not included in the share of the user. See the difference below"
-					);
+					Assert::assertArrayHasKey('path', $share);
+					Assert::assertEquals($row['path'], $share['path']);
 					$found = true;
 					break;
 				} catch (PHPUnit\Framework\ExpectationFailedException $e) {