From 03281ba9954bf734a2acf6513c655a24362c05eb Mon Sep 17 00:00:00 2001 From: Oliver Vogel Date: Sun, 10 Mar 2024 10:13:45 +0100 Subject: [PATCH] Rename test functions --- tests/BaseTestCase.php | 6 ++-- tests/GdTestCase.php | 2 +- tests/ImagickTestCase.php | 2 +- tests/Unit/Drivers/AbstractDecoderTest.php | 10 +++--- tests/Unit/Drivers/Gd/ClonerTest.php | 6 ++-- .../Gd/Decoders/AbstractDecoderTest.php | 4 +-- .../Gd/Decoders/Base64ImageDecoderTest.php | 2 +- .../Gd/Decoders/BinaryImageDecoderTest.php | 8 ++--- .../Gd/Decoders/DataUriImageDecoderTest.php | 2 +- .../Gd/Decoders/FilePathImageDecoderTest.php | 2 +- .../Decoders/FilePointerImageDecoderTest.php | 2 +- .../Decoders/SplFileInfoImageDecoderTest.php | 2 +- tests/Unit/Drivers/Gd/DriverTest.php | 6 ++-- tests/Unit/Drivers/Gd/InputHandlerTest.php | 8 ++--- .../Gd/Modifiers/PlaceModifierTest.php | 4 +-- .../Drivers/Gd/Traits/CanDecodeGifTest.php | 8 ++--- .../Decoders/Base64ImageDecoderTest.php | 2 +- .../Decoders/BinaryImageDecoderTest.php | 10 +++--- .../Decoders/DataUriImageDecoderTest.php | 2 +- .../Decoders/FilePathImageDecoderTest.php | 2 +- .../Decoders/FilePointerImageDecoderTest.php | 2 +- .../Decoders/SplFileInfoImageDecoderTest.php | 2 +- tests/Unit/Drivers/Imagick/DriverTest.php | 6 ++-- tests/Unit/Drivers/Imagick/ImageTest.php | 2 +- .../Unit/Drivers/Imagick/InputHandlerTest.php | 8 ++--- .../Imagick/Modifiers/PlaceModifierTest.php | 4 +-- tests/Unit/ImageManagerTest.php | 32 +++++++++---------- tests/Unit/OriginTest.php | 6 ++-- tests/Unit/Typography/FontTest.php | 2 +- 29 files changed, 77 insertions(+), 77 deletions(-) diff --git a/tests/BaseTestCase.php b/tests/BaseTestCase.php index 3950c337..a59ad9e5 100644 --- a/tests/BaseTestCase.php +++ b/tests/BaseTestCase.php @@ -11,14 +11,14 @@ use Mockery\Adapter\Phpunit\MockeryTestCase; abstract class BaseTestCase extends MockeryTestCase { - public function getTestImagePath($filename = 'test.jpg'): string + public function getTestResourcePath($filename = 'test.jpg'): string { return sprintf('%s/resources/%s', __DIR__, $filename); } - public function getTestImageData($filename = 'test.jpg'): string + public function getTestResourceData($filename = 'test.jpg'): string { - return file_get_contents($this->getTestImagePath($filename)); + return file_get_contents($this->getTestResourcePath($filename)); } protected function assertColor($r, $g, $b, $a, ColorInterface $color) diff --git a/tests/GdTestCase.php b/tests/GdTestCase.php index 08be306f..b4ea3f49 100644 --- a/tests/GdTestCase.php +++ b/tests/GdTestCase.php @@ -15,7 +15,7 @@ abstract class GdTestCase extends BaseTestCase public function readTestImage($filename = 'test.jpg'): Image { return (new FilePathImageDecoder())->handle( - $this->getTestImagePath($filename) + $this->getTestResourcePath($filename) ); } diff --git a/tests/ImagickTestCase.php b/tests/ImagickTestCase.php index 1b641c97..414078df 100644 --- a/tests/ImagickTestCase.php +++ b/tests/ImagickTestCase.php @@ -16,7 +16,7 @@ abstract class ImagickTestCase extends BaseTestCase public function readTestImage($filename = 'test.jpg'): Image { return (new FilePathImageDecoder())->handle( - $this->getTestImagePath($filename) + $this->getTestResourcePath($filename) ); } diff --git a/tests/Unit/Drivers/AbstractDecoderTest.php b/tests/Unit/Drivers/AbstractDecoderTest.php index 890cb00d..dff9514d 100644 --- a/tests/Unit/Drivers/AbstractDecoderTest.php +++ b/tests/Unit/Drivers/AbstractDecoderTest.php @@ -54,21 +54,21 @@ final class AbstractDecoderTest extends BaseTestCase public function testIsGifFormat(): void { $decoder = Mockery::mock(AbstractDecoder::class)->makePartial(); - $this->assertFalse($decoder->isGifFormat($this->getTestImageData('exif.jpg'))); - $this->assertTrue($decoder->isGifFormat($this->getTestImageData('red.gif'))); + $this->assertFalse($decoder->isGifFormat($this->getTestResourceData('exif.jpg'))); + $this->assertTrue($decoder->isGifFormat($this->getTestResourceData('red.gif'))); } public function testIsFile(): void { $decoder = Mockery::mock(AbstractDecoder::class)->makePartial(); - $this->assertTrue($decoder->isFile($this->getTestImagePath())); + $this->assertTrue($decoder->isFile($this->getTestResourcePath())); $this->assertFalse($decoder->isFile('non-existent-file')); } public function testExtractExifDataFromBinary(): void { $decoder = Mockery::mock(AbstractDecoder::class)->makePartial(); - $result = $decoder->extractExifData($this->getTestImageData('exif.jpg')); + $result = $decoder->extractExifData($this->getTestResourceData('exif.jpg')); $this->assertInstanceOf(CollectionInterface::class, $result); $this->assertEquals('Oliver Vogel', $result->get('IFD0.Artist')); } @@ -76,7 +76,7 @@ final class AbstractDecoderTest extends BaseTestCase public function testExtractExifDataFromPath(): void { $decoder = Mockery::mock(AbstractDecoder::class)->makePartial(); - $result = $decoder->extractExifData($this->getTestImagePath('exif.jpg')); + $result = $decoder->extractExifData($this->getTestResourcePath('exif.jpg')); $this->assertInstanceOf(CollectionInterface::class, $result); $this->assertEquals('Oliver Vogel', $result->get('IFD0.Artist')); } diff --git a/tests/Unit/Drivers/Gd/ClonerTest.php b/tests/Unit/Drivers/Gd/ClonerTest.php index f1aa3c73..fab41b25 100644 --- a/tests/Unit/Drivers/Gd/ClonerTest.php +++ b/tests/Unit/Drivers/Gd/ClonerTest.php @@ -13,7 +13,7 @@ final class ClonerTest extends BaseTestCase { public function testClone(): void { - $gd = imagecreatefromgif($this->getTestImagePath('gradient.gif')); + $gd = imagecreatefromgif($this->getTestResourcePath('gradient.gif')); $clone = Cloner::clone($gd); $this->assertEquals(16, imagesx($gd)); @@ -29,7 +29,7 @@ final class ClonerTest extends BaseTestCase public function testCloneEmpty(): void { - $gd = imagecreatefromgif($this->getTestImagePath('gradient.gif')); + $gd = imagecreatefromgif($this->getTestResourcePath('gradient.gif')); $clone = Cloner::cloneEmpty($gd, new Rectangle(12, 12), new Color(255, 0, 0, 0)); $this->assertEquals(16, imagesx($gd)); @@ -50,7 +50,7 @@ final class ClonerTest extends BaseTestCase public function testCLoneBlended(): void { - $gd = imagecreatefromgif($this->getTestImagePath('gradient.gif')); + $gd = imagecreatefromgif($this->getTestResourcePath('gradient.gif')); $clone = Cloner::cloneBlended($gd, new Color(255, 0, 255, 255)); $this->assertEquals(16, imagesx($gd)); diff --git a/tests/Unit/Drivers/Gd/Decoders/AbstractDecoderTest.php b/tests/Unit/Drivers/Gd/Decoders/AbstractDecoderTest.php index 350c8b35..264c9ed5 100644 --- a/tests/Unit/Drivers/Gd/Decoders/AbstractDecoderTest.php +++ b/tests/Unit/Drivers/Gd/Decoders/AbstractDecoderTest.php @@ -13,12 +13,12 @@ final class AbstractDecoderTest extends BaseTestCase public function testGetMediaTypeFromFilePath(): void { $decoder = Mockery::mock(AbstractDecoder::class)->makePartial(); - $this->assertEquals('image/jpeg', $decoder->getMediaTypeByFilePath($this->getTestImagePath('test.jpg'))); + $this->assertEquals('image/jpeg', $decoder->getMediaTypeByFilePath($this->getTestResourcePath('test.jpg'))); } public function testGetMediaTypeFromFileBinary(): void { $decoder = Mockery::mock(AbstractDecoder::class)->makePartial(); - $this->assertEquals('image/jpeg', $decoder->getMediaTypeByBinary($this->getTestImageData('test.jpg'))); + $this->assertEquals('image/jpeg', $decoder->getMediaTypeByBinary($this->getTestResourceData('test.jpg'))); } } diff --git a/tests/Unit/Drivers/Gd/Decoders/Base64ImageDecoderTest.php b/tests/Unit/Drivers/Gd/Decoders/Base64ImageDecoderTest.php index a0643a3c..51853e44 100644 --- a/tests/Unit/Drivers/Gd/Decoders/Base64ImageDecoderTest.php +++ b/tests/Unit/Drivers/Gd/Decoders/Base64ImageDecoderTest.php @@ -25,7 +25,7 @@ final class Base64ImageDecoderTest extends BaseTestCase public function testDecode(): void { $result = $this->decoder->decode( - base64_encode($this->getTestImageData('blue.gif')) + base64_encode($this->getTestResourceData('blue.gif')) ); $this->assertInstanceOf(Image::class, $result); diff --git a/tests/Unit/Drivers/Gd/Decoders/BinaryImageDecoderTest.php b/tests/Unit/Drivers/Gd/Decoders/BinaryImageDecoderTest.php index e19e7f74..d09690a3 100644 --- a/tests/Unit/Drivers/Gd/Decoders/BinaryImageDecoderTest.php +++ b/tests/Unit/Drivers/Gd/Decoders/BinaryImageDecoderTest.php @@ -17,7 +17,7 @@ final class BinaryImageDecoderTest extends BaseTestCase public function testDecodePng(): void { $decoder = new BinaryImageDecoder(); - $image = $decoder->decode(file_get_contents($this->getTestImagePath('tile.png'))); + $image = $decoder->decode(file_get_contents($this->getTestResourcePath('tile.png'))); $this->assertInstanceOf(Image::class, $image); $this->assertEquals(16, $image->width()); $this->assertEquals(16, $image->height()); @@ -27,7 +27,7 @@ final class BinaryImageDecoderTest extends BaseTestCase public function testDecodeGif(): void { $decoder = new BinaryImageDecoder(); - $image = $decoder->decode(file_get_contents($this->getTestImagePath('red.gif'))); + $image = $decoder->decode(file_get_contents($this->getTestResourcePath('red.gif'))); $this->assertInstanceOf(Image::class, $image); $this->assertEquals(16, $image->width()); $this->assertEquals(16, $image->height()); @@ -37,7 +37,7 @@ final class BinaryImageDecoderTest extends BaseTestCase public function testDecodeAnimatedGif(): void { $decoder = new BinaryImageDecoder(); - $image = $decoder->decode(file_get_contents($this->getTestImagePath('cats.gif'))); + $image = $decoder->decode(file_get_contents($this->getTestResourcePath('cats.gif'))); $this->assertInstanceOf(Image::class, $image); $this->assertEquals(75, $image->width()); $this->assertEquals(50, $image->height()); @@ -47,7 +47,7 @@ final class BinaryImageDecoderTest extends BaseTestCase public function testDecodeJpegWithExif(): void { $decoder = new BinaryImageDecoder(); - $image = $decoder->decode(file_get_contents($this->getTestImagePath('exif.jpg'))); + $image = $decoder->decode(file_get_contents($this->getTestResourcePath('exif.jpg'))); $this->assertInstanceOf(Image::class, $image); $this->assertEquals(16, $image->width()); $this->assertEquals(16, $image->height()); diff --git a/tests/Unit/Drivers/Gd/Decoders/DataUriImageDecoderTest.php b/tests/Unit/Drivers/Gd/Decoders/DataUriImageDecoderTest.php index c0d1dc0e..100fd982 100644 --- a/tests/Unit/Drivers/Gd/Decoders/DataUriImageDecoderTest.php +++ b/tests/Unit/Drivers/Gd/Decoders/DataUriImageDecoderTest.php @@ -26,7 +26,7 @@ final class DataUriImageDecoderTest extends BaseTestCase public function testDecode(): void { $result = $this->decoder->decode( - sprintf('data:image/jpeg;base64,%s', base64_encode($this->getTestImageData('blue.gif'))) + sprintf('data:image/jpeg;base64,%s', base64_encode($this->getTestResourceData('blue.gif'))) ); $this->assertInstanceOf(Image::class, $result); diff --git a/tests/Unit/Drivers/Gd/Decoders/FilePathImageDecoderTest.php b/tests/Unit/Drivers/Gd/Decoders/FilePathImageDecoderTest.php index 83fb9943..0a1a3d95 100644 --- a/tests/Unit/Drivers/Gd/Decoders/FilePathImageDecoderTest.php +++ b/tests/Unit/Drivers/Gd/Decoders/FilePathImageDecoderTest.php @@ -26,7 +26,7 @@ final class FilePathImageDecoderTest extends BaseTestCase public function testDecode(): void { $result = $this->decoder->decode( - $this->getTestImagePath() + $this->getTestResourcePath() ); $this->assertInstanceOf(Image::class, $result); diff --git a/tests/Unit/Drivers/Gd/Decoders/FilePointerImageDecoderTest.php b/tests/Unit/Drivers/Gd/Decoders/FilePointerImageDecoderTest.php index c219cf86..bf2281bc 100644 --- a/tests/Unit/Drivers/Gd/Decoders/FilePointerImageDecoderTest.php +++ b/tests/Unit/Drivers/Gd/Decoders/FilePointerImageDecoderTest.php @@ -17,7 +17,7 @@ final class FilePointerImageDecoderTest extends GdTestCase public function testDecode(): void { $decoder = new FilePointerImageDecoder(); - $fp = fopen($this->getTestImagePath('test.jpg'), 'r'); + $fp = fopen($this->getTestResourcePath('test.jpg'), 'r'); $result = $decoder->decode($fp); $this->assertInstanceOf(Image::class, $result); } diff --git a/tests/Unit/Drivers/Gd/Decoders/SplFileInfoImageDecoderTest.php b/tests/Unit/Drivers/Gd/Decoders/SplFileInfoImageDecoderTest.php index 639d9b75..e7517235 100644 --- a/tests/Unit/Drivers/Gd/Decoders/SplFileInfoImageDecoderTest.php +++ b/tests/Unit/Drivers/Gd/Decoders/SplFileInfoImageDecoderTest.php @@ -19,7 +19,7 @@ final class SplFileInfoImageDecoderTest extends BaseTestCase { $decoder = new SplFileInfoImageDecoder(); $result = $decoder->decode( - new SplFileInfo($this->getTestImagePath('blue.gif')) + new SplFileInfo($this->getTestResourcePath('blue.gif')) ); $this->assertInstanceOf(Image::class, $result); } diff --git a/tests/Unit/Drivers/Gd/DriverTest.php b/tests/Unit/Drivers/Gd/DriverTest.php index 14fb1967..fd6b9ca0 100644 --- a/tests/Unit/Drivers/Gd/DriverTest.php +++ b/tests/Unit/Drivers/Gd/DriverTest.php @@ -37,8 +37,8 @@ final class DriverTest extends BaseTestCase public function testCreateAnimation(): void { $image = $this->driver->createAnimation(function ($animation) { - $animation->add($this->getTestImagePath('red.gif'), .25); - $animation->add($this->getTestImagePath('green.gif'), .25); + $animation->add($this->getTestResourcePath('red.gif'), .25); + $animation->add($this->getTestResourcePath('green.gif'), .25); })->setLoops(5); $this->assertInstanceOf(ImageInterface::class, $image); @@ -50,7 +50,7 @@ final class DriverTest extends BaseTestCase public function testHandleInputImage(): void { - $result = $this->driver->handleInput($this->getTestImagePath('test.jpg')); + $result = $this->driver->handleInput($this->getTestResourcePath('test.jpg')); $this->assertInstanceOf(ImageInterface::class, $result); } diff --git a/tests/Unit/Drivers/Gd/InputHandlerTest.php b/tests/Unit/Drivers/Gd/InputHandlerTest.php index 7707c04f..43e119d6 100644 --- a/tests/Unit/Drivers/Gd/InputHandlerTest.php +++ b/tests/Unit/Drivers/Gd/InputHandlerTest.php @@ -29,7 +29,7 @@ final class InputHandlerTest extends BaseTestCase public function testHandleBinaryImage(): void { $handler = new InputHandler(); - $input = file_get_contents($this->getTestImagePath('test.jpg')); + $input = file_get_contents($this->getTestResourcePath('test.jpg')); $result = $handler->handle($input); $this->assertInstanceOf(Image::class, $result); } @@ -37,7 +37,7 @@ final class InputHandlerTest extends BaseTestCase public function testHandleSplFileInfo(): void { $handler = new InputHandler(); - $input = new SplFileInfo($this->getTestImagePath('test.jpg')); + $input = new SplFileInfo($this->getTestResourcePath('test.jpg')); $result = $handler->handle($input); $this->assertInstanceOf(Image::class, $result); } @@ -45,7 +45,7 @@ final class InputHandlerTest extends BaseTestCase public function testHandleFilePathImage(): void { $handler = new InputHandler(); - $input = $this->getTestImagePath('animation.gif'); + $input = $this->getTestResourcePath('animation.gif'); $result = $handler->handle($input); $this->assertInstanceOf(Image::class, $result); } @@ -53,7 +53,7 @@ final class InputHandlerTest extends BaseTestCase public function testHandleBase64Image(): void { $handler = new InputHandler(); - $input = base64_encode(file_get_contents($this->getTestImagePath('animation.gif'))); + $input = base64_encode(file_get_contents($this->getTestResourcePath('animation.gif'))); $result = $handler->handle($input); $this->assertInstanceOf(Image::class, $result); } diff --git a/tests/Unit/Drivers/Gd/Modifiers/PlaceModifierTest.php b/tests/Unit/Drivers/Gd/Modifiers/PlaceModifierTest.php index 00ff0064..02c1e554 100644 --- a/tests/Unit/Drivers/Gd/Modifiers/PlaceModifierTest.php +++ b/tests/Unit/Drivers/Gd/Modifiers/PlaceModifierTest.php @@ -18,7 +18,7 @@ final class PlaceModifierTest extends GdTestCase { $image = $this->readTestImage('test.jpg'); $this->assertEquals('febc44', $image->pickColor(300, 25)->toHex()); - $image->modify(new PlaceModifier($this->getTestImagePath('circle.png'), 'top-right', 0, 0)); + $image->modify(new PlaceModifier($this->getTestResourcePath('circle.png'), 'top-right', 0, 0)); $this->assertEquals('32250d', $image->pickColor(300, 25)->toHex()); } @@ -26,7 +26,7 @@ final class PlaceModifierTest extends GdTestCase { $image = $this->readTestImage('test.jpg'); $this->assertEquals('febc44', $image->pickColor(300, 25)->toHex()); - $image->modify(new PlaceModifier($this->getTestImagePath('circle.png'), 'top-right', 0, 0, 50)); + $image->modify(new PlaceModifier($this->getTestResourcePath('circle.png'), 'top-right', 0, 0, 50)); $this->assertEquals('987028', $image->pickColor(300, 25)->toHex()); } } diff --git a/tests/Unit/Drivers/Gd/Traits/CanDecodeGifTest.php b/tests/Unit/Drivers/Gd/Traits/CanDecodeGifTest.php index 2fd09e17..f8cdafe8 100644 --- a/tests/Unit/Drivers/Gd/Traits/CanDecodeGifTest.php +++ b/tests/Unit/Drivers/Gd/Traits/CanDecodeGifTest.php @@ -17,7 +17,7 @@ final class CanDecodeGifTest extends BaseTestCase use CanDecodeGif; })->makePartial(); - $result = $decoder->decodeGif($this->getTestImageData('animation.gif')); + $result = $decoder->decodeGif($this->getTestResourceData('animation.gif')); $this->assertInstanceOf(ImageInterface::class, $result); $this->assertEquals('image/gif', $result->origin()->mediaType()); } @@ -28,7 +28,7 @@ final class CanDecodeGifTest extends BaseTestCase use CanDecodeGif; })->makePartial(); - $result = $decoder->decodeGif($this->getTestImageData('red.gif')); + $result = $decoder->decodeGif($this->getTestResourceData('red.gif')); $this->assertInstanceOf(ImageInterface::class, $result); $this->assertEquals('image/gif', $result->origin()->mediaType()); } @@ -39,7 +39,7 @@ final class CanDecodeGifTest extends BaseTestCase use CanDecodeGif; })->makePartial(); - $result = $decoder->decodeGif($this->getTestImagePath('animation.gif')); + $result = $decoder->decodeGif($this->getTestResourcePath('animation.gif')); $this->assertInstanceOf(ImageInterface::class, $result); $this->assertEquals('image/gif', $result->origin()->mediaType()); } @@ -50,7 +50,7 @@ final class CanDecodeGifTest extends BaseTestCase use CanDecodeGif; })->makePartial(); - $result = $decoder->decodeGif($this->getTestImagePath('red.gif')); + $result = $decoder->decodeGif($this->getTestResourcePath('red.gif')); $this->assertInstanceOf(ImageInterface::class, $result); $this->assertEquals('image/gif', $result->origin()->mediaType()); } diff --git a/tests/Unit/Drivers/Imagick/Decoders/Base64ImageDecoderTest.php b/tests/Unit/Drivers/Imagick/Decoders/Base64ImageDecoderTest.php index a5c27f56..82910d26 100644 --- a/tests/Unit/Drivers/Imagick/Decoders/Base64ImageDecoderTest.php +++ b/tests/Unit/Drivers/Imagick/Decoders/Base64ImageDecoderTest.php @@ -25,7 +25,7 @@ final class Base64ImageDecoderTest extends BaseTestCase public function testDecode(): void { $result = $this->decoder->decode( - base64_encode($this->getTestImageData('blue.gif')) + base64_encode($this->getTestResourceData('blue.gif')) ); $this->assertInstanceOf(Image::class, $result); diff --git a/tests/Unit/Drivers/Imagick/Decoders/BinaryImageDecoderTest.php b/tests/Unit/Drivers/Imagick/Decoders/BinaryImageDecoderTest.php index d087ae18..6cab39a4 100644 --- a/tests/Unit/Drivers/Imagick/Decoders/BinaryImageDecoderTest.php +++ b/tests/Unit/Drivers/Imagick/Decoders/BinaryImageDecoderTest.php @@ -17,7 +17,7 @@ final class BinaryImageDecoderTest extends BaseTestCase public function testDecodePng(): void { $decoder = new BinaryImageDecoder(); - $image = $decoder->decode(file_get_contents($this->getTestImagePath('tile.png'))); + $image = $decoder->decode(file_get_contents($this->getTestResourcePath('tile.png'))); $this->assertInstanceOf(Image::class, $image); $this->assertInstanceOf(RgbColorspace::class, $image->colorspace()); $this->assertEquals(16, $image->width()); @@ -28,7 +28,7 @@ final class BinaryImageDecoderTest extends BaseTestCase public function testDecodeGif(): void { $decoder = new BinaryImageDecoder(); - $image = $decoder->decode(file_get_contents($this->getTestImagePath('red.gif'))); + $image = $decoder->decode(file_get_contents($this->getTestResourcePath('red.gif'))); $this->assertInstanceOf(Image::class, $image); $this->assertEquals(16, $image->width()); $this->assertEquals(16, $image->height()); @@ -38,7 +38,7 @@ final class BinaryImageDecoderTest extends BaseTestCase public function testDecodeAnimatedGif(): void { $decoder = new BinaryImageDecoder(); - $image = $decoder->decode(file_get_contents($this->getTestImagePath('cats.gif'))); + $image = $decoder->decode(file_get_contents($this->getTestResourcePath('cats.gif'))); $this->assertInstanceOf(Image::class, $image); $this->assertEquals(75, $image->width()); $this->assertEquals(50, $image->height()); @@ -48,7 +48,7 @@ final class BinaryImageDecoderTest extends BaseTestCase public function testDecodeJpegWithExif(): void { $decoder = new BinaryImageDecoder(); - $image = $decoder->decode(file_get_contents($this->getTestImagePath('exif.jpg'))); + $image = $decoder->decode(file_get_contents($this->getTestResourcePath('exif.jpg'))); $this->assertInstanceOf(Image::class, $image); $this->assertEquals(16, $image->width()); $this->assertEquals(16, $image->height()); @@ -59,7 +59,7 @@ final class BinaryImageDecoderTest extends BaseTestCase public function testDecodeCmykImage(): void { $decoder = new BinaryImageDecoder(); - $image = $decoder->decode(file_get_contents($this->getTestImagePath('cmyk.jpg'))); + $image = $decoder->decode(file_get_contents($this->getTestResourcePath('cmyk.jpg'))); $this->assertInstanceOf(Image::class, $image); $this->assertInstanceOf(CmykColorspace::class, $image->colorspace()); } diff --git a/tests/Unit/Drivers/Imagick/Decoders/DataUriImageDecoderTest.php b/tests/Unit/Drivers/Imagick/Decoders/DataUriImageDecoderTest.php index e1ee4c63..1a4ca500 100644 --- a/tests/Unit/Drivers/Imagick/Decoders/DataUriImageDecoderTest.php +++ b/tests/Unit/Drivers/Imagick/Decoders/DataUriImageDecoderTest.php @@ -26,7 +26,7 @@ final class DataUriImageDecoderTest extends BaseTestCase public function testDecode(): void { $result = $this->decoder->decode( - sprintf('data:image/jpeg;base64,%s', base64_encode($this->getTestImageData('blue.gif'))) + sprintf('data:image/jpeg;base64,%s', base64_encode($this->getTestResourceData('blue.gif'))) ); $this->assertInstanceOf(Image::class, $result); diff --git a/tests/Unit/Drivers/Imagick/Decoders/FilePathImageDecoderTest.php b/tests/Unit/Drivers/Imagick/Decoders/FilePathImageDecoderTest.php index c199506f..2a8ffcd6 100644 --- a/tests/Unit/Drivers/Imagick/Decoders/FilePathImageDecoderTest.php +++ b/tests/Unit/Drivers/Imagick/Decoders/FilePathImageDecoderTest.php @@ -26,7 +26,7 @@ final class FilePathImageDecoderTest extends BaseTestCase public function testDecode(): void { $result = $this->decoder->decode( - $this->getTestImagePath() + $this->getTestResourcePath() ); $this->assertInstanceOf(Image::class, $result); diff --git a/tests/Unit/Drivers/Imagick/Decoders/FilePointerImageDecoderTest.php b/tests/Unit/Drivers/Imagick/Decoders/FilePointerImageDecoderTest.php index 13715584..8165b3c2 100644 --- a/tests/Unit/Drivers/Imagick/Decoders/FilePointerImageDecoderTest.php +++ b/tests/Unit/Drivers/Imagick/Decoders/FilePointerImageDecoderTest.php @@ -17,7 +17,7 @@ final class FilePointerImageDecoderTest extends ImagickTestCase public function testDecode(): void { $decoder = new FilePointerImageDecoder(); - $fp = fopen($this->getTestImagePath('test.jpg'), 'r'); + $fp = fopen($this->getTestResourcePath('test.jpg'), 'r'); $result = $decoder->decode($fp); $this->assertInstanceOf(Image::class, $result); } diff --git a/tests/Unit/Drivers/Imagick/Decoders/SplFileInfoImageDecoderTest.php b/tests/Unit/Drivers/Imagick/Decoders/SplFileInfoImageDecoderTest.php index ef2e4c92..3e549909 100644 --- a/tests/Unit/Drivers/Imagick/Decoders/SplFileInfoImageDecoderTest.php +++ b/tests/Unit/Drivers/Imagick/Decoders/SplFileInfoImageDecoderTest.php @@ -19,7 +19,7 @@ final class SplFileInfoImageDecoderTest extends BaseTestCase { $decoder = new SplFileInfoImageDecoder(); $result = $decoder->decode( - new SplFileInfo($this->getTestImagePath('blue.gif')) + new SplFileInfo($this->getTestResourcePath('blue.gif')) ); $this->assertInstanceOf(Image::class, $result); } diff --git a/tests/Unit/Drivers/Imagick/DriverTest.php b/tests/Unit/Drivers/Imagick/DriverTest.php index c34f2da2..11a0c9ff 100644 --- a/tests/Unit/Drivers/Imagick/DriverTest.php +++ b/tests/Unit/Drivers/Imagick/DriverTest.php @@ -37,8 +37,8 @@ final class DriverTest extends BaseTestCase public function testCreateAnimation(): void { $image = $this->driver->createAnimation(function ($animation) { - $animation->add($this->getTestImagePath('red.gif'), .25); - $animation->add($this->getTestImagePath('green.gif'), .25); + $animation->add($this->getTestResourcePath('red.gif'), .25); + $animation->add($this->getTestResourcePath('green.gif'), .25); })->setLoops(5); $this->assertInstanceOf(ImageInterface::class, $image); @@ -50,7 +50,7 @@ final class DriverTest extends BaseTestCase public function testHandleInputImage(): void { - $result = $this->driver->handleInput($this->getTestImagePath('test.jpg')); + $result = $this->driver->handleInput($this->getTestResourcePath('test.jpg')); $this->assertInstanceOf(ImageInterface::class, $result); } diff --git a/tests/Unit/Drivers/Imagick/ImageTest.php b/tests/Unit/Drivers/Imagick/ImageTest.php index 86edde94..777fbc3e 100644 --- a/tests/Unit/Drivers/Imagick/ImageTest.php +++ b/tests/Unit/Drivers/Imagick/ImageTest.php @@ -33,7 +33,7 @@ final class ImageTest extends ImagickTestCase protected function setUp(): void { $imagick = new Imagick(); - $imagick->readImage($this->getTestImagePath('animation.gif')); + $imagick->readImage($this->getTestResourcePath('animation.gif')); $this->image = new Image( new Driver(), new Core($imagick), diff --git a/tests/Unit/Drivers/Imagick/InputHandlerTest.php b/tests/Unit/Drivers/Imagick/InputHandlerTest.php index 8131c0bb..16449d4e 100644 --- a/tests/Unit/Drivers/Imagick/InputHandlerTest.php +++ b/tests/Unit/Drivers/Imagick/InputHandlerTest.php @@ -29,7 +29,7 @@ final class InputHandlerTest extends BaseTestCase public function testHandleBinaryImage(): void { $handler = new InputHandler(); - $input = file_get_contents($this->getTestImagePath('animation.gif')); + $input = file_get_contents($this->getTestResourcePath('animation.gif')); $result = $handler->handle($input); $this->assertInstanceOf(Image::class, $result); } @@ -37,7 +37,7 @@ final class InputHandlerTest extends BaseTestCase public function testHandleSplFileInfo(): void { $handler = new InputHandler(); - $input = new SplFileInfo($this->getTestImagePath('test.jpg')); + $input = new SplFileInfo($this->getTestResourcePath('test.jpg')); $result = $handler->handle($input); $this->assertInstanceOf(Image::class, $result); } @@ -45,7 +45,7 @@ final class InputHandlerTest extends BaseTestCase public function testHandleFilePathImage(): void { $handler = new InputHandler(); - $input = $this->getTestImagePath('animation.gif'); + $input = $this->getTestResourcePath('animation.gif'); $result = $handler->handle($input); $this->assertInstanceOf(Image::class, $result); } @@ -53,7 +53,7 @@ final class InputHandlerTest extends BaseTestCase public function testHandleBase64Image(): void { $handler = new InputHandler(); - $input = base64_encode(file_get_contents($this->getTestImagePath('animation.gif'))); + $input = base64_encode(file_get_contents($this->getTestResourcePath('animation.gif'))); $result = $handler->handle($input); $this->assertInstanceOf(Image::class, $result); } diff --git a/tests/Unit/Drivers/Imagick/Modifiers/PlaceModifierTest.php b/tests/Unit/Drivers/Imagick/Modifiers/PlaceModifierTest.php index 60fc84af..7cb9de0d 100644 --- a/tests/Unit/Drivers/Imagick/Modifiers/PlaceModifierTest.php +++ b/tests/Unit/Drivers/Imagick/Modifiers/PlaceModifierTest.php @@ -18,7 +18,7 @@ final class PlaceModifierTest extends ImagickTestCase { $image = $this->readTestImage('test.jpg'); $this->assertEquals('febc44', $image->pickColor(300, 25)->toHex()); - $image->modify(new PlaceModifier($this->getTestImagePath('circle.png'), 'top-right', 0, 0)); + $image->modify(new PlaceModifier($this->getTestResourcePath('circle.png'), 'top-right', 0, 0)); $this->assertEquals('33260e', $image->pickColor(300, 25)->toHex()); } @@ -26,7 +26,7 @@ final class PlaceModifierTest extends ImagickTestCase { $image = $this->readTestImage('test.jpg'); $this->assertEquals('febc44', $image->pickColor(300, 25)->toHex()); - $image->modify(new PlaceModifier($this->getTestImagePath('circle.png'), 'top-right', 0, 0, 50)); + $image->modify(new PlaceModifier($this->getTestResourcePath('circle.png'), 'top-right', 0, 0, 50)); $this->assertEquals('987129', $image->pickColor(300, 25)->toHex()); } } diff --git a/tests/Unit/ImageManagerTest.php b/tests/Unit/ImageManagerTest.php index 920b5ba9..9307ad78 100644 --- a/tests/Unit/ImageManagerTest.php +++ b/tests/Unit/ImageManagerTest.php @@ -57,7 +57,7 @@ final class ImageManagerTest extends BaseTestCase { $manager = new ImageManager(GdDriver::class); $image = $manager->animate(function ($animation) { - $animation->add($this->getTestImagePath('red.gif'), .25); + $animation->add($this->getTestResourcePath('red.gif'), .25); }); $this->assertInstanceOf(ImageInterface::class, $image); } @@ -66,7 +66,7 @@ final class ImageManagerTest extends BaseTestCase public function testReadGd(): void { $manager = new ImageManager(GdDriver::class); - $image = $manager->read($this->getTestImagePath('red.gif')); + $image = $manager->read($this->getTestResourcePath('red.gif')); $this->assertInstanceOf(ImageInterface::class, $image); } @@ -74,7 +74,7 @@ final class ImageManagerTest extends BaseTestCase public function testReadGdWithDecoderClassname(): void { $manager = new ImageManager(GdDriver::class); - $image = $manager->read($this->getTestImagePath('red.gif'), FilePathImageDecoder::class); + $image = $manager->read($this->getTestResourcePath('red.gif'), FilePathImageDecoder::class); $this->assertInstanceOf(ImageInterface::class, $image); } @@ -82,7 +82,7 @@ final class ImageManagerTest extends BaseTestCase public function testReadGdWithDecoderInstance(): void { $manager = new ImageManager(GdDriver::class); - $image = $manager->read($this->getTestImagePath('red.gif'), new FilePathImageDecoder()); + $image = $manager->read($this->getTestResourcePath('red.gif'), new FilePathImageDecoder()); $this->assertInstanceOf(ImageInterface::class, $image); } @@ -90,7 +90,7 @@ final class ImageManagerTest extends BaseTestCase public function testReadGdWithDecoderClassnameArray(): void { $manager = new ImageManager(GdDriver::class); - $image = $manager->read($this->getTestImagePath('red.gif'), [FilePathImageDecoder::class]); + $image = $manager->read($this->getTestResourcePath('red.gif'), [FilePathImageDecoder::class]); $this->assertInstanceOf(ImageInterface::class, $image); } @@ -98,7 +98,7 @@ final class ImageManagerTest extends BaseTestCase public function testReadGdWithDecoderInstanceArray(): void { $manager = new ImageManager(GdDriver::class); - $image = $manager->read($this->getTestImagePath('red.gif'), [new FilePathImageDecoder()]); + $image = $manager->read($this->getTestResourcePath('red.gif'), [new FilePathImageDecoder()]); $this->assertInstanceOf(ImageInterface::class, $image); } @@ -106,7 +106,7 @@ final class ImageManagerTest extends BaseTestCase public function testReadGdWithDecoderInstanceArrayMultiple(): void { $manager = new ImageManager(GdDriver::class); - $image = $manager->read($this->getTestImagePath('red.gif'), [ + $image = $manager->read($this->getTestResourcePath('red.gif'), [ new BinaryImageDecoder(), new FilePathImageDecoder(), ]); @@ -117,7 +117,7 @@ final class ImageManagerTest extends BaseTestCase public function testReadGdWithRotationAdjustment(): void { $manager = new ImageManager(GdDriver::class); - $image = $manager->read($this->getTestImagePath('orientation.jpg')); + $image = $manager->read($this->getTestResourcePath('orientation.jpg')); $this->assertColor(255, 255, 255, 255, $image->pickColor(0, 24)); } @@ -134,7 +134,7 @@ final class ImageManagerTest extends BaseTestCase { $manager = new ImageManager(ImagickDriver::class); $image = $manager->animate(function ($animation) { - $animation->add($this->getTestImagePath('red.gif'), .25); + $animation->add($this->getTestResourcePath('red.gif'), .25); }); $this->assertInstanceOf(ImageInterface::class, $image); } @@ -143,7 +143,7 @@ final class ImageManagerTest extends BaseTestCase public function testReadImagick(): void { $manager = new ImageManager(ImagickDriver::class); - $image = $manager->read($this->getTestImagePath('red.gif')); + $image = $manager->read($this->getTestResourcePath('red.gif')); $this->assertInstanceOf(ImageInterface::class, $image); } @@ -151,7 +151,7 @@ final class ImageManagerTest extends BaseTestCase public function testReadImagickWithDecoderClassname(): void { $manager = new ImageManager(ImagickDriver::class); - $image = $manager->read($this->getTestImagePath('red.gif'), FilePathImageDecoder::class); + $image = $manager->read($this->getTestResourcePath('red.gif'), FilePathImageDecoder::class); $this->assertInstanceOf(ImageInterface::class, $image); } @@ -159,7 +159,7 @@ final class ImageManagerTest extends BaseTestCase public function testReadImagickWithDecoderInstance(): void { $manager = new ImageManager(ImagickDriver::class); - $image = $manager->read($this->getTestImagePath('red.gif'), new FilePathImageDecoder()); + $image = $manager->read($this->getTestResourcePath('red.gif'), new FilePathImageDecoder()); $this->assertInstanceOf(ImageInterface::class, $image); } @@ -167,7 +167,7 @@ final class ImageManagerTest extends BaseTestCase public function testReadImagickWithDecoderClassnameArray(): void { $manager = new ImageManager(ImagickDriver::class); - $image = $manager->read($this->getTestImagePath('red.gif'), [FilePathImageDecoder::class]); + $image = $manager->read($this->getTestResourcePath('red.gif'), [FilePathImageDecoder::class]); $this->assertInstanceOf(ImageInterface::class, $image); } @@ -175,7 +175,7 @@ final class ImageManagerTest extends BaseTestCase public function testReadImagickWithDecoderInstanceArray(): void { $manager = new ImageManager(ImagickDriver::class); - $image = $manager->read($this->getTestImagePath('red.gif'), [new FilePathImageDecoder()]); + $image = $manager->read($this->getTestResourcePath('red.gif'), [new FilePathImageDecoder()]); $this->assertInstanceOf(ImageInterface::class, $image); } @@ -183,7 +183,7 @@ final class ImageManagerTest extends BaseTestCase public function testReadImagickWithDecoderInstanceArrayMultiple(): void { $manager = new ImageManager(ImagickDriver::class); - $image = $manager->read($this->getTestImagePath('red.gif'), [ + $image = $manager->read($this->getTestResourcePath('red.gif'), [ new BinaryImageDecoder(), new FilePathImageDecoder(), ]); @@ -194,7 +194,7 @@ final class ImageManagerTest extends BaseTestCase public function testReadImagickWithRotationAdjustment(): void { $manager = new ImageManager(ImagickDriver::class); - $image = $manager->read($this->getTestImagePath('orientation.jpg')); + $image = $manager->read($this->getTestResourcePath('orientation.jpg')); $this->assertColor(255, 255, 255, 255, $image->pickColor(0, 24)); } } diff --git a/tests/Unit/OriginTest.php b/tests/Unit/OriginTest.php index b3eec4d2..2932ed48 100644 --- a/tests/Unit/OriginTest.php +++ b/tests/Unit/OriginTest.php @@ -11,13 +11,13 @@ final class OriginTest extends BaseTestCase { public function testFilePath(): void { - $origin = new Origin('image/jpeg', $this->getTestImagePath('example.jpg')); - $this->assertEquals($this->getTestImagePath('example.jpg'), $origin->filePath()); + $origin = new Origin('image/jpeg', $this->getTestResourcePath('example.jpg')); + $this->assertEquals($this->getTestResourcePath('example.jpg'), $origin->filePath()); } public function testFileExtension(): void { - $origin = new Origin('image/jpeg', $this->getTestImagePath('example.jpg')); + $origin = new Origin('image/jpeg', $this->getTestResourcePath('example.jpg')); $this->assertEquals('jpg', $origin->fileExtension()); $origin = new Origin('image/jpeg'); diff --git a/tests/Unit/Typography/FontTest.php b/tests/Unit/Typography/FontTest.php index 3ef55418..93d720fa 100644 --- a/tests/Unit/Typography/FontTest.php +++ b/tests/Unit/Typography/FontTest.php @@ -39,7 +39,7 @@ final class FontTest extends BaseTestCase $font = new Font(); $this->assertEquals(null, $font->filename()); $this->assertFalse($font->hasFilename()); - $filename = $this->getTestImagePath(); + $filename = $this->getTestResourcePath(); $result = $font->setFilename($filename); $this->assertTrue($font->hasFilename()); $this->assertInstanceOf(Font::class, $result);