From: Daniel Kesselberg <mail@danielkesselberg.de>
Date: Tue, 1 Sep 2020 07:58:59 +0000 (+0200)
Subject: Tests only: Forward calls to getUserValue and getAppValue
X-Git-Tag: v20.0.0beta3~4^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F22528%2Fhead;p=nextcloud-server.git

Tests only: Forward calls to getUserValue and getAppValue

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
---

diff --git a/apps/files_trashbin/tests/TrashbinTest.php b/apps/files_trashbin/tests/TrashbinTest.php
index 96a76e1e2fe..4835cb925cf 100644
--- a/apps/files_trashbin/tests/TrashbinTest.php
+++ b/apps/files_trashbin/tests/TrashbinTest.php
@@ -29,10 +29,10 @@
  *
  */
 
-use OCA\Files_Sharing\AppInfo\Application;
-use OCA\Files_Trashbin\AppInfo\Application as TrashbinApplication;
 use OC\AppFramework\Bootstrap\BootContext;
 use OC\AppFramework\DependencyInjection\DIContainer;
+use OCA\Files_Sharing\AppInfo\Application;
+use OCA\Files_Trashbin\AppInfo\Application as TrashbinApplication;
 use OCP\Share\IShare;
 
 /**
@@ -124,15 +124,25 @@ class TrashbinTest extends \Test\TestCase {
 		\OC::$server->getAppManager()->enableApp('files_trashbin');
 		$config = \OC::$server->getConfig();
 		$mockConfig = $this->createMock(\OCP\IConfig::class);
-		$mockConfig->expects($this->any())
+		$mockConfig
 			->method('getSystemValue')
-			->willReturnCallback(function ($key, $default) use ($config) {
+			->willReturnCallback(static function ($key, $default) use ($config) {
 				if ($key === 'filesystem_check_changes') {
 					return \OC\Files\Cache\Watcher::CHECK_ONCE;
 				} else {
 					return $config->getSystemValue($key, $default);
 				}
 			});
+		$mockConfig
+			->method('getUserValue')
+			->willReturnCallback(static function ($userId, $appName, $key, $default = '') use ($config) {
+				return $config->getUserValue($userId, $appName, $key, $default);
+			});
+		$mockConfig
+			->method('getAppValue')
+			->willReturnCallback(static function ($appName, $key, $default = '') use ($config) {
+				return $config->getAppValue($appName, $key, $default);
+			});
 		$this->overwriteService(\OC\AllConfig::class, $mockConfig);
 
 		$this->trashRoot1 = '/' . self::TEST_TRASHBIN_USER1 . '/files_trashbin';