You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2020/10/30 06:35:22 UTC

[lucene-solr] branch master updated: LUCENE-8626: Standardize Lucene Test Files (#2026)

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

datcm 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 57729c9  LUCENE-8626: Standardize Lucene Test Files (#2026)
57729c9 is described below

commit 57729c9acaace26f37644c42a0b0889508e589ba
Author: Marcus <ma...@gmail.com>
AuthorDate: Thu Oct 29 23:34:55 2020 -0700

    LUCENE-8626: Standardize Lucene Test Files (#2026)
---
 .../{HighlighterTest.java => TestHighlighter.java} | 88 +++++++++++-----------
 ...rPhraseTest.java => TestHighlighterPhrase.java} |  2 +-
 .../highlight/{MissesTest.java => TestMisses.java} |  2 +-
 ...erTest.java => TestOffsetLimitTokenFilter.java} |  2 +-
 ...TokenSourcesTest.java => TestTokenSources.java} |  2 +-
 ...ueryTest.java => TestHighlightCustomQuery.java} |  2 +-
 ...rTest.java => TestLengthGoalBreakIterator.java} |  2 +-
 ....java => TestBreakIteratorBoundaryScanner.java} |  2 +-
 ...terTest.java => TestFastVectorHighlighter.java} |  2 +-
 ...hraseListTest.java => TestFieldPhraseList.java} |  2 +-
 .../{FieldQueryTest.java => TestFieldQuery.java}   |  2 +-
 ...dTermStackTest.java => TestFieldTermStack.java} |  2 +-
 ...eSynonymTest.java => TestIndexTimeSynonym.java} |  2 +-
 ...st.java => TestScoreOrderFragmentsBuilder.java} |  2 +-
 ...nerTest.java => TestSimpleBoundaryScanner.java} |  2 +-
 ...derTest.java => TestSimpleFragListBuilder.java} |  2 +-
 ...erTest.java => TestSimpleFragmentsBuilder.java} |  2 +-
 ...derTest.java => TestSingleFragListBuilder.java} |  2 +-
 ...rTest.java => TestWeightedFragListBuilder.java} |  2 +-
 ...hCodeTest.java => TestQueryEqualsHashCode.java} |  2 +-
 .../spatial4j/{Geo3dTest.java => TestGeo3d.java}   |  2 +-
 .../{Geo3dRptTest.java => TestGeo3dRpt.java}       |  2 +-
 ... => TestGeo3dShapeSphereModelRectRelation.java} |  4 +-
 ...a => TestGeo3dShapeWGS84ModelRectRelation.java} |  4 +-
 ...a => TestCompositeGeoPolygonRelationships.java} |  2 +-
 .../geom/{GeoBBoxTest.java => TestGeoBBox.java}    |  2 +-
 .../{GeoCircleTest.java => TestGeoCircle.java}     |  2 +-
 ...xPolygonTest.java => TestGeoConvexPolygon.java} |  2 +-
 ...xactCircleTest.java => TestGeoExactCircle.java} |  2 +-
 .../geom/{GeoModelTest.java => TestGeoModel.java}  |  2 +-
 .../geom/{GeoPathTest.java => TestGeoPath.java}    |  2 +-
 .../geom/{GeoPointTest.java => TestGeoPoint.java}  |  2 +-
 .../{GeoPolygonTest.java => TestGeoPolygon.java}   |  2 +-
 .../geom/{PlaneTest.java => TestPlane.java}        |  2 +-
 ...ryCodecTest.java => TestRandomBinaryCodec.java} |  2 +-
 ...oPolygonTest.java => TestRandomGeoPolygon.java} |  2 +-
 ...st.java => TestRandomGeoShapeRelationship.java} |  2 +-
 .../{RandomPlaneTest.java => TestRandomPlane.java} |  2 +-
 ...java => TestSimpleGeoPolygonRelationships.java} |  2 +-
 .../geom/{XYZSolidTest.java => TestXYZSolid.java}  |  2 +-
 40 files changed, 85 insertions(+), 85 deletions(-)

diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestHighlighter.java
similarity index 96%
rename from lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
rename to lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestHighlighter.java
index 2e70317..2c989d1 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestHighlighter.java
@@ -101,7 +101,7 @@ import org.w3c.dom.NodeList;
  * JUnit Test for Highlighter class.
  *
  */
-public class HighlighterTest extends BaseTokenStreamTestCase implements Formatter {
+public class TestHighlighter extends BaseTokenStreamTestCase implements Formatter {
 
   private IndexReader reader;
   static final String FIELD_NAME = "contents";
@@ -805,7 +805,7 @@ public class HighlighterTest extends BaseTokenStreamTestCase implements Formatte
       @Override
       public void run() throws Exception {
         mode = QUERY;
-        doStandardHighlights(analyzer, searcher, hits, query, HighlighterTest.this);
+        doStandardHighlights(analyzer, searcher, hits, query, TestHighlighter.this);
       }
     };
 
@@ -850,7 +850,7 @@ public class HighlighterTest extends BaseTokenStreamTestCase implements Formatte
       @Override
       public void run() throws Exception {
         mode = QUERY;
-        doStandardHighlights(analyzer, searcher, hits, query, HighlighterTest.this);
+        doStandardHighlights(analyzer, searcher, hits, query, TestHighlighter.this);
       }
     };
 
@@ -869,7 +869,7 @@ public class HighlighterTest extends BaseTokenStreamTestCase implements Formatte
       @Override
       public void run() throws Exception {
         mode = QUERY;
-        doStandardHighlights(analyzer, searcher, hits, query, HighlighterTest.this);
+        doStandardHighlights(analyzer, searcher, hits, query, TestHighlighter.this);
       }
     };
 
@@ -885,7 +885,7 @@ public class HighlighterTest extends BaseTokenStreamTestCase implements Formatte
       public void run() throws Exception {
         numHighlights = 0;
         doSearching(new TermQuery(new Term(FIELD_NAME, "kennedy")));
-        doStandardHighlights(analyzer, searcher, hits, query, HighlighterTest.this);
+        doStandardHighlights(analyzer, searcher, hits, query, TestHighlighter.this);
         assertTrue("Failed to find correct number of highlights " + numHighlights + " found",
             numHighlights == 4);
       }
@@ -910,7 +910,7 @@ public class HighlighterTest extends BaseTokenStreamTestCase implements Formatte
           doSearching(new ConstantScoreQuery(new TermQuery(new Term(FIELD_NAME,
               "kennedy"))));
         }
-        doStandardHighlights(analyzer, searcher, hits, query, HighlighterTest.this);
+        doStandardHighlights(analyzer, searcher, hits, query, TestHighlighter.this);
         assertTrue("Failed to find correct number of highlights " + numHighlights + " found",
             numHighlights == 4);
       }
@@ -928,7 +928,7 @@ public class HighlighterTest extends BaseTokenStreamTestCase implements Formatte
         FuzzyQuery fuzzyQuery = new FuzzyQuery(new Term(FIELD_NAME, "kinnedy"), 2);
         fuzzyQuery.setRewriteMethod(MultiTermQuery.SCORING_BOOLEAN_REWRITE);
         doSearching(fuzzyQuery);
-        doStandardHighlights(analyzer, searcher, hits, query, HighlighterTest.this, true);
+        doStandardHighlights(analyzer, searcher, hits, query, TestHighlighter.this, true);
         assertTrue("Failed to find correct number of highlights " + numHighlights + " found",
             numHighlights == 4);
       }
@@ -946,7 +946,7 @@ public class HighlighterTest extends BaseTokenStreamTestCase implements Formatte
         WildcardQuery wildcardQuery = new WildcardQuery(new Term(FIELD_NAME, "k?nnedy"));
         wildcardQuery.setRewriteMethod(MultiTermQuery.SCORING_BOOLEAN_REWRITE);
         doSearching(wildcardQuery);
-        doStandardHighlights(analyzer, searcher, hits, query, HighlighterTest.this);
+        doStandardHighlights(analyzer, searcher, hits, query, TestHighlighter.this);
         assertTrue("Failed to find correct number of highlights " + numHighlights + " found",
             numHighlights == 4);
       }
@@ -964,7 +964,7 @@ public class HighlighterTest extends BaseTokenStreamTestCase implements Formatte
         WildcardQuery wildcardQuery = new WildcardQuery(new Term(FIELD_NAME, "k*dy"));
         wildcardQuery.setRewriteMethod(MultiTermQuery.SCORING_BOOLEAN_REWRITE);
         doSearching(wildcardQuery);
-        doStandardHighlights(analyzer, searcher, hits, query, HighlighterTest.this);
+        doStandardHighlights(analyzer, searcher, hits, query, TestHighlighter.this);
         assertTrue("Failed to find correct number of highlights " + numHighlights + " found",
             numHighlights == 5);
       }
@@ -994,7 +994,7 @@ public class HighlighterTest extends BaseTokenStreamTestCase implements Formatte
         query = rangeQuery;
         doSearching(query);
 
-        doStandardHighlights(analyzer, searcher, hits, query, HighlighterTest.this);
+        doStandardHighlights(analyzer, searcher, hits, query, TestHighlighter.this);
         assertTrue("Failed to find correct number of highlights " + numHighlights + " found",
             numHighlights == 5);
       }
@@ -1023,7 +1023,7 @@ public class HighlighterTest extends BaseTokenStreamTestCase implements Formatte
       TokenStream tokenStream = getAnyTokenStream(FIELD_NAME, docId);
       int maxNumFragmentsRequired = 2;
       String fragmentSeparator = "...";
-      QueryScorer scorer = new QueryScorer(query, HighlighterTest.FIELD_NAME);
+      QueryScorer scorer = new QueryScorer(query, TestHighlighter.FIELD_NAME);
 
       Highlighter highlighter = new Highlighter(this, scorer);
 
@@ -1075,7 +1075,7 @@ public class HighlighterTest extends BaseTokenStreamTestCase implements Formatte
       TokenStream tokenStream = getAnyTokenStream(FIELD_NAME, docId);
       int maxNumFragmentsRequired = 2;
       String fragmentSeparator = "...";
-      QueryScorer scorer = new QueryScorer(query, "random_field", HighlighterTest.FIELD_NAME);
+      QueryScorer scorer = new QueryScorer(query, "random_field", TestHighlighter.FIELD_NAME);
 
       Highlighter highlighter = new Highlighter(this, scorer);
 
@@ -1097,7 +1097,7 @@ public class HighlighterTest extends BaseTokenStreamTestCase implements Formatte
         numHighlights = 0;
         PhraseQuery phraseQuery = new PhraseQuery(FIELD_NAME, "john", "kennedy");
         doSearching(phraseQuery);
-        doStandardHighlights(analyzer, searcher, hits, query, HighlighterTest.this);
+        doStandardHighlights(analyzer, searcher, hits, query, TestHighlighter.this);
         // Currently highlights "John" and "Kennedy" separately
         assertTrue("Failed to find correct number of highlights " + numHighlights + " found",
             numHighlights == 2);
@@ -1118,7 +1118,7 @@ public class HighlighterTest extends BaseTokenStreamTestCase implements Formatte
 
         SpanNearQuery snq = new SpanNearQuery(clauses, 1, true);
         doSearching(snq);
-        doStandardHighlights(analyzer, searcher, hits, query, HighlighterTest.this);
+        doStandardHighlights(analyzer, searcher, hits, query, TestHighlighter.this);
         // Currently highlights "John" and "Kennedy" separately
         assertTrue("Failed to find correct number of highlights " + numHighlights + " found",
             numHighlights == 2);
@@ -1160,7 +1160,7 @@ public class HighlighterTest extends BaseTokenStreamTestCase implements Formatte
         bq.add(TermRangeQuery.newStringRange("contents", "john", "john", true, true), Occur.FILTER);
 
         doSearching(bq.build());
-        doStandardHighlights(analyzer, searcher, hits, query, HighlighterTest.this);
+        doStandardHighlights(analyzer, searcher, hits, query, TestHighlighter.this);
         // Currently highlights "John" and "Kennedy" separately
         assertTrue("Failed to find correct number of highlights " + numHighlights + " found",
             numHighlights == 2);
@@ -1182,7 +1182,7 @@ public class HighlighterTest extends BaseTokenStreamTestCase implements Formatte
         bq.add(TermRangeQuery.newStringRange("contents", "john", "john", true, true), Occur.FILTER);
 
         doSearching(bq.build());
-        doStandardHighlights(analyzer, searcher, hits, query, HighlighterTest.this);
+        doStandardHighlights(analyzer, searcher, hits, query, TestHighlighter.this);
         // Currently highlights "John" and "Kennedy" separately
         assertTrue("Failed to find correct number of highlights " + numHighlights + " found",
             numHighlights == 2);
@@ -1205,7 +1205,7 @@ public class HighlighterTest extends BaseTokenStreamTestCase implements Formatte
         booleanQuery.add(prefixQuery, Occur.SHOULD);
 
         doSearching(booleanQuery.build());
-        doStandardHighlights(analyzer, searcher, hits, query, HighlighterTest.this);
+        doStandardHighlights(analyzer, searcher, hits, query, TestHighlighter.this);
         assertTrue("Failed to find correct number of highlights " + numHighlights + " found",
             numHighlights == 5);
       }
@@ -1226,7 +1226,7 @@ public class HighlighterTest extends BaseTokenStreamTestCase implements Formatte
         query.add(new TermQuery(new Term(FIELD_NAME, "kennedy")), Occur.SHOULD);
 
         doSearching(query.build());
-        doStandardHighlights(analyzer, searcher, hits, query.build(), HighlighterTest.this);
+        doStandardHighlights(analyzer, searcher, hits, query.build(), TestHighlighter.this);
         assertTrue("Failed to find correct number of highlights " + numHighlights + " found",
             numHighlights == 5);
       }
@@ -1249,7 +1249,7 @@ public class HighlighterTest extends BaseTokenStreamTestCase implements Formatte
           TokenStream tokenStream = getAnyTokenStream(FIELD_NAME, docId);
 
           Highlighter highlighter = getHighlighter(query, FIELD_NAME,
-              HighlighterTest.this);
+              TestHighlighter.this);
           highlighter.setTextFragmenter(new SimpleFragmenter(40));
           String result = highlighter.getBestFragment(tokenStream, text);
           if (VERBOSE) System.out.println("\t" + result);
@@ -1264,7 +1264,7 @@ public class HighlighterTest extends BaseTokenStreamTestCase implements Formatte
           String text = doc.get(FIELD_NAME);
           TokenStream tokenStream = getAnyTokenStream(FIELD_NAME, docId);
           Highlighter highlighter = getHighlighter(query, FIELD_NAME,
-              HighlighterTest.this);
+              TestHighlighter.this);
           highlighter.getBestFragment(tokenStream, text);
         }
         assertTrue("Failed to find correct number of highlights " + numHighlights + " found",
@@ -1278,7 +1278,7 @@ public class HighlighterTest extends BaseTokenStreamTestCase implements Formatte
           TokenStream tokenStream = getAnyTokenStream(FIELD_NAME, docId);
 
           Highlighter highlighter = getHighlighter(query, FIELD_NAME,
-              HighlighterTest.this);
+              TestHighlighter.this);
           highlighter.getBestFragments(tokenStream, text, 10);
         }
         assertTrue("Failed to find correct number of highlights " + numHighlights + " found",
@@ -1326,7 +1326,7 @@ public class HighlighterTest extends BaseTokenStreamTestCase implements Formatte
         positionSpans.add(new PositionSpan(14, 14));
         wTerms[1].addPositionSpans(positionSpans);
 
-        Highlighter highlighter = getHighlighter(wTerms, HighlighterTest.this);// new
+        Highlighter highlighter = getHighlighter(wTerms, TestHighlighter.this);// new
         // Highlighter(new
         // QueryTermScorer(wTerms));
         TokenStream tokenStream = analyzer.tokenStream(FIELD_NAME, texts[0]);
@@ -1339,7 +1339,7 @@ public class HighlighterTest extends BaseTokenStreamTestCase implements Formatte
         // readjust weights
         wTerms[1].setWeight(50f);
         tokenStream = analyzer.tokenStream(FIELD_NAME, texts[0]);
-        highlighter = getHighlighter(wTerms, HighlighterTest.this);
+        highlighter = getHighlighter(wTerms, TestHighlighter.this);
         highlighter.setTextFragmenter(new SimpleFragmenter(2));
 
         result = highlighter.getBestFragment(tokenStream, texts[0]).trim();
@@ -1371,7 +1371,7 @@ public class HighlighterTest extends BaseTokenStreamTestCase implements Formatte
           query.add(new TermQuery(new Term("bookid", "soccer")), Occur.SHOULD);
           query.add(new TermQuery(new Term("bookid", "footie")), Occur.SHOULD);
 
-          Highlighter highlighter = getHighlighter(query.build(), null, HighlighterTest.this);
+          Highlighter highlighter = getHighlighter(query.build(), null, TestHighlighter.this);
 
           // Get 3 best fragments and separate with a "..."
           TokenStream tokenStream = analyzer.tokenStream(null, s);
@@ -1396,13 +1396,13 @@ public class HighlighterTest extends BaseTokenStreamTestCase implements Formatte
       public void run() throws Exception {
         numHighlights = 0;
         doSearching(new TermQuery(new Term(FIELD_NAME, "kennedy")));
-        // new Highlighter(HighlighterTest.this, new QueryTermScorer(query));
+        // new Highlighter(TestHighlighter.this, new QueryTermScorer(query));
 
         for (int i = 0; i < hits.totalHits.value; i++) {
           String text = searcher.doc(hits.scoreDocs[i].doc).get(FIELD_NAME);
           TokenStream tokenStream = analyzer.tokenStream(FIELD_NAME, text);
           Highlighter highlighter = getHighlighter(query, FIELD_NAME,
-              HighlighterTest.this);
+              TestHighlighter.this);
           String result = highlighter.getBestFragment(tokenStream, text);
           if (VERBOSE) System.out.println("\t" + result);
         }
@@ -1428,7 +1428,7 @@ public class HighlighterTest extends BaseTokenStreamTestCase implements Formatte
           TokenStream tokenStream = getAnyTokenStream(FIELD_NAME, docId);
 
           Highlighter highlighter = getHighlighter(query, FIELD_NAME,
-              HighlighterTest.this);// new Highlighter(this, new
+              TestHighlighter.this);// new Highlighter(this, new
           // QueryTermScorer(query));
           highlighter.setTextFragmenter(new SimpleFragmenter(20));
           String stringResults[] = highlighter.getBestFragments(tokenStream, text, 10);
@@ -1466,7 +1466,7 @@ public class HighlighterTest extends BaseTokenStreamTestCase implements Formatte
         doSearching(new TermQuery(new Term(FIELD_NAME, "meat")));
         TokenStream tokenStream = analyzer.tokenStream(FIELD_NAME, texts[0]);
         Highlighter highlighter = getHighlighter(query, FIELD_NAME,
-            HighlighterTest.this);// new Highlighter(this, new
+            TestHighlighter.this);// new Highlighter(this, new
         // QueryTermScorer(query));
         highlighter.setMaxDocCharsToAnalyze(30);
 
@@ -1615,7 +1615,7 @@ public class HighlighterTest extends BaseTokenStreamTestCase implements Formatte
           final Document doc = searcher.doc(docId);
           String text = doc.get(FIELD_NAME);
           TokenStream tokenStream = getAnyTokenStream(FIELD_NAME, docId);
-          Highlighter highlighter = getHighlighter(query.build(), FIELD_NAME, HighlighterTest.this, false);
+          Highlighter highlighter = getHighlighter(query.build(), FIELD_NAME, TestHighlighter.this, false);
 
           highlighter.setTextFragmenter(new SimpleFragmenter(40));
 
@@ -1645,7 +1645,7 @@ public class HighlighterTest extends BaseTokenStreamTestCase implements Formatte
         for (String text : texts) {
           TokenStream tokenStream = analyzer.tokenStream(FIELD_NAME, text);
           Highlighter highlighter = getHighlighter(query, FIELD_NAME,
-              HighlighterTest.this);
+              TestHighlighter.this);
           String result = highlighter.getBestFragment(tokenStream, text);
           assertNull("The highlight result should be null for text with no query terms", result);
         }
@@ -1866,27 +1866,27 @@ public class HighlighterTest extends BaseTokenStreamTestCase implements Formatte
         String result;
 
         query = new TermQuery(new Term("text", "foo"));
-        highlighter = getHighlighter(query, "text", HighlighterTest.this);
+        highlighter = getHighlighter(query, "text", TestHighlighter.this);
         result = highlighter.getBestFragments(getTS2(), s, 3, "...");
         assertEquals("Hi-Speed10 <B>foo</B>", result);
 
         query = new TermQuery(new Term("text", "10"));
-        highlighter = getHighlighter(query, "text", HighlighterTest.this);
+        highlighter = getHighlighter(query, "text", TestHighlighter.this);
         result = highlighter.getBestFragments(getTS2(), s, 3, "...");
         assertEquals("Hi-Speed<B>10</B> foo", result);
 
         query = new TermQuery(new Term("text", "hi"));
-        highlighter = getHighlighter(query, "text", HighlighterTest.this);
+        highlighter = getHighlighter(query, "text", TestHighlighter.this);
         result = highlighter.getBestFragments(getTS2(), s, 3, "...");
         assertEquals("<B>Hi</B>-Speed10 foo", result);
 
         query = new TermQuery(new Term("text", "speed"));
-        highlighter = getHighlighter(query, "text", HighlighterTest.this);
+        highlighter = getHighlighter(query, "text", TestHighlighter.this);
         result = highlighter.getBestFragments(getTS2(), s, 3, "...");
         assertEquals("Hi-<B>Speed</B>10 foo", result);
 
         query = new TermQuery(new Term("text", "hispeed"));
-        highlighter = getHighlighter(query, "text", HighlighterTest.this);
+        highlighter = getHighlighter(query, "text", TestHighlighter.this);
         result = highlighter.getBestFragments(getTS2(), s, 3, "...");
         assertEquals("<B>Hi-Speed</B>10 foo", result);
 
@@ -1895,39 +1895,39 @@ public class HighlighterTest extends BaseTokenStreamTestCase implements Formatte
         booleanQuery.add(new TermQuery(new Term("text", "speed")), Occur.SHOULD);
 
         query = booleanQuery.build();
-        highlighter = getHighlighter(query, "text", HighlighterTest.this);
+        highlighter = getHighlighter(query, "text", TestHighlighter.this);
         result = highlighter.getBestFragments(getTS2(), s, 3, "...");
         assertEquals("<B>Hi-Speed</B>10 foo", result);
 
         // ///////////////// same tests, just put the bigger overlapping token
         // first
         query = new TermQuery(new Term("text", "foo"));
-        highlighter = getHighlighter(query, "text", HighlighterTest.this);
+        highlighter = getHighlighter(query, "text", TestHighlighter.this);
         result = highlighter.getBestFragments(getTS2a(), s, 3, "...");
         assertEquals("Hi-Speed10 <B>foo</B>", result);
 
         query = new TermQuery(new Term("text", "10"));
-        highlighter = getHighlighter(query, "text", HighlighterTest.this);
+        highlighter = getHighlighter(query, "text", TestHighlighter.this);
         result = highlighter.getBestFragments(getTS2a(), s, 3, "...");
         assertEquals("Hi-Speed<B>10</B> foo", result);
 
         query = new TermQuery(new Term("text", "hi"));
-        highlighter = getHighlighter(query, "text", HighlighterTest.this);
+        highlighter = getHighlighter(query, "text", TestHighlighter.this);
         result = highlighter.getBestFragments(getTS2a(), s, 3, "...");
         assertEquals("<B>Hi</B>-Speed10 foo", result);
 
         query = new TermQuery(new Term("text", "speed"));
-        highlighter = getHighlighter(query, "text", HighlighterTest.this);
+        highlighter = getHighlighter(query, "text", TestHighlighter.this);
         result = highlighter.getBestFragments(getTS2a(), s, 3, "...");
         assertEquals("Hi-<B>Speed</B>10 foo", result);
 
         query = new TermQuery(new Term("text", "hispeed"));
-        highlighter = getHighlighter(query, "text", HighlighterTest.this);
+        highlighter = getHighlighter(query, "text", TestHighlighter.this);
         result = highlighter.getBestFragments(getTS2a(), s, 3, "...");
         assertEquals("<B>Hi-Speed</B>10 foo", result);
 
         query = booleanQuery.build();
-        highlighter = getHighlighter(query, "text", HighlighterTest.this);
+        highlighter = getHighlighter(query, "text", TestHighlighter.this);
         result = highlighter.getBestFragments(getTS2a(), s, 3, "...");
         assertEquals("<B>Hi-Speed</B>10 foo", result);
       }
@@ -2295,12 +2295,12 @@ final class SynonymTokenizer extends TokenStream {
       for (int i = 0; i < hits.totalHits.value; i++) {
         final int docId = hits.scoreDocs[i].doc;
         final Document doc = searcher.doc(docId);
-        String text = doc.get(HighlighterTest.FIELD_NAME);
+        String text = doc.get(TestHighlighter.FIELD_NAME);
         int maxNumFragmentsRequired = 2;
         String fragmentSeparator = "...";
         Scorer scorer = null;
         TokenStream tokenStream =
-            TokenSources.getTokenStream(HighlighterTest.FIELD_NAME,
+            TokenSources.getTokenStream(TestHighlighter.FIELD_NAME,
                 searcher.getIndexReader().getTermVectors(docId), text, analyzer, -1);
         if (mode == QUERY) {
           scorer = new QueryScorer(query);
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestHighlighterPhrase.java
similarity index 99%
rename from lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java
rename to lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestHighlighterPhrase.java
index 60d9349..8e92456 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestHighlighterPhrase.java
@@ -50,7 +50,7 @@ import org.apache.lucene.store.Directory;
 import org.apache.lucene.util.FixedBitSet;
 import org.apache.lucene.util.LuceneTestCase;
 
-public class HighlighterPhraseTest extends LuceneTestCase {
+public class TestHighlighterPhrase extends LuceneTestCase {
   private static final String FIELD = "text";
 
   public void testConcurrentPhrase() throws IOException, InvalidTokenOffsetsException {
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/MissesTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestMisses.java
similarity index 98%
rename from lucene/highlighter/src/test/org/apache/lucene/search/highlight/MissesTest.java
rename to lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestMisses.java
index 6289faf..02cdc04 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/MissesTest.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestMisses.java
@@ -32,7 +32,7 @@ import org.apache.lucene.search.spans.SpanQuery;
 import org.apache.lucene.search.spans.SpanTermQuery;
 import org.apache.lucene.util.LuceneTestCase;
 
-public class MissesTest extends LuceneTestCase {
+public class TestMisses extends LuceneTestCase {
   public void testTermQuery() throws IOException, InvalidTokenOffsetsException {
     try (Analyzer analyzer = new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false)) {
       final Query query = new TermQuery(new Term("test", "foo"));
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/OffsetLimitTokenFilterTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestOffsetLimitTokenFilter.java
similarity index 97%
rename from lucene/highlighter/src/test/org/apache/lucene/search/highlight/OffsetLimitTokenFilterTest.java
rename to lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestOffsetLimitTokenFilter.java
index 2ebbaf1..f0ce36c 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/OffsetLimitTokenFilterTest.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestOffsetLimitTokenFilter.java
@@ -20,7 +20,7 @@ import java.io.StringReader;
 
 import org.apache.lucene.analysis.*;
 
-public class OffsetLimitTokenFilterTest extends BaseTokenStreamTestCase {
+public class TestOffsetLimitTokenFilter extends BaseTokenStreamTestCase {
   
   public void testFilter() throws Exception {
     // we disable MockTokenizer checks because we will forcefully limit the 
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestTokenSources.java
similarity index 99%
rename from lucene/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java
rename to lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestTokenSources.java
index 30cf711..f23a65d 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestTokenSources.java
@@ -58,7 +58,7 @@ import org.apache.lucene.util.TestUtil;
  *  {@link org.apache.lucene.search.highlight.TokenStreamFromTermVector}
  * indirectly from that.
  */
-public class TokenSourcesTest extends BaseTokenStreamTestCase {
+public class TestTokenSources extends BaseTokenStreamTestCase {
   private static final String FIELD = "text";
 
   private static final class OverlappingTokenStream extends TokenStream {
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/custom/HighlightCustomQueryTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/custom/TestHighlightCustomQuery.java
similarity index 99%
rename from lucene/highlighter/src/test/org/apache/lucene/search/highlight/custom/HighlightCustomQueryTest.java
rename to lucene/highlighter/src/test/org/apache/lucene/search/highlight/custom/TestHighlightCustomQuery.java
index 115a51a9..1011efe 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/custom/HighlightCustomQueryTest.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/custom/TestHighlightCustomQuery.java
@@ -45,7 +45,7 @@ import org.apache.lucene.util.LuceneTestCase;
  * Tests the extensibility of {@link WeightedSpanTermExtractor} and
  * {@link QueryScorer} in a user defined package
  */
-public class HighlightCustomQueryTest extends LuceneTestCase {
+public class TestHighlightCustomQuery extends LuceneTestCase {
 
   private static final String FIELD_NAME = "contents";
 
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/LengthGoalBreakIteratorTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestLengthGoalBreakIterator.java
similarity index 99%
rename from lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/LengthGoalBreakIteratorTest.java
rename to lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestLengthGoalBreakIterator.java
index c240663..0ee73a8 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/LengthGoalBreakIteratorTest.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestLengthGoalBreakIterator.java
@@ -27,7 +27,7 @@ import org.apache.lucene.search.Query;
 import org.apache.lucene.util.LuceneTestCase;
 import org.apache.lucene.util.QueryBuilder;
 
-public class LengthGoalBreakIteratorTest extends LuceneTestCase {
+public class TestLengthGoalBreakIterator extends LuceneTestCase {
   private static final String FIELD = "body";
   private static final float[] ALIGNS = {0.f, 0.5f, 1.f};
 
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/BreakIteratorBoundaryScannerTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestBreakIteratorBoundaryScanner.java
similarity index 98%
rename from lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/BreakIteratorBoundaryScannerTest.java
rename to lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestBreakIteratorBoundaryScanner.java
index 330701d..272226c 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/BreakIteratorBoundaryScannerTest.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestBreakIteratorBoundaryScanner.java
@@ -21,7 +21,7 @@ import java.util.Locale;
 
 import org.apache.lucene.util.LuceneTestCase;
 
-public class BreakIteratorBoundaryScannerTest extends LuceneTestCase {
+public class TestBreakIteratorBoundaryScanner extends LuceneTestCase {
   static final String TEXT =
     "Apache Lucene(TM) is a high-performance, full-featured text search engine library written entirely in Java." +
     "\nIt is a technology suitable for nearly any application that requires\n" +
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FastVectorHighlighterTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestFastVectorHighlighter.java
similarity index 99%
rename from lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FastVectorHighlighterTest.java
rename to lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestFastVectorHighlighter.java
index 069717a..7fbd8a3 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FastVectorHighlighterTest.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestFastVectorHighlighter.java
@@ -58,7 +58,7 @@ import org.apache.lucene.util.automaton.CharacterRunAutomaton;
 import org.apache.lucene.util.automaton.RegExp;
 
 
-public class FastVectorHighlighterTest extends LuceneTestCase {
+public class TestFastVectorHighlighter extends LuceneTestCase {
   
   
   public void testSimpleHighlightTest() throws IOException {
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldPhraseListTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestFieldPhraseList.java
similarity index 99%
rename from lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldPhraseListTest.java
rename to lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestFieldPhraseList.java
index ed120f6..3458f2b 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldPhraseListTest.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestFieldPhraseList.java
@@ -24,7 +24,7 @@ import org.apache.lucene.search.vectorhighlight.FieldPhraseList.WeightedPhraseIn
 import org.apache.lucene.search.vectorhighlight.FieldTermStack.TermInfo;
 import org.apache.lucene.util.TestUtil;
 
-public class FieldPhraseListTest extends AbstractTestCase {
+public class TestFieldPhraseList extends AbstractTestCase {
   
   public void test1TermIndex() throws Exception {
     make1d1fIndex( "a" );
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldQueryTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestFieldQuery.java
similarity index 99%
rename from lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldQueryTest.java
rename to lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestFieldQuery.java
index 135d8a6..2f96961 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldQueryTest.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestFieldQuery.java
@@ -39,7 +39,7 @@ import org.apache.lucene.search.vectorhighlight.FieldQuery.QueryPhraseMap;
 import org.apache.lucene.search.vectorhighlight.FieldTermStack.TermInfo;
 import org.apache.lucene.util.BytesRef;
 
-public class FieldQueryTest extends AbstractTestCase {
+public class TestFieldQuery extends AbstractTestCase {
   private float boost;
 
   /**
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldTermStackTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestFieldTermStack.java
similarity index 99%
rename from lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldTermStackTest.java
rename to lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestFieldTermStack.java
index 3e04713..5284ba9 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldTermStackTest.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestFieldTermStack.java
@@ -22,7 +22,7 @@ import org.apache.lucene.search.WildcardQuery;
 import org.apache.lucene.search.vectorhighlight.FieldTermStack.TermInfo;
 import org.apache.lucene.util.TestUtil;
 
-public class FieldTermStackTest extends AbstractTestCase {
+public class TestFieldTermStack extends AbstractTestCase {
   
   public void test1Term() throws Exception {
     makeIndex();
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/IndexTimeSynonymTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestIndexTimeSynonym.java
similarity index 99%
rename from lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/IndexTimeSynonymTest.java
rename to lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestIndexTimeSynonym.java
index 4b52e03..2bc9c78 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/IndexTimeSynonymTest.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestIndexTimeSynonym.java
@@ -24,7 +24,7 @@ import org.apache.lucene.search.BooleanClause.Occur;
 import org.apache.lucene.search.vectorhighlight.FieldTermStack.TermInfo;
 import org.apache.lucene.util.AttributeImpl;
 
-public class IndexTimeSynonymTest extends AbstractTestCase {
+public class TestIndexTimeSynonym extends AbstractTestCase {
   
   public void testFieldTermStackIndex1wSearch1term() throws Exception {
     makeIndex1w();
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/ScoreOrderFragmentsBuilderTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestScoreOrderFragmentsBuilder.java
similarity index 97%
rename from lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/ScoreOrderFragmentsBuilderTest.java
rename to lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestScoreOrderFragmentsBuilder.java
index 6926d9e..d964feb 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/ScoreOrderFragmentsBuilderTest.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestScoreOrderFragmentsBuilder.java
@@ -22,7 +22,7 @@ import org.apache.lucene.search.BooleanQuery;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.TermQuery;
 
-public class ScoreOrderFragmentsBuilderTest extends AbstractTestCase {
+public class TestScoreOrderFragmentsBuilder extends AbstractTestCase {
   
   public void test3Frags() throws Exception {
     BooleanQuery.Builder query = new BooleanQuery.Builder();
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleBoundaryScannerTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestSimpleBoundaryScanner.java
similarity index 97%
rename from lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleBoundaryScannerTest.java
rename to lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestSimpleBoundaryScanner.java
index 5751731..0e395c4 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleBoundaryScannerTest.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestSimpleBoundaryScanner.java
@@ -18,7 +18,7 @@ package org.apache.lucene.search.vectorhighlight;
 
 import org.apache.lucene.util.LuceneTestCase;
 
-public class SimpleBoundaryScannerTest extends LuceneTestCase {
+public class TestSimpleBoundaryScanner extends LuceneTestCase {
   static final String TEXT =
     "Apache Lucene(TM) is a high-performance, full-featured\ntext search engine library written entirely in Java.";
 
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilderTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestSimpleFragListBuilder.java
similarity index 99%
rename from lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilderTest.java
rename to lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestSimpleFragListBuilder.java
index 98ec2d6..66a2a0c 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilderTest.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestSimpleFragListBuilder.java
@@ -19,7 +19,7 @@ package org.apache.lucene.search.vectorhighlight;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.search.*;
 
-public class SimpleFragListBuilderTest extends AbstractTestCase {
+public class TestSimpleFragListBuilder extends AbstractTestCase {
   
   public void testNullFieldFragList() throws Exception {
     SimpleFragListBuilder sflb = new SimpleFragListBuilder();
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestSimpleFragmentsBuilder.java
similarity index 99%
rename from lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java
rename to lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestSimpleFragmentsBuilder.java
index df9a104..9a4e879 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestSimpleFragmentsBuilder.java
@@ -43,7 +43,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-public class SimpleFragmentsBuilderTest extends AbstractTestCase {
+public class TestSimpleFragmentsBuilder extends AbstractTestCase {
   
   public void test1TermIndex() throws Exception {
     FieldFragList ffl = ffl(new TermQuery(new Term(F, "a")), "a" );
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SingleFragListBuilderTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestSingleFragListBuilder.java
similarity index 97%
rename from lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SingleFragListBuilderTest.java
rename to lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestSingleFragListBuilder.java
index 9c880fe..1286660 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SingleFragListBuilderTest.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestSingleFragListBuilder.java
@@ -20,7 +20,7 @@ import org.apache.lucene.index.Term;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.TermQuery;
 
-public class SingleFragListBuilderTest extends AbstractTestCase {
+public class TestSingleFragListBuilder extends AbstractTestCase {
   
   public void testNullFieldFragList() throws Exception {
     SingleFragListBuilder sflb = new SingleFragListBuilder();
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/WeightedFragListBuilderTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestWeightedFragListBuilder.java
similarity index 97%
rename from lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/WeightedFragListBuilderTest.java
rename to lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestWeightedFragListBuilder.java
index 7fe410b..4917ce4 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/WeightedFragListBuilderTest.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestWeightedFragListBuilder.java
@@ -22,7 +22,7 @@ import org.apache.lucene.search.Query;
 import org.apache.lucene.search.vectorhighlight.FieldFragList.WeightedFragInfo;
 import org.apache.lucene.search.vectorhighlight.FieldFragList.WeightedFragInfo.SubInfo;
 
-public class WeightedFragListBuilderTest extends AbstractTestCase {
+public class TestWeightedFragListBuilder extends AbstractTestCase {
   public void test2WeightedFragList() throws Exception {
     testCase( pqF( "the", "both" ), 100,
         "subInfos=(theboth((195,203)))/0.8679108(149,249)",
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/QueryEqualsHashCodeTest.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/TestQueryEqualsHashCode.java
similarity index 98%
rename from lucene/spatial-extras/src/test/org/apache/lucene/spatial/QueryEqualsHashCodeTest.java
rename to lucene/spatial-extras/src/test/org/apache/lucene/spatial/TestQueryEqualsHashCode.java
index 53da280..4605d4d 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/QueryEqualsHashCodeTest.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/TestQueryEqualsHashCode.java
@@ -35,7 +35,7 @@ import org.junit.Test;
 import org.locationtech.spatial4j.context.SpatialContext;
 import org.locationtech.spatial4j.shape.Shape;
 
-public class QueryEqualsHashCodeTest extends LuceneTestCase {
+public class TestQueryEqualsHashCode extends LuceneTestCase {
 
   private final SpatialContext ctx = SpatialContext.GEO;
 
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/Geo3dTest.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/TestGeo3d.java
similarity index 98%
rename from lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/Geo3dTest.java
rename to lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/TestGeo3d.java
index 89cb973..d146861 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/Geo3dTest.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/TestGeo3d.java
@@ -23,7 +23,7 @@ import org.locationtech.spatial4j.context.SpatialContext;
 import org.locationtech.spatial4j.exception.InvalidShapeException;
 import org.locationtech.spatial4j.shape.Shape;
 
-public class Geo3dTest extends LuceneTestCase {
+public class TestGeo3d extends LuceneTestCase {
 
   @Test
   public void testWKT() throws Exception {
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/Geo3dRptTest.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/TestGeo3dRpt.java
similarity index 99%
rename from lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/Geo3dRptTest.java
rename to lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/TestGeo3dRpt.java
index 1f54d67..2231351 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/Geo3dRptTest.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/TestGeo3dRpt.java
@@ -45,7 +45,7 @@ import org.locationtech.spatial4j.shape.Shape;
 
 import static org.locationtech.spatial4j.distance.DistanceUtils.DEGREES_TO_RADIANS;
 
-public class Geo3dRptTest extends RandomSpatialOpStrategyTestCase {
+public class TestGeo3dRpt extends RandomSpatialOpStrategyTestCase {
 
   private PlanetModel planetModel;
   private RandomGeo3dShapeGenerator shapeGenerator;
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeSphereModelRectRelationTest.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/TestGeo3dShapeSphereModelRectRelation.java
similarity index 97%
rename from lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeSphereModelRectRelationTest.java
rename to lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/TestGeo3dShapeSphereModelRectRelation.java
index 3e61661..afc81de 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeSphereModelRectRelationTest.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/TestGeo3dShapeSphereModelRectRelation.java
@@ -34,11 +34,11 @@ import org.locationtech.spatial4j.shape.Point;
 import org.locationtech.spatial4j.shape.Rectangle;
 import org.locationtech.spatial4j.shape.SpatialRelation;
 
-public class Geo3dShapeSphereModelRectRelationTest extends ShapeRectRelationTestCase {
+public class TestGeo3dShapeSphereModelRectRelation extends ShapeRectRelationTestCase {
 
   PlanetModel planetModel = PlanetModel.SPHERE;
 
-  public Geo3dShapeSphereModelRectRelationTest() {
+  public TestGeo3dShapeSphereModelRectRelation() {
     Geo3dSpatialContextFactory factory = new Geo3dSpatialContextFactory();
     factory.planetModel = planetModel;
     this.ctx = factory.newSpatialContext();
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeWGS84ModelRectRelationTest.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/TestGeo3dShapeWGS84ModelRectRelation.java
similarity index 98%
rename from lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeWGS84ModelRectRelationTest.java
rename to lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/TestGeo3dShapeWGS84ModelRectRelation.java
index 341d4f9..8b98aad 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeWGS84ModelRectRelationTest.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/TestGeo3dShapeWGS84ModelRectRelation.java
@@ -31,11 +31,11 @@ import org.locationtech.spatial4j.shape.Circle;
 import org.locationtech.spatial4j.shape.Point;
 import org.locationtech.spatial4j.shape.SpatialRelation;
 
-public class Geo3dShapeWGS84ModelRectRelationTest extends ShapeRectRelationTestCase {
+public class TestGeo3dShapeWGS84ModelRectRelation extends ShapeRectRelationTestCase {
 
   PlanetModel planetModel = RandomPicks.randomFrom(random(), new PlanetModel[] {PlanetModel.WGS84, PlanetModel.CLARKE_1866});
 
-  public Geo3dShapeWGS84ModelRectRelationTest() {
+  public TestGeo3dShapeWGS84ModelRectRelation() {
     Geo3dSpatialContextFactory factory = new Geo3dSpatialContextFactory();
     factory.planetModel = planetModel;
     this.ctx = factory.newSpatialContext();
diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/CompositeGeoPolygonRelationshipsTest.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestCompositeGeoPolygonRelationships.java
similarity index 99%
rename from lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/CompositeGeoPolygonRelationshipsTest.java
rename to lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestCompositeGeoPolygonRelationships.java
index 1d5ffbe..db857e5 100644
--- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/CompositeGeoPolygonRelationshipsTest.java
+++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestCompositeGeoPolygonRelationships.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertEquals;
  * Check relationship between polygon and GeoShapes of composite polygons. Normally we construct
  * the composite polygon (when possible) and the complex one.
  */
-public class CompositeGeoPolygonRelationshipsTest {
+public class TestCompositeGeoPolygonRelationships {
 
   @Test
   public void testGeoCompositePolygon1() {
diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/GeoBBoxTest.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoBBox.java
similarity index 99%
rename from lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/GeoBBoxTest.java
rename to lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoBBox.java
index 401d851..67eb8d2 100755
--- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/GeoBBoxTest.java
+++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoBBox.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class GeoBBoxTest {
+public class TestGeoBBox {
 
   protected static final double DEGREES_TO_RADIANS = Math.PI / 180.0;
 
diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/GeoCircleTest.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoCircle.java
similarity index 99%
rename from lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/GeoCircleTest.java
rename to lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoCircle.java
index 5bc3a78..01d1031 100755
--- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/GeoCircleTest.java
+++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoCircle.java
@@ -19,7 +19,7 @@ package org.apache.lucene.spatial3d.geom;
 import org.apache.lucene.util.LuceneTestCase;
 import org.junit.Test;
 
-public class GeoCircleTest extends LuceneTestCase {
+public class TestGeoCircle extends LuceneTestCase {
   
   @Test
   public void testCircleDistance() {
diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/GeoConvexPolygonTest.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoConvexPolygon.java
similarity index 98%
rename from lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/GeoConvexPolygonTest.java
rename to lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoConvexPolygon.java
index a6ca404..53ac8d3 100755
--- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/GeoConvexPolygonTest.java
+++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoConvexPolygon.java
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-public class GeoConvexPolygonTest {
+public class TestGeoConvexPolygon {
 
 
   @Test
diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/GeoExactCircleTest.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoExactCircle.java
similarity index 99%
rename from lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/GeoExactCircleTest.java
rename to lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoExactCircle.java
index 9b718cc..0476901 100644
--- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/GeoExactCircleTest.java
+++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoExactCircle.java
@@ -23,7 +23,7 @@ import org.junit.Test;
 /**
  * Tests for GeoExactCircle.
  */
-public class GeoExactCircleTest extends RandomGeo3dShapeGenerator{
+public class TestGeoExactCircle extends RandomGeo3dShapeGenerator{
 
   @Test
   public void testExactCircle() {
diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/GeoModelTest.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoModel.java
similarity index 99%
rename from lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/GeoModelTest.java
rename to lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoModel.java
index d5fcbdd..db92574 100644
--- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/GeoModelTest.java
+++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoModel.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertTrue;
 /**
  * Test basic plane functionality.
  */
-public class GeoModelTest {
+public class TestGeoModel {
 
   protected final static PlanetModel scaledModel = new PlanetModel(1.2,1.5);
   
diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/GeoPathTest.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoPath.java
similarity index 99%
rename from lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/GeoPathTest.java
rename to lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoPath.java
index 1919e96..d945bb6 100755
--- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/GeoPathTest.java
+++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoPath.java
@@ -20,7 +20,7 @@ import org.junit.Test;
 
 import org.apache.lucene.util.LuceneTestCase;
 
-public class GeoPathTest extends LuceneTestCase {
+public class TestGeoPath extends LuceneTestCase {
 
   @Test
   public void testPathDistance() {
diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/GeoPointTest.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoPoint.java
similarity index 99%
rename from lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/GeoPointTest.java
rename to lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoPoint.java
index c19f9bf..d55f1b0 100644
--- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/GeoPointTest.java
+++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoPoint.java
@@ -24,7 +24,7 @@ import static com.carrotsearch.randomizedtesting.RandomizedTest.randomFloat;
 /**
  * Test basic GeoPoint functionality.
  */
-public class GeoPointTest extends LuceneTestCase {
+public class TestGeoPoint extends LuceneTestCase {
   static final double DEGREES_TO_RADIANS =  Math.PI / 180;
 
   @Test
diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/GeoPolygonTest.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoPolygon.java
similarity index 99%
rename from lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/GeoPolygonTest.java
rename to lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoPolygon.java
index 991c407..0598abc 100755
--- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/GeoPolygonTest.java
+++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoPolygon.java
@@ -25,7 +25,7 @@ import org.apache.lucene.util.LuceneTestCase;
 
 import org.junit.Test;
 
-public class GeoPolygonTest extends LuceneTestCase {
+public class TestGeoPolygon extends LuceneTestCase {
 
   @Test
   public void testPolygonPointFiltering() {
diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/PlaneTest.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestPlane.java
similarity index 99%
rename from lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/PlaneTest.java
rename to lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestPlane.java
index 766e067..3d02f20 100644
--- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/PlaneTest.java
+++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestPlane.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertEquals;
 /**
  * Test basic plane functionality.
  */
-public class PlaneTest {
+public class TestPlane {
 
   @Test
   public void testIdenticalPlanes() {
diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/RandomBinaryCodecTest.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestRandomBinaryCodec.java
similarity index 97%
rename from lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/RandomBinaryCodecTest.java
rename to lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestRandomBinaryCodec.java
index 250b652..3169c3b 100644
--- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/RandomBinaryCodecTest.java
+++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestRandomBinaryCodec.java
@@ -27,7 +27,7 @@ import org.junit.Test;
 /**
  * Test to check Serialization
  */
-public class RandomBinaryCodecTest extends RandomGeo3dShapeGenerator {
+public class TestRandomBinaryCodec extends RandomGeo3dShapeGenerator {
 
   @Test
   @Repeat(iterations = 10)
diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/RandomGeoPolygonTest.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestRandomGeoPolygon.java
similarity index 99%
rename from lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/RandomGeoPolygonTest.java
rename to lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestRandomGeoPolygon.java
index dd43cbd..6d34a1b 100644
--- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/RandomGeoPolygonTest.java
+++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestRandomGeoPolygon.java
@@ -26,7 +26,7 @@ import org.junit.Test;
 /**
  * Random test for polygons.
  */
-public class RandomGeoPolygonTest extends RandomGeo3dShapeGenerator {
+public class TestRandomGeoPolygon extends RandomGeo3dShapeGenerator {
 
   @Test
   public void testRandomLUCENE8157() {
diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/RandomGeoShapeRelationshipTest.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestRandomGeoShapeRelationship.java
similarity index 99%
rename from lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/RandomGeoShapeRelationshipTest.java
rename to lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestRandomGeoShapeRelationship.java
index 40fe5a8..b4a5fce 100644
--- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/RandomGeoShapeRelationshipTest.java
+++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestRandomGeoShapeRelationship.java
@@ -22,7 +22,7 @@ import org.junit.Test;
 /**
  * Random test to check relationship between GeoAreaShapes and GeoShapes.
  */
-public class RandomGeoShapeRelationshipTest extends RandomGeo3dShapeGenerator {
+public class TestRandomGeoShapeRelationship extends RandomGeo3dShapeGenerator {
 
   /**
    * Test for WITHIN points. We build a WITHIN shape with respect the geoAreaShape
diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/RandomPlaneTest.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestRandomPlane.java
similarity index 98%
rename from lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/RandomPlaneTest.java
rename to lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestRandomPlane.java
index c9dc7aa..ce48250 100644
--- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/RandomPlaneTest.java
+++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestRandomPlane.java
@@ -26,7 +26,7 @@ import org.junit.Test;
 /**
  * Random test for planes.
  */
-public class RandomPlaneTest extends RandomGeo3dShapeGenerator {
+public class TestRandomPlane extends RandomGeo3dShapeGenerator {
 
   @Test
   @Repeat(iterations = 10)
diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/SimpleGeoPolygonRelationshipsTest.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestSimpleGeoPolygonRelationships.java
similarity index 99%
rename from lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/SimpleGeoPolygonRelationshipsTest.java
rename to lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestSimpleGeoPolygonRelationships.java
index cab8e06..53a32f1 100644
--- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/SimpleGeoPolygonRelationshipsTest.java
+++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestSimpleGeoPolygonRelationships.java
@@ -30,7 +30,7 @@ import static org.junit.Assert.assertTrue;
  * Check relationship between polygon and GeoShapes of basic polygons. Normally we construct
  * the convex, concave counterpart and the convex polygon as a complex polygon.
  */
-public class SimpleGeoPolygonRelationshipsTest {
+public class TestSimpleGeoPolygonRelationships {
 
   /**
    * Test with two shapes with no crossing edges and no points in common in convex case.
diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/XYZSolidTest.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestXYZSolid.java
similarity index 99%
rename from lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/XYZSolidTest.java
rename to lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestXYZSolid.java
index aea057d..b0feebc 100644
--- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/XYZSolidTest.java
+++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestXYZSolid.java
@@ -19,7 +19,7 @@ package org.apache.lucene.spatial3d.geom;
 import org.apache.lucene.util.LuceneTestCase;
 import org.junit.Test;
 
-public class XYZSolidTest extends LuceneTestCase {
+public class TestXYZSolid extends LuceneTestCase {
 
   @Test
   public void testNonDegenerateRelationships() {