https://www.mediawiki.org/wiki/Special:Code/MediaWiki/102045
Revision: 102045
Author: maxsem
Date: 2011-11-04 20:46:04 +0000 (Fri, 04 Nov 2011)
Log Message:
-----------
Windows compat for a couple of tests :(
Modified Paths:
--------------
trunk/phase3/tests/phpunit/includes/media/GIFMetadataExtractorTest.php
trunk/phase3/tests/phpunit/includes/media/SVGMetadataExtractorTest.php
Modified: trunk/phase3/tests/phpunit/includes/media/GIFMetadataExtractorTest.php
===================================================================
--- trunk/phase3/tests/phpunit/includes/media/GIFMetadataExtractorTest.php
2011-11-04 20:40:15 UTC (rev 102044)
+++ trunk/phase3/tests/phpunit/includes/media/GIFMetadataExtractorTest.php
2011-11-04 20:46:04 UTC (rev 102045)
@@ -63,6 +63,7 @@
<?xpacket end='w'?>
EOF;
+ $xmpNugget = str_replace( "\r", '', $xmpNugget ); // Windows
compat
return array(
array( 'nonanimated.gif', array(
Modified: trunk/phase3/tests/phpunit/includes/media/SVGMetadataExtractorTest.php
===================================================================
--- trunk/phase3/tests/phpunit/includes/media/SVGMetadataExtractorTest.php
2011-11-04 20:40:15 UTC (rev 102044)
+++ trunk/phase3/tests/phpunit/includes/media/SVGMetadataExtractorTest.php
2011-11-04 20:46:04 UTC (rev 102045)
@@ -67,18 +67,20 @@
function providerSvgFilesWithXMLMetadata() {
$base = dirname( __FILE__ ) . '/../../data/media';
+ $metadata =
+ '<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";>
+ <ns4:Work xmlns:ns4="http://creativecommons.org/ns#"; rdf:about="">
+ <ns5:format
xmlns:ns5="http://purl.org/dc/elements/1.1/";>image/svg+xml</ns5:format>
+ <ns5:type xmlns:ns5="http://purl.org/dc/elements/1.1/";
rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+ </ns4:Work>
+ </rdf:RDF>';
+ $metadata = str_replace( "\r", '', $metadata ); // Windows
compat
return array(
array(
"$base/US_states_by_total_state_tax_revenue.svg",
array(
'height' => 593,
- 'metadata' =>
- '<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";>
- <ns4:Work xmlns:ns4="http://creativecommons.org/ns#"; rdf:about="">
- <ns5:format
xmlns:ns5="http://purl.org/dc/elements/1.1/";>image/svg+xml</ns5:format>
- <ns5:type xmlns:ns5="http://purl.org/dc/elements/1.1/";
rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
- </ns4:Work>
- </rdf:RDF>',
+ 'metadata' => $metadata,
'width' => 959
)
),
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
