Update auf 1.13.0

13 files changed, 492 insertions, 27 deletions

diff --git a/t/inc/Database.t b/t/inc/Database.t
new file mode 100644
index 00000000..5092be9d
--- /dev/null
+++ b/t/inc/Database.t
@@ -0,0 +1,55 @@
+#!/usr/bin/env php
+<?php
+
+define( 'MEDIAWIKI', true );
+require 't/Test.php';
+
+require 'includes/Defines.php';
+require 'LocalSettings.php';
+
+plan( 13 );
+
+require_ok( 'includes/ProfilerStub.php' );
+require_ok( 'includes/GlobalFunctions.php' );
+require_ok( 'includes/Exception.php' );
+require_ok( 'includes/Database.php' );
+
+$db = new Database( $wgDBserver, $wgDBuser, $wgDBpassword );
+
+cmp_ok( $db->addQuotes( NULL ), '==',
+	'NULL', 'Add quotes to NULL' );
+
+cmp_ok( $db->addQuotes( 1234 ), '==',
+	"'1234'", 'Add quotes to int' );
+
+cmp_ok( $db->addQuotes( 1234.5678 ), '==',
+	"'1234.5678'", 'Add quotes to float' );
+
+cmp_ok( $db->addQuotes( 'string' ), '==',
+	"'string'", 'Add quotes to string' );
+	
+cmp_ok( $db->addQuotes( "string's cause trouble" ), '==',
+	"'string\'s cause trouble'", 'Add quotes to quoted string' );
+
+$sql = $db->fillPrepared(
+	'SELECT * FROM interwiki', array() );
+cmp_ok( $sql, '==',
+	'SELECT * FROM interwiki', 'FillPrepared empty' );
+
+$sql = $db->fillPrepared(
+	'SELECT * FROM cur WHERE cur_namespace=? AND cur_title=?',
+	array( 4, "Snicker's_paradox" ) );
+cmp_ok( $sql, '==',
+	"SELECT * FROM cur WHERE cur_namespace='4' AND cur_title='Snicker\'s_paradox'", 'FillPrepared question' );
+
+$sql = $db->fillPrepared(
+	'SELECT user_id FROM ! WHERE user_name=?',
+	array( '"user"', "Slash's Dot" ) );
+cmp_ok( $sql, '==',
+	"SELECT user_id FROM \"user\" WHERE user_name='Slash\'s Dot'", 'FillPrepared quoted' );
+
+$sql = $db->fillPrepared(
+	"SELECT * FROM cur WHERE cur_title='This_\\&_that,_WTF\\?\\!'",
+	array( '"user"', "Slash's Dot" ) );
+cmp_ok( $sql, '==',
+	"SELECT * FROM cur WHERE cur_title='This_&_that,_WTF?!'", 'FillPrepared raw' );
diff --git a/t/inc/Global.t b/t/inc/Global.t
new file mode 100644
index 00000000..adf8d135
--- /dev/null
+++ b/t/inc/Global.t
@@ -0,0 +1,154 @@
+#!/usr/bin/env php
+<?php
+
+define( 'MEDIAWIKI', true );
+require 't/Test.php';
+
+require 'includes/Defines.php';
+require 'LocalSettings.php';
+
+plan( 48 );
+
+require_ok( 'includes/ProfilerStub.php' );
+require_ok( 'includes/GlobalFunctions.php' );
+
+$wgReadOnly = null;
+$wgReadOnlyFile = tempnam(wfTempDir(), "mwtest_readonly");
+unlink( $wgReadOnlyFile );
+
+isnt( wfRandom(), wfRandom(), "Two differents random" );
+
+is( wfUrlencode( "\xE7\x89\xB9\xE5\x88\xA5:Contributions/Foobar" ),
+	"%E7%89%B9%E5%88%A5:Contributions/Foobar", 'Urlencode' );
+
+is( wfReadOnly(), false, 'Empty read only' );
+
+is( wfReadOnly(), false, 'Empty read only, second time' );
+
+$f = fopen( $wgReadOnlyFile, "wt" );
+fwrite( $f, 'Message' );
+fclose( $f );
+$wgReadOnly = null;
+
+is( wfReadOnly(), true, 'Read only file set' );
+
+is( wfReadOnly(), true, 'Read only file set, second time' );
+
+unlink( $wgReadOnlyFile );
+$wgReadOnly = null;
+
+is( wfReadOnly(), false, 'Read only reset' );
+
+is( wfReadOnly(), false, 'Read only reset, second time' );
+
+
+is( wfQuotedPrintable( "\xc4\x88u legebla?", "UTF-8" ), 
+	"=?UTF-8?Q?=C4=88u=20legebla=3F?=", 'Quoted printable' );
+
+$start = wfTime();
+is( gettype( $start ), 'float', 'Time (type)' );
+$end = wfTime();
+cmp_ok( $end, '>', $start, 'Time' );
+
+$arr = wfArrayToCGI(
+	array( 'baz' => 'AT&T', 'ignore' => '' ),
+	array( 'foo' => 'bar', 'baz' => 'overridden value' ) );
+is( $arr, "baz=AT%26T&foo=bar", 'Array to CGI' );
+
+$mime = mimeTypeMatch( 'text/html', array(
+	'application/xhtml+xml' => 1.0,
+	'text/html'  => 0.7,
+	'text/plain' => 0.3
+) );
+is( $mime, 'text/html', 'Mime (1)' );
+
+$mime = mimeTypeMatch( 'text/html', array(
+	'image/*' => 1.0,
+	'text/*'  => 0.5
+) );
+is( $mime, 'text/*', 'Mime (2)' );
+
+$mime = mimeTypeMatch( 'text/html', array( '*/*' => 1.0 ) );
+is( $mime, '*/*', 'Mime (3)' );
+
+$mime = mimeTypeMatch( 'text/html', array(
+	'image/png'     => 1.0,
+	'image/svg+xml' => 0.5
+) );
+is( $mime, null, 'Mime (4)' );
+
+$mime = wfNegotiateType(
+	array( 'application/xhtml+xml' => 1.0,
+	       'text/html'             => 0.7,
+	       'text/plain'            => 0.5,
+	       'text/*'                => 0.2 ),
+	array( 'text/html'             => 1.0 ) );
+is( $mime, 'text/html', 'Negotiate Mime (1)' );
+
+$mime = wfNegotiateType(
+	array( 'application/xhtml+xml' => 1.0,
+	       'text/html'             => 0.7,
+	       'text/plain'            => 0.5,
+	       'text/*'                => 0.2 ),
+	array( 'application/xhtml+xml' => 1.0,
+	       'text/html'             => 0.5 ) );
+is( $mime, 'application/xhtml+xml', 'Negotiate Mime (2)' );
+
+$mime = wfNegotiateType(
+	array( 'text/html'             => 1.0,
+	       'text/plain'            => 0.5,
+	       'text/*'                => 0.5,
+	       'application/xhtml+xml' => 0.2 ),
+	array( 'application/xhtml+xml' => 1.0,
+	       'text/html'             => 0.5 ) );
+is( $mime, 'text/html', 'Negotiate Mime (3)' );
+
+$mime = wfNegotiateType(
+	array( 'text/*'                => 1.0,
+	       'image/*'               => 0.7,
+	       '*/*'                   => 0.3 ),
+	array( 'application/xhtml+xml' => 1.0,
+	       'text/html'             => 0.5 ) );
+is( $mime, 'text/html', 'Negotiate Mime (4)' );
+
+$mime = wfNegotiateType(
+	array( 'text/*'                => 1.0 ),
+	array( 'application/xhtml+xml' => 1.0 ) );
+is( $mime, null, 'Negotiate Mime (5)' );
+
+$t = gmmktime( 12, 34, 56, 1, 15, 2001 );
+is( wfTimestamp( TS_MW, $t ), '20010115123456', 'TS_UNIX to TS_MW' );
+is( wfTimestamp( TS_UNIX, $t ), 979562096, 'TS_UNIX to TS_UNIX' );
+is( wfTimestamp( TS_DB, $t ), '2001-01-15 12:34:56', 'TS_UNIX to TS_DB' );
+$t = '20010115123456';
+is( wfTimestamp( TS_MW, $t ), '20010115123456', 'TS_MW to TS_MW' );
+is( wfTimestamp( TS_UNIX, $t ), 979562096, 'TS_MW to TS_UNIX' );
+is( wfTimestamp( TS_DB, $t ), '2001-01-15 12:34:56', 'TS_MW to TS_DB' );
+$t = '2001-01-15 12:34:56';
+is( wfTimestamp( TS_MW, $t ), '20010115123456', 'TS_DB to TS_MW' );
+is( wfTimestamp( TS_UNIX, $t ), 979562096, 'TS_DB to TS_UNIX' );
+is( wfTimestamp( TS_DB, $t ), '2001-01-15 12:34:56', 'TS_DB to TS_DB' );
+
+$sets = array(
+	'' => '',
+	'/' => '',
+	'\\' => '',
+	'//' => '',
+	'\\\\' => '',
+	'a' => 'a',
+	'aaaa' => 'aaaa',
+	'/a' => 'a',
+	'\\a' => 'a',
+	'/aaaa' => 'aaaa',
+	'\\aaaa' => 'aaaa',
+	'/aaaa/' => 'aaaa',
+	'\\aaaa\\' => 'aaaa',
+	'\\aaaa\\' => 'aaaa',
+	'/mnt/upload3/wikipedia/en/thumb/8/8b/Zork_Grand_Inquisitor_box_cover.jpg/93px-Zork_Grand_Inquisitor_box_cover.jpg' => '93px-Zork_Grand_Inquisitor_box_cover.jpg',
+	'C:\\Progra~1\\Wikime~1\\Wikipe~1\\VIEWER.EXE' => 'VIEWER.EXE',
+	'Östergötland_coat_of_arms.png' => 'Östergötland_coat_of_arms.png',
+);
+foreach( $sets as $from => $to ) {
+	is( $to, wfBaseName( $from ),
+		"wfBaseName('$from') => '$to'");
+}
\ No newline at end of file
diff --git a/t/inc/IP.t b/t/inc/IP.t
index 82a61fe1..eb717252 100644
--- a/t/inc/IP.t
+++ b/t/inc/IP.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 
-require 'Test.php';
+require 't/Test.php';
 
 plan( 1120 );
 
@@ -58,4 +58,3 @@ foreach ( $private as $p ) {
 }
 
 /* vim: set filetype=php: */
-?>
diff --git a/t/inc/ImageFunctions.t b/t/inc/ImageFunctions.t
new file mode 100644
index 00000000..3a69bf77
--- /dev/null
+++ b/t/inc/ImageFunctions.t
@@ -0,0 +1,56 @@
+#!/usr/bin/env php
+<?php
+
+define( 'MEDIAWIKI', true );
+require 't/Test.php';
+
+require 'includes/Defines.php';
+
+$vals = array(
+	array(
+		'width' => 50,
+		'height' => 50,
+		'tests' => array(
+			50 => 50,
+			17 => 17,
+			18 => 18 ) ),
+	array(
+		'width' => 366,
+		'height' => 300,
+		'tests' => array(
+			50 => 61,
+			17 => 21,
+			18 => 22 ) ),
+	array(
+		'width' => 300,
+		'height' => 366,
+		'tests' => array(
+			50 => 41,
+			17 => 14,
+			18 => 15 ) ),
+	array(
+		'width' => 100,
+		'height' => 400,
+		'tests' => array(
+			50 => 12,
+			17 => 4,
+			18 => 4 ) )
+);
+
+plan( 3 + 3 * count( $vals ) );
+
+require_ok( 'includes/ProfilerStub.php' );
+require_ok( 'includes/GlobalFunctions.php' );
+require_ok( 'includes/ImageFunctions.php' );
+
+foreach( $vals as $row ) {
+	extract( $row );
+	foreach( $tests as $max => $expected ) {
+		$y = round( $expected * $height / $width );
+		$result = wfFitBoxWidth( $width, $height, $max );
+		$y2 = round( $result * $height / $width );
+		is( $result, $expected,
+			"($width, $height, $max) wanted: {$expected}x{$y}, got: {$result}x{$y2}" );
+	}
+}
+
diff --git a/t/inc/Language.t b/t/inc/Language.t
index df5e491d..125d67c1 100644
--- a/t/inc/Language.t
+++ b/t/inc/Language.t
@@ -1,18 +1,18 @@
 #!/usr/bin/env php
 <?php
 
-require 'Test.php';
+require 't/Test.php';
 
 # Test offset usage for a given language::userAdjust
-function test_userAdjust( $langObj, $date, $offset, $expected ) {
+function test_userAdjust( &$langObj, $date, $offset, $expected ) {
 	global $wgLocalTZoffset;
 	$wgLocalTZoffset = $offset;
 
 	cmp_ok(
-		$langObj->userAdjust( $date, '' ),
+		strval( $langObj->userAdjust( $date, '' ) ),
 		'==',
-		$expected,
-		"User adjust $date by $offset minutes should give $expected"
+		strval( $expected ),
+		"User adjust {$date} by {$offset} minutes should give {$expected}"
 	);
 }
 
@@ -31,25 +31,22 @@ $userAdjust_tests = array(
 	array( 20061231235959, -60, 20061231225959 ),
 );
 
-plan( 7 + count($userAdjust_tests) );
+plan( count($userAdjust_tests) );
+define( 'MEDIAWIKI', 1 );
 
-require_ok( 'includes/Defines.php' );
+# Don't use require_ok as these files need global variables
+
+require 'includes/Defines.php';
+require 'includes/ProfilerStub.php';
 
-# require_ok() doesn't work for these, find out why
-define( 'MEDIAWIKI', 1 );
 require 'LocalSettings.php';
 require 'includes/DefaultSettings.php';
 
+require 'includes/Setup.php';
+
 # Create a language object
-require_ok( 'languages/Language.php' );
-require_ok( 'includes/Title.php' );
 $wgContLang = $en = Language::factory( 'en' );
 
-# We need an user to test the lang
-require_ok( 'includes/GlobalFunctions.php' );
-require_ok( 'includes/ProfilerStub.php' );
-require_ok( 'includes/Exception.php' );
-require_ok( 'includes/User.php' );
 global $wgUser;
 $wgUser = new User();
 
@@ -59,4 +56,3 @@ foreach( $userAdjust_tests as $data ) {
 }
 
 /* vim: set filetype=php: */
-?>
diff --git a/t/inc/Licenses.t b/t/inc/Licenses.t
index 7e9f67c8..81e7abe9 100644
--- a/t/inc/Licenses.t
+++ b/t/inc/Licenses.t
@@ -1,6 +1,6 @@
 #!/usr/bin/env php
 <?php
-require 'Test.php';
+require 't/Test.php';
 
 plan(3);
 
@@ -24,4 +24,3 @@ $str = "
 #echo $lc->html;
 
 /* vim: set filetype=php: */
-?>
diff --git a/t/inc/LocalFile.t b/t/inc/LocalFile.t
new file mode 100644
index 00000000..09df9e19
--- /dev/null
+++ b/t/inc/LocalFile.t
@@ -0,0 +1,77 @@
+#!/usr/bin/env php
+<?php
+
+define( 'MEDIAWIKI', true );
+require 't/Test.php';
+
+require 'includes/Defines.php';
+require 'includes/ProfilerStub.php';
+require 'LocalSettings.php';
+require 'includes/Setup.php';
+
+/**
+ * These tests should work regardless of $wgCapitalLinks
+ */
+
+$info = array(
+	'name' => 'test',
+	'directory' => '/testdir',
+	'url' => '/testurl',
+	'hashLevels' => 2,
+	'transformVia404' => false,
+);
+
+plan( 35 );
+
+$repo_hl0 = new LocalRepo( array( 'hashLevels' => 0 ) + $info );
+$repo_hl2 = new LocalRepo( array( 'hashLevels' => 2 ) + $info );
+$repo_lc = new LocalRepo( array( 'initialCapital' => false ) + $info );
+
+$file_hl0 = $repo_hl0->newFile( 'test!' );
+$file_hl2 = $repo_hl2->newFile( 'test!' );
+$file_lc = $repo_lc->newFile( 'test!' );
+
+is( $file_hl0->getHashPath(), '', 'Get hash path, hasLev 0' );
+is( $file_hl2->getHashPath(), 'a/a2/', 'Get hash path, hasLev 2' );
+is( $file_lc->getHashPath(), 'c/c4/', 'Get hash path, lc first' );
+
+is( $file_hl0->getRel(), 'Test!', 'Get rel path, hasLev 0' );
+is( $file_hl2->getRel(), 'a/a2/Test!', 'Get rel path, hasLev 2' );
+is( $file_lc->getRel(), 'c/c4/test!', 'Get rel path, lc first' );
+
+is( $file_hl0->getUrlRel(), 'Test%21', 'Get rel url, hasLev 0' );
+is( $file_hl2->getUrlRel(), 'a/a2/Test%21', 'Get rel url, hasLev 2' );
+is( $file_lc->getUrlRel(), 'c/c4/test%21', 'Get rel url, lc first' );
+
+is( $file_hl0->getArchivePath(), '/testdir/archive', 'Get archive path, hasLev 0' );
+is( $file_hl2->getArchivePath(), '/testdir/archive/a/a2', 'Get archive path, hasLev 2' );
+is( $file_hl0->getArchivePath( '!' ), '/testdir/archive/!', 'Get archive path, hasLev 0' );
+is( $file_hl2->getArchivePath( '!' ), '/testdir/archive/a/a2/!', 'Get archive path, hasLev 2' );
+
+is( $file_hl0->getThumbPath(), '/testdir/thumb/Test!', 'Get thumb path, hasLev 0' );
+is( $file_hl2->getThumbPath(), '/testdir/thumb/a/a2/Test!', 'Get thumb path, hasLev 2' );
+is( $file_hl0->getThumbPath( 'x' ), '/testdir/thumb/Test!/x', 'Get thumb path, hasLev 0' );
+is( $file_hl2->getThumbPath( 'x' ), '/testdir/thumb/a/a2/Test!/x', 'Get thumb path, hasLev 2' );
+
+is( $file_hl0->getArchiveUrl(), '/testurl/archive', 'Get archive url, hasLev 0' );
+is( $file_hl2->getArchiveUrl(), '/testurl/archive/a/a2', 'Get archive url, hasLev 2' );
+is( $file_hl0->getArchiveUrl( '!' ), '/testurl/archive/%21', 'Get archive url, hasLev 0' );
+is( $file_hl2->getArchiveUrl( '!' ), '/testurl/archive/a/a2/%21', 'Get archive url, hasLev 2' );
+
+is( $file_hl0->getThumbUrl(), '/testurl/thumb/Test%21', 'Get thumb url, hasLev 0' );
+is( $file_hl2->getThumbUrl(), '/testurl/thumb/a/a2/Test%21', 'Get thumb url, hasLev 2' );
+is( $file_hl0->getThumbUrl( 'x' ), '/testurl/thumb/Test%21/x', 'Get thumb url, hasLev 0' );
+is( $file_hl2->getThumbUrl( 'x' ), '/testurl/thumb/a/a2/Test%21/x', 'Get thumb url, hasLev 2' );
+
+is( $file_hl0->getArchiveVirtualUrl(), 'mwrepo://test/public/archive', 'Get archive virtual url, hasLev 0' );
+is( $file_hl2->getArchiveVirtualUrl(), 'mwrepo://test/public/archive/a/a2', 'Get archive virtual url, hasLev 2' );
+is( $file_hl0->getArchiveVirtualUrl( '!' ), 'mwrepo://test/public/archive/%21', 'Get archive virtual url, hasLev 0' );
+is( $file_hl2->getArchiveVirtualUrl( '!' ), 'mwrepo://test/public/archive/a/a2/%21', 'Get archive virtual url, hasLev 2' );
+
+is( $file_hl0->getThumbVirtualUrl(), 'mwrepo://test/public/thumb/Test%21', 'Get thumb virtual url, hasLev 0' );
+is( $file_hl2->getThumbVirtualUrl(), 'mwrepo://test/public/thumb/a/a2/Test%21', 'Get thumb virtual url, hasLev 2' );
+is( $file_hl0->getThumbVirtualUrl( '!' ), 'mwrepo://test/public/thumb/Test%21/%21', 'Get thumb virtual url, hasLev 0' );
+is( $file_hl2->getThumbVirtualUrl( '!' ), 'mwrepo://test/public/thumb/a/a2/Test%21/%21', 'Get thumb virtual url, hasLev 2' );
+
+is( $file_hl0->getUrl(), '/testurl/Test%21', 'Get url, hasLev 0' );
+is( $file_hl2->getUrl(), '/testurl/a/a2/Test%21', 'Get url, hasLev 2' );
diff --git a/t/inc/Parser.t b/t/inc/Parser.t
new file mode 100644
index 00000000..9df21d9a
--- /dev/null
+++ b/t/inc/Parser.t
@@ -0,0 +1,39 @@
+#!/usr/bin/env php
+<?php
+
+require 't/Test.php';
+require 'maintenance/parserTests.inc';
+
+error_reporting( E_ALL ^ E_NOTICE );
+
+class ProveTestRecorder extends TestRecorder {
+
+	function record( $name, $res ){}
+	function report(){}
+	function reportPercentage( $success, $total ){}
+}
+
+class ProveParserTest extends ParserTest {
+	
+	function showSuccess( $desc ){
+		pass( $desc );
+	}
+	
+	function showFailure( $desc, $exp, $got ){
+		_proclaim( false, $desc, false, $got, $exp );
+	}
+	
+	function showRunFile( $path ){}
+}
+
+$options = array( 'quick', 'quiet', 'compare' );
+$tester = new ProveParserTest();
+$tester->showProgress = false;
+$tester->showFailure = false;
+$tester->recorder = new ProveTestRecorder( $tester->term );
+
+// Do not output the number of tests, if will be done automatically at the end
+
+$tester->runTestsFromFiles( $wgParserTestFiles );
+
+/* vim: set filetype=php: */
diff --git a/t/inc/Revision.t b/t/inc/Revision.t
new file mode 100644
index 00000000..a6f2849b
--- /dev/null
+++ b/t/inc/Revision.t
@@ -0,0 +1,79 @@
+#!/usr/bin/env php
+<?php
+
+define( 'MEDIAWIKI', true );
+require 't/Test.php';
+
+plan( 19 );
+
+require_ok( 'includes/Defines.php' );
+require_ok( 'includes/ProfilerStub.php' );
+require_ok( 'includes/GlobalFunctions.php' );
+require_ok( 'languages/Language.php' );
+require_ok( 'includes/Revision.php' );
+
+$wgContLang = Language::factory( 'en' );
+$wgLegacyEncoding = false;
+$wgCompressRevisions = false;
+$wgInputEncoding = 'utf-8';
+$wgOutputEncoding = 'utf-8';
+
+$row = new stdClass;
+$row->old_flags = '';
+$row->old_text = 'This is a bunch of revision text.';
+cmp_ok( Revision::getRevisionText( $row ), '==',
+	'This is a bunch of revision text.', 'Get revision text' );
+
+$row = new stdClass;
+$row->old_flags = 'gzip';
+$row->old_text = gzdeflate( 'This is a bunch of revision text.' );
+cmp_ok( Revision::getRevisionText( $row ), '==',
+	'This is a bunch of revision text.', 'Get revision text with gzip compression' );
+
+$wgLegacyEncoding = 'iso-8859-1';
+
+$row = new stdClass;
+$row->old_flags = 'utf-8';
+$row->old_text = "Wiki est l'\xc3\xa9cole superieur !";
+cmp_ok( Revision::getRevisionText( $row ), '==',
+	"Wiki est l'\xc3\xa9cole superieur !", 'Get revision text utf-8 native' );
+
+$row = new stdClass;
+$row->old_flags = '';
+$row->old_text = "Wiki est l'\xe9cole superieur !";
+cmp_ok( Revision::getRevisionText( $row ), '==',
+	"Wiki est l'\xc3\xa9cole superieur !", 'Get revision text utf-8 legacy' );
+
+$row = new stdClass;
+$row->old_flags = 'gzip,utf-8';
+$row->old_text = gzdeflate( "Wiki est l'\xc3\xa9cole superieur !" );
+cmp_ok( Revision::getRevisionText( $row ), '==',
+	"Wiki est l'\xc3\xa9cole superieur !", 'Get revision text utf-8 native and gzip' );
+
+$row = new stdClass;
+$row->old_flags = 'gzip';
+$row->old_text = gzdeflate( "Wiki est l'\xe9cole superieur !" );
+cmp_ok( Revision::getRevisionText( $row ), '==',
+	"Wiki est l'\xc3\xa9cole superieur !", 'Get revision text utf-8 native and gzip' );
+
+$row = new stdClass;
+$row->old_text = "Wiki est l'\xc3\xa9cole superieur !";
+$row->old_flags = Revision::compressRevisionText( $row->old_text );
+like( $row->old_flags, '/utf-8/', "Flags should contain 'utf-8'" );
+unlike( $row->old_flags, '/gzip/', "Flags should not contain 'gzip'" );
+cmp_ok( $row->old_text, '==',
+	"Wiki est l'\xc3\xa9cole superieur !", "Direct check" );
+cmp_ok( Revision::getRevisionText( $row ), '==',
+	"Wiki est l'\xc3\xa9cole superieur !", "getRevisionText" );
+	
+$wgCompressRevisions = true;
+
+$row = new stdClass;
+$row->old_text = "Wiki est l'\xc3\xa9cole superieur !";
+$row->old_flags = Revision::compressRevisionText( $row->old_text );
+like( $row->old_flags, '/utf-8/', "Flags should contain 'utf-8'" );
+like( $row->old_flags, '/gzip/', "Flags should contain 'gzip'" );
+cmp_ok( gzinflate( $row->old_text ), '==',
+	"Wiki est l'\xc3\xa9cole superieur !", "Direct check" );
+cmp_ok( Revision::getRevisionText( $row ), '==',
+	"Wiki est l'\xc3\xa9cole superieur !", "getRevisionText" );
diff --git a/t/inc/Sanitizer.t b/t/inc/Sanitizer.t
index 601f8a88..ae2c9a23 100644
--- a/t/inc/Sanitizer.t
+++ b/t/inc/Sanitizer.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 
-require 'Test.php';
+require 't/Test.php';
 
 plan( 13 );
 
@@ -62,4 +62,3 @@ cmp_ok(
 );
 
 /* vim: set filetype=php: */
-?>
diff --git a/t/inc/Search.t b/t/inc/Search.t
new file mode 100644
index 00000000..2f06dcd9
--- /dev/null
+++ b/t/inc/Search.t
@@ -0,0 +1,14 @@
+#!/usr/bin/env php
+<?php
+
+require 't/Search.inc';
+
+$db = buildTestDatabase( array( 'page', 'revision', 'text', 'searchindex' ) );
+if( is_null( $db ) ){
+	fail( 'no db' );
+	exit();
+}
+$t = new SearchEngineTest( new SearchMySQL( $db ) );
+$t->run();
+
+/* vim: set filetype=php: */
diff --git a/t/inc/Title.t b/t/inc/Title.t
index 53ebfcd8..7373b9f2 100644
--- a/t/inc/Title.t
+++ b/t/inc/Title.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 
-require 'Test.php';
+require 't/Test.php';
 
 plan( 2 + 255 );
 
@@ -30,4 +30,3 @@ foreach ( range( 1, 255 ) as $num ) {
 }
 
 /* vim: set filetype=php: */
-?>
diff --git a/t/inc/Xml.t b/t/inc/Xml.t
index 527cd7f5..b7cef881 100644
--- a/t/inc/Xml.t
+++ b/t/inc/Xml.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 
-require 'Test.php';
+require 't/Test.php';
 
 plan( 8 );
 
@@ -54,4 +54,3 @@ cmp_ok(
 cmp_ok( Xml::closeElement( 'element' ), '==', '</element>', 'closeElement() shortcut' );
 
 /* vim: set filetype=php: */
-?>