dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Added --sleep-per-batch to purgeChangedFiles.php"
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
SiteConfigurationTest.php
diff --git
a/tests/phpunit/includes/SiteConfigurationTest.php
b/tests/phpunit/includes/SiteConfigurationTest.php
index
4cdf020
..
053d8a7
100644
(file)
--- a/
tests/phpunit/includes/SiteConfigurationTest.php
+++ b/
tests/phpunit/includes/SiteConfigurationTest.php
@@
-24,14
+24,18
@@
function getSiteParams( $conf, $wiki ) {
}
class SiteConfigurationTest extends MediaWikiTestCase {
}
class SiteConfigurationTest extends MediaWikiTestCase {
- var $mConf;
+
+ /**
+ * @var SiteConfiguration
+ */
+ protected $mConf;
protected function setUp() {
parent::setUp();
$this->mConf = new SiteConfiguration;
protected function setUp() {
parent::setUp();
$this->mConf = new SiteConfiguration;
- $this->mConf->suffixes = array( 'wiki' );
+ $this->mConf->suffixes = array( 'wiki
pedia' => 'wiki
' );
$this->mConf->wikis = array( 'enwiki', 'dewiki', 'frwiki' );
$this->mConf->settings = array(
'simple' => array(
$this->mConf->wikis = array( 'enwiki', 'dewiki', 'frwiki' );
$this->mConf->settings = array(
'simple' => array(
@@
-95,7
+99,10
@@
class SiteConfigurationTest extends MediaWikiTestCase {
$GLOBALS['global'] = array( 'global' => 'global' );
}
$GLOBALS['global'] = array( 'global' => 'global' );
}
- function testSiteFromDb() {
+ /**
+ * @covers SiteConfiguration::siteFromDB
+ */
+ public function testSiteFromDb() {
$this->assertEquals(
array( 'wikipedia', 'en' ),
$this->mConf->siteFromDB( 'enwiki' ),
$this->assertEquals(
array( 'wikipedia', 'en' ),
$this->mConf->siteFromDB( 'enwiki' ),
@@
-120,7
+127,10
@@
class SiteConfigurationTest extends MediaWikiTestCase {
);
}
);
}
- function testGetLocalDatabases() {
+ /**
+ * @covers SiteConfiguration::getLocalDatabases
+ */
+ public function testGetLocalDatabases() {
$this->assertEquals(
array( 'enwiki', 'dewiki', 'frwiki' ),
$this->mConf->getLocalDatabases(),
$this->assertEquals(
array( 'enwiki', 'dewiki', 'frwiki' ),
$this->mConf->getLocalDatabases(),
@@
-128,7
+138,10
@@
class SiteConfigurationTest extends MediaWikiTestCase {
);
}
);
}
- function testGetConfVariables() {
+ /**
+ * @covers SiteConfiguration::get
+ */
+ public function testGetConfVariables() {
$this->assertEquals(
'enwiki',
$this->mConf->get( 'simple', 'enwiki', 'wiki' ),
$this->assertEquals(
'enwiki',
$this->mConf->get( 'simple', 'enwiki', 'wiki' ),
@@
-240,7
+253,10
@@
class SiteConfigurationTest extends MediaWikiTestCase {
);
}
);
}
- function testSiteFromDbWithCallback() {
+ /**
+ * @covers SiteConfiguration::siteFromDB
+ */
+ public function testSiteFromDbWithCallback() {
$this->mConf->siteParamsCallback = 'getSiteParams';
$this->assertEquals(
$this->mConf->siteParamsCallback = 'getSiteParams';
$this->assertEquals(
@@
-260,7
+276,10
@@
class SiteConfigurationTest extends MediaWikiTestCase {
);
}
);
}
- function testParameterReplacement() {
+ /**
+ * @covers SiteConfiguration::get
+ */
+ public function testParameterReplacement() {
$this->mConf->siteParamsCallback = 'getSiteParams';
$this->assertEquals(
$this->mConf->siteParamsCallback = 'getSiteParams';
$this->assertEquals(
@@
-290,7
+309,10
@@
class SiteConfigurationTest extends MediaWikiTestCase {
);
}
);
}
- function testGetAllGlobals() {
+ /**
+ * @covers SiteConfiguration::getAll
+ */
+ public function testGetAllGlobals() {
$this->mConf->siteParamsCallback = 'getSiteParams';
$getall = array(
$this->mConf->siteParamsCallback = 'getSiteParams';
$getall = array(