update tests

Signed-off-by: Robin Appelman <robin@icewind.nl>
nextcloud · Aug 12, 2021 · 373b0ef · 373b0ef
1 parent 172dd33
commit 373b0ef
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 19 deletions.
diff --git a/apps/files_sharing/lib/Hooks.php b/apps/files_sharing/lib/Hooks.php
@@ -27,26 +27,10 @@
 namespace OCA\Files_Sharing;
 
 use OC\Files\Filesystem;
-use OCP\EventDispatcher\IEventDispatcher;
-use Psr\Log\LoggerInterface;
 
 class Hooks {
 	public static function deleteUser($params) {
-		$manager = new External\Manager(
-			\OC::$server->getDatabaseConnection(),
-			\OC\Files\Filesystem::getMountManager(),
-			\OC\Files\Filesystem::getLoader(),
-			\OC::$server->getHTTPClientService(),
-			\OC::$server->getNotificationManager(),
-			\OC::$server->query(\OCP\OCS\IDiscoveryService::class),
-			\OC::$server->getCloudFederationProviderManager(),
-			\OC::$server->getCloudFederationFactory(),
-			\OC::$server->getGroupManager(),
-			\OC::$server->getUserManager(),
-			$params['uid'],
-			\OC::$server->query(IEventDispatcher::class),
-			\OC::$server->get(LoggerInterface::class)
-		);
+		$manager = \OC::$server->get(External\Manager::class);
 
 		$manager->removeUserShares($params['uid']);
 	}

diff --git a/apps/files_sharing/tests/External/ManagerTest.php b/apps/files_sharing/tests/External/ManagerTest.php
@@ -44,7 +44,9 @@
 use OCP\IGroup;
 use OCP\IGroupManager;
 use OCP\IURLGenerator;
+use OCP\IUser;
 use OCP\IUserManager;
+use OCP\IUserSession;
 use OCP\Share\IShare;
 use Psr\Log\LoggerInterface;
 use Test\Traits\UserTrait;
@@ -153,6 +155,13 @@ protected function tearDown(): void {
 	}
 
 	private function createManagerForUser($userId) {
+		$user = $this->createMock(IUser::class);
+		$user->method('getUID')
+			->willReturn($userId);
+		$userSession = $this->createMock(IUserSession::class);
+		$userSession->method('getUser')
+			->willReturn($user);
+
 		return $this->getMockBuilder(Manager::class)
 			->setConstructorArgs(
 				[
@@ -166,7 +175,7 @@ private function createManagerForUser($userId) {
 					$this->cloudFederationFactory,
 					$this->groupManager,
 					$this->userManager,
-					$userId,
+					$userSession,
 					$this->eventDispatcher,
 					$this->logger,
 				]

diff --git a/apps/files_sharing/tests/TestCase.php b/apps/files_sharing/tests/TestCase.php
@@ -34,6 +34,9 @@
 
 use OC\Files\Filesystem;
 use OCA\Files_Sharing\AppInfo\Application;
+use OCA\Files_Sharing\External\MountProvider as ExternalMountProvider;
+use OCA\Files_Sharing\MountProvider;
+use OCP\Files\Config\IMountProviderCollection;
 use OCP\Share\IShare;
 use Test\Traits\MountProviderTrait;
 
@@ -71,7 +74,12 @@ abstract class TestCase extends \Test\TestCase {
 	public static function setUpBeforeClass(): void {
 		parent::setUpBeforeClass();
 
-		new Application();
+		$app = new Application();
+		$app->registerMountProviders(
+			\OC::$server->get(IMountProviderCollection::class),
+			\OC::$server->get(MountProvider::class),
+			\OC::$server->get(ExternalMountProvider::class),
+		);
 
 		// reset backend
 		\OC_User::clearBackends();