[CI] Fixes testQueryRandomGeoCollection failure again (#39275)

Moves the check for tiny polygons earlier in the test. It turned out
that polygons can be so tiny that we cannot even figure out their
orientation.

Relates to #37356
This commit is contained in:
Igor Motov 2019-02-25 12:56:19 -05:00
parent 1ed3407930
commit d5046b1c25
1 changed files with 4 additions and 3 deletions

View File

@ -420,6 +420,10 @@ public class GeoShapeQueryTests extends ESSingleNodeTestCase {
} }
} }
org.apache.lucene.geo.Polygon randomPoly = GeoTestUtil.nextPolygon(); org.apache.lucene.geo.Polygon randomPoly = GeoTestUtil.nextPolygon();
assumeTrue("Skipping the check for the polygon with a degenerated dimension",
randomPoly.maxLat - randomPoly.minLat > 8.4e-8 && randomPoly.maxLon - randomPoly.minLon > 8.4e-8);
CoordinatesBuilder cb = new CoordinatesBuilder(); CoordinatesBuilder cb = new CoordinatesBuilder();
for (int i = 0; i < randomPoly.numPoints(); ++i) { for (int i = 0; i < randomPoly.numPoints(); ++i) {
cb.coordinate(randomPoly.getPolyLon(i), randomPoly.getPolyLat(i)); cb.coordinate(randomPoly.getPolyLon(i), randomPoly.getPolyLat(i));
@ -448,9 +452,6 @@ public class GeoShapeQueryTests extends ESSingleNodeTestCase {
geoShapeQueryBuilder.relation(ShapeRelation.INTERSECTS); geoShapeQueryBuilder.relation(ShapeRelation.INTERSECTS);
SearchResponse result = client().prepareSearch("test").setQuery(geoShapeQueryBuilder).get(); SearchResponse result = client().prepareSearch("test").setQuery(geoShapeQueryBuilder).get();
assertSearchResponse(result); assertSearchResponse(result);
assumeTrue("Skipping the check for the polygon with a degenerated dimension until "
+" https://issues.apache.org/jira/browse/LUCENE-8634 is fixed",
randomPoly.maxLat - randomPoly.minLat > 8.4e-8 && randomPoly.maxLon - randomPoly.minLon > 8.4e-8);
assertTrue("query: " + geoShapeQueryBuilder.toString() + " doc: " + Strings.toString(docSource), assertTrue("query: " + geoShapeQueryBuilder.toString() + " doc: " + Strings.toString(docSource),
result.getHits().getTotalHits().value > 0); result.getHits().getTotalHits().value > 0);
} }