Author: jpz6311whu
Date: Sun Dec 1 08:10:10 2013
New Revision: 1546789
URL: http://svn.apache.org/r1546789
Log:
enrich jena-spatial tests with the bound variables for PFs of spatial:nearby
and spatial:withinCircle
Modified:
jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/AbstractTestDatasetWithSpatialIndex.java
jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIsNearByPF.java
jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIsWithinCirclePF.java
Modified:
jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/AbstractTestDatasetWithSpatialIndex.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/AbstractTestDatasetWithSpatialIndex.java?rev=1546789&r1=1546788&r2=1546789&view=diff
==============================================================================
---
jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/AbstractTestDatasetWithSpatialIndex.java
(original)
+++
jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/AbstractTestDatasetWithSpatialIndex.java
Sun Dec 1 08:10:10 2013
@@ -50,7 +50,9 @@ public abstract class AbstractTestDatase
protected static final String QUERY_PROLOG =
StrUtils.strjoinNL(
"PREFIX spatial:
<http://jena.apache.org/spatial#>",
- "PREFIX rdfs:
<http://www.w3.org/2000/01/rdf-schema#>"
+ "PREFIX rdfs:
<http://www.w3.org/2000/01/rdf-schema#>",
+ "PREFIX geo:
<http://www.w3.org/2003/01/geo/wgs84_pos#>",
+ "PREFIX : <"+ RESOURCE_BASE +">"
);
protected static final String TURTLE_PROLOG =
@@ -59,7 +61,8 @@ public abstract class AbstractTestDatase
"@prefix rdfs:
<http://www.w3.org/2000/01/rdf-schema#> .",
"@prefix xsd:
<http://www.w3.org/2001/XMLSchema#> .",
"@prefix geo:
<http://www.w3.org/2003/01/geo/wgs84_pos#> .",
- "@prefix wkt:
<http://www.opengis.net/ont/geosparql#> ."
+ "@prefix wkt:
<http://www.opengis.net/ont/geosparql#> .",
+ "@prefix : <"+ RESOURCE_BASE
+"> ."
);
Modified:
jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIsNearByPF.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIsNearByPF.java?rev=1546789&r1=1546788&r2=1546789&view=diff
==============================================================================
---
jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIsNearByPF.java
(original)
+++
jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIsNearByPF.java
Sun Dec 1 08:10:10 2013
@@ -311,4 +311,25 @@ public abstract class AbstractTestIsNear
expectedURIs = (new HashSet<String>());
doTestSearch(turtle, queryString, expectedURIs);
}
+
+ @Test
+ public void testLatLongBound() {
+ final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
+ + RESOURCE_BASE + "testLatLongBound>",
+ " geo:lat '51.3827'^^xsd:float ;",
+ " geo:long '-2.71909'^^xsd:float ", ". ",
+ "<" + RESOURCE_BASE + "center>",
+ " geo:lat '51.3000'^^xsd:float ;",
+ " geo:long '-2.71000'^^xsd:float ", ". ");
+ String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT
?s",
+ "WHERE {",
+ " :center geo:lat ?lat .",
+ " :center geo:long ?long .",
+ " ?s spatial:nearby (?lat ?long 100.0 'miles'
-1) .", "}");
+ Set<String> expectedURIs = (new HashSet<String>());
+ expectedURIs
+ .addAll(Arrays
+ .asList((new String[] {
"http://example.org/data/resource/testLatLongBound";,
"http://example.org/data/resource/center"; })));
+ doTestSearch(turtle, queryString, expectedURIs);
+ }
}
Modified:
jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIsWithinCirclePF.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIsWithinCirclePF.java?rev=1546789&r1=1546788&r2=1546789&view=diff
==============================================================================
---
jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIsWithinCirclePF.java
(original)
+++
jena/trunk/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIsWithinCirclePF.java
Sun Dec 1 08:10:10 2013
@@ -311,4 +311,26 @@ public abstract class AbstractTestIsWith
expectedURIs = (new HashSet<String>());
doTestSearch(turtle, queryString, expectedURIs);
}
+
+ @Test
+ public void testLatLongBound() {
+ final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
+ + RESOURCE_BASE + "testLatLongBound>",
+ " geo:lat '51.3827'^^xsd:float ;",
+ " geo:long '-2.71909'^^xsd:float ", ". ",
+ "<" + RESOURCE_BASE + "center>",
+ " geo:lat '51.3000'^^xsd:float ;",
+ " geo:long '-2.71000'^^xsd:float ", ". ");
+ String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT
?s",
+ "WHERE {",
+ " <http://example.org/data/resource/center>
geo:lat ?lat .",
+ " <http://example.org/data/resource/center>
geo:long ?long .",
+ " ?s spatial:nearby (?lat ?long 100.0 'miles'
-1) .", "}");
+ Set<String> expectedURIs = (new HashSet<String>());
+ expectedURIs
+ .addAll(Arrays
+ .asList((new String[] {
"http://example.org/data/resource/testLatLongBound";,
"http://example.org/data/resource/center"; })));
+ doTestSearch(turtle, queryString, expectedURIs);
+ }
+
}
