simplify setup of circular SetupManager<->Manager

Signed-off-by: Robin Appelman <robin@icewind.nl>

2 files changed, 4 insertions, 12 deletions

diff --git a/apps/files_external/tests/PersonalMountTest.php b/apps/files_external/tests/PersonalMountTest.php
index ff33f8e21a7..024695b0188 100644
--- a/apps/files_external/tests/PersonalMountTest.php
+++ b/apps/files_external/tests/PersonalMountTest.php
@@ -25,6 +25,7 @@
 namespace OCA\Files_External\Tests;
 
 use OC\Files\Mount\Manager;
+use OC\Files\SetupManagerFactory;
 use OCA\Files_External\Lib\PersonalMount;
 use OCA\Files_External\Lib\StorageConfig;
 use OCP\Diagnostics\IEventLogger;
@@ -51,12 +52,7 @@ class PersonalMountTest extends TestCase {
 
 		$mount = new PersonalMount($storageService, $storageConfig, 10, $storage, '/foo');
 
-		$mountManager = new Manager(
-			$this->createMock(IEventLogger::class),
-			$this->createMock(IMountProviderCollection::class),
-			$this->createMock(IUserManager::class),
-			$this->createMock(IEventDispatcher::class)
-		);
+		$mountManager = new Manager($this->createMock(SetupManagerFactory::class));
 		$mountManager->addMount($mount);
 
 		$this->assertEquals([$mount], $mountManager->findByStorageId('dummy'));
diff --git a/apps/files_sharing/tests/External/ManagerTest.php b/apps/files_sharing/tests/External/ManagerTest.php
index b6e9593918c..307b630970f 100644
--- a/apps/files_sharing/tests/External/ManagerTest.php
+++ b/apps/files_sharing/tests/External/ManagerTest.php
@@ -32,6 +32,7 @@ namespace OCA\Files_Sharing\Tests\External;
 
 use OC\Federation\CloudIdManager;
 use OC\Files\SetupManager;
+use OC\Files\SetupManagerFactory;
 use OC\Files\Storage\StorageFactory;
 use OCA\Files_Sharing\External\Manager;
 use OCA\Files_Sharing\External\MountProvider;
@@ -107,12 +108,7 @@ class ManagerTest extends TestCase {
 
 		$this->uid = $this->getUniqueID('user');
 		$this->user = $this->createUser($this->uid, '');
-		$this->mountManager = new \OC\Files\Mount\Manager(
-			$this->createMock(IEventLogger::class),
-			$this->createMock(IMountProviderCollection::class),
-			$this->createMock(IUserManager::class),
-			$this->createMock(IEventDispatcher::class)
-		);
+		$this->mountManager = new \OC\Files\Mount\Manager($this->createMock(SetupManagerFactory::class));
 		$this->clientService = $this->getMockBuilder(IClientService::class)
 			->disableOriginalConstructor()->getMock();
 		$this->cloudFederationProviderManager = $this->createMock(ICloudFederationProviderManager::class);