* (bug 20112) Bitrotted tests in the t/ directory were failing. Patch by Dan Nassett

diff --git a/t/Search.inc b/t/Search.inc
index a76acfd..5f784c6 100644 (file)
--- a/t/Search.inc
+++ b/t/Search.inc
@@ -12,7 +12,7 @@ require 'includes/Setup.php';
 function buildTestDatabase( $tables ) {
        global $wgDBprefix, $wgDBserver, $wgDBname, $wgDBtype;
        $oldPrefix = $wgDBprefix;
-       $wgDBprefix = 'parsertest';
+       $wgDBprefix = 'parsertest_';
 
        $db = wfGetDB ( DB_SLAVE );
 

diff --git a/t/inc/Database.t b/t/inc/Database.t
index edff163..ab3898e 100644 (file)
--- a/t/inc/Database.t
+++ b/t/inc/Database.t
@@ -4,10 +4,10 @@
 define( 'MEDIAWIKI', true );
 require 't/Test.php';
 
+require 'LocalSettings.php';
 require 'includes/Defines.php';
 require 'includes/ProfilerStub.php';
 require 'includes/AutoLoader.php';
-require 'LocalSettings.php';
 require 'includes/Setup.php';
 
 plan( 9 );

diff --git a/t/inc/Global.t b/t/inc/Global.t
index 976ea95..c76ff6a 100644 (file)
--- a/t/inc/Global.t
+++ b/t/inc/Global.t
@@ -4,10 +4,10 @@
 define( 'MEDIAWIKI', true );
 require 't/Test.php';
 
+require 'LocalSettings.php';
 require 'includes/Defines.php';
 require 'includes/ProfilerStub.php';
 require 'includes/AutoLoader.php';
-require 'LocalSettings.php';
 require 'includes/Setup.php';
 
 plan( 46 );

diff --git a/t/inc/Language.t b/t/inc/Language.t
index 125d67c..ab8dfa4 100644 (file)
--- a/t/inc/Language.t
+++ b/t/inc/Language.t
@@ -19,16 +19,16 @@ function test_userAdjust( &$langObj, $date, $offset, $expected ) {
 # Collection of parameters for Language_t_Offset.
 # Format: date to be formatted, localTZoffset value, expected date
 $userAdjust_tests = array(
-       array( 20061231235959,   0, 20061231235959 ),
-       array( 20061231235959,   5, 20070101000459 ),
-       array( 20061231235959,  15, 20070101001459 ),
-       array( 20061231235959,  60, 20070101005959 ),
-       array( 20061231235959,  90, 20070101012959 ),
-       array( 20061231235959, 120, 20070101015959 ),
-       array( 20061231235959, 540, 20070101085959 ),
-       array( 20061231235959,  -5, 20061231235459 ),
-       array( 20061231235959, -30, 20061231232959 ),
-       array( 20061231235959, -60, 20061231225959 ),
+       array( '20061231235959',   '0', '20061231235959' ),
+       array( '20061231235959',   '5', '20070101000459' ),
+       array( '20061231235959',  '15', '20070101001459' ),
+       array( '20061231235959',  '60', '20070101005959' ),
+       array( '20061231235959',  '90', '20070101012959' ),
+       array( '20061231235959', '120', '20070101015959' ),
+       array( '20061231235959', '540', '20070101085959' ),
+       array( '20061231235959',  '-5', '20061231235459' ),
+       array( '20061231235959', '-30', '20061231232959' ),
+       array( '20061231235959', '-60', '20061231225959' ),
 );
 
 plan( count($userAdjust_tests) );

diff --git a/t/inc/LocalFile.t b/t/inc/LocalFile.t
index 09df9e1..2bd88cb 100644 (file)
--- a/t/inc/LocalFile.t
+++ b/t/inc/LocalFile.t
@@ -68,10 +68,10 @@ is( $file_hl2->getArchiveVirtualUrl(), 'mwrepo://test/public/archive/a/a2', 'Get
 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->getThumbVirtualUrl(), 'mwrepo://test/thumb/Test%21', 'Get thumb virtual url, hasLev 0' );
+is( $file_hl2->getThumbVirtualUrl(), 'mwrepo://test/thumb/a/a2/Test%21', 'Get thumb virtual url, hasLev 2' );
+is( $file_hl0->getThumbVirtualUrl( '!' ), 'mwrepo://test/thumb/Test%21/%21', 'Get thumb virtual url, hasLev 0' );
+is( $file_hl2->getThumbVirtualUrl( '!' ), 'mwrepo://test/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/Revision.t b/t/inc/Revision.t
index a6f2849..5ee0b16 100644 (file)
--- a/t/inc/Revision.t
+++ b/t/inc/Revision.t
@@ -3,6 +3,8 @@
 
 define( 'MEDIAWIKI', true );
 require 't/Test.php';
+require 'LocalSettings.php';
+require_once('includes/LocalisationCache.php');
 
 plan( 19 );