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 "objectcache: add "epoch" parameter to WANObjectCache"
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
title
/
NaiveImportTitleFactoryTest.php
diff --git
a/tests/phpunit/includes/title/NaiveImportTitleFactoryTest.php
b/tests/phpunit/includes/title/NaiveImportTitleFactoryTest.php
index
067d159
..
71e52e8
100644
(file)
--- a/
tests/phpunit/includes/title/NaiveImportTitleFactoryTest.php
+++ b/
tests/phpunit/includes/title/NaiveImportTitleFactoryTest.php
@@
-29,9
+29,8
@@
class NaiveImportTitleFactoryTest extends MediaWikiTestCase {
protected function setUp() {
parent::setUp();
protected function setUp() {
parent::setUp();
+ $this->setContentLang( 'en' );
$this->setMwGlobals( [
$this->setMwGlobals( [
- 'wgLanguageCode' => 'en',
- 'wgContLang' => Language::factory( 'en' ),
'wgExtraNamespaces' => [ 100 => 'Portal' ],
] );
}
'wgExtraNamespaces' => [ 100 => 'Portal' ],
] );
}
@@
-40,39
+39,39
@@
class NaiveImportTitleFactoryTest extends MediaWikiTestCase {
return [
[
new ForeignTitle( 0, '', 'MainNamespaceArticle' ),
return [
[
new ForeignTitle( 0, '', 'MainNamespaceArticle' ),
- Title::newFromText( 'MainNamespaceArticle' )
+ 'MainNamespaceArticle'
],
[
new ForeignTitle( null, '', 'MainNamespaceArticle' ),
],
[
new ForeignTitle( null, '', 'MainNamespaceArticle' ),
- Title::newFromText( 'MainNamespaceArticle' )
+ 'MainNamespaceArticle'
],
[
new ForeignTitle( 1, 'Discussion', 'Nice_talk' ),
],
[
new ForeignTitle( 1, 'Discussion', 'Nice_talk' ),
- Title::newFromText( 'Talk:Nice_talk' )
+ 'Talk:Nice_talk'
],
[
new ForeignTitle( 0, '', 'Bogus:Nice_talk' ),
],
[
new ForeignTitle( 0, '', 'Bogus:Nice_talk' ),
- Title::newFromText( 'Bogus:Nice_talk' )
+ 'Bogus:Nice_talk'
],
[
new ForeignTitle( 100, 'Bogus', 'Nice_talk' ),
],
[
new ForeignTitle( 100, 'Bogus', 'Nice_talk' ),
-
Title::newFromText( 'Bogus:Nice_talk' )
// not Portal:Nice_talk
+
'Bogus:Nice_talk'
// not Portal:Nice_talk
],
[
new ForeignTitle( 1, 'Bogus', 'Nice_talk' ),
],
[
new ForeignTitle( 1, 'Bogus', 'Nice_talk' ),
-
Title::newFromText( 'Talk:Nice_talk' )
// not Bogus:Nice_talk
+
'Talk:Nice_talk'
// not Bogus:Nice_talk
],
[
new ForeignTitle( 100, 'Portal', 'Nice_talk' ),
],
[
new ForeignTitle( 100, 'Portal', 'Nice_talk' ),
- Title::newFromText( 'Portal:Nice_talk' )
+ 'Portal:Nice_talk'
],
[
new ForeignTitle( 724, 'Portal', 'Nice_talk' ),
],
[
new ForeignTitle( 724, 'Portal', 'Nice_talk' ),
- Title::newFromText( 'Portal:Nice_talk' )
+ 'Portal:Nice_talk'
],
[
new ForeignTitle( 2, 'Portal', 'Nice_talk' ),
],
[
new ForeignTitle( 2, 'Portal', 'Nice_talk' ),
- Title::newFromText( 'User:Nice_talk' )
+ 'User:Nice_talk'
],
];
}
],
];
}
@@
-80,9
+79,10
@@
class NaiveImportTitleFactoryTest extends MediaWikiTestCase {
/**
* @dataProvider basicProvider
*/
/**
* @dataProvider basicProvider
*/
- public function testBasic( ForeignTitle $foreignTitle,
Title $title
) {
+ public function testBasic( ForeignTitle $foreignTitle,
$titleText
) {
$factory = new NaiveImportTitleFactory();
$testTitle = $factory->createTitleFromForeignTitle( $foreignTitle );
$factory = new NaiveImportTitleFactory();
$testTitle = $factory->createTitleFromForeignTitle( $foreignTitle );
+ $title = Title::newFromText( $titleText );
$this->assertTrue( $title->equals( $testTitle ) );
}
$this->assertTrue( $title->equals( $testTitle ) );
}