mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix preview generation tests 

Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2020-04-09 15:59:18 +02:00
parent 7d386872e5
commit 8f9bac26f8
No known key found for this signature in database
GPG Key ID: 42B69D8A64526EFB
2 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/private/Preview/Generator.php
View File

@ -182,7 +182,7 @@ class Generator {
$preview = $this->generatePreview($previewFolder, $maxPreviewImage, $width, $height, $crop, $maxWidth, $maxHeight, $previewVersion);
}
} catch (\InvalidArgumentException $e) {
throw new NotFoundException();
throw new NotFoundException("", 0, $e);
}
if ($preview->getSize() === 0) {
@ -478,7 +478,7 @@ class Generator {
case 'image/gif':
return 'gif';
default:
throw new \InvalidArgumentException('Not a valid mimetype');
throw new \InvalidArgumentException('Not a valid mimetype: "' . $mimeType . '"');
}
}
}

37
tests/lib/Preview/GeneratorTest.php
View File

@ -227,19 +227,11 @@ class GeneratorTest extends \Test\TestCase {
->with($this->equalTo('256-256.png'))
->willThrowException(new NotFoundException());
$image = $this->createMock(IImage::class);
$image = $this->getMockImage(2048, 2048, 'my resized data');
$this->helper->method('getImage')
->with($this->equalTo($maxPreview))
->willReturn($image);
$image->expects($this->once())
->method('resize')
->with(256);
$image->method('data')
->willReturn('my resized data');
$image->method('valid')->willReturn(true);
$image->method('dataMimeType')->willReturn('image/png');
$previewFile->expects($this->once())
->method('putContent')
->with('my resized data');
@ -325,6 +317,27 @@ class GeneratorTest extends \Test\TestCase {
$this->generator->getPreview($file, 100, 100);
}
private function getMockImage($width, $height, $data = null) {
$image = $this->createMock(IImage::class);
$image->method('height')->willReturn($width);
$image->method('width')->willReturn($height);
$image->method('valid')->willReturn(true);
$image->method('dataMimeType')->willReturn('image/png');
$image->method('data')->willReturn($data);
$image->method('resizeCopy')->willReturnCallback(function($size) use ($data) {
return $this->getMockImage($size, $size, $data);
});
$image->method('preciseResizeCopy')->willReturnCallback(function($width, $height) use ($data) {
return $this->getMockImage($width, $height, $data);
});
$image->method('cropCopy')->willReturnCallback(function($x, $y, $width, $height) use ($data) {
return $this->getMockImage($width, $height, $data);
});
return $image;
}
public function dataSize() {
return [
[1024, 2048, 512, 512, false, IPreview::MODE_FILL, 256, 512],
@ -409,14 +422,10 @@ class GeneratorTest extends \Test\TestCase {
->with($this->equalTo($filename))
->willThrowException(new NotFoundException());
$image = $this->createMock(IImage::class);
$image = $this->getMockImage($maxX, $maxY);
$this->helper->method('getImage')
->with($this->equalTo($maxPreview))
->willReturn($image);
$image->method('height')->willReturn($maxY);
$image->method('width')->willReturn($maxX);
$image->method('valid')->willReturn(true);
$image->method('dataMimeType')->willReturn('image/png');
$preview = $this->createMock(ISimpleFile::class);
$previewFolder->method('newFile')