Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266057
Change subject: Fix casing of IPTC::parse
......................................................................
Fix casing of IPTC::parse
Change-Id: Id7271fe635c92f2c82c6e45c64a8b23b69bc3c03
---
M tests/phpunit/includes/media/IPTCTest.php
1 file changed, 12 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/57/266057/1
diff --git a/tests/phpunit/includes/media/IPTCTest.php
b/tests/phpunit/includes/media/IPTCTest.php
index 06542cf..0f12229 100644
--- a/tests/phpunit/includes/media/IPTCTest.php
+++ b/tests/phpunit/includes/media/IPTCTest.php
@@ -15,25 +15,25 @@
}
/**
- * @covers IPTC::Parse
+ * @covers IPTC::parse
*/
public function testIPTCParseNoCharset88591() {
// basically IPTC for keyword with value of 0xBC which is 1/4
in iso-8859-1
// This data doesn't specify a charset. We're supposed to guess
// (which basically means utf-8 if valid, windows 1252 (iso
8859-1) if not)
$iptcData = "Photoshop
3.0\08BIM\4\4\0\0\0\0\0\x06\x1c\x02\x19\x00\x01\xBC";
- $res = IPTC::Parse( $iptcData );
+ $res = IPTC::parse( $iptcData );
$this->assertEquals( array( '¼' ), $res['Keywords'] );
}
/**
- * @covers IPTC::Parse
+ * @covers IPTC::parse
*/
public function testIPTCParseNoCharset88591b() {
/* This one contains a sequence that's valid iso 8859-1 but not
valid utf8 */
/* \xC3 = Ã, \xB8 = ¸ */
$iptcData = "Photoshop
3.0\08BIM\4\4\0\0\0\0\0\x09\x1c\x02\x19\x00\x04\xC3\xC3\xC3\xB8";
- $res = IPTC::Parse( $iptcData );
+ $res = IPTC::parse( $iptcData );
$this->assertEquals( array( 'ÃÃø' ), $res['Keywords'] );
}
@@ -41,45 +41,45 @@
* Same as testIPTCParseNoCharset88591b, but forcing the charset to
utf-8.
* What should happen is the first "\xC3\xC3" should be dropped as
invalid,
* leaving \xC3\xB8, which is ø
- * @covers IPTC::Parse
+ * @covers IPTC::parse
*/
public function testIPTCParseForcedUTFButInvalid() {
$iptcData = "Photoshop
3.0\08BIM\4\4\0\0\0\0\0\x11\x1c\x02\x19\x00\x04\xC3\xC3\xC3\xB8"
. "\x1c\x01\x5A\x00\x03\x1B\x25\x47";
- $res = IPTC::Parse( $iptcData );
+ $res = IPTC::parse( $iptcData );
$this->assertEquals( array( 'ø' ), $res['Keywords'] );
}
/**
- * @covers IPTC::Parse
+ * @covers IPTC::parse
*/
public function testIPTCParseNoCharsetUTF8() {
$iptcData = "Photoshop
3.0\08BIM\4\4\0\0\0\0\0\x07\x1c\x02\x19\x00\x02¼";
- $res = IPTC::Parse( $iptcData );
+ $res = IPTC::parse( $iptcData );
$this->assertEquals( array( '¼' ), $res['Keywords'] );
}
/**
* Testing something that has 2 values for keyword
- * @covers IPTC::Parse
+ * @covers IPTC::parse
*/
public function testIPTCParseMulti() {
$iptcData = /* identifier */ "Photoshop 3.0\08BIM\4\4"
/* length */ . "\0\0\0\0\0\x0D"
. "\x1c\x02\x19" . "\x00\x01" . "\xBC"
. "\x1c\x02\x19" . "\x00\x02" . "\xBC\xBD";
- $res = IPTC::Parse( $iptcData );
+ $res = IPTC::parse( $iptcData );
$this->assertEquals( array( '¼', '¼½' ), $res['Keywords'] );
}
/**
- * @covers IPTC::Parse
+ * @covers IPTC::parse
*/
public function testIPTCParseUTF8() {
// This has the magic "\x1c\x01\x5A\x00\x03\x1B\x25\x47" which
marks content as UTF8.
$iptcData =
"Photoshop
3.0\08BIM\4\4\0\0\0\0\0\x0F\x1c\x02\x19\x00\x02¼\x1c\x01\x5A\x00\x03\x1B\x25\x47";
- $res = IPTC::Parse( $iptcData );
+ $res = IPTC::parse( $iptcData );
$this->assertEquals( array( '¼' ), $res['Keywords'] );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/266057
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id7271fe635c92f2c82c6e45c64a8b23b69bc3c03
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy <re...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
