HSEARCH-2434 Fix spatial tests on ES 5

The bounding box query doesn't include geo points located on the left and bottom sides of the box as of ES 5.
hibernate · Mar 21, 2017 · 66bd1c4 · 66bd1c4
1 parent 58c7ada
commit 66bd1c4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/...csearch/src/test/java/org/hibernate/search/elasticsearch/test/ElasticsearchSpatialIT.java b/...csearch/src/test/java/org/hibernate/search/elasticsearch/test/ElasticsearchSpatialIT.java
@@ -121,7 +121,7 @@ public void testBoundingBoxQuery() {
 							"'location' : {\n" +
 								"'top_left' : {\n" +
 									"'lat' : 24,\n" +
-									"'lon' : 31.9\n" +
+									"'lon' : 31.8\n" +
 								"},\n" +
 								"'bottom_right' : {\n" +
 									"'lat' : 23.8,\n" +

diff --git a/orm/src/test/java/org/hibernate/search/test/jpa/SpatialQueryingJPATest.java b/orm/src/test/java/org/hibernate/search/test/jpa/SpatialQueryingJPATest.java
@@ -34,6 +34,9 @@
  */
 public class SpatialQueryingJPATest extends JPATestCase {
 
+	// Use a large, but reasonable distance: Elasticsearch 5 can't handle Double.MAX_VALUE for instance
+	private static final double LARGE_DISTANCE_KM = 40_000;
+
 	@After
 	public void cleanup() {
 		withinEntityManager( factory, em -> {
@@ -118,7 +121,7 @@ public void testDistanceProjectionWithoutSortMissingCoordinates() throws Excepti
 				final QueryBuilder builder = em.getSearchFactory().buildQueryBuilder().forEntity( POI.class ).get();
 
 				org.apache.lucene.search.Query luceneQuery = builder.spatial().onField( "location" )
-						.within( Double.MAX_VALUE, Unit.KM ).ofLatitude( centerLatitude ).andLongitude( centerLongitude ).createQuery();
+						.within( LARGE_DISTANCE_KM, Unit.KM ).ofLatitude( centerLatitude ).andLongitude( centerLongitude ).createQuery();
 
 				FullTextQuery hibQuery = em.createFullTextQuery( luceneQuery, POI.class );
 				hibQuery.setProjection( FullTextQuery.THIS, FullTextQuery.SPATIAL_DISTANCE );