From bcba9f825c668515b891561376f69ac313e44a15 Mon Sep 17 00:00:00 2001 From: Igor Motov Date: Wed, 3 Oct 2018 09:58:16 -0400 Subject: [PATCH 1/2] Tests: Add checks to GeoDistanceQueryBuilderTests Adds checks for parsed geo distance query. It is a bit hackish since it compares with query's toString() output, but it is better than no checks. The parsed query itself has default visibility, so we cannot access it here unless we move the test to org.apache.lucene.document package. Fixes #34043 --- .../query/GeoDistanceQueryBuilderTests.java | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/server/src/test/java/org/elasticsearch/index/query/GeoDistanceQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/GeoDistanceQueryBuilderTests.java index 3a01125122460..68425ef2d7bac 100644 --- a/server/src/test/java/org/elasticsearch/index/query/GeoDistanceQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/GeoDistanceQueryBuilderTests.java @@ -156,7 +156,7 @@ public void testParsingAndToQuery1() throws IOException { " }\n" + " }\n" + "}\n"; - assertGeoDistanceRangeQuery(query, 40, -70, 12, DistanceUnit.DEFAULT); + assertGeoDistanceRangeQuery(query, 40, -70, 12, DistanceUnit.MILES); } public void testParsingAndToQuery2() throws IOException { @@ -166,7 +166,7 @@ public void testParsingAndToQuery2() throws IOException { " \"" + GEO_POINT_FIELD_NAME + "\":[-70, 40]\n" + " }\n" + "}\n"; - assertGeoDistanceRangeQuery(query, 40, -70, 12, DistanceUnit.DEFAULT); + assertGeoDistanceRangeQuery(query, 40, -70, 12, DistanceUnit.MILES); } public void testParsingAndToQuery3() throws IOException { @@ -176,7 +176,7 @@ public void testParsingAndToQuery3() throws IOException { " \"" + GEO_POINT_FIELD_NAME + "\":\"40, -70\"\n" + " }\n" + "}\n"; - assertGeoDistanceRangeQuery(query, 40, -70, 12, DistanceUnit.DEFAULT); + assertGeoDistanceRangeQuery(query, 40, -70, 12, DistanceUnit.MILES); } public void testParsingAndToQuery4() throws IOException { @@ -186,7 +186,8 @@ public void testParsingAndToQuery4() throws IOException { " \"" + GEO_POINT_FIELD_NAME + "\":\"drn5x1g8cu2y\"\n" + " }\n" + "}\n"; - assertGeoDistanceRangeQuery(query, 40, -70, 12, DistanceUnit.DEFAULT); + GeoPoint geoPoint = GeoPoint.fromGeohash("drn5x1g8cu2y"); + assertGeoDistanceRangeQuery(query, geoPoint.getLat(), geoPoint.getLon(), 12, DistanceUnit.MILES); } public void testParsingAndToQuery5() throws IOException { @@ -200,7 +201,7 @@ public void testParsingAndToQuery5() throws IOException { " }\n" + " }\n" + "}\n"; - assertGeoDistanceRangeQuery(query, 40, -70, 12, DistanceUnit.DEFAULT); + assertGeoDistanceRangeQuery(query, 40, -70, 12, DistanceUnit.MILES); } public void testParsingAndToQuery6() throws IOException { @@ -214,7 +215,7 @@ public void testParsingAndToQuery6() throws IOException { " }\n" + " }\n" + "}\n"; - assertGeoDistanceRangeQuery(query, 40, -70, 12, DistanceUnit.DEFAULT); + assertGeoDistanceRangeQuery(query, 40, -70, 12, DistanceUnit.MILES); } public void testParsingAndToQuery7() throws IOException { @@ -227,7 +228,7 @@ public void testParsingAndToQuery7() throws IOException { " }\n" + " }\n" + "}\n"; - assertGeoDistanceRangeQuery(query, 40, -70, 0.012, DistanceUnit.DEFAULT); + assertGeoDistanceRangeQuery(query, 40, -70, 19.312128, DistanceUnit.DEFAULT); } public void testParsingAndToQuery8() throws IOException { @@ -240,7 +241,7 @@ public void testParsingAndToQuery8() throws IOException { " }\n" + " }\n" + "}\n"; - assertGeoDistanceRangeQuery(query, 40, -70, 12, DistanceUnit.KILOMETERS); + assertGeoDistanceRangeQuery(query, 40, -70, 19.312128, DistanceUnit.DEFAULT); } public void testParsingAndToQuery9() throws IOException { @@ -254,7 +255,7 @@ public void testParsingAndToQuery9() throws IOException { " }\n" + " }\n" + "}\n"; - assertGeoDistanceRangeQuery(query, 40, -70, 12, DistanceUnit.DEFAULT); + assertGeoDistanceRangeQuery(query, 40, -70, 19.312128, DistanceUnit.KILOMETERS); } public void testParsingAndToQuery10() throws IOException { @@ -268,7 +269,7 @@ public void testParsingAndToQuery10() throws IOException { " }\n" + " }\n" + "}\n"; - assertGeoDistanceRangeQuery(query, 40, -70, 12, DistanceUnit.DEFAULT); + assertGeoDistanceRangeQuery(query, 40, -70, 19.312128, DistanceUnit.KILOMETERS); } public void testParsingAndToQuery11() throws IOException { @@ -281,7 +282,7 @@ public void testParsingAndToQuery11() throws IOException { " }\n" + " }\n" + "}\n"; - assertGeoDistanceRangeQuery(query, 40, -70, 12, DistanceUnit.DEFAULT); + assertGeoDistanceRangeQuery(query, 40, -70, 19.312128, DistanceUnit.KILOMETERS); } public void testParsingAndToQuery12() throws IOException { @@ -295,13 +296,14 @@ public void testParsingAndToQuery12() throws IOException { " }\n" + " }\n" + "}\n"; - assertGeoDistanceRangeQuery(query, 40, -70, 12, DistanceUnit.DEFAULT); + assertGeoDistanceRangeQuery(query, 40, -70, 12, DistanceUnit.MILES); } private void assertGeoDistanceRangeQuery(String query, double lat, double lon, double distance, DistanceUnit distanceUnit) throws IOException { - parseQuery(query).toQuery(createShardContext()); - // TODO: what can we check? See https://github.com/elastic/elasticsearch/issues/34043 + Query parsedQuery = parseQuery(query).toQuery(createShardContext()); + assertEquals(parsedQuery.toString(), + "mapped_geo_point:" + lat + "," + lon + " +/- " + distanceUnit.toMeters(distance) + " meters"); } public void testFromJson() throws IOException { From 63fc08d49740f67d8012b4ce2a429954d2abf115 Mon Sep 17 00:00:00 2001 From: Igor Motov Date: Thu, 18 Oct 2018 10:20:09 -0400 Subject: [PATCH 2/2] Add a comment requested by @cbuescher --- .../elasticsearch/index/query/GeoDistanceQueryBuilderTests.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/src/test/java/org/elasticsearch/index/query/GeoDistanceQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/GeoDistanceQueryBuilderTests.java index 68425ef2d7bac..1312486ff6994 100644 --- a/server/src/test/java/org/elasticsearch/index/query/GeoDistanceQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/GeoDistanceQueryBuilderTests.java @@ -302,6 +302,8 @@ public void testParsingAndToQuery12() throws IOException { private void assertGeoDistanceRangeQuery(String query, double lat, double lon, double distance, DistanceUnit distanceUnit) throws IOException { Query parsedQuery = parseQuery(query).toQuery(createShardContext()); + // The parsedQuery contains IndexOrDocValuesQuery, which wraps LatLonPointDistanceQuery which in turn has default visibility, + // so we cannot access its fields directly to check and have to use toString() here instead. assertEquals(parsedQuery.toString(), "mapped_geo_point:" + lat + "," + lon + " +/- " + distanceUnit.toMeters(distance) + " meters"); }