fix: adjust unit tests

Author: jvillafanez

lib/private/Files/External/StoragesBackendChecker.php

@@ -53,13 +53,11 @@ private function allowedBackendsForUsers() {
 	 */
 	public function isAllowedUserBackend(Backend $backend) {
 		$blacklistedBackendsForUsers = ['\OC\Files\Storage\Local'];
-		if (in_array($backend->getStorageClass(), $blacklistedBackendsForUsers, true)) {
+		if (\in_array($backend->getStorageClass(), $blacklistedBackendsForUsers, true)) {
 			return false;
 		}
 
-		if ($this->isUserMountingAllowed() &&
-			\array_intersect($backend->getIdentifierAliases(), $this->allowedBackendsForUsers()))
-		{
+		if ($this->isUserMountingAllowed() && \array_intersect($backend->getIdentifierAliases(), $this->allowedBackendsForUsers())) {
 			return true;
 		}
 		return false;

tests/lib/Files/External/Service/GlobalStoragesServiceDeleteUserTest.php

@@ -23,6 +23,7 @@
 use OC\Files\Config\UserMountCache;
 use OC\Files\External\Service\DBConfigService;
 use OC\Files\External\Service\GlobalStoragesService;
+use OC\Files\External\StoragesBackendChecker;
 use OC\Files\External\StoragesBackendService;
 use OCP\Files\External\Backend\Backend;
 use OCP\IUser;
@@ -125,7 +126,7 @@ public function providesDeleteAllUser() {
 	 * @param $storageParams
 	 */
 	public function testDeleteAllForUser($storageParams, $userId) {
-		$backendService = new StoragesBackendService(\OC::$server->getConfig());
+		$backendService = new StoragesBackendService(new StoragesBackendChecker(\OC::$server->getConfig()));
 		$dbConfigService = new DBConfigService(\OC::$server->getDatabaseConnection(), \OC::$server->getCrypto());
 		$userManager = \OC::$server->getUserManager();
 		$userMountCache = new UserMountCache(\OC::$server->getDatabaseConnection(), $userManager, \OC::$server->getLogger());

tests/lib/Files/External/StoragesBackendServiceTest.php

@@ -20,22 +20,31 @@
  */
 namespace Test\Files\External;
 
+use OC\Files\External\StoragesBackendChecker;
 use OC\Files\External\StoragesBackendService;
 use OCP\Files\External\IStoragesBackendService;
+use OCP\Files\External\Backend\Backend;
 use OCP\IConfig;
 use PHPUnit\Framework\MockObject\MockObject;
 
 class StoragesBackendServiceTest extends \Test\TestCase {
 	/** @var \OCP\IConfig */
-	protected $config;
+	//protected $config;
+	/** @var StoragesBackendChecker */
+	protected $storagesBackendChecker;
 
 	protected function setUp(): void {
+		$this->storagesBackendChecker = $this->createMock(StoragesBackendChecker::class);
+		$this->storagesBackendChecker->method('isUserMountingAllowed')->willReturn(false);
+		$this->storagesBackendChecker->method('isAllowedUserBackend')->willReturn(false);
+		/*
 		$this->config = $this->createMock('\OCP\IConfig');
 		$this->config
 			->method('getAppValue')
 			->willReturnMap([
 				['files_external', 'user_mounting_backends', '', '']
 			]);
+		 */
 	}
 
 	/**
@@ -67,7 +76,7 @@ protected function getAuthMechanismMock($class) {
 	}
 
 	public function testRegisterBackend() {
-		$service = new StoragesBackendService($this->config);
+		$service = new StoragesBackendService($this->storagesBackendChecker);
 
 		$backend = $this->getBackendMock('\Foo\Bar');
 
@@ -94,7 +103,7 @@ public function testRegisterBackend() {
 	}
 
 	public function testBackendProvider() {
-		$service = new StoragesBackendService($this->config);
+		$service = new StoragesBackendService($this->storagesBackendChecker);
 
 		$backend1 = $this->getBackendMock('\Foo\Bar');
 		$backend2 = $this->getBackendMock('\Bar\Foo');
@@ -112,7 +121,7 @@ public function testBackendProvider() {
 	}
 
 	public function testAuthMechanismProvider() {
-		$service = new StoragesBackendService($this->config);
+		$service = new StoragesBackendService($this->storagesBackendChecker);
 
 		$backend1 = $this->getAuthMechanismMock('\Foo\Bar');
 		$backend2 = $this->getAuthMechanismMock('\Bar\Foo');
@@ -130,7 +139,7 @@ public function testAuthMechanismProvider() {
 	}
 
 	public function testMultipleBackendProviders() {
-		$service = new StoragesBackendService($this->config);
+		$service = new StoragesBackendService($this->storagesBackendChecker);
 
 		$backend1a = $this->getBackendMock('\Foo\Bar');
 		$backend1b = $this->getBackendMock('\Bar\Foo');
@@ -156,15 +165,26 @@ public function testMultipleBackendProviders() {
 	}
 
 	public function testUserMountingBackends() {
+		$storagesBackendChecker = $this->createMock(StoragesBackendChecker::class);
+		$storagesBackendChecker->method('isUserMountingAllowed')->willReturn(true);
+		$storagesBackendChecker->method('isAllowedUserBackend')->willReturnCallback(function (Backend $backend) {
+			$backendAliases = $backend->getIdentifierAliases();
+			if (\in_array('identifier:\User\Mount\Allowed', $backendAliases, true) || \in_array('identifier_alias', $backendAliases, true)) {
+				return true;
+			}
+			return false;
+		});
+		/*
 		$config = $this->createMock(IConfig::class);
 		$config->expects($this->exactly(2))
 			->method('getAppValue')
 			->willReturnMap([
 				['files_external', 'allow_user_mounting', 'no', 'yes'],
 				['files_external', 'user_mounting_backends', '', 'identifier:\User\Mount\Allowed,identifier_alias']
 			]);
+		 */
 
-		$service = new StoragesBackendService($config);
+		$service = new StoragesBackendService($storagesBackendChecker);
 
 		$backendAllowed = $this->getBackendMock('\User\Mount\Allowed');
 		$backendAllowed->expects($this->never())
@@ -188,7 +208,7 @@ public function testUserMountingBackends() {
 	}
 
 	public function testGetAvailableBackends() {
-		$service = new StoragesBackendService($this->config);
+		$service = new StoragesBackendService($this->storagesBackendChecker);
 
 		$backendAvailable = $this->getBackendMock('\Backend\Available');
 		$backendAvailable->expects($this->once())