Merge commit 'f6d65'

# Conflicts:
#	skins/ArchLinux/ArchLinux.php

2 files changed, 347 insertions, 0 deletions

diff --git a/tests/phpunit/includes/deferred/LinksUpdateTest.php b/tests/phpunit/includes/deferred/LinksUpdateTest.php
new file mode 100644
index 00000000..02f6b2ab
--- /dev/null
+++ b/tests/phpunit/includes/deferred/LinksUpdateTest.php
@@ -0,0 +1,266 @@
+<?php
+
+/**
+ * @group Database
+ * ^--- make sure temporary tables are used.
+ */
+class LinksUpdateTest extends MediaWikiTestCase {
+
+	function __construct( $name = null, array $data = array(), $dataName = '' ) {
+		parent::__construct( $name, $data, $dataName );
+
+		$this->tablesUsed = array_merge( $this->tablesUsed,
+			array(
+				'interwiki',
+				'page_props',
+				'pagelinks',
+				'categorylinks',
+				'langlinks',
+				'externallinks',
+				'imagelinks',
+				'templatelinks',
+				'iwlinks'
+			)
+		);
+	}
+
+	protected function setUp() {
+		parent::setUp();
+		$dbw = wfGetDB( DB_MASTER );
+		$dbw->replace(
+			'interwiki',
+			array( 'iw_prefix' ),
+			array(
+				'iw_prefix' => 'linksupdatetest',
+				'iw_url' => 'http://testing.com/wiki/$1',
+				'iw_api' => 'http://testing.com/w/api.php',
+				'iw_local' => 0,
+				'iw_trans' => 0,
+				'iw_wikiid' => 'linksupdatetest',
+			)
+		);
+	}
+
+	protected function makeTitleAndParserOutput( $name, $id ) {
+		$t = Title::newFromText( $name );
+		$t->mArticleID = $id; # XXX: this is fugly
+
+		$po = new ParserOutput();
+		$po->setTitleText( $t->getPrefixedText() );
+
+		return array( $t, $po );
+	}
+
+	/**
+	 * @covers ParserOutput::addLink
+	 */
+	public function testUpdate_pagelinks() {
+		/** @var ParserOutput $po */
+		list( $t, $po ) = $this->makeTitleAndParserOutput( "Testing", 111 );
+
+		$po->addLink( Title::newFromText( "Foo" ) );
+		$po->addLink( Title::newFromText( "Special:Foo" ) ); // special namespace should be ignored
+		$po->addLink( Title::newFromText( "linksupdatetest:Foo" ) ); // interwiki link should be ignored
+		$po->addLink( Title::newFromText( "#Foo" ) ); // hash link should be ignored
+
+		$update = $this->assertLinksUpdate(
+			$t,
+			$po,
+			'pagelinks',
+			'pl_namespace,
+			pl_title',
+			'pl_from = 111',
+			array( array( NS_MAIN, 'Foo' ) )
+		);
+		$this->assertArrayEquals( array(
+			Title::makeTitle( NS_MAIN, 'Foo' ),  // newFromText doesn't yield the same internal state....
+		), $update->getAddedLinks() );
+
+		$po = new ParserOutput();
+		$po->setTitleText( $t->getPrefixedText() );
+
+		$po->addLink( Title::newFromText( "Bar" ) );
+		$po->addLink( Title::newFromText( "Talk:Bar" ) );
+
+		$update = $this->assertLinksUpdate(
+			$t,
+			$po,
+			'pagelinks',
+			'pl_namespace,
+			pl_title',
+			'pl_from = 111',
+			array(
+				array( NS_MAIN, 'Bar' ),
+				array( NS_TALK, 'Bar' ),
+			)
+		);
+		$this->assertArrayEquals( array(
+			Title::makeTitle( NS_MAIN, 'Bar' ),
+			Title::makeTitle( NS_TALK, 'Bar' ),
+		), $update->getAddedLinks() );
+		$this->assertArrayEquals( array(
+			Title::makeTitle( NS_MAIN, 'Foo' ),
+		), $update->getRemovedLinks() );
+	}
+
+	/**
+	 * @covers ParserOutput::addExternalLink
+	 */
+	public function testUpdate_externallinks() {
+		/** @var ParserOutput $po */
+		list( $t, $po ) = $this->makeTitleAndParserOutput( "Testing", 111 );
+
+		$po->addExternalLink( "http://testing.com/wiki/Foo" );
+
+		$this->assertLinksUpdate( $t, $po, 'externallinks', 'el_to, el_index', 'el_from = 111', array(
+			array( 'http://testing.com/wiki/Foo', 'http://com.testing./wiki/Foo' ),
+		) );
+	}
+
+	/**
+	 * @covers ParserOutput::addCategory
+	 */
+	public function testUpdate_categorylinks() {
+		/** @var ParserOutput $po */
+		$this->setMwGlobals( 'wgCategoryCollation', 'uppercase' );
+
+		list( $t, $po ) = $this->makeTitleAndParserOutput( "Testing", 111 );
+
+		$po->addCategory( "Foo", "FOO" );
+
+		$this->assertLinksUpdate( $t, $po, 'categorylinks', 'cl_to, cl_sortkey', 'cl_from = 111', array(
+			array( 'Foo', "FOO\nTESTING" ),
+		) );
+	}
+
+	/**
+	 * @covers ParserOutput::addInterwikiLink
+	 */
+	public function testUpdate_iwlinks() {
+		/** @var ParserOutput $po */
+		list( $t, $po ) = $this->makeTitleAndParserOutput( "Testing", 111 );
+
+		$target = Title::makeTitleSafe( NS_MAIN, "Foo", '', 'linksupdatetest' );
+		$po->addInterwikiLink( $target );
+
+		$this->assertLinksUpdate( $t, $po, 'iwlinks', 'iwl_prefix, iwl_title', 'iwl_from = 111', array(
+			array( 'linksupdatetest', 'Foo' ),
+		) );
+	}
+
+	/**
+	 * @covers ParserOutput::addTemplate
+	 */
+	public function testUpdate_templatelinks() {
+		/** @var ParserOutput $po */
+		list( $t, $po ) = $this->makeTitleAndParserOutput( "Testing", 111 );
+
+		$po->addTemplate( Title::newFromText( "Template:Foo" ), 23, 42 );
+
+		$this->assertLinksUpdate(
+			$t,
+			$po,
+			'templatelinks',
+			'tl_namespace,
+			tl_title',
+			'tl_from = 111',
+			array( array( NS_TEMPLATE, 'Foo' ) )
+		);
+	}
+
+	/**
+	 * @covers ParserOutput::addImage
+	 */
+	public function testUpdate_imagelinks() {
+		/** @var ParserOutput $po */
+		list( $t, $po ) = $this->makeTitleAndParserOutput( "Testing", 111 );
+
+		$po->addImage( "Foo.png" );
+
+		$this->assertLinksUpdate( $t, $po, 'imagelinks', 'il_to', 'il_from = 111', array(
+			array( 'Foo.png' ),
+		) );
+	}
+
+	/**
+	 * @covers ParserOutput::addLanguageLink
+	 */
+	public function testUpdate_langlinks() {
+		$this->setMwGlobals( array(
+			'wgCapitalLinks' => true,
+		) );
+
+		/** @var ParserOutput $po */
+		list( $t, $po ) = $this->makeTitleAndParserOutput( "Testing", 111 );
+
+		$po->addLanguageLink( Title::newFromText( "en:Foo" )->getFullText() );
+
+		$this->assertLinksUpdate( $t, $po, 'langlinks', 'll_lang, ll_title', 'll_from = 111', array(
+			array( 'En', 'Foo' ),
+		) );
+	}
+
+	/**
+	 * @covers ParserOutput::setProperty
+	 */
+	public function testUpdate_page_props() {
+		global $wgPagePropsHaveSortkey;
+
+		/** @var ParserOutput $po */
+		list( $t, $po ) = $this->makeTitleAndParserOutput( "Testing", 111 );
+
+		$fields = array( 'pp_propname', 'pp_value' );
+		$expected = array();
+
+		$po->setProperty( "bool", true );
+		$expected[] = array( "bool", true );
+
+		$po->setProperty( "float", 4.0 + 1.0 / 4.0 );
+		$expected[] = array( "float", 4.0 + 1.0 / 4.0 );
+
+		$po->setProperty( "int", -7 );
+		$expected[] = array( "int", -7 );
+
+		$po->setProperty( "string", "33 bar" );
+		$expected[] = array( "string", "33 bar" );
+
+		// compute expected sortkey values
+		if ( $wgPagePropsHaveSortkey ) {
+			$fields[] = 'pp_sortkey';
+
+			foreach ( $expected as &$row ) {
+				$value = $row[1];
+
+				if ( is_int( $value ) || is_float( $value ) || is_bool( $value ) ) {
+					$row[] = floatval( $value );
+				} else {
+					$row[] = null;
+				}
+			}
+		}
+
+		$this->assertLinksUpdate( $t, $po, 'page_props', $fields, 'pp_page = 111', $expected );
+	}
+
+	public function testUpdate_page_props_without_sortkey() {
+		$this->setMwGlobals( 'wgPagePropsHaveSortkey', false );
+
+		$this->testUpdate_page_props();
+	}
+
+	// @todo test recursive, too!
+
+	protected function assertLinksUpdate( Title $title, ParserOutput $parserOutput,
+		$table, $fields, $condition, array $expectedRows
+	) {
+		$update = new LinksUpdate( $title, $parserOutput );
+
+		//NOTE: make sure LinksUpdate does not generate warnings when called inside a transaction.
+		$update->beginTransaction();
+		$update->doUpdate();
+		$update->commitTransaction();
+
+		$this->assertSelect( $table, $fields, $condition, $expectedRows );
+		return $update;
+	}
+}
diff --git a/tests/phpunit/includes/deferred/SearchUpdateTest.php b/tests/phpunit/includes/deferred/SearchUpdateTest.php
new file mode 100644
index 00000000..90438a04
--- /dev/null
+++ b/tests/phpunit/includes/deferred/SearchUpdateTest.php
@@ -0,0 +1,81 @@
+<?php
+
+class MockSearch extends SearchEngine {
+	public static $id;
+	public static $title;
+	public static $text;
+
+	public function __construct( $db ) {
+	}
+
+	public function update( $id, $title, $text ) {
+		self::$id = $id;
+		self::$title = $title;
+		self::$text = $text;
+	}
+}
+
+/**
+ * @group Search
+ */
+class SearchUpdateTest extends MediaWikiTestCase {
+
+	protected function setUp() {
+		parent::setUp();
+		$this->setMwGlobals( 'wgSearchType', 'MockSearch' );
+	}
+
+	public function updateText( $text ) {
+		return trim( SearchUpdate::updateText( $text ) );
+	}
+
+	/**
+	 * @covers SearchUpdate::updateText
+	 */
+	public function testUpdateText() {
+		$this->assertEquals(
+			'test',
+			$this->updateText( '<div>TeSt</div>' ),
+			'HTML stripped, text lowercased'
+		);
+
+		$this->assertEquals(
+			'foo bar boz quux',
+			$this->updateText( <<<EOT
+<table style="color:red; font-size:100px">
+	<tr class="scary"><td><div>foo</div></td><tr>bar</td></tr>
+	<tr><td>boz</td><tr>quux</td></tr>
+</table>
+EOT
+			), 'Stripping HTML tables' );
+
+		$this->assertEquals(
+			'a b',
+			$this->updateText( 'a > b' ),
+			'Handle unclosed tags'
+		);
+
+		$text = str_pad( "foo <barbarbar \n", 10000, 'x' );
+
+		$this->assertNotEquals(
+			'',
+			$this->updateText( $text ),
+			'Bug 18609'
+		);
+	}
+
+	/**
+	 * @covers SearchUpdate::updateText
+	 * Test bug 32712
+	 * Test if unicode quotes in article links make its search index empty
+	 */
+	public function testUnicodeLinkSearchIndexError() {
+		$text = "text „http://example.com“ text";
+		$result = $this->updateText( $text );
+		$processed = preg_replace( '/Q/u', 'Q', $result );
+		$this->assertTrue(
+			$processed != '',
+			'Link surrounded by unicode quotes should not fail UTF-8 validation'
+		);
+	}
+}