Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/261622
Change subject: Organize RDF test data in sub-directories
......................................................................
Organize RDF test data in sub-directories
This was already done for all later tests, but not for the original
RdfBuilderTest, which had everything in the top level directory.
Change-Id: Ic6bbe64fc56ac6df1bb0a4fc6328e10ba3d413bc
---
R repo/tests/phpunit/data/rdf/RdfBuilder/Q10_redirect.nt
R repo/tests/phpunit/data/rdf/RdfBuilder/Q1_info.nt
R repo/tests/phpunit/data/rdf/RdfBuilder/Q1_simple.nt
R repo/tests/phpunit/data/rdf/RdfBuilder/Q2_labels.nt
R repo/tests/phpunit/data/rdf/RdfBuilder/Q3_links.nt
R repo/tests/phpunit/data/rdf/RdfBuilder/Q3_sitelinks.nt
R repo/tests/phpunit/data/rdf/RdfBuilder/Q4_all_statements.nt
R repo/tests/phpunit/data/rdf/RdfBuilder/Q4_claims.nt
R repo/tests/phpunit/data/rdf/RdfBuilder/Q4_props.nt
R repo/tests/phpunit/data/rdf/RdfBuilder/Q4_resolved.nt
R repo/tests/phpunit/data/rdf/RdfBuilder/Q4_truthy_statements.nt
R repo/tests/phpunit/data/rdf/RdfBuilder/Q4_values.nt
R repo/tests/phpunit/data/rdf/RdfBuilder/Q5_badges.nt
R repo/tests/phpunit/data/rdf/RdfBuilder/Q6_no_qualifiers.nt
R repo/tests/phpunit/data/rdf/RdfBuilder/Q6_qualifiers.nt
R repo/tests/phpunit/data/rdf/RdfBuilder/Q6_with_qualifiers.nt
R repo/tests/phpunit/data/rdf/RdfBuilder/Q7_Q9_dedup.nt
R repo/tests/phpunit/data/rdf/RdfBuilder/Q7_no_refs.nt
R repo/tests/phpunit/data/rdf/RdfBuilder/Q7_references.nt
R repo/tests/phpunit/data/rdf/RdfBuilder/Q7_refs.nt
R repo/tests/phpunit/data/rdf/RdfBuilder/Q8_baddates.nt
R repo/tests/phpunit/data/rdf/RdfBuilder/dumpheader.nt
R repo/tests/phpunit/data/rdf/entities/Q1.json
R repo/tests/phpunit/data/rdf/entities/Q10.json
R repo/tests/phpunit/data/rdf/entities/Q2.json
R repo/tests/phpunit/data/rdf/entities/Q3.json
R repo/tests/phpunit/data/rdf/entities/Q4.json
R repo/tests/phpunit/data/rdf/entities/Q5.json
R repo/tests/phpunit/data/rdf/entities/Q6.json
R repo/tests/phpunit/data/rdf/entities/Q7.json
R repo/tests/phpunit/data/rdf/entities/Q8.json
R repo/tests/phpunit/data/rdf/entities/Q9.json
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/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
39 files changed, 15 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/22/261622/1
diff --git a/repo/tests/phpunit/data/rdf/Q10_redirect.nt
b/repo/tests/phpunit/data/rdf/RdfBuilder/Q10_redirect.nt
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Q10_redirect.nt
rename to repo/tests/phpunit/data/rdf/RdfBuilder/Q10_redirect.nt
diff --git a/repo/tests/phpunit/data/rdf/Q1_info.nt
b/repo/tests/phpunit/data/rdf/RdfBuilder/Q1_info.nt
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Q1_info.nt
rename to repo/tests/phpunit/data/rdf/RdfBuilder/Q1_info.nt
diff --git a/repo/tests/phpunit/data/rdf/Q1_simple.nt
b/repo/tests/phpunit/data/rdf/RdfBuilder/Q1_simple.nt
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Q1_simple.nt
rename to repo/tests/phpunit/data/rdf/RdfBuilder/Q1_simple.nt
diff --git a/repo/tests/phpunit/data/rdf/Q2_labels.nt
b/repo/tests/phpunit/data/rdf/RdfBuilder/Q2_labels.nt
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Q2_labels.nt
rename to repo/tests/phpunit/data/rdf/RdfBuilder/Q2_labels.nt
diff --git a/repo/tests/phpunit/data/rdf/Q3_links.nt
b/repo/tests/phpunit/data/rdf/RdfBuilder/Q3_links.nt
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Q3_links.nt
rename to repo/tests/phpunit/data/rdf/RdfBuilder/Q3_links.nt
diff --git a/repo/tests/phpunit/data/rdf/Q3_sitelinks.nt
b/repo/tests/phpunit/data/rdf/RdfBuilder/Q3_sitelinks.nt
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Q3_sitelinks.nt
rename to repo/tests/phpunit/data/rdf/RdfBuilder/Q3_sitelinks.nt
diff --git a/repo/tests/phpunit/data/rdf/Q4_all_statements.nt
b/repo/tests/phpunit/data/rdf/RdfBuilder/Q4_all_statements.nt
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Q4_all_statements.nt
rename to repo/tests/phpunit/data/rdf/RdfBuilder/Q4_all_statements.nt
diff --git a/repo/tests/phpunit/data/rdf/Q4_claims.nt
b/repo/tests/phpunit/data/rdf/RdfBuilder/Q4_claims.nt
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Q4_claims.nt
rename to repo/tests/phpunit/data/rdf/RdfBuilder/Q4_claims.nt
diff --git a/repo/tests/phpunit/data/rdf/Q4_props.nt
b/repo/tests/phpunit/data/rdf/RdfBuilder/Q4_props.nt
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Q4_props.nt
rename to repo/tests/phpunit/data/rdf/RdfBuilder/Q4_props.nt
diff --git a/repo/tests/phpunit/data/rdf/Q4_resolved.nt
b/repo/tests/phpunit/data/rdf/RdfBuilder/Q4_resolved.nt
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Q4_resolved.nt
rename to repo/tests/phpunit/data/rdf/RdfBuilder/Q4_resolved.nt
diff --git a/repo/tests/phpunit/data/rdf/Q4_truthy_statements.nt
b/repo/tests/phpunit/data/rdf/RdfBuilder/Q4_truthy_statements.nt
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Q4_truthy_statements.nt
rename to repo/tests/phpunit/data/rdf/RdfBuilder/Q4_truthy_statements.nt
diff --git a/repo/tests/phpunit/data/rdf/Q4_values.nt
b/repo/tests/phpunit/data/rdf/RdfBuilder/Q4_values.nt
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Q4_values.nt
rename to repo/tests/phpunit/data/rdf/RdfBuilder/Q4_values.nt
diff --git a/repo/tests/phpunit/data/rdf/Q5_badges.nt
b/repo/tests/phpunit/data/rdf/RdfBuilder/Q5_badges.nt
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Q5_badges.nt
rename to repo/tests/phpunit/data/rdf/RdfBuilder/Q5_badges.nt
diff --git a/repo/tests/phpunit/data/rdf/Q6_no_qualifiers.nt
b/repo/tests/phpunit/data/rdf/RdfBuilder/Q6_no_qualifiers.nt
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Q6_no_qualifiers.nt
rename to repo/tests/phpunit/data/rdf/RdfBuilder/Q6_no_qualifiers.nt
diff --git a/repo/tests/phpunit/data/rdf/Q6_qualifiers.nt
b/repo/tests/phpunit/data/rdf/RdfBuilder/Q6_qualifiers.nt
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Q6_qualifiers.nt
rename to repo/tests/phpunit/data/rdf/RdfBuilder/Q6_qualifiers.nt
diff --git a/repo/tests/phpunit/data/rdf/Q6_with_qualifiers.nt
b/repo/tests/phpunit/data/rdf/RdfBuilder/Q6_with_qualifiers.nt
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Q6_with_qualifiers.nt
rename to repo/tests/phpunit/data/rdf/RdfBuilder/Q6_with_qualifiers.nt
diff --git a/repo/tests/phpunit/data/rdf/Q7_Q9_dedup.nt
b/repo/tests/phpunit/data/rdf/RdfBuilder/Q7_Q9_dedup.nt
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Q7_Q9_dedup.nt
rename to repo/tests/phpunit/data/rdf/RdfBuilder/Q7_Q9_dedup.nt
diff --git a/repo/tests/phpunit/data/rdf/Q7_no_refs.nt
b/repo/tests/phpunit/data/rdf/RdfBuilder/Q7_no_refs.nt
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Q7_no_refs.nt
rename to repo/tests/phpunit/data/rdf/RdfBuilder/Q7_no_refs.nt
diff --git a/repo/tests/phpunit/data/rdf/Q7_references.nt
b/repo/tests/phpunit/data/rdf/RdfBuilder/Q7_references.nt
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Q7_references.nt
rename to repo/tests/phpunit/data/rdf/RdfBuilder/Q7_references.nt
diff --git a/repo/tests/phpunit/data/rdf/Q7_refs.nt
b/repo/tests/phpunit/data/rdf/RdfBuilder/Q7_refs.nt
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Q7_refs.nt
rename to repo/tests/phpunit/data/rdf/RdfBuilder/Q7_refs.nt
diff --git a/repo/tests/phpunit/data/rdf/Q8_baddates.nt
b/repo/tests/phpunit/data/rdf/RdfBuilder/Q8_baddates.nt
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Q8_baddates.nt
rename to repo/tests/phpunit/data/rdf/RdfBuilder/Q8_baddates.nt
diff --git a/repo/tests/phpunit/data/rdf/dumpheader.nt
b/repo/tests/phpunit/data/rdf/RdfBuilder/dumpheader.nt
similarity index 100%
rename from repo/tests/phpunit/data/rdf/dumpheader.nt
rename to repo/tests/phpunit/data/rdf/RdfBuilder/dumpheader.nt
diff --git a/repo/tests/phpunit/data/rdf/Q1.json
b/repo/tests/phpunit/data/rdf/entities/Q1.json
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Q1.json
rename to repo/tests/phpunit/data/rdf/entities/Q1.json
diff --git a/repo/tests/phpunit/data/rdf/Q10.json
b/repo/tests/phpunit/data/rdf/entities/Q10.json
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Q10.json
rename to repo/tests/phpunit/data/rdf/entities/Q10.json
diff --git a/repo/tests/phpunit/data/rdf/Q2.json
b/repo/tests/phpunit/data/rdf/entities/Q2.json
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Q2.json
rename to repo/tests/phpunit/data/rdf/entities/Q2.json
diff --git a/repo/tests/phpunit/data/rdf/Q3.json
b/repo/tests/phpunit/data/rdf/entities/Q3.json
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Q3.json
rename to repo/tests/phpunit/data/rdf/entities/Q3.json
diff --git a/repo/tests/phpunit/data/rdf/Q4.json
b/repo/tests/phpunit/data/rdf/entities/Q4.json
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Q4.json
rename to repo/tests/phpunit/data/rdf/entities/Q4.json
diff --git a/repo/tests/phpunit/data/rdf/Q5.json
b/repo/tests/phpunit/data/rdf/entities/Q5.json
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Q5.json
rename to repo/tests/phpunit/data/rdf/entities/Q5.json
diff --git a/repo/tests/phpunit/data/rdf/Q6.json
b/repo/tests/phpunit/data/rdf/entities/Q6.json
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Q6.json
rename to repo/tests/phpunit/data/rdf/entities/Q6.json
diff --git a/repo/tests/phpunit/data/rdf/Q7.json
b/repo/tests/phpunit/data/rdf/entities/Q7.json
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Q7.json
rename to repo/tests/phpunit/data/rdf/entities/Q7.json
diff --git a/repo/tests/phpunit/data/rdf/Q8.json
b/repo/tests/phpunit/data/rdf/entities/Q8.json
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Q8.json
rename to repo/tests/phpunit/data/rdf/entities/Q8.json
diff --git a/repo/tests/phpunit/data/rdf/Q9.json
b/repo/tests/phpunit/data/rdf/entities/Q9.json
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Q9.json
rename to repo/tests/phpunit/data/rdf/entities/Q9.json
diff --git a/repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php
b/repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php
index 0a1b340..54feec2 100644
--- a/repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php
+++ b/repo/tests/phpunit/includes/Dumpers/RdfDumpGeneratorTest.php
@@ -64,7 +64,7 @@
private function getTestData() {
return new RdfBuilderTestData(
- __DIR__ . '/../../data/rdf',
+ __DIR__ . '/../../data/rdf/entities',
__DIR__ . '/../../data/rdf/RdfDumpGenerator'
);
}
diff --git a/repo/tests/phpunit/includes/rdf/FullStatementsRdfBuilderTest.php
b/repo/tests/phpunit/includes/rdf/FullStatementsRdfBuilderTest.php
index f98681d..c057eb7 100644
--- a/repo/tests/phpunit/includes/rdf/FullStatementsRdfBuilderTest.php
+++ b/repo/tests/phpunit/includes/rdf/FullStatementsRdfBuilderTest.php
@@ -37,8 +37,8 @@
private function getTestData() {
if ( $this->testData === null ) {
$this->testData = new RdfBuilderTestData(
- __DIR__ . "/../../data/rdf",
- __DIR__ .
"/../../data/rdf/FullStatementRdfBuilder"
+ __DIR__ . '/../../data/rdf/entities',
+ __DIR__ .
'/../../data/rdf/FullStatementRdfBuilder'
);
}
diff --git a/repo/tests/phpunit/includes/rdf/RdfBuilderTest.php
b/repo/tests/phpunit/includes/rdf/RdfBuilderTest.php
index 246ff58..d4401a2 100644
--- a/repo/tests/phpunit/includes/rdf/RdfBuilderTest.php
+++ b/repo/tests/phpunit/includes/rdf/RdfBuilderTest.php
@@ -33,7 +33,10 @@
*/
private function getTestData() {
if ( empty( $this->testData ) ) {
- $this->testData = new RdfBuilderTestData( __DIR__ .
"/../../data/rdf", __DIR__ . "/../../data/rdf" );
+ $this->testData = new RdfBuilderTestData(
+ __DIR__ . '/../../data/rdf/entities',
+ __DIR__ . '/../../data/rdf/RdfBuilder'
+ );
}
return $this->testData;
diff --git a/repo/tests/phpunit/includes/rdf/SiteLinksRdfBuilderTest.php
b/repo/tests/phpunit/includes/rdf/SiteLinksRdfBuilderTest.php
index 3fe059a..dd423dd 100644
--- a/repo/tests/phpunit/includes/rdf/SiteLinksRdfBuilderTest.php
+++ b/repo/tests/phpunit/includes/rdf/SiteLinksRdfBuilderTest.php
@@ -30,8 +30,8 @@
private function getTestData() {
if ( $this->testData === null ) {
$this->testData = new RdfBuilderTestData(
- __DIR__ . "/../../data/rdf",
- __DIR__ . "/../../data/rdf/SiteLinksRdfBuilder"
+ __DIR__ . '/../../data/rdf/entities',
+ __DIR__ . '/../../data/rdf/SiteLinksRdfBuilder'
);
}
diff --git a/repo/tests/phpunit/includes/rdf/SnakRdfBuilderTest.php
b/repo/tests/phpunit/includes/rdf/SnakRdfBuilderTest.php
index 6c08d0c..0adf090 100644
--- a/repo/tests/phpunit/includes/rdf/SnakRdfBuilderTest.php
+++ b/repo/tests/phpunit/includes/rdf/SnakRdfBuilderTest.php
@@ -40,8 +40,8 @@
private function getTestData() {
if ( $this->testData === null ) {
$this->testData = new RdfBuilderTestData(
- __DIR__ . "/../../data/rdf",
- __DIR__ . "/../../data/rdf/SnakRdfBuilder"
+ __DIR__ . '/../../data/rdf/entities',
+ __DIR__ . '/../../data/rdf/SnakRdfBuilder'
);
}
diff --git a/repo/tests/phpunit/includes/rdf/TermsRdfBuilderTest.php
b/repo/tests/phpunit/includes/rdf/TermsRdfBuilderTest.php
index da765cc..6285270 100644
--- a/repo/tests/phpunit/includes/rdf/TermsRdfBuilderTest.php
+++ b/repo/tests/phpunit/includes/rdf/TermsRdfBuilderTest.php
@@ -30,8 +30,8 @@
private function getTestData() {
if ( $this->testData === null ) {
$this->testData = new RdfBuilderTestData(
- __DIR__ . "/../../data/rdf",
- __DIR__ . "/../../data/rdf/TermsRdfBuilder"
+ __DIR__ . '/../../data/rdf/entities',
+ __DIR__ . '/../../data/rdf/TermsRdfBuilder'
);
}
diff --git a/repo/tests/phpunit/includes/rdf/TruthyStatementsRdfBuilderTest.php
b/repo/tests/phpunit/includes/rdf/TruthyStatementsRdfBuilderTest.php
index 26d3ef5..1f3d3cd 100644
--- a/repo/tests/phpunit/includes/rdf/TruthyStatementsRdfBuilderTest.php
+++ b/repo/tests/phpunit/includes/rdf/TruthyStatementsRdfBuilderTest.php
@@ -34,8 +34,8 @@
private function getTestData() {
if ( $this->testData === null ) {
$this->testData = new RdfBuilderTestData(
- __DIR__ . "/../../data/rdf",
- __DIR__ .
"/../../data/rdf/TruthyStatementRdfBuilder"
+ __DIR__ . '/../../data/rdf/entities',
+ __DIR__ .
'/../../data/rdf/TruthyStatementRdfBuilder'
);
}
--
To view, visit https://gerrit.wikimedia.org/r/261622
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic6bbe64fc56ac6df1bb0a4fc6328e10ba3d413bc
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
