[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add Message test for implicit formatting

2016-11-10 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Add Message test for implicit formatting
..


Add Message test for implicit formatting

Change-Id: Ia6ec10d0d6da8c2b323054642e206c722d17f0b0
---
M tests/phpunit/includes/MessageTest.php
1 file changed, 29 insertions(+), 0 deletions(-)

Approvals:
  Anomie: Looks good to me, approved
  Thiemo Mättig (WMDE): Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/tests/phpunit/includes/MessageTest.php 
b/tests/phpunit/includes/MessageTest.php
index 4c689ab..9b9a73a 100644
--- a/tests/phpunit/includes/MessageTest.php
+++ b/tests/phpunit/includes/MessageTest.php
@@ -256,6 +256,35 @@
$this->assertEquals( $expect, $msg->__toString() );
}
 
+   public static function provideToString_raw() {
+   return [
+   [ 'foo', 'foo', 'parse' ],
+   [ 'foo', 'foo', 
'escaped' ],
+   [ 'foo', 'foo', 'plain' ],
+   [ 'alert(1)', 
'', 'parse' ],
+   [ 'alert(1)', 
'', 'escaped' ],
+   [ 'alert(1)', 
'alert(1)', 'plain' ],
+   ];
+   }
+
+   /**
+* @covers Message::toString
+* @covers Message::__toString
+* @dataProvider provideToString_raw
+*/
+   public function testToString_raw( $key, $expect, $format ) {
+   // make the message behave like RawMessage and use the key as-is
+   $msg = $this->getMockBuilder( Message::class )->setMethods( [ 
'fetchMessage' ] )
+   ->setConstructorArgs( [ $key ] )
+   ->getMock();
+   $msg->expects( $this->any() )->method( 'fetchMessage' 
)->willReturn( $key );
+   /** @var Message $msg */
+   $msg->$format();
+   $this->assertEquals( $expect, $msg->toString() );
+   $this->assertEquals( $expect, $msg->__toString() );
+   $this->assertEquals( $expect, $msg->toString() );
+   }
+
/**
 * @covers Message::inLanguage
 */

-- 
To view, visit https://gerrit.wikimedia.org/r/320563
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6ec10d0d6da8c2b323054642e206c722d17f0b0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add Message test for implicit formatting

2016-11-08 Thread Code Review 
Gergő Tisza has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320563

Change subject: Add Message test for implicit formatting
..

Add Message test for implicit formatting

Change-Id: Ia6ec10d0d6da8c2b323054642e206c722d17f0b0
---
M tests/phpunit/includes/MessageTest.php
1 file changed, 29 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/63/320563/1

diff --git a/tests/phpunit/includes/MessageTest.php 
b/tests/phpunit/includes/MessageTest.php
index 4c689ab..9b9a73a 100644
--- a/tests/phpunit/includes/MessageTest.php
+++ b/tests/phpunit/includes/MessageTest.php
@@ -256,6 +256,35 @@
$this->assertEquals( $expect, $msg->__toString() );
}
 
+   public static function provideToString_raw() {
+   return [
+   [ 'foo', 'foo', 'parse' ],
+   [ 'foo', 'foo', 
'escaped' ],
+   [ 'foo', 'foo', 'plain' ],
+   [ 'alert(1)', 
'', 'parse' ],
+   [ 'alert(1)', 
'', 'escaped' ],
+   [ 'alert(1)', 
'alert(1)', 'plain' ],
+   ];
+   }
+
+   /**
+* @covers Message::toString
+* @covers Message::__toString
+* @dataProvider provideToString_raw
+*/
+   public function testToString_raw( $key, $expect, $format ) {
+   // make the message behave like RawMessage and use the key as-is
+   $msg = $this->getMockBuilder( Message::class )->setMethods( [ 
'fetchMessage' ] )
+   ->setConstructorArgs( [ $key ] )
+   ->getMock();
+   $msg->expects( $this->any() )->method( 'fetchMessage' 
)->willReturn( $key );
+   /** @var Message $msg */
+   $msg->$format();
+   $this->assertEquals( $expect, $msg->toString() );
+   $this->assertEquals( $expect, $msg->__toString() );
+   $this->assertEquals( $expect, $msg->toString() );
+   }
+
/**
 * @covers Message::inLanguage
 */

-- 
To view, visit https://gerrit.wikimedia.org/r/320563
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia6ec10d0d6da8c2b323054642e206c722d17f0b0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits