Merge pull request #39888 from nextcloud/less-container-queries

Reduce the number of container queries

2 files changed, 23 insertions, 11 deletions

diff --git a/tests/lib/Files/ViewTest.php b/tests/lib/Files/ViewTest.php
index 200b54d5829..2bf483df7d7 100644
--- a/tests/lib/Files/ViewTest.php
+++ b/tests/lib/Files/ViewTest.php
@@ -22,6 +22,7 @@ use OCP\Files\FileInfo;
 use OCP\Files\GenericFileException;
 use OCP\Files\Mount\IMountManager;
 use OCP\Files\Storage\IStorage;
+use OCP\IDBConnection;
 use OCP\Lock\ILockingProvider;
 use OCP\Lock\LockedException;
 use OCP\Share\IShare;
@@ -1590,7 +1591,7 @@ class ViewTest extends \Test\TestCase {
 				->getMock();
 			$storage->method('getId')->willReturn('non-null-id');
 			$storage->method('getStorageCache')->willReturnCallback(function () use ($storage) {
-				return new \OC\Files\Cache\Storage($storage);
+				return new \OC\Files\Cache\Storage($storage, true, \OC::$server->get(IDBConnection::class));
 			});
 
 			$mounts[] = $this->getMockBuilder(TestMoveableMountPoint::class)
diff --git a/tests/lib/HelperStorageTest.php b/tests/lib/HelperStorageTest.php
index d3f480502b2..0643c4b68a4 100644
--- a/tests/lib/HelperStorageTest.php
+++ b/tests/lib/HelperStorageTest.php
@@ -10,6 +10,7 @@ namespace Test;
 
 use OC\Files\Storage\Temporary;
 use OCP\Files\Mount\IMountManager;
+use OCP\IConfig;
 use Test\Traits\UserTrait;
 
 /**
@@ -26,12 +27,14 @@ class HelperStorageTest extends \Test\TestCase {
 	private $storageMock;
 	/** @var \OC\Files\Storage\Storage */
 	private $storage;
+	private bool $savedQuotaIncludeExternalStorage;
 
 	protected function setUp(): void {
 		parent::setUp();
 
 		$this->user = $this->getUniqueID('user_');
 		$this->createUser($this->user, $this->user);
+		$this->savedQuotaIncludeExternalStorage = $this->getIncludeExternalStorage();
 
 		\OC\Files\Filesystem::tearDown();
 		\OC_User::setUserId($this->user);
@@ -45,6 +48,7 @@ class HelperStorageTest extends \Test\TestCase {
 	}
 
 	protected function tearDown(): void {
+		$this->setIncludeExternalStorage($this->savedQuotaIncludeExternalStorage);
 		$this->user = null;
 
 		if ($this->storageMock) {
@@ -91,6 +95,19 @@ class HelperStorageTest extends \Test\TestCase {
 		$this->assertEquals(5, $storageInfo['used']);
 		$this->assertEquals(17, $storageInfo['total']);
 	}
+	private function getIncludeExternalStorage(): bool {
+		$class = new \ReflectionClass(\OC_Helper::class);
+		$prop = $class->getProperty('quotaIncludeExternalStorage');
+		$prop->setAccessible(true);
+		return $prop->getValue(null) ?? false;
+	}
+
+	private function setIncludeExternalStorage(bool $include) {
+		$class = new \ReflectionClass(\OC_Helper::class);
+		$prop = $class->getProperty('quotaIncludeExternalStorage');
+		$prop->setAccessible(true);
+		$prop->setValue(null, $include);
+	}
 
 	/**
 	 * Test getting the storage info, ignoring extra mount points
@@ -104,8 +121,7 @@ class HelperStorageTest extends \Test\TestCase {
 		$extStorage->file_put_contents('extfile.txt', 'abcdefghijklmnopq');
 		$extStorage->getScanner()->scan(''); // update root size
 
-		$config = \OC::$server->getConfig();
-		$config->setSystemValue('quota_include_external_storage', false);
+		$this->setIncludeExternalStorage(false);
 
 		\OC\Files\Filesystem::mount($extStorage, [], '/' . $this->user . '/files/ext');
 
@@ -129,10 +145,9 @@ class HelperStorageTest extends \Test\TestCase {
 
 		\OC\Files\Filesystem::mount($extStorage, [], '/' . $this->user . '/files/ext');
 
-		$config = \OC::$server->getConfig();
-		$oldConfig = $config->getSystemValue('quota_include_external_storage', false);
-		$config->setSystemValue('quota_include_external_storage', 'true');
+		$this->setIncludeExternalStorage(true);
 
+		$config = \OC::$server->get(IConfig::class);
 		$config->setUserValue($this->user, 'files', 'quota', '25');
 
 		$storageInfo = \OC_Helper::getStorageInfo('');
@@ -140,7 +155,6 @@ class HelperStorageTest extends \Test\TestCase {
 		$this->assertEquals(22, $storageInfo['used']);
 		$this->assertEquals(25, $storageInfo['total']);
 
-		$config->setSystemValue('quota_include_external_storage', $oldConfig);
 		$config->setUserValue($this->user, 'files', 'quota', 'default');
 	}
 
@@ -161,15 +175,12 @@ class HelperStorageTest extends \Test\TestCase {
 		\OC\Files\Filesystem::mount($extStorage, [], '/' . $this->user . '/files/ext');
 
 		$config = \OC::$server->getConfig();
-		$oldConfig = $config->getSystemValue('quota_include_external_storage', false);
-		$config->setSystemValue('quota_include_external_storage', 'true');
+		$this->setIncludeExternalStorage(true);
 
 		$storageInfo = \OC_Helper::getStorageInfo('');
 		$this->assertEquals(12, $storageInfo['free'], '12 bytes free in home storage');
 		$this->assertEquals(22, $storageInfo['used'], '5 bytes of home storage and 17 bytes of the temporary storage are used');
 		$this->assertEquals(34, $storageInfo['total'], '5 bytes used and 12 bytes free in home storage as well as 17 bytes used in temporary storage');
-
-		$config->setSystemValue('quota_include_external_storage', $oldConfig);
 	}