Followup r100905, disabling testGetRollbackToken because it reports as failed on...

[lhc/web/wiklou.git] / tests / phpunit / includes / SiteConfigurationTest.php

diff --git a/tests/phpunit/includes/SiteConfigurationTest.php b/tests/phpunit/includes/SiteConfigurationTest.php
index 9bfab9e..57d3532 100644 (file)
--- a/tests/phpunit/includes/SiteConfigurationTest.php
+++ b/tests/phpunit/includes/SiteConfigurationTest.php
@@ -22,7 +22,7 @@ function getSiteParams( $conf, $wiki ) {
        );
 }
 
-class SiteConfigurationTest extends PHPUnit_Framework_TestCase {
+class SiteConfigurationTest extends MediaWikiTestCase {
        var $mConf;
 
        function setUp() {
@@ -93,7 +93,7 @@ class SiteConfigurationTest extends PHPUnit_Framework_TestCase {
        }
 
 
-       function testSiteFromDB() {
+       function testSiteFromDb() {
                $this->assertEquals(
                        array( 'wikipedia', 'en' ),
                        $this->mConf->siteFromDB( 'enwiki' ),
@@ -126,7 +126,7 @@ class SiteConfigurationTest extends PHPUnit_Framework_TestCase {
                );
        }
 
-       function testGet() {
+       function testGetConfVariables() {
                $this->assertEquals(
                        'enwiki',
                        $this->mConf->get( 'simple', 'enwiki', 'wiki' ),
@@ -238,7 +238,7 @@ class SiteConfigurationTest extends PHPUnit_Framework_TestCase {
                );
        }
 
-       function testSiteFromDBWithCallback() {
+       function testSiteFromDbWithCallback() {
                $this->mConf->siteParamsCallback = 'getSiteParams';
 
                $this->assertEquals(
@@ -258,7 +258,7 @@ class SiteConfigurationTest extends PHPUnit_Framework_TestCase {
                );
        }
 
-       function testParamReplacement() {
+       function testParameterReplacement() {
                $this->mConf->siteParamsCallback = 'getSiteParams';
 
                $this->assertEquals(
@@ -288,7 +288,7 @@ class SiteConfigurationTest extends PHPUnit_Framework_TestCase {
                );
        }
 
-       function testGetAll() {
+       function testGetAllGlobals() {
                $this->mConf->siteParamsCallback = 'getSiteParams';
 
                $getall = array(