Apache Solr open-source search software
LUCENE-8626: Standardize Lucene Test Files (#2026)
Marcus57729c9acaac
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.javasimilarity index 96%rename from lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.javarename to lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestHighlighter.javaindex 2e703175bd4..2c989d10d0a 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@Overridepublic 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@Overridepublic 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@Overridepublic 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 Formattepublic 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 FormattedoSearching(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 FormatteFuzzyQuery 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 FormatteWildcardQuery 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 FormatteWildcardQuery 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 Formattequery = 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 FormatteTokenStream 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 FormatteTokenStream 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 FormattenumHighlights = 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" separatelyassertTrue("Failed to find correct number of highlights " + numHighlights + " found",numHighlights == 2);@@ -1118,7 +1118,7 @@ public class HighlighterTest extends BaseTokenStreamTestCase implements FormatteSpanNearQuery 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" separatelyassertTrue("Failed to find correct number of highlights " + numHighlights + " found",numHighlights == 2);@@ -1160,7 +1160,7 @@ public class HighlighterTest extends BaseTokenStreamTestCase implements Formattebq.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" separatelyassertTrue("Failed to find correct number of highlights " + numHighlights + " found",numHighlights == 2);@@ -1182,7 +1182,7 @@ public class HighlighterTest extends BaseTokenStreamTestCase implements Formattebq.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" separatelyassertTrue("Failed to find correct number of highlights " + numHighlights + " found",numHighlights == 2);@@ -1205,7 +1205,7 @@ public class HighlighterTest extends BaseTokenStreamTestCase implements FormattebooleanQuery.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 Formattequery.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 FormatteTokenStream 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 FormatteString 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 FormatteTokenStream 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 FormattepositionSpans.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 weightswTerms[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 Formattequery.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 Formattepublic 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 FormatteTokenStream 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 FormattedoSearching(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 Formattefinal 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 Formattefor (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 FormatteString 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 FormattebooleanQuery.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// firstquery = 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.javasimilarity index 99%rename from lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.javarename to lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestHighlighterPhrase.javaindex 60d9349fbf3..8e92456c1dd 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.javasimilarity index 98%rename from lucene/highlighter/src/test/org/apache/lucene/search/highlight/MissesTest.javarename to lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestMisses.javaindex 6289faf8e5b..02cdc04c149 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.javasimilarity index 97%rename from lucene/highlighter/src/test/org/apache/lucene/search/highlight/OffsetLimitTokenFilterTest.javarename to lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestOffsetLimitTokenFilter.javaindex 2ebbaf11deb..f0ce36c207d 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 thediff --git a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestTokenSources.javasimilarity index 99%rename from lucene/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.javarename to lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestTokenSources.javaindex 30cf7117de8..f23a65d0e20 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.javasimilarity index 99%rename from lucene/highlighter/src/test/org/apache/lucene/search/highlight/custom/HighlightCustomQueryTest.javarename to lucene/highlighter/src/test/org/apache/lucene/search/highlight/custom/TestHighlightCustomQuery.javaindex 115a51a9673..1011efe85fd 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.javasimilarity index 99%rename from lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/LengthGoalBreakIteratorTest.javarename to lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestLengthGoalBreakIterator.javaindex c2406637bd3..0ee73a8c1a1 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.javasimilarity index 98%rename from lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/BreakIteratorBoundaryScannerTest.javarename to lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestBreakIteratorBoundaryScanner.javaindex 330701d9df9..272226c4742 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.javasimilarity index 99%rename from lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FastVectorHighlighterTest.javarename to lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestFastVectorHighlighter.javaindex 069717a05d7..7fbd8a3445f 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.javasimilarity index 99%rename from lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldPhraseListTest.javarename to lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestFieldPhraseList.javaindex ed120f67eb6..3458f2b5785 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.WeightedPhraseInimport 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.javasimilarity index 99%rename from lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldQueryTest.javarename to lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestFieldQuery.javaindex 135d8a6aae5..2f9696188ad 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.javasimilarity index 99%rename from lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldTermStackTest.javarename to lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestFieldTermStack.javaindex 3e047130342..5284ba9cb1a 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.javasimilarity index 99%rename from lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/IndexTimeSynonymTest.javarename to lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestIndexTimeSynonym.javaindex 4b52e03e438..2bc9c787cf2 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.javasimilarity index 97%rename from lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/ScoreOrderFragmentsBuilderTest.javarename to lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestScoreOrderFragmentsBuilder.javaindex 6926d9ee49a..d964febaa45 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.javasimilarity index 97%rename from lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleBoundaryScannerTest.javarename to lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestSimpleBoundaryScanner.javaindex 575173176fd..0e395c4b01a 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.javasimilarity index 99%rename from lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilderTest.javarename to lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestSimpleFragListBuilder.javaindex 98ec2d6e4c8..66a2a0cb325 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.javasimilarity index 99%rename from lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.javarename to lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestSimpleFragmentsBuilder.javaindex df9a1047694..9a4e879b907 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.javasimilarity index 97%rename from lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SingleFragListBuilderTest.javarename to lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestSingleFragListBuilder.javaindex 9c880feb3fd..1286660c285 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.javasimilarity index 97%rename from lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/WeightedFragListBuilderTest.javarename to lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestWeightedFragListBuilder.javaindex 7fe410b862f..4917ce43640 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.javasimilarity index 98%rename from lucene/spatial-extras/src/test/org/apache/lucene/spatial/QueryEqualsHashCodeTest.javarename to lucene/spatial-extras/src/test/org/apache/lucene/spatial/TestQueryEqualsHashCode.javaindex 53da280c12c..4605d4d60cd 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.javasimilarity index 98%rename from lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/Geo3dTest.javarename to lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/TestGeo3d.javaindex 89cb973232b..d146861a217 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 {@Testpublic 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.javasimilarity index 99%rename from lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/Geo3dRptTest.javarename to lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/TestGeo3dRpt.javaindex 1f54d67bd06..22313514045 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.javasimilarity index 97%rename from lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeSphereModelRectRelationTest.javarename to lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/TestGeo3dShapeSphereModelRectRelation.javaindex 3e61661f1b1..afc81ded754 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.javasimilarity index 98%rename from lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeWGS84ModelRectRelationTest.javarename to lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/TestGeo3dShapeWGS84ModelRectRelation.javaindex 341d4f9ecda..8b98aad6366 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.javasimilarity index 99%rename from lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/CompositeGeoPolygonRelationshipsTest.javarename to lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestCompositeGeoPolygonRelationships.javaindex 1d5ffbe0ddc..db857e5e535 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 {@Testpublic 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.javasimilarity index 99%rename from lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/GeoBBoxTest.javarename to lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoBBox.javaindex 401d8513031..67eb8d2c41d 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.javasimilarity index 99%rename from lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/GeoCircleTest.javarename to lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoCircle.javaindex 5bc3a785872..01d1031dbf5 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 {@Testpublic 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.javasimilarity index 98%rename from lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/GeoConvexPolygonTest.javarename to lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoConvexPolygon.javaindex a6ca404ceaa..53ac8d37308 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 {@Testdiff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/GeoExactCircleTest.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoExactCircle.javasimilarity index 99%rename from lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/GeoExactCircleTest.javarename to lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoExactCircle.javaindex 9b718cca822..0476901d78a 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{@Testpublic 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.javasimilarity index 99%rename from lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/GeoModelTest.javarename to lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoModel.javaindex d5fcbdd5b89..db92574a70a 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.javasimilarity index 99%rename from lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/GeoPathTest.javarename to lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoPath.javaindex 1919e963d37..d945bb69455 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 {@Testpublic 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.javasimilarity index 99%rename from lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/GeoPointTest.javarename to lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoPoint.javaindex c19f9bfbfb4..d55f1b08207 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;@Testdiff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/GeoPolygonTest.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoPolygon.javasimilarity index 99%rename from lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/GeoPolygonTest.javarename to lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoPolygon.javaindex 991c4077085..0598abc9df9 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 {@Testpublic 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.javasimilarity index 99%rename from lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/PlaneTest.javarename to lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestPlane.javaindex 766e0677a4f..3d02f20e57f 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 {@Testpublic 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.javasimilarity index 97%rename from lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/RandomBinaryCodecTest.javarename to lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestRandomBinaryCodec.javaindex 250b652306a..3169c3b967c 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.javasimilarity index 99%rename from lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/RandomGeoPolygonTest.javarename to lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestRandomGeoPolygon.javaindex dd43cbd8bca..6d34a1bea46 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 {@Testpublic 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.javasimilarity index 99%rename from lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/RandomGeoShapeRelationshipTest.javarename to lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestRandomGeoShapeRelationship.javaindex 40fe5a820d0..b4a5fcec72d 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 geoAreaShapediff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/RandomPlaneTest.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestRandomPlane.javasimilarity index 98%rename from lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/RandomPlaneTest.javarename to lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestRandomPlane.javaindex c9dc7aae20d..ce48250cce8 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.javasimilarity index 99%rename from lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/SimpleGeoPolygonRelationshipsTest.javarename to lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestSimpleGeoPolygonRelationships.javaindex cab8e064cd3..53a32f15445 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.javasimilarity index 99%rename from lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/XYZSolidTest.javarename to lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestXYZSolid.javaindex aea057d458a..b0feebc534f 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 {@Testpublic void testNonDegenerateRelationships() {