Apache Solr open-source search software
LUCENE-8626: Lucene standardize test naming part 3 and final (#2220)
Marcus4bc5d51494c0
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/boost/DelimitedBoostTokenFilterTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/boost/TestDelimitedBoostTokenFilter.javasimilarity index 98%rename from lucene/analysis/common/src/test/org/apache/lucene/analysis/boost/DelimitedBoostTokenFilterTest.javarename to lucene/analysis/common/src/test/org/apache/lucene/analysis/boost/TestDelimitedBoostTokenFilter.javaindex d5608ac23d8..17b5c151018 100644--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/boost/DelimitedBoostTokenFilterTest.java+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/boost/TestDelimitedBoostTokenFilter.java@@ -21,7 +21,7 @@ import org.apache.lucene.analysis.TokenStream;import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;import org.apache.lucene.search.BoostAttribute;-public class DelimitedBoostTokenFilterTest extends BaseTokenStreamTestCase {+public class TestDelimitedBoostTokenFilter extends BaseTokenStreamTestCase {public void testBoosts() throws Exception {String test = "The quick|0.4 red|0.5 fox|0.2 jumped|0.1 over the lazy|0.8 brown|0.9 dogs|0.9";diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/HTMLStripCharFilterTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilter.javasimilarity index 99%rename from lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/HTMLStripCharFilterTest.javarename to lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilter.javaindex 8c3ad79a990..76aa70b2cca 100644--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/HTMLStripCharFilterTest.java+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilter.java@@ -31,7 +31,7 @@ import org.apache.lucene.analysis.MockTokenizer;import org.apache.lucene.analysis.Tokenizer;import org.apache.lucene.util.TestUtil;-public class HTMLStripCharFilterTest extends BaseTokenStreamTestCase {+public class TestHTMLStripCharFilter extends BaseTokenStreamTestCase {private static Analyzer newTestAnalyzer() {return new Analyzer() {diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/CommonGramsFilterTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsFilter.javasimilarity index 99%rename from lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/CommonGramsFilterTest.javarename to lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsFilter.javaindex ee44a498e61..2ce0d3aec2e 100644--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/CommonGramsFilterTest.java+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsFilter.java@@ -28,7 +28,7 @@ import org.apache.lucene.analysis.core.WhitespaceTokenizer;import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;/** Tests CommonGrams(Query)Filter */-public class CommonGramsFilterTest extends BaseTokenStreamTestCase {+public class TestCommonGramsFilter extends BaseTokenStreamTestCase {private static final CharArraySet commonWords =new CharArraySet(Arrays.asList("s", "a", "b", "c", "d", "the", "of"), false);diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/GreekAnalyzerTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekAnalyzer.javasimilarity index 98%rename from lucene/analysis/common/src/test/org/apache/lucene/analysis/el/GreekAnalyzerTest.javarename to lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekAnalyzer.javaindex 7555b873b91..30d2965754a 100644--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/GreekAnalyzerTest.java+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekAnalyzer.java@@ -20,7 +20,7 @@ import org.apache.lucene.analysis.Analyzer;import org.apache.lucene.analysis.BaseTokenStreamTestCase;/** A unit test class for verifying the correct operation of the GreekAnalyzer. */-public class GreekAnalyzerTest extends BaseTokenStreamTestCase {+public class TestGreekAnalyzer extends BaseTokenStreamTestCase {/*** Test the analysis of various greek strings.diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/minhash/MinHashFilterTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/minhash/TestMinHashFilter.javasimilarity index 99%rename from lucene/analysis/common/src/test/org/apache/lucene/analysis/minhash/MinHashFilterTest.javarename to lucene/analysis/common/src/test/org/apache/lucene/analysis/minhash/TestMinHashFilter.javaindex 46703f81edc..77a2ebe5cf5 100644--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/minhash/MinHashFilterTest.java+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/minhash/TestMinHashFilter.java@@ -35,7 +35,7 @@ import org.apache.lucene.util.automaton.RegExp;import org.junit.Test;/** Tests for {@link MinHashFilter} */-public class MinHashFilterTest extends BaseTokenStreamTestCase {+public class TestMinHashFilter extends BaseTokenStreamTestCase {@Testpublic void testIntHash() {diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/DateRecognizerFilterTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestDateRecognizerFilter.javasimilarity index 95%rename from lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/DateRecognizerFilterTest.javarename to lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestDateRecognizerFilter.javaindex 273980fe3b3..5c5afec2fff 100644--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/DateRecognizerFilterTest.java+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestDateRecognizerFilter.java@@ -23,7 +23,7 @@ import java.util.Locale;import org.apache.lucene.analysis.BaseTokenStreamTestCase;import org.apache.lucene.analysis.TokenStream;-public class DateRecognizerFilterTest extends BaseTokenStreamTestCase {+public class TestDateRecognizerFilter extends BaseTokenStreamTestCase {public void test() throws IOException {final String test =diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/DateRecognizerFilterFactoryTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestDateRecognizerFilterFactory.javasimilarity index 95%rename from lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/DateRecognizerFilterFactoryTest.javarename to lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestDateRecognizerFilterFactory.javaindex 803ec6abbae..28831b01205 100755--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/DateRecognizerFilterFactoryTest.java+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestDateRecognizerFilterFactory.java@@ -20,7 +20,7 @@ import java.util.HashMap;import java.util.Map;import org.apache.lucene.analysis.BaseTokenStreamTestCase;-public class DateRecognizerFilterFactoryTest extends BaseTokenStreamTestCase {+public class TestDateRecognizerFilterFactory extends BaseTokenStreamTestCase {public void testBadLanguageTagThrowsException() {expectThrows(diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/DelimitedTermFrequencyTokenFilterTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestDelimitedTermFrequencyTokenFilter.javasimilarity index 98%rename from lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/DelimitedTermFrequencyTokenFilterTest.javarename to lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestDelimitedTermFrequencyTokenFilter.javaindex 6b9acb85931..3c84f82a14a 100644--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/DelimitedTermFrequencyTokenFilterTest.java+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestDelimitedTermFrequencyTokenFilter.java@@ -22,7 +22,7 @@ import org.apache.lucene.analysis.TokenStream;import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;import org.apache.lucene.analysis.tokenattributes.TermFrequencyAttribute;-public class DelimitedTermFrequencyTokenFilterTest extends BaseTokenStreamTestCase {+public class TestDelimitedTermFrequencyTokenFilter extends BaseTokenStreamTestCase {public void testTermFrequency() throws Exception {String test = "The quick|40 red|4 fox|06 jumped|1 over the lazy|2 brown|123 dogs|1024";diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilterTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestEdgeNGramTokenFilter.javasimilarity index 99%rename from lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilterTest.javarename to lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestEdgeNGramTokenFilter.javaindex 3f39c2d7d7b..808c4737630 100644--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilterTest.java+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestEdgeNGramTokenFilter.java@@ -35,7 +35,7 @@ import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;import org.apache.lucene.util.TestUtil;/** Tests {@link EdgeNGramTokenFilter} for correctness. */-public class EdgeNGramTokenFilterTest extends BaseTokenStreamTestCase {+public class TestEdgeNGramTokenFilter extends BaseTokenStreamTestCase {private TokenStream input;@Overridediff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestEdgeNGramTokenizer.javasimilarity index 98%rename from lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerTest.javarename to lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestEdgeNGramTokenizer.javaindex c94e51ac072..78846c381b0 100644--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerTest.java+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestEdgeNGramTokenizer.java@@ -26,7 +26,7 @@ import org.apache.lucene.analysis.Tokenizer;import org.apache.lucene.util.TestUtil;/** Tests {@link EdgeNGramTokenizer} for correctness. */-public class EdgeNGramTokenizerTest extends BaseTokenStreamTestCase {+public class TestEdgeNGramTokenizer extends BaseTokenStreamTestCase {private StringReader input;@Override@@ -146,7 +146,7 @@ public class EdgeNGramTokenizerTest extends BaseTokenStreamTestCase {private static void testNGrams(int minGram, int maxGram, String s, String nonTokenChars)throws IOException {- NGramTokenizerTest.testNGrams(minGram, maxGram, s, nonTokenChars, true);+ TestNGramTokenizer.testNGrams(minGram, maxGram, s, nonTokenChars, true);}public void testLargeInput() throws IOException {diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenFilterTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestNGramTokenFilter.javasimilarity index 99%rename from lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenFilterTest.javarename to lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestNGramTokenFilter.javaindex bc27e7167a3..f5f6967bb7b 100644--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenFilterTest.java+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestNGramTokenFilter.java@@ -34,7 +34,7 @@ import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;import org.apache.lucene.util.TestUtil;/** Tests {@link NGramTokenFilter} for correctness. */-public class NGramTokenFilterTest extends BaseTokenStreamTestCase {+public class TestNGramTokenFilter extends BaseTokenStreamTestCase {private TokenStream input;@Overridediff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestNGramTokenizer.javasimilarity index 99%rename from lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.javarename to lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestNGramTokenizer.javaindex f0b1fe07480..f0b10660c9b 100644--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestNGramTokenizer.java@@ -31,7 +31,7 @@ import org.apache.lucene.util.ArrayUtil;import org.apache.lucene.util.TestUtil;/** Tests {@link NGramTokenizer} for correctness. */-public class NGramTokenizerTest extends BaseTokenStreamTestCase {+public class TestNGramTokenizer extends BaseTokenStreamTestCase {private StringReader input;@Overridediff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilterTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TestDelimitedPayloadTokenFilter.javasimilarity index 99%rename from lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilterTest.javarename to lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TestDelimitedPayloadTokenFilter.javaindex 861591d1dc1..6ac7219b4b1 100644--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilterTest.java+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TestDelimitedPayloadTokenFilter.java@@ -23,7 +23,7 @@ import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;import org.apache.lucene.analysis.tokenattributes.PayloadAttribute;import org.apache.lucene.util.BytesRef;-public class DelimitedPayloadTokenFilterTest extends BaseTokenStreamTestCase {+public class TestDelimitedPayloadTokenFilter extends BaseTokenStreamTestCase {public void testPayloads() throws Exception {String test = "The quick|JJ red|JJ fox|NN jumped|VB over the lazy|JJ brown|JJ dogs|NN";diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TestNumericPayloadTokenFilter.javasimilarity index 98%rename from lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterTest.javarename to lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TestNumericPayloadTokenFilter.javaindex dfd07ee18ab..98f2f40bc5d 100644--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterTest.java+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TestNumericPayloadTokenFilter.java@@ -26,7 +26,7 @@ import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;import org.apache.lucene.analysis.tokenattributes.PayloadAttribute;import org.apache.lucene.analysis.tokenattributes.TypeAttribute;-public class NumericPayloadTokenFilterTest extends BaseTokenStreamTestCase {+public class TestNumericPayloadTokenFilter extends BaseTokenStreamTestCase {public void test() throws IOException {String test = "The quick red fox jumped over the lazy brown dogs";diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TestTokenOffsetPayloadTokenFilter.javasimilarity index 97%rename from lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterTest.javarename to lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TestTokenOffsetPayloadTokenFilter.javaindex 32e87d7554f..eaef32b2fd2 100644--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterTest.java+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TestTokenOffsetPayloadTokenFilter.java@@ -22,7 +22,7 @@ import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;import org.apache.lucene.analysis.tokenattributes.PayloadAttribute;import org.apache.lucene.util.BytesRef;-public class TokenOffsetPayloadTokenFilterTest extends BaseTokenStreamTestCase {+public class TestTokenOffsetPayloadTokenFilter extends BaseTokenStreamTestCase {public void test() throws IOException {String test = "The quick red fox jumped over the lazy brown dogs";diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TestTypeAsPayloadTokenFilter.javasimilarity index 97%rename from lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterTest.javarename to lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TestTypeAsPayloadTokenFilter.javaindex b5b02a648d8..2a07c0e3f4c 100644--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterTest.java+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TestTypeAsPayloadTokenFilter.java@@ -24,7 +24,7 @@ import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;import org.apache.lucene.analysis.tokenattributes.PayloadAttribute;import org.apache.lucene.analysis.tokenattributes.TypeAttribute;-public class TypeAsPayloadTokenFilterTest extends BaseTokenStreamTestCase {+public class TestTypeAsPayloadTokenFilter extends BaseTokenStreamTestCase {public void test() throws IOException {String test = "The quick red fox jumped over the lazy brown dogs";diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/query/TestQueryAutoStopWordAnalyzer.javasimilarity index 99%rename from lucene/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.javarename to lucene/analysis/common/src/test/org/apache/lucene/analysis/query/TestQueryAutoStopWordAnalyzer.javaindex c99ff1baa34..0b1e29baa5f 100644--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/query/TestQueryAutoStopWordAnalyzer.java@@ -29,7 +29,7 @@ import org.apache.lucene.index.IndexWriterConfig;import org.apache.lucene.store.ByteBuffersDirectory;import org.apache.lucene.store.Directory;-public class QueryAutoStopWordAnalyzerTest extends BaseTokenStreamTestCase {+public class TestQueryAutoStopWordAnalyzer extends BaseTokenStreamTestCase {String variedFieldValues[] = {"the", "quick", "brown", "fox", "jumped", "over", "the", "lazy", "boring", "dog"};diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/FixedShingleFilterTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/TestFixedShingleFilter.javasimilarity index 99%rename from lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/FixedShingleFilterTest.javarename to lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/TestFixedShingleFilter.javaindex 2b717369b6e..db085f268a3 100644--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/FixedShingleFilterTest.java+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/TestFixedShingleFilter.java@@ -25,7 +25,7 @@ import org.apache.lucene.analysis.Token;import org.apache.lucene.analysis.TokenStream;import org.apache.lucene.util.graph.GraphTokenStreamFiniteStrings;-public class FixedShingleFilterTest extends BaseTokenStreamTestCase {+public class TestFixedShingleFilter extends BaseTokenStreamTestCase {public void testBiGramFilter() throws IOException {diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/TestShingleAnalyzerWrapper.javasimilarity index 99%rename from lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.javarename to lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/TestShingleAnalyzerWrapper.javaindex 07c36f40e26..269d48dc749 100644--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/TestShingleAnalyzerWrapper.java@@ -44,7 +44,7 @@ import org.apache.lucene.search.TermQuery;import org.apache.lucene.store.Directory;/** A test class for ShingleAnalyzerWrapper as regards queries and scoring. */-public class ShingleAnalyzerWrapperTest extends BaseTokenStreamTestCase {+public class TestShingleAnalyzerWrapper extends BaseTokenStreamTestCase {private Analyzer analyzer;private IndexSearcher searcher;private IndexReader reader;diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleFilterTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/TestShingleFilter.javasimilarity index 99%rename from lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleFilterTest.javarename to lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/TestShingleFilter.javaindex 976677f27d9..5a597ef56cb 100644--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleFilterTest.java+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/TestShingleFilter.java@@ -30,7 +30,7 @@ import org.apache.lucene.analysis.core.KeywordTokenizer;import org.apache.lucene.analysis.core.WhitespaceTokenizer;import org.apache.lucene.analysis.tokenattributes.TypeAttribute;-public class ShingleFilterTest extends BaseTokenStreamTestCase {+public class TestShingleFilter extends BaseTokenStreamTestCase {public static final Token[] TEST_TOKEN =new Token[] {diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/TestWikipediaTokenizer.javasimilarity index 99%rename from lucene/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerTest.javarename to lucene/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/TestWikipediaTokenizer.javaindex 834504b0281..de32cc4ad7b 100644--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerTest.java+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/TestWikipediaTokenizer.java@@ -31,7 +31,7 @@ import org.apache.lucene.analysis.Tokenizer;import org.apache.lucene.analysis.tokenattributes.FlagsAttribute;/** Basic Tests for {@link WikipediaTokenizer} */-public class WikipediaTokenizerTest extends BaseTokenStreamTestCase {+public class TestWikipediaTokenizer extends BaseTokenStreamTestCase {protected static final String LINK_PHRASES ="click [[link here again]] click [http://lucene.apache.org here again] [[Category:a b c d]]";diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TokenInfoDictionaryTest.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestTokenInfoDictionary.javasimilarity index 99%rename from lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TokenInfoDictionaryTest.javarename to lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestTokenInfoDictionary.javaindex 95de5408c98..9555ba02080 100644--- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TokenInfoDictionaryTest.java+++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestTokenInfoDictionary.java@@ -35,7 +35,7 @@ import org.apache.lucene.util.fst.FST;import org.apache.lucene.util.fst.IntsRefFSTEnum;/** Tests of TokenInfoDictionary build tools; run using ant test-tools */-public class TokenInfoDictionaryTest extends LuceneTestCase {+public class TestTokenInfoDictionary extends LuceneTestCase {public void testPut() throws Exception {TokenInfoDictionary dict =diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/UserDictionaryTest.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestUserDictionary.javasimilarity index 98%rename from lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/UserDictionaryTest.javarename to lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestUserDictionary.javaindex 28d55910295..3cc5ea63c98 100644--- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/UserDictionaryTest.java+++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestUserDictionary.java@@ -22,7 +22,7 @@ import org.apache.lucene.analysis.ja.TestJapaneseTokenizer;import org.apache.lucene.util.LuceneTestCase;import org.junit.Test;-public class UserDictionaryTest extends LuceneTestCase {+public class TestUserDictionary extends LuceneTestCase {@Testpublic void testLookup() throws IOException {diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/util/UnknownDictionaryTest.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/util/TestUnknownDictionary.javasimilarity index 97%rename from lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/util/UnknownDictionaryTest.javarename to lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/util/TestUnknownDictionary.javaindex 8aa118a91de..110cdc253e5 100644--- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/util/UnknownDictionaryTest.java+++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/util/TestUnknownDictionary.java@@ -19,7 +19,7 @@ package org.apache.lucene.analysis.ja.util;import org.apache.lucene.util.LuceneTestCase;import org.junit.Test;-public class UnknownDictionaryTest extends LuceneTestCase {+public class TestUnknownDictionary extends LuceneTestCase {public static final String FILENAME = "unk-tokeninfo-dict.obj";@Testdiff --git a/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/dict/TokenInfoDictionaryTest.java b/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/dict/TestTokenInfoDictionary.javasimilarity index 99%rename from lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/dict/TokenInfoDictionaryTest.javarename to lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/dict/TestTokenInfoDictionary.javaindex d4083d9d717..10042c9e7e2 100644--- a/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/dict/TokenInfoDictionaryTest.java+++ b/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/dict/TestTokenInfoDictionary.java@@ -34,7 +34,7 @@ import org.apache.lucene.util.fst.FST;import org.apache.lucene.util.fst.IntsRefFSTEnum;/** Tests of TokenInfoDictionary build tools; run using ant test-tools */-public class TokenInfoDictionaryTest extends LuceneTestCase {+public class TestTokenInfoDictionary extends LuceneTestCase {public void testPut() throws Exception {TokenInfoDictionary dict =diff --git a/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/dict/UserDictionaryTest.java b/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/dict/TestUserDictionary.javasimilarity index 97%rename from lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/dict/UserDictionaryTest.javarename to lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/dict/TestUserDictionary.javaindex 4a03b115d54..864d8e8e9f9 100644--- a/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/dict/UserDictionaryTest.java+++ b/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/dict/TestUserDictionary.java@@ -23,7 +23,7 @@ import org.apache.lucene.analysis.ko.TestKoreanTokenizer;import org.apache.lucene.util.LuceneTestCase;import org.junit.Test;-public class UserDictionaryTest extends LuceneTestCase {+public class TestUserDictionary extends LuceneTestCase {@Testpublic void testLookup() throws IOException {UserDictionary dictionary = TestKoreanTokenizer.readDict();diff --git a/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/util/UnknownDictionaryTest.java b/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/util/TestUnknownDictionary.javasimilarity index 97%rename from lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/util/UnknownDictionaryTest.javarename to lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/util/TestUnknownDictionary.javaindex 3de038a48c2..10b7deedf2f 100644--- a/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/util/UnknownDictionaryTest.java+++ b/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/util/TestUnknownDictionary.java@@ -19,7 +19,7 @@ package org.apache.lucene.analysis.ko.util;import org.apache.lucene.util.LuceneTestCase;import org.junit.Test;-public class UnknownDictionaryTest extends LuceneTestCase {+public class TestUnknownDictionary extends LuceneTestCase {@Testpublic void testPutCharacterCategory() {diff --git a/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/DoubleMetaphoneFilterTest.java b/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDoubleMetaphoneFilter.javasimilarity index 98%rename from lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/DoubleMetaphoneFilterTest.javarename to lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDoubleMetaphoneFilter.javaindex ccd1c0cec6f..798c70013f6 100644--- a/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/DoubleMetaphoneFilterTest.java+++ b/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDoubleMetaphoneFilter.java@@ -25,7 +25,7 @@ import org.apache.lucene.analysis.Tokenizer;import org.apache.lucene.analysis.core.KeywordTokenizer;import org.apache.lucene.util.TestUtil;-public class DoubleMetaphoneFilterTest extends BaseTokenStreamTestCase {+public class TestDoubleMetaphoneFilter extends BaseTokenStreamTestCase {public void testSize4FalseInject() throws Exception {TokenStream stream = whitespaceMockTokenizer("international");diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/DocMakerTest.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TestDocMaker.javasimilarity index 99%rename from lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/DocMakerTest.javarename to lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TestDocMaker.javaindex 502cc565b4c..33ce32d61b8 100644--- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/DocMakerTest.java+++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TestDocMaker.java@@ -38,7 +38,7 @@ import org.apache.lucene.search.TopDocs;import org.apache.lucene.util.IOUtils;/** Tests the functionality of {@link DocMaker}. */-public class DocMakerTest extends BenchmarkTestCase {+public class TestDocMaker extends BenchmarkTestCase {public static final class OneDocSource extends ContentSource {diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSourceTest.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TestEnwikiContentSource.javasimilarity index 98%rename from lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSourceTest.javarename to lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TestEnwikiContentSource.javaindex 7684bbb9b22..c2464b573db 100644--- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSourceTest.java+++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TestEnwikiContentSource.java@@ -26,7 +26,7 @@ import org.apache.lucene.benchmark.byTask.utils.Config;import org.apache.lucene.util.LuceneTestCase;import org.junit.Test;-public class EnwikiContentSourceTest extends LuceneTestCase {+public class TestEnwikiContentSource extends LuceneTestCase {/** An EnwikiContentSource which works on a String and not files. */private static class StringableEnwikiSource extends EnwikiContentSource {diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/LineDocSourceTest.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TestLineDocSource.javasimilarity index 99%rename from lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/LineDocSourceTest.javarename to lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TestLineDocSource.javaindex 0365bc60a8f..ad058f9d6b7 100644--- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/LineDocSourceTest.java+++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TestLineDocSource.java@@ -45,7 +45,7 @@ import org.apache.lucene.search.TopDocs;import org.apache.lucene.util.IOUtils;/** Tests the functionality of {@link LineDocSource}. */-public class LineDocSourceTest extends BenchmarkTestCase {+public class TestLineDocSource extends BenchmarkTestCase {private static final CompressorStreamFactory csFactory = new CompressorStreamFactory();diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TrecContentSourceTest.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TestTrecContentSource.javasimilarity index 99%rename from lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TrecContentSourceTest.javarename to lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TestTrecContentSource.javaindex 0b0fbc8d7c0..d6a6a0771e7 100644--- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TrecContentSourceTest.java+++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TestTrecContentSource.java@@ -31,7 +31,7 @@ import org.apache.lucene.document.DateTools;import org.apache.lucene.util.LuceneTestCase;import org.apache.lucene.util.TestUtil;-public class TrecContentSourceTest extends LuceneTestCase {+public class TestTrecContentSource extends LuceneTestCase {/** A TrecDocMaker which works on a String and not files. */private static class StringableTrecSource extends TrecContentSource {diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/AddIndexesTaskTest.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/TestAddIndexesTask.javasimilarity index 98%rename from lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/AddIndexesTaskTest.javarename to lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/TestAddIndexesTask.javaindex f95b3177f04..841047f629d 100644--- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/AddIndexesTaskTest.java+++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/TestAddIndexesTask.java@@ -33,7 +33,7 @@ import org.junit.AfterClass;import org.junit.BeforeClass;/** Tests the functionality of {@link AddIndexesTask}. */-public class AddIndexesTaskTest extends BenchmarkTestCase {+public class TestAddIndexesTask extends BenchmarkTestCase {private static Path testDir, inputDir;diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CommitIndexTaskTest.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/TestCommitIndexTask.javasimilarity index 97%rename from lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CommitIndexTaskTest.javarename to lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/TestCommitIndexTask.javaindex 6605edd1ef2..9f21a68a548 100644--- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CommitIndexTaskTest.java+++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/TestCommitIndexTask.java@@ -24,7 +24,7 @@ import org.apache.lucene.index.SegmentInfos;import org.apache.lucene.util.Version;/** Tests the functionality of {@link CreateIndexTask}. */-public class CommitIndexTaskTest extends BenchmarkTestCase {+public class TestCommitIndexTask extends BenchmarkTestCase {private PerfRunData createPerfRunData() throws Exception {Properties props = new Properties();diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTaskTest.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/TestCreateIndexTask.javasimilarity index 98%rename from lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTaskTest.javarename to lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/TestCreateIndexTask.javaindex 4408fd672df..b0d51f0f9c6 100644--- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTaskTest.java+++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/TestCreateIndexTask.java@@ -31,7 +31,7 @@ import org.apache.lucene.index.NoMergeScheduler;import org.apache.lucene.util.Version;/** Tests the functionality of {@link CreateIndexTask}. */-public class CreateIndexTaskTest extends BenchmarkTestCase {+public class TestCreateIndexTask extends BenchmarkTestCase {private PerfRunData createPerfRunData(String infoStreamValue) throws Exception {Properties props = new Properties();diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/PerfTaskTest.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/TestPerfTask.javasimilarity index 98%rename from lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/PerfTaskTest.javarename to lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/TestPerfTask.javaindex 11970df78e2..b2d7411a465 100644--- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/PerfTaskTest.java+++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/TestPerfTask.java@@ -22,7 +22,7 @@ import org.apache.lucene.benchmark.byTask.PerfRunData;import org.apache.lucene.benchmark.byTask.utils.Config;/** Tests the functionality of the abstract {@link PerfTask}. */-public class PerfTaskTest extends BenchmarkTestCase {+public class TestPerfTask extends BenchmarkTestCase {private static final class MyPerfTask extends PerfTask {diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/SearchWithSortTaskTest.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/TestSearchWithSortTask.javasimilarity index 95%rename from lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/SearchWithSortTaskTest.javarename to lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/TestSearchWithSortTask.javaindex 2a55128bb5c..baab8233abc 100644--- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/SearchWithSortTaskTest.java+++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/TestSearchWithSortTask.java@@ -22,7 +22,7 @@ import org.apache.lucene.benchmark.byTask.PerfRunData;import org.apache.lucene.benchmark.byTask.utils.Config;import org.apache.lucene.search.SortField;-public class SearchWithSortTaskTest extends BenchmarkTestCase {+public class TestSearchWithSortTask extends BenchmarkTestCase {public void testSetParams_docField() throws Exception {SearchWithSortTask task = new SearchWithSortTask(new PerfRunData(new Config(new Properties())));diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteEnwikiLineDocTaskTest.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/TestWriteEnwikiLineDocTask.javasimilarity index 97%rename from lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteEnwikiLineDocTaskTest.javarename to lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/TestWriteEnwikiLineDocTask.javaindex 4d638ef3815..a570e451716 100644--- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteEnwikiLineDocTaskTest.java+++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/TestWriteEnwikiLineDocTask.java@@ -31,7 +31,7 @@ import org.apache.lucene.document.Field;import org.apache.lucene.document.StringField;/** Tests the functionality of {@link WriteEnwikiLineDocTask}. */-public class WriteEnwikiLineDocTaskTest extends BenchmarkTestCase {+public class TestWriteEnwikiLineDocTask extends BenchmarkTestCase {// class has to be public so that Class.forName.newInstance() will work/** Interleaves category docs with regular docs */@@ -72,7 +72,7 @@ public class WriteEnwikiLineDocTaskTest extends BenchmarkTestCase {throws Exception {try (BufferedReader br = Files.newBufferedReader(file, StandardCharsets.UTF_8)) {String line = br.readLine();- WriteLineDocTaskTest.assertHeaderLine(line);+ TestWriteLineDocTask.assertHeaderLine(line);for (int i = 0; i < n; i++) {line = br.readLine();assertNotNull(line);diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTaskTest.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/TestWriteLineDocTask.javasimilarity index 99%rename from lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTaskTest.javarename to lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/TestWriteLineDocTask.javaindex cd969eee31e..0877f17f382 100644--- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTaskTest.java+++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/TestWriteLineDocTask.java@@ -36,7 +36,7 @@ import org.apache.lucene.document.Field;import org.apache.lucene.document.StringField;/** Tests the functionality of {@link WriteLineDocTask}. */-public class WriteLineDocTaskTest extends BenchmarkTestCase {+public class TestWriteLineDocTask extends BenchmarkTestCase {// class has to be public so that Class.forName.newInstance() will workpublic static final class WriteLineDocMaker extends DocMaker {diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/alt/AltPackageTaskTest.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/alt/TestAltPackageTask.javasimilarity index 96%rename from lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/alt/AltPackageTaskTest.javarename to lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/alt/TestAltPackageTask.javaindex ca6e4f8f069..c6a3a85addd 100644--- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/alt/AltPackageTaskTest.java+++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/alt/TestAltPackageTask.java@@ -20,7 +20,7 @@ import org.apache.lucene.benchmark.BenchmarkTestCase;import org.apache.lucene.benchmark.byTask.Benchmark;/** Tests that tasks in alternate packages are found. */-public class AltPackageTaskTest extends BenchmarkTestCase {+public class TestAltPackageTask extends BenchmarkTestCase {/** Benchmark should fail loading the algorithm when alt is not specified */public void testWithoutAlt() throws Exception {diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/utils/StreamUtilsTest.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/utils/TestStreamUtils.javasimilarity index 98%rename from lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/utils/StreamUtilsTest.javarename to lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/utils/TestStreamUtils.javaindex 8d00f288299..a3953f4bbae 100644--- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/utils/StreamUtilsTest.java+++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/utils/TestStreamUtils.java@@ -31,7 +31,7 @@ import org.apache.lucene.benchmark.BenchmarkTestCase;import org.junit.Before;import org.junit.Test;-public class StreamUtilsTest extends BenchmarkTestCase {+public class TestStreamUtils extends BenchmarkTestCase {private static final String TEXT = "Some-Text...";private Path testDir;diff --git a/lucene/classification/src/test/org/apache/lucene/classification/BM25NBClassifierTest.java b/lucene/classification/src/test/org/apache/lucene/classification/TestBM25NBClassifier.javasimilarity index 98%rename from lucene/classification/src/test/org/apache/lucene/classification/BM25NBClassifierTest.javarename to lucene/classification/src/test/org/apache/lucene/classification/TestBM25NBClassifier.javaindex cd0e6bd8a59..f1220d2a750 100644--- a/lucene/classification/src/test/org/apache/lucene/classification/BM25NBClassifierTest.java+++ b/lucene/classification/src/test/org/apache/lucene/classification/TestBM25NBClassifier.java@@ -33,7 +33,7 @@ import org.apache.lucene.util.BytesRef;import org.junit.Test;/** Tests for {@link BM25NBClassifier} */-public class BM25NBClassifierTest extends ClassificationTestBase<BytesRef> {+public class TestBM25NBClassifier extends ClassificationTestBase<BytesRef> {@Testpublic void testBasicUsage() throws Exception {diff --git a/lucene/classification/src/test/org/apache/lucene/classification/BooleanPerceptronClassifierTest.java b/lucene/classification/src/test/org/apache/lucene/classification/TestBooleanPerceptronClassifier.javasimilarity index 98%rename from lucene/classification/src/test/org/apache/lucene/classification/BooleanPerceptronClassifierTest.javarename to lucene/classification/src/test/org/apache/lucene/classification/TestBooleanPerceptronClassifier.javaindex 2745bd8a38b..ba6a485c95b 100644--- a/lucene/classification/src/test/org/apache/lucene/classification/BooleanPerceptronClassifierTest.java+++ b/lucene/classification/src/test/org/apache/lucene/classification/TestBooleanPerceptronClassifier.java@@ -28,7 +28,7 @@ import org.apache.lucene.util.BytesRef;import org.junit.Test;/** Testcase for {@link org.apache.lucene.classification.BooleanPerceptronClassifier} */-public class BooleanPerceptronClassifierTest extends ClassificationTestBase<Boolean> {+public class TestBooleanPerceptronClassifier extends ClassificationTestBase<Boolean> {@Testpublic void testBasicUsage() throws Exception {diff --git a/lucene/classification/src/test/org/apache/lucene/classification/CachingNaiveBayesClassifierTest.java b/lucene/classification/src/test/org/apache/lucene/classification/TestCachingNaiveBayesClassifier.javasimilarity index 98%rename from lucene/classification/src/test/org/apache/lucene/classification/CachingNaiveBayesClassifierTest.javarename to lucene/classification/src/test/org/apache/lucene/classification/TestCachingNaiveBayesClassifier.javaindex 3b16de8d026..e69e10f857c 100644--- a/lucene/classification/src/test/org/apache/lucene/classification/CachingNaiveBayesClassifierTest.java+++ b/lucene/classification/src/test/org/apache/lucene/classification/TestCachingNaiveBayesClassifier.java@@ -33,7 +33,7 @@ import org.apache.lucene.util.BytesRef;import org.junit.Test;/** Testcase for {@link org.apache.lucene.classification.CachingNaiveBayesClassifier} */-public class CachingNaiveBayesClassifierTest extends ClassificationTestBase<BytesRef> {+public class TestCachingNaiveBayesClassifier extends ClassificationTestBase<BytesRef> {@Testpublic void testBasicUsage() throws Exception {diff --git a/lucene/classification/src/test/org/apache/lucene/classification/KNearestFuzzyClassifierTest.java b/lucene/classification/src/test/org/apache/lucene/classification/TestKNearestFuzzyClassifier.javasimilarity index 98%rename from lucene/classification/src/test/org/apache/lucene/classification/KNearestFuzzyClassifierTest.javarename to lucene/classification/src/test/org/apache/lucene/classification/TestKNearestFuzzyClassifier.javaindex 34a35cc545b..2ba1c0885e3 100644--- a/lucene/classification/src/test/org/apache/lucene/classification/KNearestFuzzyClassifierTest.java+++ b/lucene/classification/src/test/org/apache/lucene/classification/TestKNearestFuzzyClassifier.java@@ -28,7 +28,7 @@ import org.apache.lucene.util.BytesRef;import org.junit.Test;/** Tests for {@link KNearestFuzzyClassifier} */-public class KNearestFuzzyClassifierTest extends ClassificationTestBase<BytesRef> {+public class TestKNearestFuzzyClassifier extends ClassificationTestBase<BytesRef> {@Testpublic void testBasicUsage() throws Exception {diff --git a/lucene/classification/src/test/org/apache/lucene/classification/KNearestNeighborClassifierTest.java b/lucene/classification/src/test/org/apache/lucene/classification/TestKNearestNeighborClassifier.javasimilarity index 99%rename from lucene/classification/src/test/org/apache/lucene/classification/KNearestNeighborClassifierTest.javarename to lucene/classification/src/test/org/apache/lucene/classification/TestKNearestNeighborClassifier.javaindex 8651ecb7ec8..95e4f505524 100644--- a/lucene/classification/src/test/org/apache/lucene/classification/KNearestNeighborClassifierTest.java+++ b/lucene/classification/src/test/org/apache/lucene/classification/TestKNearestNeighborClassifier.java@@ -33,7 +33,7 @@ import org.apache.lucene.util.BytesRef;import org.junit.Test;/** Testcase for {@link KNearestNeighborClassifier} */-public class KNearestNeighborClassifierTest extends ClassificationTestBase<BytesRef> {+public class TestKNearestNeighborClassifier extends ClassificationTestBase<BytesRef> {@Testpublic void testBasicUsage() throws Exception {diff --git a/lucene/classification/src/test/org/apache/lucene/classification/SimpleNaiveBayesClassifierTest.java b/lucene/classification/src/test/org/apache/lucene/classification/TestSimpleNaiveBayesClassifier.javasimilarity index 98%rename from lucene/classification/src/test/org/apache/lucene/classification/SimpleNaiveBayesClassifierTest.javarename to lucene/classification/src/test/org/apache/lucene/classification/TestSimpleNaiveBayesClassifier.javaindex 8400cfbb775..18538907b22 100644--- a/lucene/classification/src/test/org/apache/lucene/classification/SimpleNaiveBayesClassifierTest.java+++ b/lucene/classification/src/test/org/apache/lucene/classification/TestSimpleNaiveBayesClassifier.java@@ -33,7 +33,7 @@ import org.apache.lucene.util.BytesRef;import org.junit.Test;/** Testcase for {@link SimpleNaiveBayesClassifier} */-public class SimpleNaiveBayesClassifierTest extends ClassificationTestBase<BytesRef> {+public class TestSimpleNaiveBayesClassifier extends ClassificationTestBase<BytesRef> {@Testpublic void testBasicUsage() throws Exception {diff --git a/lucene/classification/src/test/org/apache/lucene/classification/document/KNearestNeighborDocumentClassifierTest.java b/lucene/classification/src/test/org/apache/lucene/classification/document/TestKNearestNeighborDocumentClassifier.javasimilarity index 99%rename from lucene/classification/src/test/org/apache/lucene/classification/document/KNearestNeighborDocumentClassifierTest.javarename to lucene/classification/src/test/org/apache/lucene/classification/document/TestKNearestNeighborDocumentClassifier.javaindex 58a55a31f9c..1432fb9c0c9 100644--- a/lucene/classification/src/test/org/apache/lucene/classification/document/KNearestNeighborDocumentClassifierTest.java+++ b/lucene/classification/src/test/org/apache/lucene/classification/document/TestKNearestNeighborDocumentClassifier.java@@ -23,7 +23,7 @@ import org.apache.lucene.util.BytesRef;import org.junit.Test;/** Tests for {@link org.apache.lucene.classification.KNearestNeighborClassifier} */-public class KNearestNeighborDocumentClassifierTest+public class TestKNearestNeighborDocumentClassifierextends DocumentClassificationTestBase<BytesRef> {@Testdiff --git a/lucene/classification/src/test/org/apache/lucene/classification/document/SimpleNaiveBayesDocumentClassifierTest.java b/lucene/classification/src/test/org/apache/lucene/classification/document/TestSimpleNaiveBayesDocumentClassifier.javasimilarity index 99%rename from lucene/classification/src/test/org/apache/lucene/classification/document/SimpleNaiveBayesDocumentClassifierTest.javarename to lucene/classification/src/test/org/apache/lucene/classification/document/TestSimpleNaiveBayesDocumentClassifier.javaindex e45bdfac450..8e497983c5c 100644--- a/lucene/classification/src/test/org/apache/lucene/classification/document/SimpleNaiveBayesDocumentClassifierTest.java+++ b/lucene/classification/src/test/org/apache/lucene/classification/document/TestSimpleNaiveBayesDocumentClassifier.java@@ -20,7 +20,7 @@ import org.apache.lucene.util.BytesRef;import org.junit.Test;/** Tests for {@link org.apache.lucene.classification.SimpleNaiveBayesClassifier} */-public class SimpleNaiveBayesDocumentClassifierTest+public class TestSimpleNaiveBayesDocumentClassifierextends DocumentClassificationTestBase<BytesRef> {@Testdiff --git a/lucene/classification/src/test/org/apache/lucene/classification/utils/ConfusionMatrixGeneratorTest.java b/lucene/classification/src/test/org/apache/lucene/classification/utils/TestConfusionMatrixGenerator.javasimilarity index 99%rename from lucene/classification/src/test/org/apache/lucene/classification/utils/ConfusionMatrixGeneratorTest.javarename to lucene/classification/src/test/org/apache/lucene/classification/utils/TestConfusionMatrixGenerator.javaindex e4b54b73f6d..ba03ec34fc2 100644--- a/lucene/classification/src/test/org/apache/lucene/classification/utils/ConfusionMatrixGeneratorTest.java+++ b/lucene/classification/src/test/org/apache/lucene/classification/utils/TestConfusionMatrixGenerator.java@@ -33,7 +33,7 @@ import org.apache.lucene.util.BytesRef;import org.junit.Test;/** Tests for {@link ConfusionMatrixGenerator} */-public class ConfusionMatrixGeneratorTest extends ClassificationTestBase<Object> {+public class TestConfusionMatrixGenerator extends ClassificationTestBase<Object> {@Testpublic void testGetConfusionMatrix() throws Exception {diff --git a/lucene/classification/src/test/org/apache/lucene/classification/utils/DataSplitterTest.java b/lucene/classification/src/test/org/apache/lucene/classification/utils/TestDataSplitter.javasimilarity index 99%rename from lucene/classification/src/test/org/apache/lucene/classification/utils/DataSplitterTest.javarename to lucene/classification/src/test/org/apache/lucene/classification/utils/TestDataSplitter.javaindex 3b17da57010..98265a34d44 100644--- a/lucene/classification/src/test/org/apache/lucene/classification/utils/DataSplitterTest.java+++ b/lucene/classification/src/test/org/apache/lucene/classification/utils/TestDataSplitter.java@@ -39,7 +39,7 @@ import org.junit.Test;/** Testcase for {@link org.apache.lucene.classification.utils.DatasetSplitter} */@LuceneTestCase.SuppressCodecs("SimpleText")-public class DataSplitterTest extends LuceneTestCase {+public class TestDataSplitter extends LuceneTestCase {private LeafReader originalIndex;private RandomIndexWriter indexWriter;diff --git a/lucene/classification/src/test/org/apache/lucene/classification/utils/DocToDoubleVectorUtilsTest.java b/lucene/classification/src/test/org/apache/lucene/classification/utils/TestDocToDoubleVectorUtils.javasimilarity index 98%rename from lucene/classification/src/test/org/apache/lucene/classification/utils/DocToDoubleVectorUtilsTest.javarename to lucene/classification/src/test/org/apache/lucene/classification/utils/TestDocToDoubleVectorUtils.javaindex 4392b24988a..7db23939c22 100644--- a/lucene/classification/src/test/org/apache/lucene/classification/utils/DocToDoubleVectorUtilsTest.java+++ b/lucene/classification/src/test/org/apache/lucene/classification/utils/TestDocToDoubleVectorUtils.java@@ -34,7 +34,7 @@ import org.junit.Before;import org.junit.Test;/** Testcase for {@link org.apache.lucene.classification.utils.DocToDoubleVectorUtils} */-public class DocToDoubleVectorUtilsTest extends LuceneTestCase {+public class TestDocToDoubleVectorUtils extends LuceneTestCase {private IndexReader index;private Directory dir;diff --git a/lucene/core/src/test/org/apache/lucene/search/FuzzyTermOnShortTermsTest.java b/lucene/core/src/test/org/apache/lucene/search/TestFuzzyTermOnShortTerms.javasimilarity index 98%rename from lucene/core/src/test/org/apache/lucene/search/FuzzyTermOnShortTermsTest.javarename to lucene/core/src/test/org/apache/lucene/search/TestFuzzyTermOnShortTerms.javaindex abef8b4d641..b60d70c77ff 100644--- a/lucene/core/src/test/org/apache/lucene/search/FuzzyTermOnShortTermsTest.java+++ b/lucene/core/src/test/org/apache/lucene/search/TestFuzzyTermOnShortTerms.java@@ -31,7 +31,7 @@ import org.apache.lucene.util.LuceneTestCase;import org.apache.lucene.util.TestUtil;import org.junit.Test;-public class FuzzyTermOnShortTermsTest extends LuceneTestCase {+public class TestFuzzyTermOnShortTerms extends LuceneTestCase {private static final String FIELD = "field";@Testdiff --git a/lucene/core/src/test/org/apache/lucene/search/TermInSetQueryTest.java b/lucene/core/src/test/org/apache/lucene/search/TestTermInSetQuery.javasimilarity index 99%rename from lucene/core/src/test/org/apache/lucene/search/TermInSetQueryTest.javarename to lucene/core/src/test/org/apache/lucene/search/TestTermInSetQuery.javaindex 0ce51ec5032..8ae811d3fdc 100644--- a/lucene/core/src/test/org/apache/lucene/search/TermInSetQueryTest.java+++ b/lucene/core/src/test/org/apache/lucene/search/TestTermInSetQuery.java@@ -46,7 +46,7 @@ import org.apache.lucene.util.RamUsageTester;import org.apache.lucene.util.TestUtil;import org.apache.lucene.util.automaton.ByteRunAutomaton;-public class TermInSetQueryTest extends LuceneTestCase {+public class TestTermInSetQuery extends LuceneTestCase {public void testDuel() throws IOException {final int iters = atLeast(2);diff --git a/lucene/core/src/test/org/apache/lucene/util/automaton/FiniteStringsIteratorTest.java b/lucene/core/src/test/org/apache/lucene/util/automaton/TestFiniteStringsIterator.javasimilarity index 99%rename from lucene/core/src/test/org/apache/lucene/util/automaton/FiniteStringsIteratorTest.javarename to lucene/core/src/test/org/apache/lucene/util/automaton/TestFiniteStringsIterator.javaindex 1dca315bd6f..a86932ff6e8 100644--- a/lucene/core/src/test/org/apache/lucene/util/automaton/FiniteStringsIteratorTest.java+++ b/lucene/core/src/test/org/apache/lucene/util/automaton/TestFiniteStringsIterator.java@@ -31,7 +31,7 @@ import org.apache.lucene.util.TestUtil;import org.apache.lucene.util.fst.Util;/** Test for {@link FiniteStringsIterator}. */-public class FiniteStringsIteratorTest extends LuceneTestCase {+public class TestFiniteStringsIterator extends LuceneTestCase {public void testRandomFiniteStrings1() {int numStrings = atLeast(100);if (VERBOSE) {diff --git a/lucene/core/src/test/org/apache/lucene/util/automaton/LimitedFiniteStringsIteratorTest.java b/lucene/core/src/test/org/apache/lucene/util/automaton/TestLimitedFiniteStringsIterator.javasimilarity index 95%rename from lucene/core/src/test/org/apache/lucene/util/automaton/LimitedFiniteStringsIteratorTest.javarename to lucene/core/src/test/org/apache/lucene/util/automaton/TestLimitedFiniteStringsIterator.javaindex ea295cfedd3..52145e73f8f 100644--- a/lucene/core/src/test/org/apache/lucene/util/automaton/LimitedFiniteStringsIteratorTest.java+++ b/lucene/core/src/test/org/apache/lucene/util/automaton/TestLimitedFiniteStringsIterator.java@@ -16,7 +16,7 @@*/package org.apache.lucene.util.automaton;-import static org.apache.lucene.util.automaton.FiniteStringsIteratorTest.getFiniteStrings;+import static org.apache.lucene.util.automaton.TestFiniteStringsIterator.getFiniteStrings;import java.util.List;import org.apache.lucene.util.IntsRef;@@ -26,7 +26,7 @@ import org.apache.lucene.util.TestUtil;import org.apache.lucene.util.fst.Util;/** Test for {@link FiniteStringsIterator}. */-public class LimitedFiniteStringsIteratorTest extends LuceneTestCase {+public class TestLimitedFiniteStringsIterator extends LuceneTestCase {public void testRandomFiniteStrings() {// Just makes sure we can run on any random finite// automaton:diff --git a/lucene/luke/src/test/org/apache/lucene/luke/app/desktop/util/inifile/SimpleIniFileTest.java b/lucene/luke/src/test/org/apache/lucene/luke/app/desktop/util/inifile/TestSimpleIniFile.javasimilarity index 98%rename from lucene/luke/src/test/org/apache/lucene/luke/app/desktop/util/inifile/SimpleIniFileTest.javarename to lucene/luke/src/test/org/apache/lucene/luke/app/desktop/util/inifile/TestSimpleIniFile.javaindex a6c6b581282..9f0c272cb9a 100644--- a/lucene/luke/src/test/org/apache/lucene/luke/app/desktop/util/inifile/SimpleIniFileTest.java+++ b/lucene/luke/src/test/org/apache/lucene/luke/app/desktop/util/inifile/TestSimpleIniFile.java@@ -28,7 +28,7 @@ import java.util.stream.Collectors;import org.apache.lucene.util.LuceneTestCase;import org.junit.Test;-public class SimpleIniFileTest extends LuceneTestCase {+public class TestSimpleIniFile extends LuceneTestCase {@Testpublic void testStore() throws IOException {diff --git a/lucene/luke/src/test/org/apache/lucene/luke/models/analysis/AnalysisImplTest.java b/lucene/luke/src/test/org/apache/lucene/luke/models/analysis/TestAnalysisImpl.javasimilarity index 99%rename from lucene/luke/src/test/org/apache/lucene/luke/models/analysis/AnalysisImplTest.javarename to lucene/luke/src/test/org/apache/lucene/luke/models/analysis/TestAnalysisImpl.javaindex 258c577b518..3ee9d3ad22f 100644--- a/lucene/luke/src/test/org/apache/lucene/luke/models/analysis/AnalysisImplTest.java+++ b/lucene/luke/src/test/org/apache/lucene/luke/models/analysis/TestAnalysisImpl.java@@ -32,7 +32,7 @@ import org.apache.lucene.luke.models.LukeException;import org.apache.lucene.util.LuceneTestCase;import org.junit.Test;-public class AnalysisImplTest extends LuceneTestCase {+public class TestAnalysisImpl extends LuceneTestCase {@Testpublic void testGetPresetAnalyzerTypes() throws Exception {diff --git a/lucene/luke/src/test/org/apache/lucene/luke/models/commits/CommitsImplTest.java b/lucene/luke/src/test/org/apache/lucene/luke/models/commits/TestCommitsImpl.javasimilarity index 99%rename from lucene/luke/src/test/org/apache/lucene/luke/models/commits/CommitsImplTest.javarename to lucene/luke/src/test/org/apache/lucene/luke/models/commits/TestCommitsImpl.javaindex 93a60a7b890..261347dbc4e 100644--- a/lucene/luke/src/test/org/apache/lucene/luke/models/commits/CommitsImplTest.java+++ b/lucene/luke/src/test/org/apache/lucene/luke/models/commits/TestCommitsImpl.java@@ -37,7 +37,7 @@ import org.junit.After;import org.junit.Before;import org.junit.Test;-public class CommitsImplTest extends LuceneTestCase {+public class TestCommitsImpl extends LuceneTestCase {private DirectoryReader reader;diff --git a/lucene/luke/src/test/org/apache/lucene/luke/models/documents/DocValuesAdapterTest.java b/lucene/luke/src/test/org/apache/lucene/luke/models/documents/TestDocValuesAdapter.javasimilarity index 98%rename from lucene/luke/src/test/org/apache/lucene/luke/models/documents/DocValuesAdapterTest.javarename to lucene/luke/src/test/org/apache/lucene/luke/models/documents/TestDocValuesAdapter.javaindex 572806bf9b0..75ce9945ea2 100644--- a/lucene/luke/src/test/org/apache/lucene/luke/models/documents/DocValuesAdapterTest.java+++ b/lucene/luke/src/test/org/apache/lucene/luke/models/documents/TestDocValuesAdapter.java@@ -33,7 +33,7 @@ import org.apache.lucene.store.Directory;import org.apache.lucene.util.BytesRef;import org.junit.Test;-public class DocValuesAdapterTest extends DocumentsTestBase {+public class TestDocValuesAdapter extends DocumentsTestBase {@Overrideprotected void createIndex() throws IOException {diff --git a/lucene/luke/src/test/org/apache/lucene/luke/models/documents/DocumentsImplTest.java b/lucene/luke/src/test/org/apache/lucene/luke/models/documents/TestDocumentsImpl.javasimilarity index 99%rename from lucene/luke/src/test/org/apache/lucene/luke/models/documents/DocumentsImplTest.javarename to lucene/luke/src/test/org/apache/lucene/luke/models/documents/TestDocumentsImpl.javaindex 7306026e85e..cf08f1f56d4 100644--- a/lucene/luke/src/test/org/apache/lucene/luke/models/documents/DocumentsImplTest.java+++ b/lucene/luke/src/test/org/apache/lucene/luke/models/documents/TestDocumentsImpl.java@@ -34,7 +34,7 @@ import org.junit.Test;"FastCompressingStoredFieldsData","FastDecompressionCompressingStoredFieldsData"})-public class DocumentsImplTest extends DocumentsTestBase {+public class TestDocumentsImpl extends DocumentsTestBase {@Testpublic void testGetMaxDoc() {diff --git a/lucene/luke/src/test/org/apache/lucene/luke/models/documents/TermVectorsAdapterTest.java b/lucene/luke/src/test/org/apache/lucene/luke/models/documents/TestTermVectorsAdapter.javasimilarity index 99%rename from lucene/luke/src/test/org/apache/lucene/luke/models/documents/TermVectorsAdapterTest.javarename to lucene/luke/src/test/org/apache/lucene/luke/models/documents/TestTermVectorsAdapter.javaindex ec7884d1472..40266b21e39 100644--- a/lucene/luke/src/test/org/apache/lucene/luke/models/documents/TermVectorsAdapterTest.java+++ b/lucene/luke/src/test/org/apache/lucene/luke/models/documents/TestTermVectorsAdapter.java@@ -27,7 +27,7 @@ import org.apache.lucene.index.RandomIndexWriter;import org.apache.lucene.store.Directory;import org.junit.Test;-public class TermVectorsAdapterTest extends DocumentsTestBase {+public class TestTermVectorsAdapter extends DocumentsTestBase {@Overrideprotected void createIndex() throws IOException {diff --git a/lucene/luke/src/test/org/apache/lucene/luke/models/overview/OverviewImplTest.java b/lucene/luke/src/test/org/apache/lucene/luke/models/overview/TestOverviewImpl.javasimilarity index 98%rename from lucene/luke/src/test/org/apache/lucene/luke/models/overview/OverviewImplTest.javarename to lucene/luke/src/test/org/apache/lucene/luke/models/overview/TestOverviewImpl.javaindex 25f543c117b..14810debc0a 100644--- a/lucene/luke/src/test/org/apache/lucene/luke/models/overview/OverviewImplTest.java+++ b/lucene/luke/src/test/org/apache/lucene/luke/models/overview/TestOverviewImpl.java@@ -25,7 +25,7 @@ import java.util.Map;import org.apache.lucene.store.AlreadyClosedException;import org.junit.Test;-public class OverviewImplTest extends OverviewTestBase {+public class TestOverviewImpl extends OverviewTestBase {@Testpublic void testGetIndexPath() {diff --git a/lucene/luke/src/test/org/apache/lucene/luke/models/overview/TermCountsTest.java b/lucene/luke/src/test/org/apache/lucene/luke/models/overview/TestTermCounts.javasimilarity index 98%rename from lucene/luke/src/test/org/apache/lucene/luke/models/overview/TermCountsTest.javarename to lucene/luke/src/test/org/apache/lucene/luke/models/overview/TestTermCounts.javaindex 16345f067ae..cb7a03476cd 100644--- a/lucene/luke/src/test/org/apache/lucene/luke/models/overview/TermCountsTest.java+++ b/lucene/luke/src/test/org/apache/lucene/luke/models/overview/TestTermCounts.java@@ -22,7 +22,7 @@ import java.util.Arrays;import java.util.Map;import org.junit.Test;-public class TermCountsTest extends OverviewTestBase {+public class TestTermCounts extends OverviewTestBase {@Testpublic void testNumTerms() throws Exception {diff --git a/lucene/luke/src/test/org/apache/lucene/luke/models/overview/TopTermsTest.java b/lucene/luke/src/test/org/apache/lucene/luke/models/overview/TestTopTerms.javasimilarity index 96%rename from lucene/luke/src/test/org/apache/lucene/luke/models/overview/TopTermsTest.javarename to lucene/luke/src/test/org/apache/lucene/luke/models/overview/TestTopTerms.javaindex 80e63586da9..dab4a6afef5 100644--- a/lucene/luke/src/test/org/apache/lucene/luke/models/overview/TopTermsTest.java+++ b/lucene/luke/src/test/org/apache/lucene/luke/models/overview/TestTopTerms.java@@ -20,7 +20,7 @@ package org.apache.lucene.luke.models.overview;import java.util.List;import org.junit.Test;-public class TopTermsTest extends OverviewTestBase {+public class TestTopTerms extends OverviewTestBase {@Testpublic void testGetTopTerms() throws Exception {diff --git a/lucene/luke/src/test/org/apache/lucene/luke/models/search/SearchImplTest.java b/lucene/luke/src/test/org/apache/lucene/luke/models/search/TestSearchImpl.javasimilarity index 99%rename from lucene/luke/src/test/org/apache/lucene/luke/models/search/SearchImplTest.javarename to lucene/luke/src/test/org/apache/lucene/luke/models/search/TestSearchImpl.javaindex 41679d779fe..76c6fded59c 100644--- a/lucene/luke/src/test/org/apache/lucene/luke/models/search/SearchImplTest.java+++ b/lucene/luke/src/test/org/apache/lucene/luke/models/search/TestSearchImpl.java@@ -51,7 +51,7 @@ import org.apache.lucene.util.BytesRef;import org.apache.lucene.util.LuceneTestCase;import org.junit.Test;-public class SearchImplTest extends LuceneTestCase {+public class TestSearchImpl extends LuceneTestCase {private IndexReader reader;private Directory dir;diff --git a/lucene/misc/src/test/org/apache/lucene/misc/SweetSpotSimilarityTest.java b/lucene/misc/src/test/org/apache/lucene/misc/TestSweetSpotSimilarity.javasimilarity index 99%rename from lucene/misc/src/test/org/apache/lucene/misc/SweetSpotSimilarityTest.javarename to lucene/misc/src/test/org/apache/lucene/misc/TestSweetSpotSimilarity.javaindex 46f7da61266..9ca44d1cf53 100644--- a/lucene/misc/src/test/org/apache/lucene/misc/SweetSpotSimilarityTest.java+++ b/lucene/misc/src/test/org/apache/lucene/misc/TestSweetSpotSimilarity.java@@ -36,7 +36,7 @@ import org.apache.lucene.store.Directory;import org.apache.lucene.util.LuceneTestCase;/** Test of the SweetSpotSimilarity */-public class SweetSpotSimilarityTest extends LuceneTestCase {+public class TestSweetSpotSimilarity extends LuceneTestCase {private static float computeNorm(Similarity sim, String field, int length) throws IOException {String value = IntStream.range(0, length).mapToObj(i -> "a").collect(Collectors.joining(" "));diff --git a/lucene/misc/src/test/org/apache/lucene/misc/store/WindowsDirectoryTest.java b/lucene/misc/src/test/org/apache/lucene/misc/store/TestWindowsDirectory.javasimilarity index 96%rename from lucene/misc/src/test/org/apache/lucene/misc/store/WindowsDirectoryTest.javarename to lucene/misc/src/test/org/apache/lucene/misc/store/TestWindowsDirectory.javaindex 8994e691e2c..9ccc96a5cd5 100644--- a/lucene/misc/src/test/org/apache/lucene/misc/store/WindowsDirectoryTest.java+++ b/lucene/misc/src/test/org/apache/lucene/misc/store/TestWindowsDirectory.java@@ -26,7 +26,7 @@ import org.apache.lucene.util.LuceneTestCase;import org.junit.Rule;import org.junit.rules.TestRule;-public class WindowsDirectoryTest extends LuceneTestCase {+public class TestWindowsDirectory extends LuceneTestCase {@Rulepublic static TestRule requiresNative =new NativeLibEnableRule(EnumSet.of(NativeLibEnableRule.OperatingSystem.WINDOWS));diff --git a/lucene/queryparser/docs/surround/README.txt b/lucene/queryparser/docs/surround/README.txtindex 056f08044ba..f922a360914 100644--- a/lucene/queryparser/docs/surround/README.txt+++ b/lucene/queryparser/docs/surround/README.txt@@ -70,5 +70,5 @@ WildCardTermEnum (correct name?) should be no problem.Warnings about missing terms are sent to System.out, this mightbe replaced by another stream, and tested for in the tests.-BooleanQueryTst.TestCollector uses a results checking method that should+TestBooleanQuery.TestCollector uses a results checking method that shouldbe replaced by the checking method from Lucene's TestBasics.java.diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test01Exceptions.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test01Exceptions.javaindex f7cda89f77d..0b968b88242 100644--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test01Exceptions.java+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test01Exceptions.java@@ -57,7 +57,7 @@ public class Test01Exceptions extends LuceneTestCase {};public void test01Exceptions() throws Exception {- String m = ExceptionQueryTst.getFailQueries(exceptionQueries, verbose);+ String m = TestExceptionQuery.getFailQueries(exceptionQueries, verbose);if (m.length() > 0) {fail("No ParseException for:\n" + m);}diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test02Boolean.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test02Boolean.javaindex fcb731e7e86..7d55b79d706 100644--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test02Boolean.java+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test02Boolean.java@@ -46,11 +46,11 @@ public class Test02Boolean extends LuceneTestCase {SingleFieldTestDb db1;public void normalTest1(String query, int[] expdnrs) throws Exception {- BooleanQueryTst bqt =- new BooleanQueryTst(+ TestBooleanQuery tbq =+ new TestBooleanQuery(query, expdnrs, db1, fieldName, this, new BasicQueryFactory(maxBasicQueries));- bqt.setVerbose(verbose);- bqt.doTest();+ tbq.setVerbose(verbose);+ tbq.doTest();}public void test02Terms01() throws Exception {diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test03Distance.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test03Distance.javaindex 9edbc7e7be6..36554ec2fa4 100644--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test03Distance.java+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test03Distance.java@@ -41,7 +41,7 @@ public class Test03Distance extends LuceneTestCase {};public void test00Exceptions() throws Exception {- String m = ExceptionQueryTst.getFailQueries(exceptionQueries, verbose);+ String m = TestExceptionQuery.getFailQueries(exceptionQueries, verbose);if (m.length() > 0) {fail("No ParseException for:\n" + m);}@@ -68,11 +68,11 @@ public class Test03Distance extends LuceneTestCase {}private void distanceTst(String query, int[] expdnrs, SingleFieldTestDb db) throws Exception {- BooleanQueryTst bqt =- new BooleanQueryTst(+ TestBooleanQuery tbq =+ new TestBooleanQuery(query, expdnrs, db, fieldName, this, new BasicQueryFactory(maxBasicQueries));- bqt.setVerbose(verbose);- bqt.doTest();+ tbq.setVerbose(verbose);+ tbq.doTest();}public void distanceTest1(String query, int[] expdnrs) throws Exception {diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/BooleanQueryTst.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/TestBooleanQuery.javasimilarity index 98%rename from lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/BooleanQueryTst.javarename to lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/TestBooleanQuery.javaindex 6690f5f93d3..25c848eb9e1 100644--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/BooleanQueryTst.java+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/TestBooleanQuery.java@@ -28,7 +28,7 @@ import org.apache.lucene.search.ScoreMode;import org.apache.lucene.search.SimpleCollector;import org.junit.Assert;-public class BooleanQueryTst {+public class TestBooleanQuery {String queryText;final int[] expectedDocNrs;SingleFieldTestDb dBase;@@ -37,7 +37,7 @@ public class BooleanQueryTst {BasicQueryFactory qf;boolean verbose = true;- public BooleanQueryTst(+ public TestBooleanQuery(String queryText,int[] expectedDocNrs,SingleFieldTestDb dBase,diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/ExceptionQueryTst.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/TestExceptionQuery.javasimilarity index 91%rename from lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/ExceptionQueryTst.javarename to lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/TestExceptionQuery.javaindex dc35b09e3ca..18574c3fdcb 100644--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/ExceptionQueryTst.java+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/TestExceptionQuery.java@@ -19,11 +19,11 @@ package org.apache.lucene.queryparser.surround.query;import org.apache.lucene.queryparser.surround.parser.ParseException;import org.apache.lucene.queryparser.surround.parser.QueryParser;-public class ExceptionQueryTst {+public class TestExceptionQuery {private String queryText;private boolean verbose;- public ExceptionQueryTst(String queryText, boolean verbose) {+ public TestExceptionQuery(String queryText, boolean verbose) {this.queryText = queryText;this.verbose = verbose;}@@ -53,7 +53,7 @@ public class ExceptionQueryTst {public static String getFailQueries(String[] exceptionQueries, boolean verbose) {StringBuilder failQueries = new StringBuilder();for (int i = 0; i < exceptionQueries.length; i++) {- new ExceptionQueryTst(exceptionQueries[i], verbose).doTest(failQueries);+ new TestExceptionQuery(exceptionQueries[i], verbose).doTest(failQueries);}return failQueries.toString();}diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/SrndQueryTest.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/TestSrndQuery.javasimilarity index 97%rename from lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/SrndQueryTest.javarename to lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/TestSrndQuery.javaindex e0a24fa89c5..425d902be35 100644--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/SrndQueryTest.java+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/TestSrndQuery.java@@ -23,7 +23,7 @@ import org.apache.lucene.util.LuceneTestCase;import org.junit.Test;/** */-public class SrndQueryTest extends LuceneTestCase {+public class TestSrndQuery extends LuceneTestCase {void checkEqualParsings(String s1, String s2) throws Exception {String fieldName = "foo";diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/DocumentDictionaryTest.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestDocumentDictionary.javasimilarity index 99%rename from lucene/suggest/src/test/org/apache/lucene/search/suggest/DocumentDictionaryTest.javarename to lucene/suggest/src/test/org/apache/lucene/search/suggest/TestDocumentDictionary.javaindex 715278a6ff5..12dec504555 100644--- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/DocumentDictionaryTest.java+++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestDocumentDictionary.java@@ -48,7 +48,7 @@ import org.junit.Test;// See: https://issues.apache.org/jira/browse/SOLR-12028 Tests cannot remove files on Windows// machines occasionally-public class DocumentDictionaryTest extends LuceneTestCase {+public class TestDocumentDictionary extends LuceneTestCase {static final String FIELD_NAME = "f1";static final String WEIGHT_FIELD_NAME = "w1";diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/DocumentValueSourceDictionaryTest.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestDocumentValueSourceDictionary.javasimilarity index 99%rename from lucene/suggest/src/test/org/apache/lucene/search/suggest/DocumentValueSourceDictionaryTest.javarename to lucene/suggest/src/test/org/apache/lucene/search/suggest/TestDocumentValueSourceDictionary.javaindex cb1c9920813..4706043c68a 100644--- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/DocumentValueSourceDictionaryTest.java+++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestDocumentValueSourceDictionary.java@@ -49,7 +49,7 @@ import org.apache.lucene.util.IOUtils;import org.apache.lucene.util.LuceneTestCase;import org.junit.Test;-public class DocumentValueSourceDictionaryTest extends LuceneTestCase {+public class TestDocumentValueSourceDictionary extends LuceneTestCase {static final String FIELD_NAME = "f1";static final String WEIGHT_FIELD_NAME_1 = "w1";diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/FileDictionaryTest.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestFileDictionary.javasimilarity index 99%rename from lucene/suggest/src/test/org/apache/lucene/search/suggest/FileDictionaryTest.javarename to lucene/suggest/src/test/org/apache/lucene/search/suggest/TestFileDictionary.javaindex c1bf8836683..3fd5ce7216b 100644--- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/FileDictionaryTest.java+++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestFileDictionary.java@@ -29,7 +29,7 @@ import org.apache.lucene.util.LuceneTestCase;import org.apache.lucene.util.TestUtil;import org.junit.Test;-public class FileDictionaryTest extends LuceneTestCase {+public class TestFileDictionary extends LuceneTestCase {private Map.Entry<List<String>, String> generateFileEntry(String fieldDelimiter, boolean hasWeight, boolean hasPayload) {diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/LookupBenchmarkTest.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestLookupBenchmark.javasimilarity index 97%rename from lucene/suggest/src/test/org/apache/lucene/search/suggest/LookupBenchmarkTest.javarename to lucene/suggest/src/test/org/apache/lucene/search/suggest/TestLookupBenchmark.javaindex c6b407b889d..f7386bca4b6 100644--- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/LookupBenchmarkTest.java+++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestLookupBenchmark.java@@ -49,7 +49,7 @@ import org.junit.Ignore;/** Benchmarks tests for implementations of {@link Lookup} interface. */@Ignore("COMMENT ME TO RUN BENCHMARKS!")-public class LookupBenchmarkTest extends LuceneTestCase {+public class TestLookupBenchmark extends LuceneTestCase {@SuppressWarnings({"unchecked", "deprecation"})private final List<Class<? extends Lookup>> benchmarkClasses =Arrays.asList(@@ -83,9 +83,9 @@ public class LookupBenchmarkTest extends LuceneTestCase {assert false : "disable assertions before running benchmarks!";List<Input> input = readTop50KWiki();Collections.shuffle(input, random);- LookupBenchmarkTest.dictionaryInput = input.toArray(new Input[input.size()]);+ TestLookupBenchmark.dictionaryInput = input.toArray(new Input[input.size()]);Collections.shuffle(input, random);- LookupBenchmarkTest.benchmarkInput = input;+ TestLookupBenchmark.benchmarkInput = input;}static final Charset UTF_8 = StandardCharsets.UTF_8;@@ -93,7 +93,7 @@ public class LookupBenchmarkTest extends LuceneTestCase {/** Collect the multilingual input for benchmarks/ tests. */public static List<Input> readTop50KWiki() throws Exception {List<Input> input = new ArrayList<>();- URL resource = LookupBenchmarkTest.class.getResource("Top50KWiki.utf8");+ URL resource = TestLookupBenchmark.class.getResource("Top50KWiki.utf8");assert resource != null : "Resource missing: Top50KWiki.utf8";String line = null;diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/PersistenceTest.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestPersistence.javasimilarity index 98%rename from lucene/suggest/src/test/org/apache/lucene/search/suggest/PersistenceTest.javarename to lucene/suggest/src/test/org/apache/lucene/search/suggest/TestPersistence.javaindex 731e69d1e86..e208a92e1ce 100644--- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/PersistenceTest.java+++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestPersistence.java@@ -28,7 +28,7 @@ import org.apache.lucene.store.Directory;import org.apache.lucene.util.LuceneTestCase;import org.apache.lucene.util.TestUtil;-public class PersistenceTest extends LuceneTestCase {+public class TestPersistence extends LuceneTestCase {public final String[] keys =new String[] {"one",diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestAnalyzingInfixSuggester.javasimilarity index 99%rename from lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.javarename to lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestAnalyzingInfixSuggester.javaindex 869e8820f0a..3343a6da0fb 100644--- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java+++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestAnalyzingInfixSuggester.java@@ -49,7 +49,7 @@ import org.apache.lucene.util.LuceneTestCase;import org.apache.lucene.util.TestUtil;import org.junit.Test;-public class AnalyzingInfixSuggesterTest extends LuceneTestCase {+public class TestAnalyzingInfixSuggester extends LuceneTestCase {public void testBasic() throws Exception {Input keys[] =diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggesterTest.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestAnalyzingSuggester.javasimilarity index 99%rename from lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggesterTest.javarename to lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestAnalyzingSuggester.javaindex bbdd76ac53b..c0c96c34ffe 100644--- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggesterTest.java+++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestAnalyzingSuggester.java@@ -57,7 +57,7 @@ import org.apache.lucene.util.LineFileDocs;import org.apache.lucene.util.LuceneTestCase;import org.apache.lucene.util.TestUtil;-public class AnalyzingSuggesterTest extends LuceneTestCase {+public class TestAnalyzingSuggester extends LuceneTestCase {/** this is basically the WFST test ported to KeywordAnalyzer. so it acts the same */public void testKeyword() throws Exception {diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggesterTest.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestBlendedInfixSuggester.javasimilarity index 99%rename from lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggesterTest.javarename to lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestBlendedInfixSuggester.javaindex 8717dbe2424..95114ed346d 100644--- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggesterTest.java+++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestBlendedInfixSuggester.java@@ -35,7 +35,7 @@ import org.apache.lucene.util.BytesRef;import org.apache.lucene.util.LuceneTestCase;import org.apache.lucene.util.TestUtil;-public class BlendedInfixSuggesterTest extends LuceneTestCase {+public class TestBlendedInfixSuggester extends LuceneTestCase {/** Test the weight transformation depending on the position of the matching term. */public void testBlendedSort() throws IOException {diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestFreeTextSuggester.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestFreeTextSuggester.javaindex e6f64dec2f8..7096cef20a7 100644--- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestFreeTextSuggester.java+++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestFreeTextSuggester.java@@ -51,7 +51,7 @@ public class TestFreeTextSuggester extends LuceneTestCase {public void testBasic() throws Exception {Iterable<Input> keys =- AnalyzingSuggesterTest.shuffle(+ TestAnalyzingSuggester.shuffle(new Input("foo bar baz blah", 50), new Input("boo foo bar foo bee", 20));Analyzer a = new MockAnalyzer(random());@@ -96,7 +96,7 @@ public class TestFreeTextSuggester extends LuceneTestCase {public void testIllegalByteDuringBuild() throws Exception {// Default separator is INFORMATION SEPARATOR TWO// (0x1e), so no input token is allowed to contain it- Iterable<Input> keys = AnalyzingSuggesterTest.shuffle(new Input("foo\u001ebar baz", 50));+ Iterable<Input> keys = TestAnalyzingSuggester.shuffle(new Input("foo\u001ebar baz", 50));Analyzer analyzer = new MockAnalyzer(random());FreeTextSuggester sug = new FreeTextSuggester(analyzer);expectThrows(@@ -111,7 +111,7 @@ public class TestFreeTextSuggester extends LuceneTestCase {public void testIllegalByteDuringQuery() throws Exception {// Default separator is INFORMATION SEPARATOR TWO// (0x1e), so no input token is allowed to contain it- Iterable<Input> keys = AnalyzingSuggesterTest.shuffle(new Input("foo bar baz", 50));+ Iterable<Input> keys = TestAnalyzingSuggester.shuffle(new Input("foo bar baz", 50));Analyzer analyzer = new MockAnalyzer(random());FreeTextSuggester sug = new FreeTextSuggester(analyzer);sug.build(new InputArrayIterator(keys));@@ -196,7 +196,7 @@ public class TestFreeTextSuggester extends LuceneTestCase {// Make sure you can suggest based only on unigram model:public void testUnigrams() throws Exception {Iterable<Input> keys =- AnalyzingSuggesterTest.shuffle(new Input("foo bar baz blah boo foo bar foo bee", 50));+ TestAnalyzingSuggester.shuffle(new Input("foo bar baz blah boo foo bar foo bee", 50));Analyzer a = new MockAnalyzer(random());FreeTextSuggester sug = new FreeTextSuggester(a, a, 1, (byte) 0x20);@@ -208,7 +208,7 @@ public class TestFreeTextSuggester extends LuceneTestCase {// Make sure the last token is not duplicatedpublic void testNoDupsAcrossGrams() throws Exception {- Iterable<Input> keys = AnalyzingSuggesterTest.shuffle(new Input("foo bar bar bar bar", 50));+ Iterable<Input> keys = TestAnalyzingSuggester.shuffle(new Input("foo bar bar bar bar", 50));Analyzer a = new MockAnalyzer(random());FreeTextSuggester sug = new FreeTextSuggester(a, a, 2, (byte) 0x20);sug.build(new InputArrayIterator(keys));@@ -218,7 +218,7 @@ public class TestFreeTextSuggester extends LuceneTestCase {// Lookup of just empty string produces unicode only matches:public void testEmptyString() throws Exception {- Iterable<Input> keys = AnalyzingSuggesterTest.shuffle(new Input("foo bar bar bar bar", 50));+ Iterable<Input> keys = TestAnalyzingSuggester.shuffle(new Input("foo bar bar bar bar", 50));Analyzer a = new MockAnalyzer(random());FreeTextSuggester sug = new FreeTextSuggester(a, a, 2, (byte) 0x20);sug.build(new InputArrayIterator(keys));@@ -245,7 +245,7 @@ public class TestFreeTextSuggester extends LuceneTestCase {}};- Iterable<Input> keys = AnalyzingSuggesterTest.shuffle(new Input("wizard of oz", 50));+ Iterable<Input> keys = TestAnalyzingSuggester.shuffle(new Input("wizard of oz", 50));FreeTextSuggester sug = new FreeTextSuggester(a, a, 3, (byte) 0x20);sug.build(new InputArrayIterator(keys));assertEquals("wizard _ oz/1.00", toString(sug.lookup("wizard of", 10)));@@ -271,7 +271,7 @@ public class TestFreeTextSuggester extends LuceneTestCase {}};- Iterable<Input> keys = AnalyzingSuggesterTest.shuffle(new Input("wizard of of oz", 50));+ Iterable<Input> keys = TestAnalyzingSuggester.shuffle(new Input("wizard of of oz", 50));FreeTextSuggester sug = new FreeTextSuggester(a, a, 3, (byte) 0x20);sug.build(new InputArrayIterator(keys));assertEquals("", toString(sug.lookup("wizard of of", 10)));diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/FuzzySuggesterTest.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestFuzzySuggester.javasimilarity index 99%rename from lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/FuzzySuggesterTest.javarename to lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestFuzzySuggester.javaindex ea63a1dd121..472a2879a17 100644--- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/FuzzySuggesterTest.java+++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestFuzzySuggester.java@@ -50,7 +50,7 @@ import org.apache.lucene.util.automaton.Automaton;import org.apache.lucene.util.automaton.FiniteStringsIterator;import org.apache.lucene.util.fst.Util;-public class FuzzySuggesterTest extends LuceneTestCase {+public class TestFuzzySuggester extends LuceneTestCase {public void testRandomEdits() throws IOException {List<Input> keys = new ArrayList<>();@@ -284,7 +284,7 @@ public class FuzzySuggesterTest extends LuceneTestCase {public void testGraphDups() throws Exception {final Analyzer analyzer =- new AnalyzingSuggesterTest.MultiCannedAnalyzer(+ new TestAnalyzingSuggester.MultiCannedAnalyzer(new CannedTokenStream(token("wifi", 1, 1),token("hotspot", 0, 2),@@ -343,7 +343,7 @@ public class FuzzySuggesterTest extends LuceneTestCase {// synonym modulefinal Analyzer analyzer =- new AnalyzingSuggesterTest.MultiCannedAnalyzer(+ new TestAnalyzingSuggester.MultiCannedAnalyzer(new CannedTokenStream(token("ab", 1, 1), token("ba", 0, 1), token("xc", 1, 1)),new CannedTokenStream(token("ba", 1, 1), token("xd", 1, 1)),new CannedTokenStream(token("ab", 1, 1), token("ba", 0, 1), token("x", 1, 1)));@@ -387,7 +387,7 @@ public class FuzzySuggesterTest extends LuceneTestCase {private Analyzer getUnusualAnalyzer() {// First three calls just returns "a", then returns ["a","b"], then "a" again- return new AnalyzingSuggesterTest.MultiCannedAnalyzer(+ return new TestAnalyzingSuggester.MultiCannedAnalyzer(new CannedTokenStream(token("a", 1, 1)),new CannedTokenStream(token("a", 1, 1)),new CannedTokenStream(token("a", 1, 1)),diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/BytesRefSortersTest.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/TestBytesRefSorters.javasimilarity index 97%rename from lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/BytesRefSortersTest.javarename to lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/TestBytesRefSorters.javaindex c1bde036b3b..2af2eb0752a 100644--- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/BytesRefSortersTest.java+++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/TestBytesRefSorters.java@@ -26,7 +26,7 @@ import org.apache.lucene.util.LuceneTestCase;import org.apache.lucene.util.OfflineSorter;import org.junit.Test;-public class BytesRefSortersTest extends LuceneTestCase {+public class TestBytesRefSorters extends LuceneTestCase {@Testpublic void testExternalRefSorter() throws Exception {Directory tempDir = newDirectory();diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/FSTCompletionTest.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/TestFSTCompletion.javasimilarity index 98%rename from lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/FSTCompletionTest.javarename to lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/TestFSTCompletion.javaindex 73e6f8dd7ee..29b388301fe 100644--- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/FSTCompletionTest.java+++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/TestFSTCompletion.java@@ -25,7 +25,7 @@ import org.apache.lucene.store.Directory;import org.apache.lucene.util.*;/** Unit tests for {@link FSTCompletion}. */-public class FSTCompletionTest extends LuceneTestCase {+public class TestFSTCompletion extends LuceneTestCase {public static Input tf(String t, int v) {return new Input(t, v);@@ -177,7 +177,7 @@ public class FSTCompletionTest extends LuceneTestCase {@Slowpublic void testMultilingualInput() throws Exception {- List<Input> input = LookupBenchmarkTest.readTop50KWiki();+ List<Input> input = TestLookupBenchmark.readTop50KWiki();Directory tempDir = getDirectory();FSTCompletionLookup lookup = new FSTCompletionLookup(tempDir, "fst");diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/WFSTCompletionTest.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/TestWFSTCompletion.javasimilarity index 99%rename from lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/WFSTCompletionTest.javarename to lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/TestWFSTCompletion.javaindex 68a704b07e3..2ed0f80fc1e 100644--- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/WFSTCompletionTest.java+++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/TestWFSTCompletion.java@@ -25,7 +25,7 @@ import org.apache.lucene.util.BytesRef;import org.apache.lucene.util.LuceneTestCase;import org.apache.lucene.util.TestUtil;-public class WFSTCompletionTest extends LuceneTestCase {+public class TestWFSTCompletion extends LuceneTestCase {public void testBasic() throws Exception {Input keys[] =