Merge pull request #10247 from owncloud/tests/test-coverage-7815-parent-id

[tests-only][full-ci] check parent-id of shares

Author: saw-jan

tests/acceptance/bootstrap/SpacesContext.php

@@ -4000,12 +4000,50 @@ public function asUsertheXMLResponseShouldContainMountpointWithTheseKeyAndValueP
 	}
 
 	/**
-	 * @param string $resource // can be resource name, space id or file id
-	 * @param array $properties // ["key" => "value"]
+	 * @param SimpleXMLElement $responseXmlObject
+	 * @param array $xpaths
+	 * @param string $message
+	 *
+	 * @return string
+	 */
+	public function buildXpathErrorMessage(SimpleXMLElement $responseXmlObject, array $xpaths, string $message): string {
+		return "Using xpaths:\n\t- " . \join("\n\t- ", $xpaths)
+			. "\n"
+			. $message
+			. "\n\t"
+			. "'" . \trim($responseXmlObject->asXML()) . "'";
+	}
+
+	/**
+	 * @param SimpleXMLElement $responseXmlObject
+	 * @param string $siblingXpath
+	 * @param string $siblingToFind
+	 *
+	 * @return string
+	 * @throws Exception
+	 */
+	public function getXpathSiblingValue(SimpleXMLElement $responseXmlObject, string $siblingXpath, string $siblingToFind): string {
+		$xpaths[] = $siblingXpath . "/preceding-sibling::$siblingToFind";
+		$xpaths[] = $siblingXpath . "/following-sibling::$siblingToFind";
+
+		foreach ($xpaths as $key => $xpath) {
+			$foundSibling = $responseXmlObject->xpath($xpath);
+			if (\count($foundSibling)) {
+				break;
+			}
+		}
+		$errorMessage = $this->buildXpathErrorMessage($responseXmlObject, $xpaths, "Could not find sibling '<$siblingToFind>' element in the XML response");
+		Assert::assertNotEmpty($foundSibling, $errorMessage);
+		return \preg_quote($foundSibling[0]->__toString(), "/");
+	}
+
+	/**
+	 * @param string $resource	// can be resource name, space id or file id
+	 * @param array $properties	// ["key" => "value"]
 	 *
 	 * @return void
 	 * @throws GuzzleException
-	 * @throws JsonException
+	 * @throws Exception
 	 */
 	public function theXMLResponseShouldContain(string $resource, array $properties): void {
 		$responseXmlObject = HttpRequestHelper::getResponseXml($this->featureContext->getResponse(), __METHOD__);
@@ -4056,17 +4094,39 @@ public function theXMLResponseShouldContain(string $resource, array $properties)
 				$xpaths[] = $xpath;
 			}
 
+			Assert::assertCount(
+				1,
+				$foundXmlItem,
+				$this->buildXpathErrorMessage($responseXmlObject, $xpaths, "Found multiple elements for '<$itemToFind>' in the XML response")
+			);
 			Assert::assertNotEmpty(
 				$foundXmlItem,
-				// all these for the sake of a nice error message
-				"Using xpaths:\n\t- " . \join("\n\t- ", $xpaths)
-				. "\n"
-				. "Could not find '<$itemToFind>' element in the XML response\n\t"
-				. "'" . \trim($responseXmlObject->asXML()) . "'"
+				$this->buildXpathErrorMessage($responseXmlObject, $xpaths, "Could not find '<$itemToFind>' element in the XML response")
 			);
 
 			$actualValue = $foundXmlItem[0]->__toString();
-			$expectedValue = $this->featureContext->substituteInLineCodes($property['value']);
+			$expectedValue = $property['value'];
+			\preg_match_all("/%self::[a-z0-9-:]+?%/", $expectedValue, $selfMatches);
+			$substituteFunctions = [];
+			if (!empty($selfMatches[0])) {
+				$siblingXpath = $xpaths[\count($xpaths) - 1];
+				foreach ($selfMatches[0] as $match) {
+					$siblingToFind = \ltrim($match, "/%self::/");
+					$siblingToFind = \rtrim($siblingToFind, "/%/");
+					$substituteFunctions[] = [
+						"code" => $match,
+						"function" =>
+							[$this, "getXpathSiblingValue"],
+						"parameter" => [$responseXmlObject, $siblingXpath, $siblingToFind]
+					];
+				}
+			}
+			$expectedValue = $this->featureContext->substituteInLineCodes(
+				$property['value'],
+				null,
+				[],
+				$substituteFunctions,
+			);
 
 			switch ($itemToFind) {
 				case "oc:fileid":

tests/acceptance/expected-failures-localAPI-on-OCIS-storage.md

@@ -318,5 +318,9 @@ The expected failures in this file are from features in the owncloud/ocis repo.
 - [apiSearchContent/contentSearch.feature:266](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSearchContent/contentSearch.feature#L266)
 - [apiSearchContent/contentSearch.feature:267](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSearchContent/contentSearch.feature#L267)
 
+#### [Shares Jail PROPFIND returns different File IDs for the same item](https://github.com/owncloud/ocis/issues/9933)
+
+- [apiSharingNg1/propfindShares.feature:149](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSharingNg1/propfindShares.feature#L149)
+
 Note: always have an empty line at the end of this file.
 The bash script that processes this file requires that the last line has a newline on the end.

tests/acceptance/features/apiSharingNg1/propfindShares.feature

@@ -123,18 +123,25 @@ Feature: propfind a shares
     When user "Brian" sends PROPFIND request from the space "Shares" to the resource "/" using the WebDAV API
     Then the HTTP status code should be "207"
     And as user "Brian" the PROPFIND response should contain a resource "folderToShare" with these key and value pairs:
-      | key       | value     |
-      | oc:fileid | <pattern> |
+      | key            | value                               |
+      | oc:fileid      | <pattern>                           |
+      | oc:file-parent | %self::oc:spaceid%!%uuidv4_pattern% |
     When user "Brian" sends PROPFIND request from the space "Shares" to the resource "folderToShare" using the WebDAV API
     Then the HTTP status code should be "207"
     And as user "Brian" the PROPFIND response should contain a resource "folderToShare" with these key and value pairs:
-      | key       | value     |
-      | oc:fileid | <pattern> |
+      | key            | value                               |
+      | oc:fileid      | <pattern>                           |
+      | oc:file-parent | %self::oc:spaceid%!%uuidv4_pattern% |
+    And as user "Brian" the PROPFIND response should contain a resource "folderToShare/textfile.txt" with these key and value pairs:
+      | key            | value                               |
+      | oc:fileid      | %file_id_pattern%                   |
+      | oc:file-parent | %self::oc:spaceid%!%uuidv4_pattern% |
     When user "Brian" sends PROPFIND request from the space "Shares" to the resource "folderToShare/textfile.txt" using the WebDAV API
     Then the HTTP status code should be "207"
     And as user "Brian" the PROPFIND response should contain a resource "folderToShare/textfile.txt" with these key and value pairs:
-      | key       | value             |
-      | oc:fileid | %file_id_pattern% |
+      | key            | value                               |
+      | oc:fileid      | %file_id_pattern%                   |
+      | oc:file-parent | %self::oc:spaceid%!%uuidv4_pattern% |
     Examples:
       | dav-path-version | pattern            |
       | old              | %file_id_pattern%  |