1 files changed, 54 insertions, 72 deletions

diff --git a/apps/dav/tests/unit/Files/FileSearchBackendTest.php b/apps/dav/tests/unit/Files/FileSearchBackendTest.php
index cc4dcb62b75..c6d6f85347b 100644
--- a/apps/dav/tests/unit/Files/FileSearchBackendTest.php
+++ b/apps/dav/tests/unit/Files/FileSearchBackendTest.php
@@ -1,39 +1,21 @@
 <?php
+
+declare(strict_types=1);
 /**
- * @copyright Copyright (c) 2017 Robin Appelman <robin@icewind.nl>
- *
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <robin@icewind.nl>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace OCA\DAV\Tests\Files;
+namespace OCA\DAV\Tests\unit\Files;
 
 use OC\Files\Search\SearchComparison;
 use OC\Files\Search\SearchQuery;
 use OC\Files\View;
-use OCA\DAV\Connector\Sabre\ObjectTree;
 use OCA\DAV\Connector\Sabre\Directory;
 use OCA\DAV\Connector\Sabre\File;
 use OCA\DAV\Connector\Sabre\FilesPlugin;
+use OCA\DAV\Connector\Sabre\ObjectTree;
+use OCA\DAV\Connector\Sabre\Server;
 use OCA\DAV\Files\FileSearchBackend;
 use OCP\Files\FileInfo;
 use OCP\Files\Folder;
@@ -41,38 +23,28 @@ use OCP\Files\IRootFolder;
 use OCP\Files\Search\ISearchBinaryOperator;
 use OCP\Files\Search\ISearchComparison;
 use OCP\Files\Search\ISearchQuery;
+use OCP\FilesMetadata\IFilesMetadataManager;
 use OCP\IUser;
 use OCP\Share\IManager;
+use PHPUnit\Framework\MockObject\MockObject;
 use SearchDAV\Backend\SearchPropertyDefinition;
 use SearchDAV\Query\Limit;
+use SearchDAV\Query\Literal;
 use SearchDAV\Query\Operator;
 use SearchDAV\Query\Query;
+use SearchDAV\Query\Scope;
 use Test\TestCase;
 
 class FileSearchBackendTest extends TestCase {
-	/** @var ObjectTree|\PHPUnit\Framework\MockObject\MockObject */
-	private $tree;
-
-	/** @var IUser */
-	private $user;
-
-	/** @var IRootFolder|\PHPUnit\Framework\MockObject\MockObject */
-	private $rootFolder;
-
-	/** @var IManager|\PHPUnit\Framework\MockObject\MockObject */
-	private $shareManager;
-
-	/** @var View|\PHPUnit\Framework\MockObject\MockObject */
-	private $view;
-
-	/** @var Folder|\PHPUnit\Framework\MockObject\MockObject */
-	private $searchFolder;
-
-	/** @var FileSearchBackend */
-	private $search;
-
-	/** @var Directory|\PHPUnit\Framework\MockObject\MockObject */
-	private $davFolder;
+	private ObjectTree&MockObject $tree;
+	private Server&MockObject $server;
+	private IUser&MockObject $user;
+	private IRootFolder&MockObject $rootFolder;
+	private IManager&MockObject $shareManager;
+	private View&MockObject $view;
+	private Folder&MockObject $searchFolder;
+	private Directory&MockObject $davFolder;
+	private FileSearchBackend $search;
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -82,28 +54,23 @@ class FileSearchBackendTest extends TestCase {
 			->method('getUID')
 			->willReturn('test');
 
-		$this->tree = $this->getMockBuilder(ObjectTree::class)
-			->disableOriginalConstructor()
-			->getMock();
-
-		$this->view = $this->getMockBuilder(View::class)
-			->disableOriginalConstructor()
-			->getMock();
-
-		$this->view->expects($this->any())
-			->method('getRelativePath')
-			->willReturnArgument(0);
-
+		$this->tree = $this->createMock(ObjectTree::class);
+		$this->server = $this->createMock(Server::class);
+		$this->view = $this->createMock(View::class);
 		$this->rootFolder = $this->createMock(IRootFolder::class);
-
 		$this->shareManager = $this->createMock(IManager::class);
-
 		$this->searchFolder = $this->createMock(Folder::class);
-
 		$fileInfo = $this->createMock(FileInfo::class);
-
 		$this->davFolder = $this->createMock(Directory::class);
 
+		$this->view->expects($this->any())
+			->method('getRoot')
+			->willReturn('');
+
+		$this->view->expects($this->any())
+			->method('getRelativePath')
+			->willReturnArgument(0);
+
 		$this->davFolder->expects($this->any())
 			->method('getFileInfo')
 			->willReturn($fileInfo);
@@ -112,7 +79,9 @@ class FileSearchBackendTest extends TestCase {
 			->method('get')
 			->willReturn($this->searchFolder);
 
-		$this->search = new FileSearchBackend($this->tree, $this->user, $this->rootFolder, $this->shareManager, $this->view);
+		$filesMetadataManager = $this->createMock(IFilesMetadataManager::class);
+
+		$this->search = new FileSearchBackend($this->server, $this->tree, $this->user, $this->rootFolder, $this->shareManager, $this->view, $filesMetadataManager);
 	}
 
 	public function testSearchFilename(): void {
@@ -275,8 +244,8 @@ class FileSearchBackendTest extends TestCase {
 		$this->search->search($query);
 	}
 
-	private function getBasicQuery($type, $property, $value = null) {
-		$scope = new \SearchDAV\Query\Scope('/', 'infinite');
+	private function getBasicQuery(string $type, string $property, int|string|null $value = null) {
+		$scope = new Scope('/', 'infinite');
 		$scope->path = '/';
 		$from = [$scope];
 		$orderBy = [];
@@ -284,12 +253,12 @@ class FileSearchBackendTest extends TestCase {
 		if (is_null($value)) {
 			$where = new Operator(
 				$type,
-				[new \SearchDAV\Query\Literal($property)]
+				[new Literal($property)]
 			);
 		} else {
 			$where = new Operator(
 				$type,
-				[new SearchPropertyDefinition($property, true, true, true), new \SearchDAV\Query\Literal($value)]
+				[new SearchPropertyDefinition($property, true, true, true), new Literal($value)]
 			);
 		}
 		$limit = new Limit();
@@ -362,11 +331,11 @@ class FileSearchBackendTest extends TestCase {
 			[
 				new Operator(
 					Operator::OPERATION_EQUAL,
-					[new SearchPropertyDefinition('{DAV:}getcontenttype', true, true, true), new \SearchDAV\Query\Literal('image/png')]
+					[new SearchPropertyDefinition('{DAV:}getcontenttype', true, true, true), new Literal('image/png')]
 				),
 				new Operator(
 					Operator::OPERATION_EQUAL,
-					[new SearchPropertyDefinition(FilesPlugin::OWNER_ID_PROPERTYNAME, true, true, true), new \SearchDAV\Query\Literal($this->user->getUID())]
+					[new SearchPropertyDefinition(FilesPlugin::OWNER_ID_PROPERTYNAME, true, true, true), new Literal($this->user->getUID())]
 				),
 			]
 		);
@@ -395,7 +364,7 @@ class FileSearchBackendTest extends TestCase {
 
 		$innerOperator = new Operator(
 			Operator::OPERATION_EQUAL,
-			[new SearchPropertyDefinition('{DAV:}getcontenttype', true, true, true), new \SearchDAV\Query\Literal('image/png')]
+			[new SearchPropertyDefinition('{DAV:}getcontenttype', true, true, true), new Literal('image/png')]
 		);
 		// 5 child operators
 		$level1Operator = new Operator(
@@ -436,4 +405,17 @@ class FileSearchBackendTest extends TestCase {
 		$this->expectException(\InvalidArgumentException::class);
 		$this->search->search($query);
 	}
+
+	public function testPreloadPropertyFor(): void {
+		$node1 = $this->createMock(File::class);
+		$node2 = $this->createMock(Directory::class);
+		$nodes = [$node1, $node2];
+		$requestProperties = ['{DAV:}getcontenttype', '{DAV:}getlastmodified'];
+
+		$this->server->expects($this->once())
+			->method('emit')
+			->with('preloadProperties', [$nodes, $requestProperties]);
+
+		$this->search->preloadPropertyFor($nodes, $requestProperties);
+	}
 }