Adjust tests and DI for Share.php

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

3 files changed, 28 insertions, 5 deletions

diff --git a/tests/lib/Files/FilesystemTest.php b/tests/lib/Files/FilesystemTest.php
index 04eafc99f36..dd4785ecf09 100644
--- a/tests/lib/Files/FilesystemTest.php
+++ b/tests/lib/Files/FilesystemTest.php
@@ -79,7 +79,6 @@ class FilesystemTest extends \Test\TestCase {
 
 	protected function setUp() {
 		parent::setUp();
-		\OC_User::clearBackends();
 		$userBackend = new \Test\Util\User\Dummy();
 		$userBackend->createUser(self::TEST_FILESYSTEM_USER1, self::TEST_FILESYSTEM_USER1);
 		$userBackend->createUser(self::TEST_FILESYSTEM_USER2, self::TEST_FILESYSTEM_USER2);
@@ -94,7 +93,6 @@ class FilesystemTest extends \Test\TestCase {
 
 		$this->logout();
 		$this->invokePrivate('\OC\Files\Filesystem', 'normalizedPathCache', [null]);
-		\OC_User::clearBackends();
 		parent::tearDown();
 	}
 
diff --git a/tests/lib/Share/ShareTest.php b/tests/lib/Share/ShareTest.php
index 63289529843..d550ba158a9 100644
--- a/tests/lib/Share/ShareTest.php
+++ b/tests/lib/Share/ShareTest.php
@@ -20,6 +20,9 @@
 */
 
 namespace Test\Share;
+use OC\Share\Share;
+use OCP\ILogger;
+use OCP\IUserManager;
 
 /**
  * Class Test_Share
@@ -1631,6 +1634,31 @@ class ShareTest extends \Test\TestCase {
 			$this->assertEquals('Sharing failed, because the user ' . $this->user1 . ' is the original sharer', $e->getMessage());
 		}
 	}
+
+	/**
+	 * @expectedException \OC\User\NoUserException
+	 * @expectedExceptionMessage Backends provided no user object
+	 */
+	public function testGetUsersSharingFileWithException() {
+		$userManager = $this->createMock(IUserManager::class);
+		$logger = $this->createMock(ILogger::class);
+		$userManager
+			->expects($this->once())
+			->method('get')
+			->with('test')
+			->willReturn(null);
+		$logger
+			->expects($this->once())
+			->method('error')
+			->with(
+				'Backends provided no user object for test',
+				[
+					'app' => 'files',
+				]
+			);
+
+		Share::getUsersSharingFile('/my/file/path', 'test', $userManager, $logger);
+	}
 }
 
 class DummyShareClass extends \OC\Share\Share {
diff --git a/tests/lib/TestCase.php b/tests/lib/TestCase.php
index 1ca896e0914..61372d4ae90 100644
--- a/tests/lib/TestCase.php
+++ b/tests/lib/TestCase.php
@@ -273,9 +273,6 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
 		self::tearDownAfterClassCleanStrayHooks();
 		self::tearDownAfterClassCleanStrayLocks();
 
-		\OC_User::clearBackends();
-		\OC_User::useBackend('dummy');
-
 		parent::tearDownAfterClass();
 	}