http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100576
Revision: 100576
Author: bawolff
Date: 2011-10-24 02:47:22 +0000 (Mon, 24 Oct 2011)
Log Message:
-----------
(follow-up r100575 / r99477) unit-tests for jpegMetadataExtractor dealing with
padding bytes.
Modified Paths:
--------------
trunk/phase3/tests/phpunit/data/media/README
trunk/phase3/tests/phpunit/includes/media/JpegMetadataExtractorTest.php
Added Paths:
-----------
trunk/phase3/tests/phpunit/data/media/jpeg-padding-even.jpg
trunk/phase3/tests/phpunit/data/media/jpeg-padding-odd.jpg
Modified: trunk/phase3/tests/phpunit/data/media/README
===================================================================
--- trunk/phase3/tests/phpunit/data/media/README 2011-10-24 02:41:34 UTC
(rev 100575)
+++ trunk/phase3/tests/phpunit/data/media/README 2011-10-24 02:47:22 UTC
(rev 100576)
@@ -25,7 +25,8 @@
jpeg-comment-iso8859-1.jpg, jpeg-comment-binary.jpg, jpeg-xmp-psir.jpg,
jpeg-xmp-alt.jpg, animated.gif, exif-user-comment.jpg, animated-xmp.gif,
iptc-timetest-invalid.jpg, jpeg-iptc-bad-hash.jpg, iptc-timetest.jpg,
-xmp.png, nonanimated.gif, exif-gps.jpg, jpeg-xmp-psir.xmp,
jpeg-iptc-good-hash.jpg
+xmp.png, nonanimated.gif, exif-gps.jpg, jpeg-xmp-psir.xmp,
jpeg-iptc-good-hash.jpg,
+jpeg-padding-even.jpg, jpeg-padding-odd.jpg
Are all by Bawolff. I don't think they contain enough originality to
claim copyright, but on the off chance they do, feel free to use them
however you feel fit, without restriction.
Added: trunk/phase3/tests/phpunit/data/media/jpeg-padding-even.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/phase3/tests/phpunit/data/media/jpeg-padding-even.jpg
___________________________________________________________________
Added: svn:mime-type
+ image/jpeg
Added: trunk/phase3/tests/phpunit/data/media/jpeg-padding-odd.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/phase3/tests/phpunit/data/media/jpeg-padding-odd.jpg
___________________________________________________________________
Added: svn:mime-type
+ image/jpeg
Modified:
trunk/phase3/tests/phpunit/includes/media/JpegMetadataExtractorTest.php
===================================================================
--- trunk/phase3/tests/phpunit/includes/media/JpegMetadataExtractorTest.php
2011-10-24 02:41:34 UTC (rev 100575)
+++ trunk/phase3/tests/phpunit/includes/media/JpegMetadataExtractorTest.php
2011-10-24 02:47:22 UTC (rev 100576)
@@ -12,10 +12,25 @@
$this->filePath = dirname( __FILE__ ) . '/../../data/media/';
}
- public function testUtf8Comment() {
- $res = JpegMetadataExtractor::segmentSplitter( $this->filePath
. 'jpeg-comment-utf.jpg' );
+ /**
+ * We also use this test to test padding bytes don't
+ * screw stuff up
+ *
+ * @param $file filename
+ *
+ * @dataProvider dataUtf8Comment
+ */
+ public function testUtf8Comment( $file ) {
+ $res = JpegMetadataExtractor::segmentSplitter( $this->filePath
. $file );
$this->assertEquals( array( 'UTF-8 JPEG Comment — ¼' ),
$res['COM'] );
}
+ public function dataUtf8Comment() {
+ return array(
+ array( 'jpeg-comment-utf.jpg' ),
+ array( 'jpeg-padding-even.jpg' ),
+ array( 'jpeg-padding-odd.jpg' ),
+ );
+ }
/** The file is iso-8859-1, but it should get auto converted */
public function testIso88591Comment() {
$res = JpegMetadataExtractor::segmentSplitter( $this->filePath
. 'jpeg-comment-iso8859-1.jpg' );
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
