cleanup and add specific point tests

Author: talevy

server/src/test/java/org/elasticsearch/common/geo/Point2DTests.java

@@ -42,11 +42,15 @@ public void testOnePoint() throws IOException {
         assertThat(reader.getExtent(), equalTo(Extent.fromPoint(x, y)));
         assertThat(reader.getExtent(), equalTo(reader.getExtent()));
         assertRelation(GeoRelation.QUERY_CROSSES, reader, Extent.fromPoint(x, y));
-        assertRelation(GeoRelation.QUERY_CROSSES, reader, Extent.fromPoints(x, y, x + randomIntBetween(1, 10), y + randomIntBetween(1, 10)));
-        assertRelation(GeoRelation.QUERY_CROSSES, reader, Extent.fromPoints(x - randomIntBetween(1, 10), y - randomIntBetween(1, 10), x, y));
-        assertRelation(GeoRelation.QUERY_CROSSES, reader, Extent.fromPoints(x - randomIntBetween(1, 10), y - randomIntBetween(1, 10),
+        assertRelation(GeoRelation.QUERY_CROSSES, reader,
+            Extent.fromPoints(x, y, x + randomIntBetween(1, 10), y + randomIntBetween(1, 10)));
+        assertRelation(GeoRelation.QUERY_CROSSES, reader,
+            Extent.fromPoints(x - randomIntBetween(1, 10), y - randomIntBetween(1, 10), x, y));
+        assertRelation(GeoRelation.QUERY_CROSSES, reader,
+            Extent.fromPoints(x - randomIntBetween(1, 10), y - randomIntBetween(1, 10),
             x + randomIntBetween(1, 10), y + randomIntBetween(1, 10)));
-        assertRelation(GeoRelation.QUERY_DISJOINT, reader, Extent.fromPoints(x - randomIntBetween(10, 100), y - randomIntBetween(10, 100),
+        assertRelation(GeoRelation.QUERY_DISJOINT, reader,
+            Extent.fromPoints(x - randomIntBetween(10, 100), y - randomIntBetween(10, 100),
             x - randomIntBetween(1, 10), y - randomIntBetween(1, 10)));
     }
 

server/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoGridTilerTests.java

@@ -38,7 +38,6 @@
 import static org.elasticsearch.common.geo.GeoTestUtils.geometryTreeReader;
 import static org.hamcrest.Matchers.equalTo;
 
-// TODO(talevy): more tests
 public class GeoGridTilerTests extends ESTestCase {
     private static final GeoGridTiler.GeoTileGridTiler GEOTILE = GeoGridTiler.GeoTileGridTiler.INSTANCE;
     private static final GeoGridTiler.GeoHashGridTiler GEOHASH = GeoGridTiler.GeoHashGridTiler.INSTANCE;
@@ -120,6 +119,24 @@ public void testGeoTileSetValuesBruteAndRecursivePolygon() throws Exception {
         assertArrayEquals(recursiveValues, bruteForceValues);
     }
 
+    public void testGeoTileSetValuesBruteAndRecursivePoints() throws Exception {
+        int precision = randomIntBetween(0, 10);
+        GeoShapeIndexer indexer = new GeoShapeIndexer(true, "test");
+        Geometry geometry = randomBoolean() ? GeometryTestUtils.randomPoint(false) : GeometryTestUtils.randomMultiPoint(false);
+        geometry = indexer.prepareForIndexing(geometry);
+        GeometryTreeReader reader = geometryTreeReader(geometry, GeoShapeCoordinateEncoder.INSTANCE);
+        MultiGeoValues.GeoShapeValue value = new MultiGeoValues.GeoShapeValue(reader);
+        int upperBound = (int) GEOTILE.getBoundingTileCount(value, precision);
+        long[] recursiveValues = new long[upperBound];
+        long[] bruteForceValues = new long[upperBound];
+        int recursiveCount = GEOTILE.setValues(recursiveValues, value, precision);
+        int bruteForceCount = GEOTILE.setValuesByBruteForceScan(bruteForceValues, value, precision);
+        Arrays.sort(recursiveValues);
+        Arrays.sort(bruteForceValues);
+        assertThat(recursiveCount, equalTo(bruteForceCount));
+        assertArrayEquals(recursiveValues, bruteForceValues);
+    }
+
     public void testGeoHash() throws Exception {
         double x = randomDouble();
         double y = randomDouble();