Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable10] Fix preview generation in files api controller and adding unit tests #31183

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so this means that the Preview class already resolved the $file to the correct location based on the string ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the preview class in stable10 is heavily based on file path magic and the view.
on master at least the api is a bit cleaner and uses the nodes api

$preview = new Preview('', '/', $file, $maxX, $maxY, $scaleUp);
return $preview->getPreview();
}
Expand Down
88 changes: 88 additions & 0 deletions tests/lib/PreviewManagerTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
<?php
/**
* @author Thomas Müller <[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\Filesystem;
use OC\Files\Storage\Temporary;
use OC\Files\View;
use OC\PreviewManager;
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;
/** @var View */
private $rootView;

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

$this->user = $this->createUser(self::TEST_PREVIEW_USER1, self::TEST_PREVIEW_USER1);
static::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);
}

public function testCreatePreview() {
/** @var IConfig $config */
$config = $this->createMock(IConfig::class);
/** @var IRootFolder $rootFolder */
$rootFolder = $this->createMock(IRootFolder::class);
/** @var IUserSession | \PHPUnit_Framework_MockObject_MockObject $userSession */
$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());
}
}