You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2015/10/29 10:46:06 UTC
svn commit: r1711204 - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/spatial/ lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/
Author: dweiss
Date: Thu Oct 29 09:46:06 2015
New Revision: 1711204
URL: http://svn.apache.org/viewvc?rev=1711204&view=rev
Log:
LUCENE-6867: marking certain tests as ignored because of incompatibility in RandomizedTesting versions.
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/spatial/ (props changed)
lucene/dev/branches/branch_5x/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeRectRelationTestCase.java
lucene/dev/branches/branch_5x/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/RandomizedShapeTestCase.java
Modified: lucene/dev/branches/branch_5x/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeRectRelationTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeRectRelationTestCase.java?rev=1711204&r1=1711203&r2=1711204&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeRectRelationTestCase.java (original)
+++ lucene/dev/branches/branch_5x/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeRectRelationTestCase.java Thu Oct 29 09:46:06 2015
@@ -48,10 +48,6 @@ public abstract class Geo3dShapeRectRela
@Rule
public final TestLog testLog = TestLog.instance;
- protected static Random random() {
- return RandomizedContext.current().getRandom();
- }
-
protected final PlanetModel planetModel;
public Geo3dShapeRectRelationTestCase(PlanetModel planetModel) {
@@ -117,6 +113,7 @@ public abstract class Geo3dShapeRectRela
}
}
+ @AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/LUCENE-6867")
@Test
public void testGeoCircleRect() {
new Geo3dRectIntersectionTestHelper(ctx) {
@@ -139,6 +136,7 @@ public abstract class Geo3dShapeRectRela
}.testRelateWithRectangle();
}
+ @AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/LUCENE-6867")
@Test
public void testGeoBBoxRect() {
new Geo3dRectIntersectionTestHelper(ctx) {
@@ -173,6 +171,7 @@ public abstract class Geo3dShapeRectRela
}.testRelateWithRectangle();
}
+ @AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/LUCENE-6867")
@Test
public void testGeoPolygonRect() {
new Geo3dRectIntersectionTestHelper(ctx) {
@@ -216,6 +215,7 @@ public abstract class Geo3dShapeRectRela
}.testRelateWithRectangle();
}
+ @AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/LUCENE-6867")
@Test
public void testGeoPathRect() {
new Geo3dRectIntersectionTestHelper(ctx) {
Modified: lucene/dev/branches/branch_5x/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/RandomizedShapeTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/RandomizedShapeTestCase.java?rev=1711204&r1=1711203&r2=1711204&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/RandomizedShapeTestCase.java (original)
+++ lucene/dev/branches/branch_5x/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/RandomizedShapeTestCase.java Thu Oct 29 09:46:06 2015
@@ -18,7 +18,6 @@ package org.apache.lucene.spatial.spatia
*/
-import com.carrotsearch.randomizedtesting.RandomizedTest;
import com.spatial4j.core.context.SpatialContext;
import com.spatial4j.core.distance.DistanceUtils;
import com.spatial4j.core.shape.Circle;
@@ -31,11 +30,15 @@ import com.spatial4j.core.shape.impl.Ran
import static com.spatial4j.core.shape.SpatialRelation.CONTAINS;
import static com.spatial4j.core.shape.SpatialRelation.WITHIN;
+import org.apache.lucene.util.LuceneTestCase;
+
+import static com.carrotsearch.randomizedtesting.RandomizedTest.*;
+
/**
* A base test class with utility methods to help test shapes.
* Extends from RandomizedTest.
*/
-public abstract class RandomizedShapeTestCase extends RandomizedTest {
+public abstract class RandomizedShapeTestCase extends LuceneTestCase {
protected static final double EPS = 10e-9;