Andreasburmeister has submitted this change and it was merged.
Change subject: remove what has something to do with class Violation
......................................................................
remove what has something to do with class Violation
since we decided not have it in version 1, also removed hook that was
there for testing purposes
Change-Id: Ibb2e5f3d8a894c2f41bd807bf481aee17c82e993
---
M WikidataQualityConstraints.php
M WikidataQualityConstraintsHooks.php
D includes/ConstraintCheck/Result/CheckResultToViolationTranslator.php
M specials/SpecialConstraintReport.php
D tests/phpunit/Result/CheckResultToViolationTranslatorTest.php
M tests/phpunit/Specials/SpecialConstraintReportTest.php
6 files changed, 0 insertions(+), 179 deletions(-)
Approvals:
Andreasburmeister: Verified; Looks good to me, approved
diff --git a/WikidataQualityConstraints.php b/WikidataQualityConstraints.php
index cdd4029..9c92cd6 100644
--- a/WikidataQualityConstraints.php
+++ b/WikidataQualityConstraints.php
@@ -34,8 +34,6 @@
// Register hooks for Unit Tests
$GLOBALS['wgHooks']['UnitTestsList'][] =
'WikidataQualityConstraintsHooks::onUnitTestsList';
- $GLOBALS['wgHooks']['NewRevisionFromEditComplete'][] =
'WikidataQualityConstraintsHooks::onNewRevisionFromEditComplete';
-
// Initialize special pages
$GLOBALS['wgSpecialPages']['ConstraintReport'] =
'WikidataQuality\ConstraintReport\Specials\SpecialConstraintReport';
diff --git a/WikidataQualityConstraintsHooks.php
b/WikidataQualityConstraintsHooks.php
index d272a20..45ef5e3 100644
--- a/WikidataQualityConstraintsHooks.php
+++ b/WikidataQualityConstraintsHooks.php
@@ -18,18 +18,4 @@
glob( __DIR__ . '/tests/phpunit/*Test.php' ) );
return true;
}
-
- public static function onNewRevisionFromEditComplete( $article,
Revision $rev, $baseID, User $user ) {
- $accumulator = array (
- 'special_page_id' => 42,
- 'entity_id' => $article->mTitle->mTextform,
- 'insertion_timestamp' =>
$article->mPreparedEdit->timestamp,
- 'reference_timestamp' => null,
- 'result_string' => 'This was written by
onNewRevisionFromEditComplete'
- );
- wfWaitForSlaves();
- $loadBalancer = wfGetLB();
- $db = $loadBalancer->getConnection( DB_MASTER );
- $db->insert( EVALUATION_TABLE, $accumulator );
- }
}
\ No newline at end of file
diff --git
a/includes/ConstraintCheck/Result/CheckResultToViolationTranslator.php
b/includes/ConstraintCheck/Result/CheckResultToViolationTranslator.php
deleted file mode 100755
index f193ec8..0000000
--- a/includes/ConstraintCheck/Result/CheckResultToViolationTranslator.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-namespace WikidataQuality\ConstraintReport\ConstraintCheck\Result;
-
-use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\DataModel\Entity\PropertyId;
-use Wikibase\DataModel\Entity\Entity;
-use WikidataQuality\Result\ResultToViolationTranslator;
-use WikidataQuality\Violations\Violation;
-
-
-class CheckResultToViolationTranslator extends ResultToViolationTranslator {
-
- public function translateToViolation( Entity $entity,
$checkResultOrArray ) {
-
- if ( $checkResultOrArray instanceof CheckResult ) {
- $checkResultArray = array ( $checkResultOrArray );
- } elseif ( is_array( $checkResultOrArray ) ) {
- $checkResultArray = $checkResultOrArray;
- } else {
- throw new InvalidArgumentException;
- }
-
- $violationArray = array ();
- foreach ( $checkResultArray as $checkResult ) {
- if ( $checkResult->getStatus() !==
CheckResult::STATUS_VIOLATION ) {
- continue;
- }
-
- $statement = $checkResult->getStatement();
- $entityId = $entity->getId();
-
- //TODO: Use real claimGuid
- $constraintTypeEntityId =
$checkResult->getConstraintName();
- $constraintClaimGuid = $statement->getGuid() .
$constraintTypeEntityId;
- $parameters = $checkResult->getParameters();
- if ( is_array( $parameters ) ) {
- foreach ( $parameters as $par ) {
- $constraintClaimGuid .= implode( ', ',
$par );
- }
- }
- $constraintClaimGuid = md5( $constraintClaimGuid );
- $revisionId = $this->getRevisionIdForEntity( $entityId
);
- $status = CheckResult::STATUS_VIOLATION;
-
- $violationArray[ ] = new Violation( $entityId,
$statement, $constraintClaimGuid, $constraintTypeEntityId, $revisionId, $status
);
- }
-
- return $violationArray;
- }
-}
\ No newline at end of file
diff --git a/specials/SpecialConstraintReport.php
b/specials/SpecialConstraintReport.php
index 2f4ca3e..42185c9 100755
--- a/specials/SpecialConstraintReport.php
+++ b/specials/SpecialConstraintReport.php
@@ -14,11 +14,9 @@
use Wikibase\Repo\WikibaseRepo;
use WikidataQuality\ConstraintReport\CheckForConstraintViolationsJob;
use WikidataQuality\ConstraintReport\ConstraintCheck\ConstraintChecker;
-use
WikidataQuality\ConstraintReport\ConstraintCheck\Result\CheckResultToViolationTranslator;
use WikidataQuality\Html\HtmlTable;
use WikidataQuality\Html\HtmlTableHeader;
use WikidataQuality\Specials\SpecialCheckResultPage;
-use WikidataQuality\Violations\ViolationStore;
use JobQueueGroup;
@@ -102,7 +100,6 @@
$constraintChecker = new ConstraintChecker( $this->entityLookup
);
$results = $constraintChecker->execute( $entity );
- $this->saveResultsInViolationsTable( $entity, $results );
$this->doEvaluation( $entity, $results );
return $results;
}
@@ -288,17 +285,6 @@
'exception' => 'warning',
'violation' => 'error'
);
- }
-
- /**
- * @param EntityDocument $entity
- * @param array $results
- */
- protected function saveResultsInViolationsTable( $entity, $results ) {
- $translator = new CheckResultToViolationTranslator();
- $violations = $translator->translateToViolation( $entity,
$results );
- $violationStore = new ViolationStore();
- $violationStore->insertViolations( $violations );
}
protected function doEvaluation( $entity, $results ) {
diff --git a/tests/phpunit/Result/CheckResultToViolationTranslatorTest.php
b/tests/phpunit/Result/CheckResultToViolationTranslatorTest.php
deleted file mode 100644
index 9184975..0000000
--- a/tests/phpunit/Result/CheckResultToViolationTranslatorTest.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-
-namespace
WikidataQuality\ConstraintReport\Test\CheckResultToViolationTranslator;
-
-use Wikibase\DataModel\Entity\Item;
-use Wikibase\DataModel\Statement\Statement;
-use Wikibase\DataModel\Claim\Claim;
-use Wikibase\DataModel\Snak\PropertyValueSnak;
-use Wikibase\DataModel\Entity\PropertyId;
-use DataValues\StringValue;
-use WikidataQuality\ConstraintReport\ConstraintCheck\Result\CheckResult;
-use
WikidataQuality\ConstraintReport\ConstraintCheck\Result\CheckResultToViolationTranslator;
-use Wikibase\Repo\WikibaseRepo;
-
-
-/**
- * @covers
WikidataQuality\ConstraintReport\ConstraintCheck\Result\CheckResultToViolationTranslator
- *
- * @group Database
- * @group medium
- *
- * @uses WikidataQuality\ConstraintReport\ConstraintCheck\Result\CheckResult
- *
- * @author BP2014N1
- * @license GNU GPL v2+
- */
-class CheckResultTestToViolationTranslator extends \MediaWikiTestCase {
-
- private $translator;
- private $statement;
- private $constraintName;
- private $parameters;
- private $message;
- private $entity;
-
- /**
- * @var EntityId[]
- */
- private static $idMap;
-
- protected function setUp() {
- parent::setUp();
- $this->translator = new CheckResultToViolationTranslator();
- $this->statement = new Statement( new Claim( new
PropertyValueSnak( new PropertyId( 'P1' ), new StringValue( 'Foo' ) ) ) );
- $this->constraintName = 'Range';
- $this->parameters = array ();
- $this->message = 'All right';
- $this->entity = new Item();
- $store = WikibaseRepo::getDefaultInstance()->getEntityStore();
- $store->saveEntity( $this->entity, 'TestEntityQ1', $GLOBALS[
'wgUser' ], EDIT_NEW );
- self::$idMap[ 'Q1' ] = $this->entity->getId();
- }
-
- protected function tearDown() {
- parent::tearDown();
- unset( $this->translator );
- unset( $this->statement );
- unset( $this->constraintName );
- unset( $this->parameters );
- unset( $this->message );
- unset( $this->entity );
- }
-
- public function testSingleComplianceResult() {
- $checkResult = new CheckResult( $this->statement,
$this->constraintName, $this->parameters, 'compliance', $this->message );
- $violations = $this->translator->translateToViolation(
$this->entity, $checkResult );
- $this->assertEquals( array (), $violations );
- }
-
- public function testSingleViolationResult() {
- $checkResult = new CheckResult( $this->statement,
$this->constraintName, $this->parameters, 'violation', $this->message );
- $violations = $this->translator->translateToViolation(
$this->entity, $checkResult );
- $this->assertEquals( 1, sizeof( $violations ) );
-
- $violation = $violations[ 0 ];
- $this->assertEquals( self::$idMap[ 'Q1' ],
$violation->getEntityId() );
- $this->assertEquals( 'P1',
$violation->getPropertyId()->getSerialization() );
- $this->assertEquals( $this->statement->getGuid(),
$violation->getClaimGuid() );
- $this->assertEquals( md5( $this->statement->getGuid() .
$checkResult->getConstraintName() ), $violation->getConstraintClaimGuid() );
- $this->assertEquals( $checkResult->getConstraintName(),
$violation->getConstraintTypeEntityId() );
-
- }
-
- public function testMultipleCheckResults() {
- $checkResults = array ();
- $checkResults[ ] = new CheckResult( $this->statement,
$this->constraintName, $this->parameters, 'violation', $this->message );
- $checkResults[ ] = new CheckResult( $this->statement,
$this->constraintName, $this->parameters, 'violation', $this->message );
- $checkResults[ ] = new CheckResult( $this->statement,
$this->constraintName, $this->parameters, 'compliance', $this->message );
- $violations = $this->translator->translateToViolation(
$this->entity, $checkResults );
- $this->assertEquals( 2, sizeof( $violations ) );
- }
-
-}
\ No newline at end of file
diff --git a/tests/phpunit/Specials/SpecialConstraintReportTest.php
b/tests/phpunit/Specials/SpecialConstraintReportTest.php
index f8e5075..97feda7 100755
--- a/tests/phpunit/Specials/SpecialConstraintReportTest.php
+++ b/tests/phpunit/Specials/SpecialConstraintReportTest.php
@@ -28,11 +28,6 @@
* @uses WikidataQuality\Html\HtmlTable
* @uses WikidataQuality\Html\HtmlTableCell
* @uses WikidataQuality\Html\HtmlTableHeader
- * @uses WikidataQuality\Html\HtmlTableCell
- * @uses WikidataQuality\Result\ResultToViolationTranslator
- * @uses
WikidataQuality\ConstraintReport\ConstraintCheck\Result\CheckResultToViolationTranslator
- * @uses WikidataQuality\Violations\Violation
- * @uses WikidataQuality\Violations\ViolationStore
* @uses WikidataQuality\ConstraintReport\CheckForConstraintViolationsJob
*
* @author BP2014N1
--
To view, visit https://gerrit.wikimedia.org/r/206764
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb2e5f3d8a894c2f41bd807bf481aee17c82e993
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQualityConstraints
Gerrit-Branch: v1
Gerrit-Owner: Jonaskeutel <jonas.keu...@student.hpi.de>
Gerrit-Reviewer: Andreasburmeister <andreas.burmeis...@student.hpi.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
