Merge pull request #28132 from nextcloud/work/carl/fix-tests

Fix tests in files_versions
nextcloud · Jul 24, 2021 · ece2281 · ece2281
2 parents 3295364 + 0d987dd
commit ece2281
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/apps/files_versions/tests/Controller/PreviewControllerTest.php b/apps/files_versions/tests/Controller/PreviewControllerTest.php
@@ -73,7 +73,6 @@ protected function setUp(): void {
 		$user->expects($this->any())
 			->method('getUID')
 			->willReturn($this->userId);
-		$this->mimeTypeDetector = $this->createMock(IMimeTypeDetector::class);
 		$this->previewManager = $this->createMock(IPreview::class);
 		$this->userSession = $this->createMock(IUserSession::class);
 		$this->userSession->expects($this->any())
@@ -86,7 +85,6 @@ protected function setUp(): void {
 			$this->createMock(IRequest::class),
 			$this->rootFolder,
 			$this->userSession,
-			$this->mimeTypeDetector,
 			$this->versionManager,
 			$this->previewManager
 		);
@@ -170,10 +168,6 @@ public function testVersionNotFound() {
 			->with('file')
 			->willReturn($sourceFile);
 
-		$this->mimeTypeDetector->method('detectPath')
-			->with($this->equalTo('file'))
-			->willReturn('myMime');
-
 		$this->versionManager->method('getVersionFile')
 			->willThrowException(new NotFoundException());
 

diff --git a/apps/files_versions/tests/ExpirationTest.php b/apps/files_versions/tests/ExpirationTest.php
@@ -29,6 +29,7 @@
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\IConfig;
 use PHPUnit\Framework\MockObject\MockObject;
+use Psr\Log\LoggerInterface;
 
 class ExpirationTest extends \Test\TestCase {
 	public const SECONDS_PER_DAY = 86400; //60*60*24
@@ -109,8 +110,9 @@ public function expirationData() {
 	public function testExpiration($retentionObligation, $timeNow, $timestamp, $quotaExceeded, $expectedResult) {
 		$mockedConfig = $this->getMockedConfig($retentionObligation);
 		$mockedTimeFactory = $this->getMockedTimeFactory($timeNow);
+		$mockedLogger = $this->createMock(LoggerInterface::class);
 
-		$expiration = new Expiration($mockedConfig, $mockedTimeFactory);
+		$expiration = new Expiration($mockedConfig, $mockedTimeFactory, $mockedLogger);
 		$actualResult = $expiration->isExpired($timestamp, $quotaExceeded);
 
 		$this->assertEquals($expectedResult, $actualResult);