diff options
author | Vincent Petry <pvince81@owncloud.com> | 2016-09-07 09:09:48 +0300 |
---|---|---|
committer | Vincent Petry <pvince81@owncloud.com> | 2016-09-07 09:09:48 +0300 |
commit | 5b351009be958c140ce71937327df7f540ab7c48 (patch) | |
tree | dc73f297de5125ceb4f3bcc8d2d44e57307de586 /tests | |
parent | 765fba1b5e63ccc14a496f1cc65294c373e77d9d (diff) |
Fix preview namespaces from backport
Diffstat (limited to 'tests')
-rw-r--r-- | tests/lib/preview.php | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/tests/lib/preview.php b/tests/lib/preview.php index bac728c127d..5c1d55170a2 100644 --- a/tests/lib/preview.php +++ b/tests/lib/preview.php @@ -26,7 +26,6 @@ use OC\Files\FileInfo; use OC\Files\Filesystem; use OC\Files\Storage\Temporary; use OC\Files\View; -use OC\Preview; use Test\Traits\MountProviderTrait; use Test\Traits\UserTrait; @@ -135,7 +134,7 @@ class Preview extends TestCase { $x = 50; $y = 50; - $preview = new Preview(self::TEST_PREVIEW_USER1, 'files/', 'test.txt', $x, $y); + $preview = new \OC\Preview(self::TEST_PREVIEW_USER1, 'files/', 'test.txt', $x, $y); $preview->getPreview(); $fileInfo = $this->rootView->getFileInfo($sampleFile); @@ -166,14 +165,14 @@ class Preview extends TestCase { $x = 50; $y = 50; - $preview = new Preview(self::TEST_PREVIEW_USER1, 'files/', 'test.txt', $x, $y); + $preview = new \OC\Preview(self::TEST_PREVIEW_USER1, 'files/', 'test.txt', $x, $y); $preview->getPreview(); $fileInfo = $this->rootView->getFileInfo($sampleFile); /** @var int $fileId */ $fileId = $fileInfo['fileid']; - $thumbCacheFolder = '/' . self::TEST_PREVIEW_USER1 . '/' . Preview::THUMBNAILS_FOLDER . + $thumbCacheFolder = '/' . self::TEST_PREVIEW_USER1 . '/' . \OC\Preview::THUMBNAILS_FOLDER . '/' . $fileId . '/'; $this->assertSame(true, $this->rootView->is_dir($thumbCacheFolder), "$thumbCacheFolder \n"); @@ -205,7 +204,7 @@ class Preview extends TestCase { $sample = '/' . self::TEST_PREVIEW_USER1 . '/files/test.' . $extension; $this->rootView->file_put_contents($sample, $data); - $preview = new Preview( + $preview = new \OC\Preview( self::TEST_PREVIEW_USER1, 'files/', 'test.' . $extension, $x, $y ); @@ -235,7 +234,7 @@ class Preview extends TestCase { $this->rootView->file_put_contents($imgPath, $imgData); $preview = - new Preview(self::TEST_PREVIEW_USER1, 'files/', 'testimage.odt', $width, $height); + new \OC\Preview(self::TEST_PREVIEW_USER1, 'files/', 'testimage.odt', $width, $height); $preview->getPreview(); $image = $preview->getPreview(); @@ -328,7 +327,7 @@ class Preview extends TestCase { $preview = $this->createPreview($previewWidth, $previewHeight); // There should be no cached thumbnails - $thumbnailFolder = '/' . self::TEST_PREVIEW_USER1 . '/' . Preview::THUMBNAILS_FOLDER . + $thumbnailFolder = '/' . self::TEST_PREVIEW_USER1 . '/' . \OC\Preview::THUMBNAILS_FOLDER . '/' . $sampleFileId; $this->assertSame(false, $this->rootView->is_dir($thumbnailFolder)); @@ -565,7 +564,7 @@ class Preview extends TestCase { * @return Preview */ private function createPreview($width, $height) { - $preview = new Preview( + $preview = new \OC\Preview( self::TEST_PREVIEW_USER1, 'files/', $this->sampleFilename, $width, $height ); @@ -581,7 +580,7 @@ class Preview extends TestCase { /** * Creates the Max preview which will be used in the rest of the test * - * @return Preview + * @return \OC\Preview */ private function createMaxPreview() { $this->keepAspect = true; @@ -741,7 +740,7 @@ class Preview extends TestCase { $userPath = '/' . self::TEST_PREVIEW_USER1 . '/'; } - return $userPath . Preview::THUMBNAILS_FOLDER . '/' . $fileId + return $userPath . \OC\Preview::THUMBNAILS_FOLDER . '/' . $fileId . '/' . $width . '-' . $height . $postfix . '.png'; } @@ -884,7 +883,7 @@ class Preview extends TestCase { $originalHeight = 1050; $originalAspectRation = $originalWidth / $originalHeight; - $preview = new Preview( + $preview = new \OC\Preview( self::TEST_PREVIEW_USER1, 'files/', 'testimage.jpg', 150, 150 @@ -904,13 +903,13 @@ class Preview extends TestCase { $originalHeight = 1050; $originalAspectRation = $originalWidth / $originalHeight; - $preview = new Preview( + $preview = new \OC\Preview( self::TEST_PREVIEW_USER1, 'files/', 'testimage.jpg', 150, 150 ); $preview->setKeepAspect(true); - $preview->setMode(Preview::MODE_COVER); + $preview->setMode(\OC\Preview::MODE_COVER); $image = $preview->getPreview(); $aspectRatio = $image->width() / $image->height(); @@ -922,7 +921,7 @@ class Preview extends TestCase { public function testSetFileWithInfo() { $info = new FileInfo('/foo', null, '/foo', ['mimetype' => 'foo/bar'], null); - $preview = new Preview(); + $preview = new \OC\Preview(); $preview->setFile('/foo', $info); $this->assertEquals($info, $this->invokePrivate($preview, 'getFileInfo')); } @@ -938,7 +937,7 @@ class Preview extends TestCase { \OC_Util::tearDownFS(); \OC_Util::setupFS($userId); - $preview = new Preview($userId, 'files'); + $preview = new \OC\Preview($userId, 'files'); $view = new View('/' . $userId . '/files'); $view->file_put_contents('test.png', file_get_contents($sourceFile)); $info = $view->getFileInfo('test.png'); |