Skip to content

Commit

Permalink
Fix tests in files_versions
Browse files Browse the repository at this point in the history
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
  • Loading branch information
CarlSchwan committed Jul 23, 2021
1 parent 229bfcb commit 182f002
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand All @@ -86,7 +85,6 @@ protected function setUp(): void {
$this->createMock(IRequest::class),
$this->rootFolder,
$this->userSession,
$this->mimeTypeDetector,
$this->versionManager,
$this->previewManager
);
Expand Down Expand Up @@ -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());

Expand Down
4 changes: 3 additions & 1 deletion apps/files_versions/tests/ExpirationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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, $mockedLogger, $mockedTimeFactory);
$actualResult = $expiration->isExpired($timestamp, $quotaExceeded);

$this->assertEquals($expectedResult, $actualResult);
Expand Down

0 comments on commit 182f002

Please sign in to comment.