r102045 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r102044‎ | r102045 | r102046 >
Date:20:46, 4 November 2011
Author:maxsem
Status:ok
Tags:
Comment:
Windows compat for a couple of tests :(
Modified paths:
  • /trunk/phase3/tests/phpunit/includes/media/GIFMetadataExtractorTest.php (modified) (history)
  • /trunk/phase3/tests/phpunit/includes/media/SVGMetadataExtractorTest.php (modified) (history)

Diff [purge]

Index: trunk/phase3/tests/phpunit/includes/media/SVGMetadataExtractorTest.php
@@ -67,18 +67,20 @@
6868
6969 function providerSvgFilesWithXMLMetadata() {
7070 $base = dirname( __FILE__ ) . '/../../data/media';
 71+ $metadata =
 72+ '<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 73+ <ns4:Work xmlns:ns4="http://creativecommons.org/ns#" rdf:about="">
 74+ <ns5:format xmlns:ns5="http://purl.org/dc/elements/1.1/">image/svg+xml</ns5:format>
 75+ <ns5:type xmlns:ns5="http://purl.org/dc/elements/1.1/" rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
 76+ </ns4:Work>
 77+ </rdf:RDF>';
 78+ $metadata = str_replace( "\r", '', $metadata ); // Windows compat
7179 return array(
7280 array(
7381 "$base/US_states_by_total_state_tax_revenue.svg",
7482 array(
7583 'height' => 593,
76 - 'metadata' =>
77 - '<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
78 - <ns4:Work xmlns:ns4="http://creativecommons.org/ns#" rdf:about="">
79 - <ns5:format xmlns:ns5="http://purl.org/dc/elements/1.1/">image/svg+xml</ns5:format>
80 - <ns5:type xmlns:ns5="http://purl.org/dc/elements/1.1/" rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
81 - </ns4:Work>
82 - </rdf:RDF>',
 84+ 'metadata' => $metadata,
8385 'width' => 959
8486 )
8587 ),
Index: trunk/phase3/tests/phpunit/includes/media/GIFMetadataExtractorTest.php
@@ -63,6 +63,7 @@
6464
6565 <?xpacket end='w'?>
6666 EOF;
 67+ $xmpNugget = str_replace( "\r", '', $xmpNugget ); // Windows compat
6768
6869 return array(
6970 array( 'nonanimated.gif', array(

Status & tagging log