| Index: trunk/phase3/maintenance/tests/phpunit/includes/UploadFromUrlTest.php |
| — | — | @@ -9,7 +9,7 @@ |
| 10 | 10 | |
| 11 | 11 | public function setUp() { |
| 12 | 12 | global $wgEnableUploads, $wgAllowCopyUploads, $wgAllowAsyncCopyUploads; |
| 13 | | - parent::setup(); |
| | 13 | + parent::setUp(); |
| 14 | 14 | |
| 15 | 15 | $wgEnableUploads = true; |
| 16 | 16 | $wgAllowCopyUploads = true; |
| Index: trunk/phase3/maintenance/tests/phpunit/includes/db/DatabaseSqliteTest.php |
| — | — | @@ -23,7 +23,7 @@ |
| 24 | 24 | class DatabaseSqliteTest extends PHPUnit_Framework_TestCase { |
| 25 | 25 | var $db; |
| 26 | 26 | |
| 27 | | - public function setup() { |
| | 27 | + public function setUp() { |
| 28 | 28 | if ( !Sqlite::isPresent() ) { |
| 29 | 29 | $this->markTestSkipped( 'No SQLite support detected' ); |
| 30 | 30 | } |
| — | — | @@ -84,4 +84,4 @@ |
| 85 | 85 | $this->fail( $result ); |
| 86 | 86 | } |
| 87 | 87 | } |
| 88 | | -} |
| | 88 | +} |
| \ No newline at end of file |
| Index: trunk/phase3/maintenance/tests/phpunit/includes/HttpTest.php |
| — | — | @@ -27,7 +27,7 @@ |
| 28 | 28 | |
| 29 | 29 | var $test_posturl = array( "http://www.comp.leeds.ac.uk/cgi-bin/Perl/environment-example" => "review=test" ); |
| 30 | 30 | |
| 31 | | - function setup() { |
| | 31 | + function setUp() { |
| 32 | 32 | putenv( "http_proxy" ); /* Remove any proxy env var, so curl doesn't get confused */ |
| 33 | 33 | if ( is_array( self::$content ) ) { |
| 34 | 34 | return; |
| Index: trunk/phase3/maintenance/tests/phpunit/includes/search/SearchEngineTest.php |
| — | — | @@ -13,7 +13,7 @@ |
| 14 | 14 | * Checks for database type & version. |
| 15 | 15 | * Will skip current test if DB does not support search. |
| 16 | 16 | */ |
| 17 | | - function setup() { |
| | 17 | + function setUp() { |
| 18 | 18 | // Search tests require MySQL or SQLite with FTS |
| 19 | 19 | # Get database type and version |
| 20 | 20 | $dbType = $this->db->getType(); |
| Index: trunk/phase3/maintenance/tests/phpunit/includes/api/ApiTest.php |
| — | — | @@ -19,10 +19,6 @@ |
| 20 | 20 | |
| 21 | 21 | class ApiTest extends ApiTestSetup { |
| 22 | 22 | |
| 23 | | - function setup() { |
| 24 | | - parent::setup(); |
| 25 | | - } |
| 26 | | - |
| 27 | 23 | function testRequireOnlyOneParameterDefault() { |
| 28 | 24 | $mock = new MockApi(); |
| 29 | 25 | |
| Index: trunk/phase3/maintenance/tests/phpunit/includes/UploadTest.php |
| — | — | @@ -8,7 +8,7 @@ |
| 9 | 9 | |
| 10 | 10 | function setUp() { |
| 11 | 11 | global $wgContLang; |
| 12 | | - parent::setup(); |
| | 12 | + parent::setUp(); |
| 13 | 13 | $wgContLang = Language::factory( 'en' ); |
| 14 | 14 | $this->upload = new UploadTestHandler; |
| 15 | 15 | } |
| Index: trunk/phase3/maintenance/tests/phpunit/includes/CdbTest.php |
| — | — | @@ -6,7 +6,7 @@ |
| 7 | 7 | |
| 8 | 8 | class CdbTest extends PHPUnit_Framework_TestCase { |
| 9 | 9 | |
| 10 | | - public function setup() { |
| | 10 | + public function setUp() { |
| 11 | 11 | if ( !CdbReader::haveExtension() ) { |
| 12 | 12 | $this->markTestIncomplete( 'This test requires native CDB support to be present.' ); |
| 13 | 13 | } |