Apache Solr open-source search software
LUCENE-8626: Standardize Lucene test file naming Part 2 (#2053)
Marcusb9a93cf6952f
diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestAllGroupHeadsCollector.javasimilarity index 99%rename from lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.javarename to lucene/grouping/src/test/org/apache/lucene/search/grouping/TestAllGroupHeadsCollector.javaindex 2db765abfee..fef695ff9aa 100644--- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java+++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestAllGroupHeadsCollector.java@@ -56,7 +56,7 @@ import org.apache.lucene.util.FixedBitSet;import org.apache.lucene.util.LuceneTestCase;import org.apache.lucene.util.TestUtil;-public class AllGroupHeadsCollectorTest extends LuceneTestCase {+public class TestAllGroupHeadsCollector extends LuceneTestCase {public void testBasic() throws Exception {final String groupField = "author";diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupsCollectorTest.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestAllGroupsCollector.javasimilarity index 98%rename from lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupsCollectorTest.javarename to lucene/grouping/src/test/org/apache/lucene/search/grouping/TestAllGroupsCollector.javaindex 0d777f6e7fb..ccdf3c347b6 100644--- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupsCollectorTest.java+++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestAllGroupsCollector.java@@ -34,7 +34,7 @@ import org.apache.lucene.store.Directory;import org.apache.lucene.util.BytesRef;import org.apache.lucene.util.LuceneTestCase;-public class AllGroupsCollectorTest extends LuceneTestCase {+public class TestAllGroupsCollector extends LuceneTestCase {public void testTotalGroupCount() throws Exception {diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/BlockGroupingTest.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestBlockGrouping.javasimilarity index 99%rename from lucene/grouping/src/test/org/apache/lucene/search/grouping/BlockGroupingTest.javarename to lucene/grouping/src/test/org/apache/lucene/search/grouping/TestBlockGrouping.javaindex fc03dfdd84a..78acbbfaf51 100644--- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/BlockGroupingTest.java+++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestBlockGrouping.java@@ -40,7 +40,7 @@ import org.apache.lucene.search.TermQuery;import org.apache.lucene.search.TopDocs;import org.apache.lucene.util.BytesRef;-public class BlockGroupingTest extends AbstractGroupingTestCase {+public class TestBlockGrouping extends AbstractGroupingTestCase {public void testSimple() throws IOException {diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/DistinctValuesCollectorTest.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestDistinctValuesCollector.javasimilarity index 99%rename from lucene/grouping/src/test/org/apache/lucene/search/grouping/DistinctValuesCollectorTest.javarename to lucene/grouping/src/test/org/apache/lucene/search/grouping/TestDistinctValuesCollector.javaindex a768c4c9428..cedbeeab26c 100644--- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/DistinctValuesCollectorTest.java+++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestDistinctValuesCollector.java@@ -49,7 +49,7 @@ import org.apache.lucene.util.BytesRef;import org.apache.lucene.util.mutable.MutableValue;import org.apache.lucene.util.mutable.MutableValueStr;-public class DistinctValuesCollectorTest extends AbstractGroupingTestCase {+public class TestDistinctValuesCollector extends AbstractGroupingTestCase {private final static NullComparator nullComparator = new NullComparator();diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/DoubleRangeGroupSelectorTest.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestDoubleRangeGroupSelector.javasimilarity index 97%rename from lucene/grouping/src/test/org/apache/lucene/search/grouping/DoubleRangeGroupSelectorTest.javarename to lucene/grouping/src/test/org/apache/lucene/search/grouping/TestDoubleRangeGroupSelector.javaindex c9385898ade..5350a04d639 100644--- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/DoubleRangeGroupSelectorTest.java+++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestDoubleRangeGroupSelector.java@@ -27,7 +27,7 @@ import org.apache.lucene.search.DoubleValuesSource;import org.apache.lucene.search.MatchAllDocsQuery;import org.apache.lucene.search.Query;-public class DoubleRangeGroupSelectorTest extends BaseGroupSelectorTestCase<DoubleRange> {+public class TestDoubleRangeGroupSelector extends BaseGroupSelectorTestCase<DoubleRange> {@Overrideprotected void addGroupField(Document document, int id) {diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGroupFacetCollector.javasimilarity index 99%rename from lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.javarename to lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGroupFacetCollector.javaindex 61a572299fe..fffcd69948c 100644--- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java+++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGroupFacetCollector.java@@ -49,7 +49,7 @@ import org.apache.lucene.util.BytesRef;import org.apache.lucene.util.TestUtil;-public class GroupFacetCollectorTest extends AbstractGroupingTestCase {+public class TestGroupFacetCollector extends AbstractGroupingTestCase {public void testSimple() throws Exception {final String groupField = "hotel";diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupingSearchTest.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGroupingSearch.javasimilarity index 99%rename from lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupingSearchTest.javarename to lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGroupingSearch.javaindex d09513ca128..d0c0551cf7d 100644--- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupingSearchTest.java+++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGroupingSearch.java@@ -41,7 +41,7 @@ import java.util.ArrayList;import java.util.HashMap;import java.util.List;-public class GroupingSearchTest extends LuceneTestCase {+public class TestGroupingSearch extends LuceneTestCase {// Tests some very basic usages...public void testBasic() throws Exception {diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/LongRangeGroupSelectorTest.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestLongRangeGroupSelector.javasimilarity index 97%rename from lucene/grouping/src/test/org/apache/lucene/search/grouping/LongRangeGroupSelectorTest.javarename to lucene/grouping/src/test/org/apache/lucene/search/grouping/TestLongRangeGroupSelector.javaindex 6075f700a28..7384a5653f7 100644--- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/LongRangeGroupSelectorTest.java+++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestLongRangeGroupSelector.java@@ -27,7 +27,7 @@ import org.apache.lucene.search.LongValuesSource;import org.apache.lucene.search.MatchAllDocsQuery;import org.apache.lucene.search.Query;-public class LongRangeGroupSelectorTest extends BaseGroupSelectorTestCase<LongRange> {+public class TestLongRangeGroupSelector extends BaseGroupSelectorTestCase<LongRange> {@Overrideprotected void addGroupField(Document document, int id) {diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TermGroupSelectorTest.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestTermGroupSelector.javasimilarity index 97%rename from lucene/grouping/src/test/org/apache/lucene/search/grouping/TermGroupSelectorTest.javarename to lucene/grouping/src/test/org/apache/lucene/search/grouping/TestTermGroupSelector.javaindex 831a0147d1d..e55fd641daf 100644--- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TermGroupSelectorTest.java+++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestTermGroupSelector.java@@ -30,7 +30,7 @@ import org.apache.lucene.search.Query;import org.apache.lucene.search.TermQuery;import org.apache.lucene.util.BytesRef;-public class TermGroupSelectorTest extends BaseGroupSelectorTestCase<BytesRef> {+public class TestTermGroupSelector extends BaseGroupSelectorTestCase<BytesRef> {@Overrideprotected void addGroupField(Document document, int id) {diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TopGroupsTest.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestTopGroups.javasimilarity index 99%rename from lucene/grouping/src/test/org/apache/lucene/search/grouping/TopGroupsTest.javarename to lucene/grouping/src/test/org/apache/lucene/search/grouping/TestTopGroups.javaindex e27fc07214f..6ba5ba160ab 100644--- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TopGroupsTest.java+++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestTopGroups.java@@ -21,7 +21,7 @@ import org.apache.lucene.search.Sort;import org.apache.lucene.search.TotalHits;import org.apache.lucene.util.LuceneTestCase;-public class TopGroupsTest extends LuceneTestCase {+public class TestTopGroups extends LuceneTestCase {public void testAllGroupsEmptyInSecondPass() {narrativeMergeTestImplementation(false, false, false, false);diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/ValueSourceGroupSelectorTest.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestValueSourceGroupSelector.javasimilarity index 96%rename from lucene/grouping/src/test/org/apache/lucene/search/grouping/ValueSourceGroupSelectorTest.javarename to lucene/grouping/src/test/org/apache/lucene/search/grouping/TestValueSourceGroupSelector.javaindex 941ad8a26c1..9e652b643b4 100644--- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/ValueSourceGroupSelectorTest.java+++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestValueSourceGroupSelector.java@@ -30,7 +30,7 @@ import org.apache.lucene.search.TermQuery;import org.apache.lucene.util.BytesRef;import org.apache.lucene.util.mutable.MutableValue;-public class ValueSourceGroupSelectorTest extends BaseGroupSelectorTestCase<MutableValue> {+public class TestValueSourceGroupSelector extends BaseGroupSelectorTestCase<MutableValue> {@Overrideprotected void addGroupField(Document document, int id) {diff --git a/lucene/queries/src/test/org/apache/lucene/queries/CommonTermsQueryTest.java b/lucene/queries/src/test/org/apache/lucene/queries/TestCommonTermsQuery.javasimilarity index 99%rename from lucene/queries/src/test/org/apache/lucene/queries/CommonTermsQueryTest.javarename to lucene/queries/src/test/org/apache/lucene/queries/TestCommonTermsQuery.javaindex 9b3ab88dfd4..9ec1bd251f3 100644--- a/lucene/queries/src/test/org/apache/lucene/queries/CommonTermsQueryTest.java+++ b/lucene/queries/src/test/org/apache/lucene/queries/TestCommonTermsQuery.java@@ -56,7 +56,7 @@ import org.apache.lucene.util.PriorityQueue;import org.apache.lucene.util.TestUtil;import org.junit.Test;-public class CommonTermsQueryTest extends LuceneTestCase {+public class TestCommonTermsQuery extends LuceneTestCase {public void testBasics() throws IOException {Directory dir = newDirectory();@@ -403,7 +403,7 @@ public class CommonTermsQueryTest extends LuceneTestCase {LeafReader wrapper = getOnlyLeafReader(reader);String field = "body";Terms terms = wrapper.terms(field);- PriorityQueue<TermAndFreq> lowFreqQueue = new PriorityQueue<CommonTermsQueryTest.TermAndFreq>(+ PriorityQueue<TermAndFreq> lowFreqQueue = new PriorityQueue<TestCommonTermsQuery.TermAndFreq>(5) {@Override@@ -412,7 +412,7 @@ public class CommonTermsQueryTest extends LuceneTestCase {}};- PriorityQueue<TermAndFreq> highFreqQueue = new PriorityQueue<CommonTermsQueryTest.TermAndFreq>(+ PriorityQueue<TermAndFreq> highFreqQueue = new PriorityQueue<TestCommonTermsQuery.TermAndFreq>(5) {@Overridediff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyReplicationClientTest.java b/lucene/replicator/src/test/org/apache/lucene/replicator/TestIndexAndTaxonomyReplicationClient.javasimilarity index 99%rename from lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyReplicationClientTest.javarename to lucene/replicator/src/test/org/apache/lucene/replicator/TestIndexAndTaxonomyReplicationClient.javaindex 7b4a28b7406..3303a6cc735 100644--- a/lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyReplicationClientTest.java+++ b/lucene/replicator/src/test/org/apache/lucene/replicator/TestIndexAndTaxonomyReplicationClient.java@@ -57,7 +57,7 @@ import org.junit.After;import org.junit.Before;import org.junit.Test;-public class IndexAndTaxonomyReplicationClientTest extends ReplicatorTestCase {+public class TestIndexAndTaxonomyReplicationClient extends ReplicatorTestCase {private static class IndexAndTaxonomyReadyCallback implements Callable<Boolean>, Closeable {diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyRevisionTest.java b/lucene/replicator/src/test/org/apache/lucene/replicator/TestIndexAndTaxonomyRevision.javasimilarity index 99%rename from lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyRevisionTest.javarename to lucene/replicator/src/test/org/apache/lucene/replicator/TestIndexAndTaxonomyRevision.javaindex 214c47e57c7..78c74135d46 100644--- a/lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyRevisionTest.java+++ b/lucene/replicator/src/test/org/apache/lucene/replicator/TestIndexAndTaxonomyRevision.java@@ -37,7 +37,7 @@ import org.apache.lucene.store.IndexInput;import org.apache.lucene.util.IOUtils;import org.junit.Test;-public class IndexAndTaxonomyRevisionTest extends ReplicatorTestCase {+public class TestIndexAndTaxonomyRevision extends ReplicatorTestCase {private Document newDocument(TaxonomyWriter taxoWriter) throws IOException {FacetsConfig config = new FacetsConfig();diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/IndexReplicationClientTest.java b/lucene/replicator/src/test/org/apache/lucene/replicator/TestIndexReplicationClient.javasimilarity index 99%rename from lucene/replicator/src/test/org/apache/lucene/replicator/IndexReplicationClientTest.javarename to lucene/replicator/src/test/org/apache/lucene/replicator/TestIndexReplicationClient.javaindex 3d724921dc7..129af31fb72 100644--- a/lucene/replicator/src/test/org/apache/lucene/replicator/IndexReplicationClientTest.java+++ b/lucene/replicator/src/test/org/apache/lucene/replicator/TestIndexReplicationClient.java@@ -38,7 +38,7 @@ import org.junit.After;import org.junit.Before;import org.junit.Test;-public class IndexReplicationClientTest extends ReplicatorTestCase {+public class TestIndexReplicationClient extends ReplicatorTestCase {private static class IndexReadyCallback implements Callable<Boolean>, Closeable {diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/IndexRevisionTest.java b/lucene/replicator/src/test/org/apache/lucene/replicator/TestIndexRevision.javasimilarity index 98%rename from lucene/replicator/src/test/org/apache/lucene/replicator/IndexRevisionTest.javarename to lucene/replicator/src/test/org/apache/lucene/replicator/TestIndexRevision.javaindex 1477d28baff..993a7edb311 100644--- a/lucene/replicator/src/test/org/apache/lucene/replicator/IndexRevisionTest.java+++ b/lucene/replicator/src/test/org/apache/lucene/replicator/TestIndexRevision.java@@ -32,7 +32,7 @@ import org.apache.lucene.store.IndexInput;import org.apache.lucene.util.IOUtils;import org.junit.Test;-public class IndexRevisionTest extends ReplicatorTestCase {+public class TestIndexRevision extends ReplicatorTestCase {@Testpublic void testNoSnapshotDeletionPolicy() throws Exception {diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/LocalReplicatorTest.java b/lucene/replicator/src/test/org/apache/lucene/replicator/TestLocalReplicator.javasimilarity index 99%rename from lucene/replicator/src/test/org/apache/lucene/replicator/LocalReplicatorTest.javarename to lucene/replicator/src/test/org/apache/lucene/replicator/TestLocalReplicator.javaindex 155950a2dbc..3b113f705f6 100644--- a/lucene/replicator/src/test/org/apache/lucene/replicator/LocalReplicatorTest.java+++ b/lucene/replicator/src/test/org/apache/lucene/replicator/TestLocalReplicator.java@@ -37,7 +37,7 @@ import org.junit.After;import org.junit.Before;import org.junit.Test;-public class LocalReplicatorTest extends ReplicatorTestCase {+public class TestLocalReplicator extends ReplicatorTestCase {private static final String VERSION_ID = "version";diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/SessionTokenTest.java b/lucene/replicator/src/test/org/apache/lucene/replicator/TestSessionToken.javasimilarity index 97%rename from lucene/replicator/src/test/org/apache/lucene/replicator/SessionTokenTest.javarename to lucene/replicator/src/test/org/apache/lucene/replicator/TestSessionToken.javaindex d595a7d21e4..ed2643a39dd 100644--- a/lucene/replicator/src/test/org/apache/lucene/replicator/SessionTokenTest.java+++ b/lucene/replicator/src/test/org/apache/lucene/replicator/TestSessionToken.java@@ -31,7 +31,7 @@ import org.apache.lucene.store.Directory;import org.apache.lucene.util.IOUtils;import org.junit.Test;-public class SessionTokenTest extends ReplicatorTestCase {+public class TestSessionToken extends ReplicatorTestCase {@Testpublic void testSerialization() throws IOException {diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/http/HttpReplicatorTest.java b/lucene/replicator/src/test/org/apache/lucene/replicator/http/TestHttpReplicator.javasimilarity index 98%rename from lucene/replicator/src/test/org/apache/lucene/replicator/http/HttpReplicatorTest.javarename to lucene/replicator/src/test/org/apache/lucene/replicator/http/TestHttpReplicator.javaindex f46c35666ad..6f65552e111 100644--- a/lucene/replicator/src/test/org/apache/lucene/replicator/http/HttpReplicatorTest.java+++ b/lucene/replicator/src/test/org/apache/lucene/replicator/http/TestHttpReplicator.java@@ -41,7 +41,7 @@ import org.eclipse.jetty.servlet.ServletHolder;import org.junit.Before;import org.junit.Test;-public class HttpReplicatorTest extends ReplicatorTestCase {+public class TestHttpReplicator extends ReplicatorTestCase {private Path clientWorkDir;private Replicator serverReplicator;private IndexWriter writer;diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/FuzzyLikeThisQueryTest.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestFuzzyLikeThisQuery.javasimilarity index 99%rename from lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/FuzzyLikeThisQueryTest.javarename to lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestFuzzyLikeThisQuery.javaindex 95c6cca2dc1..2dbd1ee5005 100644--- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/FuzzyLikeThisQueryTest.java+++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestFuzzyLikeThisQuery.java@@ -35,7 +35,7 @@ import org.apache.lucene.store.Directory;import org.apache.lucene.util.IOUtils;import org.apache.lucene.util.LuceneTestCase;-public class FuzzyLikeThisQueryTest extends LuceneTestCase {+public class TestFuzzyLikeThisQuery extends LuceneTestCase {private Directory directory;private IndexSearcher searcher;private IndexReader reader;diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/DistanceStrategyTest.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/TestDistanceStrategy.javasimilarity index 97%rename from lucene/spatial-extras/src/test/org/apache/lucene/spatial/DistanceStrategyTest.javarename to lucene/spatial-extras/src/test/org/apache/lucene/spatial/TestDistanceStrategy.javaindex 97c1583d343..a4b3ec397bf 100644--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/DistanceStrategyTest.java+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/TestDistanceStrategy.java@@ -37,7 +37,7 @@ import org.locationtech.spatial4j.shape.Point;import org.locationtech.spatial4j.shape.Shape;import org.locationtech.spatial4j.shape.ShapeFactory;-public class DistanceStrategyTest extends StrategyTestCase {+public class TestDistanceStrategy extends StrategyTestCase {@ParametersFactory(argumentFormatting = "strategy=%s")public static Iterable<Object[]> parameters() {List<Object[]> ctorArgs = new ArrayList<>();@@ -75,7 +75,7 @@ public class DistanceStrategyTest extends StrategyTestCase {return ctorArgs;}- public DistanceStrategyTest(String suiteName, SpatialStrategy strategy) {+ public TestDistanceStrategy(String suiteName, SpatialStrategy strategy) {this.ctx = strategy.getSpatialContext();this.strategy = strategy;}diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/PortedSolr3Test.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/TestPortedSolr3.javasimilarity index 98%rename from lucene/spatial-extras/src/test/org/apache/lucene/spatial/PortedSolr3Test.javarename to lucene/spatial-extras/src/test/org/apache/lucene/spatial/TestPortedSolr3.javaindex 244aae74859..bce5cf0bcef 100644--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/PortedSolr3Test.java+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/TestPortedSolr3.java@@ -41,7 +41,7 @@ import org.locationtech.spatial4j.shape.ShapeFactory;/*** Based off of Solr 3's SpatialFilterTest.*/-public class PortedSolr3Test extends StrategyTestCase {+public class TestPortedSolr3 extends StrategyTestCase {private ShapeFactory shapeFactory;@@ -74,7 +74,7 @@ public class PortedSolr3Test extends StrategyTestCase {return ctorArgs;}- public PortedSolr3Test(String suiteName, SpatialStrategy strategy) {+ public TestPortedSolr3(String suiteName, SpatialStrategy strategy) {this.ctx = strategy.getSpatialContext();this.strategy = strategy;shapeFactory = ctx.getShapeFactory();diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/SpatialArgsTest.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/TestSpatialArgs.javasimilarity index 97%rename from lucene/spatial-extras/src/test/org/apache/lucene/spatial/SpatialArgsTest.javarename to lucene/spatial-extras/src/test/org/apache/lucene/spatial/TestSpatialArgs.javaindex da351fc857e..ba771af7cfa 100644--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/SpatialArgsTest.java+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/TestSpatialArgs.java@@ -23,7 +23,7 @@ import org.junit.Test;import org.locationtech.spatial4j.context.SpatialContext;import org.locationtech.spatial4j.shape.Shape;-public class SpatialArgsTest extends LuceneTestCase {+public class TestSpatialArgs extends LuceneTestCase {@Testpublic void calcDistanceFromErrPct() {diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/composite/CompositeStrategyTest.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/composite/TestCompositeStrategy.javasimilarity index 98%rename from lucene/spatial-extras/src/test/org/apache/lucene/spatial/composite/CompositeStrategyTest.javarename to lucene/spatial-extras/src/test/org/apache/lucene/spatial/composite/TestCompositeStrategy.javaindex 80bda53ac0c..5b0b5347321 100644--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/composite/CompositeStrategyTest.java+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/composite/TestCompositeStrategy.java@@ -37,7 +37,7 @@ import static com.carrotsearch.randomizedtesting.RandomizedTest.randomBoolean;import static com.carrotsearch.randomizedtesting.RandomizedTest.randomDouble;import static com.carrotsearch.randomizedtesting.RandomizedTest.randomIntBetween;-public class CompositeStrategyTest extends RandomSpatialOpStrategyTestCase {+public class TestCompositeStrategy extends RandomSpatialOpStrategyTestCase {private SpatialPrefixTree grid;private RecursivePrefixTreeStrategy rptStrategy;diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/DateNRStrategyTest.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestDateNRStrategy.javasimilarity index 98%rename from lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/DateNRStrategyTest.javarename to lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestDateNRStrategy.javaindex 2571afd6c99..1f98d47e7bc 100644--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/DateNRStrategyTest.java+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestDateNRStrategy.java@@ -30,7 +30,7 @@ import org.locationtech.spatial4j.shape.Shape;import static com.carrotsearch.randomizedtesting.RandomizedTest.randomInt;import static com.carrotsearch.randomizedtesting.RandomizedTest.randomIntBetween;-public class DateNRStrategyTest extends RandomSpatialOpStrategyTestCase {+public class TestDateNRStrategy extends RandomSpatialOpStrategyTestCase {static final int ITERATIONS = 10;diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/HeatmapFacetCounterTest.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestHeatmapFacetCounter.javasimilarity index 99%rename from lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/HeatmapFacetCounterTest.javarename to lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestHeatmapFacetCounter.javaindex 5b719854d92..10805465b2c 100644--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/HeatmapFacetCounterTest.java+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestHeatmapFacetCounter.java@@ -44,7 +44,7 @@ import org.locationtech.spatial4j.shape.impl.RectangleImpl;import static com.carrotsearch.randomizedtesting.RandomizedTest.atMost;import static com.carrotsearch.randomizedtesting.RandomizedTest.randomIntBetween;-public class HeatmapFacetCounterTest extends StrategyTestCase {+public class TestHeatmapFacetCounter extends StrategyTestCase {SpatialPrefixTree grid;ShapeFactory shapeFactory;diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/JtsPolygonTest.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestJtsPolygon.javasimilarity index 98%rename from lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/JtsPolygonTest.javarename to lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestJtsPolygon.javaindex 47a92e678a2..dc3c8e53b10 100644--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/JtsPolygonTest.java+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestJtsPolygon.java@@ -37,11 +37,11 @@ import org.junit.Test;import java.text.ParseException;import java.util.HashMap;-public class JtsPolygonTest extends StrategyTestCase {+public class TestJtsPolygon extends StrategyTestCase {private static final double LUCENE_4464_distErrPct = SpatialArgs.DEFAULT_DISTERRPCT;//DEFAULT 2.5%- public JtsPolygonTest() {+ public TestJtsPolygon() {try {HashMap<String, String> args = new HashMap<>();args.put("spatialContextFactory",diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/NumberRangeFacetsTest.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestNumberRangeFacets.javasimilarity index 99%rename from lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/NumberRangeFacetsTest.javarename to lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestNumberRangeFacets.javaindex 3ddf0c78ba2..6de4b8228a1 100644--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/NumberRangeFacetsTest.java+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestNumberRangeFacets.java@@ -44,7 +44,7 @@ import org.locationtech.spatial4j.shape.Shape;import static com.carrotsearch.randomizedtesting.RandomizedTest.randomIntBetween;-public class NumberRangeFacetsTest extends StrategyTestCase {+public class TestNumberRangeFacets extends StrategyTestCase {DateRangePrefixTree tree;diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/RandomSpatialOpFuzzyPrefixTreeTest.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestRandomSpatialOpFuzzyPrefixTree.javasimilarity index 99%rename from lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/RandomSpatialOpFuzzyPrefixTreeTest.javarename to lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestRandomSpatialOpFuzzyPrefixTree.javaindex 6349060e24f..c6492e975ce 100644--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/RandomSpatialOpFuzzyPrefixTreeTest.java+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestRandomSpatialOpFuzzyPrefixTree.java@@ -63,7 +63,7 @@ import static org.locationtech.spatial4j.shape.SpatialRelation.WITHIN;/** Randomized PrefixTree test that considers the fuzziness of the* results introduced by grid approximation. */-public class RandomSpatialOpFuzzyPrefixTreeTest extends StrategyTestCase {+public class TestRandomSpatialOpFuzzyPrefixTree extends StrategyTestCase {static final int ITERATIONS = 10;@@ -471,7 +471,7 @@ public class RandomSpatialOpFuzzyPrefixTreeTest extends StrategyTestCase {final boolean biasContainsThenWithin;public ShapePair(Shape shape1, Shape shape2, boolean containsThenWithin) {- super(Arrays.asList(shape1, shape2), RandomSpatialOpFuzzyPrefixTreeTest.this.ctx);+ super(Arrays.asList(shape1, shape2), TestRandomSpatialOpFuzzyPrefixTree.this.ctx);this.shape1 = shape1;this.shape2 = shape2;this.shape1_2D = toNonGeo(shape1);diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/RandomSpatialOpFuzzyPrefixTree50Test.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestRandomSpatialOpFuzzyPrefixTree50.javasimilarity index 92%rename from lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/RandomSpatialOpFuzzyPrefixTree50Test.javarename to lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestRandomSpatialOpFuzzyPrefixTree50.javaindex e932fe91139..ec9c2e1ce85 100644--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/RandomSpatialOpFuzzyPrefixTree50Test.java+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestRandomSpatialOpFuzzyPrefixTree50.java@@ -17,7 +17,7 @@package org.apache.lucene.spatial.prefix;/** Test RandomSpatialOpFuzzyPrefixTreeTest using the PrefixTree index format found in 5.0 and prior. */-public class RandomSpatialOpFuzzyPrefixTree50Test extends RandomSpatialOpFuzzyPrefixTreeTest {+public class TestRandomSpatialOpFuzzyPrefixTree50 extends TestRandomSpatialOpFuzzyPrefixTree {protected RecursivePrefixTreeStrategy newRPT() {return new RecursivePrefixTreeStrategy(this.grid, getClass().getSimpleName()) {diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/tree/DateRangePrefixTreeTest.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/tree/TestDateRangePrefixTree.javasimilarity index 98%rename from lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/tree/DateRangePrefixTreeTest.javarename to lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/tree/TestDateRangePrefixTree.javaindex c14026fbd02..95cd4b8344e 100644--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/tree/DateRangePrefixTreeTest.java+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/tree/TestDateRangePrefixTree.java@@ -35,7 +35,7 @@ import org.locationtech.spatial4j.shape.SpatialRelation;import static java.time.format.DateTimeFormatter.ISO_DATE_TIME;-public class DateRangePrefixTreeTest extends LuceneTestCase {+public class TestDateRangePrefixTree extends LuceneTestCase {@ParametersFactory(argumentFormatting = "calendar=%s")public static Iterable<Object[]> parameters() {@@ -47,7 +47,7 @@ public class DateRangePrefixTreeTest extends LuceneTestCase {private final DateRangePrefixTree tree;- public DateRangePrefixTreeTest(String suiteName, Calendar templateCal) {+ public TestDateRangePrefixTree(String suiteName, Calendar templateCal) {tree = new DateRangePrefixTree(templateCal);}diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/tree/S2PrefixTreeTest.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/tree/TestS2PrefixTree.javasimilarity index 98%rename from lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/tree/S2PrefixTreeTest.javarename to lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/tree/TestS2PrefixTree.javaindex f3bfe3e72f0..9593e3cb10f 100644--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/tree/S2PrefixTreeTest.java+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/tree/TestS2PrefixTree.java@@ -30,7 +30,7 @@ import org.locationtech.spatial4j.shape.Point;/*** Test for S2 Spatial prefix tree.*/-public class S2PrefixTreeTest extends LuceneTestCase{+public class TestS2PrefixTree extends LuceneTestCase{@Test@Repeat(iterations = 10)diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTreeTest.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/tree/TestSpatialPrefixTree.javasimilarity index 98%rename from lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTreeTest.javarename to lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/tree/TestSpatialPrefixTree.javaindex cc63b5e17ca..3325e50c03a 100644--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTreeTest.java+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/tree/TestSpatialPrefixTree.java@@ -37,7 +37,7 @@ import org.junit.Test;import java.util.ArrayList;import java.util.List;-public class SpatialPrefixTreeTest extends SpatialTestCase {+public class TestSpatialPrefixTree extends SpatialTestCase {//TODO plug in others and test themprivate SpatialContext ctx;diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/query/SpatialArgsParserTest.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/query/TestSpatialArgsParser.javasimilarity index 97%rename from lucene/spatial-extras/src/test/org/apache/lucene/spatial/query/SpatialArgsParserTest.javarename to lucene/spatial-extras/src/test/org/apache/lucene/spatial/query/TestSpatialArgsParser.javaindex 9724c6519b2..c3b5d160e81 100644--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/query/SpatialArgsParserTest.java+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/query/TestSpatialArgsParser.java@@ -24,7 +24,7 @@ import org.junit.Test;import java.text.ParseException;//Tests SpatialOperation somewhat too-public class SpatialArgsParserTest extends LuceneTestCase {+public class TestSpatialArgsParser extends LuceneTestCase {private SpatialContext ctx = SpatialContext.GEO;diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/serialized/SerializedStrategyTest.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/serialized/TestSerializedStrategy.javasimilarity index 96%rename from lucene/spatial-extras/src/test/org/apache/lucene/spatial/serialized/SerializedStrategyTest.javarename to lucene/spatial-extras/src/test/org/apache/lucene/spatial/serialized/TestSerializedStrategy.javaindex 8466ae13d4f..88f712a8af8 100644--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/serialized/SerializedStrategyTest.java+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/serialized/TestSerializedStrategy.java@@ -24,7 +24,7 @@ import org.junit.Before;import org.junit.Test;import org.locationtech.spatial4j.context.SpatialContext;-public class SerializedStrategyTest extends StrategyTestCase {+public class TestSerializedStrategy extends StrategyTestCase {@Before@Overridediff --git a/solr/core/src/java/org/apache/solr/filestore/DistribPackageStore.java b/solr/core/src/java/org/apache/solr/filestore/DistribPackageStore.javaindex 37aaeb2b050..c7b96533d46 100644--- a/solr/core/src/java/org/apache/solr/filestore/DistribPackageStore.java+++ b/solr/core/src/java/org/apache/solr/filestore/DistribPackageStore.java@@ -637,4 +637,4 @@ public class DistribPackageStore implements PackageStore {log.error("", e);}}-}+}\ No newline at end of file