Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/253890
Change subject: Fixups to RDF builder split
......................................................................
Fixups to RDF builder split
This is a direct follow up to all my comments in I6d9b99d.
Change-Id: I04bef82de4d61d2a444d810b2df612b823dc35bb
---
M repo/includes/rdf/Values/ObjectUriRdfBuilder.php
M repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php
M repo/tests/phpunit/includes/rdf/FullStatementsRdfBuilderTest.php
M repo/tests/phpunit/includes/rdf/RdfBuilderTest.php
M repo/tests/phpunit/includes/rdf/RdfBuilderTestData.php
M repo/tests/phpunit/includes/rdf/SiteLinksRdfBuilderTest.php
M repo/tests/phpunit/includes/rdf/SnakRdfBuilderTest.php
M repo/tests/phpunit/includes/rdf/TermsRdfBuilderTest.php
M repo/tests/phpunit/includes/rdf/TruthyStatementsRdfBuilderTest.php
M repo/tests/phpunit/includes/rdf/Values/CommonsMediaRdfBuilderTest.php
M repo/tests/phpunit/includes/rdf/Values/ComplexValueRdfHelperTest.php
M repo/tests/phpunit/includes/rdf/Values/EntityIdRdfBuilderTest.php
M repo/tests/phpunit/includes/rdf/Values/GlobeCoordinateRdfBuilderTest.php
M repo/tests/phpunit/includes/rdf/Values/LiteralValueRdfBuilderTest.php
M repo/tests/phpunit/includes/rdf/Values/MonolingualTextRdfBuilderTest.php
M repo/tests/phpunit/includes/rdf/Values/ObjectValueRdfBuilderTest.php
M repo/tests/phpunit/includes/rdf/Values/QuantityRdfBuilderTest.php
M repo/tests/phpunit/includes/rdf/Values/TimeRdfBuilderTest.php
18 files changed, 41 insertions(+), 47 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/90/253890/1
diff --git a/repo/includes/rdf/Values/ObjectUriRdfBuilder.php
b/repo/includes/rdf/Values/ObjectUriRdfBuilder.php
index 4585f87..f72945b 100644
--- a/repo/includes/rdf/Values/ObjectUriRdfBuilder.php
+++ b/repo/includes/rdf/Values/ObjectUriRdfBuilder.php
@@ -45,7 +45,7 @@
* @return string the object URI
*/
protected function getValueUri( DataValue $value ) {
- return trim( strval( $value->getValue() ) );
+ return trim( $value->getValue() );
}
}
diff --git a/repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php
b/repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php
index 0a1b340..1a70f8e 100644
--- a/repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php
+++ b/repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php
@@ -144,15 +144,17 @@
/**
* Brings data to normalized form - sorted array of lines
*
- * @param string $data
+ * @param string|string[] $data
*
* @return string[]
*/
public function normalizeData( $data ) {
- $dataSplit = explode( "\n", trim( $data ) );
- sort( $dataSplit );
- $dataSplit = array_map( 'trim', $dataSplit );
- return $dataSplit;
+ if ( is_string( $data ) ) {
+ $data = explode( "\n", rtrim( $data, "\n" ) );
+ }
+
+ sort( $data );
+ return $data;
}
/**
@@ -181,7 +183,6 @@
ob_start();
$dumper->generateDump( $pager );
$dump = ob_get_clean();
- $dump = $this->normalizeData( $dump );
$this->assertTriplesEqual( $this->getSerializedData( $dumpname
), $dump );
}
@@ -213,24 +214,20 @@
ob_start();
$dumper->generateDump( $pager );
$dump = ob_get_clean();
- $dump = $this->normalizeData( $dump );
$this->assertTriplesEqual( $this->getSerializedData( $dumpname
), $dump );
}
- private function assertTriplesEqual( array $expectedTriples, array
$actualTripels, $message = '' ) {
- sort( $expectedTriples );
- sort( $actualTripels );
-
- // Note: comparing $expected and $actual directly would show
triples
- // that are present in both but shifted in position. That makes
the output
- // hard to read. Calculating the $missing and $extra sets helps.
- $extra = array_diff( $actualTripels, $expectedTriples );
- $missing = array_diff( $expectedTriples, $actualTripels );
-
- // Cute: $missing and $extra can be equal only if they are
empty.
- // Comparing them here directly looks a bit odd in code, but
produces meaningful
- // output, especially if the input was sorted.
- $this->assertEquals( $missing, $extra, $message );
+ /**
+ * @param string|string[] $expectedTriples
+ * @param string|string[] $actualTriples
+ * @param string $message
+ */
+ private function assertTriplesEqual( $expectedTriples, $actualTriples,
$message = '' ) {
+ $this->assertEquals(
+ $this->normalizeData( $expectedTriples ),
+ $this->normalizeData( $actualTriples ),
+ $message
+ );
}
}
diff --git a/repo/tests/phpunit/includes/rdf/FullStatementsRdfBuilderTest.php
b/repo/tests/phpunit/includes/rdf/FullStatementsRdfBuilderTest.php
index f98681d..2447faf 100644
--- a/repo/tests/phpunit/includes/rdf/FullStatementsRdfBuilderTest.php
+++ b/repo/tests/phpunit/includes/rdf/FullStatementsRdfBuilderTest.php
@@ -112,7 +112,7 @@
// HACK: $builder->test_writer is glued on by newBuilder().
$ntriples = $builder->test_writer->drain();
- $lines = explode( "\n", trim( $ntriples ) );
+ $lines = explode( "\n", rtrim( $ntriples, "\n" ) );
sort( $lines );
return $lines;
}
diff --git a/repo/tests/phpunit/includes/rdf/RdfBuilderTest.php
b/repo/tests/phpunit/includes/rdf/RdfBuilderTest.php
index 246ff58..3fb65bd 100644
--- a/repo/tests/phpunit/includes/rdf/RdfBuilderTest.php
+++ b/repo/tests/phpunit/includes/rdf/RdfBuilderTest.php
@@ -112,10 +112,9 @@
*/
private function getDataFromBuilder( RdfBuilder $builder ) {
$data = $builder->getRDF();
- $dataSplit = explode( "\n", trim( $data ) );
- sort( $dataSplit );
- $dataSplit = array_map( 'trim', $dataSplit );
- return $dataSplit;
+ $data = explode( "\n", rtrim( $data, "\n" ) );
+ sort( $data );
+ return $data;
}
/**
diff --git a/repo/tests/phpunit/includes/rdf/RdfBuilderTestData.php
b/repo/tests/phpunit/includes/rdf/RdfBuilderTestData.php
index d1f98f0..b4fb089 100644
--- a/repo/tests/phpunit/includes/rdf/RdfBuilderTestData.php
+++ b/repo/tests/phpunit/includes/rdf/RdfBuilderTestData.php
@@ -96,10 +96,9 @@
return null;
}
- $data = trim( file_get_contents( $filename ) );
- $data = explode( "\n", $data );
+ $data = file_get_contents( $filename );
+ $data = explode( "\n", rtrim( $data, "\n" ) );
sort( $data );
- $data = array_map( 'trim', $data );
return $data;
}
diff --git a/repo/tests/phpunit/includes/rdf/SiteLinksRdfBuilderTest.php
b/repo/tests/phpunit/includes/rdf/SiteLinksRdfBuilderTest.php
index 3fe059a..1cbee7d 100644
--- a/repo/tests/phpunit/includes/rdf/SiteLinksRdfBuilderTest.php
+++ b/repo/tests/phpunit/includes/rdf/SiteLinksRdfBuilderTest.php
@@ -70,7 +70,7 @@
// HACK: $builder->test_writer is glued on by newBuilder().
$ntriples = $builder->test_writer->drain();
- $lines = explode( "\n", trim( $ntriples ) );
+ $lines = explode( "\n", rtrim( $ntriples, "\n" ) );
sort( $lines );
return $lines;
}
diff --git a/repo/tests/phpunit/includes/rdf/SnakRdfBuilderTest.php
b/repo/tests/phpunit/includes/rdf/SnakRdfBuilderTest.php
index 6c08d0c..4510dbc 100644
--- a/repo/tests/phpunit/includes/rdf/SnakRdfBuilderTest.php
+++ b/repo/tests/phpunit/includes/rdf/SnakRdfBuilderTest.php
@@ -101,16 +101,16 @@
private function getDataFromWriter( RdfWriter $writer ) {
$ntriples = $writer->drain();
- $lines = explode( "\n", trim( $ntriples ) );
+ $lines = explode( "\n", rtrim( $ntriples, "\n" ) );
sort( $lines );
return $lines;
}
private function assertTriplesEqual( array $expectedTriples, RdfWriter
$writer ) {
- $actualTripels = $this->getDataFromWriter( $writer );
+ $actualTriples = $this->getDataFromWriter( $writer );
sort( $expectedTriples );
- $this->assertEquals( $expectedTriples, $actualTripels );
+ $this->assertEquals( $expectedTriples, $actualTriples );
}
public function provideAddSnakValue() {
diff --git a/repo/tests/phpunit/includes/rdf/TermsRdfBuilderTest.php
b/repo/tests/phpunit/includes/rdf/TermsRdfBuilderTest.php
index da765cc..b4fa82b 100644
--- a/repo/tests/phpunit/includes/rdf/TermsRdfBuilderTest.php
+++ b/repo/tests/phpunit/includes/rdf/TermsRdfBuilderTest.php
@@ -69,7 +69,7 @@
// HACK: $builder->test_writer is glued on by newBuilder().
$ntriples = $builder->test_writer->drain();
- $lines = explode( "\n", trim( $ntriples ) );
+ $lines = explode( "\n", rtrim( $ntriples, "\n" ) );
sort( $lines );
return $lines;
}
diff --git a/repo/tests/phpunit/includes/rdf/TruthyStatementsRdfBuilderTest.php
b/repo/tests/phpunit/includes/rdf/TruthyStatementsRdfBuilderTest.php
index 26d3ef5..a424053 100644
--- a/repo/tests/phpunit/includes/rdf/TruthyStatementsRdfBuilderTest.php
+++ b/repo/tests/phpunit/includes/rdf/TruthyStatementsRdfBuilderTest.php
@@ -82,9 +82,8 @@
// HACK: $builder->test_writer is glued on by newBuilder().
$ntriples = $builder->test_writer->drain();
- $lines = explode( "\n", trim( $ntriples ) );
+ $lines = explode( "\n", rtrim( $ntriples, "\n" ) );
sort( $lines );
- $lines = array_map( 'trim', $lines );
return $lines;
}
diff --git
a/repo/tests/phpunit/includes/rdf/Values/CommonsMediaRdfBuilderTest.php
b/repo/tests/phpunit/includes/rdf/Values/CommonsMediaRdfBuilderTest.php
index fba7ffc..82fadec 100644
--- a/repo/tests/phpunit/includes/rdf/Values/CommonsMediaRdfBuilderTest.php
+++ b/repo/tests/phpunit/includes/rdf/Values/CommonsMediaRdfBuilderTest.php
@@ -43,7 +43,7 @@
$builder->addValue( $writer, 'acme', 'testing', 'DUMMY', $snak
);
$expected = array( '<http://www/Q1> <http://acme/testing>
<http://commons.wikimedia.org/wiki/Special:FilePath/Bunny.jpg> .' );
- $triples = explode( "\n", trim( $writer->drain() ) );
+ $triples = explode( "\n", rtrim( $writer->drain(), "\n" ) );
$this->assertEquals( $expected, $triples );
}
diff --git
a/repo/tests/phpunit/includes/rdf/Values/ComplexValueRdfHelperTest.php
b/repo/tests/phpunit/includes/rdf/Values/ComplexValueRdfHelperTest.php
index 83ef820..6cb8b20 100644
--- a/repo/tests/phpunit/includes/rdf/Values/ComplexValueRdfHelperTest.php
+++ b/repo/tests/phpunit/includes/rdf/Values/ComplexValueRdfHelperTest.php
@@ -63,14 +63,14 @@
'<http://www/Q2> <http://acme/statement/value/testing>
<http://acme/value/e93b68fef814eb52e813bb72e6867432> .'
);
- $triples = explode( "\n", trim( $snakWriter->drain() ) );
+ $triples = explode( "\n", rtrim( $snakWriter->drain(), "\n" ) );
$this->assertEquals( $expected, $triples );
// check the triples written to the value writer
$expected = array(
'<http://acme/value/e93b68fef814eb52e813bb72e6867432> '
. '<http://www.w3.org/1999/02/22-rdf-syntax-ns#type> '
. '<http://acme/onto/StringValue> .' );
- $triples = explode( "\n", trim( $valueWriter->drain() ) );
+ $triples = explode( "\n", rtrim( $valueWriter->drain(), "\n" )
);
$this->assertEquals( $expected, $triples );
}
diff --git a/repo/tests/phpunit/includes/rdf/Values/EntityIdRdfBuilderTest.php
b/repo/tests/phpunit/includes/rdf/Values/EntityIdRdfBuilderTest.php
index c2af600..66fcf3e 100644
--- a/repo/tests/phpunit/includes/rdf/Values/EntityIdRdfBuilderTest.php
+++ b/repo/tests/phpunit/includes/rdf/Values/EntityIdRdfBuilderTest.php
@@ -45,7 +45,7 @@
$builder->addValue( $writer, 'acme', 'testing', 'DUMMY', $snak
);
$expected = array( '<http://www/Q1> <http://acme/testing>
<http://test/item/Q23> .' );
- $triples = explode( "\n", trim( $writer->drain() ) );
+ $triples = explode( "\n", rtrim( $writer->drain(), "\n" ) );
$this->assertEquals( $expected, $triples );
}
diff --git
a/repo/tests/phpunit/includes/rdf/Values/GlobeCoordinateRdfBuilderTest.php
b/repo/tests/phpunit/includes/rdf/Values/GlobeCoordinateRdfBuilderTest.php
index f9a6449..3101f48 100644
--- a/repo/tests/phpunit/includes/rdf/Values/GlobeCoordinateRdfBuilderTest.php
+++ b/repo/tests/phpunit/includes/rdf/Values/GlobeCoordinateRdfBuilderTest.php
@@ -108,7 +108,7 @@
$snak
);
- $triples = trim( $snakWriter->drain() );
+ $triples = rtrim( $snakWriter->drain(), "\n" );
$this->assertEquals( join( "\n", $expected ), $triples );
}
diff --git
a/repo/tests/phpunit/includes/rdf/Values/LiteralValueRdfBuilderTest.php
b/repo/tests/phpunit/includes/rdf/Values/LiteralValueRdfBuilderTest.php
index 3b200f3..dc7bb0d 100644
--- a/repo/tests/phpunit/includes/rdf/Values/LiteralValueRdfBuilderTest.php
+++ b/repo/tests/phpunit/includes/rdf/Values/LiteralValueRdfBuilderTest.php
@@ -65,7 +65,7 @@
$builder->addValue( $writer, 'acme', 'testing', 'DUMMY', $snak
);
- $triples = explode( "\n", trim( $writer->drain() ) );
+ $triples = explode( "\n", rtrim( $writer->drain(), "\n" ) );
$this->assertEquals( $expected, $triples );
}
diff --git
a/repo/tests/phpunit/includes/rdf/Values/MonolingualTextRdfBuilderTest.php
b/repo/tests/phpunit/includes/rdf/Values/MonolingualTextRdfBuilderTest.php
index 886b2c4..0f32e1b 100644
--- a/repo/tests/phpunit/includes/rdf/Values/MonolingualTextRdfBuilderTest.php
+++ b/repo/tests/phpunit/includes/rdf/Values/MonolingualTextRdfBuilderTest.php
@@ -35,7 +35,7 @@
$builder->addValue( $writer, 'acme', 'testing', 'DUMMY', $snak
);
$expected = array( '<http://www/Q1> <http://acme/testing>
"Hallo Welt"@de .' );
- $triples = explode( "\n", trim( $writer->drain() ) );
+ $triples = explode( "\n", rtrim( $writer->drain(), "\n" ) );
$this->assertEquals( $expected, $triples );
}
diff --git
a/repo/tests/phpunit/includes/rdf/Values/ObjectValueRdfBuilderTest.php
b/repo/tests/phpunit/includes/rdf/Values/ObjectValueRdfBuilderTest.php
index c19c661..7ce3d6c 100644
--- a/repo/tests/phpunit/includes/rdf/Values/ObjectValueRdfBuilderTest.php
+++ b/repo/tests/phpunit/includes/rdf/Values/ObjectValueRdfBuilderTest.php
@@ -40,7 +40,7 @@
$builder->addValue( $writer, 'acme', 'testing', 'DUMMY', $snak
);
$expected = array( '<http://www/Q1> <http://acme/testing>
<http://en.wikipedia.org/wiki/Wikidata> .' );
- $triples = explode( "\n", trim( $writer->drain() ) );
+ $triples = explode( "\n", rtrim( $writer->drain(), "\n" ) );
$this->assertEquals( $expected, $triples );
}
diff --git a/repo/tests/phpunit/includes/rdf/Values/QuantityRdfBuilderTest.php
b/repo/tests/phpunit/includes/rdf/Values/QuantityRdfBuilderTest.php
index 495f0e9..132991d 100644
--- a/repo/tests/phpunit/includes/rdf/Values/QuantityRdfBuilderTest.php
+++ b/repo/tests/phpunit/includes/rdf/Values/QuantityRdfBuilderTest.php
@@ -101,7 +101,7 @@
$snak
);
- $triples = trim( $snakWriter->drain() );
+ $triples = rtrim( $snakWriter->drain(), "\n" );
$this->assertEquals( join( "\n", $expected ), $triples );
}
diff --git a/repo/tests/phpunit/includes/rdf/Values/TimeRdfBuilderTest.php
b/repo/tests/phpunit/includes/rdf/Values/TimeRdfBuilderTest.php
index 371c7e0..3f9feae 100644
--- a/repo/tests/phpunit/includes/rdf/Values/TimeRdfBuilderTest.php
+++ b/repo/tests/phpunit/includes/rdf/Values/TimeRdfBuilderTest.php
@@ -140,7 +140,7 @@
$snak
);
- $triples = trim( $snakWriter->drain() );
+ $triples = rtrim( $snakWriter->drain(), "\n" );
$this->assertEquals( join( "\n", $expected ), $triples );
}
--
To view, visit https://gerrit.wikimedia.org/r/253890
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I04bef82de4d61d2a444d810b2df612b823dc35bb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
