# HG changeset patch # User Stella Giannakopoulou # Date 1422357709 -7200 # Node ID beac3abdaed146e39d6b628d51ad36e164f7fc3a # Parent ea73ab0bcc3d8f346c7e59b43108bfd9945d8736 added tests for the temporal constructs except for period_preceding and period_succeding diff -r ea73ab0bcc3d -r beac3abdaed1 generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlPeriodMinus.java --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlPeriodMinus.java Mon Jan 26 17:02:19 2015 +0200 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlPeriodMinus.java Tue Jan 27 13:21:49 2015 +0200 @@ -36,7 +36,7 @@ @Override public String getOperator() { - return "+"; + return "-"; } /* (non-Javadoc) diff -r ea73ab0bcc3d -r beac3abdaed1 testsuite/src/test/java/eu/earthobservatory/testsuite/stSPARQL/TemporalConstructsTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/testsuite/src/test/java/eu/earthobservatory/testsuite/stSPARQL/TemporalConstructsTest.java Tue Jan 27 13:21:49 2015 +0200 @@ -0,0 +1,20 @@ +/** + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * Copyright (C) 2010, 2011, 2012, 2013 Pyravlos Team + * + * http://www.strabon.di.uoa.gr/ + */ +package eu.earthobservatory.testsuite.stSPARQL; + +import eu.earthobservatory.testsuite.utils.TemplateTest; + + +/** + * A simple store test. It tests if triples with GML serialization are stored and retrieved correctly. + * + * @author Stella Giannakopoulou + */ +public class TemporalConstructsTest extends TemplateTest{} diff -r ea73ab0bcc3d -r beac3abdaed1 testsuite/src/test/resources/databases.properties --- a/testsuite/src/test/resources/databases.properties Mon Jan 26 17:02:19 2015 +0200 +++ b/testsuite/src/test/resources/databases.properties Tue Jan 27 13:21:49 2015 +0200 @@ -2,7 +2,7 @@ postgis.databaseTemplateName = spatiotemporal_template postgis.serverName = localhost postgis.username = postgres -postgis.password = p1r3as +postgis.password = postgres postgis.port = 5432 ! MonetDB diff -r ea73ab0bcc3d -r beac3abdaed1 testsuite/src/test/resources/prefixes --- a/testsuite/src/test/resources/prefixes Mon Jan 26 17:02:19 2015 +0200 +++ b/testsuite/src/test/resources/prefixes Tue Jan 27 13:21:49 2015 +0200 @@ -13,6 +13,6 @@ PREFIX geo: PREFIX geof: PREFIX ogc: -PREFIX ex: +PREFIX ex: PREFIX skos: diff -r ea73ab0bcc3d -r beac3abdaed1 testsuite/src/test/resources/stSPARQL/TemporalConstructsTest/period.rq --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/testsuite/src/test/resources/stSPARQL/TemporalConstructsTest/period.rq Tue Jan 27 13:21:49 2015 +0200 @@ -0,0 +1,5 @@ +SELECT ?t1 ?t2 (strdf:period(?t1, ?t2) as ?p) +WHERE { + ex:item4 ?y1 ?z1 ?t1 . + ex:item5 ?y2 ?z2 ?t2 . + } \ No newline at end of file diff -r ea73ab0bcc3d -r beac3abdaed1 testsuite/src/test/resources/stSPARQL/TemporalConstructsTest/period.srx --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/testsuite/src/test/resources/stSPARQL/TemporalConstructsTest/period.srx Tue Jan 27 13:21:49 2015 +0200 @@ -0,0 +1,21 @@ + + + + + + + + + + + 2012-01-19T10:41:00 + + + 2012-01-19T11:41:00 + + + [2012-01-19 10:41:00+02, 2012-01-19 11:41:00+02) + + + + \ No newline at end of file diff -r ea73ab0bcc3d -r beac3abdaed1 testsuite/src/test/resources/stSPARQL/TemporalConstructsTest/period_end.rq --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/testsuite/src/test/resources/stSPARQL/TemporalConstructsTest/period_end.rq Tue Jan 27 13:21:49 2015 +0200 @@ -0,0 +1,4 @@ +SELECT distinct ?t1 (strdf:period_end(?t1) as ?end) +WHERE { + ?x1 ?y1 ?z1 ?t1 . + } \ No newline at end of file diff -r ea73ab0bcc3d -r beac3abdaed1 testsuite/src/test/resources/stSPARQL/TemporalConstructsTest/period_end.srx --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/testsuite/src/test/resources/stSPARQL/TemporalConstructsTest/period_end.srx Tue Jan 27 13:21:49 2015 +0200 @@ -0,0 +1,73 @@ + + + + + + + + + + [2012-11-19T12:41:00,2012-11-19T13:41:00) + + + 2012-11-19T13:41:00+02 + + + + + [2012-11-19T13:41:00,2012-11-19T14:41:00) + + + 2012-11-19T14:41:00+02 + + + + + [2012-11-19T14:41:00,2012-11-19T15:41:00) + + + 2012-11-19T15:41:00+02 + + + + + [2012-11-19T10:41:00,2012-11-19T11:41:00) + + + 2012-11-19T11:41:00+02 + + + + + [2012-11-19T10:41:00,2012-11-19T15:41:00) + + + 2012-11-19T15:41:00+02 + + + + + 2012-01-19T10:41:00 + + + 2012-01-19T10:41:00+02 + + + + + 2012-01-19T11:41:00 + + + 2012-01-19T11:41:00+02 + + + + + 2012-01-19T12:41:00 + + + 2012-01-19T12:41:00+02 + + + + \ No newline at end of file diff -r ea73ab0bcc3d -r beac3abdaed1 testsuite/src/test/resources/stSPARQL/TemporalConstructsTest/period_intersect.rq --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/testsuite/src/test/resources/stSPARQL/TemporalConstructsTest/period_intersect.rq Tue Jan 27 13:21:49 2015 +0200 @@ -0,0 +1,5 @@ +SELECT ?t1 ?t2 (strdf:period_intersect(?t1, ?t2) as ?intersection) + WHERE { + ex:item1 ?y1 ?z1 ?t1 . + ex:item7 ?y2 ?z2 ?t2 . +} \ No newline at end of file diff -r ea73ab0bcc3d -r beac3abdaed1 testsuite/src/test/resources/stSPARQL/TemporalConstructsTest/period_intersect.srx --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/testsuite/src/test/resources/stSPARQL/TemporalConstructsTest/period_intersect.srx Tue Jan 27 13:21:49 2015 +0200 @@ -0,0 +1,54 @@ + + + + + + + + + + + [2012-11-19T12:41:00,2012-11-19T13:41:00) + + + [2012-11-19T13:41:00,2012-11-19T14:41:00) + + + [2012-11-19 13:41:00+02, 2012-11-19 13:41:00.000001+02) + + + + + [2012-11-19T10:41:00,2012-11-19T11:41:00) + + + [2012-11-19T13:41:00,2012-11-19T14:41:00) + + + -EMPTY- + + + + + [2012-11-19T12:41:00,2012-11-19T13:41:00) + + + [2012-11-19T13:41:00,2012-11-19T14:41:00) + + + [2012-11-19 13:41:00+02, 2012-11-19 13:41:00.000001+02) + + + + + [2012-11-19T12:41:00,2012-11-19T13:41:00) + + + [2012-11-19T13:41:00,2012-11-19T14:41:00) + + + [2012-11-19 13:41:00+02, 2012-11-19 13:41:00.000001+02) + + + + \ No newline at end of file diff -r ea73ab0bcc3d -r beac3abdaed1 testsuite/src/test/resources/stSPARQL/TemporalConstructsTest/period_minus.rq --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/testsuite/src/test/resources/stSPARQL/TemporalConstructsTest/period_minus.rq Tue Jan 27 13:21:49 2015 +0200 @@ -0,0 +1,5 @@ +SELECT ?t1 ?t2 (strdf:period_minus(?t1, ?t2) as ?minus) + WHERE { + ex:item7 ?y1 ?z1 ?t1 . + ex:item8 ?y2 ?z2 ?t2 . +} \ No newline at end of file diff -r ea73ab0bcc3d -r beac3abdaed1 testsuite/src/test/resources/stSPARQL/TemporalConstructsTest/period_minus.srx --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/testsuite/src/test/resources/stSPARQL/TemporalConstructsTest/period_minus.srx Tue Jan 27 13:21:49 2015 +0200 @@ -0,0 +1,21 @@ + + + + + + + + + + + [2012-11-19T13:41:00,2012-11-19T14:41:00) + + + [2012-11-19T14:41:00,2012-11-19T15:41:00) + + + [2012-11-19 13:41:00+02, 2012-11-19 14:41:00+02) + + + + \ No newline at end of file diff -r ea73ab0bcc3d -r beac3abdaed1 testsuite/src/test/resources/stSPARQL/TemporalConstructsTest/period_start.rq --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/testsuite/src/test/resources/stSPARQL/TemporalConstructsTest/period_start.rq Tue Jan 27 13:21:49 2015 +0200 @@ -0,0 +1,4 @@ +SELECT distinct ?t1 (strdf:period_start(?t1) as ?start) +WHERE { + ?x1 ?y1 ?z1 ?t1 . + } \ No newline at end of file diff -r ea73ab0bcc3d -r beac3abdaed1 testsuite/src/test/resources/stSPARQL/TemporalConstructsTest/period_start.srx --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/testsuite/src/test/resources/stSPARQL/TemporalConstructsTest/period_start.srx Tue Jan 27 13:21:49 2015 +0200 @@ -0,0 +1,73 @@ + + + + + + + + + + [2012-11-19T12:41:00,2012-11-19T13:41:00) + + + 2012-11-19T12:41:00+02 + + + + + [2012-11-19T10:41:00,2012-11-19T11:41:00) + + + 2012-11-19T10:41:00+02 + + + + + [2012-11-19T10:41:00,2012-11-19T15:41:00) + + + 2012-11-19T10:41:00+02 + + + + + 2012-01-19T10:41:00 + + + 2012-01-19T10:41:00+02 + + + + + 2012-01-19T11:41:00 + + + 2012-01-19T11:41:00+02 + + + + + 2012-01-19T12:41:00 + + + 2012-01-19T12:41:00+02 + + + + + [2012-11-19T13:41:00,2012-11-19T14:41:00) + + + 2012-11-19T13:41:00+02 + + + + + [2012-11-19T14:41:00,2012-11-19T15:41:00) + + + 2012-11-19T14:41:00+02 + + + + \ No newline at end of file diff -r ea73ab0bcc3d -r beac3abdaed1 testsuite/src/test/resources/stSPARQL/TemporalConstructsTest/period_union.rq --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/testsuite/src/test/resources/stSPARQL/TemporalConstructsTest/period_union.rq Tue Jan 27 13:21:49 2015 +0200 @@ -0,0 +1,5 @@ +SELECT ?t1 ?t2 (strdf:period_union(?t1, ?t2) as ?union) + WHERE { + ex:item7 ?y1 ?z1 ?t1 . + ex:item8 ?y2 ?z2 ?t2 . +} \ No newline at end of file diff -r ea73ab0bcc3d -r beac3abdaed1 testsuite/src/test/resources/stSPARQL/TemporalConstructsTest/period_union.srx --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/testsuite/src/test/resources/stSPARQL/TemporalConstructsTest/period_union.srx Tue Jan 27 13:21:49 2015 +0200 @@ -0,0 +1,21 @@ + + + + + + + + + + + [2012-11-19T13:41:00,2012-11-19T14:41:00) + + + [2012-11-19T14:41:00,2012-11-19T15:41:00) + + + [2012-11-19 13:41:00+02, 2012-11-19 15:41:00.000001+02) + + + + \ No newline at end of file diff -r ea73ab0bcc3d -r beac3abdaed1 testsuite/src/test/resources/stSPARQL/TemporalConstructsTest/temporalRelations.nq --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/testsuite/src/test/resources/stSPARQL/TemporalConstructsTest/temporalRelations.nq Tue Jan 27 13:21:49 2015 +0200 @@ -0,0 +1,15 @@ + "1"^^ "[2012-11-19T12:41:00,2012-11-19T13:41:00]"^^. + "2"^^ "[2012-11-19T12:41:00,2012-11-19T13:41:00]"^^. + "3"^^ "[2012-11-19T12:41:00,2012-11-19T13:41:00]"^^. + "10"^^ "[2012-11-19T12:41:00,2012-11-19T13:41:00]"^^. + "20"^^ "[2012-11-19T12:41:00,2012-11-19T13:41:00]"^^. + "POINT(1 0)"^^ "[2012-11-19T12:41:00,2012-11-19T13:41:00]"^^. + "POINT(2 0)"^^ "[2012-11-19T12:41:00,2012-11-19T13:41:00]"^^. + "POINT(3 0)"^^ "[2012-11-19T12:41:00,2012-11-19T13:41:00]"^^. + "10"^^ "[2012-11-19T10:41:00,2012-11-19T11:41:00]"^^. + "20"^^ "[2012-11-19T10:41:00,2012-11-19T15:41:00]"^^. + "20"^^ "2012-01-19T10:41:00"^^ . + "20"^^ "2012-01-19T11:41:00"^^ . + "20"^^ "2012-01-19T12:41:00"^^ . + "7"^^ "[2012-11-19T13:41:00,2012-11-19T14:41:00]"^^. + "8"^^ "[2012-11-19T14:41:00,2012-11-19T15:41:00]"^^. diff -r ea73ab0bcc3d -r beac3abdaed1 testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/starts.rq --- a/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/starts.rq Mon Jan 26 17:02:19 2015 +0200 +++ b/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/starts.rq Tue Jan 27 13:21:49 2015 +0200 @@ -1,7 +1,3 @@ -PREFIX strdf: -PREFIX xsd: -PREFIX noa: - SELECT distinct ?x1 ?x2 WHERE { ?x1 ?y1 ?z1 ?t1 .