summaryrefslogtreecommitdiffstats
path: root/apps/files_versions
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2016-10-18 10:36:57 +0200
committerRoeland Jago Douma <roeland@famdouma.nl>2016-11-03 14:00:33 +0100
commit55af6b45f72e0717d7b6f07b69bc0f12f4fb4cd9 (patch)
tree94990fdc1391dc5e2f558522bbbac377daa2fd3e /apps/files_versions
parent87855aa97b0d90f8036ec40174ac1a3dcbd463e8 (diff)
downloadnextcloud-server-55af6b45f72e0717d7b6f07b69bc0f12f4fb4cd9.tar.gz
nextcloud-server-55af6b45f72e0717d7b6f07b69bc0f12f4fb4cd9.zip
More tests
* PreviewController test * PublicPreview test * Versions Preview test * Trash Preview test Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'apps/files_versions')
-rw-r--r--apps/files_versions/lib/Controller/PreviewController.php14
-rw-r--r--apps/files_versions/tests/Controller/PreviewControllerTest.php167
2 files changed, 168 insertions, 13 deletions
diff --git a/apps/files_versions/lib/Controller/PreviewController.php b/apps/files_versions/lib/Controller/PreviewController.php
index 3225febfcff..8d961f47ee6 100644
--- a/apps/files_versions/lib/Controller/PreviewController.php
+++ b/apps/files_versions/lib/Controller/PreviewController.php
@@ -78,11 +78,7 @@ class PreviewController extends Controller {
$y = 44,
$version = ''
) {
- if($file === '' && $version === '') {
- return new DataResponse([], Http::STATUS_BAD_REQUEST);
- }
-
- if($x === 0 || $y === 0) {
+ if($file === '' || $version === '' || $x === 0 || $y === 0) {
return new DataResponse([], Http::STATUS_BAD_REQUEST);
}
@@ -93,19 +89,11 @@ class PreviewController extends Controller {
$mimeType = $this->mimeTypeDetector->detectPath($file);
$file = $versionFolder->get($file.'.v'.$version);
- if ($file instanceof Folder) {
- return new DataResponse([], Http::STATUS_BAD_REQUEST);
- }
-
/** @var File $file */
$f = $this->previewManager->getPreview($file, $x, $y, true, IPreview::MODE_FILL, $mimeType);
-
return new FileDisplayResponse($f, Http::STATUS_OK, ['Content-Type' => $f->getMimeType()]);
} catch (NotFoundException $e) {
return new DataResponse([], Http::STATUS_NOT_FOUND);
- } catch (\Exception $e) {
- return new DataResponse([], Http::STATUS_INTERNAL_SERVER_ERROR);
}
-
}
}
diff --git a/apps/files_versions/tests/Controller/PreviewControllerTest.php b/apps/files_versions/tests/Controller/PreviewControllerTest.php
new file mode 100644
index 00000000000..384f43cf495
--- /dev/null
+++ b/apps/files_versions/tests/Controller/PreviewControllerTest.php
@@ -0,0 +1,167 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016, Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+namespace OCA\Files_Versions\Tests\Controller;
+
+use OCA\Files_Versions\Controller\PreviewController;
+use OCP\AppFramework\Http;
+use OCP\AppFramework\Http\DataResponse;
+use OCP\AppFramework\Http\FileDisplayResponse;
+use OCP\Files\File;
+use OCP\Files\Folder;
+use OCP\Files\IMimeTypeDetector;
+use OCP\Files\IRootFolder;
+use OCP\Files\NotFoundException;
+use OCP\Files\SimpleFS\ISimpleFile;
+use OCP\IPreview;
+use OCP\IRequest;
+use Test\TestCase;
+
+class PreviewControllerTest extends TestCase {
+
+ /** @var IRootFolder|\PHPUnit_Framework_MockObject_MockObject */
+ private $rootFolder;
+
+ /** @var string */
+ private $userId;
+
+ /** @var IMimeTypeDetector|\PHPUnit_Framework_MockObject_MockObject */
+ private $mimeTypeDetector;
+
+ /** @var IPreview|\PHPUnit_Framework_MockObject_MockObject */
+ private $previewManager;
+
+ /** @var PreviewController */
+ private $controller;
+
+ public function setUp() {
+ parent::setUp();
+
+ $this->rootFolder = $this->createMock(IRootFolder::class);
+ $this->userId = 'user';
+ $this->mimeTypeDetector = $this->createMock(IMimeTypeDetector::class);
+ $this->previewManager = $this->createMock(IPreview::class);
+
+ $this->controller = new PreviewController(
+ 'files_versions',
+ $this->createMock(IRequest::class),
+ $this->rootFolder,
+ $this->userId,
+ $this->mimeTypeDetector,
+ $this->previewManager
+ );
+ }
+
+ public function testInvalidFile() {
+ $res = $this->controller->getPreview('');
+ $expected = new DataResponse([], Http::STATUS_BAD_REQUEST);
+
+ $this->assertEquals($expected, $res);
+ }
+
+ public function testInvalidWidth() {
+ $res = $this->controller->getPreview('file', 0);
+ $expected = new DataResponse([], Http::STATUS_BAD_REQUEST);
+
+ $this->assertEquals($expected, $res);
+ }
+
+ public function testInvalidHeight() {
+ $res = $this->controller->getPreview('file', 10, 0);
+ $expected = new DataResponse([], Http::STATUS_BAD_REQUEST);
+
+ $this->assertEquals($expected, $res);
+ }
+
+ public function testInvalidVersion() {
+ $res = $this->controller->getPreview('file', 10, 0);
+ $expected = new DataResponse([], Http::STATUS_BAD_REQUEST);
+
+ $this->assertEquals($expected, $res);
+ }
+
+ public function testValidPreview() {
+ $userFolder = $this->createMock(Folder::class);
+ $userRoot = $this->createMock(Folder::class);
+ $versions = $this->createMock(Folder::class);
+
+ $this->rootFolder->method('getUserFolder')
+ ->with($this->userId)
+ ->willReturn($userFolder);
+ $userFolder->method('getParent')
+ ->willReturn($userRoot);
+ $userRoot->method('get')
+ ->with('files_versions')
+ ->willReturn($versions);
+
+ $this->mimeTypeDetector->method('detectPath')
+ ->with($this->equalTo('file'))
+ ->willReturn('myMime');
+
+ $file = $this->createMock(File::class);
+ $versions->method('get')
+ ->with($this->equalTo('file.v42'))
+ ->willReturn($file);
+
+ $preview = $this->createMock(ISimpleFile::class);
+ $this->previewManager->method('getPreview')
+ ->with($this->equalTo($file), 10, 10, true, IPreview::MODE_FILL, 'myMime')
+ ->willReturn($preview);
+ $preview->method('getMimeType')
+ ->willReturn('previewMime');
+
+ $res = $this->controller->getPreview('file', 10, 10, '42');
+ $expected = new FileDisplayResponse($preview, Http::STATUS_OK, ['Content-Type' => 'previewMime']);
+
+ $this->assertEquals($expected, $res);
+ }
+
+ public function testVersionNotFound() {
+ $userFolder = $this->createMock(Folder::class);
+ $userRoot = $this->createMock(Folder::class);
+ $versions = $this->createMock(Folder::class);
+
+ $this->rootFolder->method('getUserFolder')
+ ->with($this->userId)
+ ->willReturn($userFolder);
+ $userFolder->method('getParent')
+ ->willReturn($userRoot);
+ $userRoot->method('get')
+ ->with('files_versions')
+ ->willReturn($versions);
+
+ $this->mimeTypeDetector->method('detectPath')
+ ->with($this->equalTo('file'))
+ ->willReturn('myMime');
+
+ $file = $this->createMock(File::class);
+ $versions->method('get')
+ ->with($this->equalTo('file.v42'))
+ ->willThrowException(new NotFoundException());
+
+ $res = $this->controller->getPreview('file', 10, 10, '42');
+ $expected = new DataResponse([], Http::STATUS_NOT_FOUND);
+
+ $this->assertEquals($expected, $res);
+ }
+
+}