]> source.dussan.org Git - nextcloud-server.git/commitdiff
Harden public preview tests 15134/head
authorRoeland Jago Douma <roeland@famdouma.nl>
Tue, 16 Apr 2019 14:50:44 +0000 (16:50 +0200)
committerRoeland Jago Douma <roeland@famdouma.nl>
Tue, 16 Apr 2019 14:50:44 +0000 (16:50 +0200)
This way there are less timing issues.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
apps/files_sharing/tests/Controller/PublicPreviewControllerTest.php

index 3cb38a5e388c5a682a8cba246a17463a8e7dd45b..54d57dd2d4651a18f2bda3f35696bcf45d8b0c58 100644 (file)
@@ -26,6 +26,7 @@ use OCA\Files_Sharing\Controller\PublicPreviewController;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\Http\FileDisplayResponse;
+use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\Constants;
 use OCP\Files\File;
 use OCP\Files\Folder;
@@ -37,6 +38,7 @@ use OCP\ISession;
 use OCP\Share\Exceptions\ShareNotFound;
 use OCP\Share\IManager;
 use OCP\Share\IShare;
+use PHPUnit\Framework\MockObject\MockObject;
 use Punic\Data;
 use Test\TestCase;
 
@@ -44,9 +46,10 @@ class PublicPreviewControllerTest extends TestCase {
 
        /** @var IPreview|\PHPUnit_Framework_MockObject_MockObject */
        private $previewManager;
-
        /** @var IManager|\PHPUnit_Framework_MockObject_MockObject */
        private $shareManager;
+       /** @var ITimeFactory|MockObject */
+       private $timeFactory;
 
        /** @var PublicPreviewController */
        private $controller;
@@ -56,6 +59,12 @@ class PublicPreviewControllerTest extends TestCase {
 
                $this->previewManager = $this->createMock(IPreview::class);
                $this->shareManager = $this->createMock(IManager::class);
+               $this->timeFactory = $this->createMock(ITimeFactory::class);
+
+               $this->timeFactory->method('getTime')
+                       ->willReturn(1337);
+
+               $this->overwriteService(ITimeFactory::class, $this->timeFactory);
 
                $this->controller = new PublicPreviewController(
                        'files_sharing',