http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61875
Revision: 61875
Author: maxsem
Date: 2010-02-02 20:53:28 +0000 (Tue, 02 Feb 2010)
Log Message:
-----------
PHPUnit tests:
* include Setup.php in bootstrap to avoid fatals
* require --> require_once, was causing problems
* require_once "foo.php" --> require_once( "foo.php" ), that's MediaWiki common
practice
Modified Paths:
--------------
trunk/phase3/tests/ImageFunctionsTest.php
trunk/phase3/tests/LanguageConverterTest.php
trunk/phase3/tests/LocalFileTest.php
trunk/phase3/tests/SearchEngineTest.php
trunk/phase3/tests/bootstrap.php
Modified: trunk/phase3/tests/ImageFunctionsTest.php
===================================================================
--- trunk/phase3/tests/ImageFunctionsTest.php 2010-02-02 20:49:17 UTC (rev
61874)
+++ trunk/phase3/tests/ImageFunctionsTest.php 2010-02-02 20:53:28 UTC (rev
61875)
@@ -1,6 +1,6 @@
<?php
-require 'ImageFunctions.php';
+require_once( 'ImageFunctions.php' );
class ImageFunctionsTest extends PHPUnit_Framework_TestCase {
function testFitBoxWidth() {
Modified: trunk/phase3/tests/LanguageConverterTest.php
===================================================================
--- trunk/phase3/tests/LanguageConverterTest.php 2010-02-02 20:49:17 UTC
(rev 61874)
+++ trunk/phase3/tests/LanguageConverterTest.php 2010-02-02 20:53:28 UTC
(rev 61875)
@@ -1,6 +1,6 @@
<?php
-require_once 'ProxyTools.php';
+require_once( 'ProxyTools.php' );
class LanguageConverterTest extends PHPUnit_Framework_TestCase {
protected $lang = null;
Modified: trunk/phase3/tests/LocalFileTest.php
===================================================================
--- trunk/phase3/tests/LocalFileTest.php 2010-02-02 20:49:17 UTC (rev
61874)
+++ trunk/phase3/tests/LocalFileTest.php 2010-02-02 20:53:28 UTC (rev
61875)
@@ -4,7 +4,7 @@
* These tests should work regardless of $wgCapitalLinks
*/
-require 'Namespace.php';
+require_once( 'Namespace.php' );
class LocalFileTest extends PHPUnit_Framework_TestCase {
function setUp() {
Modified: trunk/phase3/tests/SearchEngineTest.php
===================================================================
--- trunk/phase3/tests/SearchEngineTest.php 2010-02-02 20:49:17 UTC (rev
61874)
+++ trunk/phase3/tests/SearchEngineTest.php 2010-02-02 20:53:28 UTC (rev
61875)
@@ -1,6 +1,6 @@
<?php
-require_once 'MediaWiki_TestCase.php';
+require_once( 'MediaWiki_TestCase.php' );
/** @todo document
*/
Modified: trunk/phase3/tests/bootstrap.php
===================================================================
--- trunk/phase3/tests/bootstrap.php 2010-02-02 20:49:17 UTC (rev 61874)
+++ trunk/phase3/tests/bootstrap.php 2010-02-02 20:53:28 UTC (rev 61875)
@@ -14,11 +14,13 @@
define( 'MEDIAWIKI', true );
define( 'MW_PHPUNIT_TEST', true );
-require_once "$IP/includes/Defines.php";
-require_once "$IP/includes/AutoLoader.php";
-require_once "$IP/LocalSettings.php";
-require_once "$IP/includes/ProfilerStub.php";
-require_once "$IP/includes/GlobalFunctions.php";
-require_once "$IP/includes/Hooks.php";
+require_once( "$IP/includes/Defines.php" );
+require_once( "$IP/includes/AutoLoader.php" );
+require_once( "$IP/LocalSettings.php" );
+require_once( "$IP/includes/ProfilerStub.php" );
+require_once( "$IP/includes/GlobalFunctions.php" );
+require_once( "$IP/includes/Hooks.php" );
+$self = __FILE__;
+require_once( "$IP/includes/Setup.php" );
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
