From 14f74d141ab5580688bfd46d2f74c026e43ed967 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Wed, 1 Apr 2015 06:11:44 +0200
Subject: Update to MediaWiki 1.24.2

---
 tests/phpunit/includes/mail/MailAddressTest.php | 63 +++++++++++++++++++++++++
 tests/phpunit/includes/mail/UserMailerTest.php  | 14 ++++++
 2 files changed, 77 insertions(+)
 create mode 100644 tests/phpunit/includes/mail/MailAddressTest.php
 create mode 100644 tests/phpunit/includes/mail/UserMailerTest.php

(limited to 'tests/phpunit/includes/mail')

diff --git a/tests/phpunit/includes/mail/MailAddressTest.php b/tests/phpunit/includes/mail/MailAddressTest.php
new file mode 100644
index 00000000..2d078120
--- /dev/null
+++ b/tests/phpunit/includes/mail/MailAddressTest.php
@@ -0,0 +1,63 @@
+<?php
+
+class MailAddressTest extends MediaWikiTestCase {
+
+	/**
+	 * @covers MailAddress::__construct
+	 */
+	public function testConstructor() {
+		$ma = new MailAddress( 'foo@bar.baz', 'UserName', 'Real name' );
+		$this->assertInstanceOf( 'MailAddress', $ma );
+	}
+
+	/**
+	 * @covers MailAddress::newFromUser
+	 */
+	public function testNewFromUser() {
+		$user = $this->getMock( 'User' );
+		$user->expects( $this->any() )->method( 'getName' )->will( $this->returnValue( 'UserName' ) );
+		$user->expects( $this->any() )->method( 'getEmail' )->will( $this->returnValue( 'foo@bar.baz' ) );
+		$user->expects( $this->any() )->method( 'getRealName' )->will( $this->returnValue( 'Real name' ) );
+
+		$ma = MailAddress::newFromUser( $user );
+		$this->assertInstanceOf( 'MailAddress', $ma );
+		$this->setMwGlobals( 'wgEnotifUseRealName', true );
+		$this->assertEquals( 'Real name <foo@bar.baz>', $ma->toString() );
+		$this->setMwGlobals( 'wgEnotifUseRealName', false );
+		$this->assertEquals( 'UserName <foo@bar.baz>', $ma->toString() );
+	}
+
+	/**
+	 * @covers MailAddress::toString
+	 * @dataProvider provideToString
+	 */
+	public function testToString( $useRealName, $address, $name, $realName, $expected ) {
+		if ( wfIsWindows() ) {
+			$this->markTestSkipped( 'This test only works on non-Windows platforms' );
+		}
+		$this->setMwGlobals( 'wgEnotifUseRealName', $useRealName );
+		$ma = new MailAddress( $address, $name, $realName );
+		$this->assertEquals( $expected, $ma->toString() );
+	}
+
+	public static function provideToString() {
+		return array(
+			array( true, 'foo@bar.baz', 'FooBar', 'Foo Bar', 'Foo Bar <foo@bar.baz>' ),
+			array( true, 'foo@bar.baz', 'UserName', null, 'UserName <foo@bar.baz>' ),
+			array( true, 'foo@bar.baz', 'AUser', 'My real name', 'My real name <foo@bar.baz>' ),
+			array( true, 'foo@bar.baz', 'A.user.name', 'my@real.name', '"my@real.name" <foo@bar.baz>' ),
+			array( false, 'foo@bar.baz', 'AUserName', 'Some real name', 'AUserName <foo@bar.baz>' ),
+			array( false, 'foo@bar.baz', '', '', 'foo@bar.baz' ),
+			array( true, 'foo@bar.baz', '', '', 'foo@bar.baz' ),
+		);
+	}
+
+	/**
+	 * @covers MailAddress::__toString
+	 */
+	public function test__ToString() {
+		$ma = new MailAddress( 'some@email.com', 'UserName', 'A real name' );
+		$this->assertEquals( $ma->toString(), (string)$ma );
+	}
+
+}
\ No newline at end of file
diff --git a/tests/phpunit/includes/mail/UserMailerTest.php b/tests/phpunit/includes/mail/UserMailerTest.php
new file mode 100644
index 00000000..dca8aeb9
--- /dev/null
+++ b/tests/phpunit/includes/mail/UserMailerTest.php
@@ -0,0 +1,14 @@
+<?php
+
+class UserMailerTest extends MediaWikiLangTestCase {
+
+	/**
+	 * @covers UserMailer::quotedPrintable
+	 */
+	public function testQuotedPrintable() {
+		$this->assertEquals(
+			"=?UTF-8?Q?=C4=88u=20legebla=3F?=",
+			UserMailer::quotedPrintable( "\xc4\x88u legebla?", "UTF-8" ) );
+	}
+
+}
-- 
cgit v1.2.3-54-g00ecf