[tracker/wip/carlosg/domain-ontologies: 17/39] tests: Remove duplicate ontologies in libtracker-data tests
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/wip/carlosg/domain-ontologies: 17/39] tests: Remove duplicate ontologies in libtracker-data tests
- Date: Tue, 6 Jun 2017 18:31:37 +0000 (UTC)
commit 1556b7ab859a6f43404af0343379e0a9b982048c
Author: Carlos Garnacho <carlosg gnome org>
Date: Wed May 31 10:00:07 2017 +0200
tests: Remove duplicate ontologies in libtracker-data tests
Now TrackerDataManager can lookup ontologies in a directory, as opposed
to tests_schemas which could point to specific files. Luckily the ontology
files were repeated over and over for each test, so it was easy enough to
compress the ontologies into one per set of tests.
tests/libtracker-data/aggregates/Makefile.am | 2 +-
.../aggregates/{data-1.ontology => test.ontology} | 0
tests/libtracker-data/algebra/Makefile.am | 7 +--
tests/libtracker-data/algebra/data-1.ontology | 16 -----
tests/libtracker-data/algebra/data-2.ontology | 20 ------
.../libtracker-data/algebra/opt-filter-3.ontology | 20 ------
.../{two-nested-opt.ontology => test-1.ontology} | 1 -
.../{var-scope-join-1.ontology => test-2.ontology} | 6 --
tests/libtracker-data/anon/Makefile.am | 2 +-
.../anon/{data.ontology => test.ontology} | 0
tests/libtracker-data/basic/Makefile.am | 2 +-
.../basic/{data-1.ontology => test.ontology} | 0
tests/libtracker-data/datetime/Makefile.am | 4 +-
tests/libtracker-data/datetime/data-2.ontology | 15 -----
tests/libtracker-data/datetime/data-3.ontology | 15 -----
.../datetime/{data-1.ontology => test.ontology} | 0
tests/libtracker-data/error/Makefile.am | 4 +-
.../{query-error-2.ontology => test.ontology} | 0
tests/libtracker-data/functions/Makefile.am | 6 +-
tests/libtracker-data/functions/data-1.ontology | 39 ------------
tests/libtracker-data/functions/data-2.ontology | 20 ------
tests/libtracker-data/functions/data-3.ontology | 25 --------
tests/libtracker-data/functions/test-1.ontology | 62 ++++++++++++++++++++
.../functions/{data-4.ontology => test-2.ontology} | 7 --
tests/libtracker-data/graph/Makefile.am | 5 +-
tests/libtracker-data/graph/data-1.ontology | 16 -----
tests/libtracker-data/graph/data-2.ontology | 16 -----
tests/libtracker-data/graph/data-3.ontology | 23 -------
.../graph/{data-4.ontology => test.ontology} | 13 ++--
.../libtracker-data/mixed-cardinality/Makefile.am | 3 +-
...-mixed-cardinality-1.ontology => test.ontology} | 0
.../update-mixed-cardinality-1.ontology | 25 --------
tests/libtracker-data/ontologies/20-dc.ontology | 19 ------
tests/libtracker-data/ontologies/31-nao.ontology | 23 -------
.../libtracker-data/ontologies/90-tracker.ontology | 31 ----------
tests/libtracker-data/optional/Makefile.am | 4 +-
.../{complex-data-1.ontology => test-1.ontology} | 0
...le-optional-triple.ontology => test-2.ontology} | 0
tests/libtracker-data/regex/Makefile.am | 2 +-
tests/libtracker-data/regex/regex-data-01.ontology | 16 -----
.../test.ontology} | 0
tests/libtracker-data/sort/Makefile.am | 5 +-
tests/libtracker-data/sort/data-sort-1.ontology | 20 ------
tests/libtracker-data/sort/data-sort-3.ontology | 20 ------
tests/libtracker-data/sort/data-sort-4.ontology | 24 --------
.../sort/{data-sort-5.ontology => test.ontology} | 17 +++++-
tests/libtracker-data/subqueries/Makefile.am | 2 +-
.../subqueries/{data-1.ontology => test.ontology} | 0
tests/libtracker-data/turtle/Makefile.am | 3 +-
.../{turtle-data-002.ontology => test.ontology} | 14 ++++-
.../turtle/turtle-data-001.ontology | 20 ------
tests/libtracker-data/turtle/turtle-data-002.ttl | 2 +-
tests/libtracker-data/update/Makefile.am | 14 +----
.../libtracker-data/update/delete-data-2.ontology | 36 -----------
.../update/delete-insert-where-1.ontology | 36 -----------
.../update/delete-insert-where-2.ontology | 36 -----------
.../update/delete-insert-where-3.ontology | 36 -----------
.../update/delete-insert-where-4.ontology | 36 -----------
.../update/delete-insert-where-5.ontology | 36 -----------
.../update/delete-insert-where-6.ontology | 36 -----------
.../libtracker-data/update/delete-where-1.ontology | 36 -----------
.../libtracker-data/update/delete-where-2.ontology | 36 -----------
.../libtracker-data/update/insert-data-1.ontology | 36 -----------
.../libtracker-data/update/insert-data-2.ontology | 36 -----------
.../update/invalid-insert-where-1.ontology | 35 -----------
.../{delete-data-1.ontology => test.ontology} | 0
66 files changed, 114 insertions(+), 927 deletions(-)
---
diff --git a/tests/libtracker-data/aggregates/Makefile.am b/tests/libtracker-data/aggregates/Makefile.am
index a40a656..962e246 100644
--- a/tests/libtracker-data/aggregates/Makefile.am
+++ b/tests/libtracker-data/aggregates/Makefile.am
@@ -1,7 +1,7 @@
include $(top_srcdir)/Makefile.decl
EXTRA_DIST += \
- data-1.ontology \
+ test.ontology \
data-1.ttl \
aggregate-1.out \
aggregate-1.rq \
diff --git a/tests/libtracker-data/aggregates/data-1.ontology b/tests/libtracker-data/aggregates/test.ontology
similarity index 100%
rename from tests/libtracker-data/aggregates/data-1.ontology
rename to tests/libtracker-data/aggregates/test.ontology
diff --git a/tests/libtracker-data/algebra/Makefile.am b/tests/libtracker-data/algebra/Makefile.am
index c4d8d9f..68effa7 100644
--- a/tests/libtracker-data/algebra/Makefile.am
+++ b/tests/libtracker-data/algebra/Makefile.am
@@ -1,9 +1,9 @@
include $(top_srcdir)/Makefile.decl
EXTRA_DIST += \
- data-1.ontology \
+ test-1.ontology \
+ test-2.ontology \
data-1.ttl \
- data-2.ontology \
data-2.ttl \
filter-nested-1.out \
filter-nested-1.rq \
@@ -29,17 +29,14 @@ EXTRA_DIST += \
filter-placement-3a.rq \
filter-scope-1.out \
filter-scope-1.rq \
- opt-filter-3.ontology \
opt-filter-3.out \
opt-filter-3.rq \
opt-filter-3.ttl \
two-nested-opt-alt.out \
two-nested-opt-alt.rq \
- two-nested-opt.ontology \
two-nested-opt.out \
two-nested-opt.rq \
two-nested-opt.ttl \
- var-scope-join-1.ontology \
var-scope-join-1.out \
var-scope-join-1.rq \
var-scope-join-1.ttl
diff --git a/tests/libtracker-data/algebra/two-nested-opt.ontology
b/tests/libtracker-data/algebra/test-1.ontology
similarity index 99%
rename from tests/libtracker-data/algebra/two-nested-opt.ontology
rename to tests/libtracker-data/algebra/test-1.ontology
index 91dec1b..7f1ca40 100644
--- a/tests/libtracker-data/algebra/two-nested-opt.ontology
+++ b/tests/libtracker-data/algebra/test-1.ontology
@@ -17,4 +17,3 @@ example:p a rdf:Property ;
example:q a rdf:Property ;
rdfs:domain example:A ;
rdfs:range xsd:integer .
-
diff --git a/tests/libtracker-data/algebra/var-scope-join-1.ontology
b/tests/libtracker-data/algebra/test-2.ontology
similarity index 83%
rename from tests/libtracker-data/algebra/var-scope-join-1.ontology
rename to tests/libtracker-data/algebra/test-2.ontology
index cc476ba..ab81ddc 100644
--- a/tests/libtracker-data/algebra/var-scope-join-1.ontology
+++ b/tests/libtracker-data/algebra/test-2.ontology
@@ -4,12 +4,6 @@
@prefix tracker: <http://www.tracker-project.org/ontologies/tracker#> .
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-example: a tracker:Namespace ;
- tracker:prefix "example" .
-
-example:A a rdfs:Class ;
- rdfs:subClassOf rdfs:Resource .
-
example:name a rdf:Property ;
rdfs:domain example:A ;
rdfs:range xsd:string .
diff --git a/tests/libtracker-data/anon/Makefile.am b/tests/libtracker-data/anon/Makefile.am
index e4d551a..82ef280 100644
--- a/tests/libtracker-data/anon/Makefile.am
+++ b/tests/libtracker-data/anon/Makefile.am
@@ -1,7 +1,7 @@
include $(top_srcdir)/Makefile.decl
EXTRA_DIST += \
- data.ontology \
+ test.ontology \
data.ttl \
query.out \
query.rq \
diff --git a/tests/libtracker-data/anon/data.ontology b/tests/libtracker-data/anon/test.ontology
similarity index 100%
rename from tests/libtracker-data/anon/data.ontology
rename to tests/libtracker-data/anon/test.ontology
diff --git a/tests/libtracker-data/basic/Makefile.am b/tests/libtracker-data/basic/Makefile.am
index 660b372..1e163ec 100644
--- a/tests/libtracker-data/basic/Makefile.am
+++ b/tests/libtracker-data/basic/Makefile.am
@@ -1,11 +1,11 @@
include $(top_srcdir)/Makefile.decl
EXTRA_DIST += \
+ test.ontology \
base-prefix-3.out \
base-prefix-3.rq \
compare-cast.rq \
compare-cast.out \
- data-1.ontology \
data-1.ttl \
predicate-variable.out \
predicate-variable.rq \
diff --git a/tests/libtracker-data/basic/data-1.ontology b/tests/libtracker-data/basic/test.ontology
similarity index 100%
rename from tests/libtracker-data/basic/data-1.ontology
rename to tests/libtracker-data/basic/test.ontology
diff --git a/tests/libtracker-data/datetime/Makefile.am b/tests/libtracker-data/datetime/Makefile.am
index 4ee4f36..05d67c2 100644
--- a/tests/libtracker-data/datetime/Makefile.am
+++ b/tests/libtracker-data/datetime/Makefile.am
@@ -1,11 +1,9 @@
include $(top_srcdir)/Makefile.decl
EXTRA_DIST += \
- data-1.ontology \
+ test.ontology \
data-1.ttl \
- data-2.ontology \
data-2.ttl \
- data-3.ontology \
data-3.rq \
delete-1.out \
delete-1.rq \
diff --git a/tests/libtracker-data/datetime/data-1.ontology b/tests/libtracker-data/datetime/test.ontology
similarity index 100%
rename from tests/libtracker-data/datetime/data-1.ontology
rename to tests/libtracker-data/datetime/test.ontology
diff --git a/tests/libtracker-data/error/Makefile.am b/tests/libtracker-data/error/Makefile.am
index 82939b4..a91599a 100644
--- a/tests/libtracker-data/error/Makefile.am
+++ b/tests/libtracker-data/error/Makefile.am
@@ -1,15 +1,13 @@
include $(top_srcdir)/Makefile.decl
EXTRA_DIST += \
- query-error-1.ontology \
+ test.ontology \
query-error-1.out \
query-error-1.rq \
query-error-1.ttl \
- query-error-2.ontology \
query-error-2.out \
query-error-2.rq \
query-error-2.ttl \
- update-error-1.ontology \
update-error-1.rq \
update-error-query-1.out \
update-error-query-1.rq
diff --git a/tests/libtracker-data/error/query-error-2.ontology b/tests/libtracker-data/error/test.ontology
similarity index 100%
rename from tests/libtracker-data/error/query-error-2.ontology
rename to tests/libtracker-data/error/test.ontology
diff --git a/tests/libtracker-data/functions/Makefile.am b/tests/libtracker-data/functions/Makefile.am
index 02e0012..320dc99 100644
--- a/tests/libtracker-data/functions/Makefile.am
+++ b/tests/libtracker-data/functions/Makefile.am
@@ -1,13 +1,11 @@
include $(top_srcdir)/Makefile.decl
EXTRA_DIST += \
- data-1.ontology \
+ test-1.ontology \
+ test-2.ontology \
data-1.ttl \
- data-2.ontology \
data-2.ttl \
- data-3.ontology \
data-3.ttl \
- data-4.ontology \
data-4.ttl \
functions-property-1.out \
functions-property-1.rq \
diff --git a/tests/libtracker-data/functions/test-1.ontology b/tests/libtracker-data/functions/test-1.ontology
new file mode 100644
index 0000000..8d1cc9f
--- /dev/null
+++ b/tests/libtracker-data/functions/test-1.ontology
@@ -0,0 +1,62 @@
+@prefix example: <http://example/> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix tracker: <http://www.tracker-project.org/ontologies/tracker#> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix ns: <http://www.w3.org/2005/xpath-functions#> .
+
+example: a tracker:Namespace ;
+ tracker:prefix "example" .
+
+example:A a rdfs:Class ;
+ rdfs:subClassOf rdfs:Resource .
+
+example:B a rdfs:Class ;
+ rdfs:subClassOf rdfs:Resource .
+
+example:s a rdf:Property ;
+ rdfs:domain example:A ;
+ rdfs:range xsd:string .
+
+example:t a rdf:Property ;
+ rdfs:domain example:A ;
+ rdfs:range xsd:string .
+
+example:u a rdf:Property ;
+ rdfs:domain example:A ;
+ rdfs:range xsd:string .
+
+example:i a rdf:Property ;
+ rdfs:domain example:A ;
+ rdfs:range xsd:integer .
+
+example:o a rdf:Property ;
+ rdfs:domain example:B ;
+ rdfs:range xsd:string .
+
+example:a a rdf:Property ;
+ rdfs:domain example:B ;
+ rdfs:range example:A .
+
+example:title a rdf:Property ;
+ rdfs:domain example:A ;
+ rdfs:range xsd:string .
+
+example:filename a rdf:Property ;
+ rdfs:domain example:A ;
+ rdfs:range xsd:string .
+
+example:Location a rdfs:Class ;
+ rdfs:subClassOf rdfs:Resource .
+
+example:name a rdf:Property ;
+ rdfs:domain rdfs:Resource ;
+ rdfs:range xsd:string .
+
+example:latitude a rdf:Property ;
+ rdfs:domain example:Location ;
+ rdfs:range xsd:double .
+
+example:longitude a rdf:Property ;
+ rdfs:domain example:Location ;
+ rdfs:range xsd:double .
diff --git a/tests/libtracker-data/functions/data-4.ontology b/tests/libtracker-data/functions/test-2.ontology
similarity index 78%
rename from tests/libtracker-data/functions/data-4.ontology
rename to tests/libtracker-data/functions/test-2.ontology
index 222106f..f9ad3ff 100644
--- a/tests/libtracker-data/functions/data-4.ontology
+++ b/tests/libtracker-data/functions/test-2.ontology
@@ -5,16 +5,9 @@
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
@prefix ns: <http://www.w3.org/2005/xpath-functions#> .
-e: a tracker:Namespace ;
- tracker:prefix "example" .
-
e:Person a rdfs:Class ;
rdfs:subClassOf rdfs:Resource .
-e:name a rdf:Property ;
- rdfs:domain e:Person ;
- rdfs:range xsd:string .
-
e:familyName a rdf:Property ;
rdfs:domain e:Person ;
rdfs:range xsd:string .
diff --git a/tests/libtracker-data/graph/Makefile.am b/tests/libtracker-data/graph/Makefile.am
index b6a6650..d6eb67d 100644
--- a/tests/libtracker-data/graph/Makefile.am
+++ b/tests/libtracker-data/graph/Makefile.am
@@ -1,13 +1,10 @@
include $(top_srcdir)/Makefile.decl
EXTRA_DIST += \
- data-1.ontology \
+ test.ontology \
data-1.rq \
- data-2.ontology \
data-2.rq \
- data-3.ontology \
data-3.rq \
- data-4.ontology \
data-4.rq \
graph-1.out \
graph-1.rq \
diff --git a/tests/libtracker-data/graph/data-4.ontology b/tests/libtracker-data/graph/test.ontology
similarity index 99%
rename from tests/libtracker-data/graph/data-4.ontology
rename to tests/libtracker-data/graph/test.ontology
index 2618b52..f87e180 100644
--- a/tests/libtracker-data/graph/data-4.ontology
+++ b/tests/libtracker-data/graph/test.ontology
@@ -7,17 +7,16 @@
example: a tracker:Namespace ;
tracker:prefix "example" .
-example:Graph a rdfs:Class ;
- rdfs:subClassOf rdfs:Resource .
-
example:A a rdfs:Class ;
rdfs:subClassOf rdfs:Resource .
-example:graphTitle a rdf:Property ;
- rdfs:domain example:Graph ;
- rdfs:range xsd:string .
-
example:p a rdf:Property ;
rdfs:domain example:A ;
rdfs:range xsd:integer .
+example:Graph a rdfs:Class ;
+ rdfs:subClassOf rdfs:Resource .
+
+example:graphTitle a rdf:Property ;
+ rdfs:domain example:Graph ;
+ rdfs:range xsd:string .
diff --git a/tests/libtracker-data/mixed-cardinality/Makefile.am
b/tests/libtracker-data/mixed-cardinality/Makefile.am
index 2d5e820..41c8979 100644
--- a/tests/libtracker-data/mixed-cardinality/Makefile.am
+++ b/tests/libtracker-data/mixed-cardinality/Makefile.am
@@ -1,11 +1,10 @@
include $(top_srcdir)/Makefile.decl
EXTRA_DIST += \
- insert-mixed-cardinality-1.ontology \
+ test.ontology \
insert-mixed-cardinality-1.rq \
insert-mixed-cardinality-query-1.rq \
insert-mixed-cardinality-query-1.out \
- update-mixed-cardinality-1.ontology \
update-mixed-cardinality-1.rq \
update-mixed-cardinality-query-1.rq \
update-mixed-cardinality-query-1.out
diff --git a/tests/libtracker-data/mixed-cardinality/insert-mixed-cardinality-1.ontology
b/tests/libtracker-data/mixed-cardinality/test.ontology
similarity index 100%
rename from tests/libtracker-data/mixed-cardinality/insert-mixed-cardinality-1.ontology
rename to tests/libtracker-data/mixed-cardinality/test.ontology
diff --git a/tests/libtracker-data/optional/Makefile.am b/tests/libtracker-data/optional/Makefile.am
index ce33093..8be74e8 100644
--- a/tests/libtracker-data/optional/Makefile.am
+++ b/tests/libtracker-data/optional/Makefile.am
@@ -1,11 +1,11 @@
include $(top_srcdir)/Makefile.decl
EXTRA_DIST += \
- complex-data-1.ontology \
+ test-1.ontology \
+ test-2.ontology \
complex-data-1.ttl \
q-opt-complex-1.out \
q-opt-complex-1.rq \
- simple-optional-triple.ontology \
simple-optional-triple.out \
simple-optional-triple.rq \
simple-optional-triple.ttl
diff --git a/tests/libtracker-data/optional/complex-data-1.ontology
b/tests/libtracker-data/optional/test-1.ontology
similarity index 100%
rename from tests/libtracker-data/optional/complex-data-1.ontology
rename to tests/libtracker-data/optional/test-1.ontology
diff --git a/tests/libtracker-data/optional/simple-optional-triple.ontology
b/tests/libtracker-data/optional/test-2.ontology
similarity index 100%
rename from tests/libtracker-data/optional/simple-optional-triple.ontology
rename to tests/libtracker-data/optional/test-2.ontology
diff --git a/tests/libtracker-data/regex/Makefile.am b/tests/libtracker-data/regex/Makefile.am
index 16d3b46..86c1e8e 100644
--- a/tests/libtracker-data/regex/Makefile.am
+++ b/tests/libtracker-data/regex/Makefile.am
@@ -1,7 +1,7 @@
include $(top_srcdir)/Makefile.decl
EXTRA_DIST += \
- regex-data-01.ontology \
+ test.ontology \
regex-data-01.ttl \
regex-query-001.out \
regex-query-001.rq \
diff --git a/tests/libtracker-data/error/update-error-1.ontology b/tests/libtracker-data/regex/test.ontology
similarity index 100%
rename from tests/libtracker-data/error/update-error-1.ontology
rename to tests/libtracker-data/regex/test.ontology
diff --git a/tests/libtracker-data/sort/Makefile.am b/tests/libtracker-data/sort/Makefile.am
index 2c9a73f..0ad39c6 100644
--- a/tests/libtracker-data/sort/Makefile.am
+++ b/tests/libtracker-data/sort/Makefile.am
@@ -1,13 +1,10 @@
include $(top_srcdir)/Makefile.decl
EXTRA_DIST += \
- data-sort-1.ontology \
+ test.ontology \
data-sort-1.ttl \
- data-sort-3.ontology \
data-sort-3.ttl \
- data-sort-4.ontology \
data-sort-4.ttl \
- data-sort-5.ontology \
data-sort-5.ttl \
query-sort-1.out \
query-sort-1.rq \
diff --git a/tests/libtracker-data/sort/data-sort-5.ontology b/tests/libtracker-data/sort/test.ontology
similarity index 66%
rename from tests/libtracker-data/sort/data-sort-5.ontology
rename to tests/libtracker-data/sort/test.ontology
index 7d2e029..4672fba 100644
--- a/tests/libtracker-data/sort/data-sort-5.ontology
+++ b/tests/libtracker-data/sort/test.ontology
@@ -1,10 +1,11 @@
@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix nrl: <http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#> .
@prefix owl: <http://www.w3.org/2002/07/owl#> .
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@prefix tracker: <http://www.tracker-project.org/ontologies/tracker#> .
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix nrl: <http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#> .
+@prefix example: <http://example.org/things#> .
foaf: a tracker:Namespace ;
tracker:prefix "foaf" .
@@ -12,9 +13,23 @@ foaf: a tracker:Namespace ;
owl: a tracker:Namespace ;
tracker:prefix "owl" .
+example: a tracker:Namespace ;
+ tracker:prefix "example" .
+
owl:Thing a rdfs:Class ;
rdfs:subClassOf rdfs:Resource .
+foaf:Person a rdfs:Class ;
+ rdfs:subClassOf owl:Thing .
+
+example:empId a rdf:Property ;
+ rdfs:domain foaf:Person ;
+ rdfs:range xsd:integer .
+
+foaf:mbox a rdf:Property ;
+ rdfs:domain foaf:Person ;
+ rdfs:range rdfs:Resource .
+
foaf:name a rdf:Property ;
nrl:maxCardinality 1 ;
rdfs:domain owl:Thing ;
diff --git a/tests/libtracker-data/subqueries/Makefile.am b/tests/libtracker-data/subqueries/Makefile.am
index 26e278e..7c1fb1f 100644
--- a/tests/libtracker-data/subqueries/Makefile.am
+++ b/tests/libtracker-data/subqueries/Makefile.am
@@ -1,7 +1,7 @@
include $(top_srcdir)/Makefile.decl
EXTRA_DIST += \
- data-1.ontology \
+ test.ontology \
data-1.ttl \
subqueries-1.out \
subqueries-1.rq \
diff --git a/tests/libtracker-data/subqueries/data-1.ontology b/tests/libtracker-data/subqueries/test.ontology
similarity index 100%
rename from tests/libtracker-data/subqueries/data-1.ontology
rename to tests/libtracker-data/subqueries/test.ontology
diff --git a/tests/libtracker-data/turtle/Makefile.am b/tests/libtracker-data/turtle/Makefile.am
index 9f44af1..2baeeef 100644
--- a/tests/libtracker-data/turtle/Makefile.am
+++ b/tests/libtracker-data/turtle/Makefile.am
@@ -1,11 +1,10 @@
include $(top_srcdir)/Makefile.decl
EXTRA_DIST += \
- turtle-data-001.ontology \
+ test.ontology \
turtle-data-001.ttl \
turtle-query-001.out \
turtle-query-001.rq \
- turtle-data-002.ontology \
turtle-data-002.ttl \
turtle-query-002.out \
turtle-query-002.rq
diff --git a/tests/libtracker-data/turtle/turtle-data-002.ontology
b/tests/libtracker-data/turtle/test.ontology
similarity index 81%
rename from tests/libtracker-data/turtle/turtle-data-002.ontology
rename to tests/libtracker-data/turtle/test.ontology
index 770c7de..b5a57b8 100644
--- a/tests/libtracker-data/turtle/turtle-data-002.ontology
+++ b/tests/libtracker-data/turtle/test.ontology
@@ -1,16 +1,24 @@
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix : <http://example.org/ns2#> .
-@prefix f: <http://example.org/ns#> .
+@prefix foo: <http://example.org/ns#> .
+@prefix : <http://other.example.org/ns#> .
+@prefix f: <http://example.org/ns3#> .
@prefix b: <http://example.org/b2#> .
@prefix bz: <http://example.org/b2> .
@prefix tracker: <http://www.tracker-project.org/ontologies/tracker#> .
@prefix bar: <bar#> .
+foo: a tracker:Namespace ;
+ tracker:prefix "foo" .
+
: a tracker:Namespace ;
tracker:prefix "" .
+foo: a rdf:Property ;
+ rdfs:domain rdfs:Resource ;
+ rdfs:range rdfs:Resource .
+
b: a tracker:Namespace ;
tracker:prefix "b" .
@@ -23,7 +31,7 @@ bz: a tracker:Namespace ;
f: a tracker:Namespace ;
tracker:prefix "a" .
-<http://example.org/ns2#> a rdf:Property ;
+<http://other.example.org/ns#> a rdf:Property ;
rdfs:domain rdfs:Resource ;
rdfs:range rdfs:Resource .
diff --git a/tests/libtracker-data/turtle/turtle-data-002.ttl
b/tests/libtracker-data/turtle/turtle-data-002.ttl
index 422b571..e8d21a6 100755
--- a/tests/libtracker-data/turtle/turtle-data-002.ttl
+++ b/tests/libtracker-data/turtle/turtle-data-002.ttl
@@ -1,5 +1,5 @@
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix : <http://example.org/ns2#> .
+@prefix : <http://other.example.org/ns#> .
<a1> a rdfs:Resource .
diff --git a/tests/libtracker-data/update/Makefile.am b/tests/libtracker-data/update/Makefile.am
index 2bef503..6680804 100644
--- a/tests/libtracker-data/update/Makefile.am
+++ b/tests/libtracker-data/update/Makefile.am
@@ -1,25 +1,18 @@
include $(top_srcdir)/Makefile.decl
EXTRA_DIST += \
- delete-data-1.ontology \
+ test.ontology \
delete-data-1.rq \
- delete-data-2.ontology \
delete-data-2.rq \
delete-data-query-1.out \
delete-data-query-1.rq \
delete-data-query-2.out \
delete-data-query-2.rq \
- delete-insert-where-1.ontology \
delete-insert-where-1.rq \
- delete-insert-where-2.ontology \
delete-insert-where-2.rq \
- delete-insert-where-3.ontology \
delete-insert-where-3.rq \
- delete-insert-where-4.ontology \
delete-insert-where-4.rq \
- delete-insert-where-5.ontology \
delete-insert-where-5.rq \
- delete-insert-where-6.ontology \
delete-insert-where-6.rq \
delete-insert-where-query-1.out \
delete-insert-where-query-1.rq \
@@ -33,23 +26,18 @@ EXTRA_DIST += \
delete-insert-where-query-5.rq \
delete-insert-where-query-6.out \
delete-insert-where-query-6.rq \
- delete-where-1.ontology \
delete-where-1.rq \
- delete-where-2.ontology \
delete-where-2.rq \
delete-where-query-1.out \
delete-where-query-1.rq \
delete-where-query-2.out \
delete-where-query-2.rq \
- insert-data-1.ontology \
insert-data-1.rq \
- insert-data-2.ontology \
insert-data-2.rq \
insert-data-query-1.out \
insert-data-query-1.rq \
insert-data-query-2.out \
insert-data-query-2.rq \
- invalid-insert-where-1.ontology \
invalid-insert-where-1.rq \
invalid-insert-where-query-1.out \
invalid-insert-where-query-1.rq
diff --git a/tests/libtracker-data/update/delete-data-1.ontology b/tests/libtracker-data/update/test.ontology
similarity index 100%
rename from tests/libtracker-data/update/delete-data-1.ontology
rename to tests/libtracker-data/update/test.ontology
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
