Fix assertion precision for legacy GeoDistanceRangeQuery tests

nknize · nknize · commit 9ed77afe1df0 · 2015-11-18T14:09:27.000-06:00
This bug existed for GeoDistanceRangeQuery exclusion limits only (e.g., min/max included == false). closes #14838
diff --git a/core/src/test/java/org/elasticsearch/index/query/GeoDistanceRangeQueryTests.java b/core/src/test/java/org/elasticsearch/index/query/GeoDistanceRangeQueryTests.java
@@ -146,7 +146,7 @@ private void assertLegacyQuery(GeoDistanceRangeQueryBuilder queryBuilder, Query
             }
             double fromSlop = Math.abs(fromValue) / 1000;
             if (queryBuilder.includeLower() == false) {
-                fromSlop = NumericUtils.sortableLongToDouble((NumericUtils.doubleToSortableLong(fromValue) + 1L));
+                fromSlop = NumericUtils.sortableLongToDouble((NumericUtils.doubleToSortableLong(Math.abs(fromValue)) + 1L)) / 1000.0;
             }
             assertThat(geoQuery.minInclusiveDistance(), closeTo(fromValue, fromSlop));
         }
@@ -160,7 +160,7 @@ private void assertLegacyQuery(GeoDistanceRangeQueryBuilder queryBuilder, Query
             }
             double toSlop = Math.abs(toValue) / 1000;
             if (queryBuilder.includeUpper() == false) {
-                toSlop = NumericUtils.sortableLongToDouble((NumericUtils.doubleToSortableLong(toValue) + 1L));
+                toSlop = NumericUtils.sortableLongToDouble((NumericUtils.doubleToSortableLong(Math.abs(toValue)) - 1L)) / 1000.0;
             }
             assertThat(geoQuery.maxInclusiveDistance(), closeTo(toValue, toSlop));
         }

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ private void assertLegacyQuery(GeoDistanceRangeQueryBuilder queryBuilder, Query`
`146`	`146`	`}`
`147`	`147`	`double fromSlop = Math.abs(fromValue) / 1000;`
`148`	`148`	`if (queryBuilder.includeLower() == false) {`
`149`		`- fromSlop = NumericUtils.sortableLongToDouble((NumericUtils.doubleToSortableLong(fromValue) + 1L));`
	`149`	`+ fromSlop = NumericUtils.sortableLongToDouble((NumericUtils.doubleToSortableLong(Math.abs(fromValue)) + 1L)) / 1000.0;`
`150`	`150`	`}`
`151`	`151`	`assertThat(geoQuery.minInclusiveDistance(), closeTo(fromValue, fromSlop));`
`152`	`152`	`}`
`@@ -160,7 +160,7 @@ private void assertLegacyQuery(GeoDistanceRangeQueryBuilder queryBuilder, Query`
`160`	`160`	`}`
`161`	`161`	`double toSlop = Math.abs(toValue) / 1000;`
`162`	`162`	`if (queryBuilder.includeUpper() == false) {`
`163`		`- toSlop = NumericUtils.sortableLongToDouble((NumericUtils.doubleToSortableLong(toValue) + 1L));`
	`163`	`+ toSlop = NumericUtils.sortableLongToDouble((NumericUtils.doubleToSortableLong(Math.abs(toValue)) - 1L)) / 1000.0;`
`164`	`164`	`}`
`165`	`165`	`assertThat(geoQuery.maxInclusiveDistance(), closeTo(toValue, toSlop));`
`166`	`166`	`}`