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

LUCENE-6899: upgrade randomizedtesting to version 2.3.1 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1714945 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dawid Weiss 2015-11-18 07:50:02 +00:00
parent a03ed96eae
commit d07124ef6f
13 changed files with 22 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev-tools/idea/.idea/libraries/JUnit.xml
View File

@ -2,7 +2,7 @@
<library name="JUnit"> <library name="JUnit">
<CLASSES> <CLASSES>
<root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/junit-4.10.jar!/" /> <root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/junit-4.10.jar!/" />
<root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/randomizedtesting-runner-2.2.0.jar!/" /> <root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/randomizedtesting-runner-2.3.1.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />

2
lucene/CHANGES.txt
View File

@ -294,6 +294,8 @@ Bug Fixes
Other Other
* LUCENE-6899: Upgrade randomizedtesting to 2.3.1. (Dawid Weiss)
* LUCENE-6478: Test execution can hang with java.security.debug. (Dawid Weiss) * LUCENE-6478: Test execution can hang with java.security.debug. (Dawid Weiss)
* LUCENE-6862: Upgrade of RandomizedRunner to version 2.2.0. (Dawid Weiss) * LUCENE-6862: Upgrade of RandomizedRunner to version 2.2.0. (Dawid Weiss)

2
lucene/ivy-versions.properties
View File

@ -7,7 +7,7 @@
/cglib/cglib-nodep = 2.2 /cglib/cglib-nodep = 2.2
/com.adobe.xmp/xmpcore = 5.1.2 /com.adobe.xmp/xmpcore = 5.1.2
com.carrotsearch.randomizedtesting.version = 2.2.0 com.carrotsearch.randomizedtesting.version = 2.3.1
/com.carrotsearch.randomizedtesting/junit4-ant = ${com.carrotsearch.randomizedtesting.version} /com.carrotsearch.randomizedtesting/junit4-ant = ${com.carrotsearch.randomizedtesting.version}
/com.carrotsearch.randomizedtesting/randomizedtesting-runner = ${com.carrotsearch.randomizedtesting.version} /com.carrotsearch.randomizedtesting/randomizedtesting-runner = ${com.carrotsearch.randomizedtesting.version}

1
lucene/licenses/junit4-ant-2.2.0.jar.sha1
View File

@ -1 +0,0 @@
0d401c9c729deccd5db8a5df3102eb18793c2224

1
lucene/licenses/junit4-ant-2.3.1.jar.sha1 Normal file
View File

@ -0,0 +1 @@
054cdf1533c6362812605dab2a984494930108d6

1
lucene/licenses/randomizedtesting-runner-2.2.0.jar.sha1
View File

@ -1 +0,0 @@
60de504132241be049564a3a34fd7dcc296e2ef0

1
lucene/licenses/randomizedtesting-runner-2.3.1.jar.sha1 Normal file
View File

@ -0,0 +1 @@
a6e5446a14e44802b91983b3e5c2d56e1d1c424a

35
lucene/spatial/src/test/org/apache/lucene/spatial/DistanceStrategyTest.java
View File

@ -22,7 +22,6 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import com.carrotsearch.randomizedtesting.annotations.Name;
import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
import com.spatial4j.core.context.SpatialContext; import com.spatial4j.core.context.SpatialContext;
import com.spatial4j.core.shape.Point; import com.spatial4j.core.shape.Point;
@ -41,8 +40,7 @@ import org.apache.lucene.spatial.vector.PointVectorStrategy;
import org.junit.Test; import org.junit.Test;
public class DistanceStrategyTest extends StrategyTestCase { public class DistanceStrategyTest extends StrategyTestCase {
@ParametersFactory(argumentFormatting = "strategy=%s")
@ParametersFactory
public static Iterable<Object[]> parameters() { public static Iterable<Object[]> parameters() {
List<Object[]> ctorArgs = new ArrayList<>(); List<Object[]> ctorArgs = new ArrayList<>();
@ -52,46 +50,29 @@ public class DistanceStrategyTest extends StrategyTestCase {
grid = new QuadPrefixTree(ctx,25); grid = new QuadPrefixTree(ctx,25);
strategy = new RecursivePrefixTreeStrategy(grid, "recursive_quad"); strategy = new RecursivePrefixTreeStrategy(grid, "recursive_quad");
ctorArgs.add(new Object[]{new Param(strategy)}); ctorArgs.add(new Object[]{strategy.getFieldName(), strategy});
grid = new GeohashPrefixTree(ctx,12); grid = new GeohashPrefixTree(ctx,12);
strategy = new TermQueryPrefixTreeStrategy(grid, "termquery_geohash"); strategy = new TermQueryPrefixTreeStrategy(grid, "termquery_geohash");
ctorArgs.add(new Object[]{new Param(strategy)}); ctorArgs.add(new Object[]{strategy.getFieldName(), strategy});
grid = new PackedQuadPrefixTree(ctx,25); grid = new PackedQuadPrefixTree(ctx,25);
strategy = new RecursivePrefixTreeStrategy(grid, "recursive_packedquad"); strategy = new RecursivePrefixTreeStrategy(grid, "recursive_packedquad");
ctorArgs.add(new Object[]{new Param(strategy)}); ctorArgs.add(new Object[]{strategy.getFieldName(), strategy});
strategy = new PointVectorStrategy(ctx, "pointvector"); strategy = new PointVectorStrategy(ctx, "pointvector");
ctorArgs.add(new Object[]{new Param(strategy)}); ctorArgs.add(new Object[]{strategy.getFieldName(), strategy});
strategy = new BBoxStrategy(ctx, "bbox"); strategy = new BBoxStrategy(ctx, "bbox");
ctorArgs.add(new Object[]{new Param(strategy)}); ctorArgs.add(new Object[]{strategy.getFieldName(), strategy});
strategy = new SerializedDVStrategy(ctx, "serialized"); strategy = new SerializedDVStrategy(ctx, "serialized");
ctorArgs.add(new Object[]{new Param(strategy)}); ctorArgs.add(new Object[]{strategy.getFieldName(), strategy});
return ctorArgs; return ctorArgs;
} }
// this is a hack for clover! public DistanceStrategyTest(String suiteName, SpatialStrategy strategy) {
static class Param {
SpatialStrategy strategy;
Param(SpatialStrategy strategy) {
this.strategy = strategy;
}
@Override
public String toString() {
return strategy.getFieldName();
}
}
// private String fieldName;
public DistanceStrategyTest(@Name("strategy") Param param) {
SpatialStrategy strategy = param.strategy;
this.ctx = strategy.getSpatialContext(); this.ctx = strategy.getSpatialContext();
this.strategy = strategy; this.strategy = strategy;
} }

26
lucene/spatial/src/test/org/apache/lucene/spatial/PortedSolr3Test.java
View File

@ -22,7 +22,6 @@ import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import com.carrotsearch.randomizedtesting.annotations.Name;
import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
import com.spatial4j.core.context.SpatialContext; import com.spatial4j.core.context.SpatialContext;
import com.spatial4j.core.distance.DistanceUtils; import com.spatial4j.core.distance.DistanceUtils;
@ -44,7 +43,7 @@ import org.junit.Test;
*/ */
public class PortedSolr3Test extends StrategyTestCase { public class PortedSolr3Test extends StrategyTestCase {
@ParametersFactory @ParametersFactory(argumentFormatting = "strategy=%s")
public static Iterable<Object[]> parameters() { public static Iterable<Object[]> parameters() {
List<Object[]> ctorArgs = new ArrayList<>(); List<Object[]> ctorArgs = new ArrayList<>();
@ -54,36 +53,23 @@ public class PortedSolr3Test extends StrategyTestCase {
grid = new GeohashPrefixTree(ctx,12); grid = new GeohashPrefixTree(ctx,12);
strategy = new RecursivePrefixTreeStrategy(grid, "recursive_geohash"); strategy = new RecursivePrefixTreeStrategy(grid, "recursive_geohash");
ctorArgs.add(new Object[]{new Param(strategy)}); ctorArgs.add(new Object[]{strategy.getFieldName(), strategy});
grid = new QuadPrefixTree(ctx,25); grid = new QuadPrefixTree(ctx,25);
strategy = new RecursivePrefixTreeStrategy(grid, "recursive_quad"); strategy = new RecursivePrefixTreeStrategy(grid, "recursive_quad");
ctorArgs.add(new Object[]{new Param(strategy)}); ctorArgs.add(new Object[]{strategy.getFieldName(), strategy});
grid = new GeohashPrefixTree(ctx,12); grid = new GeohashPrefixTree(ctx,12);
strategy = new TermQueryPrefixTreeStrategy(grid, "termquery_geohash"); strategy = new TermQueryPrefixTreeStrategy(grid, "termquery_geohash");
ctorArgs.add(new Object[]{new Param(strategy)}); ctorArgs.add(new Object[]{strategy.getFieldName(), strategy});
strategy = new PointVectorStrategy(ctx, "pointvector"); strategy = new PointVectorStrategy(ctx, "pointvector");
ctorArgs.add(new Object[]{new Param(strategy)}); ctorArgs.add(new Object[]{strategy.getFieldName(), strategy});
return ctorArgs; return ctorArgs;
} }
// this is a hack for clover! (otherwise strategy.toString() used as file name)
static class Param {
SpatialStrategy strategy;
Param(SpatialStrategy strategy) { this.strategy = strategy; } public PortedSolr3Test(String suiteName, SpatialStrategy strategy) {
@Override
public String toString() { return strategy.getFieldName(); }
}
// private String fieldName;
public PortedSolr3Test(@Name("strategy") Param param) {
SpatialStrategy strategy = param.strategy;
this.ctx = strategy.getSpatialContext(); this.ctx = strategy.getSpatialContext();
this.strategy = strategy; this.strategy = strategy;
} }

1
solr/licenses/junit4-ant-2.2.0.jar.sha1
View File

@ -1 +0,0 @@
0d401c9c729deccd5db8a5df3102eb18793c2224

1
solr/licenses/junit4-ant-2.3.1.jar.sha1 Normal file
View File

@ -0,0 +1 @@
054cdf1533c6362812605dab2a984494930108d6

1
solr/licenses/randomizedtesting-runner-2.2.0.jar.sha1
View File

@ -1 +0,0 @@
60de504132241be049564a3a34fd7dcc296e2ef0

1
solr/licenses/randomizedtesting-runner-2.3.1.jar.sha1 Normal file
View File

@ -0,0 +1 @@
a6e5446a14e44802b91983b3e5c2d56e1d1c424a