[MediaWiki-commits] [Gerrit] Use mock SnakHtmlGenerator in ClaimHtmlGeneratorTest - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Use mock SnakHtmlGenerator in ClaimHtmlGeneratorTest
......................................................................


Use mock SnakHtmlGenerator in ClaimHtmlGeneratorTest

Change-Id: Ieac3a02f571fd695ddba259c05102edfc5867179
---
M repo/tests/phpunit/includes/View/ClaimHtmlGeneratorTest.php
1 file changed, 20 insertions(+), 38 deletions(-)

Approvals:
  Thiemo Mättig (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git a/repo/tests/phpunit/includes/View/ClaimHtmlGeneratorTest.php 
b/repo/tests/phpunit/includes/View/ClaimHtmlGeneratorTest.php
index 6c23381..21b1093 100644
--- a/repo/tests/phpunit/includes/View/ClaimHtmlGeneratorTest.php
+++ b/repo/tests/phpunit/includes/View/ClaimHtmlGeneratorTest.php
@@ -4,6 +4,7 @@
 
 use DataValues\StringValue;
 use Html;
+use PHPUnit_Framework_TestCase;
 use Wikibase\DataModel\Claim\Claim;
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Reference;
@@ -13,7 +14,6 @@
 use Wikibase\DataModel\Snak\SnakList;
 use Wikibase\DataModel\Statement\Statement;
 use Wikibase\Lib\EntityIdFormatter;
-use Wikibase\Lib\SnakFormatter;
 use Wikibase\Repo\View\ClaimHtmlGenerator;
 use Wikibase\Repo\View\SnakHtmlGenerator;
 use Wikibase\Template\TemplateFactory;
@@ -22,8 +22,7 @@
 /**
  * @covers Wikibase\Repo\View\ClaimHtmlGenerator
  *
- * @todo more specific tests for all parts of claim html formatting,
- * and use mock SnakHtmlGenerator
+ * @todo more specific tests for all parts of claim html formatting
  *
  * @group Wikibase
  * @group WikibaseRepo
@@ -33,23 +32,21 @@
  * @author Daniel Kinzler
  * @author H. Snater < mediaw...@snater.com >
  */
-class ClaimHtmlGeneratorTest extends \PHPUnit_Framework_TestCase {
+class ClaimHtmlGeneratorTest extends PHPUnit_Framework_TestCase {
 
        /**
-        * @return SnakFormatter
+        * @return SnakHtmlGenerator
         */
-       protected function getSnakFormatterMock() {
-               $snakFormatter = $this->getMock( 'Wikibase\Lib\SnakFormatter' );
+       protected function getSnakHtmlGeneratorMock() {
+               $snakHtmlGenerator = $this->getMockBuilder( 
'Wikibase\Repo\View\SnakHtmlGenerator' )
+                       ->disableOriginalConstructor()
+                       ->getMock();
 
-               $snakFormatter->expects( $this->any() )
-                       ->method( 'formatSnak' )
-                       ->will( $this->returnValue( 'a snak!' ) );
+               $snakHtmlGenerator->expects( $this->any() )
+                       ->method( 'getSnakHtml' )
+                       ->will( $this->returnValue( 'SNAK HTML' ) );
 
-               $snakFormatter->expects( $this->any() )
-                       ->method( 'getFormat' )
-                       ->will( $this->returnValue( SnakFormatter::FORMAT_HTML 
) );
-
-               return $snakFormatter;
+               return $snakHtmlGenerator;
        }
 
        /**
@@ -75,19 +72,12 @@
         * @dataProvider getHtmlForClaimProvider
         */
        public function testGetHtmlForClaim(
-               SnakFormatter $snakFormatter,
-               EntityIdFormatter $propertyIdFormatter,
+               SnakHtmlGenerator $snakHtmlGenerator,
                Claim $claim,
                $patterns
        ) {
                $templateFactory = new TemplateFactory(
                        TemplateRegistry::getDefaultInstance()
-               );
-
-               $snakHtmlGenerator = new SnakHtmlGenerator(
-                       $templateFactory,
-                       $snakFormatter,
-                       $propertyIdFormatter
                );
 
                $claimHtmlGenerator = new ClaimHtmlGenerator(
@@ -103,25 +93,20 @@
        }
 
        public function getHtmlForClaimProvider() {
-               $snakFormatter = $this->getSnakFormatterMock();
-
-               $propertyIdFormatterMock = $this->getPropertyIdFormatterMock();
+               $snakHtmlGenerator = $this->getSnakHtmlGeneratorMock();
 
                $testCases = array();
 
                $testCases[] = array(
-                       $snakFormatter,
-                       $propertyIdFormatterMock,
+                       $snakHtmlGenerator,
                        new Claim( new PropertySomeValueSnak( 42 ) ),
                        array(
-                               'snak variation css' => 
'/wikibase-snakview-variation-somevalue/',
-                               'formatted snak' => '/a snak!/'
+                               'snak html' => '/SNAK HTML/',
                        )
                );
 
                $testCases[] = array(
-                       $snakFormatter,
-                       $propertyIdFormatterMock,
+                       $snakHtmlGenerator,
                        new Claim(
                                new PropertySomeValueSnak( 42 ),
                                new SnakList( array(
@@ -129,14 +114,12 @@
                                ) )
                        ),
                        array(
-                               'snak variation css' => 
'/wikibase-snakview-variation-somevalue/',
-                               'formatted snak' => '/a snak!.*a snak!/s'
+                               'snak html' => '/SNAK HTML.*SNAK HTML/s',
                        )
                );
 
                $testCases[] = array(
-                       $snakFormatter,
-                       $propertyIdFormatterMock,
+                       $snakHtmlGenerator,
                        new Statement(
                                new Claim(
                                        new PropertyValueSnak( 50, new 
StringValue( 'chocolate!' ) ),
@@ -147,8 +130,7 @@
                                ) ) ) ) )
                        ),
                        array(
-                               'snak variation css' => 
'/wikibase-snakview-variation-value/',
-                               'formatted snak' => '/a snak!.*a snak!/s'
+                               'snak html' => '/SNAK HTML.*SNAK HTML/s',
                        )
                );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieac3a02f571fd695ddba259c05102edfc5867179
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang <adrian.he...@wikimedia.de>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>

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