You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ds...@apache.org on 2014/07/09 17:55:01 UTC
svn commit: r1609209 -
/lucene/dev/trunk/lucene/spatial/src/test/org/apache/lucene/spatial/bbox/TestBBoxStrategy.java
Author: dsmiley
Date: Wed Jul 9 15:55:01 2014
New Revision: 1609209
URL: http://svn.apache.org/r1609209
Log:
LUCENE-5714: Enhance TestBBoxStrategy with/without docvalues & indexed
Modified:
lucene/dev/trunk/lucene/spatial/src/test/org/apache/lucene/spatial/bbox/TestBBoxStrategy.java
Modified: lucene/dev/trunk/lucene/spatial/src/test/org/apache/lucene/spatial/bbox/TestBBoxStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/spatial/src/test/org/apache/lucene/spatial/bbox/TestBBoxStrategy.java?rev=1609209&r1=1609208&r2=1609209&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/spatial/src/test/org/apache/lucene/spatial/bbox/TestBBoxStrategy.java (original)
+++ lucene/dev/trunk/lucene/spatial/src/test/org/apache/lucene/spatial/bbox/TestBBoxStrategy.java Wed Jul 9 15:55:01 2014
@@ -24,6 +24,7 @@ import com.spatial4j.core.distance.Dista
import com.spatial4j.core.shape.Rectangle;
import com.spatial4j.core.shape.Shape;
import com.spatial4j.core.shape.impl.RectangleImpl;
+import org.apache.lucene.document.FieldType;
import org.apache.lucene.spatial.SpatialMatchConcern;
import org.apache.lucene.spatial.prefix.RandomSpatialOpStrategyTestCase;
import org.apache.lucene.spatial.query.SpatialOperation;
@@ -95,7 +96,13 @@ public class TestBBoxStrategy extends Ra
this.ctx = factory.newSpatialContext();
}
this.strategy = new BBoxStrategy(ctx, "bbox");
-
+ //test we can disable docValues for predicate tests
+ if (random().nextBoolean()) {
+ BBoxStrategy bboxStrategy = (BBoxStrategy) strategy;
+ FieldType fieldType = new FieldType(bboxStrategy.getFieldType());
+ fieldType.setDocValueType(null);
+ bboxStrategy.setFieldType(fieldType);
+ }
for (SpatialOperation operation : SpatialOperation.values()) {
if (operation == SpatialOperation.Overlaps)
continue;//unsupported
@@ -244,10 +251,17 @@ public class TestBBoxStrategy extends Ra
public void testAreaValueSource() throws IOException {
setupGeo();
+ //test we can disable indexed for this test
+ BBoxStrategy bboxStrategy = (BBoxStrategy) strategy;
+ if (random().nextBoolean()) {
+ FieldType fieldType = new FieldType(bboxStrategy.getFieldType());
+ fieldType.setIndexed(false);
+ bboxStrategy.setFieldType(fieldType);
+ }
+
adoc("100", ctx.makeRectangle(0, 20, 40, 80));
adoc("999", (Shape) null);
commit();
- BBoxStrategy bboxStrategy = (BBoxStrategy) strategy;
checkValueSource(new ShapeAreaValueSource(bboxStrategy.makeShapeValueSource(), ctx, false),
new float[]{800f, 0f}, 0f);
checkValueSource(new ShapeAreaValueSource(bboxStrategy.makeShapeValueSource(), ctx, true),//geo