update tests

Signed-off-by: Robin Appelman <[email protected]>

Author: icewind1991

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

@@ -29,6 +29,7 @@
 namespace OCA\DAV\Tests\Unit\Connector\Sabre;
 
 use OC\Files\FileInfo;
+use OC\Files\Node\Node;
 use OC\Files\Storage\Wrapper\Quota;
 use OCA\DAV\Connector\Sabre\Directory;
 use OCP\Files\ForbiddenException;
@@ -82,9 +83,10 @@ protected function setUp(): void {
 
 		$this->view = $this->createMock('OC\Files\View');
 		$this->info = $this->createMock('OC\Files\FileInfo');
-		$this->info->expects($this->any())
-			->method('isReadable')
+		$this->info->method('isReadable')
 			->willReturn(true);
+		$this->info->method('getType')
+			->willReturn(Node::TYPE_FOLDER);
 	}
 
 	private function getDir($path = '/') {

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

@@ -167,17 +167,14 @@ public function testGetNodeForPath(
 		$fileInfo = $this->getMockBuilder(FileInfo::class)
 			->disableOriginalConstructor()
 			->getMock();
-		$fileInfo->expects($this->once())
-			->method('getType')
+		$fileInfo->method('getType')
 			->willReturn($type);
-		$fileInfo->expects($this->once())
-			->method('getName')
+		$fileInfo->method('getName')
 			->willReturn($outputFileName);
 		$fileInfo->method('getStorage')
 			->willReturn($this->createMock(\OC\Files\Storage\Common::class));
 
-		$view->expects($this->once())
-			->method('getFileInfo')
+		$view->method('getFileInfo')
 			->with($fileInfoQueryPath)
 			->willReturn($fileInfo);
 

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

@@ -111,9 +111,7 @@ public function testGetProperties($shareTypes) {
 			->disableOriginalConstructor()
 			->getMock();
 
-		$this->userFolder->expects($this->once())
-			->method('get')
-			->with('/subdir')
+		$sabreNode->method('getNode')
 			->willReturn($node);
 
 		$this->shareManager->expects($this->any())
@@ -187,9 +185,12 @@ public function testPreloadThenGetProperties($shareTypes) {
 		$node2->method('getId')
 			->willReturn(222);
 
-		$this->userFolder->method('get')
-			->with('/subdir')
+		$sabreNode->method('getNode')
 			->willReturn($node);
+		$sabreNode1->method('getNode')
+			->willReturn($node1);
+		$sabreNode2->method('getNode')
+			->willReturn($node2);
 
 		$dummyShares = array_map(function ($type) {
 			$share = $this->getMockBuilder(IShare::class)->getMock();