Skip to content

Commit

Permalink
Fix preview generation in files api controller and adding unit tests
Browse files Browse the repository at this point in the history
  • Loading branch information
DeepDiver1975 committed Apr 18, 2018
1 parent 959efd1 commit 59f6591
Show file tree
Hide file tree
Showing 2 changed files with 89 additions and 1 deletion.
1 change: 0 additions & 1 deletion lib/private/PreviewManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ public function createPreview($file, $maxX = 100, $maxY = 75, $scaleUp = false)
if ($user === null) {
throw new NotLoggedInException();
}
$file = $this->rootFolder->getUserFolder($user->getUID())->get($file);
$preview = new Preview('', '/', $file, $maxX, $maxY, $scaleUp);
return $preview->getPreview();
}
Expand Down
89 changes: 89 additions & 0 deletions tests/lib/PreviewManagerTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
<?php
/**
* @author Georg Ehrke <[email protected]>
* @author Olivier Paroz <[email protected]>
*
* @copyright Copyright (c) 2018, ownCloud GmbH
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* 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, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/

namespace Test;

use OC\Files\FileInfo;
use OC\Files\Filesystem;
use OC\Files\Storage\Temporary;
use OC\Files\View;
use OC\Preview;
use OC\PreviewManager;
use OC\Server;
use OCP\Files\IRootFolder;
use OCP\IConfig;
use OCP\IImage;
use OCP\IUser;
use OCP\IUserSession;
use Test\Traits\MountProviderTrait;
use Test\Traits\UserTrait;

/**
* Class PreviewManagerTest
*
* @group DB
*
* @package Test
*/
class PreviewManagerTest extends TestCase {
use UserTrait;
use MountProviderTrait;

const TEST_PREVIEW_USER1 = 'test-preview-user1';

/** @var IUser */
private $user;

protected function setUp() {
parent::setUp();

$this->user = $this->createUser(self::TEST_PREVIEW_USER1, self::TEST_PREVIEW_USER1);
$this->loginAsUser(self::TEST_PREVIEW_USER1);

$storage = new Temporary([]);
Filesystem::mount($storage, [], '/' . self::TEST_PREVIEW_USER1 . '/');

$this->rootView = new View('');
$this->rootView->mkdir('/' . self::TEST_PREVIEW_USER1);
$this->rootView->mkdir('/' . self::TEST_PREVIEW_USER1 . '/files');

$imgData = file_get_contents(\OC::$SERVERROOT . '/tests/data/testimage.jpg');
$imgPath = '/' . self::TEST_PREVIEW_USER1 . '/files/testimage.jpg';
$this->rootView->file_put_contents($imgPath, $imgData);
// $fileInfo = $this->rootView->getFileInfo($imgPath);

}

public function testCreatePreview() {
$config = $this->createMock(IConfig::class);
$rootFolder = $this->createMock(IRootFolder::class);
$userSession = $this->createMock(IUserSession::class);

$userSession->method('getUser')->willReturn($this->user);

$previewManager = new PreviewManager($config, $rootFolder, $userSession);

$image = $previewManager->createPreview('files/testimage.jpg');
$this->assertInstanceOf(IImage::class, $image);
$this->assertTrue($image->valid());
}
}

0 comments on commit 59f6591

Please sign in to comment.