}
}
if( $total > 0 ) {
- $ratio = IntVal( 100.0 * $success / $total );
+ $ratio = sprintf( "%.2f", 100 * $success / $total );
print $this->termColor( 1 ) . "\nPassed $success of $total tests ($ratio%) ";
if( $success == $total ) {
print $this->termColor( 32 ) . "PASSED!";
$this->teardownGlobals();
- if( $result === $out ) {
+ if( $result === $out && $this->wellFormed( $out ) ) {
return $this->showSuccess( $desc );
} else {
return $this->showFailure( $desc, $result, $out );
'wgSitename' => 'MediaWiki',
'wgLanguageCode' => 'en',
'wgContLanguageCode' => 'en',
- 'wgUseLatin1' => false,
'wgDBprefix' => 'parsertest',
'wgDefaultUserOptions' => array(),
'wgCapitalLinks' => true,
'wgDefaultUserOptions' => array(),
'wgNoFollowLinks' => true,
+ 'wgThumbnailScriptPath' => false,
);
$this->savedGlobals = array();
foreach( $settings as $var => $val ) {
'recentchanges',
'watchlist', 'math', 'searchindex',
'interwiki', 'querycache',
- 'objectcache', 'group'
+ 'objectcache', 'groups'
);
}
) );
# Hack: initialize a group
- $db->insert( 'group', array(
- 'group_id' => 1,
- 'group_name' => 'Anonymous',
- 'group_description' => 'Anonymous users',
- 'group_rights' => 'read' ) );
+ $db->insert( 'groups', array(
+ 'gr_id' => 1,
+ 'gr_name' => 'Anonymous',
+ 'gr_description' => 'Anonymous users',
+ 'gr_rights' => 'read' ) );
+
+ # Hack: Insert an image to work with
+ $db->insert( 'image', array(
+ 'img_name' => 'Foobar.jpg',
+ 'img_size' => 12345,
+ 'img_description' => 'Some lame file',
+ 'img_user' => 1,
+ 'img_user_text' => 'WikiSysop',
+ 'img_timestamp' => $db->timestamp( '20010115123500' ),
+ 'img_width' => 1941,
+ 'img_height' => 220,
+ 'img_bits' => 24,
+ 'img_type' => 2, // 2 == JPEG
+ ) );
$setupDB = true;
}
* @access private
*/
function setupUploadDir() {
+ global $IP;
+
$dir = "/tmp/mwParser-" . mt_rand() . "-images";
mkdir( $dir );
mkdir( $dir . '/3' );
mkdir( $dir . '/3/3a' );
+
+ $img = "$IP/skins/monobook/headbg.jpg";
+ $h = fopen($img, 'r');
+ $c = fread($h, filesize($img));
+ fclose($h);
+
$f = fopen( $dir . '/3/3a/Foobar.jpg', 'wb' );
- fwrite( $f, 'Dummy file' );
+ fwrite( $f, $c );
fclose( $f );
return $dir;
}
unlink( "$dir/3/3a/Foobar.jpg" );
rmdir( "$dir/3/3a" );
rmdir( "$dir/3" );
- @rmdir( "$dir/thumb/3/39" );
+
+ @unlink( "$dir/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" );
+ @rmdir( "$dir/thumb/3/3a/Foobar.jpg" );
+ @rmdir( "$dir/thumb/3/3a" );
+ @rmdir( "$dir/thumb/3/39" ); # wtf?
@rmdir( "$dir/thumb/3" );
@rmdir( "$dir/thumb" );
rmdir( "$dir" );
if( $this->showDiffs ) {
print $this->quickDiff( $result, $html );
}
+ if( !$this->wellFormed( $html ) ) {
+ print "XML error: $this->mXmlError\n";
+ }
return false;
}
}
return $text;
}
+
+ function wellFormed( $text ) {
+ $html =
+ '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" ' .
+ '"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">' .
+ '<html>' .
+ $text .
+ '</html>';
+
+ $parser = xml_parser_create( "UTF-8" );
+
+ # case folding violates XML standard, turn it off
+ xml_parser_set_option( $parser, XML_OPTION_CASE_FOLDING, false );
+
+ if( !xml_parse( $parser, $html, true ) ) {
+ $err = xml_error_string( xml_get_error_code( $parser ) );
+ $position = xml_get_current_byte_index( $parser );
+ $fragment = $this->extractFragment( $html, $position );
+ $this->mXmlError = "$err at byte $position:\n$fragment";
+ xml_parser_free( $parser );
+ return false;
+ }
+ xml_parser_free( $parser );
+ return true;
+ }
+
+ function extractFragment( $text, $position ) {
+ $start = max( 0, $position - 10 );
+ $before = $position - $start;
+ $fragment = '...' .
+ $this->termColor( 34 ) .
+ substr( $text, $start, $before ) .
+ $this->termColor( 0 ) .
+ $this->termColor( 31 ) .
+ $this->termColor( 1 ) .
+ substr( $text, $position, 1 ) .
+ $this->termColor( 0 ) .
+ $this->termColor( 34 ) .
+ substr( $text, $position + 1, 9 ) .
+ $this->termColor( 0 ) .
+ '...';
+ $display = str_replace( "\n", ' ', $fragment );
+ $caret = ' ' .
+ str_repeat( ' ', $before ) .
+ $this->termColor( 31 ) .
+ '^' .
+ $this->termColor( 0 );
+ return "$display\n$caret";
+ }
+
}
if( isset( $options['help'] ) ) {
exit ($ok ? 0 : -1);
-?>
\ No newline at end of file
+?>