Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-5017: SpatialOpRecursivePrefixTreeTest "Contains" test bug. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1487098 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
David Wayne Smiley 2013-05-28 20:23:39 +00:00
parent 5ad879d348
commit 02a14e43f6
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lucene/spatial/src/test/org/apache/lucene/spatial/prefix/SpatialOpRecursivePrefixTreeTest.java
View File

@ -58,6 +58,8 @@ import static com.spatial4j.core.shape.SpatialRelation.WITHIN;
public class SpatialOpRecursivePrefixTreeTest extends StrategyTestCase {
static final int ITERATIONS = 10;//Test Iterations
private SpatialPrefixTree grid;
@Before
@ -81,28 +83,28 @@ public class SpatialOpRecursivePrefixTreeTest extends StrategyTestCase {
}
@Test
@Repeat(iterations = 10)
@Repeat(iterations = ITERATIONS)
public void testIntersects() throws IOException {
mySetup(-1);
doTest(SpatialOperation.Intersects);
}
@Test
@Repeat(iterations = 10)
@Repeat(iterations = ITERATIONS)
public void testWithin() throws IOException {
mySetup(-1);
doTest(SpatialOperation.IsWithin);
}
@Test
@Repeat(iterations = 10)
@Repeat(iterations = ITERATIONS)
public void testContains() throws IOException {
mySetup(-1);
doTest(SpatialOperation.Contains);
}
@Test
@Repeat(iterations = 10)
@Repeat(iterations = ITERATIONS)
public void testDisjoint() throws IOException {
mySetup(-1);
doTest(SpatialOperation.IsDisjointTo);
@ -334,9 +336,10 @@ public class SpatialOpRecursivePrefixTreeTest extends StrategyTestCase {
@Override
public SpatialRelation relate(Shape other) {
SpatialRelation r = relateApprox(other);
if (r != INTERSECTS)
if (r != INTERSECTS && !(r == WITHIN && biasContainsThenWithin))
return r;
//See if the correct answer is actually Contains
//See if the correct answer is actually Contains, when the indexed shapes are adjacent,
// creating a larger shape that contains the input shape.
Rectangle oRect = (Rectangle)other;
boolean pairTouches = shape1.relate(shape2).intersects();
if (!pairTouches)