Add test assertions to validate the correct mime type

olivervogel · olivervogel · commit b496d1f6b9f8 · 2024-10-27T11:15:54.000+01:00
diff --git a/tests/Unit/Drivers/Gd/Encoders/AvifEncoderTest.php b/tests/Unit/Drivers/Gd/Encoders/AvifEncoderTest.php
@@ -20,5 +20,6 @@ public function testEncode(): void
         $encoder = new AvifEncoder(10);
         $result = $encoder->encode($image);
         $this->assertMediaType('image/avif', $result);
+        $this->assertEquals('image/avif', $result->mimetype());
     }
 }
diff --git a/tests/Unit/Drivers/Gd/Encoders/BmpEncoderTest.php b/tests/Unit/Drivers/Gd/Encoders/BmpEncoderTest.php
@@ -20,5 +20,6 @@ public function testEncode(): void
         $encoder = new BmpEncoder();
         $result = $encoder->encode($image);
         $this->assertMediaType(['image/bmp', 'image/x-ms-bmp'], $result);
+        $this->assertEquals('image/bmp', $result->mimetype());
     }
 }
diff --git a/tests/Unit/Drivers/Gd/Encoders/GifEncoderTest.php b/tests/Unit/Drivers/Gd/Encoders/GifEncoderTest.php
@@ -21,6 +21,7 @@ public function testEncode(): void
         $encoder = new GifEncoder();
         $result = $encoder->encode($image);
         $this->assertMediaType('image/gif', $result);
+        $this->assertEquals('image/gif', $result->mimetype());
         $this->assertFalse(
             Decoder::decode((string) $result)->getFirstFrame()->getImageDescriptor()->isInterlaced()
         );
@@ -32,6 +33,7 @@ public function testEncodeInterlaced(): void
         $encoder = new GifEncoder(interlaced: true);
         $result = $encoder->encode($image);
         $this->assertMediaType('image/gif', $result);
+        $this->assertEquals('image/gif', $result->mimetype());
         $this->assertTrue(
             Decoder::decode((string) $result)->getFirstFrame()->getImageDescriptor()->isInterlaced()
         );
@@ -43,6 +45,7 @@ public function testEncodeInterlacedAnimation(): void
         $encoder = new GifEncoder(interlaced: true);
         $result = $encoder->encode($image);
         $this->assertMediaType('image/gif', $result);
+        $this->assertEquals('image/gif', $result->mimetype());
         $this->assertTrue(
             Decoder::decode((string) $result)->getFirstFrame()->getImageDescriptor()->isInterlaced()
         );
diff --git a/tests/Unit/Drivers/Gd/Encoders/JpegEncoderTest.php b/tests/Unit/Drivers/Gd/Encoders/JpegEncoderTest.php
@@ -23,6 +23,7 @@ public function testEncode(): void
         $encoder = new JpegEncoder(75);
         $result = $encoder->encode($image);
         $this->assertMediaType('image/jpeg', $result);
+        $this->assertEquals('image/jpeg', $result->mimetype());
     }
 
     public function testEncodeProgressive(): void
@@ -31,6 +32,7 @@ public function testEncodeProgressive(): void
         $encoder = new JpegEncoder(progressive: true);
         $result = $encoder->encode($image);
         $this->assertMediaType('image/jpeg', $result);
+        $this->assertEquals('image/jpeg', $result->mimetype());
         $this->assertTrue($this->isProgressiveJpeg($result));
     }
 }
diff --git a/tests/Unit/Drivers/Gd/Encoders/PngEncoderTest.php b/tests/Unit/Drivers/Gd/Encoders/PngEncoderTest.php
@@ -25,6 +25,7 @@ public function testEncode(): void
         $encoder = new PngEncoder();
         $result = $encoder->encode($image);
         $this->assertMediaType('image/png', $result);
+        $this->assertEquals('image/png', $result->mimetype());
         $this->assertFalse($this->isInterlacedPng($result));
     }
 
@@ -34,6 +35,7 @@ public function testEncodeInterlaced(): void
         $encoder = new PngEncoder(interlaced: true);
         $result = $encoder->encode($image);
         $this->assertMediaType('image/png', $result);
+        $this->assertEquals('image/png', $result->mimetype());
         $this->assertTrue($this->isInterlacedPng($result));
     }
 
diff --git a/tests/Unit/Drivers/Gd/Encoders/WebpEncoderTest.php b/tests/Unit/Drivers/Gd/Encoders/WebpEncoderTest.php
@@ -20,5 +20,6 @@ public function testEncode(): void
         $encoder = new WebpEncoder(75);
         $result = $encoder->encode($image);
         $this->assertMediaType('image/webp', $result);
+        $this->assertEquals('image/webp', $result->mimetype());
     }
 }
diff --git a/tests/Unit/Drivers/Imagick/Encoders/AvifEncoderTest.php b/tests/Unit/Drivers/Imagick/Encoders/AvifEncoderTest.php
@@ -20,5 +20,6 @@ public function testEncode(): void
         $encoder = new AvifEncoder(10);
         $result = $encoder->encode($image);
         $this->assertMediaType('image/avif', $result);
+        $this->assertEquals('image/avif', $result->mimetype());
     }
 }
diff --git a/tests/Unit/Drivers/Imagick/Encoders/BmpEncoderTest.php b/tests/Unit/Drivers/Imagick/Encoders/BmpEncoderTest.php
@@ -20,5 +20,6 @@ public function testEncode(): void
         $encoder = new BmpEncoder();
         $result = $encoder->encode($image);
         $this->assertMediaType(['image/bmp', 'image/x-ms-bmp'], $result);
+        $this->assertEquals('image/bmp', $result->mimetype());
     }
 }
diff --git a/tests/Unit/Drivers/Imagick/Encoders/GifEncoderTest.php b/tests/Unit/Drivers/Imagick/Encoders/GifEncoderTest.php
@@ -21,6 +21,7 @@ public function testEncode(): void
         $encoder = new GifEncoder();
         $result = $encoder->encode($image);
         $this->assertMediaType('image/gif', $result);
+        $this->assertEquals('image/gif', $result->mimetype());
         $this->assertFalse(
             Decoder::decode((string) $result)->getFirstFrame()->getImageDescriptor()->isInterlaced()
         );
@@ -32,6 +33,7 @@ public function testEncodeInterlaced(): void
         $encoder = new GifEncoder(interlaced: true);
         $result = $encoder->encode($image);
         $this->assertMediaType('image/gif', $result);
+        $this->assertEquals('image/gif', $result->mimetype());
         $this->assertTrue(
             Decoder::decode((string) $result)->getFirstFrame()->getImageDescriptor()->isInterlaced()
         );
@@ -43,6 +45,7 @@ public function testEncodeInterlacedAnimation(): void
         $encoder = new GifEncoder(interlaced: true);
         $result = $encoder->encode($image);
         $this->assertMediaType('image/gif', $result);
+        $this->assertEquals('image/gif', $result->mimetype());
         $this->assertTrue(
             Decoder::decode((string) $result)->getFirstFrame()->getImageDescriptor()->isInterlaced()
         );
diff --git a/tests/Unit/Drivers/Imagick/Encoders/HeicEncoderTest.php b/tests/Unit/Drivers/Imagick/Encoders/HeicEncoderTest.php
@@ -20,5 +20,6 @@ public function testEncode(): void
         $encoder = new HeicEncoder(75);
         $result = $encoder->encode($image);
         $this->assertMediaType('image/heic', $result);
+        $this->assertEquals('image/heic', $result->mimetype());
     }
 }
diff --git a/tests/Unit/Drivers/Imagick/Encoders/Jpeg2000EncoderTest.php b/tests/Unit/Drivers/Imagick/Encoders/Jpeg2000EncoderTest.php
@@ -20,5 +20,6 @@ public function testEncode(): void
         $encoder = new Jpeg2000Encoder(75);
         $result = $encoder->encode($image);
         $this->assertMediaType('image/jp2', $result);
+        $this->assertEquals('image/jp2', $result->mimetype());
     }
 }
diff --git a/tests/Unit/Drivers/Imagick/Encoders/JpegEncoderTest.php b/tests/Unit/Drivers/Imagick/Encoders/JpegEncoderTest.php
@@ -23,6 +23,7 @@ public function testEncode(): void
         $encoder = new JpegEncoder(75);
         $result = $encoder->encode($image);
         $this->assertMediaType('image/jpeg', $result);
+        $this->assertEquals('image/jpeg', $result->mimetype());
     }
 
     public function testEncodeProgressive(): void
@@ -31,6 +32,7 @@ public function testEncodeProgressive(): void
         $encoder = new JpegEncoder(progressive: true);
         $result = $encoder->encode($image);
         $this->assertMediaType('image/jpeg', $result);
+        $this->assertEquals('image/jpeg', $result->mimetype());
         $this->assertTrue($this->isProgressiveJpeg($result));
     }
 }
diff --git a/tests/Unit/Drivers/Imagick/Encoders/PngEncoderTest.php b/tests/Unit/Drivers/Imagick/Encoders/PngEncoderTest.php
@@ -25,6 +25,7 @@ public function testEncode(): void
         $encoder = new PngEncoder();
         $result = $encoder->encode($image);
         $this->assertMediaType('image/png', $result);
+        $this->assertEquals('image/png', $result->mimetype());
         $this->assertFalse($this->isInterlacedPng($result));
     }
 
@@ -34,6 +35,7 @@ public function testEncodeInterlaced(): void
         $encoder = new PngEncoder(interlaced: true);
         $result = $encoder->encode($image);
         $this->assertMediaType('image/png', $result);
+        $this->assertEquals('image/png', $result->mimetype());
         $this->assertTrue($this->isInterlacedPng($result));
     }
 
diff --git a/tests/Unit/Drivers/Imagick/Encoders/TiffEncoderTest.php b/tests/Unit/Drivers/Imagick/Encoders/TiffEncoderTest.php
@@ -20,5 +20,6 @@ public function testEncode(): void
         $encoder = new TiffEncoder();
         $result = $encoder->encode($image);
         $this->assertMediaType('image/tiff', $result);
+        $this->assertEquals('image/tiff', $result->mimetype());
     }
 }
diff --git a/tests/Unit/Drivers/Imagick/Encoders/WebpEncoderTest.php b/tests/Unit/Drivers/Imagick/Encoders/WebpEncoderTest.php
@@ -20,5 +20,6 @@ public function testEncode(): void
         $encoder = new WebpEncoder(75);
         $result = $encoder->encode($image);
         $this->assertMediaType('image/webp', $result);
+        $this->assertEquals('image/webp', $result->mimetype());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,6 @@ public function testEncode(): void`
`20`	`20`	`$encoder = new AvifEncoder(10);`
`21`	`21`	`$result = $encoder->encode($image);`
`22`	`22`	`$this->assertMediaType('image/avif', $result);`
	`23`	`+ $this->assertEquals('image/avif', $result->mimetype());`
`23`	`24`	`}`
`24`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ public function testEncode(): void`
`23`	`23`	`$encoder = new JpegEncoder(75);`
`24`	`24`	`$result = $encoder->encode($image);`
`25`	`25`	`$this->assertMediaType('image/jpeg', $result);`
	`26`	`+ $this->assertEquals('image/jpeg', $result->mimetype());`
`26`	`27`	`}`
`27`	`28`
`28`	`29`	`public function testEncodeProgressive(): void`
`@@ -31,6 +32,7 @@ public function testEncodeProgressive(): void`
`31`	`32`	`$encoder = new JpegEncoder(progressive: true);`
`32`	`33`	`$result = $encoder->encode($image);`
`33`	`34`	`$this->assertMediaType('image/jpeg', $result);`
	`35`	`+ $this->assertEquals('image/jpeg', $result->mimetype());`
`34`	`36`	`$this->assertTrue($this->isProgressiveJpeg($result));`
`35`	`37`	`}`
`36`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ public function testEncode(): void`
`25`	`25`	`$encoder = new PngEncoder();`
`26`	`26`	`$result = $encoder->encode($image);`
`27`	`27`	`$this->assertMediaType('image/png', $result);`
	`28`	`+ $this->assertEquals('image/png', $result->mimetype());`
`28`	`29`	`$this->assertFalse($this->isInterlacedPng($result));`
`29`	`30`	`}`
`30`	`31`
`@@ -34,6 +35,7 @@ public function testEncodeInterlaced(): void`
`34`	`35`	`$encoder = new PngEncoder(interlaced: true);`
`35`	`36`	`$result = $encoder->encode($image);`
`36`	`37`	`$this->assertMediaType('image/png', $result);`
	`38`	`+ $this->assertEquals('image/png', $result->mimetype());`
`37`	`39`	`$this->assertTrue($this->isInterlacedPng($result));`
`38`	`40`	`}`
`39`	`41`