nextcloud / server

apps/dav/tests/unit/Connector/Sabre/PublicAuthTest.php

Indentation +283 added lines, -283 removed lines

@@ -28,357 +28,357 @@
  */
 class PublicAuthTest extends \Test\TestCase {
 
-	private ISession&MockObject $session;
-	private IRequest&MockObject $request;
-	private IManager&MockObject $shareManager;
-	private IThrottler&MockObject $throttler;
-	private LoggerInterface&MockObject $logger;
-	private IURLGenerator&MockObject $urlGenerator;
-	private PublicAuth $auth;
-
-	private bool|string $oldUser;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->session = $this->createMock(ISession::class);
-		$this->request = $this->createMock(IRequest::class);
-		$this->shareManager = $this->createMock(IManager::class);
-		$this->throttler = $this->createMock(IThrottler::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->urlGenerator = $this->createMock(IURLGenerator::class);
-
-		$this->auth = new PublicAuth(
-			$this->request,
-			$this->shareManager,
-			$this->session,
-			$this->throttler,
-			$this->logger,
-			$this->urlGenerator,
-		);
-
-		// Store current user
-		$this->oldUser = \OC_User::getUser();
-	}
-
-	protected function tearDown(): void {
-		\OC_User::setIncognitoMode(false);
-
-		// Set old user
-		\OC_User::setUserId($this->oldUser);
-		if ($this->oldUser !== false) {
-			\OC_Util::setupFS($this->oldUser);
-		}
-
-		parent::tearDown();
-	}
-
-	public function testGetToken(): void {
-		$this->request->method('getPathInfo')
-			->willReturn('/dav/files/GX9HSGQrGE');
-
-		$result = self::invokePrivate($this->auth, 'getToken');
-
-		$this->assertSame('GX9HSGQrGE', $result);
-	}
-
-	public function testGetTokenInvalid(): void {
-		$this->request->method('getPathInfo')
-			->willReturn('/dav/files');
-
-		$this->expectException(\Sabre\DAV\Exception\NotFound::class);
-		self::invokePrivate($this->auth, 'getToken');
-	}
-
-	public function testCheckTokenValidShare(): void {
-		$this->request->method('getPathInfo')
-			->willReturn('/dav/files/GX9HSGQrGE');
-
-		$share = $this->createMock(IShare::class);
-		$share->method('getPassword')->willReturn(null);
-
-		$this->shareManager->expects($this->once())
-			->method('getShareByToken')
-			->with('GX9HSGQrGE')
-			->willReturn($share);
-
-		$result = self::invokePrivate($this->auth, 'checkToken');
-		$this->assertSame([true, 'principals/GX9HSGQrGE'], $result);
-	}
+    private ISession&MockObject $session;
+    private IRequest&MockObject $request;
+    private IManager&MockObject $shareManager;
+    private IThrottler&MockObject $throttler;
+    private LoggerInterface&MockObject $logger;
+    private IURLGenerator&MockObject $urlGenerator;
+    private PublicAuth $auth;
+
+    private bool|string $oldUser;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->session = $this->createMock(ISession::class);
+        $this->request = $this->createMock(IRequest::class);
+        $this->shareManager = $this->createMock(IManager::class);
+        $this->throttler = $this->createMock(IThrottler::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->urlGenerator = $this->createMock(IURLGenerator::class);
+
+        $this->auth = new PublicAuth(
+            $this->request,
+            $this->shareManager,
+            $this->session,
+            $this->throttler,
+            $this->logger,
+            $this->urlGenerator,
+        );
+
+        // Store current user
+        $this->oldUser = \OC_User::getUser();
+    }
+
+    protected function tearDown(): void {
+        \OC_User::setIncognitoMode(false);
+
+        // Set old user
+        \OC_User::setUserId($this->oldUser);
+        if ($this->oldUser !== false) {
+            \OC_Util::setupFS($this->oldUser);
+        }
+
+        parent::tearDown();
+    }
+
+    public function testGetToken(): void {
+        $this->request->method('getPathInfo')
+            ->willReturn('/dav/files/GX9HSGQrGE');
+
+        $result = self::invokePrivate($this->auth, 'getToken');
+
+        $this->assertSame('GX9HSGQrGE', $result);
+    }
+
+    public function testGetTokenInvalid(): void {
+        $this->request->method('getPathInfo')
+            ->willReturn('/dav/files');
+
+        $this->expectException(\Sabre\DAV\Exception\NotFound::class);
+        self::invokePrivate($this->auth, 'getToken');
+    }
+
+    public function testCheckTokenValidShare(): void {
+        $this->request->method('getPathInfo')
+            ->willReturn('/dav/files/GX9HSGQrGE');
+
+        $share = $this->createMock(IShare::class);
+        $share->method('getPassword')->willReturn(null);
+
+        $this->shareManager->expects($this->once())
+            ->method('getShareByToken')
+            ->with('GX9HSGQrGE')
+            ->willReturn($share);
+
+        $result = self::invokePrivate($this->auth, 'checkToken');
+        $this->assertSame([true, 'principals/GX9HSGQrGE'], $result);
+    }
 
-	public function testCheckTokenInvalidShare(): void {
-		$this->request->method('getPathInfo')
-			->willReturn('/dav/files/GX9HSGQrGE');
+    public function testCheckTokenInvalidShare(): void {
+        $this->request->method('getPathInfo')
+            ->willReturn('/dav/files/GX9HSGQrGE');
 
-		$this->shareManager
-			->expects($this->once())
-			->method('getShareByToken')
-			->with('GX9HSGQrGE')
-			->will($this->throwException(new ShareNotFound()));
-
-		$this->expectException(\Sabre\DAV\Exception\NotFound::class);
-		self::invokePrivate($this->auth, 'checkToken');
-	}
-
-	public function testCheckTokenAlreadyAuthenticated(): void {
-		$this->request->method('getPathInfo')
-			->willReturn('/dav/files/GX9HSGQrGE');
+        $this->shareManager
+            ->expects($this->once())
+            ->method('getShareByToken')
+            ->with('GX9HSGQrGE')
+            ->will($this->throwException(new ShareNotFound()));
+
+        $this->expectException(\Sabre\DAV\Exception\NotFound::class);
+        self::invokePrivate($this->auth, 'checkToken');
+    }
+
+    public function testCheckTokenAlreadyAuthenticated(): void {
+        $this->request->method('getPathInfo')
+            ->willReturn('/dav/files/GX9HSGQrGE');
 
-		$share = $this->createMock(IShare::class);
-		$share->method('getShareType')->willReturn(42);
+        $share = $this->createMock(IShare::class);
+        $share->method('getShareType')->willReturn(42);
 
-		$this->shareManager->expects($this->once())
-			->method('getShareByToken')
-			->with('GX9HSGQrGE')
-			->willReturn($share);
+        $this->shareManager->expects($this->once())
+            ->method('getShareByToken')
+            ->with('GX9HSGQrGE')
+            ->willReturn($share);
 
-		$this->session->method('exists')->with('public_link_authenticated')->willReturn(true);
-		$this->session->method('get')->with('public_link_authenticated')->willReturn('42');
+        $this->session->method('exists')->with('public_link_authenticated')->willReturn(true);
+        $this->session->method('get')->with('public_link_authenticated')->willReturn('42');
 
-		$result = self::invokePrivate($this->auth, 'checkToken');
-		$this->assertSame([true, 'principals/GX9HSGQrGE'], $result);
-	}
+        $result = self::invokePrivate($this->auth, 'checkToken');
+        $this->assertSame([true, 'principals/GX9HSGQrGE'], $result);
+    }
 
-	public function testCheckTokenPasswordNotAuthenticated(): void {
-		$this->request->method('getPathInfo')
-			->willReturn('/dav/files/GX9HSGQrGE');
+    public function testCheckTokenPasswordNotAuthenticated(): void {
+        $this->request->method('getPathInfo')
+            ->willReturn('/dav/files/GX9HSGQrGE');
 
-		$share = $this->createMock(IShare::class);
-		$share->method('getPassword')->willReturn('password');
-		$share->method('getShareType')->willReturn(42);
+        $share = $this->createMock(IShare::class);
+        $share->method('getPassword')->willReturn('password');
+        $share->method('getShareType')->willReturn(42);
 
-		$this->shareManager->expects($this->once())
-			->method('getShareByToken')
-			->with('GX9HSGQrGE')
-			->willReturn($share);
+        $this->shareManager->expects($this->once())
+            ->method('getShareByToken')
+            ->with('GX9HSGQrGE')
+            ->willReturn($share);
 
-		$this->session->method('exists')->with('public_link_authenticated')->willReturn(false);
+        $this->session->method('exists')->with('public_link_authenticated')->willReturn(false);
 
-		$this->expectException(\Sabre\DAV\Exception\NotAuthenticated::class);
-		self::invokePrivate($this->auth, 'checkToken');
-	}
+        $this->expectException(\Sabre\DAV\Exception\NotAuthenticated::class);
+        self::invokePrivate($this->auth, 'checkToken');
+    }
 
-	public function testCheckTokenPasswordAuthenticatedWrongShare(): void {
-		$this->request->method('getPathInfo')
-			->willReturn('/dav/files/GX9HSGQrGE');
+    public function testCheckTokenPasswordAuthenticatedWrongShare(): void {
+        $this->request->method('getPathInfo')
+            ->willReturn('/dav/files/GX9HSGQrGE');
 
-		$share = $this->createMock(IShare::class);
-		$share->method('getPassword')->willReturn('password');
-		$share->method('getShareType')->willReturn(42);
+        $share = $this->createMock(IShare::class);
+        $share->method('getPassword')->willReturn('password');
+        $share->method('getShareType')->willReturn(42);
 
-		$this->shareManager->expects($this->once())
-			->method('getShareByToken')
-			->with('GX9HSGQrGE')
-			->willReturn($share);
+        $this->shareManager->expects($this->once())
+            ->method('getShareByToken')
+            ->with('GX9HSGQrGE')
+            ->willReturn($share);
 
-		$this->session->method('exists')->with('public_link_authenticated')->willReturn(false);
-		$this->session->method('get')->with('public_link_authenticated')->willReturn('43');
+        $this->session->method('exists')->with('public_link_authenticated')->willReturn(false);
+        $this->session->method('get')->with('public_link_authenticated')->willReturn('43');
 
-		$this->expectException(\Sabre\DAV\Exception\NotAuthenticated::class);
-		self::invokePrivate($this->auth, 'checkToken');
-	}
+        $this->expectException(\Sabre\DAV\Exception\NotAuthenticated::class);
+        self::invokePrivate($this->auth, 'checkToken');
+    }
 
-	public function testNoShare(): void {
-		$this->request->method('getPathInfo')
-			->willReturn('/dav/files/GX9HSGQrGE');
+    public function testNoShare(): void {
+        $this->request->method('getPathInfo')
+            ->willReturn('/dav/files/GX9HSGQrGE');
 
-		$this->shareManager->expects($this->once())
-			->method('getShareByToken')
-			->with('GX9HSGQrGE')
-			->willThrowException(new ShareNotFound());
+        $this->shareManager->expects($this->once())
+            ->method('getShareByToken')
+            ->with('GX9HSGQrGE')
+            ->willThrowException(new ShareNotFound());
 
-		$result = self::invokePrivate($this->auth, 'validateUserPass', ['username', 'password']);
+        $result = self::invokePrivate($this->auth, 'validateUserPass', ['username', 'password']);
 
-		$this->assertFalse($result);
-	}
+        $this->assertFalse($result);
+    }
 
-	public function testShareNoPassword(): void {
-		$this->request->method('getPathInfo')
-			->willReturn('/dav/files/GX9HSGQrGE');
+    public function testShareNoPassword(): void {
+        $this->request->method('getPathInfo')
+            ->willReturn('/dav/files/GX9HSGQrGE');
 
-		$share = $this->createMock(IShare::class);
-		$share->method('getPassword')->willReturn(null);
+        $share = $this->createMock(IShare::class);
+        $share->method('getPassword')->willReturn(null);
 
-		$this->shareManager->expects($this->once())
-			->method('getShareByToken')
-			->with('GX9HSGQrGE')
-			->willReturn($share);
+        $this->shareManager->expects($this->once())
+            ->method('getShareByToken')
+            ->with('GX9HSGQrGE')
+            ->willReturn($share);
 
-		$result = self::invokePrivate($this->auth, 'validateUserPass', ['username', 'password']);
+        $result = self::invokePrivate($this->auth, 'validateUserPass', ['username', 'password']);
 
-		$this->assertTrue($result);
-	}
+        $this->assertTrue($result);
+    }
 
-	public function testSharePasswordFancyShareType(): void {
-		$this->request->method('getPathInfo')
-			->willReturn('/dav/files/GX9HSGQrGE');
+    public function testSharePasswordFancyShareType(): void {
+        $this->request->method('getPathInfo')
+            ->willReturn('/dav/files/GX9HSGQrGE');
 
-		$share = $this->createMock(IShare::class);
-		$share->method('getPassword')->willReturn('password');
-		$share->method('getShareType')->willReturn(42);
+        $share = $this->createMock(IShare::class);
+        $share->method('getPassword')->willReturn('password');
+        $share->method('getShareType')->willReturn(42);
 
-		$this->shareManager->expects($this->once())
-			->method('getShareByToken')
-			->with('GX9HSGQrGE')
-			->willReturn($share);
+        $this->shareManager->expects($this->once())
+            ->method('getShareByToken')
+            ->with('GX9HSGQrGE')
+            ->willReturn($share);
 
-		$result = self::invokePrivate($this->auth, 'validateUserPass', ['username', 'password']);
+        $result = self::invokePrivate($this->auth, 'validateUserPass', ['username', 'password']);
 
-		$this->assertFalse($result);
-	}
+        $this->assertFalse($result);
+    }
 
 
-	public function testSharePasswordRemote(): void {
-		$this->request->method('getPathInfo')
-			->willReturn('/dav/files/GX9HSGQrGE');
+    public function testSharePasswordRemote(): void {
+        $this->request->method('getPathInfo')
+            ->willReturn('/dav/files/GX9HSGQrGE');
 
-		$share = $this->createMock(IShare::class);
-		$share->method('getPassword')->willReturn('password');
-		$share->method('getShareType')->willReturn(IShare::TYPE_REMOTE);
+        $share = $this->createMock(IShare::class);
+        $share->method('getPassword')->willReturn('password');
+        $share->method('getShareType')->willReturn(IShare::TYPE_REMOTE);
 
-		$this->shareManager->expects($this->once())
-			->method('getShareByToken')
-			->with('GX9HSGQrGE')
-			->willReturn($share);
+        $this->shareManager->expects($this->once())
+            ->method('getShareByToken')
+            ->with('GX9HSGQrGE')
+            ->willReturn($share);
 
-		$result = self::invokePrivate($this->auth, 'validateUserPass', ['username', 'password']);
+        $result = self::invokePrivate($this->auth, 'validateUserPass', ['username', 'password']);
 
-		$this->assertTrue($result);
-	}
+        $this->assertTrue($result);
+    }
 
-	public function testSharePasswordLinkValidPassword(): void {
-		$this->request->method('getPathInfo')
-			->willReturn('/dav/files/GX9HSGQrGE');
+    public function testSharePasswordLinkValidPassword(): void {
+        $this->request->method('getPathInfo')
+            ->willReturn('/dav/files/GX9HSGQrGE');
 
-		$share = $this->createMock(IShare::class);
-		$share->method('getPassword')->willReturn('password');
-		$share->method('getShareType')->willReturn(IShare::TYPE_LINK);
+        $share = $this->createMock(IShare::class);
+        $share->method('getPassword')->willReturn('password');
+        $share->method('getShareType')->willReturn(IShare::TYPE_LINK);
 
-		$this->shareManager->expects($this->once())
-			->method('getShareByToken')
-			->with('GX9HSGQrGE')
-			->willReturn($share);
+        $this->shareManager->expects($this->once())
+            ->method('getShareByToken')
+            ->with('GX9HSGQrGE')
+            ->willReturn($share);
 
-		$this->shareManager->expects($this->once())
-			->method('checkPassword')->with(
-				$this->equalTo($share),
-				$this->equalTo('password')
-			)->willReturn(true);
+        $this->shareManager->expects($this->once())
+            ->method('checkPassword')->with(
+                $this->equalTo($share),
+                $this->equalTo('password')
+            )->willReturn(true);
 
-		$result = self::invokePrivate($this->auth, 'validateUserPass', ['username', 'password']);
+        $result = self::invokePrivate($this->auth, 'validateUserPass', ['username', 'password']);
 
-		$this->assertTrue($result);
-	}
+        $this->assertTrue($result);
+    }
 
-	public function testSharePasswordMailValidPassword(): void {
-		$this->request->method('getPathInfo')
-			->willReturn('/dav/files/GX9HSGQrGE');
+    public function testSharePasswordMailValidPassword(): void {
+        $this->request->method('getPathInfo')
+            ->willReturn('/dav/files/GX9HSGQrGE');
 
-		$share = $this->createMock(IShare::class);
-		$share->method('getPassword')->willReturn('password');
-		$share->method('getShareType')->willReturn(IShare::TYPE_EMAIL);
+        $share = $this->createMock(IShare::class);
+        $share->method('getPassword')->willReturn('password');
+        $share->method('getShareType')->willReturn(IShare::TYPE_EMAIL);
 
-		$this->shareManager->expects($this->once())
-			->method('getShareByToken')
-			->with('GX9HSGQrGE')
-			->willReturn($share);
+        $this->shareManager->expects($this->once())
+            ->method('getShareByToken')
+            ->with('GX9HSGQrGE')
+            ->willReturn($share);
 
-		$this->shareManager->expects($this->once())
-			->method('checkPassword')->with(
-				$this->equalTo($share),
-				$this->equalTo('password')
-			)->willReturn(true);
+        $this->shareManager->expects($this->once())
+            ->method('checkPassword')->with(
+                $this->equalTo($share),
+                $this->equalTo('password')
+            )->willReturn(true);
 
-		$result = self::invokePrivate($this->auth, 'validateUserPass', ['username', 'password']);
+        $result = self::invokePrivate($this->auth, 'validateUserPass', ['username', 'password']);
 
-		$this->assertTrue($result);
-	}
+        $this->assertTrue($result);
+    }
 
-	public function testInvalidSharePasswordLinkValidSession(): void {
-		$this->request->method('getPathInfo')
-			->willReturn('/dav/files/GX9HSGQrGE');
+    public function testInvalidSharePasswordLinkValidSession(): void {
+        $this->request->method('getPathInfo')
+            ->willReturn('/dav/files/GX9HSGQrGE');
 
-		$share = $this->createMock(IShare::class);
-		$share->method('getPassword')->willReturn('password');
-		$share->method('getShareType')->willReturn(IShare::TYPE_LINK);
-		$share->method('getId')->willReturn('42');
+        $share = $this->createMock(IShare::class);
+        $share->method('getPassword')->willReturn('password');
+        $share->method('getShareType')->willReturn(IShare::TYPE_LINK);
+        $share->method('getId')->willReturn('42');
 
-		$this->shareManager->expects($this->once())
-			->method('getShareByToken')
-			->with('GX9HSGQrGE')
-			->willReturn($share);
+        $this->shareManager->expects($this->once())
+            ->method('getShareByToken')
+            ->with('GX9HSGQrGE')
+            ->willReturn($share);
 
-		$this->shareManager->expects($this->once())
-			->method('checkPassword')
-			->with(
-				$this->equalTo($share),
-				$this->equalTo('password')
-			)->willReturn(false);
+        $this->shareManager->expects($this->once())
+            ->method('checkPassword')
+            ->with(
+                $this->equalTo($share),
+                $this->equalTo('password')
+            )->willReturn(false);
 
-		$this->session->method('exists')->with('public_link_authenticated')->willReturn(true);
-		$this->session->method('get')->with('public_link_authenticated')->willReturn('42');
+        $this->session->method('exists')->with('public_link_authenticated')->willReturn(true);
+        $this->session->method('get')->with('public_link_authenticated')->willReturn('42');
 
-		$result = self::invokePrivate($this->auth, 'validateUserPass', ['username', 'password']);
+        $result = self::invokePrivate($this->auth, 'validateUserPass', ['username', 'password']);
 
-		$this->assertTrue($result);
-	}
+        $this->assertTrue($result);
+    }
 
-	public function testSharePasswordLinkInvalidSession(): void {
-		$this->request->method('getPathInfo')
-			->willReturn('/dav/files/GX9HSGQrGE');
+    public function testSharePasswordLinkInvalidSession(): void {
+        $this->request->method('getPathInfo')
+            ->willReturn('/dav/files/GX9HSGQrGE');
 
-		$share = $this->createMock(IShare::class);
-		$share->method('getPassword')->willReturn('password');
-		$share->method('getShareType')->willReturn(IShare::TYPE_LINK);
-		$share->method('getId')->willReturn('42');
+        $share = $this->createMock(IShare::class);
+        $share->method('getPassword')->willReturn('password');
+        $share->method('getShareType')->willReturn(IShare::TYPE_LINK);
+        $share->method('getId')->willReturn('42');
 
-		$this->shareManager->expects($this->once())
-			->method('getShareByToken')
-			->with('GX9HSGQrGE')
-			->willReturn($share);
+        $this->shareManager->expects($this->once())
+            ->method('getShareByToken')
+            ->with('GX9HSGQrGE')
+            ->willReturn($share);
 
-		$this->shareManager->expects($this->once())
-			->method('checkPassword')
-			->with(
-				$this->equalTo($share),
-				$this->equalTo('password')
-			)->willReturn(false);
+        $this->shareManager->expects($this->once())
+            ->method('checkPassword')
+            ->with(
+                $this->equalTo($share),
+                $this->equalTo('password')
+            )->willReturn(false);
 
-		$this->session->method('exists')->with('public_link_authenticated')->willReturn(true);
-		$this->session->method('get')->with('public_link_authenticated')->willReturn('43');
+        $this->session->method('exists')->with('public_link_authenticated')->willReturn(true);
+        $this->session->method('get')->with('public_link_authenticated')->willReturn('43');
 
-		$result = self::invokePrivate($this->auth, 'validateUserPass', ['username', 'password']);
+        $result = self::invokePrivate($this->auth, 'validateUserPass', ['username', 'password']);
 
-		$this->assertFalse($result);
-	}
+        $this->assertFalse($result);
+    }
 
 
-	public function testSharePasswordMailInvalidSession(): void {
-		$this->request->method('getPathInfo')
-			->willReturn('/dav/files/GX9HSGQrGE');
+    public function testSharePasswordMailInvalidSession(): void {
+        $this->request->method('getPathInfo')
+            ->willReturn('/dav/files/GX9HSGQrGE');
 
-		$share = $this->createMock(IShare::class);
-		$share->method('getPassword')->willReturn('password');
-		$share->method('getShareType')->willReturn(IShare::TYPE_EMAIL);
-		$share->method('getId')->willReturn('42');
+        $share = $this->createMock(IShare::class);
+        $share->method('getPassword')->willReturn('password');
+        $share->method('getShareType')->willReturn(IShare::TYPE_EMAIL);
+        $share->method('getId')->willReturn('42');
 
-		$this->shareManager->expects($this->once())
-			->method('getShareByToken')
-			->with('GX9HSGQrGE')
-			->willReturn($share);
+        $this->shareManager->expects($this->once())
+            ->method('getShareByToken')
+            ->with('GX9HSGQrGE')
+            ->willReturn($share);
 
-		$this->shareManager->expects($this->once())
-			->method('checkPassword')
-			->with(
-				$this->equalTo($share),
-				$this->equalTo('password')
-			)->willReturn(false);
+        $this->shareManager->expects($this->once())
+            ->method('checkPassword')
+            ->with(
+                $this->equalTo($share),
+                $this->equalTo('password')
+            )->willReturn(false);
 
-		$this->session->method('exists')->with('public_link_authenticated')->willReturn(true);
-		$this->session->method('get')->with('public_link_authenticated')->willReturn('43');
+        $this->session->method('exists')->with('public_link_authenticated')->willReturn(true);
+        $this->session->method('get')->with('public_link_authenticated')->willReturn('43');
 
-		$result = self::invokePrivate($this->auth, 'validateUserPass', ['username', 'password']);
+        $result = self::invokePrivate($this->auth, 'validateUserPass', ['username', 'password']);
 
-		$this->assertFalse($result);
-	}
+        $this->assertFalse($result);
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 	private IURLGenerator&MockObject $urlGenerator;
 	private PublicAuth $auth;
 
-	private bool|string $oldUser;
+	private bool | string $oldUser;
 
 	protected function setUp(): void {
 		parent::setUp();

apps/dav/tests/unit/Connector/Sabre/NodeTest.php

Indentation +243 added lines, -243 removed lines

@@ -33,247 +33,247 @@
  * @package OCA\DAV\Tests\unit\Connector\Sabre
  */
 class NodeTest extends \Test\TestCase {
-	public static function davPermissionsProvider(): array {
-		return [
-			[Constants::PERMISSION_ALL, 'file', false, Constants::PERMISSION_ALL, false, 'test', 'RGDNVW'],
-			[Constants::PERMISSION_ALL, 'dir', false, Constants::PERMISSION_ALL, false, 'test', 'RGDNVCK'],
-			[Constants::PERMISSION_ALL, 'file', true, Constants::PERMISSION_ALL, false, 'test', 'SRGDNVW'],
-			[Constants::PERMISSION_ALL, 'file', true, Constants::PERMISSION_ALL, true, 'test', 'SRMGDNVW'],
-			[Constants::PERMISSION_ALL, 'file', true, Constants::PERMISSION_ALL, true, '' , 'SRMGDNVW'],
-			[Constants::PERMISSION_ALL, 'file', true, Constants::PERMISSION_ALL - Constants::PERMISSION_UPDATE, true, '' , 'SRMGDNV'],
-			[Constants::PERMISSION_ALL - Constants::PERMISSION_SHARE, 'file', true, Constants::PERMISSION_ALL, false, 'test', 'SGDNVW'],
-			[Constants::PERMISSION_ALL - Constants::PERMISSION_UPDATE, 'file', false, Constants::PERMISSION_ALL, false, 'test', 'RGD'],
-			[Constants::PERMISSION_ALL - Constants::PERMISSION_DELETE, 'file', false, Constants::PERMISSION_ALL, false, 'test', 'RGNVW'],
-			[Constants::PERMISSION_ALL - Constants::PERMISSION_CREATE, 'file', false, Constants::PERMISSION_ALL, false, 'test', 'RGDNVW'],
-			[Constants::PERMISSION_ALL - Constants::PERMISSION_READ, 'file', false, Constants::PERMISSION_ALL, false, 'test', 'RDNVW'],
-			[Constants::PERMISSION_ALL - Constants::PERMISSION_CREATE, 'dir', false, Constants::PERMISSION_ALL, false, 'test', 'RGDNV'],
-			[Constants::PERMISSION_ALL - Constants::PERMISSION_READ, 'dir', false, Constants::PERMISSION_ALL, false, 'test', 'RDNVCK'],
-		];
-	}
-
-	/**
-	 * @dataProvider davPermissionsProvider
-	 */
-	public function testDavPermissions(int $permissions, string $type, bool $shared, int $shareRootPermissions, bool $mounted, string $internalPath, string $expected): void {
-		$info = $this->getMockBuilder(FileInfo::class)
-			->disableOriginalConstructor()
-			->onlyMethods(['getPermissions', 'isShared', 'isMounted', 'getType', 'getInternalPath', 'getStorage', 'getMountPoint'])
-			->getMock();
-		$info->method('getPermissions')
-			->willReturn($permissions);
-		$info->method('isShared')
-			->willReturn($shared);
-		$info->method('isMounted')
-			->willReturn($mounted);
-		$info->method('getType')
-			->willReturn($type);
-		$info->method('getInternalPath')
-			->willReturn($internalPath);
-		$info->method('getMountPoint')
-			->willReturnCallback(function () use ($shared) {
-				if ($shared) {
-					return $this->createMock(SharedMount::class);
-				} else {
-					return $this->createMock(MountPoint::class);
-				}
-			});
-		$storage = $this->createMock(IStorage::class);
-		if ($shared) {
-			$storage->method('instanceOfStorage')
-				->willReturn(true);
-			$cache = $this->createMock(ICache::class);
-			$storage->method('getCache')
-				->willReturn($cache);
-			$shareRootEntry = $this->createMock(ICacheEntry::class);
-			$cache->method('get')
-				->willReturn($shareRootEntry);
-			$shareRootEntry->method('getPermissions')
-				->willReturn($shareRootPermissions);
-		} else {
-			$storage->method('instanceOfStorage')
-				->willReturn(false);
-		}
-		$info->method('getStorage')
-			->willReturn($storage);
-		$view = $this->createMock(View::class);
-
-		$node = new  File($view, $info);
-		$this->assertEquals($expected, $node->getDavPermissions());
-	}
-
-	public static function sharePermissionsProvider(): array {
-		return [
-			[\OCP\Files\FileInfo::TYPE_FILE, null, 1, 1],
-			[\OCP\Files\FileInfo::TYPE_FILE, null, 3, 3],
-			[\OCP\Files\FileInfo::TYPE_FILE, null, 5, 1],
-			[\OCP\Files\FileInfo::TYPE_FILE, null, 7, 3],
-			[\OCP\Files\FileInfo::TYPE_FILE, null, 9, 1],
-			[\OCP\Files\FileInfo::TYPE_FILE, null, 11, 3],
-			[\OCP\Files\FileInfo::TYPE_FILE, null, 13, 1],
-			[\OCP\Files\FileInfo::TYPE_FILE, null, 15, 3],
-			[\OCP\Files\FileInfo::TYPE_FILE, null, 17, 17],
-			[\OCP\Files\FileInfo::TYPE_FILE, null, 19, 19],
-			[\OCP\Files\FileInfo::TYPE_FILE, null, 21, 17],
-			[\OCP\Files\FileInfo::TYPE_FILE, null, 23, 19],
-			[\OCP\Files\FileInfo::TYPE_FILE, null, 25, 17],
-			[\OCP\Files\FileInfo::TYPE_FILE, null, 27, 19],
-			[\OCP\Files\FileInfo::TYPE_FILE, null, 29, 17],
-			[\OCP\Files\FileInfo::TYPE_FILE, null, 30, 18],
-			[\OCP\Files\FileInfo::TYPE_FILE, null, 31, 19],
-			[\OCP\Files\FileInfo::TYPE_FOLDER, null, 1, 1],
-			[\OCP\Files\FileInfo::TYPE_FOLDER, null, 3, 3],
-			[\OCP\Files\FileInfo::TYPE_FOLDER, null, 5, 5],
-			[\OCP\Files\FileInfo::TYPE_FOLDER, null, 7, 7],
-			[\OCP\Files\FileInfo::TYPE_FOLDER, null, 9, 9],
-			[\OCP\Files\FileInfo::TYPE_FOLDER, null, 11, 11],
-			[\OCP\Files\FileInfo::TYPE_FOLDER, null, 13, 13],
-			[\OCP\Files\FileInfo::TYPE_FOLDER, null, 15, 15],
-			[\OCP\Files\FileInfo::TYPE_FOLDER, null, 17, 17],
-			[\OCP\Files\FileInfo::TYPE_FOLDER, null, 19, 19],
-			[\OCP\Files\FileInfo::TYPE_FOLDER, null, 21, 21],
-			[\OCP\Files\FileInfo::TYPE_FOLDER, null, 23, 23],
-			[\OCP\Files\FileInfo::TYPE_FOLDER, null, 25, 25],
-			[\OCP\Files\FileInfo::TYPE_FOLDER, null, 27, 27],
-			[\OCP\Files\FileInfo::TYPE_FOLDER, null, 29, 29],
-			[\OCP\Files\FileInfo::TYPE_FOLDER, null, 30, 30],
-			[\OCP\Files\FileInfo::TYPE_FOLDER, null, 31, 31],
-			[\OCP\Files\FileInfo::TYPE_FOLDER, 'shareToken', 7, 7],
-		];
-	}
-
-	/**
-	 * @dataProvider sharePermissionsProvider
-	 */
-	public function testSharePermissions(string $type, ?string $user, int $permissions, int $expected): void {
-		$storage = $this->createMock(IStorage::class);
-		$storage->method('getPermissions')->willReturn($permissions);
-
-		$mountpoint = $this->createMock(IMountPoint::class);
-		$mountpoint->method('getMountPoint')->willReturn('myPath');
-		$shareManager = $this->createMock(IManager::class);
-		$share = $this->createMock(IShare::class);
-
-		if ($user === null) {
-			$shareManager->expects($this->never())->method('getShareByToken');
-			$share->expects($this->never())->method('getPermissions');
-		} else {
-			$shareManager->expects($this->once())->method('getShareByToken')->with($user)
-				->willReturn($share);
-			$share->expects($this->once())->method('getPermissions')->willReturn($permissions);
-		}
-
-		$info = $this->getMockBuilder(FileInfo::class)
-			->disableOriginalConstructor()
-			->onlyMethods(['getStorage', 'getType', 'getMountPoint', 'getPermissions'])
-			->getMock();
-
-		$info->method('getStorage')->willReturn($storage);
-		$info->method('getType')->willReturn($type);
-		$info->method('getMountPoint')->willReturn($mountpoint);
-		$info->method('getPermissions')->willReturn($permissions);
-
-		$view = $this->createMock(View::class);
-
-		$node = new File($view, $info);
-		$this->invokePrivate($node, 'shareManager', [$shareManager]);
-		$this->assertEquals($expected, $node->getSharePermissions($user));
-	}
-
-	public function testShareAttributes(): void {
-		$storage = $this->getMockBuilder(SharedStorage::class)
-			->disableOriginalConstructor()
-			->onlyMethods(['getShare'])
-			->getMock();
-
-		$shareManager = $this->createMock(IManager::class);
-		$share = $this->createMock(IShare::class);
-
-		$storage->expects($this->once())
-			->method('getShare')
-			->willReturn($share);
-
-		$attributes = new ShareAttributes();
-		$attributes->setAttribute('permissions', 'download', false);
-
-		$share->expects($this->once())->method('getAttributes')->willReturn($attributes);
-
-		/** @var Folder&MockObject $info */
-		$info = $this->getMockBuilder(Folder::class)
-			->disableOriginalConstructor()
-			->onlyMethods(['getStorage', 'getType'])
-			->getMock();
-
-		$info->method('getStorage')->willReturn($storage);
-		$info->method('getType')->willReturn(FileInfo::TYPE_FOLDER);
-
-		/** @var View&MockObject $view */
-		$view = $this->createMock(View::class);
-
-		$node = new File($view, $info);
-		$this->invokePrivate($node, 'shareManager', [$shareManager]);
-		$this->assertEquals($attributes->toArray(), $node->getShareAttributes());
-	}
-
-	public function testShareAttributesNonShare(): void {
-		$storage = $this->createMock(IStorage::class);
-		$shareManager = $this->createMock(IManager::class);
-
-		/** @var Folder&MockObject */
-		$info = $this->getMockBuilder(Folder::class)
-			->disableOriginalConstructor()
-			->onlyMethods(['getStorage', 'getType'])
-			->getMock();
-
-		$info->method('getStorage')->willReturn($storage);
-		$info->method('getType')->willReturn(FileInfo::TYPE_FOLDER);
-
-		/** @var View&MockObject */
-		$view = $this->createMock(View::class);
-
-		$node = new File($view, $info);
-		$this->invokePrivate($node, 'shareManager', [$shareManager]);
-		$this->assertEquals([], $node->getShareAttributes());
-	}
-
-	public static function sanitizeMtimeProvider(): array {
-		return [
-			[123456789, 123456789],
-			['987654321', 987654321],
-		];
-	}
-
-	/**
-	 * @dataProvider sanitizeMtimeProvider
-	 */
-	public function testSanitizeMtime(string|int $mtime, int $expected): void {
-		$view = $this->getMockBuilder(View::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$info = $this->getMockBuilder(FileInfo::class)
-			->disableOriginalConstructor()
-			->getMock();
-
-		$node = new File($view, $info);
-		$result = $this->invokePrivate($node, 'sanitizeMtime', [$mtime]);
-		$this->assertEquals($expected, $result);
-	}
-
-	public static function invalidSanitizeMtimeProvider(): array {
-		return [
-			[-1337], [0], ['abcdef'], ['-1337'], ['0'], [12321], [24 * 60 * 60 - 1],
-		];
-	}
-
-	/**
-	 * @dataProvider invalidSanitizeMtimeProvider
-	 */
-	public function testInvalidSanitizeMtime(int|string $mtime): void {
-		$this->expectException(\InvalidArgumentException::class);
-
-		$view = $this->createMock(View::class);
-		$info = $this->createMock(FileInfo::class);
-
-		$node = new File($view, $info);
-		self::invokePrivate($node, 'sanitizeMtime', [$mtime]);
-	}
+    public static function davPermissionsProvider(): array {
+        return [
+            [Constants::PERMISSION_ALL, 'file', false, Constants::PERMISSION_ALL, false, 'test', 'RGDNVW'],
+            [Constants::PERMISSION_ALL, 'dir', false, Constants::PERMISSION_ALL, false, 'test', 'RGDNVCK'],
+            [Constants::PERMISSION_ALL, 'file', true, Constants::PERMISSION_ALL, false, 'test', 'SRGDNVW'],
+            [Constants::PERMISSION_ALL, 'file', true, Constants::PERMISSION_ALL, true, 'test', 'SRMGDNVW'],
+            [Constants::PERMISSION_ALL, 'file', true, Constants::PERMISSION_ALL, true, '' , 'SRMGDNVW'],
+            [Constants::PERMISSION_ALL, 'file', true, Constants::PERMISSION_ALL - Constants::PERMISSION_UPDATE, true, '' , 'SRMGDNV'],
+            [Constants::PERMISSION_ALL - Constants::PERMISSION_SHARE, 'file', true, Constants::PERMISSION_ALL, false, 'test', 'SGDNVW'],
+            [Constants::PERMISSION_ALL - Constants::PERMISSION_UPDATE, 'file', false, Constants::PERMISSION_ALL, false, 'test', 'RGD'],
+            [Constants::PERMISSION_ALL - Constants::PERMISSION_DELETE, 'file', false, Constants::PERMISSION_ALL, false, 'test', 'RGNVW'],
+            [Constants::PERMISSION_ALL - Constants::PERMISSION_CREATE, 'file', false, Constants::PERMISSION_ALL, false, 'test', 'RGDNVW'],
+            [Constants::PERMISSION_ALL - Constants::PERMISSION_READ, 'file', false, Constants::PERMISSION_ALL, false, 'test', 'RDNVW'],
+            [Constants::PERMISSION_ALL - Constants::PERMISSION_CREATE, 'dir', false, Constants::PERMISSION_ALL, false, 'test', 'RGDNV'],
+            [Constants::PERMISSION_ALL - Constants::PERMISSION_READ, 'dir', false, Constants::PERMISSION_ALL, false, 'test', 'RDNVCK'],
+        ];
+    }
+
+    /**
+     * @dataProvider davPermissionsProvider
+     */
+    public function testDavPermissions(int $permissions, string $type, bool $shared, int $shareRootPermissions, bool $mounted, string $internalPath, string $expected): void {
+        $info = $this->getMockBuilder(FileInfo::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['getPermissions', 'isShared', 'isMounted', 'getType', 'getInternalPath', 'getStorage', 'getMountPoint'])
+            ->getMock();
+        $info->method('getPermissions')
+            ->willReturn($permissions);
+        $info->method('isShared')
+            ->willReturn($shared);
+        $info->method('isMounted')
+            ->willReturn($mounted);
+        $info->method('getType')
+            ->willReturn($type);
+        $info->method('getInternalPath')
+            ->willReturn($internalPath);
+        $info->method('getMountPoint')
+            ->willReturnCallback(function () use ($shared) {
+                if ($shared) {
+                    return $this->createMock(SharedMount::class);
+                } else {
+                    return $this->createMock(MountPoint::class);
+                }
+            });
+        $storage = $this->createMock(IStorage::class);
+        if ($shared) {
+            $storage->method('instanceOfStorage')
+                ->willReturn(true);
+            $cache = $this->createMock(ICache::class);
+            $storage->method('getCache')
+                ->willReturn($cache);
+            $shareRootEntry = $this->createMock(ICacheEntry::class);
+            $cache->method('get')
+                ->willReturn($shareRootEntry);
+            $shareRootEntry->method('getPermissions')
+                ->willReturn($shareRootPermissions);
+        } else {
+            $storage->method('instanceOfStorage')
+                ->willReturn(false);
+        }
+        $info->method('getStorage')
+            ->willReturn($storage);
+        $view = $this->createMock(View::class);
+
+        $node = new  File($view, $info);
+        $this->assertEquals($expected, $node->getDavPermissions());
+    }
+
+    public static function sharePermissionsProvider(): array {
+        return [
+            [\OCP\Files\FileInfo::TYPE_FILE, null, 1, 1],
+            [\OCP\Files\FileInfo::TYPE_FILE, null, 3, 3],
+            [\OCP\Files\FileInfo::TYPE_FILE, null, 5, 1],
+            [\OCP\Files\FileInfo::TYPE_FILE, null, 7, 3],
+            [\OCP\Files\FileInfo::TYPE_FILE, null, 9, 1],
+            [\OCP\Files\FileInfo::TYPE_FILE, null, 11, 3],
+            [\OCP\Files\FileInfo::TYPE_FILE, null, 13, 1],
+            [\OCP\Files\FileInfo::TYPE_FILE, null, 15, 3],
+            [\OCP\Files\FileInfo::TYPE_FILE, null, 17, 17],
+            [\OCP\Files\FileInfo::TYPE_FILE, null, 19, 19],
+            [\OCP\Files\FileInfo::TYPE_FILE, null, 21, 17],
+            [\OCP\Files\FileInfo::TYPE_FILE, null, 23, 19],
+            [\OCP\Files\FileInfo::TYPE_FILE, null, 25, 17],
+            [\OCP\Files\FileInfo::TYPE_FILE, null, 27, 19],
+            [\OCP\Files\FileInfo::TYPE_FILE, null, 29, 17],
+            [\OCP\Files\FileInfo::TYPE_FILE, null, 30, 18],
+            [\OCP\Files\FileInfo::TYPE_FILE, null, 31, 19],
+            [\OCP\Files\FileInfo::TYPE_FOLDER, null, 1, 1],
+            [\OCP\Files\FileInfo::TYPE_FOLDER, null, 3, 3],
+            [\OCP\Files\FileInfo::TYPE_FOLDER, null, 5, 5],
+            [\OCP\Files\FileInfo::TYPE_FOLDER, null, 7, 7],
+            [\OCP\Files\FileInfo::TYPE_FOLDER, null, 9, 9],
+            [\OCP\Files\FileInfo::TYPE_FOLDER, null, 11, 11],
+            [\OCP\Files\FileInfo::TYPE_FOLDER, null, 13, 13],
+            [\OCP\Files\FileInfo::TYPE_FOLDER, null, 15, 15],
+            [\OCP\Files\FileInfo::TYPE_FOLDER, null, 17, 17],
+            [\OCP\Files\FileInfo::TYPE_FOLDER, null, 19, 19],
+            [\OCP\Files\FileInfo::TYPE_FOLDER, null, 21, 21],
+            [\OCP\Files\FileInfo::TYPE_FOLDER, null, 23, 23],
+            [\OCP\Files\FileInfo::TYPE_FOLDER, null, 25, 25],
+            [\OCP\Files\FileInfo::TYPE_FOLDER, null, 27, 27],
+            [\OCP\Files\FileInfo::TYPE_FOLDER, null, 29, 29],
+            [\OCP\Files\FileInfo::TYPE_FOLDER, null, 30, 30],
+            [\OCP\Files\FileInfo::TYPE_FOLDER, null, 31, 31],
+            [\OCP\Files\FileInfo::TYPE_FOLDER, 'shareToken', 7, 7],
+        ];
+    }
+
+    /**
+     * @dataProvider sharePermissionsProvider
+     */
+    public function testSharePermissions(string $type, ?string $user, int $permissions, int $expected): void {
+        $storage = $this->createMock(IStorage::class);
+        $storage->method('getPermissions')->willReturn($permissions);
+
+        $mountpoint = $this->createMock(IMountPoint::class);
+        $mountpoint->method('getMountPoint')->willReturn('myPath');
+        $shareManager = $this->createMock(IManager::class);
+        $share = $this->createMock(IShare::class);
+
+        if ($user === null) {
+            $shareManager->expects($this->never())->method('getShareByToken');
+            $share->expects($this->never())->method('getPermissions');
+        } else {
+            $shareManager->expects($this->once())->method('getShareByToken')->with($user)
+                ->willReturn($share);
+            $share->expects($this->once())->method('getPermissions')->willReturn($permissions);
+        }
+
+        $info = $this->getMockBuilder(FileInfo::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['getStorage', 'getType', 'getMountPoint', 'getPermissions'])
+            ->getMock();
+
+        $info->method('getStorage')->willReturn($storage);
+        $info->method('getType')->willReturn($type);
+        $info->method('getMountPoint')->willReturn($mountpoint);
+        $info->method('getPermissions')->willReturn($permissions);
+
+        $view = $this->createMock(View::class);
+
+        $node = new File($view, $info);
+        $this->invokePrivate($node, 'shareManager', [$shareManager]);
+        $this->assertEquals($expected, $node->getSharePermissions($user));
+    }
+
+    public function testShareAttributes(): void {
+        $storage = $this->getMockBuilder(SharedStorage::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['getShare'])
+            ->getMock();
+
+        $shareManager = $this->createMock(IManager::class);
+        $share = $this->createMock(IShare::class);
+
+        $storage->expects($this->once())
+            ->method('getShare')
+            ->willReturn($share);
+
+        $attributes = new ShareAttributes();
+        $attributes->setAttribute('permissions', 'download', false);
+
+        $share->expects($this->once())->method('getAttributes')->willReturn($attributes);
+
+        /** @var Folder&MockObject $info */
+        $info = $this->getMockBuilder(Folder::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['getStorage', 'getType'])
+            ->getMock();
+
+        $info->method('getStorage')->willReturn($storage);
+        $info->method('getType')->willReturn(FileInfo::TYPE_FOLDER);
+
+        /** @var View&MockObject $view */
+        $view = $this->createMock(View::class);
+
+        $node = new File($view, $info);
+        $this->invokePrivate($node, 'shareManager', [$shareManager]);
+        $this->assertEquals($attributes->toArray(), $node->getShareAttributes());
+    }
+
+    public function testShareAttributesNonShare(): void {
+        $storage = $this->createMock(IStorage::class);
+        $shareManager = $this->createMock(IManager::class);
+
+        /** @var Folder&MockObject */
+        $info = $this->getMockBuilder(Folder::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['getStorage', 'getType'])
+            ->getMock();
+
+        $info->method('getStorage')->willReturn($storage);
+        $info->method('getType')->willReturn(FileInfo::TYPE_FOLDER);
+
+        /** @var View&MockObject */
+        $view = $this->createMock(View::class);
+
+        $node = new File($view, $info);
+        $this->invokePrivate($node, 'shareManager', [$shareManager]);
+        $this->assertEquals([], $node->getShareAttributes());
+    }
+
+    public static function sanitizeMtimeProvider(): array {
+        return [
+            [123456789, 123456789],
+            ['987654321', 987654321],
+        ];
+    }
+
+    /**
+     * @dataProvider sanitizeMtimeProvider
+     */
+    public function testSanitizeMtime(string|int $mtime, int $expected): void {
+        $view = $this->getMockBuilder(View::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $info = $this->getMockBuilder(FileInfo::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $node = new File($view, $info);
+        $result = $this->invokePrivate($node, 'sanitizeMtime', [$mtime]);
+        $this->assertEquals($expected, $result);
+    }
+
+    public static function invalidSanitizeMtimeProvider(): array {
+        return [
+            [-1337], [0], ['abcdef'], ['-1337'], ['0'], [12321], [24 * 60 * 60 - 1],
+        ];
+    }
+
+    /**
+     * @dataProvider invalidSanitizeMtimeProvider
+     */
+    public function testInvalidSanitizeMtime(int|string $mtime): void {
+        $this->expectException(\InvalidArgumentException::class);
+
+        $view = $this->createMock(View::class);
+        $info = $this->createMock(FileInfo::class);
+
+        $node = new File($view, $info);
+        self::invokePrivate($node, 'sanitizeMtime', [$mtime]);
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -39,8 +39,8 @@ 
 			[Constants::PERMISSION_ALL, 'dir', false, Constants::PERMISSION_ALL, false, 'test', 'RGDNVCK'],
 			[Constants::PERMISSION_ALL, 'file', true, Constants::PERMISSION_ALL, false, 'test', 'SRGDNVW'],
 			[Constants::PERMISSION_ALL, 'file', true, Constants::PERMISSION_ALL, true, 'test', 'SRMGDNVW'],
-			[Constants::PERMISSION_ALL, 'file', true, Constants::PERMISSION_ALL, true, '' , 'SRMGDNVW'],
-			[Constants::PERMISSION_ALL, 'file', true, Constants::PERMISSION_ALL - Constants::PERMISSION_UPDATE, true, '' , 'SRMGDNV'],
+			[Constants::PERMISSION_ALL, 'file', true, Constants::PERMISSION_ALL, true, '', 'SRMGDNVW'],
+			[Constants::PERMISSION_ALL, 'file', true, Constants::PERMISSION_ALL - Constants::PERMISSION_UPDATE, true, '', 'SRMGDNV'],
 			[Constants::PERMISSION_ALL - Constants::PERMISSION_SHARE, 'file', true, Constants::PERMISSION_ALL, false, 'test', 'SGDNVW'],
 			[Constants::PERMISSION_ALL - Constants::PERMISSION_UPDATE, 'file', false, Constants::PERMISSION_ALL, false, 'test', 'RGD'],
 			[Constants::PERMISSION_ALL - Constants::PERMISSION_DELETE, 'file', false, Constants::PERMISSION_ALL, false, 'test', 'RGNVW'],
@@ -70,7 +70,7 @@ 
 		$info->method('getInternalPath')
 			->willReturn($internalPath);
 		$info->method('getMountPoint')
-			->willReturnCallback(function () use ($shared) {
+			->willReturnCallback(function() use ($shared) {
 				if ($shared) {
 					return $this->createMock(SharedMount::class);
 				} else {
@@ -245,7 +245,7 @@ 
 	/**
 	 * @dataProvider sanitizeMtimeProvider
 	 */
-	public function testSanitizeMtime(string|int $mtime, int $expected): void {
+	public function testSanitizeMtime(string | int $mtime, int $expected): void {
 		$view = $this->getMockBuilder(View::class)
 			->disableOriginalConstructor()
 			->getMock();
@@ -267,7 +267,7 @@ 
 	/**
 	 * @dataProvider invalidSanitizeMtimeProvider
 	 */
-	public function testInvalidSanitizeMtime(int|string $mtime): void {
+	public function testInvalidSanitizeMtime(int | string $mtime): void {
 		$this->expectException(\InvalidArgumentException::class);
 
 		$view = $this->createMock(View::class);

apps/dav/tests/unit/Connector/Sabre/CommentsPropertiesPluginTest.php

Indentation +101 added lines, -101 removed lines

@@ -19,105 +19,105 @@
 use Sabre\DAV\Server;
 
 class CommentsPropertiesPluginTest extends \Test\TestCase {
-	protected CommentPropertiesPluginImplementation $plugin;
-	protected ICommentsManager&MockObject $commentsManager;
-	protected IUserSession&MockObject $userSession;
-	protected Server&MockObject $server;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->commentsManager = $this->createMock(ICommentsManager::class);
-		$this->userSession = $this->createMock(IUserSession::class);
-		$this->server = $this->createMock(Server::class);
-
-		$this->plugin = new CommentPropertiesPluginImplementation($this->commentsManager, $this->userSession);
-		$this->plugin->initialize($this->server);
-	}
-
-	public static function nodeProvider(): array {
-		return [
-			[File::class, true],
-			[Directory::class, true],
-			[\Sabre\DAV\INode::class, false]
-		];
-	}
-
-	/**
-	 * @dataProvider nodeProvider
-	 */
-	public function testHandleGetProperties(string $class, bool $expectedSuccessful): void {
-		$propFind = $this->createMock(PropFind::class);
-
-		if ($expectedSuccessful) {
-			$propFind->expects($this->exactly(3))
-				->method('handle');
-		} else {
-			$propFind->expects($this->never())
-				->method('handle');
-		}
-
-		$node = $this->createMock($class);
-		$this->plugin->handleGetProperties($propFind, $node);
-	}
-
-	public static function baseUriProvider(): array {
-		return [
-			['owncloud/remote.php/webdav/', '4567', 'owncloud/remote.php/dav/comments/files/4567'],
-			['owncloud/remote.php/files/', '4567', 'owncloud/remote.php/dav/comments/files/4567'],
-			['owncloud/wicked.php/files/', '4567', null]
-		];
-	}
-
-	/**
-	 * @dataProvider baseUriProvider
-	 */
-	public function testGetCommentsLink(string $baseUri, string $fid, ?string $expectedHref): void {
-		$node = $this->createMock(File::class);
-		$node->expects($this->any())
-			->method('getId')
-			->willReturn($fid);
-
-		$this->server->expects($this->once())
-			->method('getBaseUri')
-			->willReturn($baseUri);
-
-		$href = $this->plugin->getCommentsLink($node);
-		$this->assertSame($expectedHref, $href);
-	}
-
-	public static function userProvider(): array {
-		return [
-			[IUser::class],
-			[null]
-		];
-	}
-
-	/**
-	 * @dataProvider userProvider
-	 */
-	public function testGetUnreadCount(?string $user): void {
-		$node = $this->createMock(File::class);
-		$node->expects($this->any())
-			->method('getId')
-			->willReturn('4567');
-
-		if ($user !== null) {
-			$user = $this->createMock($user);
-		}
-		$this->userSession->expects($this->once())
-			->method('getUser')
-			->willReturn($user);
-
-		$this->commentsManager->expects($this->any())
-			->method('getNumberOfCommentsForObject')
-			->willReturn(42);
-
-		$unread = $this->plugin->getUnreadCount($node);
-		if (is_null($user)) {
-			$this->assertNull($unread);
-		} else {
-			$this->assertSame($unread, 42);
-		}
-	}
+    protected CommentPropertiesPluginImplementation $plugin;
+    protected ICommentsManager&MockObject $commentsManager;
+    protected IUserSession&MockObject $userSession;
+    protected Server&MockObject $server;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->commentsManager = $this->createMock(ICommentsManager::class);
+        $this->userSession = $this->createMock(IUserSession::class);
+        $this->server = $this->createMock(Server::class);
+
+        $this->plugin = new CommentPropertiesPluginImplementation($this->commentsManager, $this->userSession);
+        $this->plugin->initialize($this->server);
+    }
+
+    public static function nodeProvider(): array {
+        return [
+            [File::class, true],
+            [Directory::class, true],
+            [\Sabre\DAV\INode::class, false]
+        ];
+    }
+
+    /**
+     * @dataProvider nodeProvider
+     */
+    public function testHandleGetProperties(string $class, bool $expectedSuccessful): void {
+        $propFind = $this->createMock(PropFind::class);
+
+        if ($expectedSuccessful) {
+            $propFind->expects($this->exactly(3))
+                ->method('handle');
+        } else {
+            $propFind->expects($this->never())
+                ->method('handle');
+        }
+
+        $node = $this->createMock($class);
+        $this->plugin->handleGetProperties($propFind, $node);
+    }
+
+    public static function baseUriProvider(): array {
+        return [
+            ['owncloud/remote.php/webdav/', '4567', 'owncloud/remote.php/dav/comments/files/4567'],
+            ['owncloud/remote.php/files/', '4567', 'owncloud/remote.php/dav/comments/files/4567'],
+            ['owncloud/wicked.php/files/', '4567', null]
+        ];
+    }
+
+    /**
+     * @dataProvider baseUriProvider
+     */
+    public function testGetCommentsLink(string $baseUri, string $fid, ?string $expectedHref): void {
+        $node = $this->createMock(File::class);
+        $node->expects($this->any())
+            ->method('getId')
+            ->willReturn($fid);
+
+        $this->server->expects($this->once())
+            ->method('getBaseUri')
+            ->willReturn($baseUri);
+
+        $href = $this->plugin->getCommentsLink($node);
+        $this->assertSame($expectedHref, $href);
+    }
+
+    public static function userProvider(): array {
+        return [
+            [IUser::class],
+            [null]
+        ];
+    }
+
+    /**
+     * @dataProvider userProvider
+     */
+    public function testGetUnreadCount(?string $user): void {
+        $node = $this->createMock(File::class);
+        $node->expects($this->any())
+            ->method('getId')
+            ->willReturn('4567');
+
+        if ($user !== null) {
+            $user = $this->createMock($user);
+        }
+        $this->userSession->expects($this->once())
+            ->method('getUser')
+            ->willReturn($user);
+
+        $this->commentsManager->expects($this->any())
+            ->method('getNumberOfCommentsForObject')
+            ->willReturn(42);
+
+        $unread = $this->plugin->getUnreadCount($node);
+        if (is_null($user)) {
+            $this->assertNull($unread);
+        } else {
+            $this->assertSame($unread, 42);
+        }
+    }
 }

apps/dav/tests/unit/Connector/Sabre/TagsPluginTest.php

Indentation +386 added lines, -386 removed lines

@@ -23,390 +23,390 @@
 use Sabre\DAV\Tree;
 
 class TagsPluginTest extends \Test\TestCase {
-	public const TAGS_PROPERTYNAME = TagsPlugin::TAGS_PROPERTYNAME;
-	public const FAVORITE_PROPERTYNAME = TagsPlugin::FAVORITE_PROPERTYNAME;
-	public const TAG_FAVORITE = TagsPlugin::TAG_FAVORITE;
-
-	private \Sabre\DAV\Server $server;
-	private Tree&MockObject $tree;
-	private ITagManager&MockObject $tagManager;
-	private ITags&MockObject $tagger;
-	private IEventDispatcher&MockObject $eventDispatcher;
-	private IUserSession&MockObject $userSession;
-	private TagsPlugin $plugin;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->server = new \Sabre\DAV\Server();
-		$this->tree = $this->createMock(Tree::class);
-		$this->tagger = $this->createMock(ITags::class);
-		$this->tagManager = $this->createMock(ITagManager::class);
-		$this->eventDispatcher = $this->createMock(IEventDispatcher::class);
-		$user = $this->createMock(IUser::class);
-
-		$this->userSession = $this->createMock(IUserSession::class);
-		$this->userSession->expects($this->any())
-			->method('getUser')
-			->withAnyParameters()
-			->willReturn($user);
-		$this->tagManager->expects($this->any())
-			->method('load')
-			->with('files')
-			->willReturn($this->tagger);
-		$this->plugin = new TagsPlugin($this->tree, $this->tagManager, $this->eventDispatcher, $this->userSession);
-		$this->plugin->initialize($this->server);
-	}
-
-	/**
-	 * @dataProvider tagsGetPropertiesDataProvider
-	 */
-	public function testGetProperties(array $tags, array $requestedProperties, array $expectedProperties): void {
-		$node = $this->createMock(Node::class);
-		$node->expects($this->any())
-			->method('getId')
-			->willReturn(123);
-
-		$expectedCallCount = 0;
-		if (count($requestedProperties) > 0) {
-			$expectedCallCount = 1;
-		}
-
-		$this->tagger->expects($this->exactly($expectedCallCount))
-			->method('getTagsForObjects')
-			->with($this->equalTo([123]))
-			->willReturn([123 => $tags]);
-
-		$propFind = new \Sabre\DAV\PropFind(
-			'/dummyPath',
-			$requestedProperties,
-			0
-		);
-
-		$this->plugin->handleGetProperties(
-			$propFind,
-			$node
-		);
-
-		$result = $propFind->getResultForMultiStatus();
-
-		$this->assertEmpty($result[404]);
-		unset($result[404]);
-		$this->assertEquals($expectedProperties, $result);
-	}
-
-	/**
-	 * @dataProvider tagsGetPropertiesDataProvider
-	 */
-	public function testPreloadThenGetProperties(array $tags, array $requestedProperties, array $expectedProperties): void {
-		$node1 = $this->createMock(File::class);
-		$node1->expects($this->any())
-			->method('getId')
-			->willReturn(111);
-		$node2 = $this->createMock(File::class);
-		$node2->expects($this->any())
-			->method('getId')
-			->willReturn(222);
-
-		$expectedCallCount = 0;
-		if (count($requestedProperties) > 0) {
-			// this guarantees that getTagsForObjects
-			// is only called once and then the tags
-			// are cached
-			$expectedCallCount = 1;
-		}
-
-		$node = $this->createMock(Directory::class);
-		$node->expects($this->any())
-			->method('getId')
-			->willReturn(123);
-		$node->expects($this->exactly($expectedCallCount))
-			->method('getChildren')
-			->willReturn([$node1, $node2]);
-
-		$this->tagger->expects($this->exactly($expectedCallCount))
-			->method('getTagsForObjects')
-			->with($this->equalTo([123, 111, 222]))
-			->willReturn(
-				[
-					111 => $tags,
-					123 => $tags
-				]
-			);
-
-		// simulate sabre recursive PROPFIND traversal
-		$propFindRoot = new \Sabre\DAV\PropFind(
-			'/subdir',
-			$requestedProperties,
-			1
-		);
-		$propFind1 = new \Sabre\DAV\PropFind(
-			'/subdir/test.txt',
-			$requestedProperties,
-			0
-		);
-		$propFind2 = new \Sabre\DAV\PropFind(
-			'/subdir/test2.txt',
-			$requestedProperties,
-			0
-		);
-
-		$this->plugin->handleGetProperties(
-			$propFindRoot,
-			$node
-		);
-		$this->plugin->handleGetProperties(
-			$propFind1,
-			$node1
-		);
-		$this->plugin->handleGetProperties(
-			$propFind2,
-			$node2
-		);
-
-		$result = $propFind1->getResultForMultiStatus();
-
-		$this->assertEmpty($result[404]);
-		unset($result[404]);
-		$this->assertEquals($expectedProperties, $result);
-	}
-
-	public static function tagsGetPropertiesDataProvider(): array {
-		return [
-			// request both, receive both
-			[
-				['tag1', 'tag2', self::TAG_FAVORITE],
-				[self::TAGS_PROPERTYNAME, self::FAVORITE_PROPERTYNAME],
-				[
-					200 => [
-						self::TAGS_PROPERTYNAME => new TagList(['tag1', 'tag2']),
-						self::FAVORITE_PROPERTYNAME => true,
-					]
-				]
-			],
-			// request tags alone
-			[
-				['tag1', 'tag2', self::TAG_FAVORITE],
-				[self::TAGS_PROPERTYNAME],
-				[
-					200 => [
-						self::TAGS_PROPERTYNAME => new TagList(['tag1', 'tag2']),
-					]
-				]
-			],
-			// request fav alone
-			[
-				['tag1', 'tag2', self::TAG_FAVORITE],
-				[self::FAVORITE_PROPERTYNAME],
-				[
-					200 => [
-						self::FAVORITE_PROPERTYNAME => true,
-					]
-				]
-			],
-			// request none
-			[
-				['tag1', 'tag2', self::TAG_FAVORITE],
-				[],
-				[
-					200 => []
-				],
-			],
-			// request both with none set, receive both
-			[
-				[],
-				[self::TAGS_PROPERTYNAME, self::FAVORITE_PROPERTYNAME],
-				[
-					200 => [
-						self::TAGS_PROPERTYNAME => new TagList([]),
-						self::FAVORITE_PROPERTYNAME => false,
-					]
-				]
-			],
-		];
-	}
-
-	public function testGetPropertiesSkipChunks(): void {
-		$sabreNode = $this->createMock(UploadFile::class);
-
-		$propFind = new \Sabre\DAV\PropFind(
-			'/dummyPath',
-			[self::TAGS_PROPERTYNAME, self::TAG_FAVORITE],
-			0
-		);
-
-		$this->plugin->handleGetProperties(
-			$propFind,
-			$sabreNode
-		);
-
-		$result = $propFind->getResultForMultiStatus();
-		$this->assertCount(2, $result[404]);
-	}
-
-	public function testUpdateTags(): void {
-		// this test will replace the existing tags "tagremove" with "tag1" and "tag2"
-		// and keep "tagkeep"
-		$node = $this->createMock(Node::class);
-		$node->expects($this->any())
-			->method('getId')
-			->willReturn(123);
-
-		$this->tree->expects($this->any())
-			->method('getNodeForPath')
-			->with('/dummypath')
-			->willReturn($node);
-
-		$this->tagger->expects($this->once())
-			->method('getTagsForObjects')
-			->with($this->equalTo([123]))
-			->willReturn([123 => ['tagkeep', 'tagremove', self::TAG_FAVORITE]]);
-
-		// then tag as tag1 and tag2
-		$calls = [
-			[123, 'tag1'],
-			[123, 'tag2'],
-		];
-		$this->tagger->expects($this->exactly(count($calls)))
-			->method('tagAs')
-			->willReturnCallback(function () use (&$calls) {
-				$expected = array_shift($calls);
-				$this->assertEquals($expected, func_get_args());
-			});
-
-		// it will untag tag3
-		$this->tagger->expects($this->once())
-			->method('unTag')
-			->with(123, 'tagremove');
-
-		// properties to set
-		$propPatch = new \Sabre\DAV\PropPatch([
-			self::TAGS_PROPERTYNAME => new TagList(['tag1', 'tag2', 'tagkeep'])
-		]);
-
-		$this->plugin->handleUpdateProperties(
-			'/dummypath',
-			$propPatch
-		);
-
-		$propPatch->commit();
-
-		// all requested properties removed, as they were processed already
-		$this->assertEmpty($propPatch->getRemainingMutations());
-
-		$result = $propPatch->getResult();
-		$this->assertEquals(200, $result[self::TAGS_PROPERTYNAME]);
-		$this->assertArrayNotHasKey(self::FAVORITE_PROPERTYNAME, $result);
-	}
-
-	public function testUpdateTagsFromScratch(): void {
-		$node = $this->createMock(Node::class);
-		$node->expects($this->any())
-			->method('getId')
-			->willReturn(123);
-
-		$this->tree->expects($this->any())
-			->method('getNodeForPath')
-			->with('/dummypath')
-			->willReturn($node);
-
-		$this->tagger->expects($this->once())
-			->method('getTagsForObjects')
-			->with($this->equalTo([123]))
-			->willReturn([]);
-
-		// then tag as tag1 and tag2
-		$calls = [
-			[123, 'tag1'],
-			[123, 'tag2'],
-		];
-		$this->tagger->expects($this->exactly(count($calls)))
-			->method('tagAs')
-			->willReturnCallback(function () use (&$calls) {
-				$expected = array_shift($calls);
-				$this->assertEquals($expected, func_get_args());
-			});
-
-		// properties to set
-		$propPatch = new \Sabre\DAV\PropPatch([
-			self::TAGS_PROPERTYNAME => new TagList(['tag1', 'tag2'])
-		]);
-
-		$this->plugin->handleUpdateProperties(
-			'/dummypath',
-			$propPatch
-		);
-
-		$propPatch->commit();
-
-		// all requested properties removed, as they were processed already
-		$this->assertEmpty($propPatch->getRemainingMutations());
-
-		$result = $propPatch->getResult();
-		$this->assertEquals(200, $result[self::TAGS_PROPERTYNAME]);
-		$this->assertArrayNotHasKey(self::FAVORITE_PROPERTYNAME, $result);
-	}
-
-	public function testUpdateFav(): void {
-		// this test will replace the existing tags "tagremove" with "tag1" and "tag2"
-		// and keep "tagkeep"
-		$node = $this->createMock(Node::class);
-		$node->expects($this->any())
-			->method('getId')
-			->willReturn(123);
-
-		$this->tree->expects($this->any())
-			->method('getNodeForPath')
-			->with('/dummypath')
-			->willReturn($node);
-
-		// set favorite tag
-		$this->tagger->expects($this->once())
-			->method('tagAs')
-			->with(123, self::TAG_FAVORITE);
-
-		// properties to set
-		$propPatch = new \Sabre\DAV\PropPatch([
-			self::FAVORITE_PROPERTYNAME => true
-		]);
-
-		$this->plugin->handleUpdateProperties(
-			'/dummypath',
-			$propPatch
-		);
-
-		$propPatch->commit();
-
-		// all requested properties removed, as they were processed already
-		$this->assertEmpty($propPatch->getRemainingMutations());
-
-		$result = $propPatch->getResult();
-		$this->assertArrayNotHasKey(self::TAGS_PROPERTYNAME, $result);
-		$this->assertEquals(200, $result[self::FAVORITE_PROPERTYNAME]);
-
-		// unfavorite now
-		// set favorite tag
-		$this->tagger->expects($this->once())
-			->method('unTag')
-			->with(123, self::TAG_FAVORITE);
-
-		// properties to set
-		$propPatch = new \Sabre\DAV\PropPatch([
-			self::FAVORITE_PROPERTYNAME => false
-		]);
-
-		$this->plugin->handleUpdateProperties(
-			'/dummypath',
-			$propPatch
-		);
-
-		$propPatch->commit();
-
-		// all requested properties removed, as they were processed already
-		$this->assertEmpty($propPatch->getRemainingMutations());
-
-		$result = $propPatch->getResult();
-		$this->assertArrayNotHasKey(self::TAGS_PROPERTYNAME, $result);
-		$this->assertEquals(200, $result[self::FAVORITE_PROPERTYNAME]);
-	}
+    public const TAGS_PROPERTYNAME = TagsPlugin::TAGS_PROPERTYNAME;
+    public const FAVORITE_PROPERTYNAME = TagsPlugin::FAVORITE_PROPERTYNAME;
+    public const TAG_FAVORITE = TagsPlugin::TAG_FAVORITE;
+
+    private \Sabre\DAV\Server $server;
+    private Tree&MockObject $tree;
+    private ITagManager&MockObject $tagManager;
+    private ITags&MockObject $tagger;
+    private IEventDispatcher&MockObject $eventDispatcher;
+    private IUserSession&MockObject $userSession;
+    private TagsPlugin $plugin;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->server = new \Sabre\DAV\Server();
+        $this->tree = $this->createMock(Tree::class);
+        $this->tagger = $this->createMock(ITags::class);
+        $this->tagManager = $this->createMock(ITagManager::class);
+        $this->eventDispatcher = $this->createMock(IEventDispatcher::class);
+        $user = $this->createMock(IUser::class);
+
+        $this->userSession = $this->createMock(IUserSession::class);
+        $this->userSession->expects($this->any())
+            ->method('getUser')
+            ->withAnyParameters()
+            ->willReturn($user);
+        $this->tagManager->expects($this->any())
+            ->method('load')
+            ->with('files')
+            ->willReturn($this->tagger);
+        $this->plugin = new TagsPlugin($this->tree, $this->tagManager, $this->eventDispatcher, $this->userSession);
+        $this->plugin->initialize($this->server);
+    }
+
+    /**
+     * @dataProvider tagsGetPropertiesDataProvider
+     */
+    public function testGetProperties(array $tags, array $requestedProperties, array $expectedProperties): void {
+        $node = $this->createMock(Node::class);
+        $node->expects($this->any())
+            ->method('getId')
+            ->willReturn(123);
+
+        $expectedCallCount = 0;
+        if (count($requestedProperties) > 0) {
+            $expectedCallCount = 1;
+        }
+
+        $this->tagger->expects($this->exactly($expectedCallCount))
+            ->method('getTagsForObjects')
+            ->with($this->equalTo([123]))
+            ->willReturn([123 => $tags]);
+
+        $propFind = new \Sabre\DAV\PropFind(
+            '/dummyPath',
+            $requestedProperties,
+            0
+        );
+
+        $this->plugin->handleGetProperties(
+            $propFind,
+            $node
+        );
+
+        $result = $propFind->getResultForMultiStatus();
+
+        $this->assertEmpty($result[404]);
+        unset($result[404]);
+        $this->assertEquals($expectedProperties, $result);
+    }
+
+    /**
+     * @dataProvider tagsGetPropertiesDataProvider
+     */
+    public function testPreloadThenGetProperties(array $tags, array $requestedProperties, array $expectedProperties): void {
+        $node1 = $this->createMock(File::class);
+        $node1->expects($this->any())
+            ->method('getId')
+            ->willReturn(111);
+        $node2 = $this->createMock(File::class);
+        $node2->expects($this->any())
+            ->method('getId')
+            ->willReturn(222);
+
+        $expectedCallCount = 0;
+        if (count($requestedProperties) > 0) {
+            // this guarantees that getTagsForObjects
+            // is only called once and then the tags
+            // are cached
+            $expectedCallCount = 1;
+        }
+
+        $node = $this->createMock(Directory::class);
+        $node->expects($this->any())
+            ->method('getId')
+            ->willReturn(123);
+        $node->expects($this->exactly($expectedCallCount))
+            ->method('getChildren')
+            ->willReturn([$node1, $node2]);
+
+        $this->tagger->expects($this->exactly($expectedCallCount))
+            ->method('getTagsForObjects')
+            ->with($this->equalTo([123, 111, 222]))
+            ->willReturn(
+                [
+                    111 => $tags,
+                    123 => $tags
+                ]
+            );
+
+        // simulate sabre recursive PROPFIND traversal
+        $propFindRoot = new \Sabre\DAV\PropFind(
+            '/subdir',
+            $requestedProperties,
+            1
+        );
+        $propFind1 = new \Sabre\DAV\PropFind(
+            '/subdir/test.txt',
+            $requestedProperties,
+            0
+        );
+        $propFind2 = new \Sabre\DAV\PropFind(
+            '/subdir/test2.txt',
+            $requestedProperties,
+            0
+        );
+
+        $this->plugin->handleGetProperties(
+            $propFindRoot,
+            $node
+        );
+        $this->plugin->handleGetProperties(
+            $propFind1,
+            $node1
+        );
+        $this->plugin->handleGetProperties(
+            $propFind2,
+            $node2
+        );
+
+        $result = $propFind1->getResultForMultiStatus();
+
+        $this->assertEmpty($result[404]);
+        unset($result[404]);
+        $this->assertEquals($expectedProperties, $result);
+    }
+
+    public static function tagsGetPropertiesDataProvider(): array {
+        return [
+            // request both, receive both
+            [
+                ['tag1', 'tag2', self::TAG_FAVORITE],
+                [self::TAGS_PROPERTYNAME, self::FAVORITE_PROPERTYNAME],
+                [
+                    200 => [
+                        self::TAGS_PROPERTYNAME => new TagList(['tag1', 'tag2']),
+                        self::FAVORITE_PROPERTYNAME => true,
+                    ]
+                ]
+            ],
+            // request tags alone
+            [
+                ['tag1', 'tag2', self::TAG_FAVORITE],
+                [self::TAGS_PROPERTYNAME],
+                [
+                    200 => [
+                        self::TAGS_PROPERTYNAME => new TagList(['tag1', 'tag2']),
+                    ]
+                ]
+            ],
+            // request fav alone
+            [
+                ['tag1', 'tag2', self::TAG_FAVORITE],
+                [self::FAVORITE_PROPERTYNAME],
+                [
+                    200 => [
+                        self::FAVORITE_PROPERTYNAME => true,
+                    ]
+                ]
+            ],
+            // request none
+            [
+                ['tag1', 'tag2', self::TAG_FAVORITE],
+                [],
+                [
+                    200 => []
+                ],
+            ],
+            // request both with none set, receive both
+            [
+                [],
+                [self::TAGS_PROPERTYNAME, self::FAVORITE_PROPERTYNAME],
+                [
+                    200 => [
+                        self::TAGS_PROPERTYNAME => new TagList([]),
+                        self::FAVORITE_PROPERTYNAME => false,
+                    ]
+                ]
+            ],
+        ];
+    }
+
+    public function testGetPropertiesSkipChunks(): void {
+        $sabreNode = $this->createMock(UploadFile::class);
+
+        $propFind = new \Sabre\DAV\PropFind(
+            '/dummyPath',
+            [self::TAGS_PROPERTYNAME, self::TAG_FAVORITE],
+            0
+        );
+
+        $this->plugin->handleGetProperties(
+            $propFind,
+            $sabreNode
+        );
+
+        $result = $propFind->getResultForMultiStatus();
+        $this->assertCount(2, $result[404]);
+    }
+
+    public function testUpdateTags(): void {
+        // this test will replace the existing tags "tagremove" with "tag1" and "tag2"
+        // and keep "tagkeep"
+        $node = $this->createMock(Node::class);
+        $node->expects($this->any())
+            ->method('getId')
+            ->willReturn(123);
+
+        $this->tree->expects($this->any())
+            ->method('getNodeForPath')
+            ->with('/dummypath')
+            ->willReturn($node);
+
+        $this->tagger->expects($this->once())
+            ->method('getTagsForObjects')
+            ->with($this->equalTo([123]))
+            ->willReturn([123 => ['tagkeep', 'tagremove', self::TAG_FAVORITE]]);
+
+        // then tag as tag1 and tag2
+        $calls = [
+            [123, 'tag1'],
+            [123, 'tag2'],
+        ];
+        $this->tagger->expects($this->exactly(count($calls)))
+            ->method('tagAs')
+            ->willReturnCallback(function () use (&$calls) {
+                $expected = array_shift($calls);
+                $this->assertEquals($expected, func_get_args());
+            });
+
+        // it will untag tag3
+        $this->tagger->expects($this->once())
+            ->method('unTag')
+            ->with(123, 'tagremove');
+
+        // properties to set
+        $propPatch = new \Sabre\DAV\PropPatch([
+            self::TAGS_PROPERTYNAME => new TagList(['tag1', 'tag2', 'tagkeep'])
+        ]);
+
+        $this->plugin->handleUpdateProperties(
+            '/dummypath',
+            $propPatch
+        );
+
+        $propPatch->commit();
+
+        // all requested properties removed, as they were processed already
+        $this->assertEmpty($propPatch->getRemainingMutations());
+
+        $result = $propPatch->getResult();
+        $this->assertEquals(200, $result[self::TAGS_PROPERTYNAME]);
+        $this->assertArrayNotHasKey(self::FAVORITE_PROPERTYNAME, $result);
+    }
+
+    public function testUpdateTagsFromScratch(): void {
+        $node = $this->createMock(Node::class);
+        $node->expects($this->any())
+            ->method('getId')
+            ->willReturn(123);
+
+        $this->tree->expects($this->any())
+            ->method('getNodeForPath')
+            ->with('/dummypath')
+            ->willReturn($node);
+
+        $this->tagger->expects($this->once())
+            ->method('getTagsForObjects')
+            ->with($this->equalTo([123]))
+            ->willReturn([]);
+
+        // then tag as tag1 and tag2
+        $calls = [
+            [123, 'tag1'],
+            [123, 'tag2'],
+        ];
+        $this->tagger->expects($this->exactly(count($calls)))
+            ->method('tagAs')
+            ->willReturnCallback(function () use (&$calls) {
+                $expected = array_shift($calls);
+                $this->assertEquals($expected, func_get_args());
+            });
+
+        // properties to set
+        $propPatch = new \Sabre\DAV\PropPatch([
+            self::TAGS_PROPERTYNAME => new TagList(['tag1', 'tag2'])
+        ]);
+
+        $this->plugin->handleUpdateProperties(
+            '/dummypath',
+            $propPatch
+        );
+
+        $propPatch->commit();
+
+        // all requested properties removed, as they were processed already
+        $this->assertEmpty($propPatch->getRemainingMutations());
+
+        $result = $propPatch->getResult();
+        $this->assertEquals(200, $result[self::TAGS_PROPERTYNAME]);
+        $this->assertArrayNotHasKey(self::FAVORITE_PROPERTYNAME, $result);
+    }
+
+    public function testUpdateFav(): void {
+        // this test will replace the existing tags "tagremove" with "tag1" and "tag2"
+        // and keep "tagkeep"
+        $node = $this->createMock(Node::class);
+        $node->expects($this->any())
+            ->method('getId')
+            ->willReturn(123);
+
+        $this->tree->expects($this->any())
+            ->method('getNodeForPath')
+            ->with('/dummypath')
+            ->willReturn($node);
+
+        // set favorite tag
+        $this->tagger->expects($this->once())
+            ->method('tagAs')
+            ->with(123, self::TAG_FAVORITE);
+
+        // properties to set
+        $propPatch = new \Sabre\DAV\PropPatch([
+            self::FAVORITE_PROPERTYNAME => true
+        ]);
+
+        $this->plugin->handleUpdateProperties(
+            '/dummypath',
+            $propPatch
+        );
+
+        $propPatch->commit();
+
+        // all requested properties removed, as they were processed already
+        $this->assertEmpty($propPatch->getRemainingMutations());
+
+        $result = $propPatch->getResult();
+        $this->assertArrayNotHasKey(self::TAGS_PROPERTYNAME, $result);
+        $this->assertEquals(200, $result[self::FAVORITE_PROPERTYNAME]);
+
+        // unfavorite now
+        // set favorite tag
+        $this->tagger->expects($this->once())
+            ->method('unTag')
+            ->with(123, self::TAG_FAVORITE);
+
+        // properties to set
+        $propPatch = new \Sabre\DAV\PropPatch([
+            self::FAVORITE_PROPERTYNAME => false
+        ]);
+
+        $this->plugin->handleUpdateProperties(
+            '/dummypath',
+            $propPatch
+        );
+
+        $propPatch->commit();
+
+        // all requested properties removed, as they were processed already
+        $this->assertEmpty($propPatch->getRemainingMutations());
+
+        $result = $propPatch->getResult();
+        $this->assertArrayNotHasKey(self::TAGS_PROPERTYNAME, $result);
+        $this->assertEquals(200, $result[self::FAVORITE_PROPERTYNAME]);
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -269,7 +269,7 @@ 
 		];
 		$this->tagger->expects($this->exactly(count($calls)))
 			->method('tagAs')
-			->willReturnCallback(function () use (&$calls) {
+			->willReturnCallback(function() use (&$calls) {
 				$expected = array_shift($calls);
 				$this->assertEquals($expected, func_get_args());
 			});
@@ -322,7 +322,7 @@ 
 		];
 		$this->tagger->expects($this->exactly(count($calls)))
 			->method('tagAs')
-			->willReturnCallback(function () use (&$calls) {
+			->willReturnCallback(function() use (&$calls) {
 				$expected = array_shift($calls);
 				$this->assertEquals($expected, func_get_args());
 			});

apps/dav/tests/unit/Connector/Sabre/DummyGetResponsePluginTest.php

Indentation +34 added lines, -34 removed lines

@@ -20,38 +20,38 @@
  * @package OCA\DAV\Tests\unit\Connector\Sabre
  */
 class DummyGetResponsePluginTest extends TestCase {
-	private DummyGetResponsePlugin $dummyGetResponsePlugin;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->dummyGetResponsePlugin = new DummyGetResponsePlugin();
-	}
-
-	public function testInitialize(): void {
-		$server = $this->createMock(Server::class);
-		$server
-			->expects($this->once())
-			->method('on')
-			->with('method:GET', [$this->dummyGetResponsePlugin, 'httpGet'], 200);
-
-		$this->dummyGetResponsePlugin->initialize($server);
-	}
-
-
-	public function testHttpGet(): void {
-		/** @var \Sabre\HTTP\RequestInterface $request */
-		$request = $this->createMock(RequestInterface::class);
-		/** @var \Sabre\HTTP\ResponseInterface $response */
-		$response = $this->createMock(ResponseInterface::class);
-		$response
-			->expects($this->once())
-			->method('setBody');
-		$response
-			->expects($this->once())
-			->method('setStatus')
-			->with(200);
-
-		$this->assertSame(false, $this->dummyGetResponsePlugin->httpGet($request, $response));
-	}
+    private DummyGetResponsePlugin $dummyGetResponsePlugin;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->dummyGetResponsePlugin = new DummyGetResponsePlugin();
+    }
+
+    public function testInitialize(): void {
+        $server = $this->createMock(Server::class);
+        $server
+            ->expects($this->once())
+            ->method('on')
+            ->with('method:GET', [$this->dummyGetResponsePlugin, 'httpGet'], 200);
+
+        $this->dummyGetResponsePlugin->initialize($server);
+    }
+
+
+    public function testHttpGet(): void {
+        /** @var \Sabre\HTTP\RequestInterface $request */
+        $request = $this->createMock(RequestInterface::class);
+        /** @var \Sabre\HTTP\ResponseInterface $response */
+        $response = $this->createMock(ResponseInterface::class);
+        $response
+            ->expects($this->once())
+            ->method('setBody');
+        $response
+            ->expects($this->once())
+            ->method('setStatus')
+            ->with(200);
+
+        $this->assertSame(false, $this->dummyGetResponsePlugin->httpGet($request, $response));
+    }
 }

apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php

Indentation +218 added lines, -218 removed lines

@@ -28,222 +28,222 @@
  * @package OCA\DAV\Tests\Unit\Connector\Sabre
  */
 class ObjectTreeTest extends \Test\TestCase {
-	public static function copyDataProvider(): array {
-		return [
-			// copy into same dir
-			['a', 'b', ''],
-			// copy into same dir
-			['a/a', 'a/b', 'a'],
-			// copy into another dir
-			['a', 'sub/a', 'sub'],
-		];
-	}
-
-	/**
-	 * @dataProvider copyDataProvider
-	 */
-	public function testCopy(string $sourcePath, string $targetPath, string $targetParent): void {
-		$view = $this->createMock(View::class);
-		$view->expects($this->once())
-			->method('verifyPath')
-			->with($targetParent);
-		$view->expects($this->once())
-			->method('file_exists')
-			->with($targetPath)
-			->willReturn(false);
-		$view->expects($this->once())
-			->method('copy')
-			->with($sourcePath, $targetPath)
-			->willReturn(true);
-
-		$info = $this->createMock(FileInfo::class);
-		$info->expects($this->once())
-			->method('isCreatable')
-			->willReturn(true);
-
-		$view->expects($this->once())
-			->method('getFileInfo')
-			->with($targetParent === '' ? '.' : $targetParent)
-			->willReturn($info);
-
-		$rootDir = new Directory($view, $info);
-		$objectTree = $this->getMockBuilder(ObjectTree::class)
-			->onlyMethods(['nodeExists', 'getNodeForPath'])
-			->setConstructorArgs([$rootDir, $view])
-			->getMock();
-
-		$objectTree->expects($this->once())
-			->method('getNodeForPath')
-			->with($this->identicalTo($sourcePath))
-			->willReturn(false);
-
-		/** @var ObjectTree $objectTree */
-		$mountManager = Filesystem::getMountManager();
-		$objectTree->init($rootDir, $view, $mountManager);
-		$objectTree->copy($sourcePath, $targetPath);
-	}
-
-	/**
-	 * @dataProvider copyDataProvider
-	 */
-	public function testCopyFailNotCreatable($sourcePath, $targetPath, $targetParent): void {
-		$this->expectException(\Sabre\DAV\Exception\Forbidden::class);
-
-		$view = $this->createMock(View::class);
-		$view->expects($this->never())
-			->method('verifyPath');
-		$view->expects($this->once())
-			->method('file_exists')
-			->with($targetPath)
-			->willReturn(false);
-		$view->expects($this->never())
-			->method('copy');
-
-		$info = $this->createMock(FileInfo::class);
-		$info->expects($this->once())
-			->method('isCreatable')
-			->willReturn(false);
-
-		$view->expects($this->once())
-			->method('getFileInfo')
-			->with($targetParent === '' ? '.' : $targetParent)
-			->willReturn($info);
-
-		$rootDir = new Directory($view, $info);
-		$objectTree = $this->getMockBuilder(ObjectTree::class)
-			->onlyMethods(['nodeExists', 'getNodeForPath'])
-			->setConstructorArgs([$rootDir, $view])
-			->getMock();
-
-		$objectTree->expects($this->never())
-			->method('getNodeForPath');
-
-		/** @var ObjectTree $objectTree */
-		$mountManager = Filesystem::getMountManager();
-		$objectTree->init($rootDir, $view, $mountManager);
-		$objectTree->copy($sourcePath, $targetPath);
-	}
-
-	/**
-	 * @dataProvider nodeForPathProvider
-	 */
-	public function testGetNodeForPath(
-		string $inputFileName,
-		string $fileInfoQueryPath,
-		string $outputFileName,
-		string $type,
-	): void {
-		$rootNode = $this->createMock(Directory::class);
-		$mountManager = $this->createMock(Manager::class);
-		$view = $this->createMock(View::class);
-		$fileInfo = $this->createMock(FileInfo::class);
-		$fileInfo->method('getType')
-			->willReturn($type);
-		$fileInfo->method('getName')
-			->willReturn($outputFileName);
-		$fileInfo->method('getStorage')
-			->willReturn($this->createMock(Common::class));
-
-		$view->method('getFileInfo')
-			->with($fileInfoQueryPath)
-			->willReturn($fileInfo);
-
-		$tree = new ObjectTree();
-		$tree->init($rootNode, $view, $mountManager);
-
-		$node = $tree->getNodeForPath($inputFileName);
-
-		$this->assertNotNull($node);
-		$this->assertEquals($outputFileName, $node->getName());
-
-		if ($type === 'file') {
-			$this->assertInstanceOf(File::class, $node);
-		} else {
-			$this->assertInstanceOf(Directory::class, $node);
-		}
-	}
-
-	public static function nodeForPathProvider(): array {
-		return [
-			// regular file
-			[
-				'regularfile.txt',
-				'regularfile.txt',
-				'regularfile.txt',
-				'file',
-			],
-			// regular directory
-			[
-				'regulardir',
-				'regulardir',
-				'regulardir',
-				'dir',
-			],
-			// regular file in subdir
-			[
-				'subdir/regularfile.txt',
-				'subdir/regularfile.txt',
-				'regularfile.txt',
-				'file',
-			],
-			// regular directory in subdir
-			[
-				'subdir/regulardir',
-				'subdir/regulardir',
-				'regulardir',
-				'dir',
-			],
-		];
-	}
-
-
-	public function testGetNodeForPathInvalidPath(): void {
-		$this->expectException(InvalidPath::class);
-
-		$path = '/foo\bar';
-
-
-		$storage = new Temporary([]);
-
-		$view = $this->getMockBuilder(View::class)
-			->onlyMethods(['resolvePath'])
-			->getMock();
-		$view->expects($this->once())
-			->method('resolvePath')
-			->willReturnCallback(function ($path) use ($storage) {
-				return [$storage, ltrim($path, '/')];
-			});
-
-		$rootNode = $this->createMock(Directory::class);
-		$mountManager = $this->createMock(IMountManager::class);
-
-		$tree = new ObjectTree();
-		$tree->init($rootNode, $view, $mountManager);
-
-		$tree->getNodeForPath($path);
-	}
-
-	public function testGetNodeForPathRoot(): void {
-		$path = '/';
-
-
-		$storage = new Temporary([]);
-
-		$view = $this->getMockBuilder(View::class)
-			->onlyMethods(['resolvePath'])
-			->getMock();
-		$view->expects($this->any())
-			->method('resolvePath')
-			->willReturnCallback(function ($path) use ($storage) {
-				return [$storage, ltrim($path, '/')];
-			});
-
-		$rootNode = $this->createMock(Directory::class);
-		$mountManager = $this->createMock(IMountManager::class);
-
-		$tree = new ObjectTree();
-		$tree->init($rootNode, $view, $mountManager);
-
-		$this->assertInstanceOf('\Sabre\DAV\INode', $tree->getNodeForPath($path));
-	}
+    public static function copyDataProvider(): array {
+        return [
+            // copy into same dir
+            ['a', 'b', ''],
+            // copy into same dir
+            ['a/a', 'a/b', 'a'],
+            // copy into another dir
+            ['a', 'sub/a', 'sub'],
+        ];
+    }
+
+    /**
+     * @dataProvider copyDataProvider
+     */
+    public function testCopy(string $sourcePath, string $targetPath, string $targetParent): void {
+        $view = $this->createMock(View::class);
+        $view->expects($this->once())
+            ->method('verifyPath')
+            ->with($targetParent);
+        $view->expects($this->once())
+            ->method('file_exists')
+            ->with($targetPath)
+            ->willReturn(false);
+        $view->expects($this->once())
+            ->method('copy')
+            ->with($sourcePath, $targetPath)
+            ->willReturn(true);
+
+        $info = $this->createMock(FileInfo::class);
+        $info->expects($this->once())
+            ->method('isCreatable')
+            ->willReturn(true);
+
+        $view->expects($this->once())
+            ->method('getFileInfo')
+            ->with($targetParent === '' ? '.' : $targetParent)
+            ->willReturn($info);
+
+        $rootDir = new Directory($view, $info);
+        $objectTree = $this->getMockBuilder(ObjectTree::class)
+            ->onlyMethods(['nodeExists', 'getNodeForPath'])
+            ->setConstructorArgs([$rootDir, $view])
+            ->getMock();
+
+        $objectTree->expects($this->once())
+            ->method('getNodeForPath')
+            ->with($this->identicalTo($sourcePath))
+            ->willReturn(false);
+
+        /** @var ObjectTree $objectTree */
+        $mountManager = Filesystem::getMountManager();
+        $objectTree->init($rootDir, $view, $mountManager);
+        $objectTree->copy($sourcePath, $targetPath);
+    }
+
+    /**
+     * @dataProvider copyDataProvider
+     */
+    public function testCopyFailNotCreatable($sourcePath, $targetPath, $targetParent): void {
+        $this->expectException(\Sabre\DAV\Exception\Forbidden::class);
+
+        $view = $this->createMock(View::class);
+        $view->expects($this->never())
+            ->method('verifyPath');
+        $view->expects($this->once())
+            ->method('file_exists')
+            ->with($targetPath)
+            ->willReturn(false);
+        $view->expects($this->never())
+            ->method('copy');
+
+        $info = $this->createMock(FileInfo::class);
+        $info->expects($this->once())
+            ->method('isCreatable')
+            ->willReturn(false);
+
+        $view->expects($this->once())
+            ->method('getFileInfo')
+            ->with($targetParent === '' ? '.' : $targetParent)
+            ->willReturn($info);
+
+        $rootDir = new Directory($view, $info);
+        $objectTree = $this->getMockBuilder(ObjectTree::class)
+            ->onlyMethods(['nodeExists', 'getNodeForPath'])
+            ->setConstructorArgs([$rootDir, $view])
+            ->getMock();
+
+        $objectTree->expects($this->never())
+            ->method('getNodeForPath');
+
+        /** @var ObjectTree $objectTree */
+        $mountManager = Filesystem::getMountManager();
+        $objectTree->init($rootDir, $view, $mountManager);
+        $objectTree->copy($sourcePath, $targetPath);
+    }
+
+    /**
+     * @dataProvider nodeForPathProvider
+     */
+    public function testGetNodeForPath(
+        string $inputFileName,
+        string $fileInfoQueryPath,
+        string $outputFileName,
+        string $type,
+    ): void {
+        $rootNode = $this->createMock(Directory::class);
+        $mountManager = $this->createMock(Manager::class);
+        $view = $this->createMock(View::class);
+        $fileInfo = $this->createMock(FileInfo::class);
+        $fileInfo->method('getType')
+            ->willReturn($type);
+        $fileInfo->method('getName')
+            ->willReturn($outputFileName);
+        $fileInfo->method('getStorage')
+            ->willReturn($this->createMock(Common::class));
+
+        $view->method('getFileInfo')
+            ->with($fileInfoQueryPath)
+            ->willReturn($fileInfo);
+
+        $tree = new ObjectTree();
+        $tree->init($rootNode, $view, $mountManager);
+
+        $node = $tree->getNodeForPath($inputFileName);
+
+        $this->assertNotNull($node);
+        $this->assertEquals($outputFileName, $node->getName());
+
+        if ($type === 'file') {
+            $this->assertInstanceOf(File::class, $node);
+        } else {
+            $this->assertInstanceOf(Directory::class, $node);
+        }
+    }
+
+    public static function nodeForPathProvider(): array {
+        return [
+            // regular file
+            [
+                'regularfile.txt',
+                'regularfile.txt',
+                'regularfile.txt',
+                'file',
+            ],
+            // regular directory
+            [
+                'regulardir',
+                'regulardir',
+                'regulardir',
+                'dir',
+            ],
+            // regular file in subdir
+            [
+                'subdir/regularfile.txt',
+                'subdir/regularfile.txt',
+                'regularfile.txt',
+                'file',
+            ],
+            // regular directory in subdir
+            [
+                'subdir/regulardir',
+                'subdir/regulardir',
+                'regulardir',
+                'dir',
+            ],
+        ];
+    }
+
+
+    public function testGetNodeForPathInvalidPath(): void {
+        $this->expectException(InvalidPath::class);
+
+        $path = '/foo\bar';
+
+
+        $storage = new Temporary([]);
+
+        $view = $this->getMockBuilder(View::class)
+            ->onlyMethods(['resolvePath'])
+            ->getMock();
+        $view->expects($this->once())
+            ->method('resolvePath')
+            ->willReturnCallback(function ($path) use ($storage) {
+                return [$storage, ltrim($path, '/')];
+            });
+
+        $rootNode = $this->createMock(Directory::class);
+        $mountManager = $this->createMock(IMountManager::class);
+
+        $tree = new ObjectTree();
+        $tree->init($rootNode, $view, $mountManager);
+
+        $tree->getNodeForPath($path);
+    }
+
+    public function testGetNodeForPathRoot(): void {
+        $path = '/';
+
+
+        $storage = new Temporary([]);
+
+        $view = $this->getMockBuilder(View::class)
+            ->onlyMethods(['resolvePath'])
+            ->getMock();
+        $view->expects($this->any())
+            ->method('resolvePath')
+            ->willReturnCallback(function ($path) use ($storage) {
+                return [$storage, ltrim($path, '/')];
+            });
+
+        $rootNode = $this->createMock(Directory::class);
+        $mountManager = $this->createMock(IMountManager::class);
+
+        $tree = new ObjectTree();
+        $tree->init($rootNode, $view, $mountManager);
+
+        $this->assertInstanceOf('\Sabre\DAV\INode', $tree->getNodeForPath($path));
+    }
 }

apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php

Indentation +260 added lines, -260 removed lines

@@ -22,264 +22,264 @@
 use Sabre\DAV\Tree;
 
 class SharesPluginTest extends \Test\TestCase {
-	public const SHARETYPES_PROPERTYNAME = SharesPlugin::SHARETYPES_PROPERTYNAME;
-
-	private \Sabre\DAV\Server $server;
-	private \Sabre\DAV\Tree&MockObject $tree;
-	private \OCP\Share\IManager&MockObject $shareManager;
-	private Folder&MockObject $userFolder;
-	private SharesPlugin $plugin;
-
-	protected function setUp(): void {
-		parent::setUp();
-		$this->server = new \Sabre\DAV\Server();
-		$this->tree = $this->createMock(Tree::class);
-		$this->shareManager = $this->createMock(IManager::class);
-		$user = $this->createMock(IUser::class);
-		$user->expects($this->once())
-			->method('getUID')
-			->willReturn('user1');
-		$userSession = $this->createMock(IUserSession::class);
-		$userSession->expects($this->once())
-			->method('getUser')
-			->willReturn($user);
-		$this->userFolder = $this->createMock(Folder::class);
-
-		$this->plugin = new SharesPlugin(
-			$this->tree,
-			$userSession,
-			$this->userFolder,
-			$this->shareManager
-		);
-		$this->plugin->initialize($this->server);
-	}
-
-	/**
-	 * @dataProvider sharesGetPropertiesDataProvider
-	 */
-	public function testGetProperties(array $shareTypes): void {
-		$sabreNode = $this->createMock(Node::class);
-		$sabreNode->expects($this->any())
-			->method('getId')
-			->willReturn(123);
-		$sabreNode->expects($this->any())
-			->method('getPath')
-			->willReturn('/subdir');
-
-		// node API nodes
-		$node = $this->createMock(Folder::class);
-
-		$sabreNode->method('getNode')
-			->willReturn($node);
-
-		$this->shareManager->expects($this->any())
-			->method('getSharesBy')
-			->with(
-				$this->equalTo('user1'),
-				$this->anything(),
-				$this->equalTo($node),
-				$this->equalTo(false),
-				$this->equalTo(-1)
-			)
-			->willReturnCallback(function ($userId, $requestedShareType, $node, $flag, $limit) use ($shareTypes) {
-				if (in_array($requestedShareType, $shareTypes)) {
-					$share = $this->createMock(IShare::class);
-					$share->method('getShareType')
-						->willReturn($requestedShareType);
-					return [$share];
-				}
-				return [];
-			});
-
-		$this->shareManager->expects($this->any())
-			->method('getSharedWith')
-			->with(
-				$this->equalTo('user1'),
-				$this->anything(),
-				$this->equalTo($node),
-				$this->equalTo(-1)
-			)
-			->willReturn([]);
-
-		$propFind = new \Sabre\DAV\PropFind(
-			'/dummyPath',
-			[self::SHARETYPES_PROPERTYNAME],
-			0
-		);
-
-		$this->plugin->handleGetProperties(
-			$propFind,
-			$sabreNode
-		);
-
-		$result = $propFind->getResultForMultiStatus();
-
-		$this->assertEmpty($result[404]);
-		unset($result[404]);
-		$this->assertEquals($shareTypes, $result[200][self::SHARETYPES_PROPERTYNAME]->getShareTypes());
-	}
-
-	/**
-	 * @dataProvider sharesGetPropertiesDataProvider
-	 */
-	public function testPreloadThenGetProperties(array $shareTypes): void {
-		$sabreNode1 = $this->createMock(File::class);
-		$sabreNode1->method('getId')
-			->willReturn(111);
-		$sabreNode2 = $this->createMock(File::class);
-		$sabreNode2->method('getId')
-			->willReturn(222);
-		$sabreNode2->method('getPath')
-			->willReturn('/subdir/foo');
-
-		$sabreNode = $this->createMock(Directory::class);
-		$sabreNode->method('getId')
-			->willReturn(123);
-		// never, because we use getDirectoryListing from the Node API instead
-		$sabreNode->expects($this->never())
-			->method('getChildren');
-		$sabreNode->expects($this->any())
-			->method('getPath')
-			->willReturn('/subdir');
-
-		// node API nodes
-		$node = $this->createMock(Folder::class);
-		$node->method('getId')
-			->willReturn(123);
-		$node1 = $this->createMock(\OC\Files\Node\File::class);
-		$node1->method('getId')
-			->willReturn(111);
-		$node2 = $this->createMock(\OC\Files\Node\File::class);
-		$node2->method('getId')
-			->willReturn(222);
-
-		$sabreNode->method('getNode')
-			->willReturn($node);
-		$sabreNode1->method('getNode')
-			->willReturn($node1);
-		$sabreNode2->method('getNode')
-			->willReturn($node2);
-
-		$dummyShares = array_map(function ($type) {
-			$share = $this->createMock(IShare::class);
-			$share->expects($this->any())
-				->method('getShareType')
-				->willReturn($type);
-			return $share;
-		}, $shareTypes);
-
-		$this->shareManager->expects($this->any())
-			->method('getSharesBy')
-			->with(
-				$this->equalTo('user1'),
-				$this->anything(),
-				$this->anything(),
-				$this->equalTo(false),
-				$this->equalTo(-1)
-			)
-			->willReturnCallback(function ($userId, $requestedShareType, $node, $flag, $limit) use ($shareTypes, $dummyShares) {
-				if ($node->getId() === 111 && in_array($requestedShareType, $shareTypes)) {
-					foreach ($dummyShares as $dummyShare) {
-						if ($dummyShare->getShareType() === $requestedShareType) {
-							return [$dummyShare];
-						}
-					}
-				}
-
-				return [];
-			});
-
-		$this->shareManager->expects($this->any())
-			->method('getSharedWith')
-			->with(
-				$this->equalTo('user1'),
-				$this->anything(),
-				$this->equalTo($node),
-				$this->equalTo(-1)
-			)
-			->willReturn([]);
-
-		$this->shareManager->expects($this->any())
-			->method('getSharesInFolder')
-			->with(
-				$this->equalTo('user1'),
-				$this->anything(),
-				$this->equalTo(true)
-			)
-			->willReturnCallback(function ($userId, $node, $flag) use ($shareTypes, $dummyShares) {
-				return [111 => $dummyShares];
-			});
-
-		// simulate sabre recursive PROPFIND traversal
-		$propFindRoot = new \Sabre\DAV\PropFind(
-			'/subdir',
-			[self::SHARETYPES_PROPERTYNAME],
-			1
-		);
-		$propFind1 = new \Sabre\DAV\PropFind(
-			'/subdir/test.txt',
-			[self::SHARETYPES_PROPERTYNAME],
-			0
-		);
-		$propFind2 = new \Sabre\DAV\PropFind(
-			'/subdir/test2.txt',
-			[self::SHARETYPES_PROPERTYNAME],
-			0
-		);
-
-		$this->plugin->handleGetProperties(
-			$propFindRoot,
-			$sabreNode
-		);
-		$this->plugin->handleGetProperties(
-			$propFind1,
-			$sabreNode1
-		);
-		$this->plugin->handleGetProperties(
-			$propFind2,
-			$sabreNode2
-		);
-
-		$result = $propFind1->getResultForMultiStatus();
-
-		$this->assertEmpty($result[404]);
-		unset($result[404]);
-		$this->assertEquals($shareTypes, $result[200][self::SHARETYPES_PROPERTYNAME]->getShareTypes());
-	}
-
-	public static function sharesGetPropertiesDataProvider(): array {
-		return [
-			[[]],
-			[[IShare::TYPE_USER]],
-			[[IShare::TYPE_GROUP]],
-			[[IShare::TYPE_LINK]],
-			[[IShare::TYPE_REMOTE]],
-			[[IShare::TYPE_ROOM]],
-			[[IShare::TYPE_DECK]],
-			[[IShare::TYPE_SCIENCEMESH]],
-			[[IShare::TYPE_USER, IShare::TYPE_GROUP]],
-			[[IShare::TYPE_USER, IShare::TYPE_GROUP, IShare::TYPE_LINK]],
-			[[IShare::TYPE_USER, IShare::TYPE_LINK]],
-			[[IShare::TYPE_GROUP, IShare::TYPE_LINK]],
-			[[IShare::TYPE_USER, IShare::TYPE_REMOTE]],
-		];
-	}
-
-	public function testGetPropertiesSkipChunks(): void {
-		$sabreNode = $this->createMock(UploadFile::class);
-
-		$propFind = new \Sabre\DAV\PropFind(
-			'/dummyPath',
-			[self::SHARETYPES_PROPERTYNAME],
-			0
-		);
-
-		$this->plugin->handleGetProperties(
-			$propFind,
-			$sabreNode
-		);
-
-		$result = $propFind->getResultForMultiStatus();
-		$this->assertCount(1, $result[404]);
-	}
+    public const SHARETYPES_PROPERTYNAME = SharesPlugin::SHARETYPES_PROPERTYNAME;
+
+    private \Sabre\DAV\Server $server;
+    private \Sabre\DAV\Tree&MockObject $tree;
+    private \OCP\Share\IManager&MockObject $shareManager;
+    private Folder&MockObject $userFolder;
+    private SharesPlugin $plugin;
+
+    protected function setUp(): void {
+        parent::setUp();
+        $this->server = new \Sabre\DAV\Server();
+        $this->tree = $this->createMock(Tree::class);
+        $this->shareManager = $this->createMock(IManager::class);
+        $user = $this->createMock(IUser::class);
+        $user->expects($this->once())
+            ->method('getUID')
+            ->willReturn('user1');
+        $userSession = $this->createMock(IUserSession::class);
+        $userSession->expects($this->once())
+            ->method('getUser')
+            ->willReturn($user);
+        $this->userFolder = $this->createMock(Folder::class);
+
+        $this->plugin = new SharesPlugin(
+            $this->tree,
+            $userSession,
+            $this->userFolder,
+            $this->shareManager
+        );
+        $this->plugin->initialize($this->server);
+    }
+
+    /**
+     * @dataProvider sharesGetPropertiesDataProvider
+     */
+    public function testGetProperties(array $shareTypes): void {
+        $sabreNode = $this->createMock(Node::class);
+        $sabreNode->expects($this->any())
+            ->method('getId')
+            ->willReturn(123);
+        $sabreNode->expects($this->any())
+            ->method('getPath')
+            ->willReturn('/subdir');
+
+        // node API nodes
+        $node = $this->createMock(Folder::class);
+
+        $sabreNode->method('getNode')
+            ->willReturn($node);
+
+        $this->shareManager->expects($this->any())
+            ->method('getSharesBy')
+            ->with(
+                $this->equalTo('user1'),
+                $this->anything(),
+                $this->equalTo($node),
+                $this->equalTo(false),
+                $this->equalTo(-1)
+            )
+            ->willReturnCallback(function ($userId, $requestedShareType, $node, $flag, $limit) use ($shareTypes) {
+                if (in_array($requestedShareType, $shareTypes)) {
+                    $share = $this->createMock(IShare::class);
+                    $share->method('getShareType')
+                        ->willReturn($requestedShareType);
+                    return [$share];
+                }
+                return [];
+            });
+
+        $this->shareManager->expects($this->any())
+            ->method('getSharedWith')
+            ->with(
+                $this->equalTo('user1'),
+                $this->anything(),
+                $this->equalTo($node),
+                $this->equalTo(-1)
+            )
+            ->willReturn([]);
+
+        $propFind = new \Sabre\DAV\PropFind(
+            '/dummyPath',
+            [self::SHARETYPES_PROPERTYNAME],
+            0
+        );
+
+        $this->plugin->handleGetProperties(
+            $propFind,
+            $sabreNode
+        );
+
+        $result = $propFind->getResultForMultiStatus();
+
+        $this->assertEmpty($result[404]);
+        unset($result[404]);
+        $this->assertEquals($shareTypes, $result[200][self::SHARETYPES_PROPERTYNAME]->getShareTypes());
+    }
+
+    /**
+     * @dataProvider sharesGetPropertiesDataProvider
+     */
+    public function testPreloadThenGetProperties(array $shareTypes): void {
+        $sabreNode1 = $this->createMock(File::class);
+        $sabreNode1->method('getId')
+            ->willReturn(111);
+        $sabreNode2 = $this->createMock(File::class);
+        $sabreNode2->method('getId')
+            ->willReturn(222);
+        $sabreNode2->method('getPath')
+            ->willReturn('/subdir/foo');
+
+        $sabreNode = $this->createMock(Directory::class);
+        $sabreNode->method('getId')
+            ->willReturn(123);
+        // never, because we use getDirectoryListing from the Node API instead
+        $sabreNode->expects($this->never())
+            ->method('getChildren');
+        $sabreNode->expects($this->any())
+            ->method('getPath')
+            ->willReturn('/subdir');
+
+        // node API nodes
+        $node = $this->createMock(Folder::class);
+        $node->method('getId')
+            ->willReturn(123);
+        $node1 = $this->createMock(\OC\Files\Node\File::class);
+        $node1->method('getId')
+            ->willReturn(111);
+        $node2 = $this->createMock(\OC\Files\Node\File::class);
+        $node2->method('getId')
+            ->willReturn(222);
+
+        $sabreNode->method('getNode')
+            ->willReturn($node);
+        $sabreNode1->method('getNode')
+            ->willReturn($node1);
+        $sabreNode2->method('getNode')
+            ->willReturn($node2);
+
+        $dummyShares = array_map(function ($type) {
+            $share = $this->createMock(IShare::class);
+            $share->expects($this->any())
+                ->method('getShareType')
+                ->willReturn($type);
+            return $share;
+        }, $shareTypes);
+
+        $this->shareManager->expects($this->any())
+            ->method('getSharesBy')
+            ->with(
+                $this->equalTo('user1'),
+                $this->anything(),
+                $this->anything(),
+                $this->equalTo(false),
+                $this->equalTo(-1)
+            )
+            ->willReturnCallback(function ($userId, $requestedShareType, $node, $flag, $limit) use ($shareTypes, $dummyShares) {
+                if ($node->getId() === 111 && in_array($requestedShareType, $shareTypes)) {
+                    foreach ($dummyShares as $dummyShare) {
+                        if ($dummyShare->getShareType() === $requestedShareType) {
+                            return [$dummyShare];
+                        }
+                    }
+                }
+
+                return [];
+            });
+
+        $this->shareManager->expects($this->any())
+            ->method('getSharedWith')
+            ->with(
+                $this->equalTo('user1'),
+                $this->anything(),
+                $this->equalTo($node),
+                $this->equalTo(-1)
+            )
+            ->willReturn([]);
+
+        $this->shareManager->expects($this->any())
+            ->method('getSharesInFolder')
+            ->with(
+                $this->equalTo('user1'),
+                $this->anything(),
+                $this->equalTo(true)
+            )
+            ->willReturnCallback(function ($userId, $node, $flag) use ($shareTypes, $dummyShares) {
+                return [111 => $dummyShares];
+            });
+
+        // simulate sabre recursive PROPFIND traversal
+        $propFindRoot = new \Sabre\DAV\PropFind(
+            '/subdir',
+            [self::SHARETYPES_PROPERTYNAME],
+            1
+        );
+        $propFind1 = new \Sabre\DAV\PropFind(
+            '/subdir/test.txt',
+            [self::SHARETYPES_PROPERTYNAME],
+            0
+        );
+        $propFind2 = new \Sabre\DAV\PropFind(
+            '/subdir/test2.txt',
+            [self::SHARETYPES_PROPERTYNAME],
+            0
+        );
+
+        $this->plugin->handleGetProperties(
+            $propFindRoot,
+            $sabreNode
+        );
+        $this->plugin->handleGetProperties(
+            $propFind1,
+            $sabreNode1
+        );
+        $this->plugin->handleGetProperties(
+            $propFind2,
+            $sabreNode2
+        );
+
+        $result = $propFind1->getResultForMultiStatus();
+
+        $this->assertEmpty($result[404]);
+        unset($result[404]);
+        $this->assertEquals($shareTypes, $result[200][self::SHARETYPES_PROPERTYNAME]->getShareTypes());
+    }
+
+    public static function sharesGetPropertiesDataProvider(): array {
+        return [
+            [[]],
+            [[IShare::TYPE_USER]],
+            [[IShare::TYPE_GROUP]],
+            [[IShare::TYPE_LINK]],
+            [[IShare::TYPE_REMOTE]],
+            [[IShare::TYPE_ROOM]],
+            [[IShare::TYPE_DECK]],
+            [[IShare::TYPE_SCIENCEMESH]],
+            [[IShare::TYPE_USER, IShare::TYPE_GROUP]],
+            [[IShare::TYPE_USER, IShare::TYPE_GROUP, IShare::TYPE_LINK]],
+            [[IShare::TYPE_USER, IShare::TYPE_LINK]],
+            [[IShare::TYPE_GROUP, IShare::TYPE_LINK]],
+            [[IShare::TYPE_USER, IShare::TYPE_REMOTE]],
+        ];
+    }
+
+    public function testGetPropertiesSkipChunks(): void {
+        $sabreNode = $this->createMock(UploadFile::class);
+
+        $propFind = new \Sabre\DAV\PropFind(
+            '/dummyPath',
+            [self::SHARETYPES_PROPERTYNAME],
+            0
+        );
+
+        $this->plugin->handleGetProperties(
+            $propFind,
+            $sabreNode
+        );
+
+        $result = $propFind->getResultForMultiStatus();
+        $this->assertCount(1, $result[404]);
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -81,7 +81,7 @@ 
 				$this->equalTo(false),
 				$this->equalTo(-1)
 			)
-			->willReturnCallback(function ($userId, $requestedShareType, $node, $flag, $limit) use ($shareTypes) {
+			->willReturnCallback(function($userId, $requestedShareType, $node, $flag, $limit) use ($shareTypes) {
 				if (in_array($requestedShareType, $shareTypes)) {
 					$share = $this->createMock(IShare::class);
 					$share->method('getShareType')
@@ -160,7 +160,7 @@ 
 		$sabreNode2->method('getNode')
 			->willReturn($node2);
 
-		$dummyShares = array_map(function ($type) {
+		$dummyShares = array_map(function($type) {
 			$share = $this->createMock(IShare::class);
 			$share->expects($this->any())
 				->method('getShareType')
@@ -177,7 +177,7 @@ 
 				$this->equalTo(false),
 				$this->equalTo(-1)
 			)
-			->willReturnCallback(function ($userId, $requestedShareType, $node, $flag, $limit) use ($shareTypes, $dummyShares) {
+			->willReturnCallback(function($userId, $requestedShareType, $node, $flag, $limit) use ($shareTypes, $dummyShares) {
 				if ($node->getId() === 111 && in_array($requestedShareType, $shareTypes)) {
 					foreach ($dummyShares as $dummyShare) {
 						if ($dummyShare->getShareType() === $requestedShareType) {
@@ -206,7 +206,7 @@ 
 				$this->anything(),
 				$this->equalTo(true)
 			)
-			->willReturnCallback(function ($userId, $node, $flag) use ($shareTypes, $dummyShares) {
+			->willReturnCallback(function($userId, $node, $flag) use ($shareTypes, $dummyShares) {
 				return [111 => $dummyShares];
 			});
 

apps/dav/tests/unit/Connector/Sabre/FakeLockerPluginTest.php

Indentation +136 added lines, -136 removed lines

@@ -23,140 +23,140 @@
  * @package OCA\DAV\Tests\unit\Connector\Sabre
  */
 class FakeLockerPluginTest extends TestCase {
-	private FakeLockerPlugin $fakeLockerPlugin;
-
-	protected function setUp(): void {
-		parent::setUp();
-		$this->fakeLockerPlugin = new FakeLockerPlugin();
-	}
-
-	public function testInitialize(): void {
-		/** @var Server $server */
-		$server = $this->createMock(Server::class);
-		$calls = [
-			['method:LOCK', [$this->fakeLockerPlugin, 'fakeLockProvider'], 1],
-			['method:UNLOCK', [$this->fakeLockerPlugin, 'fakeUnlockProvider'], 1],
-			['propFind', [$this->fakeLockerPlugin, 'propFind'], 100],
-			['validateTokens', [$this->fakeLockerPlugin, 'validateTokens'], 100],
-		];
-		$server->expects($this->exactly(count($calls)))
-			->method('on')
-			->willReturnCallback(function () use (&$calls) {
-				$expected = array_shift($calls);
-				$this->assertEquals($expected, func_get_args());
-			});
-
-		$this->fakeLockerPlugin->initialize($server);
-	}
-
-	public function testGetHTTPMethods(): void {
-		$expected = [
-			'LOCK',
-			'UNLOCK',
-		];
-		$this->assertSame($expected, $this->fakeLockerPlugin->getHTTPMethods('Test'));
-	}
-
-	public function testGetFeatures(): void {
-		$expected = [
-			2,
-		];
-		$this->assertSame($expected, $this->fakeLockerPlugin->getFeatures());
-	}
-
-	public function testPropFind(): void {
-		$propFind = $this->createMock(PropFind::class);
-		$node = $this->createMock(INode::class);
-
-		$calls = [
-			'{DAV:}supportedlock',
-			'{DAV:}lockdiscovery',
-		];
-		$propFind->expects($this->exactly(count($calls)))
-			->method('handle')
-			->willReturnCallback(function ($propertyName) use (&$calls) {
-				$expected = array_shift($calls);
-				$this->assertEquals($expected, $propertyName);
-			});
-
-		$this->fakeLockerPlugin->propFind($propFind, $node);
-	}
-
-	public static function tokenDataProvider(): array {
-		return [
-			[
-				[
-					[
-						'tokens' => [
-							[
-								'token' => 'aToken',
-								'validToken' => false,
-							],
-							[],
-							[
-								'token' => 'opaquelocktoken:asdf',
-								'validToken' => false,
-							]
-						],
-					]
-				],
-				[
-					[
-						'tokens' => [
-							[
-								'token' => 'aToken',
-								'validToken' => false,
-							],
-							[],
-							[
-								'token' => 'opaquelocktoken:asdf',
-								'validToken' => true,
-							]
-						],
-					]
-				],
-			]
-		];
-	}
-
-	/**
-	 * @dataProvider tokenDataProvider
-	 */
-	public function testValidateTokens(array $input, array $expected): void {
-		$request = $this->createMock(RequestInterface::class);
-		$this->fakeLockerPlugin->validateTokens($request, $input);
-		$this->assertSame($expected, $input);
-	}
-
-	public function testFakeLockProvider(): void {
-		$request = $this->createMock(RequestInterface::class);
-		$response = new Response();
-		$server = $this->getMockBuilder(Server::class)
-			->getMock();
-		$this->fakeLockerPlugin->initialize($server);
-
-		$request->expects($this->exactly(2))
-			->method('getPath')
-			->willReturn('MyPath');
-
-		$this->assertSame(false, $this->fakeLockerPlugin->fakeLockProvider($request, $response));
-
-		$expectedXml = '<?xml version="1.0" encoding="utf-8"?><d:prop xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns"><d:lockdiscovery><d:activelock><d:lockscope><d:exclusive/></d:lockscope><d:locktype><d:write/></d:locktype><d:lockroot><d:href>MyPath</d:href></d:lockroot><d:depth>infinity</d:depth><d:timeout>Second-1800</d:timeout><d:locktoken><d:href>opaquelocktoken:fe4f7f2437b151fbcb4e9f5c8118c6b1</d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>';
-
-		$this->assertXmlStringEqualsXmlString($expectedXml, $response->getBody());
-	}
-
-	public function testFakeUnlockProvider(): void {
-		$request = $this->createMock(RequestInterface::class);
-		$response = $this->createMock(ResponseInterface::class);
-
-		$response->expects($this->once())
-			->method('setStatus')
-			->with('204');
-		$response->expects($this->once())
-			->method('setHeader')
-			->with('Content-Length', '0');
-
-		$this->assertSame(false, $this->fakeLockerPlugin->fakeUnlockProvider($request, $response));
-	}
+    private FakeLockerPlugin $fakeLockerPlugin;
+
+    protected function setUp(): void {
+        parent::setUp();
+        $this->fakeLockerPlugin = new FakeLockerPlugin();
+    }
+
+    public function testInitialize(): void {
+        /** @var Server $server */
+        $server = $this->createMock(Server::class);
+        $calls = [
+            ['method:LOCK', [$this->fakeLockerPlugin, 'fakeLockProvider'], 1],
+            ['method:UNLOCK', [$this->fakeLockerPlugin, 'fakeUnlockProvider'], 1],
+            ['propFind', [$this->fakeLockerPlugin, 'propFind'], 100],
+            ['validateTokens', [$this->fakeLockerPlugin, 'validateTokens'], 100],
+        ];
+        $server->expects($this->exactly(count($calls)))
+            ->method('on')
+            ->willReturnCallback(function () use (&$calls) {
+                $expected = array_shift($calls);
+                $this->assertEquals($expected, func_get_args());
+            });
+
+        $this->fakeLockerPlugin->initialize($server);
+    }
+
+    public function testGetHTTPMethods(): void {
+        $expected = [
+            'LOCK',
+            'UNLOCK',
+        ];
+        $this->assertSame($expected, $this->fakeLockerPlugin->getHTTPMethods('Test'));
+    }
+
+    public function testGetFeatures(): void {
+        $expected = [
+            2,
+        ];
+        $this->assertSame($expected, $this->fakeLockerPlugin->getFeatures());
+    }
+
+    public function testPropFind(): void {
+        $propFind = $this->createMock(PropFind::class);
+        $node = $this->createMock(INode::class);
+
+        $calls = [
+            '{DAV:}supportedlock',
+            '{DAV:}lockdiscovery',
+        ];
+        $propFind->expects($this->exactly(count($calls)))
+            ->method('handle')
+            ->willReturnCallback(function ($propertyName) use (&$calls) {
+                $expected = array_shift($calls);
+                $this->assertEquals($expected, $propertyName);
+            });
+
+        $this->fakeLockerPlugin->propFind($propFind, $node);
+    }
+
+    public static function tokenDataProvider(): array {
+        return [
+            [
+                [
+                    [
+                        'tokens' => [
+                            [
+                                'token' => 'aToken',
+                                'validToken' => false,
+                            ],
+                            [],
+                            [
+                                'token' => 'opaquelocktoken:asdf',
+                                'validToken' => false,
+                            ]
+                        ],
+                    ]
+                ],
+                [
+                    [
+                        'tokens' => [
+                            [
+                                'token' => 'aToken',
+                                'validToken' => false,
+                            ],
+                            [],
+                            [
+                                'token' => 'opaquelocktoken:asdf',
+                                'validToken' => true,
+                            ]
+                        ],
+                    ]
+                ],
+            ]
+        ];
+    }
+
+    /**
+     * @dataProvider tokenDataProvider
+     */
+    public function testValidateTokens(array $input, array $expected): void {
+        $request = $this->createMock(RequestInterface::class);
+        $this->fakeLockerPlugin->validateTokens($request, $input);
+        $this->assertSame($expected, $input);
+    }
+
+    public function testFakeLockProvider(): void {
+        $request = $this->createMock(RequestInterface::class);
+        $response = new Response();
+        $server = $this->getMockBuilder(Server::class)
+            ->getMock();
+        $this->fakeLockerPlugin->initialize($server);
+
+        $request->expects($this->exactly(2))
+            ->method('getPath')
+            ->willReturn('MyPath');
+
+        $this->assertSame(false, $this->fakeLockerPlugin->fakeLockProvider($request, $response));
+
+        $expectedXml = '<?xml version="1.0" encoding="utf-8"?><d:prop xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns"><d:lockdiscovery><d:activelock><d:lockscope><d:exclusive/></d:lockscope><d:locktype><d:write/></d:locktype><d:lockroot><d:href>MyPath</d:href></d:lockroot><d:depth>infinity</d:depth><d:timeout>Second-1800</d:timeout><d:locktoken><d:href>opaquelocktoken:fe4f7f2437b151fbcb4e9f5c8118c6b1</d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>';
+
+        $this->assertXmlStringEqualsXmlString($expectedXml, $response->getBody());
+    }
+
+    public function testFakeUnlockProvider(): void {
+        $request = $this->createMock(RequestInterface::class);
+        $response = $this->createMock(ResponseInterface::class);
+
+        $response->expects($this->once())
+            ->method('setStatus')
+            ->with('204');
+        $response->expects($this->once())
+            ->method('setHeader')
+            ->with('Content-Length', '0');
+
+        $this->assertSame(false, $this->fakeLockerPlugin->fakeUnlockProvider($request, $response));
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
 		];
 		$server->expects($this->exactly(count($calls)))
 			->method('on')
-			->willReturnCallback(function () use (&$calls) {
+			->willReturnCallback(function() use (&$calls) {
 				$expected = array_shift($calls);
 				$this->assertEquals($expected, func_get_args());
 			});
@@ -74,7 +74,7 @@ 
 		];
 		$propFind->expects($this->exactly(count($calls)))
 			->method('handle')
-			->willReturnCallback(function ($propertyName) use (&$calls) {
+			->willReturnCallback(function($propertyName) use (&$calls) {
 				$expected = array_shift($calls);
 				$this->assertEquals($expected, $propertyName);
 			});

apps/dav/tests/unit/Connector/Sabre/CustomPropertiesBackendTest.php

Indentation +203 added lines, -203 removed lines

@@ -26,207 +26,207 @@
  * @package OCA\DAV\Tests\unit\Connector\Sabre
  */
 class CustomPropertiesBackendTest extends \Test\TestCase {
-	private \Sabre\DAV\Server $server;
-	private \Sabre\DAV\Tree&MockObject $tree;
-	private IUser&MockObject $user;
-	private DefaultCalendarValidator&MockObject $defaultCalendarValidator;
-	private CustomPropertiesBackend $plugin;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->server = new \Sabre\DAV\Server();
-		$this->tree = $this->createMock(Tree::class);
-
-		$userId = self::getUniqueID('testcustompropertiesuser');
-
-		$this->user = $this->createMock(IUser::class);
-		$this->user->expects($this->any())
-			->method('getUID')
-			->willReturn($userId);
-
-		$this->defaultCalendarValidator = $this->createMock(DefaultCalendarValidator::class);
-
-		$this->plugin = new CustomPropertiesBackend(
-			$this->server,
-			$this->tree,
-			Server::get(IDBConnection::class),
-			$this->user,
-			$this->defaultCalendarValidator,
-		);
-	}
-
-	protected function tearDown(): void {
-		$connection = Server::get(IDBConnection::class);
-		$deleteStatement = $connection->prepare(
-			'DELETE FROM `*PREFIX*properties`' .
-			' WHERE `userid` = ?'
-		);
-		$deleteStatement->execute(
-			[
-				$this->user->getUID(),
-			]
-		);
-		$deleteStatement->closeCursor();
-
-		parent::tearDown();
-	}
-
-	private function createTestNode(string $class) {
-		$node = $this->createMock($class);
-		$node->expects($this->any())
-			->method('getId')
-			->willReturn(123);
-
-		$node->expects($this->any())
-			->method('getPath')
-			->willReturn('/dummypath');
-
-		return $node;
-	}
-
-	private function applyDefaultProps($path = '/dummypath'): void {
-		// properties to set
-		$propPatch = new \Sabre\DAV\PropPatch([
-			'customprop' => 'value1',
-			'customprop2' => 'value2',
-		]);
-
-		$this->plugin->propPatch(
-			$path,
-			$propPatch
-		);
-
-		$propPatch->commit();
-
-		$this->assertEmpty($propPatch->getRemainingMutations());
-
-		$result = $propPatch->getResult();
-		$this->assertEquals(200, $result['customprop']);
-		$this->assertEquals(200, $result['customprop2']);
-	}
-
-	/**
-	 * Test that propFind on a missing file soft fails
-	 */
-	public function testPropFindMissingFileSoftFail(): void {
-		$propFind = new \Sabre\DAV\PropFind(
-			'/dummypath',
-			[
-				'customprop',
-				'customprop2',
-				'unsetprop',
-			],
-			0
-		);
-
-		$this->plugin->propFind(
-			'/dummypath',
-			$propFind
-		);
-
-		$this->plugin->propFind(
-			'/dummypath',
-			$propFind
-		);
-
-		// assert that the above didn't throw exceptions
-		$this->assertTrue(true);
-	}
-
-	/**
-	 * Test setting/getting properties
-	 */
-	public function testSetGetPropertiesForFile(): void {
-		$this->applyDefaultProps();
-
-		$propFind = new \Sabre\DAV\PropFind(
-			'/dummypath',
-			[
-				'customprop',
-				'customprop2',
-				'unsetprop',
-			],
-			0
-		);
-
-		$this->plugin->propFind(
-			'/dummypath',
-			$propFind
-		);
-
-		$this->assertEquals('value1', $propFind->get('customprop'));
-		$this->assertEquals('value2', $propFind->get('customprop2'));
-		$this->assertEquals(['unsetprop'], $propFind->get404Properties());
-	}
-
-	/**
-	 * Test getting properties from directory
-	 */
-	public function testGetPropertiesForDirectory(): void {
-		$this->applyDefaultProps('/dummypath');
-		$this->applyDefaultProps('/dummypath/test.txt');
-
-		$propNames = [
-			'customprop',
-			'customprop2',
-			'unsetprop',
-		];
-
-		$propFindRoot = new \Sabre\DAV\PropFind(
-			'/dummypath',
-			$propNames,
-			1
-		);
-
-		$propFindSub = new \Sabre\DAV\PropFind(
-			'/dummypath/test.txt',
-			$propNames,
-			0
-		);
-
-		$this->plugin->propFind(
-			'/dummypath',
-			$propFindRoot
-		);
-
-		$this->plugin->propFind(
-			'/dummypath/test.txt',
-			$propFindSub
-		);
-
-		// TODO: find a way to assert that no additional SQL queries were
-		// run while doing the second propFind
-
-		$this->assertEquals('value1', $propFindRoot->get('customprop'));
-		$this->assertEquals('value2', $propFindRoot->get('customprop2'));
-		$this->assertEquals(['unsetprop'], $propFindRoot->get404Properties());
-
-		$this->assertEquals('value1', $propFindSub->get('customprop'));
-		$this->assertEquals('value2', $propFindSub->get('customprop2'));
-		$this->assertEquals(['unsetprop'], $propFindSub->get404Properties());
-	}
-
-	/**
-	 * Test delete property
-	 */
-	public function testDeleteProperty(): void {
-		$this->applyDefaultProps();
-
-		$propPatch = new \Sabre\DAV\PropPatch([
-			'customprop' => null,
-		]);
-
-		$this->plugin->propPatch(
-			'/dummypath',
-			$propPatch
-		);
-
-		$propPatch->commit();
-
-		$this->assertEmpty($propPatch->getRemainingMutations());
-
-		$result = $propPatch->getResult();
-		$this->assertEquals(204, $result['customprop']);
-	}
+    private \Sabre\DAV\Server $server;
+    private \Sabre\DAV\Tree&MockObject $tree;
+    private IUser&MockObject $user;
+    private DefaultCalendarValidator&MockObject $defaultCalendarValidator;
+    private CustomPropertiesBackend $plugin;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->server = new \Sabre\DAV\Server();
+        $this->tree = $this->createMock(Tree::class);
+
+        $userId = self::getUniqueID('testcustompropertiesuser');
+
+        $this->user = $this->createMock(IUser::class);
+        $this->user->expects($this->any())
+            ->method('getUID')
+            ->willReturn($userId);
+
+        $this->defaultCalendarValidator = $this->createMock(DefaultCalendarValidator::class);
+
+        $this->plugin = new CustomPropertiesBackend(
+            $this->server,
+            $this->tree,
+            Server::get(IDBConnection::class),
+            $this->user,
+            $this->defaultCalendarValidator,
+        );
+    }
+
+    protected function tearDown(): void {
+        $connection = Server::get(IDBConnection::class);
+        $deleteStatement = $connection->prepare(
+            'DELETE FROM `*PREFIX*properties`' .
+            ' WHERE `userid` = ?'
+        );
+        $deleteStatement->execute(
+            [
+                $this->user->getUID(),
+            ]
+        );
+        $deleteStatement->closeCursor();
+
+        parent::tearDown();
+    }
+
+    private function createTestNode(string $class) {
+        $node = $this->createMock($class);
+        $node->expects($this->any())
+            ->method('getId')
+            ->willReturn(123);
+
+        $node->expects($this->any())
+            ->method('getPath')
+            ->willReturn('/dummypath');
+
+        return $node;
+    }
+
+    private function applyDefaultProps($path = '/dummypath'): void {
+        // properties to set
+        $propPatch = new \Sabre\DAV\PropPatch([
+            'customprop' => 'value1',
+            'customprop2' => 'value2',
+        ]);
+
+        $this->plugin->propPatch(
+            $path,
+            $propPatch
+        );
+
+        $propPatch->commit();
+
+        $this->assertEmpty($propPatch->getRemainingMutations());
+
+        $result = $propPatch->getResult();
+        $this->assertEquals(200, $result['customprop']);
+        $this->assertEquals(200, $result['customprop2']);
+    }
+
+    /**
+     * Test that propFind on a missing file soft fails
+     */
+    public function testPropFindMissingFileSoftFail(): void {
+        $propFind = new \Sabre\DAV\PropFind(
+            '/dummypath',
+            [
+                'customprop',
+                'customprop2',
+                'unsetprop',
+            ],
+            0
+        );
+
+        $this->plugin->propFind(
+            '/dummypath',
+            $propFind
+        );
+
+        $this->plugin->propFind(
+            '/dummypath',
+            $propFind
+        );
+
+        // assert that the above didn't throw exceptions
+        $this->assertTrue(true);
+    }
+
+    /**
+     * Test setting/getting properties
+     */
+    public function testSetGetPropertiesForFile(): void {
+        $this->applyDefaultProps();
+
+        $propFind = new \Sabre\DAV\PropFind(
+            '/dummypath',
+            [
+                'customprop',
+                'customprop2',
+                'unsetprop',
+            ],
+            0
+        );
+
+        $this->plugin->propFind(
+            '/dummypath',
+            $propFind
+        );
+
+        $this->assertEquals('value1', $propFind->get('customprop'));
+        $this->assertEquals('value2', $propFind->get('customprop2'));
+        $this->assertEquals(['unsetprop'], $propFind->get404Properties());
+    }
+
+    /**
+     * Test getting properties from directory
+     */
+    public function testGetPropertiesForDirectory(): void {
+        $this->applyDefaultProps('/dummypath');
+        $this->applyDefaultProps('/dummypath/test.txt');
+
+        $propNames = [
+            'customprop',
+            'customprop2',
+            'unsetprop',
+        ];
+
+        $propFindRoot = new \Sabre\DAV\PropFind(
+            '/dummypath',
+            $propNames,
+            1
+        );
+
+        $propFindSub = new \Sabre\DAV\PropFind(
+            '/dummypath/test.txt',
+            $propNames,
+            0
+        );
+
+        $this->plugin->propFind(
+            '/dummypath',
+            $propFindRoot
+        );
+
+        $this->plugin->propFind(
+            '/dummypath/test.txt',
+            $propFindSub
+        );
+
+        // TODO: find a way to assert that no additional SQL queries were
+        // run while doing the second propFind
+
+        $this->assertEquals('value1', $propFindRoot->get('customprop'));
+        $this->assertEquals('value2', $propFindRoot->get('customprop2'));
+        $this->assertEquals(['unsetprop'], $propFindRoot->get404Properties());
+
+        $this->assertEquals('value1', $propFindSub->get('customprop'));
+        $this->assertEquals('value2', $propFindSub->get('customprop2'));
+        $this->assertEquals(['unsetprop'], $propFindSub->get404Properties());
+    }
+
+    /**
+     * Test delete property
+     */
+    public function testDeleteProperty(): void {
+        $this->applyDefaultProps();
+
+        $propPatch = new \Sabre\DAV\PropPatch([
+            'customprop' => null,
+        ]);
+
+        $this->plugin->propPatch(
+            '/dummypath',
+            $propPatch
+        );
+
+        $propPatch->commit();
+
+        $this->assertEmpty($propPatch->getRemainingMutations());
+
+        $result = $propPatch->getResult();
+        $this->assertEquals(204, $result['customprop']);
+    }
 }