Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/206778
Change subject: remove what has something to do with class Violation.
......................................................................
remove what has something to do with class Violation.
Change-Id: I178ea6540d4cffb4103d7406154221a1abc6aaee
---
M WikidataQualityExternalValidation.php
M build/travis/before_script.sh
D includes/CrossCheck/Result/CrossCheckResultToViolationTranslator.php
M specials/SpecialCrossCheck.php
D tests/phpunit/CrossCheck/Result/CrossCheckResultToViolationTranslatorTest.php
M tests/phpunit/Specials/SpecialCrossCheckTest.php
6 files changed, 5 insertions(+), 188 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityExternalValidation
refs/changes/78/206778/1
diff --git a/WikidataQualityExternalValidation.php
b/WikidataQualityExternalValidation.php
index 2fa5c2a..e9caee9 100644
--- a/WikidataQualityExternalValidation.php
+++ b/WikidataQualityExternalValidation.php
@@ -47,5 +47,5 @@
define( 'DUMP_IDENTIFIER_PROPERTIES_TABLE',
'wdqa_identifier_properties' );
// Jobs
- $GLOBALS['wgJobClasses']['checkForCrossCheckViolations'] =
'CheckForCrossCheckViolationsJob';
+ $GLOBALS['wgJobClasses']['checkForCrossCheckViolations'] =
'WikidataQuality\ExternalValidation\CheckForCrossCheckViolationsJob';
} );
\ No newline at end of file
diff --git a/build/travis/before_script.sh b/build/travis/before_script.sh
index 37d1094..b5c6bc7 100644
--- a/build/travis/before_script.sh
+++ b/build/travis/before_script.sh
@@ -21,10 +21,10 @@
mv mediawiki-extensions-Wikibase-master wiki/extensions/Wikibase
# checkout WikidataQuality
-wget
https://github.com/wikimedia/mediawiki-extensions-WikidataQuality/archive/master.tar.gz
-tar -zxf master.tar.gz
-rm master.tar.gz
-mv mediawiki-extensions-WikidataQuality-master wiki/extensions/WikidataQuality
+wget
https://github.com/wikimedia/mediawiki-extensions-WikidataQuality/archive/v1.tar.gz
+tar -zxf v1.tar.gz
+rm v1.tar.gz
+mv mediawiki-extensions-WikidataQuality-1 wiki/extensions/WikidataQuality
cd wiki
diff --git
a/includes/CrossCheck/Result/CrossCheckResultToViolationTranslator.php
b/includes/CrossCheck/Result/CrossCheckResultToViolationTranslator.php
deleted file mode 100755
index 453bb12..0000000
--- a/includes/CrossCheck/Result/CrossCheckResultToViolationTranslator.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace WikidataQuality\ExternalValidation\CrossCheck\Result;
-
-use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\DataModel\Entity\PropertyId;
-use Wikibase\DataModel\Entity\Entity;
-use WikidataQuality\Result\ResultToViolationTranslator;
-use WikidataQuality\Violations\Violation;
-use Doctrine\Instantiator\Exception\InvalidArgumentException;
-
-
-class CrossCheckResultToViolationTranslator extends
ResultToViolationTranslator {
-
- public function translateToViolation( Entity $entity, CrossCheckResultList
$crossCheckResultList ) {
-
- $violationArray = array();
- foreach( $crossCheckResultList as $crossCheckResult ) {
- if( $crossCheckResult->getStatus() !==
CrossCheckResult::STATUS_DATA_MISMATCH ){
- continue;
- }
-
- $entityId = $entity->getId();
- $statement = array(
- 'pid' => $crossCheckResult->getPropertyId(),
- 'claimGuid' => $crossCheckResult->getClaimGuid()
- );
-
- //TODO: Use real ClaimGuid and TypeEntityId
- $constraintTypeEntityId =
$crossCheckResult->getDumpMetaInformation()->getSourceItemId();
- $constraintClaimGuid =
$crossCheckResult->getDumpMetaInformation()->getImportDate()->format( 'YmdHis'
) . $constraintTypeEntityId;
-
- $constraintClaimGuid = md5( $constraintClaimGuid );
- $revisionId = $this->getRevisionIdForEntity( $entityId );
- $status = CrossCheckResult::STATUS_DATA_MISMATCH;
- $additionalInformation = array(
- 'dump_id' =>
$crossCheckResult->getDumpMetaInformation()->getDumpId(),
- 'external_values' =>
$crossCheckResult->getCompareResult()->getExternalValues()
-
- );
- $additionalInformation = json_encode( $additionalInformation );
-
- $violationArray[] = new Violation( $entityId, $statement,
$constraintClaimGuid, $constraintTypeEntityId, $revisionId, $status,
$additionalInformation);
- }
-
- return $violationArray;
- }
-
-}
\ No newline at end of file
diff --git a/specials/SpecialCrossCheck.php b/specials/SpecialCrossCheck.php
index 6a6c369..80e4780 100755
--- a/specials/SpecialCrossCheck.php
+++ b/specials/SpecialCrossCheck.php
@@ -69,8 +69,6 @@
$this->doEvaluation( $entity, $results );
- $this->saveResultsInViolationsTable( $entity, $results );
-
return $results;
}
@@ -135,17 +133,6 @@
CrossCheckResult::STATUS_REFERENCES_MISSING =>
'warning',
CrossCheckResult::STATUS_DATA_MISMATCH => 'error'
);
- }
-
- /**
- * @param EntityDocument $entity
- * @param array $results
- */
- protected function saveResultsInViolationsTable( $entity, $results ) {
- $translator = new CrossCheckResultToViolationTranslator();
- $violations = $translator->translateToViolation( $entity,
$results );
- $violationStore = new ViolationStore();
- $violationStore->insertViolations( $violations );
}
protected function doEvaluation( $entity, $results ) {
diff --git
a/tests/phpunit/CrossCheck/Result/CrossCheckResultToViolationTranslatorTest.php
b/tests/phpunit/CrossCheck/Result/CrossCheckResultToViolationTranslatorTest.php
deleted file mode 100755
index 43d15d9..0000000
---
a/tests/phpunit/CrossCheck/Result/CrossCheckResultToViolationTranslatorTest.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-
-namespace WikidataQuality\ExternalValidation\Test\CrossCheck\Result;
-
-use Wikibase\DataModel\Entity\Item;
-use Wikibase\DataModel\Entity\PropertyId;
-use Wikibase\DataModel\Entity\ItemId;
-use DateTime;
-use WikidataQuality\ExternalValidation\CrossCheck\Result\CompareResult;
-use WikidataQuality\ExternalValidation\CrossCheck\Result\ReferenceResult;
-use WikidataQuality\ExternalValidation\CrossCheck\Result\CrossCheckResult;
-use WikidataQuality\ExternalValidation\CrossCheck\Result\CrossCheckResultList;
-use
WikidataQuality\ExternalValidation\CrossCheck\Result\CrossCheckResultToViolationTranslator;
-use WikidataQuality\ExternalValidation\DumpMetaInformation;
-use Wikibase\Repo\WikibaseRepo;
-
-
-/**
- * @covers
WikidataQuality\ExternalValidation\CrossCheck\Result\CrossCheckResultToViolationTranslator
- *
- * @group Database
- * @group medium
- *
- * @uses WikidataQuality\ExternalValidation\DumpMetaInformation
- * @uses WikidataQuality\ExternalValidation\CrossCheck\Result\CompareResult
- * @uses WikidataQuality\ExternalValidation\CrossCheck\Result\ReferenceResult
- * @uses
WikidataQuality\ExternalValidation\CrossCheck\Result\CrossCheckResult
- * @uses
WikidataQuality\ExternalValidation\CrossCheck\Result\CrossCheckResultList
- *
- * @author BP2014N1
- * @license GNU GPL v2+
- */
-class CrossCheckResultToViolationTranslatorTest extends \MediaWikiTestCase {
-
- private $translator;
- private $propertyId;
- private $claimGuid;
- private $entity;
- private $dumpMetaInformation;
- private $referenceResult;
-
- /**
- * @var EntityId[]
- */
- private static $idMap;
-
- protected function setUp() {
- parent::setUp();
- $this->translator = new CrossCheckResultToViolationTranslator();
-
- $this->propertyId = new PropertyId( 'P1' );
- $this->entity = new Item();
- $store = WikibaseRepo::getDefaultInstance()->getEntityStore();
- $store->saveEntity( $this->entity, 'TestEntityQ1', $GLOBALS[ 'wgUser'
], EDIT_NEW );
- self::$idMap[ 'Q1' ] = $this->entity->getId();
- $this->claimGuid = self::$idMap[ 'Q1' ] .
'$aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee';
-
- $this->dumpMetaInformation = new DumpMetaInformation(
- 'foo',
- new ItemId( 'Q123456' ),
- new DateTime( '2015-01-01 00:00:00' ),
- 'en',
- 'http://www.foo.bar',
- 42,
- new ItemId( 'Q6938433' )
- );
-
- $this->referenceResult = new ReferenceResult(
- false,
- $this->getReferenceMock()
- );
-
- }
-
- protected function tearDown() {
- parent::tearDown();
- unset( $this->translator, $this->propertyId, $this->claimGuid,
$this->entity, $this->dumpMetaInformation, $this->referenceResult );
- }
-
- public function testSingleComplianceResult() {
- $compareResult = new CompareResult(
- $this->getDataValueMock(),
- array( $this->getDataValueMock() ),
- false
- );
-
- $crossCheckResultList = new CrossCheckResultList( array( new
CrossCheckResult( $this->propertyId, $this->claimGuid,
$this->dumpMetaInformation, $compareResult, $this->referenceResult ) ) );
- $violations = $this->translator->translateToViolation( $this->entity,
$crossCheckResultList );
- $this->assertEquals( array(), $violations );
- }
-
- public function testSingleViolationResult() {
- $compareResult = new CompareResult(
- $this->getDataValueMock(),
- array( $this->getDataValueMock() ),
- true
- );
-
- $crossCheckResultList = new CrossCheckResultList( array( new
CrossCheckResult( $this->propertyId, $this->claimGuid,
$this->dumpMetaInformation, $compareResult, $this->referenceResult ) ) );
- $violations = $this->translator->translateToViolation( $this->entity,
$crossCheckResultList );
- $this->assertEquals( 1, sizeof( $violations ) );
-
- $violation = $violations[0];
- $this->assertEquals( self::$idMap[ 'Q1' ], $violation->getEntityId() );
- $this->assertEquals( 'P1',
$violation->getPropertyId()->getSerialization() );
- $this->assertEquals( $this->claimGuid, $violation->getClaimGuid() );
- $this->assertEquals( md5(
$this->dumpMetaInformation->getImportDate()->format( 'YmdHis' ) .
$this->dumpMetaInformation->getSourceItemId() ),
$violation->getConstraintClaimGuid() );
- $this->assertEquals( $this->dumpMetaInformation->getSourceItemId(),
$violation->getConstraintTypeEntityId() );
-
- }
-
- private function getReferenceMock() {
- return $this->getMock( 'Wikibase\DataModel\Reference' );
- }
-
- private function getDataValueMock()
- {
- return $this->getMock( 'DataValues\DataValue' );
- }
-}
\ No newline at end of file
diff --git a/tests/phpunit/Specials/SpecialCrossCheckTest.php
b/tests/phpunit/Specials/SpecialCrossCheckTest.php
index 163d4cb..330e09f 100755
--- a/tests/phpunit/Specials/SpecialCrossCheckTest.php
+++ b/tests/phpunit/Specials/SpecialCrossCheckTest.php
@@ -33,7 +33,6 @@
* @uses WikidataQuality\ExternalValidation\CrossCheck\Result\ReferenceResult
* @uses
WikidataQuality\ExternalValidation\CrossCheck\Result\CrossCheckResult
* @uses
WikidataQuality\ExternalValidation\CrossCheck\Result\CrossCheckResultList
- * @uses
WikidataQuality\ExternalValidation\CrossCheck\Result\CrossCheckResultToViolationTranslator
* @uses WikidataQuality\ExternalValidation\CheckForCrossCheckViolationsJob
* @uses WikidataQuality\Html\HtmlTable
* @uses WikidataQuality\Html\HtmlTableHeader
--
To view, visit https://gerrit.wikimedia.org/r/206778
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I178ea6540d4cffb4103d7406154221a1abc6aaee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQualityExternalValidation
Gerrit-Branch: v1
Gerrit-Owner: Soeren.oldag <soeren_ol...@freenet.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
