[full-ci][tests-only] Improve then steps for suite 'apiFederationToShares2'

tests/acceptance/features/apiShareOperationsToShares1/accessToSharesFolder.feature

@@ -56,7 +56,7 @@ Feature: write directly into the folder for received shares
     And user "Brian" creates folder "/Shares/aFolder" using the WebDAV API
     And user "Alice" shares folder "/shared" with user "Brian" using the sharing API
     And user "Brian" accepts share "/shared" offered by user "Alice" using the sharing API
-    #OCS status code is checked only for Sharing API request
+    # OCS status code is available only for the Sharing API request
     Then the OCS status code of responses on all endpoints should be "100"
     And the HTTP status code of responses on each endpoint should be "201, 201, 200, 200" respectively
     And as "Brian" folder "/Shares" should exist

tests/acceptance/features/bootstrap/AppConfigurationContext.php

@@ -23,6 +23,7 @@
  */
 
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
+use GuzzleHttp\Exception\GuzzleException;
 use PHPUnit\Framework\Assert;
 use TestHelpers\AppConfigHelper;
 use TestHelpers\OcsApiHelper;
@@ -47,6 +48,7 @@ class AppConfigurationContext implements Context {
 	 * @param string $value
 	 *
 	 * @return void
+	 * @throws Exception
 	 */
 	public function adminSetsServerParameterToUsingAPI(
 		string $parameter,
@@ -68,6 +70,7 @@ public function adminSetsServerParameterToUsingAPI(
 	 * @param string $value
 	 *
 	 * @return void
+	 * @throws Exception
 	 */
 	public function serverParameterHasBeenSetTo(string $parameter, string $app, string $value):void {
 		// The capturing group of the regex always includes the quotes at each
@@ -77,6 +80,7 @@ public function serverParameterHasBeenSetTo(string $parameter, string $app, stri
 		}
 		$value = \trim($value, $value[0]);
 		$this->modifyAppConfig($app, $parameter, $value);
+		$this->featureContext->clearStatusCodeArrays();
 	}
 
 	/**
@@ -111,6 +115,7 @@ public function theCapabilitiesSettingOfAppParameterShouldBe(
 	 * @param string $capabilitiesPath the path to the element
 	 *
 	 * @return string
+	 * @throws Exception
 	 */
 	public function getAppParameter(string $capabilitiesApp, string $capabilitiesPath):string {
 		return $this->getParameterValueFromXml(
@@ -126,6 +131,8 @@ public function getAppParameter(string $capabilitiesApp, string $capabilitiesPat
 	 * @param string $username
 	 *
 	 * @return void
+	 * @throws GuzzleException
+	 * @throws JsonException
 	 */
 	public function userGetsCapabilities(string $username):void {
 		$user = $this->featureContext->getActualUsername($username);
@@ -184,6 +191,7 @@ public function theUserGetsCapabilitiesCheckResponse():void {
 
 	/**
 	 * @return string
+	 * @throws Exception
 	 */
 	public function getAdminUsernameForCapabilitiesCheck():string {
 		if (\TestHelpers\OcisHelper::isTestingOnReva()) {
@@ -225,6 +233,7 @@ public function theAdministratorGetsCapabilitiesCheckResponse():void {
 	 * @param string $exceptionText text to put at the front of exception messages
 	 *
 	 * @return SimpleXMLElement latest retrieved capabilities in XML format
+	 * @throws Exception
 	 */
 	public function getCapabilitiesXml(string $exceptionText = ''): SimpleXMLElement {
 		if ($exceptionText === '') {
@@ -237,6 +246,7 @@ public function getCapabilitiesXml(string $exceptionText = ''): SimpleXMLElement
 	 * @param string $exceptionText text to put at the front of exception messages
 	 *
 	 * @return SimpleXMLElement latest retrieved version data in XML format
+	 * @throws Exception
 	 */
 	public function getVersionXml(string $exceptionText = ''): SimpleXMLElement {
 		if ($exceptionText === '') {
@@ -326,6 +336,7 @@ public function parameterValueExistsInXml(
 	 * @param string $value
 	 *
 	 * @return void
+	 * @throws Exception
 	 */
 	public function modifyAppConfig(string $app, string $parameter, string $value):void {
 		AppConfigHelper::modifyAppConfig(
@@ -344,6 +355,7 @@ public function modifyAppConfig(string $app, string $parameter, string $value):v
 	 * @param array $appParameterValues
 	 *
 	 * @return void
+	 * @throws Exception
 	 */
 	public function modifyAppConfigs(array $appParameterValues):void {
 		AppConfigHelper::modifyAppConfigs(
@@ -362,6 +374,7 @@ public function modifyAppConfigs(array $appParameterValues):void {
 	 * @param string $url
 	 *
 	 * @return void
+	 * @throws GuzzleException
 	 */
 	public function theAdministratorAddsUrlAsTrustedServerUsingTheTestingApi(string $url):void {
 		$adminUser = $this->featureContext->getAdminUsername();
@@ -375,6 +388,7 @@ public function theAdministratorAddsUrlAsTrustedServerUsingTheTestingApi(string
 			['url' => $this->featureContext->substituteInLineCodes($url)]
 		);
 		$this->featureContext->setResponse($response);
+		$this->featureContext->pushToLastStatusCodesArrays();
 	}
 
 	/**
@@ -456,6 +470,7 @@ public function theTrustedServerListShouldIncludeTheseUrls(TableNode $table):voi
 	 *
 	 * @return void
 	 * @throws Exception
+	 * @throws GuzzleException
 	 */
 	public function theAdministratorHasAddedUrlAsTrustedServer(string $url):void {
 		$this->theAdministratorAddsUrlAsTrustedServerUsingTheTestingApi($url);
@@ -475,6 +490,7 @@ public function theAdministratorHasAddedUrlAsTrustedServer(string $url):void {
 	 * @param string $url
 	 *
 	 * @return void
+	 * @throws GuzzleException
 	 */
 	public function theAdministratorDeletesUrlFromTrustedServersUsingTheTestingApi(string $url):void {
 		$adminUser = $this->featureContext->getAdminUsername();
@@ -514,6 +530,7 @@ public function urlShouldNotBeATrustedServer(string $url):void {
 	 * @When the administrator deletes all trusted servers using the testing API
 	 *
 	 * @return void
+	 * @throws GuzzleException
 	 */
 	public function theAdministratorDeletesAllTrustedServersUsingTheTestingApi():void {
 		$adminUser = $this->featureContext->getAdminUsername();
@@ -564,6 +581,7 @@ public function theTrustedServerListShouldBeEmpty():void {
 	 * Expires last created share using the testing API
 	 *
 	 * @return void
+	 * @throws GuzzleException
 	 */
 	public function expireLastCreatedUserShare():void {
 		$adminUser = $this->featureContext->getAdminUsername();
@@ -585,6 +603,7 @@ public function expireLastCreatedUserShare():void {
 	 * @Given the administrator has expired the last created share using the testing API
 	 *
 	 * @return void
+	 * @throws GuzzleException
 	 */
 	public function theAdministratorHasExpiredTheLastCreatedShare():void {
 		$this->expireLastCreatedUserShare();
@@ -599,6 +618,7 @@ public function theAdministratorHasExpiredTheLastCreatedShare():void {
 	 * @When the administrator expires the last created share using the testing API
 	 *
 	 * @return void
+	 * @throws GuzzleException
 	 */
 	public function theAdministratorExpiresTheLastCreatedShare():void {
 		$this->expireLastCreatedUserShare();

tests/acceptance/features/bootstrap/FeatureContext.php

@@ -372,12 +372,16 @@ public function getOCSelector(): string {
 	}
 
 	/**
-	 * @param string $httpStatusCode
+	 * @param string|null $httpStatusCode
 	 *
 	 * @return void
 	 */
-	public function pushToLastHttpStatusCodesArray(string $httpStatusCode):void {
-		\array_push($this->lastHttpStatusCodesArray, $httpStatusCode);
+	public function pushToLastHttpStatusCodesArray(?string $httpStatusCode=null):void {
+		if ($httpStatusCode !== null) {
+			$this->lastHttpStatusCodesArray[] = $httpStatusCode;
+		} elseif ($this->getResponse()->getStatusCode() !== null) {
+			$this->lastHttpStatusCodesArray[] = (string)$this->getResponse()->getStatusCode();
+		}
 	}
 
 	/**
@@ -393,6 +397,15 @@ public function emptyLastHTTPStatusCodesArray():void {
 	public function emptyLastOCSStatusCodesArray():void {
 		$this->lastOCSStatusCodesArray = [];
 	}
+
+	/**
+	 * @return void
+	 */
+	public function clearStatusCodeArrays():void {
+		$this->emptyLastHTTPStatusCodesArray();
+		$this->emptyLastOCSStatusCodesArray();
+	}
+
 	/**
 	 * @param string $ocsStatusCode
 	 *
@@ -1580,6 +1593,7 @@ public function theHTTPStatusCodeShouldBe($expectedStatusCode, ?string $message
 				$message
 			);
 		}
+		$this->emptyLastHTTPStatusCodesArray();
 	}
 
 	/**

tests/acceptance/features/bootstrap/FederationContext.php

@@ -57,6 +57,7 @@ class FederationContext implements Context {
 	 * @param string|null $expireDate
 	 *
 	 * @return void
+	 * @throws JsonException
 	 */
 	public function userFromServerSharesWithUserFromServerUsingTheSharingAPI(
 		string $sharerUser,
@@ -75,7 +76,6 @@ public function userFromServerSharesWithUserFromServerUsingTheSharingAPI(
 			null,
 			$expireDate
 		);
-		$this->featureContext->pushToLastStatusCodesArrays();
 	}
 
 	/**
@@ -90,6 +90,7 @@ public function userFromServerSharesWithUserFromServerUsingTheSharingAPI(
 	 * @param string|null $expireDate
 	 *
 	 * @return void
+	 * @throws JsonException
 	 */
 	public function userFromServerSharesWithUserFromServerUsingTheSharingAPIWithPermissions(
 		string $sharerUser,
@@ -121,6 +122,7 @@ public function userFromServerSharesWithUserFromServerUsingTheSharingAPIWithPerm
 			null,
 			$expireDate
 		);
+		$this->featureContext->pushToLastStatusCodesArrays();
 		$this->featureContext->usingServer($previous);
 	}
 
@@ -156,6 +158,7 @@ public function userFromServerHasSharedWithUserFromServer(
 				$this->featureContext->getResponse()
 			) . '"'
 		);
+		$this->featureContext->emptyLastHTTPStatusCodesArray();
 	}
 
 	/**
@@ -255,6 +258,7 @@ public function userFromServerAcceptsLastPendingShareUsingTheSharingAPI(string $
 			"/apps/files_sharing/api/v1/remote_shares/pending/{$share_id}",
 			null
 		);
+		$this->featureContext->pushToLastStatusCodesArrays();
 		$this->featureContext->usingServer($previous);
 	}
 
@@ -273,6 +277,7 @@ public function userFromServerHasAcceptedLastPendingShare(string $user, string $
 			$server
 		);
 		$this->ocsContext->assertOCSResponseIndicatesSuccess();
+		$this->featureContext->emptyLastHTTPStatusCodesArray();
 	}
 
 	/**
@@ -303,6 +308,7 @@ public function userRetrievesInformationOfLastFederatedShare(string $user):void
 	 * @param string $user
 	 *
 	 * @return void
+	 * @throws Exception
 	 */
 	public function userShouldHaveNoLastPendingFederatedCloudShare(string $user):void {
 		$this->userGetsTheListOfPendingFederatedCloudShares($user);
@@ -313,6 +319,7 @@ public function userShouldHaveNoLastPendingFederatedCloudShare(string $user):voi
 			__METHOD__
 			. " No pending federated cloud shares were expected, but got unexpectedly."
 		);
+		$this->featureContext->emptyLastHTTPStatusCodesArray();
 	}
 
 	/**

tests/acceptance/features/bootstrap/OCSContext.php

@@ -759,6 +759,7 @@ public function theOCSStatusCodeShouldBe(string $statusCode, $message = ""):void
 				$statusCodes,
 				$message
 			);
+			$this->featureContext->emptyLastOCSStatusCodesArray();
 		} else {
 			if ($message === "") {
 				$message = "OCS status code is not the expected value " . $statusCodes . " got " . $responseStatusCode;

tests/acceptance/features/bootstrap/Sharing.php

@@ -994,6 +994,8 @@ public function addToListOfCreatedPublicLinks(string $name, string $url):void {
 	 * @param string $sharingApp
 	 *
 	 * @return void
+	 * @throws JsonException
+	 * @throws Exception
 	 */
 	public function createShare(
 		string $user,