Strabon

changeset 1078:034bc45c1b03

find changesets by author, revision, files, or words in the commit message
Added prefixes file.
author Panayiotis Smeros <psmeros@di.uoa.gr>
date Thu Apr 25 19:19:32 2013 +0300 (2013-04-25)
parents 36142847a6e9
children 0b0ef882b198
files testsuite/src/test/java/eu/earthobservatory/testsuite/utils/Utils.java testsuite/src/test/resources/geoSPARQL/SpatialObjectClassTest/SpatialObjectClassTest.rq testsuite/src/test/resources/prefixes testsuite/src/test/resources/stSPARQL/StoreGMLTest/StoreGMLTest.rq testsuite/src/test/resources/stSPARQL/StoreWKTTest/StoreWKTTest.rq
line diff
     1.1 --- a/testsuite/src/test/java/eu/earthobservatory/testsuite/utils/Utils.java	Thu Apr 25 14:00:37 2013 +0300
     1.2 +++ b/testsuite/src/test/java/eu/earthobservatory/testsuite/utils/Utils.java	Thu Apr 25 19:19:32 2013 +0300
     1.3 @@ -53,6 +53,7 @@
     1.4  public class Utils
     1.5  {
     1.6  	private static final String dbPropertiesFile=File.separator+"databases.properties";
     1.7 +	private static final String prefixesFile=File.separator+"prefixes";
     1.8  	
     1.9  	private static String databaseTemplateName = null;
    1.10  	private static String serverName = null;
    1.11 @@ -143,7 +144,7 @@
    1.12  	public static void testQuery(String queryFile, String resultsFile) throws IOException, MalformedQueryException, QueryEvaluationException, TupleQueryResultHandlerException, URISyntaxException, QueryResultParseException, UnsupportedQueryResultFormatException
    1.13  	{
    1.14  		ByteArrayOutputStream resultsStream = new ByteArrayOutputStream();
    1.15 -		String query = FileUtils.readFileToString(new File(Utils.class.getResource(queryFile).toURI()));
    1.16 +		String query = FileUtils.readFileToString(new File(Utils.class.getResource(prefixesFile).toURI()))+"\n"+FileUtils.readFileToString(new File(Utils.class.getResource(queryFile).toURI()));
    1.17  		
    1.18  		//Pose the query
    1.19  		strabon.query(query, Format.XML, strabon.getSailRepoConnection(), resultsStream);

     2.1 --- a/testsuite/src/test/resources/geoSPARQL/SpatialObjectClassTest/SpatialObjectClassTest.rq	Thu Apr 25 14:00:37 2013 +0300
     2.2 +++ b/testsuite/src/test/resources/geoSPARQL/SpatialObjectClassTest/SpatialObjectClassTest.rq	Thu Apr 25 19:19:32 2013 +0300
     2.3 @@ -1,3 +1,3 @@
     2.4  SELECT ?o
     2.5  WHERE
     2.6 -{<http://example.org#Geom> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> ?o}
     2.7 \ No newline at end of file
     2.8 +{<http://example.org#Geom> rdf:type ?o}
     2.9 \ No newline at end of file

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/testsuite/src/test/resources/prefixes	Thu Apr 25 19:19:32 2013 +0300
     3.3 @@ -0,0 +1,13 @@
     3.4 +PREFIX lgd:<http://linkedgeodata.org/triplify/>
     3.5 +PREFIX lgdgeo:<http://www.w3.org/2003/01/geo/wgs84_pos#>
     3.6 +PREFIX lgdont:<http://linkedgeodata.org/ontology/>
     3.7 +PREFIX geonames:<http://www.geonames.org/ontology#>
     3.8 +PREFIX clc: <http://geo.linkedopendata.gr/corine/ontology#>
     3.9 +PREFIX gag: <http://geo.linkedopendata.gr/greekadministrativeregion/ontology#>
    3.10 +PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
    3.11 +PREFIX dlr: <http://www.earthobservatory.eu/ontologies/dlrOntology-v2.owl#>
    3.12 +PREFIX strdf: <http://strdf.di.uoa.gr/ontology#>
    3.13 +PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
    3.14 +PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
    3.15 +PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
    3.16 +PREFIX geo: <http://www.opengis.net/ont/geosparql#>
    3.17 \ No newline at end of file

     4.1 --- a/testsuite/src/test/resources/stSPARQL/StoreGMLTest/StoreGMLTest.rq	Thu Apr 25 14:00:37 2013 +0300
     4.2 +++ b/testsuite/src/test/resources/stSPARQL/StoreGMLTest/StoreGMLTest.rq	Thu Apr 25 19:19:32 2013 +0300
     4.3 @@ -1,3 +1,3 @@
     4.4  SELECT ?o
     4.5 -WHERE {?s <http://strdf.di.uoa.gr/ontology#hasGeometry> ?geo.
     4.6 -?geo <http://www.w3.org/2003/01/geo/wgs84_pos#lat> ?o.}
     4.7 \ No newline at end of file
     4.8 +WHERE {?s strdf:hasGeometry ?geo.
     4.9 +?geo lgdgeo:lat ?o.}
    4.10 \ No newline at end of file

     5.1 --- a/testsuite/src/test/resources/stSPARQL/StoreWKTTest/StoreWKTTest.rq	Thu Apr 25 14:00:37 2013 +0300
     5.2 +++ b/testsuite/src/test/resources/stSPARQL/StoreWKTTest/StoreWKTTest.rq	Thu Apr 25 19:19:32 2013 +0300
     5.3 @@ -1,2 +1,2 @@
     5.4  SELECT ?o
     5.5 -WHERE {?s <http://strdf.di.uoa.gr/ontology#hasGeometry> ?o}
     5.6 \ No newline at end of file
     5.7 +WHERE {?s strdf:hasGeometry ?o}
     5.8 \ No newline at end of file