Improved share grouping readability + fixed test

apps/files_sharing/lib/MountProvider.php

@@ -75,10 +75,7 @@ class MountProvider implements IMountProvider {
 			return $share->getPermissions() > 0 && $share->getShareOwner() !== $user->getUID();
 		});
 
-		$groupedShares = $this->groupShares($shares);
+		$superShares = $this->buildSuperShares($shares);
-
-		$superShares = $this->superShares($groupedShares);
-
 
 		$mounts = [];
 		foreach ($superShares as $share) {
@@ -88,7 +85,9 @@ class MountProvider implements IMountProvider {
 					$mounts,
 					[
 						'user' => $user->getUID(),
+						// parent share
 						'superShare' => $share[0],
+						// children/component of the superShare
 						'groupedShares' => $share[1],
 					],
 					$storageFactory
@@ -104,8 +103,11 @@ class MountProvider implements IMountProvider {
 	}
 
 	/**
+	 * Groups shares by path (nodeId) and target path
+	 *
 	 * @param \OCP\Share\IShare[] $shares
-	 * @return \OCP\Share\IShare[]
+	 * @return \OCP\Share\IShare[][] array of grouped shares, each element in the
+	 * array is a group which itself is an array of shares
 	 */
 	private function groupShares(array $shares) {
 		$tmp = [];
@@ -128,14 +130,19 @@ class MountProvider implements IMountProvider {
 	}
 
 	/**
-	 * Extract super shares
+	 * Build super shares (virtual share) by grouping them by node id and target,
+	 * then for each group compute the super share and return it along with the matching
+	 * grouped shares. The most permissive permissions are used based on the permissions
+	 * of all shares within the group.
 	 *
-	 * @param array $shares Array of \OCP\Share\IShare[]
+	 * @param \OCP\Share\IShare[] $allShares
 	 * @return array Tuple of [superShare, groupedShares]
 	 */
-	private function superShares(array $groupedShares) {
+	private function buildSuperShares(array $allShares) {
 		$result = [];
 
+		$groupedShares = $this->groupShares($allShares);
+
 		/** @var \OCP\Share\IShare[] $shares */
 		foreach ($groupedShares as $shares) {
 			if (count($shares) === 0) {
@@ -144,11 +151,13 @@ class MountProvider implements IMountProvider {
 
 			$superShare = $this->shareManager->newShare();
 
+			// compute super share based on first entry of the group
 			$superShare->setId($shares[0]->getId())
 				->setShareOwner($shares[0]->getShareOwner())
 				->setNodeId($shares[0]->getNodeId())
 				->setTarget($shares[0]->getTarget());
 
+			// use most permissive permissions
 			$permissions = 0;
 			foreach ($shares as $share) {
 				$permissions |= $share->getPermissions();

apps/files_sharing/tests/MountProviderTest.php

@@ -68,56 +68,41 @@ class MountProviderTest extends \Test\TestCase {
 		$this->provider = new MountProvider($this->config, $this->shareManager, $this->logger);
 	}
 
+	private function makeMockShare($id, $nodeId, $owner = 'user2', $target = null, $permissions = 31) {
+		$share = $this->getMock('\OCP\Share\IShare');
+		$share->expects($this->any())
+			->method('getPermissions')
+			->will($this->returnValue($permissions));
+		$share->expects($this->any())
+			->method('getShareOwner')
+			->will($this->returnValue($owner));
+		$share->expects($this->any())
+			->method('getTarget')
+			->will($this->returnValue($target));
+		$share->expects($this->any())
+			->method('getId')
+			->will($this->returnValue($id));
+		$share->expects($this->any())
+			->method('getNodeId')
+			->will($this->returnValue($nodeId));
+		return $share;
+	}
+
 	public function testExcludeShares() {
-		/** @var IShare | \PHPUnit_Framework_MockObject_MockObject $share1 */
+		$rootFolder = $this->getMock('\OCP\Files\IRootFolder');
-		$share1 = $this->getMockBuilder('\OCP\Share\IShare')->getMock();
+		$userManager = $this->getMock('\OCP\IUserManager');
-		$share1->expects($this->once())
+		$userShares = [
-			->method('getPermissions')
+			$this->makeMockShare(1, 100, 'user2', '/share2', 0),
-			->will($this->returnValue(0));
+			$this->makeMockShare(2, 100, 'user2', '/share2', 31),
-
+		];
-		$share2 = $this->getMockBuilder('\OCP\Share\IShare')->getMock();
+		$groupShares = [
-		$share2->expects($this->once())
+			$this->makeMockShare(3, 100, 'user2', '/share2', 0),
-			->method('getPermissions')
+			$this->makeMockShare(4, 100, 'user2', '/share4', 31),
-			->will($this->returnValue(31));
+			$this->makeMockShare(5, 100, 'user1', '/share4', 31),
-		$share2->expects($this->any())
+		];
-			->method('getShareOwner')
-			->will($this->returnValue('user2'));
-		$share2->expects($this->any())
-			->method('getTarget')
-			->will($this->returnValue('/share2'));
-
-		$share3 = $this->getMockBuilder('\OCP\Share\IShare')->getMock();
-		$share3->expects($this->once())
-			->method('getPermissions')
-			->will($this->returnValue(0));
-
-		/** @var IShare | \PHPUnit_Framework_MockObject_MockObject $share4 */
-		$share4 = $this->getMockBuilder('\OCP\Share\IShare')->getMock();
-		$share4->expects($this->once())
-			->method('getPermissions')
-			->will($this->returnValue(31));
-		$share4->expects($this->any())
-			->method('getShareOwner')
-			->will($this->returnValue('user2'));
-		$share4->expects($this->any())
-			->method('getTarget')
-			->will($this->returnValue('/share4'));
-
-		$share5 = $this->getMockBuilder('\OCP\Share\IShare')->getMock();
-		$share5->expects($this->once())
-			->method('getPermissions')
-			->will($this->returnValue(31));
-		$share5->expects($this->any())
-			->method('getShareOwner')
-			->will($this->returnValue('user1'));
-
-		$userShares = [$share1, $share2];
-		$groupShares = [$share3, $share4, $share5];
-
 		$this->user->expects($this->any())
 			->method('getUID')
 			->will($this->returnValue('user1'));
-
 		$this->shareManager->expects($this->at(0))
 			->method('getSharedWith')
 			->with('user1', \OCP\Share::SHARE_TYPE_USER)
@@ -126,17 +111,27 @@ class MountProviderTest extends \Test\TestCase {
 			->method('getSharedWith')
 			->with('user1', \OCP\Share::SHARE_TYPE_GROUP, null, -1)
 			->will($this->returnValue($groupShares));
-
+		$this->shareManager->expects($this->any())
+			->method('newShare')
+			->will($this->returnCallback(function() use ($rootFolder, $userManager) {
+				return new \OC\Share20\Share($rootFolder, $userManager);
+			}));
 		$mounts = $this->provider->getMountsForUser($this->user, $this->loader);
-
 		$this->assertCount(2, $mounts);
-		$this->assertSharedMount($share1, $mounts[0]);
+		$this->assertInstanceOf('OCA\Files_Sharing\SharedMount', $mounts[0]);
-		$this->assertSharedMount($share4, $mounts[1]);
+		$this->assertInstanceOf('OCA\Files_Sharing\SharedMount', $mounts[1]);
-	}
+		$mountedShare1 = $mounts[0]->getShare();
-
+		$this->assertEquals('2', $mountedShare1->getId());
-	private function assertSharedMount(IShare $share, IMountPoint $mount) {
+		$this->assertEquals('user2', $mountedShare1->getShareOwner());
-		$this->assertInstanceOf('OCA\Files_Sharing\SharedMount', $mount);
+		$this->assertEquals(100, $mountedShare1->getNodeId());
-		$this->assertEquals($share, $mount->getShare());
+		$this->assertEquals('/share2', $mountedShare1->getTarget());
+		$this->assertEquals(31, $mountedShare1->getPermissions());
+		$mountedShare2 = $mounts[1]->getShare();
+		$this->assertEquals('4', $mountedShare2->getId());
+		$this->assertEquals('user2', $mountedShare2->getShareOwner());
+		$this->assertEquals(100, $mountedShare2->getNodeId());
+		$this->assertEquals('/share4', $mountedShare2->getTarget());
+		$this->assertEquals(31, $mountedShare2->getPermissions());
 	}
 }