Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/191054
Change subject: Add correct @uses and @covers annotations for View tests
......................................................................
Add correct @uses and @covers annotations for View tests
Change-Id: I03a759e6d40f157d2ef96b7212771b79db796fcb
---
M repo/tests/phpunit/includes/View/ClaimHtmlGeneratorTest.php
M repo/tests/phpunit/includes/View/ClaimsViewTest.php
M repo/tests/phpunit/includes/View/EntityTermsViewTest.php
M repo/tests/phpunit/includes/View/EntityViewFactoryTest.php
M repo/tests/phpunit/includes/View/EntityViewPlaceholderExpanderTest.php
M repo/tests/phpunit/includes/View/ItemViewTest.php
M repo/tests/phpunit/includes/View/PropertyViewTest.php
M repo/tests/phpunit/includes/View/SectionEditLinkGeneratorTest.php
M repo/tests/phpunit/includes/View/SiteLinksViewTest.php
M repo/tests/phpunit/includes/View/SnakHtmlGeneratorTest.php
10 files changed, 100 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/54/191054/1
diff --git a/repo/tests/phpunit/includes/View/ClaimHtmlGeneratorTest.php
b/repo/tests/phpunit/includes/View/ClaimHtmlGeneratorTest.php
index 8c5d767..4afd815 100644
--- a/repo/tests/phpunit/includes/View/ClaimHtmlGeneratorTest.php
+++ b/repo/tests/phpunit/includes/View/ClaimHtmlGeneratorTest.php
@@ -20,7 +20,7 @@
use Wikibase\Template\TemplateRegistry;
/**
- * @covers Wikibase\ClaimHtmlGenerator
+ * @covers Wikibase\Repo\View\ClaimHtmlGenerator
*
* @todo more specific tests for all parts of claim html formatting,
* and use mock SnakHtmlGenerator
@@ -72,6 +72,10 @@
}
/**
+ * @uses Wikibase\Repo\View\SnakHtmlGenerator
+ * @uses Wikibase\Template\Template
+ * @uses Wikibase\Template\TemplateFactory
+ * @uses Wikibase\Template\TemplateRegistry
* @dataProvider getHtmlForClaimProvider
*/
public function testGetHtmlForClaim(
diff --git a/repo/tests/phpunit/includes/View/ClaimsViewTest.php
b/repo/tests/phpunit/includes/View/ClaimsViewTest.php
index 5097e0d..9908ac2 100644
--- a/repo/tests/phpunit/includes/View/ClaimsViewTest.php
+++ b/repo/tests/phpunit/includes/View/ClaimsViewTest.php
@@ -40,6 +40,12 @@
) );
}
+ /**
+ * @uses Wikibase\Repo\View\SectionEditLinkGenerator
+ * @uses Wikibase\Template\Template
+ * @uses Wikibase\Template\TemplateFactory
+ * @uses Wikibase\Template\TemplateRegistry
+ */
public function testGetHtml() {
$propertyId = new PropertyId( 'P77' );
$claims = $this->makeClaims( $propertyId );
diff --git a/repo/tests/phpunit/includes/View/EntityTermsViewTest.php
b/repo/tests/phpunit/includes/View/EntityTermsViewTest.php
index 43a926f..75cc30a 100644
--- a/repo/tests/phpunit/includes/View/EntityTermsViewTest.php
+++ b/repo/tests/phpunit/includes/View/EntityTermsViewTest.php
@@ -2,17 +2,22 @@
namespace Wikibase\Test;
+use MediaWikiLangTestCase;
use MessageCache;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Term\Fingerprint;
use Wikibase\Repo\View\EntityTermsView;
-use Wikibase\Repo\View\SectionEditLinkGenerator;
use Wikibase\Repo\View\TextInjector;
use Wikibase\Template\TemplateFactory;
use Wikibase\Template\TemplateRegistry;
/**
* @covers Wikibase\Repo\View\EntityTermsView
+ *
+ * @uses Wikibase\Repo\View\TextInjector
+ * @uses Wikibase\Template\Template
+ * @uses Wikibase\Template\TemplateFactory
+ * @uses Wikibase\Template\TemplateRegistry
*
* @group Wikibase
* @group WikibaseRepo
@@ -21,7 +26,7 @@
* @author Bene* < [email protected] >
* @author Thiemo Mättig
*/
-class EntityTermsViewTest extends \MediaWikiLangTestCase {
+class EntityTermsViewTest extends MediaWikiLangTestCase {
protected function setUp() {
parent::setUp();
@@ -42,12 +47,24 @@
parent::tearDown();
}
- private function getEntityTermsView( $languageCode = 'en' ) {
+ private function getEntityTermsView( $languageCode = 'en', $called =
null ) {
$templateFactory = new TemplateFactory(
TemplateRegistry::getDefaultInstance() );
+
+ if ( $called === null ) {
+ $called = $this->any();
+ }
+
+ $sectionEditLinkGenerator = $this->getMockBuilder(
'Wikibase\Repo\View\SectionEditLinkGenerator' )
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $sectionEditLinkGenerator->expects( $called )
+ ->method( 'getHtmlForEditSection' )
+ ->will( $this->returnValue( '~EDITSECTION~' ) );
return new EntityTermsView(
$templateFactory,
- new SectionEditLinkGenerator( $templateFactory ),
+ $sectionEditLinkGenerator,
$this->getMock( 'Wikibase\Lib\LanguageNameLookup' ),
$languageCode
);
@@ -93,21 +110,20 @@
* @dataProvider entityFingerprintProvider
*/
public function testGetHtml_isEditable( Fingerprint $fingerprint,
ItemId $entityId, $languageCode ) {
- $entityTermsView = $this->getEntityTermsView( $languageCode );
+ $entityTermsView = $this->getEntityTermsView( $languageCode,
$this->once() );
$html = $entityTermsView->getHtml( $fingerprint, $entityId, '',
new TextInjector() );
- $idString = $entityId->getSerialization();
- $this->assertRegExp( '@<a href="[^"]*\bSpecial:SetLabel/' .
$idString . '/' . $languageCode . '"@', $html );
+ $this->assertContains( '~EDITSECTION~', $html );
}
/**
* @dataProvider entityFingerprintProvider
*/
public function testGetHtml_isNotEditable( Fingerprint $fingerprint,
ItemId $entityId, $languageCode ) {
- $entityTermsView = $this->getEntityTermsView( $languageCode );
+ $entityTermsView = $this->getEntityTermsView( $languageCode,
$this->never() );
$html = $entityTermsView->getHtml( $fingerprint, $entityId, '',
new TextInjector(), false );
- $this->assertNotContains( '<a ', $html );
+ $this->assertNotContains( '~EDITSECTION~', $html );
}
public function testGetHtml_valuesAreEscaped() {
@@ -164,12 +180,12 @@
* @dataProvider entityFingerprintProvider
*/
public function testGetHtml_withEntityId( Fingerprint $fingerprint,
ItemId $entityId, $languageCode ) {
- $entityTermsView = $this->getEntityTermsView( $languageCode );
+ $entityTermsView = $this->getEntityTermsView( $languageCode,
$this->once() );
$html = $entityTermsView->getHtml( $fingerprint, $entityId, '',
new TextInjector() );
$idString = $entityId->getSerialization();
$this->assertContains( '(' . $idString . ')', $html );
- $this->assertContains( '<a ', $html );
+ $this->assertContains( '~EDITSECTION~', $html );
}
public function testGetHtml_withoutEntityId() {
diff --git a/repo/tests/phpunit/includes/View/EntityViewFactoryTest.php
b/repo/tests/phpunit/includes/View/EntityViewFactoryTest.php
index 427dad9..e87af70 100644
--- a/repo/tests/phpunit/includes/View/EntityViewFactoryTest.php
+++ b/repo/tests/phpunit/includes/View/EntityViewFactoryTest.php
@@ -10,6 +10,22 @@
use Wikibase\Template\TemplateRegistry;
/**
+ * @covers \Wikibase\Repo\View\EntityViewFactory
+ *
+ * @uses Wikibase\Repo\View\ClaimHtmlGenerator
+ * @uses Wikibase\Repo\View\EntityTermsView
+ * @uses Wikibase\Repo\View\EntityView
+ * @uses Wikibase\Repo\View\ItemView
+ * @uses Wikibase\Repo\View\PropertyView
+ * @uses Wikibase\Repo\View\SectionEditLinkGenerator
+ * @uses Wikibase\Repo\View\SiteLinksView
+ * @uses Wikibase\Repo\View\StatementGroupListView
+ * @uses Wikibase\Repo\View\SnakHtmlGenerator
+ * @uses Wikibase\Repo\View\TextInjector
+ * @uses Wikibase\Template\Template
+ * @uses Wikibase\Template\TemplateFactory
+ * @uses Wikibase\Template\TemplateRegistry
+ *
* @licence GNU GPL v2+
* @author Katie Filbert < [email protected] >
*/
diff --git
a/repo/tests/phpunit/includes/View/EntityViewPlaceholderExpanderTest.php
b/repo/tests/phpunit/includes/View/EntityViewPlaceholderExpanderTest.php
index cc4c9c7..8fa8d4a 100644
--- a/repo/tests/phpunit/includes/View/EntityViewPlaceholderExpanderTest.php
+++ b/repo/tests/phpunit/includes/View/EntityViewPlaceholderExpanderTest.php
@@ -18,6 +18,11 @@
/**
* @covers Wikibase\Repo\View\EntityViewPlaceholderExpander
*
+ * @uses Wikibase\Repo\View\EntityTermsView
+ * @uses Wikibase\Template\Template
+ * @uses Wikibase\Template\TemplateFactory
+ * @uses Wikibase\Template\TemplateRegistry
+ *
* @group Wikibase
* @group WikibaseRepo
* @group EntityView
diff --git a/repo/tests/phpunit/includes/View/ItemViewTest.php
b/repo/tests/phpunit/includes/View/ItemViewTest.php
index e81e8d8..8475c9c 100644
--- a/repo/tests/phpunit/includes/View/ItemViewTest.php
+++ b/repo/tests/phpunit/includes/View/ItemViewTest.php
@@ -11,6 +11,12 @@
/**
* @covers Wikibase\Repo\View\ItemView
+ * @covers Wikibase\Repo\View\EntityView
+ *
+ * @uses Wikibase\Repo\View\TextInjector
+ * @uses Wikibase\Template\Template
+ * @uses Wikibase\Template\TemplateFactory
+ * @uses Wikibase\Template\TemplateRegistry
*
* @group Wikibase
* @group WikibaseItemView
diff --git a/repo/tests/phpunit/includes/View/PropertyViewTest.php
b/repo/tests/phpunit/includes/View/PropertyViewTest.php
index 69e38c7..bcea249 100644
--- a/repo/tests/phpunit/includes/View/PropertyViewTest.php
+++ b/repo/tests/phpunit/includes/View/PropertyViewTest.php
@@ -15,6 +15,12 @@
/**
* @covers Wikibase\Repo\View\PropertyView
+ * @covers Wikibase\Repo\View\EntityView
+ *
+ * @uses Wikibase\Repo\View\TextInjector
+ * @uses Wikibase\Template\Template
+ * @uses Wikibase\Template\TemplateFactory
+ * @uses Wikibase\Template\TemplateRegistry
*
* @group Wikibase
* @group WikibasePropertyView
diff --git a/repo/tests/phpunit/includes/View/SectionEditLinkGeneratorTest.php
b/repo/tests/phpunit/includes/View/SectionEditLinkGeneratorTest.php
index ec88583..5660dd5 100644
--- a/repo/tests/phpunit/includes/View/SectionEditLinkGeneratorTest.php
+++ b/repo/tests/phpunit/includes/View/SectionEditLinkGeneratorTest.php
@@ -2,12 +2,18 @@
namespace Wikibase\Test;
+use MediaWikiLangTestCase;
+use SpecialPage;
use Wikibase\Repo\View\SectionEditLinkGenerator;
use Wikibase\Template\TemplateFactory;
use Wikibase\Template\TemplateRegistry;
/**
* @covers Wikibase\Repo\View\SectionEditLinkGenerator
+ *
+ * @uses Wikibase\Template\Template
+ * @uses Wikibase\Template\TemplateFactory
+ * @uses Wikibase\Template\TemplateRegistry
*
* @group Wikibase
* @group WikibaseRepo
@@ -18,8 +24,16 @@
* @author Daniel Kinzler
* @author Adrian Lang
*/
-class SectionEditLinkGeneratorTest extends \MediaWikiLangTestCase {
+class SectionEditLinkGeneratorTest extends MediaWikiLangTestCase {
+ protected function setUp() {
+ // Override wgSpecialPages since the SpecialPageFactory would
otherwise run huge amounts of repo code
+ $this->setMwGlobals( 'wgSpecialPages', array(
+ 'Version' => new SpecialPage( 'Version' ),
+ 'SetLabel' => new SpecialPage( 'SetLabel')
+ ) );
+ parent::setUp();
+ }
/**
* @dataProvider getHtmlForEditSectionProvider
*/
diff --git a/repo/tests/phpunit/includes/View/SiteLinksViewTest.php
b/repo/tests/phpunit/includes/View/SiteLinksViewTest.php
index a6fcea9..3c2a13b 100644
--- a/repo/tests/phpunit/includes/View/SiteLinksViewTest.php
+++ b/repo/tests/phpunit/includes/View/SiteLinksViewTest.php
@@ -3,6 +3,8 @@
namespace Wikibase\Test;
use MediaWikiSite;
+use MediaWikiTestCase;
+use PHPUnit_Framework_TestCase;
use SiteList;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\Item;
@@ -18,6 +20,10 @@
/**
* @covers Wikibase\Repo\View\SiteLinksView
*
+ * @uses Wikibase\Template\Template
+ * @uses Wikibase\Template\TemplateFactory
+ * @uses Wikibase\Template\TemplateRegistry
+ *
* @group Wikibase
* @group WikibaseRepo
*
@@ -25,7 +31,7 @@
* @author Adrian Lang <[email protected]>
* @author Bene* < [email protected] >
*/
-class SiteLinksViewTest extends \PHPUnit_Framework_TestCase {
+class SiteLinksViewTest extends PHPUnit_Framework_TestCase {
/**
* @dataProvider getHtmlProvider
@@ -35,7 +41,7 @@
$value = $siteLinksView->getHtml( $item->getSiteLinks(),
$item->getId(), $groups, $editable );
$this->assertInternalType( 'string', $value );
- \MediaWikiTestCase::assertTag( $expectedValue, $value, $value .
' did not match ' . var_export( $expectedValue, true ) );
+ MediaWikiTestCase::assertTag( $expectedValue, $value, $value .
' did not match ' . var_export( $expectedValue, true ) );
}
public function getHtmlProvider() {
diff --git a/repo/tests/phpunit/includes/View/SnakHtmlGeneratorTest.php
b/repo/tests/phpunit/includes/View/SnakHtmlGeneratorTest.php
index d375c93..ae0a72c 100644
--- a/repo/tests/phpunit/includes/View/SnakHtmlGeneratorTest.php
+++ b/repo/tests/phpunit/includes/View/SnakHtmlGeneratorTest.php
@@ -4,6 +4,7 @@
use DataValues\StringValue;
use Html;
+use PHPUnit_Framework_TestCase;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Snak\PropertySomeValueSnak;
use Wikibase\DataModel\Snak\PropertyValueSnak;
@@ -17,13 +18,17 @@
/**
* @covers Wikibase\Repo\View\SnakHtmlGenerator
*
+ * @uses Wikibase\Template\Template
+ * @uses Wikibase\Template\TemplateFactory
+ * @uses Wikibase\Template\TemplateRegistry
+ *
* @group Wikibase
* @group WikibaseRepo
*
* @licence GNU GPL v2+
* @author Katie Filbert < [email protected] >
*/
-class SnakHtmlGeneratorTest extends \PHPUnit_Framework_TestCase {
+class SnakHtmlGeneratorTest extends PHPUnit_Framework_TestCase {
/**
* @dataProvider getSnakHtmlProvider
--
To view, visit https://gerrit.wikimedia.org/r/191054
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I03a759e6d40f157d2ef96b7212771b79db796fcb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
