Merge commit 'f6d65'

# Conflicts:
#	skins/ArchLinux/ArchLinux.php

1 files changed, 89 insertions, 0 deletions

diff --git a/tests/phpunit/includes/title/NaiveImportTitleFactoryTest.php b/tests/phpunit/includes/title/NaiveImportTitleFactoryTest.php
new file mode 100644
index 00000000..98b414e0
--- /dev/null
+++ b/tests/phpunit/includes/title/NaiveImportTitleFactoryTest.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @author This, that and the other
+ */
+
+/**
+ * @covers NaiveImportTitleFactory
+ *
+ * @group Title
+ */
+class NaiveImportTitleFactoryTest extends MediaWikiTestCase {
+
+	protected function setUp() {
+		parent::setUp();
+
+		$this->setMwGlobals( array(
+			'wgLanguageCode' => 'en',
+			'wgContLang' => Language::factory( 'en' ),
+			'wgExtraNamespaces' => array( 100 => 'Portal' ),
+		) );
+	}
+
+	public function basicProvider() {
+		return array(
+			array(
+				new ForeignTitle( 0, '', 'MainNamespaceArticle' ),
+				Title::newFromText( 'MainNamespaceArticle' )
+			),
+			array(
+				new ForeignTitle( null, '', 'MainNamespaceArticle' ),
+				Title::newFromText( 'MainNamespaceArticle' )
+			),
+			array(
+				new ForeignTitle( 1, 'Discussion', 'Nice_talk' ),
+				Title::newFromText( 'Talk:Nice_talk' )
+			),
+			array(
+				new ForeignTitle( 0, '', 'Bogus:Nice_talk' ),
+				Title::newFromText( 'Bogus:Nice_talk' )
+			),
+			array(
+				new ForeignTitle( 100, 'Bogus', 'Nice_talk' ),
+				Title::newFromText( 'Bogus:Nice_talk' ) // not Portal:Nice_talk
+			),
+			array(
+				new ForeignTitle( 1, 'Bogus', 'Nice_talk' ),
+				Title::newFromText( 'Talk:Nice_talk' ) // not Bogus:Nice_talk
+			),
+			array(
+				new ForeignTitle( 100, 'Portal', 'Nice_talk' ),
+				Title::newFromText( 'Portal:Nice_talk' )
+			),
+			array(
+				new ForeignTitle( 724, 'Portal', 'Nice_talk' ),
+				Title::newFromText( 'Portal:Nice_talk' )
+			),
+			array(
+				new ForeignTitle( 2, 'Portal', 'Nice_talk' ),
+				Title::newFromText( 'User:Nice_talk' )
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider basicProvider
+	 */
+	public function testBasic( ForeignTitle $foreignTitle, Title $title ) {
+		$factory = new NaiveImportTitleFactory();
+		$testTitle = $factory->createTitleFromForeignTitle( $foreignTitle );
+
+		$this->assertTrue( $title->equals( $testTitle ) );
+	}
+}