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/11/18 09:53:39 UTC
svn commit: r1714952 - in /lucene/dev/branches/branch_5x: ./ dev-tools/
dev-tools/idea/.idea/libraries/ lucene/ lucene/licenses/ lucene/spatial/
lucene/spatial/src/test/org/apache/lucene/spatial/ solr/ solr/licenses/
Author: dweiss
Date: Wed Nov 18 08:53:38 2015
New Revision: 1714952
URL: http://svn.apache.org/viewvc?rev=1714952&view=rev
Log:
LUCENE-6899: upgrade randomizedtesting to version 2.3.1
Added:
lucene/dev/branches/branch_5x/lucene/licenses/junit4-ant-2.3.1.jar.sha1
- copied unchanged from r1714945, lucene/dev/trunk/lucene/licenses/junit4-ant-2.3.1.jar.sha1
lucene/dev/branches/branch_5x/lucene/licenses/randomizedtesting-runner-2.3.1.jar.sha1
- copied unchanged from r1714945, lucene/dev/trunk/lucene/licenses/randomizedtesting-runner-2.3.1.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/junit4-ant-2.3.1.jar.sha1
- copied unchanged from r1714945, lucene/dev/trunk/solr/licenses/junit4-ant-2.3.1.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/randomizedtesting-runner-2.3.1.jar.sha1
- copied unchanged from r1714945, lucene/dev/trunk/solr/licenses/randomizedtesting-runner-2.3.1.jar.sha1
Removed:
lucene/dev/branches/branch_5x/lucene/licenses/junit4-ant-2.2.0.jar.sha1
lucene/dev/branches/branch_5x/lucene/licenses/randomizedtesting-runner-2.2.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/junit4-ant-2.2.0.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/randomizedtesting-runner-2.2.0.jar.sha1
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/dev-tools/ (props changed)
lucene/dev/branches/branch_5x/dev-tools/idea/.idea/libraries/JUnit.xml
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/lucene/ivy-versions.properties (contents, props changed)
lucene/dev/branches/branch_5x/lucene/licenses/ (props changed)
lucene/dev/branches/branch_5x/lucene/spatial/ (props changed)
lucene/dev/branches/branch_5x/lucene/spatial/src/test/org/apache/lucene/spatial/DistanceStrategyTest.java
lucene/dev/branches/branch_5x/lucene/spatial/src/test/org/apache/lucene/spatial/PortedSolr3Test.java
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/licenses/ (props changed)
Modified: lucene/dev/branches/branch_5x/dev-tools/idea/.idea/libraries/JUnit.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/dev-tools/idea/.idea/libraries/JUnit.xml?rev=1714952&r1=1714951&r2=1714952&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/dev-tools/idea/.idea/libraries/JUnit.xml (original)
+++ lucene/dev/branches/branch_5x/dev-tools/idea/.idea/libraries/JUnit.xml Wed Nov 18 08:53:38 2015
@@ -2,7 +2,7 @@
<library name="JUnit">
<CLASSES>
<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>
<JAVADOC />
<SOURCES />
Modified: lucene/dev/branches/branch_5x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/CHANGES.txt?rev=1714952&r1=1714951&r2=1714952&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/lucene/CHANGES.txt Wed Nov 18 08:53:38 2015
@@ -203,6 +203,8 @@ Bug Fixes
Other
+* LUCENE-6899: Upgrade randomizedtesting to 2.3.1. (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)
Modified: lucene/dev/branches/branch_5x/lucene/ivy-versions.properties
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/ivy-versions.properties?rev=1714952&r1=1714951&r2=1714952&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/ivy-versions.properties (original)
+++ lucene/dev/branches/branch_5x/lucene/ivy-versions.properties Wed Nov 18 08:53:38 2015
@@ -7,7 +7,7 @@
/cglib/cglib-nodep = 2.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/randomizedtesting-runner = ${com.carrotsearch.randomizedtesting.version}
Modified: lucene/dev/branches/branch_5x/lucene/spatial/src/test/org/apache/lucene/spatial/DistanceStrategyTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/spatial/src/test/org/apache/lucene/spatial/DistanceStrategyTest.java?rev=1714952&r1=1714951&r2=1714952&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/spatial/src/test/org/apache/lucene/spatial/DistanceStrategyTest.java (original)
+++ lucene/dev/branches/branch_5x/lucene/spatial/src/test/org/apache/lucene/spatial/DistanceStrategyTest.java Wed Nov 18 08:53:38 2015
@@ -22,7 +22,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import com.carrotsearch.randomizedtesting.annotations.Name;
import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
import com.spatial4j.core.context.SpatialContext;
import com.spatial4j.core.shape.Point;
@@ -41,8 +40,7 @@ import org.apache.lucene.spatial.vector.
import org.junit.Test;
public class DistanceStrategyTest extends StrategyTestCase {
-
- @ParametersFactory
+ @ParametersFactory(argumentFormatting = "strategy=%s")
public static Iterable<Object[]> parameters() {
List<Object[]> ctorArgs = new ArrayList<>();
@@ -52,46 +50,29 @@ public class DistanceStrategyTest extend
grid = new QuadPrefixTree(ctx,25);
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);
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);
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");
- ctorArgs.add(new Object[]{new Param(strategy)});
+ ctorArgs.add(new Object[]{strategy.getFieldName(), strategy});
strategy = new BBoxStrategy(ctx, "bbox");
- ctorArgs.add(new Object[]{new Param(strategy)});
+ ctorArgs.add(new Object[]{strategy.getFieldName(), strategy});
strategy = new SerializedDVStrategy(ctx, "serialized");
- ctorArgs.add(new Object[]{new Param(strategy)});
+ ctorArgs.add(new Object[]{strategy.getFieldName(), strategy});
return ctorArgs;
}
- // this is a hack for clover!
- 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;
+ public DistanceStrategyTest(String suiteName, SpatialStrategy strategy) {
this.ctx = strategy.getSpatialContext();
this.strategy = strategy;
}
Modified: lucene/dev/branches/branch_5x/lucene/spatial/src/test/org/apache/lucene/spatial/PortedSolr3Test.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/spatial/src/test/org/apache/lucene/spatial/PortedSolr3Test.java?rev=1714952&r1=1714951&r2=1714952&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/spatial/src/test/org/apache/lucene/spatial/PortedSolr3Test.java (original)
+++ lucene/dev/branches/branch_5x/lucene/spatial/src/test/org/apache/lucene/spatial/PortedSolr3Test.java Wed Nov 18 08:53:38 2015
@@ -22,7 +22,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import com.carrotsearch.randomizedtesting.annotations.Name;
import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
import com.spatial4j.core.context.SpatialContext;
import com.spatial4j.core.distance.DistanceUtils;
@@ -44,7 +43,7 @@ import org.junit.Test;
*/
public class PortedSolr3Test extends StrategyTestCase {
- @ParametersFactory
+ @ParametersFactory(argumentFormatting = "strategy=%s")
public static Iterable<Object[]> parameters() {
List<Object[]> ctorArgs = new ArrayList<>();
@@ -54,36 +53,23 @@ public class PortedSolr3Test extends Str
grid = new GeohashPrefixTree(ctx,12);
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);
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);
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");
- ctorArgs.add(new Object[]{new Param(strategy)});
+ ctorArgs.add(new Object[]{strategy.getFieldName(), strategy});
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; }
-
- @Override
- public String toString() { return strategy.getFieldName(); }
- }
-
-// private String fieldName;
- public PortedSolr3Test(@Name("strategy") Param param) {
- SpatialStrategy strategy = param.strategy;
+ public PortedSolr3Test(String suiteName, SpatialStrategy strategy) {
this.ctx = strategy.getSpatialContext();
this.strategy = strategy;
}