From bf3f960e76049f3acca56e1ed8d50580dab51fb8 Mon Sep 17 00:00:00 2001
From: Karl Wright <DaddyWri@gmail.com>
Date: Sat, 16 Apr 2016 04:07:10 -0400
Subject: [PATCH] LUCENE-7225: Fix Geo3DRelations test to use the correct
 measure of 'truth' in assessing relationships.

---
 .../lucene/spatial3d/TestGeo3DPoint.java       | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/TestGeo3DPoint.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/TestGeo3DPoint.java
index 330a15edc40..48e7f0a851f 100644
--- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/TestGeo3DPoint.java
+++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/TestGeo3DPoint.java
@@ -195,10 +195,12 @@ public class TestGeo3DPoint extends LuceneTestCase {
     }
 
     GeoPoint[] docs = new GeoPoint[numDocs];
+    GeoPoint[] unquantizedDocs = new GeoPoint[numDocs];
     for(int docID=0;docID<numDocs;docID++) {
-      docs[docID] = quantize(new GeoPoint(PlanetModel.WGS84, toRadians(GeoTestUtil.nextLatitude()), toRadians(GeoTestUtil.nextLongitude())));
+      unquantizedDocs[docID] = new GeoPoint(PlanetModel.WGS84, toRadians(GeoTestUtil.nextLatitude()), toRadians(GeoTestUtil.nextLongitude()));
+      docs[docID] = quantize(unquantizedDocs[docID]);
       if (VERBOSE) {
-        System.out.println("  doc=" + docID + ": " + docs[docID]);
+        System.out.println("  doc=" + docID + ": " + docs[docID] + "; unquantized: "+unquantizedDocs[docID]);
       }
     }
 
@@ -253,15 +255,18 @@ public class TestGeo3DPoint extends LuceneTestCase {
           // Leaf cell: brute force check all docs that fall within this cell:
           for(int docID=0;docID<numDocs;docID++) {
             GeoPoint point = docs[docID];
+            GeoPoint mappedPoint = unquantizedDocs[docID];
+            boolean pointWithinShape = shape.isWithin(point);
+            boolean mappedPointWithinShape = shape.isWithin(mappedPoint);
             if (cell.contains(point)) {
-              if (shape.isWithin(point)) {
+              if (mappedPointWithinShape) {
                 if (VERBOSE) {
-                  log.println("    check doc=" + docID + ": match!");
+                  log.println("    check doc=" + docID + ": match!  Actual quantized point within: "+pointWithinShape);
                 }
                 hits.add(docID);
               } else {
                 if (VERBOSE) {
-                  log.println("    check doc=" + docID + ": no match");
+                  log.println("    check doc=" + docID + ": no match.  Quantized point within: "+pointWithinShape);
                 }
               }
             }
@@ -416,7 +421,8 @@ public class TestGeo3DPoint extends LuceneTestCase {
       boolean fail = false;
       for(int docID=0;docID<numDocs;docID++) {
         GeoPoint point = docs[docID];
-        boolean expected = shape.isWithin(point);
+        GeoPoint mappedPoint = unquantizedDocs[docID];
+        boolean expected = shape.isWithin(mappedPoint);
         boolean actual = hits.contains(docID);
         if (actual != expected) {
           if (actual) {