[02/40] jena git commit: Fix line endings

[an...@apache.org]

http://git-wip-us.apache.org/repos/asf/jena/blob/d6ae87fd/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIsNearByPF.java
----------------------------------------------------------------------
diff --git a/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIsNearByPF.java b/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIsNearByPF.java
index 346af4a..2e84cad 100644
--- a/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIsNearByPF.java
+++ b/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIsNearByPF.java
@@ -1,335 +1,335 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.query.spatial.pfunction;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.jena.atlas.lib.StrUtils;
-import org.apache.jena.query.spatial.AbstractTestDatasetWithSpatialIndex;
-import org.junit.Test;
-
-public abstract class AbstractTestIsNearByPF extends AbstractTestDatasetWithSpatialIndex {
-
-	@Test
-	public void testOneSimpleResult() {
-		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
-				+ RESOURCE_BASE + "testOneSimpleResult>",
-				"   geo:lat '51.3827'^^xsd:float ;",
-				"   geo:long '-2.71909'^^xsd:float ", ".");
-		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:nearby (51.3000 -2.71000 100.0 'miles' -1) .", "}");
-		Set<String> expectedURIs = (new HashSet<String>());
-		expectedURIs
-				.addAll(Arrays
-						.asList((new String[] { "http://example.org/data/resource/testOneSimpleResult" })));
-		doTestSearch(turtle, queryString, expectedURIs);
-	}
-
-	@Test
-	public void testMultipleResults() {
-		String label = "testMultipleResults";
-		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
-				+ RESOURCE_BASE + label + "1>",
-				"   geo:lat '51.3827'^^xsd:float ;",
-				"   geo:long '-2.71909'^^xsd:float ;" , ".",
-				"<"	+ RESOURCE_BASE + label + "2>",
-				"   geo:lat '51.3967'^^xsd:float ;",
-				"   geo:long '-3.34333'^^xsd:float ;", ".");
-
-		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:nearby (51.3000 -2.71000 100.0 'miles' -1) .", "}");
-		Set<String> expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll(Arrays.asList((new String[] {
-				"http://example.org/data/resource/" + label + "1",
-				"http://example.org/data/resource/" + label + "2" })));
-		doTestSearch(turtle, queryString, expectedURIs);
-	}
-	
-	@Test
-	public void testArgumentListSize() {
-		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
-				+ RESOURCE_BASE + "testArgumentListSize>",
-				"   geo:lat '51.3827'^^xsd:float ;",
-				"   geo:long '-2.71909'^^xsd:float ", ".");
-		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:nearby (51.3000 -2.71000) .", "}");
-		doTestSearchThrowException(turtle, queryString);
-		
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:nearby (51.3000 -2.71000 100 'miles' 1 'another argument') .", "}");
-		doTestSearchThrowException(turtle, queryString);
-	}
-	
-  @Test
-	public void testSearchLimitsResults() {
-		String label = "testSearchLimitsResults";
-		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
-				+ RESOURCE_BASE + label + "1>",
-				"   geo:lat '51.3827'^^xsd:float ;",
-				"   geo:long '-2.71909'^^xsd:float ;" , ".",
-				"<"	+ RESOURCE_BASE + label + "2>",
-				"   geo:lat '51.3967'^^xsd:float ;",
-				"   geo:long '-3.34333'^^xsd:float ;", ".");
-		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:nearby (51.3000 -2.71000 100.0 1) .", "}");
-		Set<String> expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll( Arrays.asList((
-				new String[]
-				{
-					    "http://example.org/data/resource/" + label + "1",
-					    "http://example.org/data/resource/" + label + "2"
-				}
-		)));
-		doTestSearch(turtle, queryString, expectedURIs, 1);
-		
-		
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:nearby (51.3000 -2.71000 100.0 -1) .", "}");
-		expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll( Arrays.asList((
-				new String[]
-				{
-					    "http://example.org/data/resource/" + label + "1",
-					    "http://example.org/data/resource/" + label + "2"
-				}
-		)));
-		doTestSearch(turtle, queryString, expectedURIs);
-		
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:nearby (51.3000 -2.71000 100.0 3) .", "}");
-		expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll( Arrays.asList((
-				new String[]
-				{
-					    "http://example.org/data/resource/" + label + "1",
-					    "http://example.org/data/resource/" + label + "2"
-				}
-		)));
-		doTestSearch(turtle, queryString, expectedURIs);
-		
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:nearby (51.3000 -2.71000 100.0 'something not an integer') .", "}");
-		expectedURIs = (new HashSet<String>());
-		doTestSearch(turtle, queryString, expectedURIs);
-	}
-  
-  @Test
-	public void testDistanceUnits() {
-		String label = "testDistanceUnits";
-		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
-				+ RESOURCE_BASE + label + "1>",
-				"   geo:lat '51.3827'^^xsd:float ;",
-				"   geo:long '-2.71909'^^xsd:float ;" , ".",
-				"<"	+ RESOURCE_BASE + label + "2>",
-				"   geo:lat '51.3967'^^xsd:float ;",
-				"   geo:long '-3.34333'^^xsd:float ;", ".", 
-				"<"	+ RESOURCE_BASE + label + "3>",
-				"   geo:lat '52.4539'^^xsd:float ;",
-				"   geo:long '-1.74803'^^xsd:float ;", ".");
-		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:nearby (51.3000 -2.71000 100.0 'miles') .", "}");
-		Set<String> expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll( Arrays.asList((
-				new String[]
-				{
-					    "http://example.org/data/resource/" + label + "1",
-					    "http://example.org/data/resource/" + label + "2",
-					    "http://example.org/data/resource/" + label + "3"
-				}
-		)));
-		doTestSearch(turtle, queryString, expectedURIs);
-		
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:nearby (51.3000 -2.71000 100.0 'mi') .", "}");
-		expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll( Arrays.asList((
-				new String[]
-				{
-					    "http://example.org/data/resource/" + label + "1",
-					    "http://example.org/data/resource/" + label + "2",
-					    "http://example.org/data/resource/" + label + "3"
-				}
-		)));
-		doTestSearch(turtle, queryString, expectedURIs);
-		
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:nearby (51.3000 -2.71000 100.0 'kilometres') .", "}");
-		expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll( Arrays.asList((
-				new String[]
-				{
-					    "http://example.org/data/resource/" + label + "1",
-					    "http://example.org/data/resource/" + label + "2"
-				}
-		)));
-		doTestSearch(turtle, queryString, expectedURIs);
-		
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:nearby (51.3000 -2.71000 100.0 'km') .", "}");
-		expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll( Arrays.asList((
-				new String[]
-				{
-					    "http://example.org/data/resource/" + label + "1",
-					    "http://example.org/data/resource/" + label + "2"
-				}
-		)));
-		doTestSearch(turtle, queryString, expectedURIs);
-		
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:nearby (51.3000 -2.71000 10000.0 'metres') .", "}");
-		expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll( Arrays.asList((
-				new String[]
-				{
-					    "http://example.org/data/resource/" + label + "1"
-				}
-		)));
-		doTestSearch(turtle, queryString, expectedURIs);
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:nearby (51.3000 -2.71000 10000.0 'm') .", "}");
-		expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll( Arrays.asList((
-				new String[]
-				{
-					    "http://example.org/data/resource/" + label + "1"
-				}
-		)));
-		doTestSearch(turtle, queryString, expectedURIs);
-		
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:nearby (51.3000 -2.71000 1000000.0 'centimetres') .", "}");
-		expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll( Arrays.asList((
-				new String[]
-				{
-					    "http://example.org/data/resource/" + label + "1"
-				}
-		)));
-		doTestSearch(turtle, queryString, expectedURIs);
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:nearby (51.3000 -2.71000 1000000.0 'cm') .", "}");
-		expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll( Arrays.asList((
-				new String[]
-				{
-					    "http://example.org/data/resource/" + label + "1"
-				}
-		)));
-		doTestSearch(turtle, queryString, expectedURIs);
-		
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:nearby (51.3000 -2.71000 10000000.0 'millimetres') .", "}");
-		expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll( Arrays.asList((
-				new String[]
-				{
-					    "http://example.org/data/resource/" + label + "1"
-				}
-		)));
-		doTestSearch(turtle, queryString, expectedURIs);
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:nearby (51.3000 -2.71000 10000000.0 'mm') .", "}");
-		expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll( Arrays.asList((
-				new String[]
-				{
-					    "http://example.org/data/resource/" + label + "1"
-				}
-		)));
-		doTestSearch(turtle, queryString, expectedURIs);
-		
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:nearby (51.3000 -2.71000 0.09 'degrees') .", "}");
-		expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll( Arrays.asList((
-				new String[]
-				{
-					    "http://example.org/data/resource/" + label + "1"
-				}
-		)));
-		doTestSearch(turtle, queryString, expectedURIs);
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:nearby (51.3000 -2.71000 0.09 'de') .", "}");
-		expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll( Arrays.asList((
-				new String[]
-				{
-					    "http://example.org/data/resource/" + label + "1"
-				}
-		)));
-		doTestSearch(turtle, queryString, expectedURIs);
-		
-		
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:nearby (51.3000 -2.71000 100.0 1 'mi') .", "}");
-		expectedURIs = (new HashSet<String>());
-		doTestSearch(turtle, queryString, expectedURIs);
-		
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:nearby (51.3000 -2.71000 100.0 'other unsupported unit' -1) .", "}");
-		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);
-	}
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.query.spatial.pfunction;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.jena.atlas.lib.StrUtils;
+import org.apache.jena.query.spatial.AbstractTestDatasetWithSpatialIndex;
+import org.junit.Test;
+
+public abstract class AbstractTestIsNearByPF extends AbstractTestDatasetWithSpatialIndex {
+
+	@Test
+	public void testOneSimpleResult() {
+		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
+				+ RESOURCE_BASE + "testOneSimpleResult>",
+				"   geo:lat '51.3827'^^xsd:float ;",
+				"   geo:long '-2.71909'^^xsd:float ", ".");
+		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:nearby (51.3000 -2.71000 100.0 'miles' -1) .", "}");
+		Set<String> expectedURIs = (new HashSet<String>());
+		expectedURIs
+				.addAll(Arrays
+						.asList((new String[] { "http://example.org/data/resource/testOneSimpleResult" })));
+		doTestSearch(turtle, queryString, expectedURIs);
+	}
+
+	@Test
+	public void testMultipleResults() {
+		String label = "testMultipleResults";
+		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
+				+ RESOURCE_BASE + label + "1>",
+				"   geo:lat '51.3827'^^xsd:float ;",
+				"   geo:long '-2.71909'^^xsd:float ;" , ".",
+				"<"	+ RESOURCE_BASE + label + "2>",
+				"   geo:lat '51.3967'^^xsd:float ;",
+				"   geo:long '-3.34333'^^xsd:float ;", ".");
+
+		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:nearby (51.3000 -2.71000 100.0 'miles' -1) .", "}");
+		Set<String> expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll(Arrays.asList((new String[] {
+				"http://example.org/data/resource/" + label + "1",
+				"http://example.org/data/resource/" + label + "2" })));
+		doTestSearch(turtle, queryString, expectedURIs);
+	}
+	
+	@Test
+	public void testArgumentListSize() {
+		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
+				+ RESOURCE_BASE + "testArgumentListSize>",
+				"   geo:lat '51.3827'^^xsd:float ;",
+				"   geo:long '-2.71909'^^xsd:float ", ".");
+		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:nearby (51.3000 -2.71000) .", "}");
+		doTestSearchThrowException(turtle, queryString);
+		
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:nearby (51.3000 -2.71000 100 'miles' 1 'another argument') .", "}");
+		doTestSearchThrowException(turtle, queryString);
+	}
+	
+  @Test
+	public void testSearchLimitsResults() {
+		String label = "testSearchLimitsResults";
+		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
+				+ RESOURCE_BASE + label + "1>",
+				"   geo:lat '51.3827'^^xsd:float ;",
+				"   geo:long '-2.71909'^^xsd:float ;" , ".",
+				"<"	+ RESOURCE_BASE + label + "2>",
+				"   geo:lat '51.3967'^^xsd:float ;",
+				"   geo:long '-3.34333'^^xsd:float ;", ".");
+		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:nearby (51.3000 -2.71000 100.0 1) .", "}");
+		Set<String> expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll( Arrays.asList((
+				new String[]
+				{
+					    "http://example.org/data/resource/" + label + "1",
+					    "http://example.org/data/resource/" + label + "2"
+				}
+		)));
+		doTestSearch(turtle, queryString, expectedURIs, 1);
+		
+		
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:nearby (51.3000 -2.71000 100.0 -1) .", "}");
+		expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll( Arrays.asList((
+				new String[]
+				{
+					    "http://example.org/data/resource/" + label + "1",
+					    "http://example.org/data/resource/" + label + "2"
+				}
+		)));
+		doTestSearch(turtle, queryString, expectedURIs);
+		
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:nearby (51.3000 -2.71000 100.0 3) .", "}");
+		expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll( Arrays.asList((
+				new String[]
+				{
+					    "http://example.org/data/resource/" + label + "1",
+					    "http://example.org/data/resource/" + label + "2"
+				}
+		)));
+		doTestSearch(turtle, queryString, expectedURIs);
+		
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:nearby (51.3000 -2.71000 100.0 'something not an integer') .", "}");
+		expectedURIs = (new HashSet<String>());
+		doTestSearch(turtle, queryString, expectedURIs);
+	}
+  
+  @Test
+	public void testDistanceUnits() {
+		String label = "testDistanceUnits";
+		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
+				+ RESOURCE_BASE + label + "1>",
+				"   geo:lat '51.3827'^^xsd:float ;",
+				"   geo:long '-2.71909'^^xsd:float ;" , ".",
+				"<"	+ RESOURCE_BASE + label + "2>",
+				"   geo:lat '51.3967'^^xsd:float ;",
+				"   geo:long '-3.34333'^^xsd:float ;", ".", 
+				"<"	+ RESOURCE_BASE + label + "3>",
+				"   geo:lat '52.4539'^^xsd:float ;",
+				"   geo:long '-1.74803'^^xsd:float ;", ".");
+		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:nearby (51.3000 -2.71000 100.0 'miles') .", "}");
+		Set<String> expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll( Arrays.asList((
+				new String[]
+				{
+					    "http://example.org/data/resource/" + label + "1",
+					    "http://example.org/data/resource/" + label + "2",
+					    "http://example.org/data/resource/" + label + "3"
+				}
+		)));
+		doTestSearch(turtle, queryString, expectedURIs);
+		
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:nearby (51.3000 -2.71000 100.0 'mi') .", "}");
+		expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll( Arrays.asList((
+				new String[]
+				{
+					    "http://example.org/data/resource/" + label + "1",
+					    "http://example.org/data/resource/" + label + "2",
+					    "http://example.org/data/resource/" + label + "3"
+				}
+		)));
+		doTestSearch(turtle, queryString, expectedURIs);
+		
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:nearby (51.3000 -2.71000 100.0 'kilometres') .", "}");
+		expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll( Arrays.asList((
+				new String[]
+				{
+					    "http://example.org/data/resource/" + label + "1",
+					    "http://example.org/data/resource/" + label + "2"
+				}
+		)));
+		doTestSearch(turtle, queryString, expectedURIs);
+		
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:nearby (51.3000 -2.71000 100.0 'km') .", "}");
+		expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll( Arrays.asList((
+				new String[]
+				{
+					    "http://example.org/data/resource/" + label + "1",
+					    "http://example.org/data/resource/" + label + "2"
+				}
+		)));
+		doTestSearch(turtle, queryString, expectedURIs);
+		
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:nearby (51.3000 -2.71000 10000.0 'metres') .", "}");
+		expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll( Arrays.asList((
+				new String[]
+				{
+					    "http://example.org/data/resource/" + label + "1"
+				}
+		)));
+		doTestSearch(turtle, queryString, expectedURIs);
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:nearby (51.3000 -2.71000 10000.0 'm') .", "}");
+		expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll( Arrays.asList((
+				new String[]
+				{
+					    "http://example.org/data/resource/" + label + "1"
+				}
+		)));
+		doTestSearch(turtle, queryString, expectedURIs);
+		
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:nearby (51.3000 -2.71000 1000000.0 'centimetres') .", "}");
+		expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll( Arrays.asList((
+				new String[]
+				{
+					    "http://example.org/data/resource/" + label + "1"
+				}
+		)));
+		doTestSearch(turtle, queryString, expectedURIs);
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:nearby (51.3000 -2.71000 1000000.0 'cm') .", "}");
+		expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll( Arrays.asList((
+				new String[]
+				{
+					    "http://example.org/data/resource/" + label + "1"
+				}
+		)));
+		doTestSearch(turtle, queryString, expectedURIs);
+		
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:nearby (51.3000 -2.71000 10000000.0 'millimetres') .", "}");
+		expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll( Arrays.asList((
+				new String[]
+				{
+					    "http://example.org/data/resource/" + label + "1"
+				}
+		)));
+		doTestSearch(turtle, queryString, expectedURIs);
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:nearby (51.3000 -2.71000 10000000.0 'mm') .", "}");
+		expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll( Arrays.asList((
+				new String[]
+				{
+					    "http://example.org/data/resource/" + label + "1"
+				}
+		)));
+		doTestSearch(turtle, queryString, expectedURIs);
+		
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:nearby (51.3000 -2.71000 0.09 'degrees') .", "}");
+		expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll( Arrays.asList((
+				new String[]
+				{
+					    "http://example.org/data/resource/" + label + "1"
+				}
+		)));
+		doTestSearch(turtle, queryString, expectedURIs);
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:nearby (51.3000 -2.71000 0.09 'de') .", "}");
+		expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll( Arrays.asList((
+				new String[]
+				{
+					    "http://example.org/data/resource/" + label + "1"
+				}
+		)));
+		doTestSearch(turtle, queryString, expectedURIs);
+		
+		
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:nearby (51.3000 -2.71000 100.0 1 'mi') .", "}");
+		expectedURIs = (new HashSet<String>());
+		doTestSearch(turtle, queryString, expectedURIs);
+		
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:nearby (51.3000 -2.71000 100.0 'other unsupported unit' -1) .", "}");
+		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);
+	}
+}

http://git-wip-us.apache.org/repos/asf/jena/blob/d6ae87fd/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIsWithinBoxPF.java
----------------------------------------------------------------------
diff --git a/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIsWithinBoxPF.java b/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIsWithinBoxPF.java
index c165c3b..7ae76ac 100644
--- a/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIsWithinBoxPF.java
+++ b/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIsWithinBoxPF.java
@@ -1,142 +1,142 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.query.spatial.pfunction;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.jena.atlas.lib.StrUtils;
-import org.apache.jena.query.spatial.AbstractTestDatasetWithSpatialIndex;
-import org.junit.Test;
-
-public abstract class AbstractTestIsWithinBoxPF extends AbstractTestDatasetWithSpatialIndex {
-
-	@Test
-	public void testOneSimpleResult() {
-		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
-				+ RESOURCE_BASE + "testOneSimpleResult>",
-				"   geo:lat '51.3827'^^xsd:float ;",
-				"   geo:long '-2.71909'^^xsd:float ", ".");
-		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:withinBox (51.1000 -4.0000 51.4000 0.0000 -1) .", "}");
-		Set<String> expectedURIs = (new HashSet<String>());
-		expectedURIs
-				.addAll(Arrays
-						.asList((new String[] { "http://example.org/data/resource/testOneSimpleResult" })));
-		doTestSearch(turtle, queryString, expectedURIs);
-	}
-
-	@Test
-	public void testMultipleResults() {
-		String label = "testMultipleResults";
-		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
-				+ RESOURCE_BASE + label + "1>",
-				"   geo:lat '51.3827'^^xsd:float ;",
-				"   geo:long '-2.71909'^^xsd:float ;" , ".",
-				"<"	+ RESOURCE_BASE + label + "2>",
-				"   geo:lat '51.3967'^^xsd:float ;",
-				"   geo:long '-3.34333'^^xsd:float ;", ".");
-
-		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:withinBox (51.1000 -4.0000 51.4000 0.0000 -1) .", "}");
-		Set<String> expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll(Arrays.asList((new String[] {
-				"http://example.org/data/resource/" + label + "1",
-				"http://example.org/data/resource/" + label + "2" })));
-		doTestSearch(turtle, queryString, expectedURIs);
-	}
-	
-	@Test
-	public void testArgumentListSize() {
-		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
-				+ RESOURCE_BASE + "testArgumentListSize>",
-				"   geo:lat '51.3827'^^xsd:float ;",
-				"   geo:long '-2.71909'^^xsd:float ", ".");
-		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:withinBox (51.1000 -4.0000 -1) .", "}");
-		doTestSearchThrowException(turtle, queryString);
-		
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:withinBox (51.1000 -4.0000 51.4000 0.0000 -1 'some other argument') .", "}");
-		doTestSearchThrowException(turtle, queryString);
-	}
-	
-  @Test
-	public void testSearchLimitsResults() {
-		String label = "testSearchLimitsResults";
-		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
-				+ RESOURCE_BASE + label + "1>",
-				"   geo:lat '51.3827'^^xsd:float ;",
-				"   geo:long '-2.71909'^^xsd:float ;" , ".",
-				"<"	+ RESOURCE_BASE + label + "2>",
-				"   geo:lat '51.3967'^^xsd:float ;",
-				"   geo:long '-3.34333'^^xsd:float ;", ".");
-		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:withinBox (51.1000 -4.0000 51.4000 0.0000 1)  .", "}");
-		Set<String> expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll( Arrays.asList((
-				new String[]
-				{
-					    "http://example.org/data/resource/" + label + "1",
-					    "http://example.org/data/resource/" + label + "2"
-				}
-		)));
-		doTestSearch(turtle, queryString, expectedURIs, 1);
-		
-		
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:withinBox (51.1000 -4.0000 51.4000 0.0000 -1)  .", "}");
-		expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll( Arrays.asList((
-				new String[]
-				{
-					    "http://example.org/data/resource/" + label + "1",
-					    "http://example.org/data/resource/" + label + "2"
-				}
-		)));
-		doTestSearch(turtle, queryString, expectedURIs);
-		
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:withinBox (51.1000 -4.0000 51.4000 0.0000 3)  .", "}");
-		expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll( Arrays.asList((
-				new String[]
-				{
-					    "http://example.org/data/resource/" + label + "1",
-					    "http://example.org/data/resource/" + label + "2"
-				}
-		)));
-		doTestSearch(turtle, queryString, expectedURIs);
-		
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:withinBox (51.1000 -4.0000 51.4000 0.0000 'something not an integer')  .", "}");
-		expectedURIs = (new HashSet<String>());
-		doTestSearch(turtle, queryString, expectedURIs);
-	}
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.query.spatial.pfunction;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.jena.atlas.lib.StrUtils;
+import org.apache.jena.query.spatial.AbstractTestDatasetWithSpatialIndex;
+import org.junit.Test;
+
+public abstract class AbstractTestIsWithinBoxPF extends AbstractTestDatasetWithSpatialIndex {
+
+	@Test
+	public void testOneSimpleResult() {
+		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
+				+ RESOURCE_BASE + "testOneSimpleResult>",
+				"   geo:lat '51.3827'^^xsd:float ;",
+				"   geo:long '-2.71909'^^xsd:float ", ".");
+		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:withinBox (51.1000 -4.0000 51.4000 0.0000 -1) .", "}");
+		Set<String> expectedURIs = (new HashSet<String>());
+		expectedURIs
+				.addAll(Arrays
+						.asList((new String[] { "http://example.org/data/resource/testOneSimpleResult" })));
+		doTestSearch(turtle, queryString, expectedURIs);
+	}
+
+	@Test
+	public void testMultipleResults() {
+		String label = "testMultipleResults";
+		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
+				+ RESOURCE_BASE + label + "1>",
+				"   geo:lat '51.3827'^^xsd:float ;",
+				"   geo:long '-2.71909'^^xsd:float ;" , ".",
+				"<"	+ RESOURCE_BASE + label + "2>",
+				"   geo:lat '51.3967'^^xsd:float ;",
+				"   geo:long '-3.34333'^^xsd:float ;", ".");
+
+		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:withinBox (51.1000 -4.0000 51.4000 0.0000 -1) .", "}");
+		Set<String> expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll(Arrays.asList((new String[] {
+				"http://example.org/data/resource/" + label + "1",
+				"http://example.org/data/resource/" + label + "2" })));
+		doTestSearch(turtle, queryString, expectedURIs);
+	}
+	
+	@Test
+	public void testArgumentListSize() {
+		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
+				+ RESOURCE_BASE + "testArgumentListSize>",
+				"   geo:lat '51.3827'^^xsd:float ;",
+				"   geo:long '-2.71909'^^xsd:float ", ".");
+		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:withinBox (51.1000 -4.0000 -1) .", "}");
+		doTestSearchThrowException(turtle, queryString);
+		
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:withinBox (51.1000 -4.0000 51.4000 0.0000 -1 'some other argument') .", "}");
+		doTestSearchThrowException(turtle, queryString);
+	}
+	
+  @Test
+	public void testSearchLimitsResults() {
+		String label = "testSearchLimitsResults";
+		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
+				+ RESOURCE_BASE + label + "1>",
+				"   geo:lat '51.3827'^^xsd:float ;",
+				"   geo:long '-2.71909'^^xsd:float ;" , ".",
+				"<"	+ RESOURCE_BASE + label + "2>",
+				"   geo:lat '51.3967'^^xsd:float ;",
+				"   geo:long '-3.34333'^^xsd:float ;", ".");
+		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:withinBox (51.1000 -4.0000 51.4000 0.0000 1)  .", "}");
+		Set<String> expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll( Arrays.asList((
+				new String[]
+				{
+					    "http://example.org/data/resource/" + label + "1",
+					    "http://example.org/data/resource/" + label + "2"
+				}
+		)));
+		doTestSearch(turtle, queryString, expectedURIs, 1);
+		
+		
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:withinBox (51.1000 -4.0000 51.4000 0.0000 -1)  .", "}");
+		expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll( Arrays.asList((
+				new String[]
+				{
+					    "http://example.org/data/resource/" + label + "1",
+					    "http://example.org/data/resource/" + label + "2"
+				}
+		)));
+		doTestSearch(turtle, queryString, expectedURIs);
+		
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:withinBox (51.1000 -4.0000 51.4000 0.0000 3)  .", "}");
+		expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll( Arrays.asList((
+				new String[]
+				{
+					    "http://example.org/data/resource/" + label + "1",
+					    "http://example.org/data/resource/" + label + "2"
+				}
+		)));
+		doTestSearch(turtle, queryString, expectedURIs);
+		
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:withinBox (51.1000 -4.0000 51.4000 0.0000 'something not an integer')  .", "}");
+		expectedURIs = (new HashSet<String>());
+		doTestSearch(turtle, queryString, expectedURIs);
+	}
+
+}

http://git-wip-us.apache.org/repos/asf/jena/blob/d6ae87fd/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIsWithinCirclePF.java
----------------------------------------------------------------------
diff --git a/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIsWithinCirclePF.java b/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIsWithinCirclePF.java
index 5f460fa..95c65c0 100644
--- a/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIsWithinCirclePF.java
+++ b/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIsWithinCirclePF.java
@@ -1,336 +1,336 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.query.spatial.pfunction;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.jena.atlas.lib.StrUtils;
-import org.apache.jena.query.spatial.AbstractTestDatasetWithSpatialIndex;
-import org.junit.Test;
-
-public abstract class AbstractTestIsWithinCirclePF extends AbstractTestDatasetWithSpatialIndex {
-
-	@Test
-	public void testOneSimpleResult() {
-		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
-				+ RESOURCE_BASE + "testOneSimpleResult>",
-				"   geo:lat '51.3827'^^xsd:float ;",
-				"   geo:long '-2.71909'^^xsd:float ", ".");
-		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:withinCircle (51.3000 -2.71000 100.0 'miles' -1) .", "}");
-		Set<String> expectedURIs = (new HashSet<String>());
-		expectedURIs
-				.addAll(Arrays
-						.asList((new String[] { "http://example.org/data/resource/testOneSimpleResult" })));
-		doTestSearch(turtle, queryString, expectedURIs);
-	}
-
-	@Test
-	public void testMultipleResults() {
-		String label = "testMultipleResults";
-		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
-				+ RESOURCE_BASE + label + "1>",
-				"   geo:lat '51.3827'^^xsd:float ;",
-				"   geo:long '-2.71909'^^xsd:float ;" , ".",
-				"<"	+ RESOURCE_BASE + label + "2>",
-				"   geo:lat '51.3967'^^xsd:float ;",
-				"   geo:long '-3.34333'^^xsd:float ;", ".");
-
-		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:withinCircle (51.3000 -2.71000 100.0 'miles' -1) .", "}");
-		Set<String> expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll(Arrays.asList((new String[] {
-				"http://example.org/data/resource/" + label + "1",
-				"http://example.org/data/resource/" + label + "2" })));
-		doTestSearch(turtle, queryString, expectedURIs);
-	}
-	
-	@Test
-	public void testArgumentListSize() {
-		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
-				+ RESOURCE_BASE + "testArgumentListSize>",
-				"   geo:lat '51.3827'^^xsd:float ;",
-				"   geo:long '-2.71909'^^xsd:float ", ".");
-		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:withinCircle (51.3000 -2.71000) .", "}");
-		doTestSearchThrowException(turtle, queryString);
-		
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:withinCircle (51.3000 -2.71000 100 'miles' 1 'another argument') .", "}");
-		doTestSearchThrowException(turtle, queryString);
-	}
-	
-  @Test
-	public void testSearchLimitsResults() {
-		String label = "testSearchLimitsResults";
-		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
-				+ RESOURCE_BASE + label + "1>",
-				"   geo:lat '51.3827'^^xsd:float ;",
-				"   geo:long '-2.71909'^^xsd:float ;" , ".",
-				"<"	+ RESOURCE_BASE + label + "2>",
-				"   geo:lat '51.3967'^^xsd:float ;",
-				"   geo:long '-3.34333'^^xsd:float ;", ".");
-		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:withinCircle (51.3000 -2.71000 100.0 1) .", "}");
-		Set<String> expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll( Arrays.asList((
-				new String[]
-				{
-					    "http://example.org/data/resource/" + label + "1",
-					    "http://example.org/data/resource/" + label + "2"
-				}
-		)));
-		doTestSearch(turtle, queryString, expectedURIs, 1);
-		
-		
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:withinCircle (51.3000 -2.71000 100.0 -1) .", "}");
-		expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll( Arrays.asList((
-				new String[]
-				{
-					    "http://example.org/data/resource/" + label + "1",
-					    "http://example.org/data/resource/" + label + "2"
-				}
-		)));
-		doTestSearch(turtle, queryString, expectedURIs);
-		
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:withinCircle (51.3000 -2.71000 100.0 3) .", "}");
-		expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll( Arrays.asList((
-				new String[]
-				{
-					    "http://example.org/data/resource/" + label + "1",
-					    "http://example.org/data/resource/" + label + "2"
-				}
-		)));
-		doTestSearch(turtle, queryString, expectedURIs);
-		
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:withinCircle (51.3000 -2.71000 100.0 'something not an integer') .", "}");
-		expectedURIs = (new HashSet<String>());
-		doTestSearch(turtle, queryString, expectedURIs);
-	}
-  
-  @Test
-	public void testDistanceUnits() {
-		String label = "testDistanceUnits";
-		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
-				+ RESOURCE_BASE + label + "1>",
-				"   geo:lat '51.3827'^^xsd:float ;",
-				"   geo:long '-2.71909'^^xsd:float ;" , ".",
-				"<"	+ RESOURCE_BASE + label + "2>",
-				"   geo:lat '51.3967'^^xsd:float ;",
-				"   geo:long '-3.34333'^^xsd:float ;", ".", 
-				"<"	+ RESOURCE_BASE + label + "3>",
-				"   geo:lat '52.4539'^^xsd:float ;",
-				"   geo:long '-1.74803'^^xsd:float ;", ".");
-		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:withinCircle (51.3000 -2.71000 100.0 'miles') .", "}");
-		Set<String> expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll( Arrays.asList((
-				new String[]
-				{
-					    "http://example.org/data/resource/" + label + "1",
-					    "http://example.org/data/resource/" + label + "2",
-					    "http://example.org/data/resource/" + label + "3"
-				}
-		)));
-		doTestSearch(turtle, queryString, expectedURIs);
-		
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:withinCircle (51.3000 -2.71000 100.0 'mi') .", "}");
-		expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll( Arrays.asList((
-				new String[]
-				{
-					    "http://example.org/data/resource/" + label + "1",
-					    "http://example.org/data/resource/" + label + "2",
-					    "http://example.org/data/resource/" + label + "3"
-				}
-		)));
-		doTestSearch(turtle, queryString, expectedURIs);
-		
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:withinCircle (51.3000 -2.71000 100.0 'kilometers') .", "}");
-		expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll( Arrays.asList((
-				new String[]
-				{
-					    "http://example.org/data/resource/" + label + "1",
-					    "http://example.org/data/resource/" + label + "2"
-				}
-		)));
-		doTestSearch(turtle, queryString, expectedURIs);
-		
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:withinCircle (51.3000 -2.71000 100.0 'km') .", "}");
-		expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll( Arrays.asList((
-				new String[]
-				{
-					    "http://example.org/data/resource/" + label + "1",
-					    "http://example.org/data/resource/" + label + "2"
-				}
-		)));
-		doTestSearch(turtle, queryString, expectedURIs);
-		
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:withinCircle (51.3000 -2.71000 10000.0 'metres') .", "}");
-		expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll( Arrays.asList((
-				new String[]
-				{
-					    "http://example.org/data/resource/" + label + "1"
-				}
-		)));
-		doTestSearch(turtle, queryString, expectedURIs);
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:withinCircle (51.3000 -2.71000 10000.0 'm') .", "}");
-		expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll( Arrays.asList((
-				new String[]
-				{
-					    "http://example.org/data/resource/" + label + "1"
-				}
-		)));
-		doTestSearch(turtle, queryString, expectedURIs);
-		
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:withinCircle (51.3000 -2.71000 1000000.0 'centimetres') .", "}");
-		expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll( Arrays.asList((
-				new String[]
-				{
-					    "http://example.org/data/resource/" + label + "1"
-				}
-		)));
-		doTestSearch(turtle, queryString, expectedURIs);
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:withinCircle (51.3000 -2.71000 1000000.0 'cm') .", "}");
-		expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll( Arrays.asList((
-				new String[]
-				{
-					    "http://example.org/data/resource/" + label + "1"
-				}
-		)));
-		doTestSearch(turtle, queryString, expectedURIs);
-		
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:withinCircle (51.3000 -2.71000 10000000.0 'millimeters') .", "}");
-		expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll( Arrays.asList((
-				new String[]
-				{
-					    "http://example.org/data/resource/" + label + "1"
-				}
-		)));
-		doTestSearch(turtle, queryString, expectedURIs);
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:withinCircle (51.3000 -2.71000 10000000.0 'mm') .", "}");
-		expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll( Arrays.asList((
-				new String[]
-				{
-					    "http://example.org/data/resource/" + label + "1"
-				}
-		)));
-		doTestSearch(turtle, queryString, expectedURIs);
-		
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:withinCircle (51.3000 -2.71000 0.09 'degrees') .", "}");
-		expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll( Arrays.asList((
-				new String[]
-				{
-					    "http://example.org/data/resource/" + label + "1"
-				}
-		)));
-		doTestSearch(turtle, queryString, expectedURIs);
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:withinCircle (51.3000 -2.71000 0.09 'de') .", "}");
-		expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll( Arrays.asList((
-				new String[]
-				{
-					    "http://example.org/data/resource/" + label + "1"
-				}
-		)));
-		doTestSearch(turtle, queryString, expectedURIs);
-		
-		
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:withinCircle (51.3000 -2.71000 100.0 1 'mi') .", "}");
-		expectedURIs = (new HashSet<String>());
-		doTestSearch(turtle, queryString, expectedURIs);
-		
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:withinCircle (51.3000 -2.71000 100.0 'other unsupported unit' -1) .", "}");
-		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);
-	}
-	
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.query.spatial.pfunction;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.jena.atlas.lib.StrUtils;
+import org.apache.jena.query.spatial.AbstractTestDatasetWithSpatialIndex;
+import org.junit.Test;
+
+public abstract class AbstractTestIsWithinCirclePF extends AbstractTestDatasetWithSpatialIndex {
+
+	@Test
+	public void testOneSimpleResult() {
+		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
+				+ RESOURCE_BASE + "testOneSimpleResult>",
+				"   geo:lat '51.3827'^^xsd:float ;",
+				"   geo:long '-2.71909'^^xsd:float ", ".");
+		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:withinCircle (51.3000 -2.71000 100.0 'miles' -1) .", "}");
+		Set<String> expectedURIs = (new HashSet<String>());
+		expectedURIs
+				.addAll(Arrays
+						.asList((new String[] { "http://example.org/data/resource/testOneSimpleResult" })));
+		doTestSearch(turtle, queryString, expectedURIs);
+	}
+
+	@Test
+	public void testMultipleResults() {
+		String label = "testMultipleResults";
+		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
+				+ RESOURCE_BASE + label + "1>",
+				"   geo:lat '51.3827'^^xsd:float ;",
+				"   geo:long '-2.71909'^^xsd:float ;" , ".",
+				"<"	+ RESOURCE_BASE + label + "2>",
+				"   geo:lat '51.3967'^^xsd:float ;",
+				"   geo:long '-3.34333'^^xsd:float ;", ".");
+
+		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:withinCircle (51.3000 -2.71000 100.0 'miles' -1) .", "}");
+		Set<String> expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll(Arrays.asList((new String[] {
+				"http://example.org/data/resource/" + label + "1",
+				"http://example.org/data/resource/" + label + "2" })));
+		doTestSearch(turtle, queryString, expectedURIs);
+	}
+	
+	@Test
+	public void testArgumentListSize() {
+		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
+				+ RESOURCE_BASE + "testArgumentListSize>",
+				"   geo:lat '51.3827'^^xsd:float ;",
+				"   geo:long '-2.71909'^^xsd:float ", ".");
+		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:withinCircle (51.3000 -2.71000) .", "}");
+		doTestSearchThrowException(turtle, queryString);
+		
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:withinCircle (51.3000 -2.71000 100 'miles' 1 'another argument') .", "}");
+		doTestSearchThrowException(turtle, queryString);
+	}
+	
+  @Test
+	public void testSearchLimitsResults() {
+		String label = "testSearchLimitsResults";
+		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
+				+ RESOURCE_BASE + label + "1>",
+				"   geo:lat '51.3827'^^xsd:float ;",
+				"   geo:long '-2.71909'^^xsd:float ;" , ".",
+				"<"	+ RESOURCE_BASE + label + "2>",
+				"   geo:lat '51.3967'^^xsd:float ;",
+				"   geo:long '-3.34333'^^xsd:float ;", ".");
+		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:withinCircle (51.3000 -2.71000 100.0 1) .", "}");
+		Set<String> expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll( Arrays.asList((
+				new String[]
+				{
+					    "http://example.org/data/resource/" + label + "1",
+					    "http://example.org/data/resource/" + label + "2"
+				}
+		)));
+		doTestSearch(turtle, queryString, expectedURIs, 1);
+		
+		
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:withinCircle (51.3000 -2.71000 100.0 -1) .", "}");
+		expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll( Arrays.asList((
+				new String[]
+				{
+					    "http://example.org/data/resource/" + label + "1",
+					    "http://example.org/data/resource/" + label + "2"
+				}
+		)));
+		doTestSearch(turtle, queryString, expectedURIs);
+		
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:withinCircle (51.3000 -2.71000 100.0 3) .", "}");
+		expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll( Arrays.asList((
+				new String[]
+				{
+					    "http://example.org/data/resource/" + label + "1",
+					    "http://example.org/data/resource/" + label + "2"
+				}
+		)));
+		doTestSearch(turtle, queryString, expectedURIs);
+		
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:withinCircle (51.3000 -2.71000 100.0 'something not an integer') .", "}");
+		expectedURIs = (new HashSet<String>());
+		doTestSearch(turtle, queryString, expectedURIs);
+	}
+  
+  @Test
+	public void testDistanceUnits() {
+		String label = "testDistanceUnits";
+		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
+				+ RESOURCE_BASE + label + "1>",
+				"   geo:lat '51.3827'^^xsd:float ;",
+				"   geo:long '-2.71909'^^xsd:float ;" , ".",
+				"<"	+ RESOURCE_BASE + label + "2>",
+				"   geo:lat '51.3967'^^xsd:float ;",
+				"   geo:long '-3.34333'^^xsd:float ;", ".", 
+				"<"	+ RESOURCE_BASE + label + "3>",
+				"   geo:lat '52.4539'^^xsd:float ;",
+				"   geo:long '-1.74803'^^xsd:float ;", ".");
+		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:withinCircle (51.3000 -2.71000 100.0 'miles') .", "}");
+		Set<String> expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll( Arrays.asList((
+				new String[]
+				{
+					    "http://example.org/data/resource/" + label + "1",
+					    "http://example.org/data/resource/" + label + "2",
+					    "http://example.org/data/resource/" + label + "3"
+				}
+		)));
+		doTestSearch(turtle, queryString, expectedURIs);
+		
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:withinCircle (51.3000 -2.71000 100.0 'mi') .", "}");
+		expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll( Arrays.asList((
+				new String[]
+				{
+					    "http://example.org/data/resource/" + label + "1",
+					    "http://example.org/data/resource/" + label + "2",
+					    "http://example.org/data/resource/" + label + "3"
+				}
+		)));
+		doTestSearch(turtle, queryString, expectedURIs);
+		
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:withinCircle (51.3000 -2.71000 100.0 'kilometers') .", "}");
+		expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll( Arrays.asList((
+				new String[]
+				{
+					    "http://example.org/data/resource/" + label + "1",
+					    "http://example.org/data/resource/" + label + "2"
+				}
+		)));
+		doTestSearch(turtle, queryString, expectedURIs);
+		
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:withinCircle (51.3000 -2.71000 100.0 'km') .", "}");
+		expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll( Arrays.asList((
+				new String[]
+				{
+					    "http://example.org/data/resource/" + label + "1",
+					    "http://example.org/data/resource/" + label + "2"
+				}
+		)));
+		doTestSearch(turtle, queryString, expectedURIs);
+		
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:withinCircle (51.3000 -2.71000 10000.0 'metres') .", "}");
+		expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll( Arrays.asList((
+				new String[]
+				{
+					    "http://example.org/data/resource/" + label + "1"
+				}
+		)));
+		doTestSearch(turtle, queryString, expectedURIs);
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:withinCircle (51.3000 -2.71000 10000.0 'm') .", "}");
+		expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll( Arrays.asList((
+				new String[]
+				{
+					    "http://example.org/data/resource/" + label + "1"
+				}
+		)));
+		doTestSearch(turtle, queryString, expectedURIs);
+		
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:withinCircle (51.3000 -2.71000 1000000.0 'centimetres') .", "}");
+		expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll( Arrays.asList((
+				new String[]
+				{
+					    "http://example.org/data/resource/" + label + "1"
+				}
+		)));
+		doTestSearch(turtle, queryString, expectedURIs);
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:withinCircle (51.3000 -2.71000 1000000.0 'cm') .", "}");
+		expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll( Arrays.asList((
+				new String[]
+				{
+					    "http://example.org/data/resource/" + label + "1"
+				}
+		)));
+		doTestSearch(turtle, queryString, expectedURIs);
+		
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:withinCircle (51.3000 -2.71000 10000000.0 'millimeters') .", "}");
+		expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll( Arrays.asList((
+				new String[]
+				{
+					    "http://example.org/data/resource/" + label + "1"
+				}
+		)));
+		doTestSearch(turtle, queryString, expectedURIs);
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:withinCircle (51.3000 -2.71000 10000000.0 'mm') .", "}");
+		expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll( Arrays.asList((
+				new String[]
+				{
+					    "http://example.org/data/resource/" + label + "1"
+				}
+		)));
+		doTestSearch(turtle, queryString, expectedURIs);
+		
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:withinCircle (51.3000 -2.71000 0.09 'degrees') .", "}");
+		expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll( Arrays.asList((
+				new String[]
+				{
+					    "http://example.org/data/resource/" + label + "1"
+				}
+		)));
+		doTestSearch(turtle, queryString, expectedURIs);
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:withinCircle (51.3000 -2.71000 0.09 'de') .", "}");
+		expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll( Arrays.asList((
+				new String[]
+				{
+					    "http://example.org/data/resource/" + label + "1"
+				}
+		)));
+		doTestSearch(turtle, queryString, expectedURIs);
+		
+		
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:withinCircle (51.3000 -2.71000 100.0 1 'mi') .", "}");
+		expectedURIs = (new HashSet<String>());
+		doTestSearch(turtle, queryString, expectedURIs);
+		
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:withinCircle (51.3000 -2.71000 100.0 'other unsupported unit' -1) .", "}");
+		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);
+	}
+	
+}

http://git-wip-us.apache.org/repos/asf/jena/blob/d6ae87fd/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestNorthPF.java
----------------------------------------------------------------------
diff --git a/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestNorthPF.java b/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestNorthPF.java
index 3eb61b8..01e9a7d 100644
--- a/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestNorthPF.java
+++ b/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestNorthPF.java
@@ -1,142 +1,142 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.query.spatial.pfunction;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.jena.atlas.lib.StrUtils;
-import org.apache.jena.query.spatial.AbstractTestDatasetWithSpatialIndex;
-import org.junit.Test;
-
-public abstract class AbstractTestNorthPF extends AbstractTestDatasetWithSpatialIndex {
-
-	@Test
-	public void testOneSimpleResult() {
-		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
-				+ RESOURCE_BASE + "testOneSimpleResult>",
-				"   geo:lat '51.3827'^^xsd:float ;",
-				"   geo:long '-2.71909'^^xsd:float ", ".");
-		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:north (51.3000 0.0000 -1) .", "}");
-		Set<String> expectedURIs = (new HashSet<String>());
-		expectedURIs
-				.addAll(Arrays
-						.asList((new String[] { "http://example.org/data/resource/testOneSimpleResult" })));
-		doTestSearch(turtle, queryString, expectedURIs);
-	}
-
-	@Test
-	public void testMultipleResults() {
-		String label = "testMultipleResults";
-		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
-				+ RESOURCE_BASE + label + "1>",
-				"   geo:lat '51.3827'^^xsd:float ;",
-				"   geo:long '-2.71909'^^xsd:float ;" , ".",
-				"<"	+ RESOURCE_BASE + label + "2>",
-				"   geo:lat '51.3967'^^xsd:float ;",
-				"   geo:long '-3.34333'^^xsd:float ;", ".");
-
-		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:north (51.3000 0.0000 -1) .", "}");
-		Set<String> expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll(Arrays.asList((new String[] {
-				"http://example.org/data/resource/" + label + "1",
-				"http://example.org/data/resource/" + label + "2" })));
-		doTestSearch(turtle, queryString, expectedURIs);
-	}
-	
-	@Test
-	public void testArgumentListSize() {
-		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
-				+ RESOURCE_BASE + "testArgumentListSize>",
-				"   geo:lat '51.3827'^^xsd:float ;",
-				"   geo:long '-2.71909'^^xsd:float ", ".");
-		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:north (51.3000) .", "}");
-		doTestSearchThrowException(turtle, queryString);
-		
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:north (51.3000 0.0000 -1 'another argument') .", "}");
-		doTestSearchThrowException(turtle, queryString);
-	}
-	
-  @Test
-	public void testSearchLimitsResults() {
-		String label = "testSearchLimitsResults";
-		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
-				+ RESOURCE_BASE + label + "1>",
-				"   geo:lat '51.3827'^^xsd:float ;",
-				"   geo:long '-2.71909'^^xsd:float ;" , ".",
-				"<"	+ RESOURCE_BASE + label + "2>",
-				"   geo:lat '51.3967'^^xsd:float ;",
-				"   geo:long '-3.34333'^^xsd:float ;", ".");
-		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:north (51.3000 0.0000 1) .", "}");
-		Set<String> expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll( Arrays.asList((
-				new String[]
-				{
-					    "http://example.org/data/resource/" + label + "1",
-					    "http://example.org/data/resource/" + label + "2"
-				}
-		)));
-		doTestSearch(turtle, queryString, expectedURIs, 1);
-		
-		
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:north (51.3000 0.0000 -1) .", "}");
-		expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll( Arrays.asList((
-				new String[]
-				{
-					    "http://example.org/data/resource/" + label + "1",
-					    "http://example.org/data/resource/" + label + "2"
-				}
-		)));
-		doTestSearch(turtle, queryString, expectedURIs);
-		
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:north (51.3000 0.0000 3) .", "}");
-		expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll( Arrays.asList((
-				new String[]
-				{
-					    "http://example.org/data/resource/" + label + "1",
-					    "http://example.org/data/resource/" + label + "2"
-				}
-		)));
-		doTestSearch(turtle, queryString, expectedURIs);
-		
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:north (51.3000 0.0000 'something not an integer') .", "}");
-		expectedURIs = (new HashSet<String>());
-		doTestSearch(turtle, queryString, expectedURIs);
-	}
-  
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.query.spatial.pfunction;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.jena.atlas.lib.StrUtils;
+import org.apache.jena.query.spatial.AbstractTestDatasetWithSpatialIndex;
+import org.junit.Test;
+
+public abstract class AbstractTestNorthPF extends AbstractTestDatasetWithSpatialIndex {
+
+	@Test
+	public void testOneSimpleResult() {
+		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
+				+ RESOURCE_BASE + "testOneSimpleResult>",
+				"   geo:lat '51.3827'^^xsd:float ;",
+				"   geo:long '-2.71909'^^xsd:float ", ".");
+		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:north (51.3000 0.0000 -1) .", "}");
+		Set<String> expectedURIs = (new HashSet<String>());
+		expectedURIs
+				.addAll(Arrays
+						.asList((new String[] { "http://example.org/data/resource/testOneSimpleResult" })));
+		doTestSearch(turtle, queryString, expectedURIs);
+	}
+
+	@Test
+	public void testMultipleResults() {
+		String label = "testMultipleResults";
+		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
+				+ RESOURCE_BASE + label + "1>",
+				"   geo:lat '51.3827'^^xsd:float ;",
+				"   geo:long '-2.71909'^^xsd:float ;" , ".",
+				"<"	+ RESOURCE_BASE + label + "2>",
+				"   geo:lat '51.3967'^^xsd:float ;",
+				"   geo:long '-3.34333'^^xsd:float ;", ".");
+
+		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:north (51.3000 0.0000 -1) .", "}");
+		Set<String> expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll(Arrays.asList((new String[] {
+				"http://example.org/data/resource/" + label + "1",
+				"http://example.org/data/resource/" + label + "2" })));
+		doTestSearch(turtle, queryString, expectedURIs);
+	}
+	
+	@Test
+	public void testArgumentListSize() {
+		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
+				+ RESOURCE_BASE + "testArgumentListSize>",
+				"   geo:lat '51.3827'^^xsd:float ;",
+				"   geo:long '-2.71909'^^xsd:float ", ".");
+		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:north (51.3000) .", "}");
+		doTestSearchThrowException(turtle, queryString);
+		
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:north (51.3000 0.0000 -1 'another argument') .", "}");
+		doTestSearchThrowException(turtle, queryString);
+	}
+	
+  @Test
+	public void testSearchLimitsResults() {
+		String label = "testSearchLimitsResults";
+		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
+				+ RESOURCE_BASE + label + "1>",
+				"   geo:lat '51.3827'^^xsd:float ;",
+				"   geo:long '-2.71909'^^xsd:float ;" , ".",
+				"<"	+ RESOURCE_BASE + label + "2>",
+				"   geo:lat '51.3967'^^xsd:float ;",
+				"   geo:long '-3.34333'^^xsd:float ;", ".");
+		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:north (51.3000 0.0000 1) .", "}");
+		Set<String> expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll( Arrays.asList((
+				new String[]
+				{
+					    "http://example.org/data/resource/" + label + "1",
+					    "http://example.org/data/resource/" + label + "2"
+				}
+		)));
+		doTestSearch(turtle, queryString, expectedURIs, 1);
+		
+		
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:north (51.3000 0.0000 -1) .", "}");
+		expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll( Arrays.asList((
+				new String[]
+				{
+					    "http://example.org/data/resource/" + label + "1",
+					    "http://example.org/data/resource/" + label + "2"
+				}
+		)));
+		doTestSearch(turtle, queryString, expectedURIs);
+		
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:north (51.3000 0.0000 3) .", "}");
+		expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll( Arrays.asList((
+				new String[]
+				{
+					    "http://example.org/data/resource/" + label + "1",
+					    "http://example.org/data/resource/" + label + "2"
+				}
+		)));
+		doTestSearch(turtle, queryString, expectedURIs);
+		
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:north (51.3000 0.0000 'something not an integer') .", "}");
+		expectedURIs = (new HashSet<String>());
+		doTestSearch(turtle, queryString, expectedURIs);
+	}
+  
+}

http://git-wip-us.apache.org/repos/asf/jena/blob/d6ae87fd/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestSouthPF.java
----------------------------------------------------------------------
diff --git a/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestSouthPF.java b/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestSouthPF.java
index b7a04ef..a2fad14 100644
--- a/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestSouthPF.java
+++ b/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestSouthPF.java
@@ -1,142 +1,142 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.query.spatial.pfunction;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.jena.atlas.lib.StrUtils;
-import org.apache.jena.query.spatial.AbstractTestDatasetWithSpatialIndex;
-import org.junit.Test;
-
-public abstract class AbstractTestSouthPF extends AbstractTestDatasetWithSpatialIndex {
-
-	@Test
-	public void testOneSimpleResult() {
-		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
-				+ RESOURCE_BASE + "testOneSimpleResult>",
-				"   geo:lat '51.1481'^^xsd:float ;",
-				"   geo:long '-0.190278'^^xsd:float ", ".");
-		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:south (51.3000 0.0000 -1) .", "}");
-		Set<String> expectedURIs = (new HashSet<String>());
-		expectedURIs
-				.addAll(Arrays
-						.asList((new String[] { "http://example.org/data/resource/testOneSimpleResult" })));
-		doTestSearch(turtle, queryString, expectedURIs);
-	}
-
-	@Test
-	public void testMultipleResults() {
-		String label = "testMultipleResults";
-		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
-				+ RESOURCE_BASE + label + "1>",
-				"   geo:lat '51.1481'^^xsd:float ;",
-				"   geo:long '-0.190278'^^xsd:float ;" , ".",
-				"<"	+ RESOURCE_BASE + label + "2>",
-				"   geo:lat '51.0123'^^xsd:float ;",
-				"   geo:long '-0.123456'^^xsd:float ;", ".");
-
-		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:south (51.3000 0.0000 -1) .", "}");
-		Set<String> expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll(Arrays.asList((new String[] {
-				"http://example.org/data/resource/" + label + "1",
-				"http://example.org/data/resource/" + label + "2" })));
-		doTestSearch(turtle, queryString, expectedURIs);
-	}
-	
-	@Test
-	public void testArgumentListSize() {
-		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
-				+ RESOURCE_BASE + "testArgumentListSize>",
-				"   geo:lat '51.3827'^^xsd:float ;",
-				"   geo:long '-2.71909'^^xsd:float ", ".");
-		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:south (51.3000) .", "}");
-		doTestSearchThrowException(turtle, queryString);
-		
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:south (51.3000 0.0000 -1 'another argument') .", "}");
-		doTestSearchThrowException(turtle, queryString);
-	}
-	
-  @Test
-	public void testSearchLimitsResults() {
-		String label = "testSearchLimitsResults";
-		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
-				+ RESOURCE_BASE + label + "1>",
-				"   geo:lat '51.1481'^^xsd:float ;",
-				"   geo:long '-0.190278'^^xsd:float ;" , ".",
-				"<"	+ RESOURCE_BASE + label + "2>",
-				"   geo:lat '51.0123'^^xsd:float ;",
-				"   geo:long '-0.123456'^^xsd:float ;", ".");
-		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:south (51.3000 0.0000 1) .", "}");
-		Set<String> expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll( Arrays.asList((
-				new String[]
-				{
-					    "http://example.org/data/resource/" + label + "1",
-					    "http://example.org/data/resource/" + label + "2"
-				}
-		)));
-		doTestSearch(turtle, queryString, expectedURIs, 1);
-		
-		
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:south (51.3000 0.0000 -1) .", "}");
-		expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll( Arrays.asList((
-				new String[]
-				{
-					    "http://example.org/data/resource/" + label + "1",
-					    "http://example.org/data/resource/" + label + "2"
-				}
-		)));
-		doTestSearch(turtle, queryString, expectedURIs);
-		
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:south (51.3000 0.0000 3) .", "}");
-		expectedURIs = (new HashSet<String>());
-		expectedURIs.addAll( Arrays.asList((
-				new String[]
-				{
-					    "http://example.org/data/resource/" + label + "1",
-					    "http://example.org/data/resource/" + label + "2"
-				}
-		)));
-		doTestSearch(turtle, queryString, expectedURIs);
-		
-		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
-				"WHERE {",
-				" ?s spatial:south (51.3000 0.0000 'something not an integer') .", "}");
-		expectedURIs = (new HashSet<String>());
-		doTestSearch(turtle, queryString, expectedURIs);
-	}
-  
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.query.spatial.pfunction;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.jena.atlas.lib.StrUtils;
+import org.apache.jena.query.spatial.AbstractTestDatasetWithSpatialIndex;
+import org.junit.Test;
+
+public abstract class AbstractTestSouthPF extends AbstractTestDatasetWithSpatialIndex {
+
+	@Test
+	public void testOneSimpleResult() {
+		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
+				+ RESOURCE_BASE + "testOneSimpleResult>",
+				"   geo:lat '51.1481'^^xsd:float ;",
+				"   geo:long '-0.190278'^^xsd:float ", ".");
+		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:south (51.3000 0.0000 -1) .", "}");
+		Set<String> expectedURIs = (new HashSet<String>());
+		expectedURIs
+				.addAll(Arrays
+						.asList((new String[] { "http://example.org/data/resource/testOneSimpleResult" })));
+		doTestSearch(turtle, queryString, expectedURIs);
+	}
+
+	@Test
+	public void testMultipleResults() {
+		String label = "testMultipleResults";
+		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
+				+ RESOURCE_BASE + label + "1>",
+				"   geo:lat '51.1481'^^xsd:float ;",
+				"   geo:long '-0.190278'^^xsd:float ;" , ".",
+				"<"	+ RESOURCE_BASE + label + "2>",
+				"   geo:lat '51.0123'^^xsd:float ;",
+				"   geo:long '-0.123456'^^xsd:float ;", ".");
+
+		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:south (51.3000 0.0000 -1) .", "}");
+		Set<String> expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll(Arrays.asList((new String[] {
+				"http://example.org/data/resource/" + label + "1",
+				"http://example.org/data/resource/" + label + "2" })));
+		doTestSearch(turtle, queryString, expectedURIs);
+	}
+	
+	@Test
+	public void testArgumentListSize() {
+		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
+				+ RESOURCE_BASE + "testArgumentListSize>",
+				"   geo:lat '51.3827'^^xsd:float ;",
+				"   geo:long '-2.71909'^^xsd:float ", ".");
+		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:south (51.3000) .", "}");
+		doTestSearchThrowException(turtle, queryString);
+		
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:south (51.3000 0.0000 -1 'another argument') .", "}");
+		doTestSearchThrowException(turtle, queryString);
+	}
+	
+  @Test
+	public void testSearchLimitsResults() {
+		String label = "testSearchLimitsResults";
+		final String turtle = StrUtils.strjoinNL(TURTLE_PROLOG, "<"
+				+ RESOURCE_BASE + label + "1>",
+				"   geo:lat '51.1481'^^xsd:float ;",
+				"   geo:long '-0.190278'^^xsd:float ;" , ".",
+				"<"	+ RESOURCE_BASE + label + "2>",
+				"   geo:lat '51.0123'^^xsd:float ;",
+				"   geo:long '-0.123456'^^xsd:float ;", ".");
+		String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:south (51.3000 0.0000 1) .", "}");
+		Set<String> expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll( Arrays.asList((
+				new String[]
+				{
+					    "http://example.org/data/resource/" + label + "1",
+					    "http://example.org/data/resource/" + label + "2"
+				}
+		)));
+		doTestSearch(turtle, queryString, expectedURIs, 1);
+		
+		
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:south (51.3000 0.0000 -1) .", "}");
+		expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll( Arrays.asList((
+				new String[]
+				{
+					    "http://example.org/data/resource/" + label + "1",
+					    "http://example.org/data/resource/" + label + "2"
+				}
+		)));
+		doTestSearch(turtle, queryString, expectedURIs);
+		
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:south (51.3000 0.0000 3) .", "}");
+		expectedURIs = (new HashSet<String>());
+		expectedURIs.addAll( Arrays.asList((
+				new String[]
+				{
+					    "http://example.org/data/resource/" + label + "1",
+					    "http://example.org/data/resource/" + label + "2"
+				}
+		)));
+		doTestSearch(turtle, queryString, expectedURIs);
+		
+		queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s",
+				"WHERE {",
+				" ?s spatial:south (51.3000 0.0000 'something not an integer') .", "}");
+		expectedURIs = (new HashSet<String>());
+		doTestSearch(turtle, queryString, expectedURIs);
+	}
+  
+}