You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by so...@apache.org on 2020/11/17 13:13:32 UTC

[lucene-solr] branch master updated: LUCENE-8626: Standardize Lucene test file naming Part 2 (#2053)

This is an automated email from the ASF dual-hosted git repository.

sokolov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/master by this push:
     new b9a93cf  LUCENE-8626: Standardize Lucene test file naming Part 2 (#2053)
b9a93cf is described below

commit b9a93cf6952fa785fc5bf4d95f15e978e269baf2
Author: Marcus <ma...@gmail.com>
AuthorDate: Tue Nov 17 05:13:13 2020 -0800

    LUCENE-8626: Standardize Lucene test file naming Part 2 (#2053)
---
 ...GroupHeadsCollectorTest.java => TestAllGroupHeadsCollector.java} | 2 +-
 .../{AllGroupsCollectorTest.java => TestAllGroupsCollector.java}    | 2 +-
 .../grouping/{BlockGroupingTest.java => TestBlockGrouping.java}     | 2 +-
 ...nctValuesCollectorTest.java => TestDistinctValuesCollector.java} | 2 +-
 ...angeGroupSelectorTest.java => TestDoubleRangeGroupSelector.java} | 2 +-
 .../{GroupFacetCollectorTest.java => TestGroupFacetCollector.java}  | 2 +-
 .../grouping/{GroupingSearchTest.java => TestGroupingSearch.java}   | 2 +-
 ...gRangeGroupSelectorTest.java => TestLongRangeGroupSelector.java} | 2 +-
 .../{TermGroupSelectorTest.java => TestTermGroupSelector.java}      | 2 +-
 .../search/grouping/{TopGroupsTest.java => TestTopGroups.java}      | 2 +-
 ...urceGroupSelectorTest.java => TestValueSourceGroupSelector.java} | 2 +-
 .../{CommonTermsQueryTest.java => TestCommonTermsQuery.java}        | 6 +++---
 ...onClientTest.java => TestIndexAndTaxonomyReplicationClient.java} | 2 +-
 ...dTaxonomyRevisionTest.java => TestIndexAndTaxonomyRevision.java} | 2 +-
 ...exReplicationClientTest.java => TestIndexReplicationClient.java} | 2 +-
 .../replicator/{IndexRevisionTest.java => TestIndexRevision.java}   | 2 +-
 .../{LocalReplicatorTest.java => TestLocalReplicator.java}          | 2 +-
 .../replicator/{SessionTokenTest.java => TestSessionToken.java}     | 2 +-
 .../http/{HttpReplicatorTest.java => TestHttpReplicator.java}       | 2 +-
 .../{FuzzyLikeThisQueryTest.java => TestFuzzyLikeThisQuery.java}    | 2 +-
 .../{DistanceStrategyTest.java => TestDistanceStrategy.java}        | 4 ++--
 .../lucene/spatial/{PortedSolr3Test.java => TestPortedSolr3.java}   | 4 ++--
 .../lucene/spatial/{SpatialArgsTest.java => TestSpatialArgs.java}   | 2 +-
 .../{CompositeStrategyTest.java => TestCompositeStrategy.java}      | 2 +-
 .../prefix/{DateNRStrategyTest.java => TestDateNRStrategy.java}     | 2 +-
 .../{HeatmapFacetCounterTest.java => TestHeatmapFacetCounter.java}  | 2 +-
 .../spatial/prefix/{JtsPolygonTest.java => TestJtsPolygon.java}     | 4 ++--
 .../{NumberRangeFacetsTest.java => TestNumberRangeFacets.java}      | 2 +-
 ...yPrefixTreeTest.java => TestRandomSpatialOpFuzzyPrefixTree.java} | 4 ++--
 ...fixTree50Test.java => TestRandomSpatialOpFuzzyPrefixTree50.java} | 2 +-
 .../{DateRangePrefixTreeTest.java => TestDateRangePrefixTree.java}  | 4 ++--
 .../prefix/tree/{S2PrefixTreeTest.java => TestS2PrefixTree.java}    | 2 +-
 .../tree/{SpatialPrefixTreeTest.java => TestSpatialPrefixTree.java} | 2 +-
 .../{SpatialArgsParserTest.java => TestSpatialArgsParser.java}      | 2 +-
 .../{SerializedStrategyTest.java => TestSerializedStrategy.java}    | 2 +-
 .../src/java/org/apache/solr/filestore/DistribPackageStore.java     | 2 +-
 36 files changed, 43 insertions(+), 43 deletions(-)

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.java
similarity index 99%
rename from lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java
rename to lucene/grouping/src/test/org/apache/lucene/search/grouping/TestAllGroupHeadsCollector.java
index 2db765a..fef695f 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.java
similarity index 98%
rename from lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupsCollectorTest.java
rename to lucene/grouping/src/test/org/apache/lucene/search/grouping/TestAllGroupsCollector.java
index 0d777f6..ccdf3c3 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.java
similarity index 99%
rename from lucene/grouping/src/test/org/apache/lucene/search/grouping/BlockGroupingTest.java
rename to lucene/grouping/src/test/org/apache/lucene/search/grouping/TestBlockGrouping.java
index fc03dfd..78acbbf 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.java
similarity index 99%
rename from lucene/grouping/src/test/org/apache/lucene/search/grouping/DistinctValuesCollectorTest.java
rename to lucene/grouping/src/test/org/apache/lucene/search/grouping/TestDistinctValuesCollector.java
index a768c4c..cedbeea 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.java
similarity index 97%
rename from lucene/grouping/src/test/org/apache/lucene/search/grouping/DoubleRangeGroupSelectorTest.java
rename to lucene/grouping/src/test/org/apache/lucene/search/grouping/TestDoubleRangeGroupSelector.java
index c938589..5350a04 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> {
 
   @Override
   protected 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.java
similarity index 99%
rename from lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java
rename to lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGroupFacetCollector.java
index 61a5722..fffcd69 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.java
similarity index 99%
rename from lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupingSearchTest.java
rename to lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGroupingSearch.java
index d09513c..d0c0551 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.java
similarity index 97%
rename from lucene/grouping/src/test/org/apache/lucene/search/grouping/LongRangeGroupSelectorTest.java
rename to lucene/grouping/src/test/org/apache/lucene/search/grouping/TestLongRangeGroupSelector.java
index 6075f70..7384a56 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> {
 
   @Override
   protected 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.java
similarity index 97%
rename from lucene/grouping/src/test/org/apache/lucene/search/grouping/TermGroupSelectorTest.java
rename to lucene/grouping/src/test/org/apache/lucene/search/grouping/TestTermGroupSelector.java
index 831a014..e55fd64 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> {
 
   @Override
   protected 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.java
similarity index 99%
rename from lucene/grouping/src/test/org/apache/lucene/search/grouping/TopGroupsTest.java
rename to lucene/grouping/src/test/org/apache/lucene/search/grouping/TestTopGroups.java
index e27fc07..6ba5ba1 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.java
similarity index 96%
rename from lucene/grouping/src/test/org/apache/lucene/search/grouping/ValueSourceGroupSelectorTest.java
rename to lucene/grouping/src/test/org/apache/lucene/search/grouping/TestValueSourceGroupSelector.java
index 941ad8a..9e652b6 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> {
 
   @Override
   protected 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.java
similarity index 99%
rename from lucene/queries/src/test/org/apache/lucene/queries/CommonTermsQueryTest.java
rename to lucene/queries/src/test/org/apache/lucene/queries/TestCommonTermsQuery.java
index 9b3ab88..9ec1bd2 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) {
       
       @Override
diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyReplicationClientTest.java b/lucene/replicator/src/test/org/apache/lucene/replicator/TestIndexAndTaxonomyReplicationClient.java
similarity index 99%
rename from lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyReplicationClientTest.java
rename to lucene/replicator/src/test/org/apache/lucene/replicator/TestIndexAndTaxonomyReplicationClient.java
index 7b4a28b..3303a6c 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.java
similarity index 99%
rename from lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyRevisionTest.java
rename to lucene/replicator/src/test/org/apache/lucene/replicator/TestIndexAndTaxonomyRevision.java
index 214c47e..78c7413 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.java
similarity index 99%
rename from lucene/replicator/src/test/org/apache/lucene/replicator/IndexReplicationClientTest.java
rename to lucene/replicator/src/test/org/apache/lucene/replicator/TestIndexReplicationClient.java
index 3d72492..129af31 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.java
similarity index 98%
rename from lucene/replicator/src/test/org/apache/lucene/replicator/IndexRevisionTest.java
rename to lucene/replicator/src/test/org/apache/lucene/replicator/TestIndexRevision.java
index 1477d28..993a7ed 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 {
   
   @Test
   public 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.java
similarity index 99%
rename from lucene/replicator/src/test/org/apache/lucene/replicator/LocalReplicatorTest.java
rename to lucene/replicator/src/test/org/apache/lucene/replicator/TestLocalReplicator.java
index 155950a..3b113f7 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.java
similarity index 97%
rename from lucene/replicator/src/test/org/apache/lucene/replicator/SessionTokenTest.java
rename to lucene/replicator/src/test/org/apache/lucene/replicator/TestSessionToken.java
index d595a7d..ed2643a 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 {
   
   @Test
   public 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.java
similarity index 98%
rename from lucene/replicator/src/test/org/apache/lucene/replicator/http/HttpReplicatorTest.java
rename to lucene/replicator/src/test/org/apache/lucene/replicator/http/TestHttpReplicator.java
index f46c356..6f65552 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.java
similarity index 99%
rename from lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/FuzzyLikeThisQueryTest.java
rename to lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestFuzzyLikeThisQuery.java
index 95c6cca..2dbd1ee 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.java
similarity index 97%
rename from lucene/spatial-extras/src/test/org/apache/lucene/spatial/DistanceStrategyTest.java
rename to lucene/spatial-extras/src/test/org/apache/lucene/spatial/TestDistanceStrategy.java
index 97c1583..a4b3ec3 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.java
similarity index 98%
rename from lucene/spatial-extras/src/test/org/apache/lucene/spatial/PortedSolr3Test.java
rename to lucene/spatial-extras/src/test/org/apache/lucene/spatial/TestPortedSolr3.java
index 244aae7..bce5cf0 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.java
similarity index 97%
rename from lucene/spatial-extras/src/test/org/apache/lucene/spatial/SpatialArgsTest.java
rename to lucene/spatial-extras/src/test/org/apache/lucene/spatial/TestSpatialArgs.java
index da351fc..ba771af 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 {
 
   @Test
   public 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.java
similarity index 98%
rename from lucene/spatial-extras/src/test/org/apache/lucene/spatial/composite/CompositeStrategyTest.java
rename to lucene/spatial-extras/src/test/org/apache/lucene/spatial/composite/TestCompositeStrategy.java
index 80bda53..5b0b534 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.java
similarity index 98%
rename from lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/DateNRStrategyTest.java
rename to lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestDateNRStrategy.java
index 2571afd..1f98d47 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.java
similarity index 99%
rename from lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/HeatmapFacetCounterTest.java
rename to lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestHeatmapFacetCounter.java
index 5b71985..1080546 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.java
similarity index 98%
rename from lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/JtsPolygonTest.java
rename to lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestJtsPolygon.java
index 47a92e6..dc3c8e5 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.java
similarity index 99%
rename from lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/NumberRangeFacetsTest.java
rename to lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestNumberRangeFacets.java
index 3ddf0c7..6de4b82 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.java
similarity index 99%
rename from lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/RandomSpatialOpFuzzyPrefixTreeTest.java
rename to lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestRandomSpatialOpFuzzyPrefixTree.java
index 6349060..c6492e9 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.java
similarity index 92%
rename from lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/RandomSpatialOpFuzzyPrefixTree50Test.java
rename to lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestRandomSpatialOpFuzzyPrefixTree50.java
index e932fe9..ec9c2e1 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.java
similarity index 98%
rename from lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/tree/DateRangePrefixTreeTest.java
rename to lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/tree/TestDateRangePrefixTree.java
index c14026f..95cd4b8 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.java
similarity index 98%
rename from lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/tree/S2PrefixTreeTest.java
rename to lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/tree/TestS2PrefixTree.java
index f3bfe3e..9593e3c 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.java
similarity index 98%
rename from lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTreeTest.java
rename to lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/tree/TestSpatialPrefixTree.java
index cc63b5e..3325e50 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 them
   private 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.java
similarity index 97%
rename from lucene/spatial-extras/src/test/org/apache/lucene/spatial/query/SpatialArgsParserTest.java
rename to lucene/spatial-extras/src/test/org/apache/lucene/spatial/query/TestSpatialArgsParser.java
index 9724c65..c3b5d16 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.java
similarity index 96%
rename from lucene/spatial-extras/src/test/org/apache/lucene/spatial/serialized/SerializedStrategyTest.java
rename to lucene/spatial-extras/src/test/org/apache/lucene/spatial/serialized/TestSerializedStrategy.java
index 8466ae1..88f712a 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
   @Override
diff --git a/solr/core/src/java/org/apache/solr/filestore/DistribPackageStore.java b/solr/core/src/java/org/apache/solr/filestore/DistribPackageStore.java
index 37aaeb2..c7b9653 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