From 985d52f3ab1e7ff14f11c1900fde208b38f5d012 Mon Sep 17 00:00:00 2001 From: Dawid Weiss Date: Sun, 19 Dec 2021 13:13:44 +0100 Subject: [PATCH 01/32] move util -> tests.util --- .../analysis/bn/TestBengaliNormalizer.java | 2 +- .../charfilter/TestHTMLStripCharFilter.java | 2 +- .../charfilter/TestMappingCharFilter.java | 2 +- .../core/TestAllAnalyzersHaveFactories.java | 2 +- .../analysis/core/TestBugInSomething.java | 2 +- .../analysis/core/TestDecimalDigitFilter.java | 2 +- .../analysis/core/TestDuelingAnalyzers.java | 2 +- .../lucene/analysis/core/TestFactories.java | 2 +- .../analysis/core/TestKeywordAnalyzer.java | 2 +- .../analysis/core/TestRandomChains.java | 6 ++-- .../analysis/core/TestTypeTokenFilter.java | 2 +- .../email/TestUAX29URLEmailTokenizer.java | 2 +- .../analysis/hunspell/StemmerTestBase.java | 2 +- .../analysis/hunspell/Test64kAffixes.java | 2 +- .../analysis/hunspell/TestAffixCondition.java | 2 +- .../hunspell/TestAllDictionaries.java | 6 ++-- .../analysis/hunspell/TestDictionary.java | 2 +- .../analysis/hunspell/TestHunspell.java | 2 +- .../analysis/hunspell/TestPerformance.java | 2 +- .../analysis/hunspell/TestSpellChecking.java | 2 +- .../hunspell/TestTrigramAutomaton.java | 2 +- .../TestCodepointCountFilter.java | 2 +- .../TestLimitTokenCountAnalyzer.java | 2 +- .../TestRemoveDuplicatesTokenFilter.java | 2 +- .../TestStemmerOverrideFilter.java | 2 +- .../TestWordDelimiterGraphFilter.java | 2 +- .../ngram/TestEdgeNGramTokenFilter.java | 2 +- .../ngram/TestEdgeNGramTokenizer.java | 2 +- .../analysis/ngram/TestNGramTokenFilter.java | 2 +- .../analysis/ngram/TestNGramTokenizer.java | 2 +- .../pattern/TestPatternReplaceCharFilter.java | 2 +- .../TestSimplePatternSplitTokenizer.java | 2 +- .../pattern/TestSimplePatternTokenizer.java | 2 +- .../sinks/TestTeeSinkTokenFilter.java | 2 +- .../analysis/snowball/TestSnowballVocab.java | 2 +- .../synonym/TestSynonymGraphFilter.java | 4 +-- .../synonym/TestSynonymMapFilter.java | 2 +- .../analysis/util/TestCharArrayIterator.java | 4 +-- .../util/TestFilesystemResourceLoader.java | 2 +- .../analysis/util/TestRollingCharBuffer.java | 4 +-- .../TestCollationDocValuesField.java | 4 +-- .../icu/TestICUCollationDocValuesField.java | 4 +-- .../icu/TestICUNormalizer2CharFilter.java | 2 +- .../segmentation/TestCharArrayIterator.java | 2 +- .../icu/segmentation/TestICUTokenizerCJK.java | 2 +- .../lucene/analysis/ja/TestCSVUtil.java | 2 +- .../lucene/analysis/ja/TestExtendedMode.java | 2 +- .../lucene/analysis/ja/TestFactories.java | 2 +- .../analysis/ja/TestJapaneseTokenizer.java | 2 +- .../ja/completion/TestKatakanaRomanizer.java | 2 +- .../ja/dict/TestTokenInfoDictionary.java | 2 +- .../analysis/ja/dict/TestUserDictionary.java | 2 +- .../analysis/ja/util/TestToStringUtil.java | 2 +- .../ja/util/TestUnknownDictionary.java | 2 +- .../ko/dict/TestTokenInfoDictionary.java | 2 +- .../analysis/ko/dict/TestUserDictionary.java | 2 +- .../ko/util/TestUnknownDictionary.java | 2 +- .../TestOpenNLPSentenceBreakIterator.java | 2 +- .../phonetic/TestDoubleMetaphoneFilter.java | 2 +- .../test/org/egothor/stemmer/TestCompile.java | 2 +- .../test/org/egothor/stemmer/TestStemmer.java | 2 +- .../lucene50/TestBlockPostingsFormat.java | 4 +-- .../lucene50/TestBlockPostingsFormat2.java | 6 ++-- .../lucene50/TestBlockPostingsFormat3.java | 10 +++--- .../backward_codecs/lucene50/TestForUtil.java | 4 +-- .../lucene50/TestLucene50CompoundFormat.java | 2 +- .../lucene50/TestLucene50LiveDocsFormat.java | 2 +- .../TestLucene50StoredFieldsFormat.java | 2 +- ...ne50StoredFieldsFormatHighCompression.java | 2 +- ...cene50StoredFieldsFormatMergeInstance.java | 2 +- .../TestLucene50TermVectorsFormat.java | 2 +- .../TestLucene60FieldInfosFormat.java | 2 +- .../lucene60/TestLucene60PointsFormat.java | 4 +-- .../TestLucene70SegmentInfoFormat.java | 2 +- .../BaseLucene80DocValuesFormatTestCase.java | 2 +- ...estCompressionLucene80DocValuesFormat.java | 4 +-- .../TestBestSpeedLucene80DocValuesFormat.java | 4 +-- .../lucene80/TestDocValuesCompression.java | 6 ++-- .../lucene80/TestIndexedDISI.java | 6 ++-- .../lucene80/TestLucene80NormsFormat.java | 2 +- .../TestLucene80NormsFormatMergeInstance.java | 2 +- .../lucene84/TestForDeltaUtil.java | 6 ++-- .../backward_codecs/lucene84/TestForUtil.java | 6 ++-- .../lucene84/TestLucene84PostingsFormat.java | 4 +-- .../lucene84/TestPForUtil.java | 6 ++-- .../lucene86/TestLucene86PointsFormat.java | 4 +-- .../TestLucene86SegmentInfoFormat.java | 2 +- .../TestLucene87StoredFieldsFormat.java | 2 +- ...ne87StoredFieldsFormatHighCompression.java | 2 +- ...cene87StoredFieldsFormatMergeInstance.java | 2 +- .../packed/TestLegacyDirectMonotonic.java | 6 ++-- .../packed/TestLegacyDirectPacked.java | 6 ++-- .../packed/TestLegacyPackedInts.java | 8 ++--- .../store/EndiannessReverserTestCase.java | 4 +-- ...tEndiannessReverserCheckSumIndexInput.java | 2 +- .../TestEndiannessReverserIndexInput.java | 2 +- .../TestBackwardsCompatibility.java | 6 ++-- .../TestIndexWriterOnOldIndex.java | 4 +-- .../TestManyPointsInOldIndex.java | 4 +-- .../lucene/benchmark/BenchmarkTestCase.java | 4 +-- .../benchmark/byTask/TestPerfTasksLogic.java | 4 +-- .../benchmark/byTask/TestPerfTasksParse.java | 4 +-- .../byTask/feeds/TestEnwikiContentSource.java | 2 +- .../byTask/feeds/TestHtmlParser.java | 2 +- .../byTask/feeds/TestTrecContentSource.java | 4 +-- .../benchmark/byTask/utils/TestConfig.java | 2 +- .../ClassificationTestBase.java | 4 +-- .../Test20NewsgroupsClassification.java | 4 +-- .../utils/TestDataSplitter.java | 4 +-- .../utils/TestDocToDoubleVectorUtils.java | 2 +- .../TestFixedGapPostingsFormat.java | 2 +- ...stVarGapDocFreqIntervalPostingsFormat.java | 2 +- ...TestVarGapFixedIntervalPostingsFormat.java | 2 +- .../blocktreeords/TestOrdsBlockTree.java | 2 +- .../codecs/bloom/TestBloomPostingsFormat.java | 2 +- .../memory/TestDirectPostingsFormat.java | 2 +- .../codecs/memory/TestFSTPostingsFormat.java | 2 +- .../TestSimpleTextPostingsFormat.java | 2 +- .../codecs/uniformsplit/TestBlockWriter.java | 2 +- .../uniformsplit/TestFSTDictionary.java | 2 +- .../codecs/uniformsplit/TestTermBytes.java | 2 +- .../uniformsplit/TestTermBytesComparator.java | 2 +- .../TestUniformSplitPostingFormat.java | 2 +- .../sharedterms/TestSTBlockReader.java | 2 +- .../apache/lucene/util/RamUsageEstimator.java | 2 +- .../lucene/util/automaton/Automaton.java | 2 +- .../lucene/util/automaton/Operations.java | 2 +- .../org/apache/lucene/TestAssertions.java | 2 +- .../src/test/org/apache/lucene/TestDemo.java | 2 +- .../org/apache/lucene/TestExternalCodecs.java | 4 +-- .../lucene/TestMergeSchedulerExternal.java | 2 +- .../test/org/apache/lucene/TestSearch.java | 2 +- .../lucene/TestSearchForDuplicates.java | 2 +- .../analysis/TestAbstractAnalysisFactory.java | 2 +- .../analysis/TestAnalysisSPILoader.java | 2 +- .../lucene/analysis/TestAnalyzerWrapper.java | 2 +- .../lucene/analysis/TestCharArrayMap.java | 2 +- .../lucene/analysis/TestCharArraySet.java | 2 +- .../lucene/analysis/TestCharFilter.java | 2 +- .../lucene/analysis/TestCharacterUtils.java | 4 +-- .../TestDelegatingAnalyzerWrapper.java | 2 +- .../lucene/analysis/TestGraphTokenizers.java | 2 +- .../analysis/TestReusableStringReader.java | 2 +- .../lucene/analysis/TestStopFilter.java | 2 +- .../lucene/analysis/TestWordlistLoader.java | 2 +- .../standard/TestStandardAnalyzer.java | 2 +- .../tokenattributes/TestBytesRefAttImpl.java | 2 +- .../TestCharTermAttributeImpl.java | 4 +-- .../TestPackedTokenAttributeImpl.java | 4 +-- .../TestSimpleAttributeImpl.java | 4 +-- .../apache/lucene/codecs/TestCodecUtil.java | 2 +- .../TestCompetitiveFreqNormAccumulator.java | 2 +- .../AbstractTestCompressionMode.java | 4 +-- .../lucene/codecs/lucene90/TestForUtil.java | 4 +-- .../codecs/lucene90/TestIndexedDISI.java | 4 +-- .../lucene90/TestLucene90CompoundFormat.java | 2 +- .../lucene90/TestLucene90DocValuesFormat.java | 2 +- .../TestLucene90FieldInfosFormat.java | 2 +- .../TestLucene90HnswVectorsFormat.java | 2 +- .../lucene90/TestLucene90LiveDocsFormat.java | 2 +- .../lucene90/TestLucene90NormsFormat.java | 2 +- .../lucene90/TestLucene90PointsFormat.java | 2 +- .../lucene90/TestLucene90PostingsFormat.java | 2 +- .../TestLucene90SegmentInfoFormat.java | 2 +- .../TestLucene90StoredFieldsFormat.java | 2 +- .../TestLucene90TermVectorsFormat.java | 2 +- .../lucene/codecs/lucene90/TestPForUtil.java | 4 +-- .../compressing/TestStoredFieldsInt.java | 4 +-- .../perfield/TestPerFieldDocValuesFormat.java | 2 +- .../TestPerFieldKnnVectorsFormat.java | 2 +- .../perfield/TestPerFieldPostingsFormat2.java | 4 +-- .../document/BaseLatLonSpatialTestCase.java | 2 +- .../document/BaseShapeEncodingTestCase.java | 2 +- .../lucene/document/BaseSpatialTestCase.java | 4 +-- .../lucene/document/BaseXYShapeTestCase.java | 2 +- .../lucene/document/TestBinaryDocument.java | 2 +- .../apache/lucene/document/TestDateTools.java | 2 +- .../apache/lucene/document/TestDocument.java | 2 +- .../lucene/document/TestDoubleRange.java | 2 +- .../document/TestFeatureDoubleValues.java | 2 +- .../lucene/document/TestFeatureField.java | 2 +- .../lucene/document/TestFeatureSort.java | 4 +-- .../org/apache/lucene/document/TestField.java | 2 +- .../apache/lucene/document/TestFieldType.java | 2 +- .../lucene/document/TestFloatRange.java | 2 +- .../lucene/document/TestInetAddressPoint.java | 2 +- .../apache/lucene/document/TestIntRange.java | 2 +- .../document/TestLatLonDocValuesField.java | 2 +- .../lucene/document/TestLatLonPoint.java | 2 +- .../TestLatLonPointDistanceFeatureQuery.java | 2 +- .../document/TestLatLonPointDistanceSort.java | 4 +-- .../lucene/document/TestLatLonShape.java | 4 +-- .../TestLongDistanceFeatureQuery.java | 2 +- .../apache/lucene/document/TestLongRange.java | 2 +- .../document/TestPerFieldConsistency.java | 2 +- .../TestXYMultiPolygonShapeQueries.java | 2 +- .../apache/lucene/document/TestXYShape.java | 4 +-- .../org/apache/lucene/geo/TestCircle.java | 2 +- .../org/apache/lucene/geo/TestCircle2D.java | 2 +- .../lucene/geo/TestGeoEncodingUtils.java | 4 +-- .../org/apache/lucene/geo/TestGeoUtils.java | 2 +- .../org/apache/lucene/geo/TestLine2D.java | 2 +- .../test/org/apache/lucene/geo/TestPoint.java | 2 +- .../org/apache/lucene/geo/TestPoint2D.java | 2 +- .../org/apache/lucene/geo/TestPolygon.java | 2 +- .../org/apache/lucene/geo/TestPolygon2D.java | 4 +-- .../apache/lucene/geo/TestRectangle2D.java | 2 +- .../lucene/geo/TestSimpleWKTShapeParsing.java | 2 +- .../apache/lucene/geo/TestTessellator.java | 2 +- .../org/apache/lucene/geo/TestXYCircle.java | 2 +- .../org/apache/lucene/geo/TestXYLine.java | 2 +- .../org/apache/lucene/geo/TestXYPoint.java | 2 +- .../org/apache/lucene/geo/TestXYPolygon.java | 2 +- .../apache/lucene/geo/TestXYRectangle.java | 4 +-- .../lucene/index/Test2BBinaryDocValues.java | 12 +++---- .../org/apache/lucene/index/Test2BDocs.java | 12 +++---- .../lucene/index/Test2BNumericDocValues.java | 12 +++---- .../org/apache/lucene/index/Test2BPoints.java | 8 ++--- .../apache/lucene/index/Test2BPositions.java | 8 ++--- .../apache/lucene/index/Test2BPostings.java | 6 ++-- .../lucene/index/Test2BPostingsBytes.java | 8 ++--- .../Test2BSortedDocValuesFixedSorted.java | 12 +++---- .../index/Test2BSortedDocValuesOrds.java | 12 +++---- .../org/apache/lucene/index/Test2BTerms.java | 12 +++---- .../lucene/index/Test4GBStoredFields.java | 6 ++-- .../apache/lucene/index/TestAddIndexes.java | 4 +-- .../index/TestAllFilesCheckIndexHeader.java | 8 ++--- .../index/TestAllFilesDetectBitFlips.java | 10 +++--- .../index/TestAllFilesDetectTruncation.java | 10 +++--- .../index/TestAllFilesHaveChecksumFooter.java | 6 ++-- .../index/TestAllFilesHaveCodecHeader.java | 6 ++-- .../index/TestApproximatePriorityQueue.java | 2 +- .../apache/lucene/index/TestAtomicUpdate.java | 4 +-- .../lucene/index/TestBagOfPositions.java | 6 ++-- .../lucene/index/TestBagOfPostings.java | 6 ++-- .../index/TestBinaryDocValuesUpdates.java | 4 +-- .../apache/lucene/index/TestBinaryTerms.java | 2 +- .../lucene/index/TestBufferedUpdates.java | 2 +- .../lucene/index/TestByteSliceReader.java | 4 +-- .../apache/lucene/index/TestCheckIndex.java | 2 +- .../lucene/index/TestCodecHoldsOpenFiles.java | 4 +-- .../org/apache/lucene/index/TestCodecs.java | 4 +-- .../index/TestConcurrentMergeScheduler.java | 4 +-- .../index/TestConsistentFieldNumbers.java | 4 +-- .../org/apache/lucene/index/TestCrash.java | 2 +- .../index/TestCrashCausesCorruptIndex.java | 2 +- .../apache/lucene/index/TestCustomNorms.java | 6 ++-- .../lucene/index/TestCustomTermFreq.java | 2 +- .../lucene/index/TestDeletionPolicy.java | 4 +-- .../index/TestDemoParallelLeafReader.java | 4 +-- .../lucene/index/TestDirectoryReader.java | 4 +-- .../index/TestDirectoryReaderReopen.java | 4 +-- .../test/org/apache/lucene/index/TestDoc.java | 2 +- .../org/apache/lucene/index/TestDocCount.java | 4 +-- .../apache/lucene/index/TestDocIDMerger.java | 4 +-- .../TestDocInverterPerFieldErrorInfo.java | 2 +- .../apache/lucene/index/TestDocValues.java | 2 +- .../index/TestDocValuesFieldUpdates.java | 2 +- .../lucene/index/TestDocValuesIndexing.java | 4 +-- .../lucene/index/TestDocsAndPositions.java | 4 +-- .../lucene/index/TestDocsWithFieldSet.java | 4 +-- .../lucene/index/TestDocumentWriter.java | 4 +-- .../index/TestDocumentsWriterDeleteQueue.java | 2 +- .../TestDocumentsWriterPerThreadPool.java | 2 +- .../TestDocumentsWriterStallControl.java | 2 +- .../lucene/index/TestDuelingCodecs.java | 8 ++--- .../index/TestDuelingCodecsAtNight.java | 4 +-- .../lucene/index/TestExceedMaxTermLength.java | 4 +-- .../index/TestExitableDirectoryReader.java | 2 +- .../apache/lucene/index/TestFieldInfos.java | 2 +- .../lucene/index/TestFieldInvertState.java | 4 +-- .../lucene/index/TestFieldUpdatesBuffer.java | 4 +-- .../apache/lucene/index/TestFieldsReader.java | 2 +- .../lucene/index/TestFilterCodecReader.java | 2 +- .../index/TestFilterDirectoryReader.java | 2 +- .../lucene/index/TestFilterLeafReader.java | 2 +- .../lucene/index/TestFilterMergePolicy.java | 2 +- .../org/apache/lucene/index/TestFlex.java | 4 +-- .../index/TestFlushByRamOrCountsPolicy.java | 6 ++-- .../lucene/index/TestForTooMuchCloning.java | 4 +-- .../lucene/index/TestForceMergeForever.java | 6 ++-- .../index/TestFrozenBufferedUpdates.java | 4 +-- .../apache/lucene/index/TestIndexCommit.java | 2 +- .../lucene/index/TestIndexFileDeleter.java | 4 +-- .../apache/lucene/index/TestIndexInput.java | 4 +-- .../lucene/index/TestIndexManyDocuments.java | 4 +-- .../apache/lucene/index/TestIndexOptions.java | 2 +- .../lucene/index/TestIndexReaderClose.java | 4 +-- .../apache/lucene/index/TestIndexSorting.java | 4 +-- .../lucene/index/TestIndexTooManyDocs.java | 2 +- .../apache/lucene/index/TestIndexWriter.java | 4 +-- .../lucene/index/TestIndexWriterCommit.java | 4 +-- .../lucene/index/TestIndexWriterConfig.java | 2 +- .../lucene/index/TestIndexWriterDelete.java | 6 ++-- .../index/TestIndexWriterExceptions.java | 6 ++-- .../index/TestIndexWriterExceptions2.java | 8 ++--- .../index/TestIndexWriterForceMerge.java | 4 +-- .../index/TestIndexWriterFromReader.java | 2 +- .../index/TestIndexWriterLockRelease.java | 2 +- .../lucene/index/TestIndexWriterMaxDocs.java | 8 ++--- .../index/TestIndexWriterMergePolicy.java | 2 +- .../lucene/index/TestIndexWriterMerging.java | 2 +- .../index/TestIndexWriterNRTIsCurrent.java | 4 +-- .../index/TestIndexWriterOnDiskFull.java | 4 +-- .../index/TestIndexWriterOnJRECrash.java | 2 +- .../index/TestIndexWriterOnVMError.java | 8 ++--- .../TestIndexWriterOutOfFileDescriptors.java | 6 ++-- .../lucene/index/TestIndexWriterReader.java | 6 ++-- .../TestIndexWriterThreadsToSegments.java | 4 +-- .../lucene/index/TestIndexWriterUnicode.java | 2 +- .../index/TestIndexWriterWithThreads.java | 8 ++--- .../lucene/index/TestIndexableField.java | 4 +-- .../index/TestIndexingSequenceNumbers.java | 4 +-- .../apache/lucene/index/TestInfoStream.java | 2 +- .../apache/lucene/index/TestIntBlockPool.java | 2 +- .../apache/lucene/index/TestIsCurrent.java | 2 +- .../org/apache/lucene/index/TestKnnGraph.java | 2 +- .../lucene/index/TestLazyProxSkipping.java | 4 +-- .../apache/lucene/index/TestLongPostings.java | 6 ++-- .../apache/lucene/index/TestManyFields.java | 2 +- .../apache/lucene/index/TestMaxPosition.java | 2 +- .../lucene/index/TestMaxTermFrequency.java | 4 +-- .../apache/lucene/index/TestMergePolicy.java | 4 +-- .../lucene/index/TestMergeRateLimiter.java | 2 +- .../apache/lucene/index/TestMixedCodecs.java | 4 +-- .../index/TestMixedDocValuesUpdates.java | 4 +-- .../lucene/index/TestMultiDocValues.java | 4 +-- .../apache/lucene/index/TestMultiFields.java | 4 +-- .../lucene/index/TestMultiLevelSkipList.java | 4 +-- .../lucene/index/TestMultiTermsEnum.java | 2 +- .../lucene/index/TestNRTReaderCleanup.java | 4 +-- .../index/TestNRTReaderWithThreads.java | 2 +- .../apache/lucene/index/TestNRTThreads.java | 2 +- .../apache/lucene/index/TestNeverDelete.java | 4 +-- .../lucene/index/TestNewestSegment.java | 2 +- .../lucene/index/TestNoDeletionPolicy.java | 2 +- .../lucene/index/TestNoMergeScheduler.java | 2 +- .../org/apache/lucene/index/TestNorms.java | 4 +-- .../index/TestNumericDocValuesUpdates.java | 4 +-- .../apache/lucene/index/TestOmitNorms.java | 2 +- .../lucene/index/TestOmitPositions.java | 4 +-- .../org/apache/lucene/index/TestOmitTf.java | 2 +- .../TestOneMergeWrappingMergePolicy.java | 4 +-- .../apache/lucene/index/TestOrdinalMap.java | 6 ++-- .../index/TestParallelCompositeReader.java | 2 +- .../lucene/index/TestParallelLeafReader.java | 4 +-- .../index/TestParallelReaderEmptyIndex.java | 2 +- .../lucene/index/TestParallelTermEnum.java | 4 +-- .../org/apache/lucene/index/TestPayloads.java | 4 +-- .../lucene/index/TestPayloadsOnVectors.java | 2 +- .../lucene/index/TestPendingDeletes.java | 4 +-- .../lucene/index/TestPerSegmentDeletes.java | 4 +-- .../apache/lucene/index/TestPointValues.java | 4 +-- .../lucene/index/TestPostingsOffsets.java | 6 ++-- .../lucene/index/TestPrefixCodedTerms.java | 4 +-- .../lucene/index/TestReadOnlyIndex.java | 2 +- .../apache/lucene/index/TestReaderClosed.java | 4 +-- .../apache/lucene/index/TestReaderPool.java | 4 +-- .../index/TestReaderWrapperDVTypeCheck.java | 4 +-- .../org/apache/lucene/index/TestRollback.java | 2 +- .../lucene/index/TestRollingUpdates.java | 3 ++ .../index/TestSameTokenSamePosition.java | 2 +- .../apache/lucene/index/TestSegmentInfos.java | 4 +-- .../lucene/index/TestSegmentMerger.java | 4 +-- .../lucene/index/TestSegmentReader.java | 4 +-- .../lucene/index/TestSegmentTermDocs.java | 4 +-- .../lucene/index/TestSegmentTermEnum.java | 4 +-- .../index/TestSegmentToThreadMapping.java | 2 +- .../index/TestSizeBoundedForceMerge.java | 2 +- .../index/TestSnapshotDeletionPolicy.java | 2 +- ...TestSoftDeletesDirectoryReaderWrapper.java | 2 +- .../TestSoftDeletesRetentionMergePolicy.java | 2 +- .../lucene/index/TestSortedSetDocValues.java | 2 +- .../lucene/index/TestSortingCodecReader.java | 2 +- .../lucene/index/TestStressAdvance.java | 4 +-- .../lucene/index/TestStressDeletes.java | 4 +-- .../lucene/index/TestStressIndexing.java | 3 +- .../lucene/index/TestStressIndexing2.java | 4 +-- .../apache/lucene/index/TestStressNRT.java | 4 +-- .../apache/lucene/index/TestSumDocFreq.java | 4 +-- .../lucene/index/TestSwappedIndexFiles.java | 8 ++--- .../org/apache/lucene/index/TestTerm.java | 2 +- .../apache/lucene/index/TestTermStates.java | 2 +- .../apache/lucene/index/TestTermVectors.java | 4 +-- .../lucene/index/TestTermVectorsReader.java | 4 +-- .../lucene/index/TestTermVectorsWriter.java | 4 +-- .../apache/lucene/index/TestTermdocPerf.java | 4 +-- .../org/apache/lucene/index/TestTerms.java | 4 +-- .../apache/lucene/index/TestTermsEnum.java | 8 ++--- .../apache/lucene/index/TestTermsEnum2.java | 5 +-- .../lucene/index/TestTermsHashPerField.java | 2 +- .../lucene/index/TestThreadedForceMerge.java | 4 +-- .../lucene/index/TestTieredMergePolicy.java | 2 +- .../index/TestTragicIndexWriterDeadlock.java | 2 +- .../lucene/index/TestTransactionRollback.java | 2 +- .../apache/lucene/index/TestTransactions.java | 4 +-- .../apache/lucene/index/TestTryDelete.java | 2 +- .../lucene/index/TestTwoPhaseCommitTool.java | 2 +- .../lucene/index/TestUniqueTermCount.java | 4 +-- .../index/TestUpgradeIndexMergePolicy.java | 2 +- .../lucene/search/TestAutomatonQuery.java | 8 ++--- .../search/TestAutomatonQueryUnicode.java | 2 +- .../lucene/search/TestBaseRangeFilter.java | 4 +-- .../lucene/search/TestBlendedTermQuery.java | 2 +- .../search/TestBlockMaxConjunction.java | 4 +-- .../apache/lucene/search/TestBoolean2.java | 4 +-- .../search/TestBoolean2ScorerSupplier.java | 4 +-- .../search/TestBooleanMinShouldMatch.java | 2 +- .../apache/lucene/search/TestBooleanOr.java | 4 +-- .../lucene/search/TestBooleanQuery.java | 4 +-- .../TestBooleanQueryVisitSubscorers.java | 2 +- .../lucene/search/TestBooleanRewrites.java | 4 +-- .../lucene/search/TestBooleanScorer.java | 2 +- .../apache/lucene/search/TestBoostQuery.java | 2 +- .../lucene/search/TestCachingCollector.java | 2 +- .../lucene/search/TestCollectorManager.java | 2 +- .../lucene/search/TestConjunctionDISI.java | 4 +-- .../lucene/search/TestConjunctions.java | 2 +- .../lucene/search/TestConstantScoreQuery.java | 2 +- .../search/TestConstantScoreScorer.java | 2 +- .../TestControlledRealTimeReopenThread.java | 4 +-- .../lucene/search/TestCustomSearcherSort.java | 2 +- .../apache/lucene/search/TestDateSort.java | 2 +- .../search/TestDisjunctionMaxQuery.java | 2 +- ...sjunctionScoreBlockBoundaryPropagator.java | 2 +- .../lucene/search/TestDocIdSetIterator.java | 2 +- .../search/TestDocValuesFieldExistsQuery.java | 4 +-- .../lucene/search/TestDocValuesQueries.java | 4 +-- .../search/TestDocValuesRewriteMethod.java | 6 ++-- .../lucene/search/TestDoubleValuesSource.java | 6 ++-- .../lucene/search/TestEarlyTermination.java | 2 +- .../search/TestElevationComparator.java | 2 +- .../lucene/search/TestFilterWeight.java | 2 +- .../apache/lucene/search/TestFuzzyQuery.java | 4 +-- .../search/TestFuzzyTermOnShortTerms.java | 4 +-- .../search/TestIndexOrDocValuesQuery.java | 4 +-- .../lucene/search/TestIndexSearcher.java | 4 +-- .../lucene/search/TestIndriAndQuery.java | 2 +- .../search/TestInetAddressRangeQueries.java | 2 +- .../search/TestIntRangeFieldQueries.java | 2 +- .../lucene/search/TestKnnVectorQuery.java | 2 +- .../lucene/search/TestLRUQueryCache.java | 6 ++-- .../lucene/search/TestLiveFieldValues.java | 4 +-- .../search/TestLongRangeFieldQueries.java | 2 +- .../lucene/search/TestLongValuesSource.java | 6 ++-- .../lucene/search/TestMatchAllDocsQuery.java | 2 +- .../lucene/search/TestMatchNoDocsQuery.java | 2 +- .../lucene/search/TestMaxClauseLimit.java | 2 +- .../search/TestMaxScoreAccumulator.java | 2 +- .../search/TestMaxScoreSumPropagator.java | 4 +-- .../lucene/search/TestMinShouldMatch2.java | 4 +-- .../lucene/search/TestMultiCollector.java | 4 +-- .../search/TestMultiCollectorManager.java | 2 +- .../lucene/search/TestMultiPhraseEnum.java | 2 +- .../lucene/search/TestMultiPhraseQuery.java | 2 +- .../lucene/search/TestMultiSliceMerge.java | 2 +- .../search/TestMultiTermQueryRewrites.java | 2 +- .../search/TestMultiThreadTermVectors.java | 4 +-- .../apache/lucene/search/TestMultiset.java | 2 +- .../lucene/search/TestNGramPhraseQuery.java | 2 +- .../apache/lucene/search/TestNeedsScores.java | 2 +- .../search/TestNormsFieldExistsQuery.java | 4 +-- .../org/apache/lucene/search/TestNot.java | 2 +- .../lucene/search/TestPhrasePrefixQuery.java | 2 +- .../apache/lucene/search/TestPhraseQuery.java | 4 +-- .../lucene/search/TestPointQueries.java | 4 +-- .../lucene/search/TestPositionIncrement.java | 2 +- .../TestPositiveScoresOnlyCollector.java | 2 +- .../search/TestPrefixInBooleanQuery.java | 2 +- .../apache/lucene/search/TestPrefixQuery.java | 4 +-- .../lucene/search/TestPrefixRandom.java | 4 +-- .../lucene/search/TestQueryRescorer.java | 4 +-- .../lucene/search/TestQueryVisitor.java | 2 +- .../search/TestRangeFieldsDocValuesQuery.java | 2 +- .../apache/lucene/search/TestRegexpQuery.java | 2 +- .../lucene/search/TestRegexpRandom.java | 4 +-- .../lucene/search/TestRegexpRandom2.java | 6 ++-- .../lucene/search/TestReqExclBulkScorer.java | 4 +-- .../lucene/search/TestReqOptSumScorer.java | 2 +- .../search/TestSameScoresWithThreads.java | 6 ++-- .../TestScoreCachingWrappingScorer.java | 2 +- .../apache/lucene/search/TestScorerPerf.java | 2 +- .../apache/lucene/search/TestSearchAfter.java | 6 ++-- .../lucene/search/TestSearchWithThreads.java | 2 +- .../lucene/search/TestSearcherManager.java | 6 ++-- .../lucene/search/TestSegmentCacheables.java | 2 +- .../lucene/search/TestShardSearching.java | 4 +-- .../apache/lucene/search/TestSimilarity.java | 2 +- .../lucene/search/TestSimilarityProvider.java | 2 +- .../TestSimpleExplanationsWithFillerDocs.java | 2 +- .../lucene/search/TestSloppyPhraseQuery.java | 2 +- .../lucene/search/TestSloppyPhraseQuery2.java | 2 +- .../org/apache/lucene/search/TestSort.java | 2 +- .../lucene/search/TestSortOptimization.java | 2 +- .../apache/lucene/search/TestSortRandom.java | 4 +-- .../lucene/search/TestSortRescorer.java | 4 +-- .../search/TestSortedNumericSortField.java | 2 +- .../lucene/search/TestSortedSetSelector.java | 4 +-- .../lucene/search/TestSortedSetSortField.java | 2 +- .../lucene/search/TestSubScorerFreqs.java | 2 +- .../lucene/search/TestSynonymQuery.java | 4 +-- .../lucene/search/TestTermInSetQuery.java | 6 ++-- .../apache/lucene/search/TestTermQuery.java | 4 +-- .../lucene/search/TestTermRangeQuery.java | 2 +- .../apache/lucene/search/TestTermScorer.java | 4 +-- .../search/TestTimeLimitingCollector.java | 6 ++-- .../lucene/search/TestTopDocsCollector.java | 4 +-- .../lucene/search/TestTopDocsMerge.java | 4 +-- .../lucene/search/TestTopFieldCollector.java | 4 +-- ...TestTopFieldCollectorEarlyTermination.java | 4 +-- .../search/TestTotalHitCountCollector.java | 2 +- .../apache/lucene/search/TestTotalHits.java | 2 +- .../TestUsageTrackingFilterCachingPolicy.java | 2 +- .../apache/lucene/search/TestWANDScorer.java | 4 +-- .../apache/lucene/search/TestWildcard.java | 2 +- .../lucene/search/TestWildcardRandom.java | 4 +-- .../search/TestXYPointDistanceSort.java | 4 +-- .../similarities/TestAxiomaticSimilarity.java | 2 +- .../similarities/TestBooleanSimilarity.java | 2 +- .../similarities/TestClassicSimilarity.java | 2 +- .../search/similarities/TestSimilarity2.java | 4 +-- .../similarities/TestSimilarityBase.java | 4 +-- .../lucene/store/BaseDataOutputTestCase.java | 2 +- .../lucene/store/TestBufferedChecksum.java | 2 +- .../lucene/store/TestBufferedIndexInput.java | 2 +- .../lucene/store/TestByteArrayDataInput.java | 2 +- .../store/TestByteBuffersDataInput.java | 2 +- .../store/TestByteBuffersDataOutput.java | 4 +-- .../store/TestByteBuffersDirectory.java | 2 +- .../lucene/store/TestChecksumIndexInput.java | 4 +-- .../apache/lucene/store/TestDirectory.java | 2 +- .../lucene/store/TestFileSwitchDirectory.java | 2 +- .../store/TestIndexOutputAlignment.java | 2 +- .../store/TestInputStreamDataInput.java | 4 +-- .../apache/lucene/store/TestLockFactory.java | 2 +- .../lucene/store/TestNRTCachingDirectory.java | 4 +-- .../lucene/store/TestNativeFSLockFactory.java | 2 +- .../store/TestOutputStreamIndexOutput.java | 2 +- .../apache/lucene/store/TestRateLimiter.java | 4 +-- .../lucene/store/TestSleepingLockWrapper.java | 2 +- .../lucene/store/TestStressLockFactories.java | 2 +- .../apache/lucene/util/BaseSortTestCase.java | 2 ++ .../apache/lucene/util/Test2BPagedBytes.java | 4 ++- .../org/apache/lucene/util/TestArrayUtil.java | 2 ++ .../lucene/util/TestAttributeSource.java | 1 + .../apache/lucene/util/TestByteBlockPool.java | 2 ++ .../org/apache/lucene/util/TestBytesRef.java | 3 ++ .../apache/lucene/util/TestBytesRefArray.java | 2 ++ .../apache/lucene/util/TestBytesRefHash.java | 2 ++ .../org/apache/lucene/util/TestCharsRef.java | 2 ++ .../lucene/util/TestCharsRefBuilder.java | 3 ++ .../lucene/util/TestClassLoaderUtils.java | 1 + .../lucene/util/TestCloseableThreadLocal.java | 2 ++ .../lucene/util/TestCollectionUtil.java | 1 + .../lucene/util/TestDocIdSetBuilder.java | 2 ++ .../lucene/util/TestFilterIterator.java | 1 + .../lucene/util/TestFixedBitDocIdSet.java | 1 + .../apache/lucene/util/TestFixedBitSet.java | 2 ++ .../util/TestFixedLengthBytesRefArray.java | 2 ++ .../util/TestFrequencyTrackingRingBuffer.java | 2 ++ .../org/apache/lucene/util/TestIOUtils.java | 1 + .../lucene/util/TestIntArrayDocIdSet.java | 1 + .../apache/lucene/util/TestIntroSelector.java | 2 ++ .../org/apache/lucene/util/TestIntsRef.java | 2 ++ .../lucene/util/TestLSBRadixSorter.java | 2 ++ .../apache/lucene/util/TestLongBitSet.java | 2 ++ .../org/apache/lucene/util/TestLongHeap.java | 2 ++ .../org/apache/lucene/util/TestLongsRef.java | 2 ++ .../lucene/util/TestMSBRadixSorter.java | 2 ++ .../org/apache/lucene/util/TestMathUtil.java | 1 + .../lucene/util/TestMergedIterator.java | 1 + .../lucene/util/TestNamedSPILoader.java | 2 ++ .../apache/lucene/util/TestNotDocIdSet.java | 1 + .../apache/lucene/util/TestNumericUtils.java | 2 ++ .../apache/lucene/util/TestOfflineSorter.java | 2 ++ .../apache/lucene/util/TestPagedBytes.java | 3 ++ .../apache/lucene/util/TestPriorityQueue.java | 2 ++ .../apache/lucene/util/TestQueryBuilder.java | 1 + .../apache/lucene/util/TestRadixSelector.java | 2 ++ .../lucene/util/TestRamUsageEstimator.java | 3 +- .../util/TestRecyclingByteBlockAllocator.java | 1 + .../util/TestRecyclingIntBlockAllocator.java | 1 + .../lucene/util/TestRoaringDocIdSet.java | 1 + .../apache/lucene/util/TestRollingBuffer.java | 1 + .../lucene/util/TestSentinelIntSet.java | 1 + .../org/apache/lucene/util/TestSetOnce.java | 1 + .../apache/lucene/util/TestSloppyMath.java | 1 + .../apache/lucene/util/TestSmallFloat.java | 2 ++ .../util/TestSparseFixedBitDocIdSet.java | 1 + .../lucene/util/TestSparseFixedBitSet.java | 2 ++ .../lucene/util/TestStableMSBRadixSorter.java | 2 ++ .../util/TestStressRamUsageEstimator.java | 2 ++ .../apache/lucene/util/TestStringHelper.java | 2 ++ .../lucene/util/TestStringMSBRadixSorter.java | 2 ++ .../org/apache/lucene/util/TestTimSorter.java | 1 + .../lucene/util/TestTimSorterWorstCase.java | 3 +- .../apache/lucene/util/TestUnicodeUtil.java | 2 ++ .../apache/lucene/util/TestVectorUtil.java | 1 + .../org/apache/lucene/util/TestVersion.java | 1 + .../apache/lucene/util/TestVirtualMethod.java | 2 ++ .../lucene/util/TestWeakIdentityMap.java | 1 + .../lucene/util/automaton/TestAutomaton.java | 7 ++-- .../util/automaton/TestCompiledAutomaton.java | 4 +-- .../TestDaciukMihovAutomatonBuilder.java | 2 +- .../util/automaton/TestDeterminism.java | 3 +- .../automaton/TestDeterminizeLexicon.java | 4 +-- .../automaton/TestFiniteStringsIterator.java | 5 +-- .../lucene/util/automaton/TestIntSet.java | 2 +- .../automaton/TestLevenshteinAutomata.java | 2 +- .../TestLimitedFiniteStringsIterator.java | 5 +-- .../lucene/util/automaton/TestMinimize.java | 3 +- .../lucene/util/automaton/TestOperations.java | 3 ++ .../lucene/util/automaton/TestRegExp.java | 2 +- .../util/automaton/TestRegExpParsing.java | 2 +- .../util/automaton/TestUTF32ToUTF8.java | 5 +-- .../lucene/util/bkd/Test2BBKDPoints.java | 4 +-- .../org/apache/lucene/util/bkd/TestBKD.java | 4 +-- .../lucene/util/bkd/TestBKDRadixSelector.java | 4 +-- .../lucene/util/bkd/TestBKDRadixSort.java | 4 +-- .../apache/lucene/util/bkd/TestBKDUtil.java | 4 +-- .../lucene/util/bkd/TestDocIdsWriter.java | 4 +-- .../bkd/TestMutablePointTreeReaderUtils.java | 4 +-- .../lucene/util/compress/LZ4TestCase.java | 4 +-- .../TestLowercaseAsciiCompression.java | 4 +-- .../org/apache/lucene/util/fst/Test2BFST.java | 4 +-- .../lucene/util/fst/TestBitTableUtil.java | 2 +- .../lucene/util/fst/TestBytesStore.java | 4 +-- .../util/fst/TestFSTDirectAddressing.java | 2 +- .../org/apache/lucene/util/fst/TestFSTs.java | 15 ++++---- .../org/apache/lucene/util/fst/TestUtil.java | 2 +- .../TestGraphTokenStreamFiniteStrings.java | 2 +- .../lucene/util/hnsw/MockVectorValues.java | 2 +- .../lucene/util/hnsw/TestHnswGraph.java | 2 +- .../lucene/util/hnsw/TestNeighbors.java | 2 +- .../lucene/util/hppc/TestIntIntHashMap.java | 2 +- .../util/mutable/TestMutableValues.java | 2 +- .../util/packed/TestDirectMonotonic.java | 4 +-- .../lucene/util/packed/TestDirectPacked.java | 4 +-- .../lucene/util/packed/TestPackedInts.java | 6 ++-- .../test/org/apache/lucene/demo/TestDemo.java | 2 +- .../facet/TestAssociationsFacetsExample.java | 2 +- .../demo/facet/TestDistanceFacetsExample.java | 2 +- ...estExpressionAggregationFacetsExample.java | 2 +- .../TestMultiCategoryListsFacetsExample.java | 2 +- .../demo/facet/TestRangeFacetsExample.java | 2 +- .../demo/facet/TestSimpleFacetsExample.java | 2 +- .../TestSimpleSortedSetFacetsExample.java | 2 +- .../lucene/demo/knn/TestDemoEmbeddings.java | 2 +- .../lucene/demo/knn/TestKnnVectorDict.java | 2 +- .../expressions/TestDemoExpressions.java | 2 +- .../expressions/TestExpressionRescorer.java | 2 +- .../expressions/TestExpressionSortField.java | 2 +- .../expressions/TestExpressionSorts.java | 6 ++-- .../expressions/TestExpressionValidation.java | 2 +- .../TestExpressionValueSource.java | 2 +- .../expressions/js/TestCustomFunctions.java | 2 +- .../expressions/js/TestExpressionMath.java | 2 +- .../js/TestJavascriptCompiler.java | 2 +- .../js/TestJavascriptFunction.java | 2 +- .../js/TestJavascriptOperations.java | 2 +- .../expressions/js/TestVariableContext.java | 2 +- .../apache/lucene/facet/FacetTestCase.java | 4 +-- .../lucene/facet/TestDrillSideways.java | 2 +- .../apache/lucene/facet/TestFacetUtils.java | 2 +- .../apache/lucene/facet/TestFacetsConfig.java | 2 +- .../facet/TestLongValueFacetCounts.java | 4 +-- .../facet/TestStringValueFacetCounts.java | 2 +- .../facet/range/TestRangeFacetCounts.java | 2 +- .../TestSortedSetDocValuesFacets.java | 4 +-- .../lucene/facet/taxonomy/TestFacetLabel.java | 2 +- .../taxonomy/TestSearcherTaxonomyManager.java | 4 +-- .../facet/taxonomy/TestTaxonomyCombined.java | 2 +- .../taxonomy/TestTaxonomyFacetCounts.java | 2 +- .../TestTaxonomyFacetSumValueSource.java | 2 +- .../taxonomy/directory/TestAddTaxonomy.java | 4 +-- .../TestDirectoryTaxonomyWriter.java | 2 +- .../writercache/Test2GBCharBlockArray.java | 6 ++-- .../TestUTF8TaxonomyWriterCache.java | 2 +- .../grouping/AbstractGroupingTestCase.java | 4 +-- .../grouping/TestAllGroupHeadsCollector.java | 4 +-- .../grouping/TestAllGroupsCollector.java | 2 +- .../grouping/TestDoubleRangeFactory.java | 2 +- .../grouping/TestGroupFacetCollector.java | 2 +- .../lucene/search/grouping/TestGrouping.java | 4 +-- .../search/grouping/TestGroupingSearch.java | 2 +- .../search/grouping/TestLongRangeFactory.java | 2 +- .../lucene/search/grouping/TestTopGroups.java | 2 +- .../search/highlight/TestHighlighter.java | 2 +- .../highlight/TestHighlighterPhrase.java | 2 +- .../lucene/search/highlight/TestMisses.java | 2 +- .../search/highlight/TestTokenSources.java | 2 +- .../custom/TestHighlightCustomQuery.java | 2 +- .../search/matchhighlight/IndexBuilder.java | 2 +- .../matchhighlight/TestMatchHighlighter.java | 2 +- .../TestMatchRegionRetriever.java | 2 +- .../matchhighlight/TestPassageSelector.java | 2 +- .../TestCustomSeparatorBreakIterator.java | 2 +- .../TestDefaultPassageFormatter.java | 2 +- .../TestLengthGoalBreakIterator.java | 2 +- .../TestSplittingBreakIterator.java | 2 +- .../uhighlight/TestUnifiedHighlighter.java | 2 +- .../uhighlight/TestUnifiedHighlighterMTQ.java | 2 +- .../TestUnifiedHighlighterRanking.java | 4 +-- .../TestUnifiedHighlighterReanalysis.java | 2 +- .../TestUnifiedHighlighterStrictPhrases.java | 2 +- .../TestUnifiedHighlighterTermIntervals.java | 2 +- .../TestUnifiedHighlighterTermVec.java | 2 +- .../uhighlight/TestWholeBreakIterator.java | 2 +- .../TestUnifiedHighlighterExtensibility.java | 2 +- .../vectorhighlight/AbstractTestCase.java | 2 +- .../TestBreakIteratorBoundaryScanner.java | 2 +- .../TestFastVectorHighlighter.java | 2 +- .../vectorhighlight/TestFieldPhraseList.java | 2 +- .../vectorhighlight/TestFieldTermStack.java | 2 +- .../TestSimpleBoundaryScanner.java | 2 +- .../TestSimpleFragmentsBuilder.java | 2 +- .../lucene/search/join/TestBlockJoin.java | 4 +-- .../search/join/TestBlockJoinScorer.java | 2 +- .../search/join/TestBlockJoinSelector.java | 2 +- .../search/join/TestBlockJoinSorting.java | 2 +- .../search/join/TestBlockJoinValidation.java | 4 +-- .../search/join/TestCheckJoinIndex.java | 4 +-- .../lucene/search/join/TestJoinUtil.java | 4 +-- .../TestParentChildrenBlockJoinQuery.java | 2 +- .../search/join/TestQueryBitSetProducer.java | 2 +- .../util/inifile/TestSimpleIniFile.java | 2 +- .../models/analysis/TestAnalysisImpl.java | 2 +- .../luke/models/commits/TestCommitsImpl.java | 4 +-- .../models/documents/DocumentsTestBase.java | 2 +- .../models/documents/TestDocumentsImpl.java | 2 +- .../models/overview/OverviewTestBase.java | 2 +- .../luke/models/search/TestSearchImpl.java | 2 +- .../lucene/index/memory/TestMemoryIndex.java | 4 +-- .../TestMemoryIndexAgainstDirectory.java | 4 +-- .../apache/lucene/misc/TestHighFreqTerms.java | 4 +-- .../lucene/misc/TestIndexMergeTool.java | 2 +- .../lucene/misc/TestSweetSpotSimilarity.java | 2 +- .../misc/document/TestLazyDocument.java | 2 +- .../misc/index/TestIndexRearranger.java | 2 +- .../lucene/misc/index/TestIndexSplitter.java | 2 +- .../index/TestMultiPassIndexSplitter.java | 2 +- .../misc/index/TestPKIndexSplitter.java | 2 +- .../TestDiversifiedTopDocsCollector.java | 2 +- .../search/TestDocValuesStatsCollector.java | 4 +-- .../TestMemoryAccountingBitsetCollector.java | 2 +- .../misc/store/TestWindowsDirectory.java | 2 +- .../misc/util/TestCollectorMemoryTracker.java | 2 +- .../lucene/misc/util/fst/TestFSTsMisc.java | 6 ++-- .../monitor/ConcurrentMatcherTestBase.java | 2 +- .../lucene/monitor/MonitorTestBase.java | 2 +- .../monitor/TestBooleanClauseWeightings.java | 2 +- .../monitor/TestBooleanTermExtractor.java | 2 +- .../lucene/monitor/TestDocumentBatch.java | 2 +- .../apache/lucene/monitor/TestExtractors.java | 2 +- .../monitor/TestForceNoBulkScoringQuery.java | 2 +- .../lucene/monitor/TestQueryAnalyzer.java | 2 +- .../monitor/TestQueryTermComparators.java | 2 +- .../lucene/monitor/TestQueryTermFilter.java | 2 +- .../lucene/monitor/TestSpanExtractors.java | 2 +- .../monitor/TestTermsEnumTokenFilter.java | 2 +- .../lucene/queries/TestCommonTermsQuery.java | 6 ++-- .../queries/function/FunctionTestSetup.java | 4 +-- .../function/TestDocValuesFieldSources.java | 4 +-- .../function/TestFunctionQuerySort.java | 2 +- .../function/TestIndexReaderFunctions.java | 2 +- .../function/TestLongNormValueSource.java | 2 +- .../function/TestSortedSetFieldSource.java | 2 +- .../queries/function/TestValueSources.java | 2 +- .../docvalues/TestBoolValOfNumericDVs.java | 2 +- .../intervals/TestDisjunctionRewrites.java | 2 +- .../intervals/TestIntervalBuilder.java | 2 +- .../queries/intervals/TestIntervalQuery.java | 2 +- .../queries/intervals/TestIntervals.java | 2 +- .../TestPayloadFilteredInterval.java | 4 +-- .../intervals/TestSimplifications.java | 2 +- .../lucene/queries/mlt/TestMoreLikeThis.java | 2 +- .../queries/payloads/PayloadHelper.java | 4 +-- .../payloads/TestPayloadCheckQuery.java | 6 ++-- .../payloads/TestPayloadScoreQuery.java | 4 +-- .../payloads/TestPayloadSpanPositions.java | 2 +- .../queries/payloads/TestPayloadSpans.java | 2 +- .../payloads/TestPayloadTermQuery.java | 4 +-- .../lucene/queries/spans/TestBasics.java | 6 ++-- .../spans/TestFieldMaskingSpanQuery.java | 2 +- .../lucene/queries/spans/TestFilterSpans.java | 2 +- .../queries/spans/TestNearSpansOrdered.java | 2 +- .../spans/TestQueryRescorerWithSpans.java | 2 +- .../queries/spans/TestSpanCollection.java | 2 +- .../queries/spans/TestSpanContainQuery.java | 2 +- .../queries/spans/TestSpanFirstQuery.java | 2 +- .../spans/TestSpanMultiTermQueryWrapper.java | 2 +- .../queries/spans/TestSpanNearQuery.java | 2 +- .../queries/spans/TestSpanNotQuery.java | 2 +- .../lucene/queries/spans/TestSpanOrQuery.java | 2 +- .../queries/spans/TestSpanQueryVisitor.java | 2 +- .../queries/spans/TestSpanSimilarity.java | 2 +- .../queries/spans/TestSpanTermQuery.java | 2 +- .../lucene/queries/spans/TestSpans.java | 2 +- .../lucene/queries/spans/TestSpansEnum.java | 6 ++-- .../classic/TestMultiFieldQueryParser.java | 2 +- .../classic/TestMultiPhraseQueryParsing.java | 2 +- .../complexPhrase/TestComplexPhraseQuery.java | 2 +- .../queryparser/ext/TestExtensions.java | 2 +- .../core/builders/TestQueryTreeBuilder.java | 2 +- .../flexible/core/nodes/TestQueryNode.java | 2 +- .../flexible/messages/TestNLS.java | 2 +- .../precedence/TestPrecedenceQueryParser.java | 2 +- .../flexible/spans/TestSpanQueryParser.java | 2 +- .../TestSpanQueryParserSimpleSample.java | 2 +- .../standard/TestMultiAnalyzerQPHelper.java | 2 +- .../standard/TestMultiFieldQPHelper.java | 2 +- .../standard/TestPointQueryParser.java | 2 +- .../flexible/standard/TestQPHelper.java | 2 +- .../standard/TestStandardQPEnhancements.java | 2 +- .../simple/TestSimpleQueryParser.java | 4 +-- .../surround/query/Test01Exceptions.java | 2 +- .../surround/query/Test02Boolean.java | 2 +- .../surround/query/Test03Distance.java | 2 +- .../surround/query/TestSrndQuery.java | 2 +- .../queryparser/util/QueryParserTestBase.java | 2 +- .../xml/CoreParserTestIndexData.java | 2 +- .../queryparser/xml/TestCoreParser.java | 2 +- lucene/replicator/src/java/module-info.java | 1 + .../lucene/replicator/ReplicatorTestCase.java | 2 +- ...TestIndexAndTaxonomyReplicationClient.java | 2 +- .../TestIndexReplicationClient.java | 2 +- .../replicator/nrt/SimplePrimaryNode.java | 4 +-- .../replicator/nrt/SimpleReplicaNode.java | 2 +- .../replicator/nrt/TestNRTReplication.java | 12 +++---- .../replicator/nrt/TestSimpleServer.java | 10 +++--- .../nrt/TestStressNRTReplication.java | 12 +++---- .../lucene/payloads/TestPayloadSpanUtil.java | 2 +- .../TestIDVersionPostingsFormat.java | 4 +-- .../sandbox/document/TestBigIntegerPoint.java | 2 +- .../document/TestDoubleRangeField.java | 2 +- .../TestFloatPointNearestNeighbor.java | 4 +-- .../sandbox/document/TestHalfFloatPoint.java | 4 +-- .../queries/TestFuzzyLikeThisQuery.java | 2 +- .../search/TestCombinedFieldQuery.java | 2 +- .../sandbox/search/TestCoveringQuery.java | 2 +- .../search/TestDocValuesNumbersQuery.java | 4 +-- .../search/TestDocValuesTermsQuery.java | 4 +-- .../search/TestFieldCacheTermsFilter.java | 2 +- ...xSortSortedNumericDocValuesRangeQuery.java | 4 +-- .../TestLargeNumHitsTopDocsCollector.java | 2 +- .../sandbox/search/TestLongHashSet.java | 2 +- .../sandbox/search/TestMultiRangeQueries.java | 4 +-- .../lucene/sandbox/search/TestNearest.java | 4 +-- .../search/TestPhraseWildcardQuery.java | 2 +- .../sandbox/search/TestProfilerCollector.java | 4 +-- .../TestQueryProfilerIndexSearcher.java | 4 +-- .../search/TestQueryProfilerScorer.java | 2 +- .../search/TestTermAutomatonQuery.java | 4 +-- .../lucene/spatial/SpatialTestCase.java | 4 +-- .../spatial/TestQueryEqualsHashCode.java | 2 +- .../lucene/spatial/TestSpatialArgs.java | 2 +- .../lucene/spatial/TestSpatialExample.java | 2 +- .../lucene/spatial/TestTestFramework.java | 2 +- .../TestRecursivePrefixTreeStrategy.java | 2 +- .../prefix/tree/TestDateRangePrefixTree.java | 2 +- .../spatial/prefix/tree/TestS2PrefixTree.java | 2 +- .../spatial/query/TestSpatialArgsParser.java | 2 +- .../spatial4j/RandomizedShapeTestCase.java | 2 +- .../lucene/spatial/spatial4j/TestGeo3d.java | 2 +- .../lucene/spatial3d/TestGeo3DDocValues.java | 4 +-- .../lucene/spatial3d/TestGeo3DPoint.java | 4 +-- .../TestCompositeGeoPolygonRelationships.java | 2 +- .../lucene/spatial3d/geom/TestGeoBBox.java | 2 +- .../lucene/spatial3d/geom/TestGeoCircle.java | 2 +- .../spatial3d/geom/TestGeoConvexPolygon.java | 2 +- .../spatial3d/geom/TestGeoExactCircle.java | 2 +- .../lucene/spatial3d/geom/TestGeoModel.java | 2 +- .../lucene/spatial3d/geom/TestGeoPath.java | 2 +- .../lucene/spatial3d/geom/TestGeoPoint.java | 2 +- .../lucene/spatial3d/geom/TestGeoPolygon.java | 2 +- .../lucene/spatial3d/geom/TestPlane.java | 2 +- .../spatial3d/geom/TestRandomBinaryCodec.java | 2 +- .../spatial3d/geom/TestRandomGeoPolygon.java | 2 +- .../geom/TestRandomGeoShapeRelationship.java | 2 +- .../spatial3d/geom/TestRandomPlane.java | 2 +- .../TestSimpleGeoPolygonRelationships.java | 2 +- .../lucene/spatial3d/geom/TestXYZSolid.java | 2 +- .../search/spell/TestDirectSpellChecker.java | 4 +-- .../search/spell/TestJaroWinklerDistance.java | 2 +- .../search/spell/TestLevenshteinDistance.java | 2 +- .../search/spell/TestLuceneDictionary.java | 2 +- .../search/spell/TestNGramDistance.java | 2 +- .../search/spell/TestPlainTextDictionary.java | 2 +- .../lucene/search/spell/TestSpellChecker.java | 4 +-- .../spell/TestWordBreakSpellChecker.java | 6 ++-- .../suggest/TestDocumentDictionary.java | 2 +- .../TestDocumentValueSourceDictionary.java | 2 +- .../search/suggest/TestFileDictionary.java | 4 +-- .../suggest/TestHighFrequencyDictionary.java | 2 +- .../search/suggest/TestInputIterator.java | 4 +-- .../search/suggest/TestLookupBenchmark.java | 2 +- .../search/suggest/TestPersistence.java | 4 +-- .../TestAnalyzingInfixSuggester.java | 4 +-- .../analyzing/TestAnalyzingSuggester.java | 6 ++-- .../analyzing/TestBlendedInfixSuggester.java | 4 +-- .../analyzing/TestFreeTextSuggester.java | 6 ++-- .../suggest/analyzing/TestFuzzySuggester.java | 4 +-- .../suggest/document/TestContextQuery.java | 4 +-- .../document/TestContextSuggestField.java | 2 +- .../document/TestFuzzyCompletionQuery.java | 2 +- .../document/TestPrefixCompletionQuery.java | 2 +- .../document/TestRegexCompletionQuery.java | 2 +- .../suggest/document/TestSuggestField.java | 6 ++-- .../suggest/fst/TestBytesRefSorters.java | 2 +- .../search/suggest/fst/TestFSTCompletion.java | 2 ++ .../suggest/fst/TestWFSTCompletion.java | 4 +-- .../analysis/BaseTokenStreamTestCase.java | 8 ++--- .../lucene/analysis/CollationTestBase.java | 4 +-- .../apache/lucene/analysis/MockAnalyzer.java | 2 +- .../lucene/analysis/MockGraphTokenFilter.java | 2 +- .../MockHoleInjectingTokenFilter.java | 2 +- .../lucene/analysis/MockReaderWrapper.java | 2 +- .../lucene/analysis/VocabularyAssert.java | 4 +-- .../codecs/asserting/AssertingCodec.java | 2 +- .../asserting/AssertingDocValuesFormat.java | 2 +- .../asserting/AssertingKnnVectorsFormat.java | 2 +- .../asserting/AssertingLiveDocsFormat.java | 2 +- .../asserting/AssertingNormsFormat.java | 2 +- .../asserting/AssertingPointsFormat.java | 2 +- .../asserting/AssertingPostingsFormat.java | 2 +- .../AssertingStoredFieldsFormat.java | 2 +- .../asserting/AssertingTermVectorsFormat.java | 2 +- .../TestBloomFilteredLucenePostings.java | 2 +- .../cheapbastard/CheapBastardCodec.java | 2 +- .../codecs/compressing/CompressingCodec.java | 2 +- .../mockrandom/MockRandomPostingsFormat.java | 4 +-- .../lucene/geo/BaseGeoPointTestCase.java | 4 +-- .../lucene/geo/BaseXYPointTestCase.java | 4 +-- .../org/apache/lucene/geo/GeoTestUtil.java | 2 +- .../org/apache/lucene/geo/ShapeTestUtil.java | 4 +-- .../lucene/index/AlcoholicMergePolicy.java | 2 +- .../index/BaseCompoundFormatTestCase.java | 2 +- ...aseCompressingDocValuesFormatTestCase.java | 2 +- .../index/BaseDocValuesFormatTestCase.java | 2 +- .../index/BaseFieldInfoFormatTestCase.java | 2 +- .../index/BaseIndexFileFormatTestCase.java | 8 ++--- .../index/BaseKnnVectorsFormatTestCase.java | 2 +- .../index/BaseLiveDocsFormatTestCase.java | 4 +-- .../lucene/index/BaseMergePolicyTestCase.java | 6 ++-- .../lucene/index/BaseNormsFormatTestCase.java | 2 +- .../index/BasePointsFormatTestCase.java | 4 +-- .../index/BasePostingsFormatTestCase.java | 6 ++-- .../index/BaseSegmentInfoFormatTestCase.java | 2 +- .../index/BaseStoredFieldsFormatTestCase.java | 2 +- .../index/BaseTermVectorsFormatTestCase.java | 2 +- .../lucene/index/BaseTestCheckIndex.java | 6 ++-- .../index/IndexWriterMaxDocsChanger.java | 2 +- .../lucene/index/MockRandomMergePolicy.java | 4 +-- .../org/apache/lucene/index/RandomCodec.java | 4 +-- .../lucene/index/RandomIndexWriter.java | 6 ++-- .../lucene/index/RandomPostingsTester.java | 8 ++--- .../ThreadedIndexingAndSearchingTestCase.java | 8 ++--- .../mockfile/MockFileSystemTestCase.java | 4 +-- .../lucene/mockfile/VirusCheckingFS.java | 2 +- .../apache/lucene/search/AssertingWeight.java | 2 +- .../search/BaseExplanationTestCase.java | 2 +- .../search/BaseRangeFieldQueryTestCase.java | 4 +-- .../org/apache/lucene/search/CheckHits.java | 2 +- .../apache/lucene/search/MatchesTestBase.java | 2 +- .../org/apache/lucene/search/QueryUtils.java | 2 +- .../search/SearchEquivalenceTestBase.java | 6 ++-- .../lucene/search/ShardSearchingTestBase.java | 6 ++-- .../similarities/BaseSimilarityTestCase.java | 4 +-- .../store/BaseChunkedDirectoryTestCase.java | 2 +- .../lucene/store/BaseDirectoryTestCase.java | 4 +-- .../lucene/store/BaseDirectoryWrapper.java | 2 +- .../lucene/store/BaseLockFactoryTestCase.java | 4 +-- .../lucene/store/MockDirectoryWrapper.java | 6 ++-- .../lucene/store/MockIndexOutputWrapper.java | 2 +- .../util/AbstractBeforeAfterRule.java | 2 +- .../{ => tests}/util/BaseBitSetTestCase.java | 9 ++++- .../util/BaseDocIdSetTestCase.java | 5 +-- .../{ => tests}/util/CloseableDirectory.java | 2 +- .../lucene/{ => tests}/util/English.java | 2 +- .../util/FailOnNonBulkMergesInfoStream.java | 3 +- .../{ => tests}/util/FailureMarker.java | 2 +- .../lucene/{ => tests}/util/LineFileDocs.java | 5 ++- .../util/LuceneJUnit3MethodProvider.java | 2 +- .../{ => tests}/util/LuceneTestCase.java | 11 ++++-- .../{ => tests}/util/NullInfoStream.java | 3 +- .../util/QuickPatchThreadsFilter.java | 3 +- .../{ => tests}/util/RamUsageTester.java | 5 ++- .../{ => tests}/util/RemoveUponClose.java | 3 +- .../lucene/{ => tests}/util/Rethrow.java | 2 +- .../util/RunListenerPrintReproduceInfo.java | 5 +-- .../util/TestRuleAssertionsRequired.java | 2 +- .../{ => tests}/util/TestRuleDelegate.java | 2 +- .../util/TestRuleIgnoreAfterMaxFailures.java | 2 +- .../util/TestRuleIgnoreTestSuites.java | 2 +- .../util/TestRuleLimitSysouts.java | 6 ++-- .../{ => tests}/util/TestRuleMarkFailure.java | 2 +- .../util/TestRuleRestoreSystemProperties.java | 2 +- .../util/TestRuleSetupAndRestoreClassEnv.java | 30 ++++++++-------- .../TestRuleSetupAndRestoreInstanceEnv.java | 2 +- .../util/TestRuleSetupTeardownChained.java | 2 +- .../util/TestRuleStoreClassName.java | 2 +- .../util/TestRuleTemporaryFilesCleanup.java | 10 +++--- .../util/TestRuleThreadAndTestName.java | 2 +- .../{ => tests}/util/TestSecurityManager.java | 2 +- .../lucene/{ => tests}/util/TestUtil.java | 9 ++++- .../util/ThrottledIndexOutput.java | 3 +- .../lucene/{ => tests}/util/TimeUnits.java | 2 +- .../util/VerifyTestClassNamingConvention.java | 2 +- .../util/automaton/AutomatonTestUtil.java | 9 +++-- .../{ => tests}/util/automaton/package.html | 0 .../{ => tests}/util/fst/FSTTester.java | 33 ++++++++++-------- .../lucene/{ => tests}/util/fst/package.html | 0 .../lucene/{ => tests}/util/package.html | 0 .../{ => tests}/util/europarl.lines.txt.gz | Bin .../{ => tests}/util/europarl.lines.txt.seek | 0 .../lucene/analysis/TestMockAnalyzer.java | 4 +-- .../org/apache/lucene/analysis/TestToken.java | 4 +-- .../lucene/index/TestAssertingLeafReader.java | 2 +- .../lucene/index/TestForceMergePolicy.java | 2 +- .../lucene/{ => tests}/util/SorePoint.java | 2 +- .../lucene/{ => tests}/util/SoreType.java | 2 +- .../util/TestBeforeAfterOverrides.java | 2 +- .../{ => tests}/util/TestCodecReported.java | 4 +-- .../util/TestExceptionInBeforeClassHooks.java | 2 +- .../{ => tests}/util/TestExpectThrows.java | 2 +- .../util/TestFailIfDirectoryNotClosed.java | 4 +-- .../util/TestFailIfUnreferencedFiles.java | 4 +-- .../{ => tests}/util/TestGroupFiltering.java | 2 +- .../{ => tests}/util/TestJUnitRuleOrder.java | 2 +- .../lucene/{ => tests}/util/TestJvmInfo.java | 2 +- .../{ => tests}/util/TestMaxFailuresRule.java | 6 ++-- .../{ => tests}/util/TestPleaseFail.java | 2 +- .../util/TestRamUsageTesterOnWildAnimals.java | 2 +- .../util/TestReproduceMessage.java | 2 +- .../TestReproduceMessageWithRepeated.java | 2 +- .../TestRunWithRestrictedPermissions.java | 2 +- .../util/TestSeedFromUncaught.java | 2 +- .../util/TestSetupTeardownChaining.java | 2 +- .../{ => tests}/util/TestSysoutsLimits.java | 2 +- .../util/TestWorstCaseTestBehavior.java | 2 +- .../{ => tests}/util/WithNestedTests.java | 5 +-- 1041 files changed, 1664 insertions(+), 1499 deletions(-) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/util/AbstractBeforeAfterRule.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/util/BaseBitSetTestCase.java (96%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/util/BaseDocIdSetTestCase.java (97%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/util/CloseableDirectory.java (97%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/util/English.java (99%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/util/FailOnNonBulkMergesInfoStream.java (94%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/util/FailureMarker.java (97%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/util/LineFileDocs.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/util/LuceneJUnit3MethodProvider.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/util/LuceneTestCase.java (99%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/util/NullInfoStream.java (94%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/util/QuickPatchThreadsFilter.java (94%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/util/RamUsageTester.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/util/RemoveUponClose.java (96%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/util/Rethrow.java (97%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/util/RunListenerPrintReproduceInfo.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/util/TestRuleAssertionsRequired.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/util/TestRuleDelegate.java (97%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/util/TestRuleIgnoreAfterMaxFailures.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/util/TestRuleIgnoreTestSuites.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/util/TestRuleLimitSysouts.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/util/TestRuleMarkFailure.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/util/TestRuleRestoreSystemProperties.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/util/TestRuleSetupAndRestoreClassEnv.java (91%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/util/TestRuleSetupAndRestoreInstanceEnv.java (97%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/util/TestRuleSetupTeardownChained.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/util/TestRuleStoreClassName.java (97%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/util/TestRuleTemporaryFilesCleanup.java (97%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/util/TestRuleThreadAndTestName.java (97%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/util/TestSecurityManager.java (99%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/util/TestUtil.java (99%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/util/ThrottledIndexOutput.java (97%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/util/TimeUnits.java (96%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/util/VerifyTestClassNamingConvention.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/util/automaton/AutomatonTestUtil.java (97%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/util/automaton/package.html (100%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/util/fst/FSTTester.java (97%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/util/fst/package.html (100%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/util/package.html (100%) rename lucene/test-framework/src/resources/org/apache/lucene/{ => tests}/util/europarl.lines.txt.gz (100%) rename lucene/test-framework/src/resources/org/apache/lucene/{ => tests}/util/europarl.lines.txt.seek (100%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/util/SorePoint.java (96%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/util/SoreType.java (95%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/util/TestBeforeAfterOverrides.java (98%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/util/TestCodecReported.java (96%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/util/TestExceptionInBeforeClassHooks.java (99%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/util/TestExpectThrows.java (99%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/util/TestFailIfDirectoryNotClosed.java (94%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/util/TestFailIfUnreferencedFiles.java (96%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/util/TestGroupFiltering.java (97%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/util/TestJUnitRuleOrder.java (98%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/util/TestJvmInfo.java (97%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/util/TestMaxFailuresRule.java (97%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/util/TestPleaseFail.java (97%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/util/TestRamUsageTesterOnWildAnimals.java (97%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/util/TestReproduceMessage.java (99%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/util/TestReproduceMessageWithRepeated.java (97%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/util/TestRunWithRestrictedPermissions.java (98%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/util/TestSeedFromUncaught.java (98%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/util/TestSetupTeardownChaining.java (98%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/util/TestSysoutsLimits.java (98%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/util/TestWorstCaseTestBehavior.java (98%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/util/WithNestedTests.java (97%) diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/bn/TestBengaliNormalizer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/bn/TestBengaliNormalizer.java index 841859c0ac4..7c5855debc9 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/bn/TestBengaliNormalizer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/bn/TestBengaliNormalizer.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; /** Test BengaliNormalizer */ public class TestBengaliNormalizer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilter.java index d91baa657e5..f49bb796dc1 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilter.java @@ -29,7 +29,7 @@ import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; public class TestHTMLStripCharFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilter.java index 79a8a44b616..43aa9e86cb3 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilter.java @@ -31,7 +31,7 @@ import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.UnicodeUtil; public class TestMappingCharFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAllAnalyzersHaveFactories.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAllAnalyzersHaveFactories.java index b5d0570118f..e0ed581d79f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAllAnalyzersHaveFactories.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAllAnalyzersHaveFactories.java @@ -54,7 +54,7 @@ import org.apache.lucene.analysis.snowball.SnowballFilter; import org.apache.lucene.analysis.sr.SerbianNormalizationRegularFilter; import org.apache.lucene.analysis.util.StringMockResourceLoader; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.ResourceLoader; import org.apache.lucene.util.ResourceLoaderAware; import org.apache.lucene.util.Version; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestBugInSomething.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestBugInSomething.java index a1a754bceb9..0f187938213 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestBugInSomething.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestBugInSomething.java @@ -40,7 +40,7 @@ import org.apache.lucene.analysis.ngram.NGramTokenFilter; import org.apache.lucene.analysis.shingle.ShingleFilter; import org.apache.lucene.analysis.wikipedia.WikipediaTokenizer; -import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; @SuppressCodecs("Direct") public class TestBugInSomething extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDecimalDigitFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDecimalDigitFilter.java index fbf7b0d0a53..9566e12ec0f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDecimalDigitFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDecimalDigitFilter.java @@ -22,8 +22,8 @@ import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.search.DocIdSetIterator; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.SparseFixedBitSet; -import org.apache.lucene.util.TestUtil; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDuelingAnalyzers.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDuelingAnalyzers.java index 3142f57c5d3..a8d46b8ecd2 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDuelingAnalyzers.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDuelingAnalyzers.java @@ -28,8 +28,8 @@ import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.automaton.Automaton; import org.apache.lucene.util.automaton.CharacterRunAutomaton; import org.apache.lucene.util.automaton.Operations; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFactories.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFactories.java index a20e1eed519..dad9ff0e389 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFactories.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFactories.java @@ -36,8 +36,8 @@ import org.apache.lucene.analysis.boost.DelimitedBoostTokenFilterFactory; import org.apache.lucene.analysis.miscellaneous.DelimitedTermFrequencyTokenFilterFactory; import org.apache.lucene.analysis.util.StringMockResourceLoader; +import org.apache.lucene.tests.util.LuceneTestCase.Nightly; import org.apache.lucene.util.AttributeFactory; -import org.apache.lucene.util.LuceneTestCase.Nightly; import org.apache.lucene.util.ResourceLoaderAware; import org.apache.lucene.util.Version; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java index a75ebd5620d..ee83d8543d6 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java @@ -33,9 +33,9 @@ import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.TestUtil; public class TestKeywordAnalyzer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java index 99061d50e20..f739b22f356 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java @@ -95,14 +95,14 @@ import org.apache.lucene.analysis.synonym.SynonymMap; import org.apache.lucene.analysis.wikipedia.WikipediaTokenizer; import org.apache.lucene.store.ByteBuffersDirectory; +import org.apache.lucene.tests.util.Rethrow; +import org.apache.lucene.tests.util.TestUtil; +import org.apache.lucene.tests.util.automaton.AutomatonTestUtil; import org.apache.lucene.util.AttributeFactory; import org.apache.lucene.util.AttributeSource; import org.apache.lucene.util.CharsRef; -import org.apache.lucene.util.Rethrow; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.Version; import org.apache.lucene.util.automaton.Automaton; -import org.apache.lucene.util.automaton.AutomatonTestUtil; import org.apache.lucene.util.automaton.CharacterRunAutomaton; import org.apache.lucene.util.automaton.Operations; import org.apache.lucene.util.automaton.RegExp; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilter.java index 32ce49624e2..0198d8ef462 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilter.java @@ -26,7 +26,7 @@ import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; import org.apache.lucene.analysis.tokenattributes.TypeAttribute; -import org.apache.lucene.util.English; +import org.apache.lucene.tests.util.English; public class TestTypeTokenFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/email/TestUAX29URLEmailTokenizer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/email/TestUAX29URLEmailTokenizer.java index 6eb226d43df..461fd69935f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/email/TestUAX29URLEmailTokenizer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/email/TestUAX29URLEmailTokenizer.java @@ -37,8 +37,8 @@ import org.apache.lucene.analysis.standard.EmojiTokenizationTestUnicode_12_1; import org.apache.lucene.analysis.standard.WordBreakTestUnicode_12_1_0; import org.apache.lucene.analysis.tokenattributes.TypeAttribute; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.TestUtil; public class TestUAX29URLEmailTokenizer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/StemmerTestBase.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/StemmerTestBase.java index 5ea1d334557..bdffa5a3dad 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/StemmerTestBase.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/StemmerTestBase.java @@ -23,9 +23,9 @@ import java.util.Arrays; import java.util.List; import org.apache.lucene.store.ByteBuffersDirectory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.CharsRef; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; import org.junit.AfterClass; /** base class for hunspell stemmer tests */ diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/Test64kAffixes.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/Test64kAffixes.java index 51c76d8cb0e..eb3938c58cb 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/Test64kAffixes.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/Test64kAffixes.java @@ -23,8 +23,8 @@ import java.nio.file.Path; import java.util.List; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.CharsRef; -import org.apache.lucene.util.LuceneTestCase; /** Tests that > 64k affixes actually works and doesnt overflow some internal int */ public class Test64kAffixes extends LuceneTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestAffixCondition.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestAffixCondition.java index c419040f92e..301c19e9111 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestAffixCondition.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestAffixCondition.java @@ -21,7 +21,7 @@ import static org.apache.lucene.analysis.hunspell.AffixKind.PREFIX; import static org.apache.lucene.analysis.hunspell.AffixKind.SUFFIX; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestAffixCondition extends LuceneTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestAllDictionaries.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestAllDictionaries.java index 670dea96717..51f9c702a9e 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestAllDictionaries.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestAllDictionaries.java @@ -42,11 +42,11 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import org.apache.lucene.store.BaseDirectoryWrapper; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.SuppressSysoutChecks; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressSysoutChecks; +import org.apache.lucene.tests.util.RamUsageTester; import org.apache.lucene.util.NamedThreadFactory; import org.apache.lucene.util.RamUsageEstimator; -import org.apache.lucene.util.RamUsageTester; import org.junit.Assert; import org.junit.Assume; import org.junit.Ignore; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestDictionary.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestDictionary.java index 41ece96492c..3ba00941109 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestDictionary.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestDictionary.java @@ -34,8 +34,8 @@ import java.util.stream.IntStream; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IntsRef; -import org.apache.lucene.util.LuceneTestCase; import org.junit.Test; public class TestDictionary extends LuceneTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspell.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspell.java index 598e74c6d77..3da1f114a16 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspell.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspell.java @@ -26,7 +26,7 @@ import java.util.Collections; import java.util.concurrent.CancellationException; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; public class TestHunspell extends LuceneTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestPerformance.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestPerformance.java index 9b2ef820480..61410c9939e 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestPerformance.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestPerformance.java @@ -35,7 +35,7 @@ import java.util.function.Consumer; import java.util.regex.Pattern; import java.util.stream.Collectors; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.NamedThreadFactory; import org.junit.Assume; import org.junit.AssumptionViolatedException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestSpellChecking.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestSpellChecking.java index 7e175b6b922..15e452ce133 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestSpellChecking.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestSpellChecking.java @@ -24,8 +24,8 @@ import java.util.List; import java.util.stream.Collectors; import org.apache.lucene.store.ByteBuffersDirectory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; public class TestSpellChecking extends LuceneTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestTrigramAutomaton.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestTrigramAutomaton.java index a424d23b1ac..49134ff199f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestTrigramAutomaton.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestTrigramAutomaton.java @@ -17,8 +17,8 @@ package org.apache.lucene.analysis.hunspell; import java.util.stream.Collectors; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.CharsRef; -import org.apache.lucene.util.LuceneTestCase; public class TestTrigramAutomaton extends LuceneTestCase { public void testSameScore() { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCodepointCountFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCodepointCountFilter.java index 733d10b99be..a5345d98810 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCodepointCountFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCodepointCountFilter.java @@ -23,7 +23,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; import org.junit.Test; public class TestCodepointCountFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java index 988f0fa026a..37925920d83 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java @@ -28,7 +28,7 @@ import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; public class TestLimitTokenCountAnalyzer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestRemoveDuplicatesTokenFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestRemoveDuplicatesTokenFilter.java index a2963a245f0..6f3553ccade 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestRemoveDuplicatesTokenFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestRemoveDuplicatesTokenFilter.java @@ -31,8 +31,8 @@ import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.CharsRef; -import org.apache.lucene.util.TestUtil; public class TestRemoveDuplicatesTokenFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilter.java index c07d2c8e991..ea819937d40 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilter.java @@ -33,7 +33,7 @@ import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.apache.lucene.analysis.en.PorterStemFilter; import org.apache.lucene.analysis.miscellaneous.StemmerOverrideFilter.StemmerOverrideMap; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; /** */ public class TestStemmerOverrideFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterGraphFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterGraphFilter.java index f0fe89c57ca..5336b0aa752 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterGraphFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterGraphFilter.java @@ -49,8 +49,8 @@ import org.apache.lucene.analysis.en.EnglishAnalyzer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.TestUtil; /** * New WordDelimiterGraphFilter tests... most of the tests are in ConvertedLegacyTest TODO: should diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestEdgeNGramTokenFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestEdgeNGramTokenFilter.java index 808c4737630..8955527961a 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestEdgeNGramTokenFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestEdgeNGramTokenFilter.java @@ -32,7 +32,7 @@ import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; /** Tests {@link EdgeNGramTokenFilter} for correctness. */ public class TestEdgeNGramTokenFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestEdgeNGramTokenizer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestEdgeNGramTokenizer.java index 78846c381b0..165ea09b2cb 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestEdgeNGramTokenizer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestEdgeNGramTokenizer.java @@ -23,7 +23,7 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; /** Tests {@link EdgeNGramTokenizer} for correctness. */ public class TestEdgeNGramTokenizer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestNGramTokenFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestNGramTokenFilter.java index f5f6967bb7b..628597df2a8 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestNGramTokenFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestNGramTokenFilter.java @@ -31,7 +31,7 @@ import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; /** Tests {@link NGramTokenFilter} for correctness. */ public class TestNGramTokenFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestNGramTokenizer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestNGramTokenizer.java index 5908cdf0f10..1c6d7a219a8 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestNGramTokenizer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestNGramTokenizer.java @@ -27,8 +27,8 @@ import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; import org.apache.lucene.analysis.tokenattributes.PositionLengthAttribute; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.ArrayUtil; -import org.apache.lucene.util.TestUtil; /** Tests {@link NGramTokenizer} for correctness. */ public class TestNGramTokenizer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceCharFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceCharFilter.java index 8c9a054308a..5602bbdd2b6 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceCharFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceCharFilter.java @@ -28,7 +28,7 @@ import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; import org.junit.Ignore; /** Tests {@link PatternReplaceCharFilter} */ diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestSimplePatternSplitTokenizer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestSimplePatternSplitTokenizer.java index 82fc2ece185..6b68efa0545 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestSimplePatternSplitTokenizer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestSimplePatternSplitTokenizer.java @@ -29,7 +29,7 @@ import org.apache.lucene.analysis.charfilter.NormalizeCharMap; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.automaton.Automaton; public class TestSimplePatternSplitTokenizer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestSimplePatternTokenizer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestSimplePatternTokenizer.java index e4ac20baf49..61ff88f6237 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestSimplePatternTokenizer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestSimplePatternTokenizer.java @@ -29,7 +29,7 @@ import org.apache.lucene.analysis.charfilter.NormalizeCharMap; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.automaton.Automaton; public class TestSimplePatternTokenizer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java index 9ed0350457d..9ff684474c0 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java @@ -43,7 +43,7 @@ import org.apache.lucene.index.TermsEnum; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.English; +import org.apache.lucene.tests.util.English; /** tests for the TestTeeSinkTokenFilter */ public class TestTeeSinkTokenFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java index 17204aa40ec..41cfd998fe2 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java @@ -25,7 +25,7 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.WordlistLoader; import org.apache.lucene.analysis.core.KeywordTokenizer; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** Test the snowball filters against the snowball data tests */ public class TestSnowballVocab extends LuceneTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymGraphFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymGraphFilter.java index 3bfe306156b..e5373329e5c 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymGraphFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymGraphFilter.java @@ -42,15 +42,15 @@ import org.apache.lucene.search.PhraseQuery; import org.apache.lucene.store.ByteArrayDataInput; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.TestUtil; +import org.apache.lucene.tests.util.automaton.AutomatonTestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.CharsRef; import org.apache.lucene.util.CharsRefBuilder; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.IntsRef; import org.apache.lucene.util.IntsRefBuilder; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.automaton.Automaton; -import org.apache.lucene.util.automaton.AutomatonTestUtil; import org.apache.lucene.util.automaton.Operations; import org.apache.lucene.util.automaton.TooComplexToDeterminizeException; import org.apache.lucene.util.automaton.Transition; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymMapFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymMapFilter.java index 83e7f51f538..ee40248e26e 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymMapFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymMapFilter.java @@ -35,8 +35,8 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.tokenattributes.*; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.CharsRefBuilder; -import org.apache.lucene.util.TestUtil; @Deprecated public class TestSynonymMapFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayIterator.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayIterator.java index e448a8cf26f..13a02f0369e 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayIterator.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayIterator.java @@ -19,8 +19,8 @@ import java.text.BreakIterator; import java.text.CharacterIterator; import java.util.Locale; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestCharArrayIterator extends LuceneTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestFilesystemResourceLoader.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestFilesystemResourceLoader.java index 861b6365e15..b82bde51b8a 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestFilesystemResourceLoader.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestFilesystemResourceLoader.java @@ -25,8 +25,8 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.TokenFilterFactory; import org.apache.lucene.analysis.WordlistLoader; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.ResourceLoader; public class TestFilesystemResourceLoader extends LuceneTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestRollingCharBuffer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestRollingCharBuffer.java index 8c3f6520474..9a9e74c8764 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestRollingCharBuffer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestRollingCharBuffer.java @@ -18,8 +18,8 @@ import java.io.StringReader; import java.util.Random; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestRollingCharBuffer extends LuceneTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/collation/TestCollationDocValuesField.java b/lucene/analysis/common/src/test/org/apache/lucene/collation/TestCollationDocValuesField.java index 69ab63c2002..a810db20419 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/collation/TestCollationDocValuesField.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/collation/TestCollationDocValuesField.java @@ -31,9 +31,9 @@ import org.apache.lucene.search.SortField; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; /** trivial test of CollationDocValuesField */ public class TestCollationDocValuesField extends LuceneTestCase { diff --git a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUCollationDocValuesField.java b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUCollationDocValuesField.java index dd6fb5ab786..8de52e1cda2 100644 --- a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUCollationDocValuesField.java +++ b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUCollationDocValuesField.java @@ -31,9 +31,9 @@ import org.apache.lucene.search.SortField; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; /** trivial test of ICUCollationDocValuesField */ public class TestICUCollationDocValuesField extends LuceneTestCase { diff --git a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2CharFilter.java b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2CharFilter.java index 9026701b70e..f114048311a 100644 --- a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2CharFilter.java +++ b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2CharFilter.java @@ -28,7 +28,7 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.ngram.NGramTokenizer; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; public class TestICUNormalizer2CharFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestCharArrayIterator.java b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestCharArrayIterator.java index 4a0057f20f2..9d9c20f19c2 100644 --- a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestCharArrayIterator.java +++ b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestCharArrayIterator.java @@ -17,7 +17,7 @@ package org.apache.lucene.analysis.icu.segmentation; import java.text.CharacterIterator; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestCharArrayIterator extends LuceneTestCase { public void testBasicUsage() { diff --git a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizerCJK.java b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizerCJK.java index 6d989b3a569..f3873e8380b 100644 --- a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizerCJK.java +++ b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizerCJK.java @@ -19,7 +19,7 @@ import java.util.Random; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.util.LuceneTestCase.AwaitsFix; +import org.apache.lucene.tests.util.LuceneTestCase.AwaitsFix; /** test ICUTokenizer with dictionary-based CJ segmentation */ @AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/LUCENE-8222") diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestCSVUtil.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestCSVUtil.java index 380b387d780..072a93726d8 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestCSVUtil.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestCSVUtil.java @@ -18,7 +18,7 @@ import java.io.IOException; import org.apache.lucene.analysis.ja.util.CSVUtil; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /* * Tests for the CSVUtil class. diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestExtendedMode.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestExtendedMode.java index 37db3346ef1..6c0400138c2 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestExtendedMode.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestExtendedMode.java @@ -24,7 +24,7 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.ja.JapaneseTokenizer.Mode; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.UnicodeUtil; public class TestExtendedMode extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestFactories.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestFactories.java index 1924b6aa403..da5bf808812 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestFactories.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestFactories.java @@ -35,8 +35,8 @@ import org.apache.lucene.analysis.TokenizerFactory; import org.apache.lucene.analysis.boost.DelimitedBoostTokenFilterFactory; import org.apache.lucene.analysis.miscellaneous.DelimitedTermFrequencyTokenFilterFactory; +import org.apache.lucene.tests.util.LuceneTestCase.Nightly; import org.apache.lucene.util.AttributeFactory; -import org.apache.lucene.util.LuceneTestCase.Nightly; import org.apache.lucene.util.ResourceLoaderAware; import org.apache.lucene.util.Version; diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java index efc64dc0254..b0009fcdd56 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java @@ -39,8 +39,8 @@ import org.apache.lucene.analysis.ja.dict.UserDictionary; import org.apache.lucene.analysis.ja.tokenattributes.*; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.UnicodeUtil; public class TestJapaneseTokenizer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/completion/TestKatakanaRomanizer.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/completion/TestKatakanaRomanizer.java index d1f739e12b6..d6611209a74 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/completion/TestKatakanaRomanizer.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/completion/TestKatakanaRomanizer.java @@ -17,8 +17,8 @@ package org.apache.lucene.analysis.ja.completion; import java.util.List; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.CharsRef; -import org.apache.lucene.util.LuceneTestCase; import org.junit.Test; public class TestKatakanaRomanizer extends LuceneTestCase { diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestTokenInfoDictionary.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestTokenInfoDictionary.java index 9555ba02080..53993141894 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestTokenInfoDictionary.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestTokenInfoDictionary.java @@ -27,9 +27,9 @@ import org.apache.lucene.analysis.ja.util.DictionaryBuilder; import org.apache.lucene.analysis.ja.util.DictionaryBuilder.DictionaryFormat; import org.apache.lucene.analysis.ja.util.ToStringUtil; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IntsRef; import org.apache.lucene.util.IntsRefBuilder; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.UnicodeUtil; import org.apache.lucene.util.fst.FST; import org.apache.lucene.util.fst.IntsRefFSTEnum; diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestUserDictionary.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestUserDictionary.java index 3cc5ea63c98..b08d75344f0 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestUserDictionary.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestUserDictionary.java @@ -19,7 +19,7 @@ import java.io.IOException; import java.io.StringReader; import org.apache.lucene.analysis.ja.TestJapaneseTokenizer; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; public class TestUserDictionary extends LuceneTestCase { diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/util/TestToStringUtil.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/util/TestToStringUtil.java index 22b1a324a5b..cbe0554a971 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/util/TestToStringUtil.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/util/TestToStringUtil.java @@ -18,7 +18,7 @@ import java.util.HashMap; import java.util.Map; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestToStringUtil extends LuceneTestCase { public void testPOS() { diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/util/TestUnknownDictionary.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/util/TestUnknownDictionary.java index 110cdc253e5..a2e74c710f7 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/util/TestUnknownDictionary.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/util/TestUnknownDictionary.java @@ -16,7 +16,7 @@ */ package org.apache.lucene.analysis.ja.util; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; public class TestUnknownDictionary extends LuceneTestCase { diff --git a/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/dict/TestTokenInfoDictionary.java b/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/dict/TestTokenInfoDictionary.java index 10042c9e7e2..406ce6c414e 100644 --- a/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/dict/TestTokenInfoDictionary.java +++ b/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/dict/TestTokenInfoDictionary.java @@ -26,9 +26,9 @@ import java.nio.file.Path; import org.apache.lucene.analysis.ko.POS; import org.apache.lucene.analysis.ko.util.DictionaryBuilder; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IntsRef; import org.apache.lucene.util.IntsRefBuilder; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.UnicodeUtil; import org.apache.lucene.util.fst.FST; import org.apache.lucene.util.fst.IntsRefFSTEnum; diff --git a/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/dict/TestUserDictionary.java b/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/dict/TestUserDictionary.java index 864d8e8e9f9..7f97d0520e8 100644 --- a/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/dict/TestUserDictionary.java +++ b/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/dict/TestUserDictionary.java @@ -20,7 +20,7 @@ import java.util.List; import org.apache.lucene.analysis.ko.POS; import org.apache.lucene.analysis.ko.TestKoreanTokenizer; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; public class TestUserDictionary extends LuceneTestCase { diff --git a/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/util/TestUnknownDictionary.java b/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/util/TestUnknownDictionary.java index 10b7deedf2f..c619ad36072 100644 --- a/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/util/TestUnknownDictionary.java +++ b/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/util/TestUnknownDictionary.java @@ -16,7 +16,7 @@ */ package org.apache.lucene.analysis.ko.util; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; public class TestUnknownDictionary extends LuceneTestCase { diff --git a/lucene/analysis/opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPSentenceBreakIterator.java b/lucene/analysis/opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPSentenceBreakIterator.java index 7c778d1e2ea..acd13da0037 100644 --- a/lucene/analysis/opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPSentenceBreakIterator.java +++ b/lucene/analysis/opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPSentenceBreakIterator.java @@ -23,8 +23,8 @@ import org.apache.lucene.analysis.opennlp.tools.NLPSentenceDetectorOp; import org.apache.lucene.analysis.opennlp.tools.OpenNLPOpsFactory; import org.apache.lucene.analysis.util.CharArrayIterator; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.ClasspathResourceLoader; -import org.apache.lucene.util.LuceneTestCase; import org.junit.BeforeClass; public class TestOpenNLPSentenceBreakIterator extends LuceneTestCase { diff --git a/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDoubleMetaphoneFilter.java b/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDoubleMetaphoneFilter.java index 798c70013f6..3e9d6354151 100644 --- a/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDoubleMetaphoneFilter.java +++ b/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDoubleMetaphoneFilter.java @@ -23,7 +23,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; public class TestDoubleMetaphoneFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/stempel/src/test/org/egothor/stemmer/TestCompile.java b/lucene/analysis/stempel/src/test/org/egothor/stemmer/TestCompile.java index 8c27af0a488..aa196fdd1bc 100644 --- a/lucene/analysis/stempel/src/test/org/egothor/stemmer/TestCompile.java +++ b/lucene/analysis/stempel/src/test/org/egothor/stemmer/TestCompile.java @@ -65,7 +65,7 @@ created by Leo Galambos (Leo.G@seznam.cz). import java.nio.file.Path; import java.util.Locale; import java.util.StringTokenizer; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestCompile extends LuceneTestCase { diff --git a/lucene/analysis/stempel/src/test/org/egothor/stemmer/TestStemmer.java b/lucene/analysis/stempel/src/test/org/egothor/stemmer/TestStemmer.java index b0d06c4d27f..02e27b2f473 100644 --- a/lucene/analysis/stempel/src/test/org/egothor/stemmer/TestStemmer.java +++ b/lucene/analysis/stempel/src/test/org/egothor/stemmer/TestStemmer.java @@ -55,7 +55,7 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE created by Leo Galambos (Leo.G@seznam.cz). */ -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestStemmer extends LuceneTestCase { diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestBlockPostingsFormat.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestBlockPostingsFormat.java index 3bc364b320a..48a1d96e61c 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestBlockPostingsFormat.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestBlockPostingsFormat.java @@ -39,8 +39,8 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; -import org.apache.lucene.util.LuceneTestCase.Nightly; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase.Nightly; +import org.apache.lucene.tests.util.TestUtil; /** Tests BlockPostingsFormat */ @Nightly // N-2 formats are only tested on nightly runs diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestBlockPostingsFormat2.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestBlockPostingsFormat2.java index cc3dc608e53..c899ff02a79 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestBlockPostingsFormat2.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestBlockPostingsFormat2.java @@ -28,9 +28,9 @@ import org.apache.lucene.index.IndexableField; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.Nightly; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.Nightly; +import org.apache.lucene.tests.util.TestUtil; /** Tests special cases of BlockPostingsFormat */ @Nightly // N-2 formats are only tested on nightly runs diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestBlockPostingsFormat3.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestBlockPostingsFormat3.java index 7dec8c40c05..51ff8305f7c 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestBlockPostingsFormat3.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestBlockPostingsFormat3.java @@ -44,13 +44,13 @@ import org.apache.lucene.index.TermsEnum.SeekStatus; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.English; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.Nightly; +import org.apache.lucene.tests.util.TestUtil; +import org.apache.lucene.tests.util.automaton.AutomatonTestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.English; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.Nightly; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.automaton.Automaton; -import org.apache.lucene.util.automaton.AutomatonTestUtil; import org.apache.lucene.util.automaton.CompiledAutomaton; import org.apache.lucene.util.automaton.Operations; import org.apache.lucene.util.automaton.RegExp; diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestForUtil.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestForUtil.java index 4513778bc6d..6c9bfebc20b 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestForUtil.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestForUtil.java @@ -28,9 +28,9 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.Nightly; import org.apache.lucene.util.ArrayUtil; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.Nightly; import org.apache.lucene.util.packed.PackedInts; @Nightly // N-2 formats are only tested on nightly runs diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50CompoundFormat.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50CompoundFormat.java index 7fd2128072a..0f18e266492 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50CompoundFormat.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50CompoundFormat.java @@ -19,7 +19,7 @@ import org.apache.lucene.backward_codecs.lucene87.Lucene87RWCodec; import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BaseCompoundFormatTestCase; -import org.apache.lucene.util.LuceneTestCase.Nightly; +import org.apache.lucene.tests.util.LuceneTestCase.Nightly; @Nightly // N-2 formats are only tested on nightly runs public class TestLucene50CompoundFormat extends BaseCompoundFormatTestCase { diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50LiveDocsFormat.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50LiveDocsFormat.java index f8ee50a5bf4..0295e3fc2ab 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50LiveDocsFormat.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50LiveDocsFormat.java @@ -19,7 +19,7 @@ import org.apache.lucene.backward_codecs.lucene86.Lucene86RWCodec; import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BaseLiveDocsFormatTestCase; -import org.apache.lucene.util.LuceneTestCase.Nightly; +import org.apache.lucene.tests.util.LuceneTestCase.Nightly; @Nightly // N-2 formats are only tested on nightly runs public class TestLucene50LiveDocsFormat extends BaseLiveDocsFormatTestCase { diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50StoredFieldsFormat.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50StoredFieldsFormat.java index 935929c8978..f3620d2046a 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50StoredFieldsFormat.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50StoredFieldsFormat.java @@ -19,7 +19,7 @@ import org.apache.lucene.backward_codecs.lucene86.Lucene86RWCodec; import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BaseStoredFieldsFormatTestCase; -import org.apache.lucene.util.LuceneTestCase.Nightly; +import org.apache.lucene.tests.util.LuceneTestCase.Nightly; @Nightly // N-2 formats are only tested on nightly runs public class TestLucene50StoredFieldsFormat extends BaseStoredFieldsFormatTestCase { diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50StoredFieldsFormatHighCompression.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50StoredFieldsFormatHighCompression.java index 89a34e1e644..9a78a029a18 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50StoredFieldsFormatHighCompression.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50StoredFieldsFormatHighCompression.java @@ -27,7 +27,7 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase.Nightly; +import org.apache.lucene.tests.util.LuceneTestCase.Nightly; @Nightly // N-2 formats are only tested on nightly runs public class TestLucene50StoredFieldsFormatHighCompression extends BaseStoredFieldsFormatTestCase { diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50StoredFieldsFormatMergeInstance.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50StoredFieldsFormatMergeInstance.java index 3ddd3c69ee5..5034e4032d6 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50StoredFieldsFormatMergeInstance.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50StoredFieldsFormatMergeInstance.java @@ -16,7 +16,7 @@ */ package org.apache.lucene.backward_codecs.lucene50; -import org.apache.lucene.util.LuceneTestCase.Nightly; +import org.apache.lucene.tests.util.LuceneTestCase.Nightly; /** Test the merge instance of the Lucene50 stored fields format. */ @Nightly // N-2 formats are only tested on nightly runs diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50TermVectorsFormat.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50TermVectorsFormat.java index 39a8b1a9f20..29f544391b8 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50TermVectorsFormat.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50TermVectorsFormat.java @@ -19,7 +19,7 @@ import org.apache.lucene.backward_codecs.lucene87.Lucene87RWCodec; import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BaseTermVectorsFormatTestCase; -import org.apache.lucene.util.LuceneTestCase.Nightly; +import org.apache.lucene.tests.util.LuceneTestCase.Nightly; @Nightly // N-2 formats are only tested on nightly runs public class TestLucene50TermVectorsFormat extends BaseTermVectorsFormatTestCase { diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene60/TestLucene60FieldInfosFormat.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene60/TestLucene60FieldInfosFormat.java index 0099e5dd67d..51b6ce8d880 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene60/TestLucene60FieldInfosFormat.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene60/TestLucene60FieldInfosFormat.java @@ -19,7 +19,7 @@ import org.apache.lucene.backward_codecs.lucene84.Lucene84RWCodec; import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BaseFieldInfoFormatTestCase; -import org.apache.lucene.util.LuceneTestCase.Nightly; +import org.apache.lucene.tests.util.LuceneTestCase.Nightly; @Nightly // N-2 formats are only tested on nightly runs public class TestLucene60FieldInfosFormat extends BaseFieldInfoFormatTestCase { diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene60/TestLucene60PointsFormat.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene60/TestLucene60PointsFormat.java index e70e6449be7..af130044e8e 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene60/TestLucene60PointsFormat.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene60/TestLucene60PointsFormat.java @@ -34,8 +34,8 @@ import org.apache.lucene.index.PointValues.IntersectVisitor; import org.apache.lucene.index.PointValues.Relation; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase.Nightly; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase.Nightly; +import org.apache.lucene.tests.util.TestUtil; /** Tests Lucene60PointsFormat */ @Nightly // N-2 formats are only tested on nightly runs diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene70/TestLucene70SegmentInfoFormat.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene70/TestLucene70SegmentInfoFormat.java index ed68ef982d7..69b6ca26106 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene70/TestLucene70SegmentInfoFormat.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene70/TestLucene70SegmentInfoFormat.java @@ -20,7 +20,7 @@ import org.apache.lucene.backward_codecs.lucene84.Lucene84RWCodec; import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BaseSegmentInfoFormatTestCase; -import org.apache.lucene.util.LuceneTestCase.Nightly; +import org.apache.lucene.tests.util.LuceneTestCase.Nightly; import org.apache.lucene.util.Version; @Nightly // N-2 formats are only tested on nightly runs diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/BaseLucene80DocValuesFormatTestCase.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/BaseLucene80DocValuesFormatTestCase.java index 5ae55493f70..4d7440e0094 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/BaseLucene80DocValuesFormatTestCase.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/BaseLucene80DocValuesFormatTestCase.java @@ -63,9 +63,9 @@ import org.apache.lucene.store.ByteBuffersDataInput; import org.apache.lucene.store.ByteBuffersDataOutput; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; -import org.apache.lucene.util.TestUtil; /** Tests Lucene80DocValuesFormat */ public abstract class BaseLucene80DocValuesFormatTestCase diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/TestBestCompressionLucene80DocValuesFormat.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/TestBestCompressionLucene80DocValuesFormat.java index 59dc7f97740..93ca2fe3cee 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/TestBestCompressionLucene80DocValuesFormat.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/TestBestCompressionLucene80DocValuesFormat.java @@ -17,8 +17,8 @@ package org.apache.lucene.backward_codecs.lucene80; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.util.LuceneTestCase.Nightly; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase.Nightly; +import org.apache.lucene.tests.util.TestUtil; /** Tests Lucene80DocValuesFormat */ @Nightly // N-2 formats are only tested on nightly runs diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/TestBestSpeedLucene80DocValuesFormat.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/TestBestSpeedLucene80DocValuesFormat.java index 47723f5fecd..2bdb660ca70 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/TestBestSpeedLucene80DocValuesFormat.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/TestBestSpeedLucene80DocValuesFormat.java @@ -17,8 +17,8 @@ package org.apache.lucene.backward_codecs.lucene80; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.util.LuceneTestCase.Nightly; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase.Nightly; +import org.apache.lucene.tests.util.TestUtil; /** Tests Lucene80DocValuesFormat */ @Nightly // N-2 formats are only tested on nightly runs diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/TestDocValuesCompression.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/TestDocValuesCompression.java index 8dcfbc2b5dc..42e9ec28be6 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/TestDocValuesCompression.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/TestDocValuesCompression.java @@ -37,10 +37,10 @@ import org.apache.lucene.index.SortedDocValues; import org.apache.lucene.index.SortedSetDocValues; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.Nightly; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.Nightly; -import org.apache.lucene.util.TestUtil; @Nightly // N-2 formats are only tested on nightly runs public class TestDocValuesCompression extends LuceneTestCase { diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/TestIndexedDISI.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/TestIndexedDISI.java index 7f42398f352..b15d2cfa836 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/TestIndexedDISI.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/TestIndexedDISI.java @@ -25,13 +25,13 @@ import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; import org.apache.lucene.store.RandomAccessInput; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.Nightly; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BitSet; import org.apache.lucene.util.BitSetIterator; import org.apache.lucene.util.FixedBitSet; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.Nightly; import org.apache.lucene.util.SparseFixedBitSet; -import org.apache.lucene.util.TestUtil; @Nightly // N-2 formats are only tested on nightly runs public class TestIndexedDISI extends LuceneTestCase { diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/TestLucene80NormsFormat.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/TestLucene80NormsFormat.java index bb51f100080..fb1efea3acf 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/TestLucene80NormsFormat.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/TestLucene80NormsFormat.java @@ -19,7 +19,7 @@ import org.apache.lucene.backward_codecs.lucene87.Lucene87RWCodec; import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BaseNormsFormatTestCase; -import org.apache.lucene.util.LuceneTestCase.Nightly; +import org.apache.lucene.tests.util.LuceneTestCase.Nightly; /** Tests Lucene80NormsFormat */ @Nightly // N-2 formats are only tested on nightly runs diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/TestLucene80NormsFormatMergeInstance.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/TestLucene80NormsFormatMergeInstance.java index f93d7e1f57f..851d8f82056 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/TestLucene80NormsFormatMergeInstance.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/TestLucene80NormsFormatMergeInstance.java @@ -16,7 +16,7 @@ */ package org.apache.lucene.backward_codecs.lucene80; -import org.apache.lucene.util.LuceneTestCase.Nightly; +import org.apache.lucene.tests.util.LuceneTestCase.Nightly; /** Test the merge instance of the Lucene80 norms format. */ @Nightly // N-2 formats are only tested on nightly runs diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene84/TestForDeltaUtil.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene84/TestForDeltaUtil.java index b36ca0f45a6..8217751151a 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene84/TestForDeltaUtil.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene84/TestForDeltaUtil.java @@ -25,9 +25,9 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.Nightly; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.Nightly; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.packed.PackedInts; @Nightly // N-2 formats are only tested on nightly runs diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene84/TestForUtil.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene84/TestForUtil.java index 04145cff1b6..75aa44c9eb3 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene84/TestForUtil.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene84/TestForUtil.java @@ -25,10 +25,10 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.Nightly; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.ArrayUtil; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.Nightly; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.packed.PackedInts; @Nightly // N-2 formats are only tested on nightly runs diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene84/TestLucene84PostingsFormat.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene84/TestLucene84PostingsFormat.java index 0521203755b..a6239f9ad5f 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene84/TestLucene84PostingsFormat.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene84/TestLucene84PostingsFormat.java @@ -39,8 +39,8 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; -import org.apache.lucene.util.LuceneTestCase.Nightly; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase.Nightly; +import org.apache.lucene.tests.util.TestUtil; @Nightly // N-2 formats are only tested on nightly runs public class TestLucene84PostingsFormat extends BasePostingsFormatTestCase { diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene84/TestPForUtil.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene84/TestPForUtil.java index 02b88091302..fb6161830a3 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene84/TestPForUtil.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene84/TestPForUtil.java @@ -25,10 +25,10 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.Nightly; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.ArrayUtil; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.Nightly; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.packed.PackedInts; @Nightly // N-2 formats are only tested on nightly runs diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene86/TestLucene86PointsFormat.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene86/TestLucene86PointsFormat.java index 9d7678df4b1..7d1f0ac7848 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene86/TestLucene86PointsFormat.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene86/TestLucene86PointsFormat.java @@ -39,8 +39,8 @@ import org.apache.lucene.index.SegmentReadState; import org.apache.lucene.index.SegmentWriteState; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase.Nightly; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase.Nightly; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.bkd.BKDConfig; @Nightly // N-2 formats are only tested on nightly runs diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene86/TestLucene86SegmentInfoFormat.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene86/TestLucene86SegmentInfoFormat.java index bc2b5c6db8f..ffc83407ab8 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene86/TestLucene86SegmentInfoFormat.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene86/TestLucene86SegmentInfoFormat.java @@ -20,7 +20,7 @@ import org.apache.lucene.backward_codecs.lucene87.Lucene87RWCodec; import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BaseSegmentInfoFormatTestCase; -import org.apache.lucene.util.LuceneTestCase.Nightly; +import org.apache.lucene.tests.util.LuceneTestCase.Nightly; import org.apache.lucene.util.Version; @Nightly // N-2 formats are only tested on nightly runs diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene87/TestLucene87StoredFieldsFormat.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene87/TestLucene87StoredFieldsFormat.java index 4a11b40bb73..0aa9063ca25 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene87/TestLucene87StoredFieldsFormat.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene87/TestLucene87StoredFieldsFormat.java @@ -18,7 +18,7 @@ import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BaseStoredFieldsFormatTestCase; -import org.apache.lucene.util.LuceneTestCase.Nightly; +import org.apache.lucene.tests.util.LuceneTestCase.Nightly; @Nightly // N-2 formats are only tested on nightly runs public class TestLucene87StoredFieldsFormat extends BaseStoredFieldsFormatTestCase { diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene87/TestLucene87StoredFieldsFormatHighCompression.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene87/TestLucene87StoredFieldsFormatHighCompression.java index d197e0c2cd9..62db916e81c 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene87/TestLucene87StoredFieldsFormatHighCompression.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene87/TestLucene87StoredFieldsFormatHighCompression.java @@ -25,7 +25,7 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase.Nightly; +import org.apache.lucene.tests.util.LuceneTestCase.Nightly; @Nightly // N-2 formats are only tested on nightly runs public class TestLucene87StoredFieldsFormatHighCompression extends BaseStoredFieldsFormatTestCase { diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene87/TestLucene87StoredFieldsFormatMergeInstance.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene87/TestLucene87StoredFieldsFormatMergeInstance.java index c9dab93dd90..7d7444cbed6 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene87/TestLucene87StoredFieldsFormatMergeInstance.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene87/TestLucene87StoredFieldsFormatMergeInstance.java @@ -16,7 +16,7 @@ */ package org.apache.lucene.backward_codecs.lucene87; -import org.apache.lucene.util.LuceneTestCase.Nightly; +import org.apache.lucene.tests.util.LuceneTestCase.Nightly; /** Test the merge instance of the Lucene87 stored fields format. */ @Nightly // N-2 formats are only tested on nightly runs diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/packed/TestLegacyDirectMonotonic.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/packed/TestLegacyDirectMonotonic.java index cfc6aa2a0c8..ba988afa614 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/packed/TestLegacyDirectMonotonic.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/packed/TestLegacyDirectMonotonic.java @@ -26,11 +26,11 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.Nightly; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.LongValues; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.Nightly; -import org.apache.lucene.util.TestUtil; @Nightly // N-2 formats are only tested on nightly runs public class TestLegacyDirectMonotonic extends LuceneTestCase { diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/packed/TestLegacyDirectPacked.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/packed/TestLegacyDirectPacked.java index a8ee6fe1c8f..0cbceb92685 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/packed/TestLegacyDirectPacked.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/packed/TestLegacyDirectPacked.java @@ -23,10 +23,10 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.Nightly; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.LongValues; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.Nightly; -import org.apache.lucene.util.TestUtil; @Nightly // N-2 formats are only tested on nightly runs public class TestLegacyDirectPacked extends LuceneTestCase { diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/packed/TestLegacyPackedInts.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/packed/TestLegacyPackedInts.java index 1dc0be458b2..cdf5686bb66 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/packed/TestLegacyPackedInts.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/packed/TestLegacyPackedInts.java @@ -22,10 +22,10 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.Nightly; -import org.apache.lucene.util.RamUsageTester; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.Nightly; +import org.apache.lucene.tests.util.RamUsageTester; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.packed.PackedInts; import org.apache.lucene.util.packed.PackedInts.Reader; diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/store/EndiannessReverserTestCase.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/store/EndiannessReverserTestCase.java index a0d1b3c06db..eeb1719f6f8 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/store/EndiannessReverserTestCase.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/store/EndiannessReverserTestCase.java @@ -22,8 +22,8 @@ import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; import org.apache.lucene.store.RandomAccessInput; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.Nightly; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.Nightly; @Nightly // N-2 formats are only tested on nightly runs public abstract class EndiannessReverserTestCase extends LuceneTestCase { diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/store/TestEndiannessReverserCheckSumIndexInput.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/store/TestEndiannessReverserCheckSumIndexInput.java index 8e3f6486eda..ded97033ec2 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/store/TestEndiannessReverserCheckSumIndexInput.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/store/TestEndiannessReverserCheckSumIndexInput.java @@ -21,7 +21,7 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; -import org.apache.lucene.util.LuceneTestCase.Nightly; +import org.apache.lucene.tests.util.LuceneTestCase.Nightly; @Nightly // N-2 formats are only tested on nightly runs public class TestEndiannessReverserCheckSumIndexInput extends EndiannessReverserTestCase { diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/store/TestEndiannessReverserIndexInput.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/store/TestEndiannessReverserIndexInput.java index 6e7f0c0884f..757ef328b77 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/store/TestEndiannessReverserIndexInput.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/store/TestEndiannessReverserIndexInput.java @@ -21,7 +21,7 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; -import org.apache.lucene.util.LuceneTestCase.Nightly; +import org.apache.lucene.tests.util.LuceneTestCase.Nightly; @Nightly // N-2 formats are only tested on nightly runs public class TestEndiannessReverserIndexInput extends EndiannessReverserTestCase { diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestBackwardsCompatibility.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestBackwardsCompatibility.java index 442ae7355fa..379fa99d390 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestBackwardsCompatibility.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestBackwardsCompatibility.java @@ -109,13 +109,13 @@ import org.apache.lucene.store.FSDirectory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.NIOFSDirectory; +import org.apache.lucene.tests.util.LineFileDocs; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.InfoStream; -import org.apache.lucene.util.LineFileDocs; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.Version; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestIndexWriterOnOldIndex.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestIndexWriterOnOldIndex.java index a3f00b94dd7..66fc4fdd891 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestIndexWriterOnOldIndex.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestIndexWriterOnOldIndex.java @@ -23,8 +23,8 @@ import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.index.SegmentInfos; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Version; public class TestIndexWriterOnOldIndex extends LuceneTestCase { diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestManyPointsInOldIndex.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestManyPointsInOldIndex.java index cae0742bb98..23167e4470b 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestManyPointsInOldIndex.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestManyPointsInOldIndex.java @@ -27,8 +27,8 @@ import org.apache.lucene.store.BaseDirectoryWrapper; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; // LUCENE-7501 public class TestManyPointsInOldIndex extends LuceneTestCase { diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/BenchmarkTestCase.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/BenchmarkTestCase.java index f8287fbfa5a..a37c740ee71 100644 --- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/BenchmarkTestCase.java +++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/BenchmarkTestCase.java @@ -22,8 +22,8 @@ import java.nio.file.Files; import java.nio.file.Path; import org.apache.lucene.benchmark.byTask.Benchmark; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.SuppressSysoutChecks; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressSysoutChecks; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java index eae50b71da2..8e257e6ba84 100644 --- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java +++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java @@ -53,9 +53,9 @@ import org.apache.lucene.index.TermsEnum; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; /** Test very simply that perf tasks - simple algorithms - are doing what they should. */ @LuceneTestCase.SuppressCodecs({"SimpleText", "Direct"}) diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksParse.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksParse.java index b3ccee71863..010f70f638c 100644 --- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksParse.java +++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksParse.java @@ -34,8 +34,8 @@ import org.apache.lucene.benchmark.byTask.utils.Algorithm; import org.apache.lucene.benchmark.byTask.utils.Config; import org.apache.lucene.search.Query; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.SuppressSysoutChecks; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressSysoutChecks; import org.junit.Assert; /** Test very simply that perf tasks are parsed as expected. */ diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TestEnwikiContentSource.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TestEnwikiContentSource.java index c2464b573db..a2a58bdb5d1 100644 --- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TestEnwikiContentSource.java +++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TestEnwikiContentSource.java @@ -23,7 +23,7 @@ import java.text.ParseException; import java.util.Properties; import org.apache.lucene.benchmark.byTask.utils.Config; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; public class TestEnwikiContentSource extends LuceneTestCase { diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TestHtmlParser.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TestHtmlParser.java index 7353d640baf..9d147832bf4 100644 --- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TestHtmlParser.java +++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TestHtmlParser.java @@ -20,7 +20,7 @@ import java.util.Locale; import java.util.Properties; import org.apache.lucene.benchmark.byTask.feeds.DemoHTMLParser.Parser; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestHtmlParser extends LuceneTestCase { diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TestTrecContentSource.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TestTrecContentSource.java index b5b2f67e52c..9a038b2bde7 100644 --- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TestTrecContentSource.java +++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TestTrecContentSource.java @@ -28,8 +28,8 @@ import org.apache.lucene.benchmark.byTask.feeds.TrecDocParser.ParsePathType; import org.apache.lucene.benchmark.byTask.utils.Config; import org.apache.lucene.document.DateTools; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestTrecContentSource extends LuceneTestCase { diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/utils/TestConfig.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/utils/TestConfig.java index 1fd668ab112..57c4f5a34f0 100644 --- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/utils/TestConfig.java +++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/utils/TestConfig.java @@ -17,7 +17,7 @@ package org.apache.lucene.benchmark.byTask.utils; import java.util.Properties; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; public class TestConfig extends LuceneTestCase { diff --git a/lucene/classification/src/test/org/apache/lucene/classification/ClassificationTestBase.java b/lucene/classification/src/test/org/apache/lucene/classification/ClassificationTestBase.java index 28b6e48854a..06bc4740a41 100644 --- a/lucene/classification/src/test/org/apache/lucene/classification/ClassificationTestBase.java +++ b/lucene/classification/src/test/org/apache/lucene/classification/ClassificationTestBase.java @@ -28,9 +28,9 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.Query; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.junit.After; import org.junit.Before; diff --git a/lucene/classification/src/test/org/apache/lucene/classification/Test20NewsgroupsClassification.java b/lucene/classification/src/test/org/apache/lucene/classification/Test20NewsgroupsClassification.java index 61afc53e5e4..1cb03f618dd 100644 --- a/lucene/classification/src/test/org/apache/lucene/classification/Test20NewsgroupsClassification.java +++ b/lucene/classification/src/test/org/apache/lucene/classification/Test20NewsgroupsClassification.java @@ -60,10 +60,10 @@ import org.apache.lucene.search.similarities.Normalization; import org.apache.lucene.search.similarities.NormalizationH1; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.NamedThreadFactory; -import org.apache.lucene.util.TestUtil; import org.junit.Test; @LuceneTestCase.SuppressSysoutChecks(bugUrl = "none") diff --git a/lucene/classification/src/test/org/apache/lucene/classification/utils/TestDataSplitter.java b/lucene/classification/src/test/org/apache/lucene/classification/utils/TestDataSplitter.java index 7228130f054..62668749aa6 100644 --- a/lucene/classification/src/test/org/apache/lucene/classification/utils/TestDataSplitter.java +++ b/lucene/classification/src/test/org/apache/lucene/classification/utils/TestDataSplitter.java @@ -30,9 +30,9 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.BaseDirectoryWrapper; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/lucene/classification/src/test/org/apache/lucene/classification/utils/TestDocToDoubleVectorUtils.java b/lucene/classification/src/test/org/apache/lucene/classification/utils/TestDocToDoubleVectorUtils.java index 7db23939c22..f36b7880fe6 100644 --- a/lucene/classification/src/test/org/apache/lucene/classification/utils/TestDocToDoubleVectorUtils.java +++ b/lucene/classification/src/test/org/apache/lucene/classification/utils/TestDocToDoubleVectorUtils.java @@ -28,7 +28,7 @@ import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestFixedGapPostingsFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestFixedGapPostingsFormat.java index 2d80009c69f..e441fe933e3 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestFixedGapPostingsFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestFixedGapPostingsFormat.java @@ -18,7 +18,7 @@ import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BasePostingsFormatTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; /** Basic tests of a PF using FixedGap terms dictionary */ public class TestFixedGapPostingsFormat extends BasePostingsFormatTestCase { diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestVarGapDocFreqIntervalPostingsFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestVarGapDocFreqIntervalPostingsFormat.java index 5f66a59f042..e66a337ae39 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestVarGapDocFreqIntervalPostingsFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestVarGapDocFreqIntervalPostingsFormat.java @@ -18,7 +18,7 @@ import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BasePostingsFormatTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; /** Basic tests of a PF using VariableGap terms dictionary (fixed interval) */ public class TestVarGapDocFreqIntervalPostingsFormat extends BasePostingsFormatTestCase { diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestVarGapFixedIntervalPostingsFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestVarGapFixedIntervalPostingsFormat.java index 73566fa2642..29aeac9ff50 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestVarGapFixedIntervalPostingsFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestVarGapFixedIntervalPostingsFormat.java @@ -18,7 +18,7 @@ import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BasePostingsFormatTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; /** Basic tests of a PF using VariableGap terms dictionary (fixed interval, docFreq threshold) */ public class TestVarGapFixedIntervalPostingsFormat extends BasePostingsFormatTestCase { diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/blocktreeords/TestOrdsBlockTree.java b/lucene/codecs/src/test/org/apache/lucene/codecs/blocktreeords/TestOrdsBlockTree.java index 1c6ea28309f..52ad7625468 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/blocktreeords/TestOrdsBlockTree.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/blocktreeords/TestOrdsBlockTree.java @@ -33,8 +33,8 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.TestUtil; public class TestOrdsBlockTree extends BasePostingsFormatTestCase { private final Codec codec = TestUtil.alwaysPostingsFormat(new BlockTreeOrdsPostingsFormat()); diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/bloom/TestBloomPostingsFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/bloom/TestBloomPostingsFormat.java index 89b58a29af0..34d33f3cc39 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/bloom/TestBloomPostingsFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/bloom/TestBloomPostingsFormat.java @@ -18,7 +18,7 @@ import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BasePostingsFormatTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; /** Basic tests for BloomPostingsFormat */ public class TestBloomPostingsFormat extends BasePostingsFormatTestCase { diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestDirectPostingsFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestDirectPostingsFormat.java index 69e9226e32f..08b1459d859 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestDirectPostingsFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestDirectPostingsFormat.java @@ -18,7 +18,7 @@ import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BasePostingsFormatTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; /** Tests DirectPostingsFormat */ public class TestDirectPostingsFormat extends BasePostingsFormatTestCase { diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestFSTPostingsFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestFSTPostingsFormat.java index 2ffbaa8b1e8..32c79cee587 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestFSTPostingsFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestFSTPostingsFormat.java @@ -18,7 +18,7 @@ import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BasePostingsFormatTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; /** Tests FSTPostingsFormat */ public class TestFSTPostingsFormat extends BasePostingsFormatTestCase { diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextPostingsFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextPostingsFormat.java index 7d90470f385..68228134fbf 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextPostingsFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextPostingsFormat.java @@ -18,7 +18,7 @@ import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BasePostingsFormatTestCase; -import org.apache.lucene.util.LuceneTestCase.Nightly; +import org.apache.lucene.tests.util.LuceneTestCase.Nightly; /** Tests SimpleText's postings */ @Nightly // please figure out why I am so horrendously slow! diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/TestBlockWriter.java b/lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/TestBlockWriter.java index 815d286972f..5d74e7bf0d0 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/TestBlockWriter.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/TestBlockWriter.java @@ -26,8 +26,8 @@ import org.apache.lucene.index.VectorSimilarityFunction; import org.apache.lucene.store.ByteBuffersDataOutput; import org.apache.lucene.store.ByteBuffersIndexOutput; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; /** Tests {@link BlockWriter}. */ public class TestBlockWriter extends LuceneTestCase { diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/TestFSTDictionary.java b/lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/TestFSTDictionary.java index d3e8004064d..7e12cc2ae64 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/TestFSTDictionary.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/TestFSTDictionary.java @@ -24,8 +24,8 @@ import java.util.List; import java.util.stream.Collectors; import org.apache.lucene.store.ByteBuffersDataOutput; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; /** Tests {@link FSTDictionary}. */ public class TestFSTDictionary extends LuceneTestCase { diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/TestTermBytes.java b/lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/TestTermBytes.java index 9fb54080c31..a5f90976120 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/TestTermBytes.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/TestTermBytes.java @@ -22,8 +22,8 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; /** Tests {@link TermBytes}. */ public class TestTermBytes extends LuceneTestCase { diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/TestTermBytesComparator.java b/lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/TestTermBytesComparator.java index c2ba3e99dcc..e1bec2ea3f5 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/TestTermBytesComparator.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/TestTermBytesComparator.java @@ -33,8 +33,8 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; /** Tests the {@link TermBytes} comparator. */ public class TestTermBytesComparator extends LuceneTestCase { diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/TestUniformSplitPostingFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/TestUniformSplitPostingFormat.java index 95242eb2371..3bb8774a974 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/TestUniformSplitPostingFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/TestUniformSplitPostingFormat.java @@ -20,7 +20,7 @@ import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.PostingsFormat; import org.apache.lucene.index.BasePostingsFormatTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; import org.junit.After; import org.junit.Before; diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/sharedterms/TestSTBlockReader.java b/lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/sharedterms/TestSTBlockReader.java index 513a0d99b8c..2a5e9121edf 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/sharedterms/TestSTBlockReader.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/sharedterms/TestSTBlockReader.java @@ -48,8 +48,8 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; public class TestSTBlockReader extends LuceneTestCase { diff --git a/lucene/core/src/java/org/apache/lucene/util/RamUsageEstimator.java b/lucene/core/src/java/org/apache/lucene/util/RamUsageEstimator.java index 656bf75ab99..d19ca3be06b 100644 --- a/lucene/core/src/java/org/apache/lucene/util/RamUsageEstimator.java +++ b/lucene/core/src/java/org/apache/lucene/util/RamUsageEstimator.java @@ -607,7 +607,7 @@ private static long shallowSizeOfArray(Object array) { *

The returned offset will be the maximum of whatever was measured so far and f * field's offset and representation size (unaligned). */ - static long adjustForField(long sizeSoFar, final Field f) { + public static long adjustForField(long sizeSoFar, final Field f) { final Class type = f.getType(); final int fsize = type.isPrimitive() ? primitiveSizes.get(type) : NUM_BYTES_OBJECT_REF; // TODO: No alignments based on field type/ subclass fields alignments? diff --git a/lucene/core/src/java/org/apache/lucene/util/automaton/Automaton.java b/lucene/core/src/java/org/apache/lucene/util/automaton/Automaton.java index f46104647b8..cc9ff2427a6 100644 --- a/lucene/core/src/java/org/apache/lucene/util/automaton/Automaton.java +++ b/lucene/core/src/java/org/apache/lucene/util/automaton/Automaton.java @@ -630,7 +630,7 @@ public String toDot() { } /** Returns sorted array of all interval start points. */ - int[] getStartPoints() { + public int[] getStartPoints() { Set pointset = new HashSet<>(); pointset.add(Character.MIN_CODE_POINT); // System.out.println("getStartPoints"); diff --git a/lucene/core/src/java/org/apache/lucene/util/automaton/Operations.java b/lucene/core/src/java/org/apache/lucene/util/automaton/Operations.java index 1b54b57a80b..6db58e7119e 100644 --- a/lucene/core/src/java/org/apache/lucene/util/automaton/Operations.java +++ b/lucene/core/src/java/org/apache/lucene/util/automaton/Operations.java @@ -1223,7 +1223,7 @@ public static Automaton reverse(Automaton a) { } /** Reverses the automaton, returning the new initial states. */ - static Automaton reverse(Automaton a, Set initialStates) { + public static Automaton reverse(Automaton a, Set initialStates) { if (Operations.isEmpty(a)) { return new Automaton(); diff --git a/lucene/core/src/test/org/apache/lucene/TestAssertions.java b/lucene/core/src/test/org/apache/lucene/TestAssertions.java index c35a7c3dd9d..fdcbd870490 100644 --- a/lucene/core/src/test/org/apache/lucene/TestAssertions.java +++ b/lucene/core/src/test/org/apache/lucene/TestAssertions.java @@ -17,7 +17,7 @@ package org.apache.lucene; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** validate that assertions are enabled during tests */ public class TestAssertions extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/TestDemo.java b/lucene/core/src/test/org/apache/lucene/TestDemo.java index 0a512c32574..0f64228a04c 100644 --- a/lucene/core/src/test/org/apache/lucene/TestDemo.java +++ b/lucene/core/src/test/org/apache/lucene/TestDemo.java @@ -31,8 +31,8 @@ import org.apache.lucene.search.*; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; /** * A very simple demo used in the API documentation (src/java/overview.html). diff --git a/lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java b/lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java index bf353a55307..4686de83e5b 100644 --- a/lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java +++ b/lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java @@ -28,8 +28,8 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.BaseDirectoryWrapper; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; /* Intentionally outside of oal.index to verify fully external codecs work fine */ diff --git a/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java b/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java index cf9283ab71a..3a154a61c21 100644 --- a/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java +++ b/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java @@ -36,9 +36,9 @@ import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.InfoStream; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.PrintStreamInfoStream; import org.junit.AfterClass; diff --git a/lucene/core/src/test/org/apache/lucene/TestSearch.java b/lucene/core/src/test/org/apache/lucene/TestSearch.java index 04aa6e39f15..d0381e61144 100644 --- a/lucene/core/src/test/org/apache/lucene/TestSearch.java +++ b/lucene/core/src/test/org/apache/lucene/TestSearch.java @@ -26,7 +26,7 @@ import org.apache.lucene.index.*; import org.apache.lucene.search.*; import org.apache.lucene.store.*; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** JUnit adaptation of an older test case SearchTest. */ public class TestSearch extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/TestSearchForDuplicates.java b/lucene/core/src/test/org/apache/lucene/TestSearchForDuplicates.java index 6bbce716903..427859296e2 100644 --- a/lucene/core/src/test/org/apache/lucene/TestSearchForDuplicates.java +++ b/lucene/core/src/test/org/apache/lucene/TestSearchForDuplicates.java @@ -41,7 +41,7 @@ import org.apache.lucene.search.SortField; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestSearchForDuplicates extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/analysis/TestAbstractAnalysisFactory.java b/lucene/core/src/test/org/apache/lucene/analysis/TestAbstractAnalysisFactory.java index bb9953f27da..474e76ab4af 100644 --- a/lucene/core/src/test/org/apache/lucene/analysis/TestAbstractAnalysisFactory.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/TestAbstractAnalysisFactory.java @@ -18,7 +18,7 @@ package org.apache.lucene.analysis; import org.apache.lucene.analysis.standard.StandardTokenizerFactory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestAbstractAnalysisFactory extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/analysis/TestAnalysisSPILoader.java b/lucene/core/src/test/org/apache/lucene/analysis/TestAnalysisSPILoader.java index 904cd415702..e6fcf460f59 100644 --- a/lucene/core/src/test/org/apache/lucene/analysis/TestAnalysisSPILoader.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/TestAnalysisSPILoader.java @@ -19,7 +19,7 @@ import java.util.HashMap; import java.util.Map; import org.apache.lucene.analysis.standard.StandardTokenizerFactory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.Version; public class TestAnalysisSPILoader extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/analysis/TestAnalyzerWrapper.java b/lucene/core/src/test/org/apache/lucene/analysis/TestAnalyzerWrapper.java index 051338da5ad..cf468af467e 100644 --- a/lucene/core/src/test/org/apache/lucene/analysis/TestAnalyzerWrapper.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/TestAnalyzerWrapper.java @@ -19,7 +19,7 @@ import java.io.IOException; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestAnalyzerWrapper extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/analysis/TestCharArrayMap.java b/lucene/core/src/test/org/apache/lucene/analysis/TestCharArrayMap.java index 0380e5d7c74..625da794325 100644 --- a/lucene/core/src/test/org/apache/lucene/analysis/TestCharArrayMap.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/TestCharArrayMap.java @@ -17,7 +17,7 @@ package org.apache.lucene.analysis; import java.util.*; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestCharArrayMap extends LuceneTestCase { public void doRandom(int iter, boolean ignoreCase) { diff --git a/lucene/core/src/test/org/apache/lucene/analysis/TestCharArraySet.java b/lucene/core/src/test/org/apache/lucene/analysis/TestCharArraySet.java index 2396d6468e3..b25b4e8c5d0 100644 --- a/lucene/core/src/test/org/apache/lucene/analysis/TestCharArraySet.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/TestCharArraySet.java @@ -17,7 +17,7 @@ package org.apache.lucene.analysis; import java.util.*; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.SuppressForbidden; public class TestCharArraySet extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/analysis/TestCharFilter.java b/lucene/core/src/test/org/apache/lucene/analysis/TestCharFilter.java index c00f26e49b3..145d74364a1 100644 --- a/lucene/core/src/test/org/apache/lucene/analysis/TestCharFilter.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/TestCharFilter.java @@ -19,7 +19,7 @@ import java.io.IOException; import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestCharFilter extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/analysis/TestCharacterUtils.java b/lucene/core/src/test/org/apache/lucene/analysis/TestCharacterUtils.java index ba916b504e2..8d0dcc6ff9d 100644 --- a/lucene/core/src/test/org/apache/lucene/analysis/TestCharacterUtils.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/TestCharacterUtils.java @@ -20,9 +20,9 @@ import java.io.Reader; import java.io.StringReader; import org.apache.lucene.analysis.CharacterUtils.CharacterBuffer; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.ArrayUtil; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.junit.Test; /** TestCase for the {@link CharacterUtils} class. */ diff --git a/lucene/core/src/test/org/apache/lucene/analysis/TestDelegatingAnalyzerWrapper.java b/lucene/core/src/test/org/apache/lucene/analysis/TestDelegatingAnalyzerWrapper.java index 2255d0b227c..9d107c7020a 100644 --- a/lucene/core/src/test/org/apache/lucene/analysis/TestDelegatingAnalyzerWrapper.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/TestDelegatingAnalyzerWrapper.java @@ -19,8 +19,8 @@ import java.io.IOException; import java.io.Reader; import java.nio.charset.StandardCharsets; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; public class TestDelegatingAnalyzerWrapper extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/analysis/TestGraphTokenizers.java b/lucene/core/src/test/org/apache/lucene/analysis/TestGraphTokenizers.java index 989759d9038..ce50f2f629a 100644 --- a/lucene/core/src/test/org/apache/lucene/analysis/TestGraphTokenizers.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/TestGraphTokenizers.java @@ -31,11 +31,11 @@ import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; import org.apache.lucene.analysis.tokenattributes.PositionLengthAttribute; +import org.apache.lucene.tests.util.automaton.AutomatonTestUtil; import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.IntsRef; import org.apache.lucene.util.automaton.Automata; import org.apache.lucene.util.automaton.Automaton; -import org.apache.lucene.util.automaton.AutomatonTestUtil; import org.apache.lucene.util.automaton.Operations; import org.apache.lucene.util.fst.Util; diff --git a/lucene/core/src/test/org/apache/lucene/analysis/TestReusableStringReader.java b/lucene/core/src/test/org/apache/lucene/analysis/TestReusableStringReader.java index 564f5aaeed0..aa376210ca0 100644 --- a/lucene/core/src/test/org/apache/lucene/analysis/TestReusableStringReader.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/TestReusableStringReader.java @@ -17,7 +17,7 @@ package org.apache.lucene.analysis; import java.nio.CharBuffer; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestReusableStringReader extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/analysis/TestStopFilter.java b/lucene/core/src/test/org/apache/lucene/analysis/TestStopFilter.java index 13b2ea9df7b..3f92ba58155 100644 --- a/lucene/core/src/test/org/apache/lucene/analysis/TestStopFilter.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/TestStopFilter.java @@ -29,7 +29,7 @@ import java.util.Set; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; -import org.apache.lucene.util.English; +import org.apache.lucene.tests.util.English; public class TestStopFilter extends BaseTokenStreamTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/analysis/TestWordlistLoader.java b/lucene/core/src/test/org/apache/lucene/analysis/TestWordlistLoader.java index 6526dd589c7..7af64c0011e 100644 --- a/lucene/core/src/test/org/apache/lucene/analysis/TestWordlistLoader.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/TestWordlistLoader.java @@ -19,7 +19,7 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.StringReader; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestWordlistLoader extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/analysis/standard/TestStandardAnalyzer.java b/lucene/core/src/test/org/apache/lucene/analysis/standard/TestStandardAnalyzer.java index a14d31fa0f8..23f72161206 100644 --- a/lucene/core/src/test/org/apache/lucene/analysis/standard/TestStandardAnalyzer.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/standard/TestStandardAnalyzer.java @@ -29,8 +29,8 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.TestUtil; public class TestStandardAnalyzer extends BaseTokenStreamTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestBytesRefAttImpl.java b/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestBytesRefAttImpl.java index ebf20d8dc56..3e1f42762de 100644 --- a/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestBytesRefAttImpl.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestBytesRefAttImpl.java @@ -17,9 +17,9 @@ package org.apache.lucene.analysis.tokenattributes; import java.util.stream.Stream; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.AttributeImpl; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; public class TestBytesRefAttImpl extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestCharTermAttributeImpl.java b/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestCharTermAttributeImpl.java index 53af58b8f68..8152b3e26f5 100644 --- a/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestCharTermAttributeImpl.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestCharTermAttributeImpl.java @@ -21,10 +21,10 @@ import java.util.HashMap; import java.util.Locale; import java.util.regex.Pattern; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.AttributeImpl; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestCharTermAttributeImpl extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestPackedTokenAttributeImpl.java b/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestPackedTokenAttributeImpl.java index 8e440962630..b06acea9b06 100644 --- a/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestPackedTokenAttributeImpl.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestPackedTokenAttributeImpl.java @@ -21,9 +21,9 @@ import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestPackedTokenAttributeImpl extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestSimpleAttributeImpl.java b/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestSimpleAttributeImpl.java index f8832d97248..74d9726e352 100644 --- a/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestSimpleAttributeImpl.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestSimpleAttributeImpl.java @@ -18,8 +18,8 @@ import java.util.Collections; import java.util.HashMap; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestSimpleAttributeImpl extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/codecs/TestCodecUtil.java b/lucene/core/src/test/org/apache/lucene/codecs/TestCodecUtil.java index 26f00c3c2ee..ea47019de6c 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/TestCodecUtil.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/TestCodecUtil.java @@ -29,7 +29,7 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.StringHelper; /** tests for codecutil methods */ diff --git a/lucene/core/src/test/org/apache/lucene/codecs/TestCompetitiveFreqNormAccumulator.java b/lucene/core/src/test/org/apache/lucene/codecs/TestCompetitiveFreqNormAccumulator.java index 26e7adeb32c..6a7e165cedd 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/TestCompetitiveFreqNormAccumulator.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/TestCompetitiveFreqNormAccumulator.java @@ -22,7 +22,7 @@ import java.util.Set; import java.util.TreeSet; import org.apache.lucene.index.Impact; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestCompetitiveFreqNormAccumulator extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/codecs/compressing/AbstractTestCompressionMode.java b/lucene/core/src/test/org/apache/lucene/codecs/compressing/AbstractTestCompressionMode.java index b1be46c9a8a..4c9478800a0 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/compressing/AbstractTestCompressionMode.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/compressing/AbstractTestCompressionMode.java @@ -22,10 +22,10 @@ import java.util.Random; import org.apache.lucene.store.ByteArrayDataInput; import org.apache.lucene.store.ByteArrayDataOutput; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public abstract class AbstractTestCompressionMode extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestForUtil.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestForUtil.java index b1f683ba005..363226423ee 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestForUtil.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestForUtil.java @@ -24,9 +24,9 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.ArrayUtil; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.packed.PackedInts; public class TestForUtil extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestIndexedDISI.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestIndexedDISI.java index 3cbff9f9679..a45f0e6d5ac 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestIndexedDISI.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestIndexedDISI.java @@ -24,12 +24,12 @@ import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; import org.apache.lucene.store.RandomAccessInput; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BitSet; import org.apache.lucene.util.BitSetIterator; import org.apache.lucene.util.FixedBitSet; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.SparseFixedBitSet; -import org.apache.lucene.util.TestUtil; // Copied from the lucene70 package for separation of codec-code public class TestIndexedDISI extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90CompoundFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90CompoundFormat.java index ed78abd345e..48ee783e623 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90CompoundFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90CompoundFormat.java @@ -18,7 +18,7 @@ import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BaseCompoundFormatTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; public class TestLucene90CompoundFormat extends BaseCompoundFormatTestCase { private final Codec codec = TestUtil.getDefaultCodec(); diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90DocValuesFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90DocValuesFormat.java index 1439d0862d6..5fee1966ae1 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90DocValuesFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90DocValuesFormat.java @@ -66,9 +66,9 @@ import org.apache.lucene.store.ByteBuffersDataInput; import org.apache.lucene.store.ByteBuffersDataOutput; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; -import org.apache.lucene.util.TestUtil; /** Tests Lucene90DocValuesFormat */ public class TestLucene90DocValuesFormat extends BaseCompressingDocValuesFormatTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90FieldInfosFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90FieldInfosFormat.java index 83bd56a1aaa..000e6d3e8fc 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90FieldInfosFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90FieldInfosFormat.java @@ -18,7 +18,7 @@ import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BaseFieldInfoFormatTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; public class TestLucene90FieldInfosFormat extends BaseFieldInfoFormatTestCase { @Override diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90HnswVectorsFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90HnswVectorsFormat.java index e13840b97db..c03a9164dcc 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90HnswVectorsFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90HnswVectorsFormat.java @@ -23,7 +23,7 @@ import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.KnnVectorsFormat; import org.apache.lucene.index.BaseKnnVectorsFormatTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; public class TestLucene90HnswVectorsFormat extends BaseKnnVectorsFormatTestCase { @Override diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90LiveDocsFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90LiveDocsFormat.java index 9575def972d..1c46d4dbf92 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90LiveDocsFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90LiveDocsFormat.java @@ -18,7 +18,7 @@ import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BaseLiveDocsFormatTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; public class TestLucene90LiveDocsFormat extends BaseLiveDocsFormatTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90NormsFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90NormsFormat.java index d7023ba590b..5b090bb0a7e 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90NormsFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90NormsFormat.java @@ -18,7 +18,7 @@ import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BaseNormsFormatTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; /** Tests Lucene90NormsFormat */ public class TestLucene90NormsFormat extends BaseNormsFormatTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90PointsFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90PointsFormat.java index f7284d04271..36938f2d0e9 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90PointsFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90PointsFormat.java @@ -38,7 +38,7 @@ import org.apache.lucene.index.SegmentReadState; import org.apache.lucene.index.SegmentWriteState; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.bkd.BKDConfig; public class TestLucene90PointsFormat extends BasePointsFormatTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90PostingsFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90PostingsFormat.java index df4aacc1b27..6eb68cd6810 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90PostingsFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90PostingsFormat.java @@ -38,7 +38,7 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; public class TestLucene90PostingsFormat extends BasePostingsFormatTestCase { private final Codec codec = TestUtil.alwaysPostingsFormat(new Lucene90PostingsFormat()); diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90SegmentInfoFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90SegmentInfoFormat.java index 4826b12fd06..24749f02321 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90SegmentInfoFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90SegmentInfoFormat.java @@ -19,7 +19,7 @@ import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BaseSegmentInfoFormatTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Version; public class TestLucene90SegmentInfoFormat extends BaseSegmentInfoFormatTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90StoredFieldsFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90StoredFieldsFormat.java index e2e0ec69c6c..1faca6ca372 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90StoredFieldsFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90StoredFieldsFormat.java @@ -18,7 +18,7 @@ import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BaseStoredFieldsFormatTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; public class TestLucene90StoredFieldsFormat extends BaseStoredFieldsFormatTestCase { @Override diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90TermVectorsFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90TermVectorsFormat.java index 00bf963ab03..a64fd5d5ee0 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90TermVectorsFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90TermVectorsFormat.java @@ -18,7 +18,7 @@ import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BaseTermVectorsFormatTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; public class TestLucene90TermVectorsFormat extends BaseTermVectorsFormatTestCase { @Override diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestPForUtil.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestPForUtil.java index 207adcb1e7e..a7b37030ad1 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestPForUtil.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestPForUtil.java @@ -24,9 +24,9 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.ArrayUtil; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.packed.PackedInts; public class TestPForUtil extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/compressing/TestStoredFieldsInt.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/compressing/TestStoredFieldsInt.java index fee31356700..3578cdd713e 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/compressing/TestStoredFieldsInt.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/compressing/TestStoredFieldsInt.java @@ -21,8 +21,8 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestStoredFieldsInt extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java index 619c940da29..ec4cc16d6fb 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java @@ -53,8 +53,8 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.TestUtil; /** Basic tests of PerFieldDocValuesFormat */ public class TestPerFieldDocValuesFormat extends BaseDocValuesFormatTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldKnnVectorsFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldKnnVectorsFormat.java index 31371a5b9fa..0cd31167ff8 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldKnnVectorsFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldKnnVectorsFormat.java @@ -46,7 +46,7 @@ import org.apache.lucene.index.VectorValues; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; import org.hamcrest.MatcherAssert; /** Basic tests of PerFieldDocValuesFormat */ diff --git a/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat2.java b/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat2.java index 9497fae1a75..0c77b7b4c9c 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat2.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat2.java @@ -54,8 +54,8 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.junit.Test; /** */ diff --git a/lucene/core/src/test/org/apache/lucene/document/BaseLatLonSpatialTestCase.java b/lucene/core/src/test/org/apache/lucene/document/BaseLatLonSpatialTestCase.java index 483e9e35846..4cf9e4fb129 100644 --- a/lucene/core/src/test/org/apache/lucene/document/BaseLatLonSpatialTestCase.java +++ b/lucene/core/src/test/org/apache/lucene/document/BaseLatLonSpatialTestCase.java @@ -39,7 +39,7 @@ import org.apache.lucene.geo.Rectangle; import org.apache.lucene.geo.Tessellator; import org.apache.lucene.search.Query; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; /** Base test case for testing geospatial indexing and search functionality * */ public abstract class BaseLatLonSpatialTestCase extends BaseSpatialTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/document/BaseShapeEncodingTestCase.java b/lucene/core/src/test/org/apache/lucene/document/BaseShapeEncodingTestCase.java index 668443cf46e..3beafb44bd9 100644 --- a/lucene/core/src/test/org/apache/lucene/document/BaseShapeEncodingTestCase.java +++ b/lucene/core/src/test/org/apache/lucene/document/BaseShapeEncodingTestCase.java @@ -18,7 +18,7 @@ import org.apache.lucene.geo.Component2D; import org.apache.lucene.geo.GeoUtils; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** * base shape encoding class for testing encoding of tessellated {@link diff --git a/lucene/core/src/test/org/apache/lucene/document/BaseSpatialTestCase.java b/lucene/core/src/test/org/apache/lucene/document/BaseSpatialTestCase.java index 2d2da74e280..d75758fe039 100644 --- a/lucene/core/src/test/org/apache/lucene/document/BaseSpatialTestCase.java +++ b/lucene/core/src/test/org/apache/lucene/document/BaseSpatialTestCase.java @@ -42,11 +42,11 @@ import org.apache.lucene.search.ScoreMode; import org.apache.lucene.search.SimpleCollector; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; import org.apache.lucene.util.FixedBitSet; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; /** * Base test case for testing spherical and cartesian geometry indexing and search functionality diff --git a/lucene/core/src/test/org/apache/lucene/document/BaseXYShapeTestCase.java b/lucene/core/src/test/org/apache/lucene/document/BaseXYShapeTestCase.java index b6dc4b80109..30c4411cdb7 100644 --- a/lucene/core/src/test/org/apache/lucene/document/BaseXYShapeTestCase.java +++ b/lucene/core/src/test/org/apache/lucene/document/BaseXYShapeTestCase.java @@ -33,7 +33,7 @@ import org.apache.lucene.geo.XYPolygon; import org.apache.lucene.geo.XYRectangle; import org.apache.lucene.search.Query; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; /** Base test case for testing indexing and search functionality of cartesian geometry * */ public abstract class BaseXYShapeTestCase extends BaseSpatialTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/document/TestBinaryDocument.java b/lucene/core/src/test/org/apache/lucene/document/TestBinaryDocument.java index 6c091cca430..773ebc29178 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestBinaryDocument.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestBinaryDocument.java @@ -20,8 +20,8 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; /** Tests {@link Document} class. */ public class TestBinaryDocument extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/document/TestDateTools.java b/lucene/core/src/test/org/apache/lucene/document/TestDateTools.java index 287801a56b8..8c2c22f8b6a 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestDateTools.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestDateTools.java @@ -19,7 +19,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestDateTools extends LuceneTestCase { public void testStringToDate() throws ParseException { diff --git a/lucene/core/src/test/org/apache/lucene/document/TestDocument.java b/lucene/core/src/test/org/apache/lucene/document/TestDocument.java index f67379957b3..79efd71fe75 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestDocument.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestDocument.java @@ -33,8 +33,8 @@ import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; /** Tests {@link Document} class. */ public class TestDocument extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/document/TestDoubleRange.java b/lucene/core/src/test/org/apache/lucene/document/TestDoubleRange.java index f60cf711bf7..ee94abda8d7 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestDoubleRange.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestDoubleRange.java @@ -16,7 +16,7 @@ */ package org.apache.lucene.document; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestDoubleRange extends LuceneTestCase { public void testToString() { diff --git a/lucene/core/src/test/org/apache/lucene/document/TestFeatureDoubleValues.java b/lucene/core/src/test/org/apache/lucene/document/TestFeatureDoubleValues.java index c901a24acc8..2e0832d7759 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestFeatureDoubleValues.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestFeatureDoubleValues.java @@ -25,7 +25,7 @@ import org.apache.lucene.search.DoubleValuesSource; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestFeatureDoubleValues extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/document/TestFeatureField.java b/lucene/core/src/test/org/apache/lucene/document/TestFeatureField.java index 5fea98ccaed..88ac68f4e4a 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestFeatureField.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestFeatureField.java @@ -36,7 +36,7 @@ import org.apache.lucene.search.similarities.BM25Similarity; import org.apache.lucene.search.similarities.Similarity.SimScorer; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestFeatureField extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/document/TestFeatureSort.java b/lucene/core/src/test/org/apache/lucene/document/TestFeatureSort.java index e300abc9205..ceba664a619 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestFeatureSort.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestFeatureSort.java @@ -27,8 +27,8 @@ import org.apache.lucene.search.SortField; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; /* * Test for sorting using a feature from a FeatureField. diff --git a/lucene/core/src/test/org/apache/lucene/document/TestField.java b/lucene/core/src/test/org/apache/lucene/document/TestField.java index f187a069744..909a41f9fd4 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestField.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestField.java @@ -27,8 +27,8 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; // sanity check some basics of fields public class TestField extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/document/TestFieldType.java b/lucene/core/src/test/org/apache/lucene/document/TestFieldType.java index 6de673b2081..4b2136dfa4b 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestFieldType.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestFieldType.java @@ -21,7 +21,7 @@ import org.apache.lucene.index.DocValuesType; import org.apache.lucene.index.IndexOptions; import org.apache.lucene.index.PointValues; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** simple testcases for concrete impl of IndexableFieldType */ public class TestFieldType extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/document/TestFloatRange.java b/lucene/core/src/test/org/apache/lucene/document/TestFloatRange.java index 5ce4eb03ca5..bc5227f63be 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestFloatRange.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestFloatRange.java @@ -16,7 +16,7 @@ */ package org.apache.lucene.document; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestFloatRange extends LuceneTestCase { public void testToString() { diff --git a/lucene/core/src/test/org/apache/lucene/document/TestInetAddressPoint.java b/lucene/core/src/test/org/apache/lucene/document/TestInetAddressPoint.java index 168b35d8b65..fbcd7b9582f 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestInetAddressPoint.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestInetAddressPoint.java @@ -22,7 +22,7 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** Simple tests for {@link InetAddressPoint} */ public class TestInetAddressPoint extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/document/TestIntRange.java b/lucene/core/src/test/org/apache/lucene/document/TestIntRange.java index 0bf73cd81e3..167c70068a1 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestIntRange.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestIntRange.java @@ -16,7 +16,7 @@ */ package org.apache.lucene.document; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestIntRange extends LuceneTestCase { public void testToString() { diff --git a/lucene/core/src/test/org/apache/lucene/document/TestLatLonDocValuesField.java b/lucene/core/src/test/org/apache/lucene/document/TestLatLonDocValuesField.java index 28797854b5a..8a6711fd7d1 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestLatLonDocValuesField.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestLatLonDocValuesField.java @@ -16,7 +16,7 @@ */ package org.apache.lucene.document; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** Simple tests for LatLonDocValuesField */ public class TestLatLonDocValuesField extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/document/TestLatLonPoint.java b/lucene/core/src/test/org/apache/lucene/document/TestLatLonPoint.java index 3137e6ea4c9..823046b1333 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestLatLonPoint.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestLatLonPoint.java @@ -16,7 +16,7 @@ */ package org.apache.lucene.document; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** Simple tests for {@link LatLonPoint} TODO: move this lone test and remove class? */ public class TestLatLonPoint extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/document/TestLatLonPointDistanceFeatureQuery.java b/lucene/core/src/test/org/apache/lucene/document/TestLatLonPointDistanceFeatureQuery.java index f5bfb9ead30..e626846c2d9 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestLatLonPointDistanceFeatureQuery.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestLatLonPointDistanceFeatureQuery.java @@ -35,7 +35,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.TopScoreDocCollector; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.SloppyMath; public class TestLatLonPointDistanceFeatureQuery extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/document/TestLatLonPointDistanceSort.java b/lucene/core/src/test/org/apache/lucene/document/TestLatLonPointDistanceSort.java index 24b9a3b93ab..1bc33e64771 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestLatLonPointDistanceSort.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestLatLonPointDistanceSort.java @@ -35,9 +35,9 @@ import org.apache.lucene.search.SortField; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.SloppyMath; -import org.apache.lucene.util.TestUtil; /** Simple tests for {@link LatLonDocValuesField#newDistanceSort} */ public class TestLatLonPointDistanceSort extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/document/TestLatLonShape.java b/lucene/core/src/test/org/apache/lucene/document/TestLatLonShape.java index 431d4a2ff5e..d867084be73 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestLatLonShape.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestLatLonShape.java @@ -44,9 +44,9 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.junit.Ignore; /** Test case for indexing polygons and querying by bounding box */ diff --git a/lucene/core/src/test/org/apache/lucene/document/TestLongDistanceFeatureQuery.java b/lucene/core/src/test/org/apache/lucene/document/TestLongDistanceFeatureQuery.java index 2e6db55f028..e26d4c2b786 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestLongDistanceFeatureQuery.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestLongDistanceFeatureQuery.java @@ -30,7 +30,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.TopScoreDocCollector; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestLongDistanceFeatureQuery extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/document/TestLongRange.java b/lucene/core/src/test/org/apache/lucene/document/TestLongRange.java index 14ef9f1ddc1..2cd0e9b998d 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestLongRange.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestLongRange.java @@ -16,7 +16,7 @@ */ package org.apache.lucene.document; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestLongRange extends LuceneTestCase { public void testToString() { diff --git a/lucene/core/src/test/org/apache/lucene/document/TestPerFieldConsistency.java b/lucene/core/src/test/org/apache/lucene/document/TestPerFieldConsistency.java index ae124500337..b4c397e65b5 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestPerFieldConsistency.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestPerFieldConsistency.java @@ -34,8 +34,8 @@ import org.apache.lucene.index.NoMergePolicy; import org.apache.lucene.index.VectorSimilarityFunction; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; public class TestPerFieldConsistency extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/document/TestXYMultiPolygonShapeQueries.java b/lucene/core/src/test/org/apache/lucene/document/TestXYMultiPolygonShapeQueries.java index 2c44bcd9667..83158c276a4 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestXYMultiPolygonShapeQueries.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestXYMultiPolygonShapeQueries.java @@ -21,7 +21,7 @@ import org.apache.lucene.document.ShapeField.QueryRelation; import org.apache.lucene.geo.Component2D; import org.apache.lucene.geo.XYPolygon; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** * random cartesian bounding box, line, and polygon query tests for random indexed arrays of diff --git a/lucene/core/src/test/org/apache/lucene/document/TestXYShape.java b/lucene/core/src/test/org/apache/lucene/document/TestXYShape.java index 69521099cf2..7a4f6bbb2f3 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestXYShape.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestXYShape.java @@ -33,9 +33,9 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; /** Test case for indexing cartesian shapes and search by bounding box, lines, and polygons */ public class TestXYShape extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/geo/TestCircle.java b/lucene/core/src/test/org/apache/lucene/geo/TestCircle.java index a835e69d768..16098fca1a8 100644 --- a/lucene/core/src/test/org/apache/lucene/geo/TestCircle.java +++ b/lucene/core/src/test/org/apache/lucene/geo/TestCircle.java @@ -16,7 +16,7 @@ */ package org.apache.lucene.geo; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestCircle extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/geo/TestCircle2D.java b/lucene/core/src/test/org/apache/lucene/geo/TestCircle2D.java index 670632b9bfa..22b39026121 100644 --- a/lucene/core/src/test/org/apache/lucene/geo/TestCircle2D.java +++ b/lucene/core/src/test/org/apache/lucene/geo/TestCircle2D.java @@ -18,7 +18,7 @@ package org.apache.lucene.geo; import org.apache.lucene.index.PointValues; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestCircle2D extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/geo/TestGeoEncodingUtils.java b/lucene/core/src/test/org/apache/lucene/geo/TestGeoEncodingUtils.java index fc170b8333f..d654e446475 100644 --- a/lucene/core/src/test/org/apache/lucene/geo/TestGeoEncodingUtils.java +++ b/lucene/core/src/test/org/apache/lucene/geo/TestGeoEncodingUtils.java @@ -28,9 +28,9 @@ import static org.apache.lucene.geo.GeoUtils.MIN_LON_INCL; import java.util.Random; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.NumericUtils; -import org.apache.lucene.util.TestUtil; /** Tests methods in {@link GeoEncodingUtils} */ public class TestGeoEncodingUtils extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/geo/TestGeoUtils.java b/lucene/core/src/test/org/apache/lucene/geo/TestGeoUtils.java index 27a76a56132..56e9e04a8c0 100644 --- a/lucene/core/src/test/org/apache/lucene/geo/TestGeoUtils.java +++ b/lucene/core/src/test/org/apache/lucene/geo/TestGeoUtils.java @@ -18,7 +18,7 @@ import java.util.Locale; import java.util.Random; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.SloppyMath; /** diff --git a/lucene/core/src/test/org/apache/lucene/geo/TestLine2D.java b/lucene/core/src/test/org/apache/lucene/geo/TestLine2D.java index a64ff0ae28c..570a5216f56 100644 --- a/lucene/core/src/test/org/apache/lucene/geo/TestLine2D.java +++ b/lucene/core/src/test/org/apache/lucene/geo/TestLine2D.java @@ -18,7 +18,7 @@ package org.apache.lucene.geo; import org.apache.lucene.index.PointValues.Relation; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestLine2D extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/geo/TestPoint.java b/lucene/core/src/test/org/apache/lucene/geo/TestPoint.java index ec1861f1271..616af8b090a 100644 --- a/lucene/core/src/test/org/apache/lucene/geo/TestPoint.java +++ b/lucene/core/src/test/org/apache/lucene/geo/TestPoint.java @@ -16,7 +16,7 @@ */ package org.apache.lucene.geo; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestPoint extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/geo/TestPoint2D.java b/lucene/core/src/test/org/apache/lucene/geo/TestPoint2D.java index ef041f6204f..b1030fffcd3 100644 --- a/lucene/core/src/test/org/apache/lucene/geo/TestPoint2D.java +++ b/lucene/core/src/test/org/apache/lucene/geo/TestPoint2D.java @@ -18,7 +18,7 @@ package org.apache.lucene.geo; import org.apache.lucene.index.PointValues.Relation; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestPoint2D extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/geo/TestPolygon.java b/lucene/core/src/test/org/apache/lucene/geo/TestPolygon.java index bdc0eaadb5c..4e6aa00940e 100644 --- a/lucene/core/src/test/org/apache/lucene/geo/TestPolygon.java +++ b/lucene/core/src/test/org/apache/lucene/geo/TestPolygon.java @@ -17,7 +17,7 @@ package org.apache.lucene.geo; import java.text.ParseException; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestPolygon extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/geo/TestPolygon2D.java b/lucene/core/src/test/org/apache/lucene/geo/TestPolygon2D.java index c39e63b3408..9d36d8a6175 100644 --- a/lucene/core/src/test/org/apache/lucene/geo/TestPolygon2D.java +++ b/lucene/core/src/test/org/apache/lucene/geo/TestPolygon2D.java @@ -24,8 +24,8 @@ import com.carrotsearch.randomizedtesting.generators.RandomNumbers; import org.apache.lucene.index.PointValues.Relation; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; /** Test Polygon2D impl */ public class TestPolygon2D extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/geo/TestRectangle2D.java b/lucene/core/src/test/org/apache/lucene/geo/TestRectangle2D.java index 8299f7f0ee5..c5907039892 100644 --- a/lucene/core/src/test/org/apache/lucene/geo/TestRectangle2D.java +++ b/lucene/core/src/test/org/apache/lucene/geo/TestRectangle2D.java @@ -19,7 +19,7 @@ import java.util.Random; import org.apache.lucene.index.PointValues; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestRectangle2D extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/geo/TestSimpleWKTShapeParsing.java b/lucene/core/src/test/org/apache/lucene/geo/TestSimpleWKTShapeParsing.java index 83eef23f771..2e709aefa02 100644 --- a/lucene/core/src/test/org/apache/lucene/geo/TestSimpleWKTShapeParsing.java +++ b/lucene/core/src/test/org/apache/lucene/geo/TestSimpleWKTShapeParsing.java @@ -17,7 +17,7 @@ package org.apache.lucene.geo; import org.apache.lucene.geo.SimpleWKTShapeParser.ShapeType; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** simple WKT parsing tests */ public class TestSimpleWKTShapeParsing extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/geo/TestTessellator.java b/lucene/core/src/test/org/apache/lucene/geo/TestTessellator.java index 2c7686a95d4..b3c0d1cc461 100644 --- a/lucene/core/src/test/org/apache/lucene/geo/TestTessellator.java +++ b/lucene/core/src/test/org/apache/lucene/geo/TestTessellator.java @@ -20,7 +20,7 @@ import java.text.ParseException; import java.util.List; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** Test case for the Polygon {@link Tessellator} class */ public class TestTessellator extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/geo/TestXYCircle.java b/lucene/core/src/test/org/apache/lucene/geo/TestXYCircle.java index 3aee255ea2e..ab61af4ffa0 100644 --- a/lucene/core/src/test/org/apache/lucene/geo/TestXYCircle.java +++ b/lucene/core/src/test/org/apache/lucene/geo/TestXYCircle.java @@ -16,7 +16,7 @@ */ package org.apache.lucene.geo; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestXYCircle extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/geo/TestXYLine.java b/lucene/core/src/test/org/apache/lucene/geo/TestXYLine.java index 700a16c0e09..6eac9e57b04 100644 --- a/lucene/core/src/test/org/apache/lucene/geo/TestXYLine.java +++ b/lucene/core/src/test/org/apache/lucene/geo/TestXYLine.java @@ -17,7 +17,7 @@ package org.apache.lucene.geo; import java.util.Arrays; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestXYLine extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/geo/TestXYPoint.java b/lucene/core/src/test/org/apache/lucene/geo/TestXYPoint.java index 6919ce62579..1f50164fed5 100644 --- a/lucene/core/src/test/org/apache/lucene/geo/TestXYPoint.java +++ b/lucene/core/src/test/org/apache/lucene/geo/TestXYPoint.java @@ -16,7 +16,7 @@ */ package org.apache.lucene.geo; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestXYPoint extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/geo/TestXYPolygon.java b/lucene/core/src/test/org/apache/lucene/geo/TestXYPolygon.java index ecb73040e9f..671a8913d20 100644 --- a/lucene/core/src/test/org/apache/lucene/geo/TestXYPolygon.java +++ b/lucene/core/src/test/org/apache/lucene/geo/TestXYPolygon.java @@ -17,7 +17,7 @@ package org.apache.lucene.geo; import java.util.Arrays; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestXYPolygon extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/geo/TestXYRectangle.java b/lucene/core/src/test/org/apache/lucene/geo/TestXYRectangle.java index bbb475c477b..8f33bdb9a18 100644 --- a/lucene/core/src/test/org/apache/lucene/geo/TestXYRectangle.java +++ b/lucene/core/src/test/org/apache/lucene/geo/TestXYRectangle.java @@ -16,8 +16,8 @@ */ package org.apache.lucene.geo; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestXYRectangle extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/Test2BBinaryDocValues.java b/lucene/core/src/test/org/apache/lucene/index/Test2BBinaryDocValues.java index d6fd95a38a6..b09286a1408 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test2BBinaryDocValues.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test2BBinaryDocValues.java @@ -24,13 +24,13 @@ import org.apache.lucene.store.ByteArrayDataInput; import org.apache.lucene.store.ByteArrayDataOutput; import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.Monster; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressSysoutChecks; +import org.apache.lucene.tests.util.TestUtil; +import org.apache.lucene.tests.util.TimeUnits; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.Monster; -import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; -import org.apache.lucene.util.LuceneTestCase.SuppressSysoutChecks; -import org.apache.lucene.util.TestUtil; -import org.apache.lucene.util.TimeUnits; @SuppressCodecs({"SimpleText", "Direct"}) @TimeoutSuite(millis = 80 * TimeUnits.HOUR) // effectively no limit diff --git a/lucene/core/src/test/org/apache/lucene/index/Test2BDocs.java b/lucene/core/src/test/org/apache/lucene/index/Test2BDocs.java index c2cc19a3cb5..50491e3d7b5 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test2BDocs.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test2BDocs.java @@ -25,13 +25,13 @@ import org.apache.lucene.document.StringField; import org.apache.lucene.store.BaseDirectoryWrapper; import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.Monster; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressSysoutChecks; +import org.apache.lucene.tests.util.TestUtil; +import org.apache.lucene.tests.util.TimeUnits; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.Monster; -import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; -import org.apache.lucene.util.LuceneTestCase.SuppressSysoutChecks; -import org.apache.lucene.util.TestUtil; -import org.apache.lucene.util.TimeUnits; @SuppressCodecs({"SimpleText", "Direct"}) @TimeoutSuite(millis = 80 * TimeUnits.HOUR) // effectively no limit diff --git a/lucene/core/src/test/org/apache/lucene/index/Test2BNumericDocValues.java b/lucene/core/src/test/org/apache/lucene/index/Test2BNumericDocValues.java index 215b966ffed..163a589a2d2 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test2BNumericDocValues.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test2BNumericDocValues.java @@ -22,12 +22,12 @@ import org.apache.lucene.document.NumericDocValuesField; import org.apache.lucene.store.BaseDirectoryWrapper; import org.apache.lucene.store.MockDirectoryWrapper; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.Monster; -import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; -import org.apache.lucene.util.LuceneTestCase.SuppressSysoutChecks; -import org.apache.lucene.util.TestUtil; -import org.apache.lucene.util.TimeUnits; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.Monster; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressSysoutChecks; +import org.apache.lucene.tests.util.TestUtil; +import org.apache.lucene.tests.util.TimeUnits; @SuppressCodecs({"SimpleText", "Direct"}) @TimeoutSuite(millis = 8 * TimeUnits.HOUR) diff --git a/lucene/core/src/test/org/apache/lucene/index/Test2BPoints.java b/lucene/core/src/test/org/apache/lucene/index/Test2BPoints.java index 6ed6e563969..e2334c53b8b 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test2BPoints.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test2BPoints.java @@ -24,10 +24,10 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.Monster; -import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.Monster; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; +import org.apache.lucene.tests.util.TestUtil; // e.g. run like this: ant test -Dtestcase=Test2BPoints -Dtests.nightly=true -Dtests.verbose=true // -Dtests.monster=true diff --git a/lucene/core/src/test/org/apache/lucene/index/Test2BPositions.java b/lucene/core/src/test/org/apache/lucene/index/Test2BPositions.java index 13b426f5f23..054e5866080 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test2BPositions.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test2BPositions.java @@ -26,10 +26,10 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.store.BaseDirectoryWrapper; import org.apache.lucene.store.MockDirectoryWrapper; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.Monster; -import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.Monster; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; +import org.apache.lucene.tests.util.TestUtil; /** * Test indexes ~82M docs with 52 positions each, so you get > Integer.MAX_VALUE positions diff --git a/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java b/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java index f3f800edc30..c6355f710ae 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java @@ -26,9 +26,9 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.store.BaseDirectoryWrapper; import org.apache.lucene.store.MockDirectoryWrapper; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; -import org.apache.lucene.util.TimeUnits; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; +import org.apache.lucene.tests.util.TimeUnits; /** * Test indexes ~82M docs with 26 terms each, so you get > Integer.MAX_VALUE terms/docs pairs diff --git a/lucene/core/src/test/org/apache/lucene/index/Test2BPostingsBytes.java b/lucene/core/src/test/org/apache/lucene/index/Test2BPostingsBytes.java index ff932ad0b8f..d958872f422 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test2BPostingsBytes.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test2BPostingsBytes.java @@ -30,10 +30,10 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.store.BaseDirectoryWrapper; import org.apache.lucene.store.MockDirectoryWrapper; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.Monster; -import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.Monster; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; +import org.apache.lucene.tests.util.TestUtil; /** * Test indexes 2B docs with 65k freqs each, so you get > Integer.MAX_VALUE postings data for the diff --git a/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValuesFixedSorted.java b/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValuesFixedSorted.java index daf662d7bb5..5f24a544520 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValuesFixedSorted.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValuesFixedSorted.java @@ -22,13 +22,13 @@ import org.apache.lucene.document.SortedDocValuesField; import org.apache.lucene.store.BaseDirectoryWrapper; import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.Monster; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressSysoutChecks; +import org.apache.lucene.tests.util.TestUtil; +import org.apache.lucene.tests.util.TimeUnits; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.Monster; -import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; -import org.apache.lucene.util.LuceneTestCase.SuppressSysoutChecks; -import org.apache.lucene.util.TestUtil; -import org.apache.lucene.util.TimeUnits; @SuppressCodecs({"SimpleText", "Direct"}) @TimeoutSuite(millis = 80 * TimeUnits.HOUR) // effectively no limit diff --git a/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValuesOrds.java b/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValuesOrds.java index a314a8bb5a4..98ed31a9c04 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValuesOrds.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValuesOrds.java @@ -22,13 +22,13 @@ import org.apache.lucene.document.SortedDocValuesField; import org.apache.lucene.store.BaseDirectoryWrapper; import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.Monster; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressSysoutChecks; +import org.apache.lucene.tests.util.TestUtil; +import org.apache.lucene.tests.util.TimeUnits; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.Monster; -import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; -import org.apache.lucene.util.LuceneTestCase.SuppressSysoutChecks; -import org.apache.lucene.util.TestUtil; -import org.apache.lucene.util.TimeUnits; @SuppressCodecs({"SimpleText", "Direct"}) @TimeoutSuite(millis = 80 * TimeUnits.HOUR) // effectively no limit diff --git a/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java b/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java index 1a577b0582e..e2567c00f02 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java @@ -34,17 +34,17 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.BaseDirectoryWrapper; import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.Monster; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressSysoutChecks; +import org.apache.lucene.tests.util.TestUtil; +import org.apache.lucene.tests.util.TimeUnits; import org.apache.lucene.util.Attribute; import org.apache.lucene.util.AttributeFactory; import org.apache.lucene.util.AttributeImpl; import org.apache.lucene.util.AttributeReflector; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.Monster; -import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; -import org.apache.lucene.util.LuceneTestCase.SuppressSysoutChecks; -import org.apache.lucene.util.TestUtil; -import org.apache.lucene.util.TimeUnits; // NOTE: SimpleText codec will consume very large amounts of // disk (but, should run successfully). Best to run w/ diff --git a/lucene/core/src/test/org/apache/lucene/index/Test4GBStoredFields.java b/lucene/core/src/test/org/apache/lucene/index/Test4GBStoredFields.java index 6d0dea843e2..7e870fc41b5 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test4GBStoredFields.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test4GBStoredFields.java @@ -25,10 +25,10 @@ import org.apache.lucene.document.FieldType; import org.apache.lucene.store.MMapDirectory; import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; +import org.apache.lucene.tests.util.TimeUnits; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; -import org.apache.lucene.util.TimeUnits; /** This test creates an index with one segment that is a little larger than 4GB. */ @SuppressCodecs({"SimpleText", "Compressing"}) diff --git a/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java b/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java index 86f45b9603b..4f44457949f 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java @@ -45,9 +45,9 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.LockObtainFailedException; import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestAddIndexes extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesCheckIndexHeader.java b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesCheckIndexHeader.java index 1ee2961c573..15d30d23e9f 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesCheckIndexHeader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesCheckIndexHeader.java @@ -28,10 +28,10 @@ import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; import org.apache.lucene.store.MockDirectoryWrapper; -import org.apache.lucene.util.LineFileDocs; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.SuppressFileSystems; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LineFileDocs; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressFileSystems; +import org.apache.lucene.tests.util.TestUtil; /** Test that a plain default detects broken index headers early (on opening a reader). */ @SuppressFileSystems("ExtrasFS") diff --git a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesDetectBitFlips.java b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesDetectBitFlips.java index ecd0657ff94..589a1bfde0d 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesDetectBitFlips.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesDetectBitFlips.java @@ -26,11 +26,11 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; -import org.apache.lucene.util.LineFileDocs; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.AwaitsFix; -import org.apache.lucene.util.LuceneTestCase.SuppressFileSystems; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LineFileDocs; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.AwaitsFix; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressFileSystems; +import org.apache.lucene.tests.util.TestUtil; /** Test that the default codec detects bit flips at open or checkIntegrity time. */ @SuppressFileSystems("ExtrasFS") diff --git a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesDetectTruncation.java b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesDetectTruncation.java index 8c94f87f3b4..40a50311fd6 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesDetectTruncation.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesDetectTruncation.java @@ -26,11 +26,11 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; -import org.apache.lucene.util.LineFileDocs; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.AwaitsFix; -import org.apache.lucene.util.LuceneTestCase.SuppressFileSystems; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LineFileDocs; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.AwaitsFix; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressFileSystems; +import org.apache.lucene.tests.util.TestUtil; /** Test that a plain default detects index file truncation early (on opening a reader). */ @SuppressFileSystems("ExtrasFS") diff --git a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveChecksumFooter.java b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveChecksumFooter.java index 8dceeb038ad..a4cebe3b391 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveChecksumFooter.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveChecksumFooter.java @@ -21,9 +21,9 @@ import org.apache.lucene.codecs.CodecUtil; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IndexInput; -import org.apache.lucene.util.LineFileDocs; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LineFileDocs; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; /** Test that a plain default puts CRC32 footers in all files. */ public class TestAllFilesHaveChecksumFooter extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveCodecHeader.java b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveCodecHeader.java index 1a1f0b3c679..cbe2c418532 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveCodecHeader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveCodecHeader.java @@ -23,9 +23,9 @@ import org.apache.lucene.codecs.CodecUtil; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IndexInput; -import org.apache.lucene.util.LineFileDocs; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LineFileDocs; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; /** Test that a plain default puts codec headers in all files */ public class TestAllFilesHaveCodecHeader extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestApproximatePriorityQueue.java b/lucene/core/src/test/org/apache/lucene/index/TestApproximatePriorityQueue.java index ee764bc7ae3..fa6052d16e9 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestApproximatePriorityQueue.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestApproximatePriorityQueue.java @@ -16,7 +16,7 @@ */ package org.apache.lucene.index; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestApproximatePriorityQueue extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestAtomicUpdate.java b/lucene/core/src/test/org/apache/lucene/index/TestAtomicUpdate.java index f4e3a9313aa..831d49fdbf4 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestAtomicUpdate.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestAtomicUpdate.java @@ -27,8 +27,8 @@ import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; import org.apache.lucene.store.MockDirectoryWrapper; -import org.apache.lucene.util.English; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.English; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestAtomicUpdate extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestBagOfPositions.java b/lucene/core/src/test/org/apache/lucene/index/TestBagOfPositions.java index bf346901116..f94db022698 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestBagOfPositions.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestBagOfPositions.java @@ -28,10 +28,10 @@ import org.apache.lucene.document.FieldType; import org.apache.lucene.document.TextField; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; -import org.apache.lucene.util.TestUtil; /** * Simple test that adds numeric terms, where each term has the totalTermFreq of its integer value, diff --git a/lucene/core/src/test/org/apache/lucene/index/TestBagOfPostings.java b/lucene/core/src/test/org/apache/lucene/index/TestBagOfPostings.java index e096cb503a2..279c28305e4 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestBagOfPostings.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestBagOfPostings.java @@ -27,10 +27,10 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; -import org.apache.lucene.util.TestUtil; /** * Simple test that adds numeric terms, where each term has the docFreq of its integer value, and diff --git a/lucene/core/src/test/org/apache/lucene/index/TestBinaryDocValuesUpdates.java b/lucene/core/src/test/org/apache/lucene/index/TestBinaryDocValuesUpdates.java index 312f25b2291..e7eef5537e9 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestBinaryDocValuesUpdates.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestBinaryDocValuesUpdates.java @@ -44,11 +44,11 @@ import org.apache.lucene.search.SortField; import org.apache.lucene.store.Directory; import org.apache.lucene.store.NRTCachingDirectory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestBinaryDocValuesUpdates extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestBinaryTerms.java b/lucene/core/src/test/org/apache/lucene/index/TestBinaryTerms.java index e9209c022b9..b4c3a7d7543 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestBinaryTerms.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestBinaryTerms.java @@ -24,8 +24,8 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; /** Test indexing and searching some byte[] terms */ public class TestBinaryTerms extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestBufferedUpdates.java b/lucene/core/src/test/org/apache/lucene/index/TestBufferedUpdates.java index f657f888fb9..8fb59602981 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestBufferedUpdates.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestBufferedUpdates.java @@ -17,7 +17,7 @@ package org.apache.lucene.index; import org.apache.lucene.search.TermQuery; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** Unit test for {@link BufferedUpdates} */ public class TestBufferedUpdates extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestByteSliceReader.java b/lucene/core/src/test/org/apache/lucene/index/TestByteSliceReader.java index b0bc2f9d54b..a49fb5afd5c 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestByteSliceReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestByteSliceReader.java @@ -17,9 +17,9 @@ package org.apache.lucene.index; import java.util.Random; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.ByteBlockPool; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestCheckIndex.java b/lucene/core/src/test/org/apache/lucene/index/TestCheckIndex.java index c9ffbabe019..3ac36ba40c8 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestCheckIndex.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestCheckIndex.java @@ -25,10 +25,10 @@ import org.apache.lucene.search.Sort; import org.apache.lucene.search.SortField; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.NumericUtils; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.VectorUtil; import org.junit.Test; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestCodecHoldsOpenFiles.java b/lucene/core/src/test/org/apache/lucene/index/TestCodecHoldsOpenFiles.java index 229ceada8c2..261601abe15 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestCodecHoldsOpenFiles.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestCodecHoldsOpenFiles.java @@ -21,8 +21,8 @@ import org.apache.lucene.document.NumericDocValuesField; import org.apache.lucene.document.TextField; import org.apache.lucene.store.BaseDirectoryWrapper; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestCodecHoldsOpenFiles extends LuceneTestCase { public void test() throws Exception { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java b/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java index 0e467673b1c..a77a2d79ed0 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java @@ -33,12 +33,12 @@ import org.apache.lucene.document.StringField; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.InfoStream; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.StringHelper; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.Version; import org.junit.BeforeClass; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java b/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java index 6ec2946bff6..90e7b814106 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java @@ -39,9 +39,9 @@ import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.Directory; import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.InfoStream; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestConcurrentMergeScheduler extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java b/lucene/core/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java index 8d52ed76b86..7748e0111ab 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java @@ -24,8 +24,8 @@ import org.apache.lucene.document.StoredField; import org.apache.lucene.document.TextField; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.FailOnNonBulkMergesInfoStream; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.FailOnNonBulkMergesInfoStream; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; public class TestConsistentFieldNumbers extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestCrash.java b/lucene/core/src/test/org/apache/lucene/index/TestCrash.java index be3b600e3d8..080785de427 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestCrash.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestCrash.java @@ -24,7 +24,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.MockDirectoryWrapper; import org.apache.lucene.store.NoLockFactory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestCrash extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java b/lucene/core/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java index 72777918a64..17d4049263c 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java @@ -29,7 +29,7 @@ import org.apache.lucene.store.FilterDirectory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexOutput; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestCrashCausesCorruptIndex extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestCustomNorms.java b/lucene/core/src/test/org/apache/lucene/index/TestCustomNorms.java index abd091a6eff..9bf9bef958a 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestCustomNorms.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestCustomNorms.java @@ -29,9 +29,9 @@ import org.apache.lucene.search.similarities.PerFieldSimilarityWrapper; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LineFileDocs; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LineFileDocs; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; /** */ public class TestCustomNorms extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestCustomTermFreq.java b/lucene/core/src/test/org/apache/lucene/index/TestCustomTermFreq.java index a3429a0a138..bb46fbdc47a 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestCustomTermFreq.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestCustomTermFreq.java @@ -31,8 +31,8 @@ import org.apache.lucene.search.TermStatistics; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; public class TestCustomTermFreq extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDeletionPolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestDeletionPolicy.java index fb434dcd101..04ad8284d30 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDeletionPolicy.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDeletionPolicy.java @@ -32,8 +32,8 @@ import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Version; /* diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDemoParallelLeafReader.java b/lucene/core/src/test/org/apache/lucene/index/TestDemoParallelLeafReader.java index 2e1f2ebad07..56a8f964064 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDemoParallelLeafReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDemoParallelLeafReader.java @@ -48,11 +48,11 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.MockDirectoryWrapper; import org.apache.lucene.store.MockDirectoryWrapper.Throttling; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.StringHelper; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.Version; // TODO: diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java b/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java index 365c008d543..097d04ad6a1 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java @@ -41,11 +41,11 @@ import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.BaseDirectoryWrapper; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.Version; import org.junit.Assume; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReaderReopen.java b/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReaderReopen.java index 76cf47e221e..7105afea0ae 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReaderReopen.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReaderReopen.java @@ -41,9 +41,9 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.MockDirectoryWrapper; import org.apache.lucene.store.MockDirectoryWrapper.FakeIOException; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestDirectoryReaderReopen extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDoc.java b/lucene/core/src/test/org/apache/lucene/index/TestDoc.java index ae635a3b584..475631ded15 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDoc.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDoc.java @@ -42,9 +42,9 @@ import org.apache.lucene.store.MergeInfo; import org.apache.lucene.store.MockDirectoryWrapper; import org.apache.lucene.store.TrackingDirectoryWrapper; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.Bits; import org.apache.lucene.util.InfoStream; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.StringHelper; import org.apache.lucene.util.Version; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDocCount.java b/lucene/core/src/test/org/apache/lucene/index/TestDocCount.java index 40880f3b204..968d7d49c0e 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDocCount.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDocCount.java @@ -21,9 +21,9 @@ import org.apache.lucene.document.Field; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.FixedBitSet; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; /** Tests the Terms.docCount statistic */ public class TestDocCount extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDocIDMerger.java b/lucene/core/src/test/org/apache/lucene/index/TestDocIDMerger.java index 71825cd3f9d..76e1df7194c 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDocIDMerger.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDocIDMerger.java @@ -20,9 +20,9 @@ import java.util.ArrayList; import java.util.List; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.FixedBitSet; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestDocIDMerger extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDocInverterPerFieldErrorInfo.java b/lucene/core/src/test/org/apache/lucene/index/TestDocInverterPerFieldErrorInfo.java index 87a005d1c92..846d6e09271 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDocInverterPerFieldErrorInfo.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDocInverterPerFieldErrorInfo.java @@ -27,8 +27,8 @@ import org.apache.lucene.document.FieldType; import org.apache.lucene.document.TextField; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.PrintStreamInfoStream; import org.junit.Test; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDocValues.java b/lucene/core/src/test/org/apache/lucene/index/TestDocValues.java index 5ad74eee2bb..6ac48e807ab 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDocValues.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDocValues.java @@ -26,9 +26,9 @@ import org.apache.lucene.document.SortedSetDocValuesField; import org.apache.lucene.document.StringField; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; /** Tests helper methods in DocValues */ public class TestDocValues extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDocValuesFieldUpdates.java b/lucene/core/src/test/org/apache/lucene/index/TestDocValuesFieldUpdates.java index 98b81ccee9d..133f6ed61bf 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDocValuesFieldUpdates.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDocValuesFieldUpdates.java @@ -22,7 +22,7 @@ import java.util.List; import org.apache.lucene.index.NumericDocValuesFieldUpdates.SingleValueNumericDocValuesFieldUpdates; import org.apache.lucene.search.DocIdSetIterator; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestDocValuesFieldUpdates extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java b/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java index 1771faca801..3a9984c5938 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java @@ -33,9 +33,9 @@ import org.apache.lucene.document.StringField; import org.apache.lucene.document.TextField; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; /** Tests DocValues integration into IndexWriter */ public class TestDocValuesIndexing extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java b/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java index 05de14dbe5f..e48ef664e0b 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java @@ -26,9 +26,9 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestDocsAndPositions extends LuceneTestCase { private String fieldName; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDocsWithFieldSet.java b/lucene/core/src/test/org/apache/lucene/index/TestDocsWithFieldSet.java index 650856a4200..52ec0d7ee99 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDocsWithFieldSet.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDocsWithFieldSet.java @@ -18,8 +18,8 @@ import java.io.IOException; import org.apache.lucene.search.DocIdSetIterator; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestDocsWithFieldSet extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java b/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java index d2051cae84f..8b11496f857 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java @@ -43,10 +43,10 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.AttributeSource; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.Version; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterDeleteQueue.java b/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterDeleteQueue.java index c0b68e45c36..4f28102bd68 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterDeleteQueue.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterDeleteQueue.java @@ -27,8 +27,8 @@ import org.apache.lucene.search.MatchNoDocsQuery; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.AlreadyClosedException; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRefBuilder; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.ThreadInterruptedException; /** Unit test for {@link DocumentsWriterDeleteQueue} */ diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterPerThreadPool.java b/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterPerThreadPool.java index 4b3af6f9ba6..4f52c1f5854 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterPerThreadPool.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterPerThreadPool.java @@ -22,7 +22,7 @@ import java.util.concurrent.atomic.AtomicLong; import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.Version; public class TestDocumentsWriterPerThreadPool extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterStallControl.java b/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterStallControl.java index dacaf06fe0c..c6a7b29793e 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterStallControl.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterStallControl.java @@ -22,7 +22,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.ThreadInterruptedException; /** Tests for {@link DocumentsWriterStallControl} */ diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java b/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java index db8abfcd83e..056766e8938 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java @@ -25,12 +25,12 @@ import org.apache.lucene.document.SortedNumericDocValuesField; import org.apache.lucene.document.SortedSetDocValuesField; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LineFileDocs; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.Slow; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LineFileDocs; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.Slow; -import org.apache.lucene.util.TestUtil; /** Compares one codec against another */ @Slow diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecsAtNight.java b/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecsAtNight.java index c8082a85c4b..065605d7ea3 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecsAtNight.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecsAtNight.java @@ -16,8 +16,8 @@ */ package org.apache.lucene.index; -import org.apache.lucene.util.LuceneTestCase.Nightly; -import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; +import org.apache.lucene.tests.util.LuceneTestCase.Nightly; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; /** Just like TestDuelingCodecs, only with a lot more documents. */ @Nightly diff --git a/lucene/core/src/test/org/apache/lucene/index/TestExceedMaxTermLength.java b/lucene/core/src/test/org/apache/lucene/index/TestExceedMaxTermLength.java index 2236803a570..5bc9c2c6b7f 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestExceedMaxTermLength.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestExceedMaxTermLength.java @@ -22,8 +22,8 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.junit.After; import org.junit.Before; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestExitableDirectoryReader.java b/lucene/core/src/test/org/apache/lucene/index/TestExitableDirectoryReader.java index 195d65edb43..5595c3ded98 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestExitableDirectoryReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestExitableDirectoryReader.java @@ -26,8 +26,8 @@ import org.apache.lucene.search.PrefixQuery; import org.apache.lucene.search.Query; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; /** * Test that uses a default/lucene Implementation of {@link QueryTimeout} to exit out long running diff --git a/lucene/core/src/test/org/apache/lucene/index/TestFieldInfos.java b/lucene/core/src/test/org/apache/lucene/index/TestFieldInfos.java index 48b4e81d9c2..7c8e3323ad5 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestFieldInfos.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestFieldInfos.java @@ -28,7 +28,7 @@ import org.apache.lucene.document.FieldType; import org.apache.lucene.document.StringField; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestFieldInfos extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestFieldInvertState.java b/lucene/core/src/test/org/apache/lucene/index/TestFieldInvertState.java index e63837acdad..f3e74eac06a 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestFieldInvertState.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestFieldInvertState.java @@ -29,9 +29,9 @@ import org.apache.lucene.search.TermStatistics; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestFieldInvertState extends LuceneTestCase { /** Similarity holds onto the FieldInvertState for subsequent verification. */ diff --git a/lucene/core/src/test/org/apache/lucene/index/TestFieldUpdatesBuffer.java b/lucene/core/src/test/org/apache/lucene/index/TestFieldUpdatesBuffer.java index 181b412aa3f..f8b817d3ef4 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestFieldUpdatesBuffer.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestFieldUpdatesBuffer.java @@ -25,10 +25,10 @@ import java.util.List; import java.util.SortedMap; import java.util.TreeMap; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.Counter; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestFieldUpdatesBuffer extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestFieldsReader.java b/lucene/core/src/test/org/apache/lucene/index/TestFieldsReader.java index f278a609ffd..f19390f4e0b 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestFieldsReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestFieldsReader.java @@ -31,7 +31,7 @@ import org.apache.lucene.store.FilterDirectory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestFilterCodecReader.java b/lucene/core/src/test/org/apache/lucene/index/TestFilterCodecReader.java index 5e0563c1024..1c61139257a 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestFilterCodecReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestFilterCodecReader.java @@ -21,7 +21,7 @@ import java.lang.reflect.Modifier; import org.apache.lucene.document.Document; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestFilterCodecReader extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestFilterDirectoryReader.java b/lucene/core/src/test/org/apache/lucene/index/TestFilterDirectoryReader.java index cc6a1f67a66..620e5d3ff9b 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestFilterDirectoryReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestFilterDirectoryReader.java @@ -24,8 +24,8 @@ import org.apache.lucene.document.Document; import org.apache.lucene.index.FilterDirectoryReader.SubReaderWrapper; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; public class TestFilterDirectoryReader extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestFilterLeafReader.java b/lucene/core/src/test/org/apache/lucene/index/TestFilterLeafReader.java index 33333dd5550..44676d34b1e 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestFilterLeafReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestFilterLeafReader.java @@ -25,9 +25,9 @@ import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.BaseDirectoryWrapper; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.FixedBitSet; -import org.apache.lucene.util.LuceneTestCase; public class TestFilterLeafReader extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestFilterMergePolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestFilterMergePolicy.java index 5646e8ce94d..82dc43f174e 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestFilterMergePolicy.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestFilterMergePolicy.java @@ -18,7 +18,7 @@ import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestFilterMergePolicy extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestFlex.java b/lucene/core/src/test/org/apache/lucene/index/TestFlex.java index 406751845c2..f4ee4842ce7 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestFlex.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestFlex.java @@ -20,9 +20,9 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestFlex extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java index 3453895949b..520d673745f 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java @@ -24,9 +24,9 @@ import org.apache.lucene.document.Document; import org.apache.lucene.store.Directory; import org.apache.lucene.store.MockDirectoryWrapper; -import org.apache.lucene.util.LineFileDocs; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LineFileDocs; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestForTooMuchCloning.java b/lucene/core/src/test/org/apache/lucene/index/TestForTooMuchCloning.java index 1c275135fac..02a71039da8 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestForTooMuchCloning.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestForTooMuchCloning.java @@ -24,9 +24,9 @@ import org.apache.lucene.search.TermRangeQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestForTooMuchCloning extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestForceMergeForever.java b/lucene/core/src/test/org/apache/lucene/index/TestForceMergeForever.java index 105c6532f37..9a7933f593b 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestForceMergeForever.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestForceMergeForever.java @@ -21,9 +21,9 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LineFileDocs; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LineFileDocs; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestForceMergeForever extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestFrozenBufferedUpdates.java b/lucene/core/src/test/org/apache/lucene/index/TestFrozenBufferedUpdates.java index 6fab043da82..178ddd37b9d 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestFrozenBufferedUpdates.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestFrozenBufferedUpdates.java @@ -30,13 +30,13 @@ import org.apache.lucene.index.FrozenBufferedUpdates.TermDocsIterator; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefArray; import org.apache.lucene.util.BytesRefIterator; import org.apache.lucene.util.Counter; import org.apache.lucene.util.FixedBitSet; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestFrozenBufferedUpdates extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexCommit.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexCommit.java index dce8b81aafa..6ca5c161d5f 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexCommit.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexCommit.java @@ -19,7 +19,7 @@ import java.util.Collection; import java.util.Map; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; public class TestIndexCommit extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java index 7c2cbb93282..aa125db0dc0 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java @@ -31,9 +31,9 @@ import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.InfoStream; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; /* Verify we can read the pre-2.1 file format, do searches diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexInput.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexInput.java index 67031a0625d..3d52aa36fee 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexInput.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexInput.java @@ -24,8 +24,8 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexManyDocuments.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexManyDocuments.java index 423a3174a6c..75cf7154c94 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexManyDocuments.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexManyDocuments.java @@ -22,9 +22,9 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestIndexManyDocuments extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexOptions.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexOptions.java index 8342089d10f..3dae50ba62f 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexOptions.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexOptions.java @@ -22,8 +22,8 @@ import org.apache.lucene.document.FieldType; import org.apache.lucene.document.TextField; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; public class TestIndexOptions extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexReaderClose.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexReaderClose.java index 736d12b50ac..2ef757b1ec3 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexReaderClose.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexReaderClose.java @@ -24,8 +24,8 @@ import org.apache.lucene.document.Document; import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; /** */ public class TestIndexReaderClose extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java index 52c4db3a576..df118f78a9d 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java @@ -79,12 +79,12 @@ import org.apache.lucene.search.TopFieldCollector; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; import org.apache.lucene.util.FixedBitSet; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.NumericUtils; -import org.apache.lucene.util.TestUtil; public class TestIndexSorting extends LuceneTestCase { static class AssertingNeedsIndexSortCodec extends FilterCodec { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexTooManyDocs.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexTooManyDocs.java index 91d6a918d4b..189f7507676 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexTooManyDocs.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexTooManyDocs.java @@ -25,8 +25,8 @@ import org.apache.lucene.document.StringField; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; public class TestIndexTooManyDocs extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java index 49b537999c1..951ccdfd1ad 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java @@ -102,16 +102,16 @@ import org.apache.lucene.store.NIOFSDirectory; import org.apache.lucene.store.NoLockFactory; import org.apache.lucene.store.SimpleFSLockFactory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.Constants; import org.apache.lucene.util.IOSupplier; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.InfoStream; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.SetOnce; import org.apache.lucene.util.StringHelper; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.ThreadInterruptedException; import org.apache.lucene.util.Version; import org.apache.lucene.util.automaton.Automata; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java index c18d5fc905a..47ae874063c 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java @@ -30,8 +30,8 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.store.MockDirectoryWrapper; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestIndexWriterCommit extends LuceneTestCase { /* diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java index a1f78d0c7cf..7a2a6f9b89d 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java @@ -29,8 +29,8 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.InfoStream; -import org.apache.lucene.util.LuceneTestCase; import org.junit.Test; public class TestIndexWriterConfig extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java index fdf2ed700db..5d909585afd 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java @@ -43,10 +43,10 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; -import org.apache.lucene.util.TestUtil; import org.junit.Ignore; @SuppressCodecs("SimpleText") // too slow here diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java index fc2aca1fae5..006e706e007 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java @@ -60,13 +60,13 @@ import org.apache.lucene.store.IndexOutput; import org.apache.lucene.store.MockDirectoryWrapper; import org.apache.lucene.store.MockDirectoryWrapper.FakeIOException; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOSupplier; import org.apache.lucene.util.InfoStream; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; -import org.apache.lucene.util.TestUtil; @SuppressCodecs("SimpleText") // too slow here public class TestIndexWriterExceptions extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions2.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions2.java index 1134ac69297..5880ebdef0d 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions2.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions2.java @@ -42,12 +42,12 @@ import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.Directory; import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; +import org.apache.lucene.tests.util.Rethrow; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; -import org.apache.lucene.util.Rethrow; -import org.apache.lucene.util.TestUtil; /** * Causes a bunch of non-aborting and aborting exceptions and checks that no index corruption is diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java index 6851fa3b056..eedaa2dd3ab 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java @@ -27,8 +27,8 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.MockDirectoryWrapper; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestIndexWriterForceMerge extends LuceneTestCase { public void testPartialMerge() throws IOException { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterFromReader.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterFromReader.java index dea2358f809..aa841e05380 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterFromReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterFromReader.java @@ -23,8 +23,8 @@ import org.apache.lucene.document.Field; import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; public class TestIndexWriterFromReader extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterLockRelease.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterLockRelease.java index 0a2ad9f1dcf..3028b39d141 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterLockRelease.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterLockRelease.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** * This tests the patch for issue #LUCENE-715 (IndexWriter does not release its write lock when diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMaxDocs.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMaxDocs.java index e4a54634944..51baac59deb 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMaxDocs.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMaxDocs.java @@ -33,10 +33,10 @@ import org.apache.lucene.store.FilterDirectory; import org.apache.lucene.store.MockDirectoryWrapper; import org.apache.lucene.store.NoLockFactory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; -import org.apache.lucene.util.TestUtil; -import org.apache.lucene.util.TimeUnits; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; +import org.apache.lucene.tests.util.TestUtil; +import org.apache.lucene.tests.util.TimeUnits; @SuppressCodecs({"SimpleText", "Direct"}) @TimeoutSuite(millis = 8 * TimeUnits.HOUR) diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java index d5431fa8f03..5352c012dd2 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java @@ -33,7 +33,7 @@ import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; @HandleLimitFS.MaxOpenHandles(limit = HandleLimitFS.MaxOpenHandles.MAX_OPEN_FILES * 2) // Some of these tests are too intense for SimpleText diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java index a0237f03eb8..057b400a1b5 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java @@ -27,7 +27,7 @@ import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestIndexWriterMerging extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterNRTIsCurrent.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterNRTIsCurrent.java index 77ae60081f5..fd15c7d5af6 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterNRTIsCurrent.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterNRTIsCurrent.java @@ -24,9 +24,9 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.TextField; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestIndexWriterNRTIsCurrent extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java index d54f08fdcef..4e906f9666f 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java @@ -33,9 +33,9 @@ import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOSupplier; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; /** Tests for IndexWriter when the disk runs out of space */ public class TestIndexWriterOnDiskFull extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnJRECrash.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnJRECrash.java index dd695bfe0e6..0ec5066102d 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnJRECrash.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnJRECrash.java @@ -33,9 +33,9 @@ import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; import org.apache.lucene.store.BaseDirectoryWrapper; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Constants; import org.apache.lucene.util.SuppressForbidden; -import org.apache.lucene.util.TestUtil; /** * Runs TestNRTThreads in a separate process, crashes the JRE in the middle of execution, then runs diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnVMError.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnVMError.java index 36f8c11233f..d591cc37a0b 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnVMError.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnVMError.java @@ -39,12 +39,12 @@ import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.MockDirectoryWrapper; import org.apache.lucene.store.MockDirectoryWrapper.Failure; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; +import org.apache.lucene.tests.util.Rethrow; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; -import org.apache.lucene.util.Rethrow; -import org.apache.lucene.util.TestUtil; /** * Causes a bunch of fake VM errors and checks that no other exceptions are delivered instead, no diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOutOfFileDescriptors.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOutOfFileDescriptors.java index 7a2989953e9..712ca31843f 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOutOfFileDescriptors.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOutOfFileDescriptors.java @@ -23,10 +23,10 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.MockDirectoryWrapper; -import org.apache.lucene.util.LineFileDocs; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LineFileDocs; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.PrintStreamInfoStream; -import org.apache.lucene.util.TestUtil; public class TestIndexWriterOutOfFileDescriptors extends LuceneTestCase { public void test() throws Exception { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java index fd844106a06..2ff53c67d7a 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java @@ -42,12 +42,12 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.MockDirectoryWrapper; import org.apache.lucene.store.MockDirectoryWrapper.FakeIOException; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.InfoStream; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.ThreadInterruptedException; import org.apache.lucene.util.Version; import org.junit.Test; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterThreadsToSegments.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterThreadsToSegments.java index 81485d4547f..0f80ea71630 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterThreadsToSegments.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterThreadsToSegments.java @@ -33,10 +33,10 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.StringHelper; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.Version; @LuceneTestCase.SuppressCodecs({"SimpleText", "Direct"}) diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java index 5ad00086e6a..33b79818f2f 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java @@ -27,10 +27,10 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.CharsRefBuilder; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.UnicodeUtil; public class TestIndexWriterUnicode extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java index 44f35b2ecad..f0b544c23d1 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java @@ -37,12 +37,12 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.LockObtainFailedException; import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.util.LineFileDocs; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.Slow; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LineFileDocs; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.Slow; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.ThreadInterruptedException; /** MultiThreaded IndexWriter tests */ diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java index ed4a9f74047..0a86992e37b 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java @@ -34,9 +34,9 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestIndexableField extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexingSequenceNumbers.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexingSequenceNumbers.java index 2d20940c934..6b3fdd1bb92 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexingSequenceNumbers.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexingSequenceNumbers.java @@ -33,9 +33,9 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestIndexingSequenceNumbers extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestInfoStream.java b/lucene/core/src/test/org/apache/lucene/index/TestInfoStream.java index 5eabedf939c..80681ee126b 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestInfoStream.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestInfoStream.java @@ -20,8 +20,8 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.apache.lucene.document.Document; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.InfoStream; -import org.apache.lucene.util.LuceneTestCase; /** Tests indexwriter's infostream */ public class TestInfoStream extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIntBlockPool.java b/lucene/core/src/test/org/apache/lucene/index/TestIntBlockPool.java index 093d31c880b..7be4ac25fd1 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIntBlockPool.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIntBlockPool.java @@ -18,9 +18,9 @@ import java.util.ArrayList; import java.util.List; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.Counter; import org.apache.lucene.util.IntBlockPool; -import org.apache.lucene.util.LuceneTestCase; /** tests basic {@link IntBlockPool} functionality */ public class TestIntBlockPool extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIsCurrent.java b/lucene/core/src/test/org/apache/lucene/index/TestIsCurrent.java index 964ffe8eae3..739259849f3 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIsCurrent.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIsCurrent.java @@ -20,7 +20,7 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.store.*; -import org.apache.lucene.util.*; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; public class TestIsCurrent extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestKnnGraph.java b/lucene/core/src/test/org/apache/lucene/index/TestKnnGraph.java index b035a2ff272..46b6b6d920b 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestKnnGraph.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestKnnGraph.java @@ -41,10 +41,10 @@ import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.Bits; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.VectorUtil; import org.apache.lucene.util.hnsw.HnswGraphBuilder; import org.junit.After; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestLazyProxSkipping.java b/lucene/core/src/test/org/apache/lucene/index/TestLazyProxSkipping.java index 9507be67f1b..3ae550e9e1d 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestLazyProxSkipping.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestLazyProxSkipping.java @@ -28,9 +28,9 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; /** Tests lazy skipping on the proximity file. */ public class TestLazyProxSkipping extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestLongPostings.java b/lucene/core/src/test/org/apache/lucene/index/TestLongPostings.java index 0dabd15e059..d860501342e 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestLongPostings.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestLongPostings.java @@ -27,11 +27,11 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.FixedBitSet; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; -import org.apache.lucene.util.TestUtil; @SuppressCodecs({"SimpleText", "Direct"}) public class TestLongPostings extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestManyFields.java b/lucene/core/src/test/org/apache/lucene/index/TestManyFields.java index c2237bd363d..b3e68a8c372 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestManyFields.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestManyFields.java @@ -25,7 +25,7 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** Test that creates way, way, way too many fields */ @LuceneTestCase.SuppressCodecs("SimpleText") diff --git a/lucene/core/src/test/org/apache/lucene/index/TestMaxPosition.java b/lucene/core/src/test/org/apache/lucene/index/TestMaxPosition.java index ab04fbeb0b8..d60dbe73d5a 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestMaxPosition.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestMaxPosition.java @@ -21,8 +21,8 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.TextField; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; // LUCENE-6382 public class TestMaxPosition extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java b/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java index 9a81c14f9c2..91b1428da59 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java @@ -28,8 +28,8 @@ import org.apache.lucene.search.TermStatistics; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; /** Tests the maxTermFrequency statistic in FieldInvertState */ public class TestMaxTermFrequency extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestMergePolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestMergePolicy.java index 32b5057605a..4f455fdd5db 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestMergePolicy.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestMergePolicy.java @@ -26,9 +26,9 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.StringHelper; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.Version; public class TestMergePolicy extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestMergeRateLimiter.java b/lucene/core/src/test/org/apache/lucene/index/TestMergeRateLimiter.java index 5b6da6a1da2..6ab3b61539f 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestMergeRateLimiter.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestMergeRateLimiter.java @@ -18,7 +18,7 @@ import org.apache.lucene.document.Document; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestMergeRateLimiter extends LuceneTestCase { public void testInitDefaults() throws Exception { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestMixedCodecs.java b/lucene/core/src/test/org/apache/lucene/index/TestMixedCodecs.java index 07d667a1109..9c4ede21f7e 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestMixedCodecs.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestMixedCodecs.java @@ -23,8 +23,8 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestMixedCodecs extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestMixedDocValuesUpdates.java b/lucene/core/src/test/org/apache/lucene/index/TestMixedDocValuesUpdates.java index d5e08268480..0b0c80a0f98 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestMixedDocValuesUpdates.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestMixedDocValuesUpdates.java @@ -41,11 +41,11 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestMixedDocValuesUpdates extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestMultiDocValues.java b/lucene/core/src/test/org/apache/lucene/index/TestMultiDocValues.java index 0cbde112e13..0404c958d45 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestMultiDocValues.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestMultiDocValues.java @@ -29,9 +29,9 @@ import org.apache.lucene.document.SortedSetDocValuesField; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; /** Tests MultiDocValues versus ordinary segment merging */ public class TestMultiDocValues extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java b/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java index c63587f2812..d6229cf9e2d 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java @@ -28,11 +28,11 @@ import org.apache.lucene.document.Field; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOSupplier; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.UnicodeUtil; public class TestMultiFields extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java b/lucene/core/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java index cde8e282bf1..b4153d3f3c5 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java @@ -27,9 +27,9 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.junit.Before; /** diff --git a/lucene/core/src/test/org/apache/lucene/index/TestMultiTermsEnum.java b/lucene/core/src/test/org/apache/lucene/index/TestMultiTermsEnum.java index 534e362e0bf..0335242f468 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestMultiTermsEnum.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestMultiTermsEnum.java @@ -26,9 +26,9 @@ import org.apache.lucene.document.StringField; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; public class TestMultiTermsEnum extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderCleanup.java b/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderCleanup.java index dae36821d5a..d3f01e842bb 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderCleanup.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderCleanup.java @@ -22,9 +22,9 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.TextField; import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressFileSystems; import org.apache.lucene.util.Constants; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.SuppressFileSystems; /** LUCENE-5574 */ @SuppressFileSystems("WindowsFS") // the bug doesn't happen on windows. diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java b/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java index 490576531d5..6dde958c8d1 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java @@ -22,7 +22,7 @@ import org.apache.lucene.document.Document; import org.apache.lucene.store.Directory; import org.apache.lucene.store.MockDirectoryWrapper; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestNRTReaderWithThreads extends LuceneTestCase { AtomicInteger seq = new AtomicInteger(1); diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNRTThreads.java b/lucene/core/src/test/org/apache/lucene/index/TestNRTThreads.java index d54728fdb37..55030d58a5e 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestNRTThreads.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNRTThreads.java @@ -21,7 +21,7 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.store.Directory; import org.apache.lucene.store.MockDirectoryWrapper; -import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; import org.junit.Before; // TODO diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNeverDelete.java b/lucene/core/src/test/org/apache/lucene/index/TestNeverDelete.java index c87195c5470..352f7d1f08c 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestNeverDelete.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNeverDelete.java @@ -23,8 +23,8 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.store.BaseDirectoryWrapper; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; // Make sure if you use NoDeletionPolicy that no file // referenced by a commit point is ever deleted diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNewestSegment.java b/lucene/core/src/test/org/apache/lucene/index/TestNewestSegment.java index b47374c30a0..92d3620984b 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestNewestSegment.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNewestSegment.java @@ -18,7 +18,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestNewestSegment extends LuceneTestCase { public void testNewestSegment() throws Exception { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java index 6621365dd90..4e2978d0fa1 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java @@ -24,7 +24,7 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; public class TestNoDeletionPolicy extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNoMergeScheduler.java b/lucene/core/src/test/org/apache/lucene/index/TestNoMergeScheduler.java index eb96051a915..3b1bf3549c5 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestNoMergeScheduler.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNoMergeScheduler.java @@ -21,7 +21,7 @@ import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.Arrays; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; public class TestNoMergeScheduler extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNorms.java b/lucene/core/src/test/org/apache/lucene/index/TestNorms.java index 29ad25d30f4..0df33c55880 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestNorms.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNorms.java @@ -31,8 +31,8 @@ import org.apache.lucene.search.similarities.PerFieldSimilarityWrapper; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; /** * Test that norms info is preserved during index life - including separate norms, addDocument, diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java b/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java index 332330a36af..4125902d7c4 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java @@ -49,11 +49,11 @@ import org.apache.lucene.search.TopFieldDocs; import org.apache.lucene.store.Directory; import org.apache.lucene.store.NRTCachingDirectory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; @SuppressWarnings("resource") public class TestNumericDocValuesUpdates extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestOmitNorms.java b/lucene/core/src/test/org/apache/lucene/index/TestOmitNorms.java index f0b5583d178..d97e1a145c9 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestOmitNorms.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestOmitNorms.java @@ -23,7 +23,7 @@ import org.apache.lucene.document.FieldType; import org.apache.lucene.document.TextField; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestOmitNorms extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestOmitPositions.java b/lucene/core/src/test/org/apache/lucene/index/TestOmitPositions.java index 7052280eda4..3780dead776 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestOmitPositions.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestOmitPositions.java @@ -24,9 +24,9 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; /** @lucene.experimental */ public class TestOmitPositions extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java b/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java index 2549396fe5b..ad787a0c8d6 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java @@ -36,8 +36,8 @@ import org.apache.lucene.search.TermStatistics; import org.apache.lucene.search.similarities.TFIDFSimilarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; public class TestOmitTf extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestOneMergeWrappingMergePolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestOneMergeWrappingMergePolicy.java index 55b1129903d..94398c51a72 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestOneMergeWrappingMergePolicy.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestOneMergeWrappingMergePolicy.java @@ -23,9 +23,9 @@ import java.util.List; import java.util.Map; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.StringHelper; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.Version; import org.junit.Test; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestOrdinalMap.java b/lucene/core/src/test/org/apache/lucene/index/TestOrdinalMap.java index 61ba3a6980b..8d09ef3b860 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestOrdinalMap.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestOrdinalMap.java @@ -24,11 +24,11 @@ import org.apache.lucene.document.SortedDocValuesField; import org.apache.lucene.document.SortedSetDocValuesField; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.RamUsageTester; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.LongValues; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.RamUsageTester; -import org.apache.lucene.util.TestUtil; public class TestOrdinalMap extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestParallelCompositeReader.java b/lucene/core/src/test/org/apache/lucene/index/TestParallelCompositeReader.java index 2a987d11fd3..c39c359631e 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestParallelCompositeReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestParallelCompositeReader.java @@ -29,7 +29,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestParallelCompositeReader extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestParallelLeafReader.java b/lucene/core/src/test/org/apache/lucene/index/TestParallelLeafReader.java index 8c0e04c1d80..5313e96b555 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestParallelLeafReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestParallelLeafReader.java @@ -26,9 +26,9 @@ import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestParallelLeafReader extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java b/lucene/core/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java index 36d4a8159ad..7b4cd234a23 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java @@ -26,7 +26,7 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** Some tests for {@link ParallelLeafReader}s with empty indexes */ public class TestParallelReaderEmptyIndex extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java b/lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java index 85176575ce7..76ec0a90550 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java @@ -22,9 +22,9 @@ import org.apache.lucene.document.Field; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestParallelTermEnum extends LuceneTestCase { private LeafReader ir1; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java b/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java index 80ff34536d4..32b0876aa02 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java @@ -40,9 +40,9 @@ import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestPayloads extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestPayloadsOnVectors.java b/lucene/core/src/test/org/apache/lucene/index/TestPayloadsOnVectors.java index ae891ef29a3..edac9e5c946 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestPayloadsOnVectors.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestPayloadsOnVectors.java @@ -29,8 +29,8 @@ import org.apache.lucene.document.FieldType; import org.apache.lucene.document.TextField; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; public class TestPayloadsOnVectors extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestPendingDeletes.java b/lucene/core/src/test/org/apache/lucene/index/TestPendingDeletes.java index 852a7bb868f..5cba67078f7 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestPendingDeletes.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestPendingDeletes.java @@ -24,10 +24,10 @@ import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.StringHelper; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.Version; public class TestPendingDeletes extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java b/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java index 963279fa554..31734ef5a4b 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java @@ -24,11 +24,11 @@ import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.Bits; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestPerSegmentDeletes extends LuceneTestCase { public void testDeletes1() throws Exception { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestPointValues.java b/lucene/core/src/test/org/apache/lucene/index/TestPointValues.java index 3af9215be6b..6e7211539f6 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestPointValues.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestPointValues.java @@ -34,9 +34,9 @@ import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; /** Test Indexing/IndexWriter with points */ public class TestPointValues extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java b/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java index f38168762d5..0f58a1c05c9 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java @@ -36,11 +36,11 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.English; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.English; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; // TODO: we really need to test indexingoffsets, but then getting only docs / docs + freqs. // not all codecs store prx separate... diff --git a/lucene/core/src/test/org/apache/lucene/index/TestPrefixCodedTerms.java b/lucene/core/src/test/org/apache/lucene/index/TestPrefixCodedTerms.java index ff545317402..4ac262216a3 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestPrefixCodedTerms.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestPrefixCodedTerms.java @@ -20,8 +20,8 @@ import java.util.Set; import java.util.TreeSet; import org.apache.lucene.index.PrefixCodedTerms.TermIterator; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestPrefixCodedTerms extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestReadOnlyIndex.java b/lucene/core/src/test/org/apache/lucene/index/TestReadOnlyIndex.java index 3a1a4430058..9e9836c8b35 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestReadOnlyIndex.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestReadOnlyIndex.java @@ -31,7 +31,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java b/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java index b3811281153..bdb3bd5d2ea 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java @@ -25,8 +25,8 @@ import org.apache.lucene.search.TermRangeQuery; import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestReaderClosed extends LuceneTestCase { private DirectoryReader reader; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestReaderPool.java b/lucene/core/src/test/org/apache/lucene/index/TestReaderPool.java index 6d9901ee72e..338cf0fb2b2 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestReaderPool.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestReaderPool.java @@ -30,11 +30,11 @@ import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.NullInfoStream; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOSupplier; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.NullInfoStream; public class TestReaderPool extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestReaderWrapperDVTypeCheck.java b/lucene/core/src/test/org/apache/lucene/index/TestReaderWrapperDVTypeCheck.java index 55f3236c60c..d57d11f98ce 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestReaderWrapperDVTypeCheck.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestReaderWrapperDVTypeCheck.java @@ -24,9 +24,9 @@ import org.apache.lucene.document.SortedDocValuesField; import org.apache.lucene.document.SortedSetDocValuesField; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestReaderWrapperDVTypeCheck extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestRollback.java b/lucene/core/src/test/org/apache/lucene/index/TestRollback.java index 5a30500996b..f07cf65f142 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestRollback.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestRollback.java @@ -20,7 +20,7 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestRollback extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java b/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java index 5e005a9d21d..ccf54358c1e 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java @@ -25,6 +25,9 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.*; +import org.apache.lucene.tests.util.LineFileDocs; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.*; import org.junit.Test; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSameTokenSamePosition.java b/lucene/core/src/test/org/apache/lucene/index/TestSameTokenSamePosition.java index d888cf5ec98..0669ee5f43e 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSameTokenSamePosition.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSameTokenSamePosition.java @@ -24,7 +24,7 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.TextField; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestSameTokenSamePosition extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSegmentInfos.java b/lucene/core/src/test/org/apache/lucene/index/TestSegmentInfos.java index f090f89b9ac..33e09c9c6a1 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSegmentInfos.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSegmentInfos.java @@ -30,9 +30,9 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.StringHelper; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.Version; public class TestSegmentInfos extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java b/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java index 1d175f3c10c..7a3097b132e 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java @@ -26,12 +26,12 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.MergeInfo; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.FixedBitSet; import org.apache.lucene.util.InfoStream; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.StringHelper; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.Version; import org.apache.lucene.util.packed.PackedLongValues; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java b/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java index 55bc6928db3..fd3b495469b 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java @@ -24,9 +24,9 @@ import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.Version; public class TestSegmentReader extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java b/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java index d98d22d0c8b..2ca6daecdd3 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java @@ -22,9 +22,9 @@ import org.apache.lucene.document.Field; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.Version; public class TestSegmentTermDocs extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermEnum.java b/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermEnum.java index 3a45377b301..98a99d64124 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermEnum.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermEnum.java @@ -22,9 +22,9 @@ import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestSegmentTermEnum extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSegmentToThreadMapping.java b/lucene/core/src/test/org/apache/lucene/index/TestSegmentToThreadMapping.java index 1ca823bd055..900d3511bb9 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSegmentToThreadMapping.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSegmentToThreadMapping.java @@ -30,9 +30,9 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.Bits; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.NamedThreadFactory; import org.apache.lucene.util.Version; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.java b/lucene/core/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.java index b4403a54da1..fbf1f8533f9 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.java @@ -22,7 +22,7 @@ import org.apache.lucene.document.StringField; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestSizeBoundedForceMerge extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java index 06a60f68ae1..289296a76d7 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java @@ -28,7 +28,7 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IndexInput; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.ThreadInterruptedException; import org.junit.Test; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSoftDeletesDirectoryReaderWrapper.java b/lucene/core/src/test/org/apache/lucene/index/TestSoftDeletesDirectoryReaderWrapper.java index 4b587a5eb52..d1adaeb0e9b 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSoftDeletesDirectoryReaderWrapper.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSoftDeletesDirectoryReaderWrapper.java @@ -29,8 +29,8 @@ import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; public class TestSoftDeletesDirectoryReaderWrapper extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSoftDeletesRetentionMergePolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestSoftDeletesRetentionMergePolicy.java index 21b34f81c95..332c9320276 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSoftDeletesRetentionMergePolicy.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSoftDeletesRetentionMergePolicy.java @@ -46,9 +46,9 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.Bits; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; public class TestSoftDeletesRetentionMergePolicy extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSortedSetDocValues.java b/lucene/core/src/test/org/apache/lucene/index/TestSortedSetDocValues.java index b744d98461d..17213a0ce48 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSortedSetDocValues.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSortedSetDocValues.java @@ -16,7 +16,7 @@ */ package org.apache.lucene.index; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestSortedSetDocValues extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSortingCodecReader.java b/lucene/core/src/test/org/apache/lucene/index/TestSortingCodecReader.java index 587edf6f3a1..8adb6e52651 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSortingCodecReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSortingCodecReader.java @@ -48,9 +48,9 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; public class TestSortingCodecReader extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java b/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java index f6615b8bf8c..57353d6d273 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java @@ -24,9 +24,9 @@ import org.apache.lucene.document.Field; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestStressAdvance extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestStressDeletes.java b/lucene/core/src/test/org/apache/lucene/index/TestStressDeletes.java index ceef19edaa3..28b62c7443b 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestStressDeletes.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestStressDeletes.java @@ -26,8 +26,8 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestStressDeletes extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing.java b/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing.java index c65b1f3087e..343755c0a62 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing.java @@ -20,7 +20,8 @@ import org.apache.lucene.document.*; import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.store.*; -import org.apache.lucene.util.*; +import org.apache.lucene.tests.util.English; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestStressIndexing extends LuceneTestCase { private abstract static class TimedThread extends Thread { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java b/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java index 2fcb01cbd42..0ba751f262c 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java @@ -36,10 +36,10 @@ import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.junit.Before; public class TestStressIndexing2 extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java b/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java index f4b2938ef16..33cf6c9403e 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java @@ -34,8 +34,8 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestStressNRT extends LuceneTestCase { volatile DirectoryReader reader; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSumDocFreq.java b/lucene/core/src/test/org/apache/lucene/index/TestSumDocFreq.java index 1283274b165..342be3538e0 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSumDocFreq.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSumDocFreq.java @@ -20,8 +20,8 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; /** * Tests {@link Terms#getSumDocFreq()} diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSwappedIndexFiles.java b/lucene/core/src/test/org/apache/lucene/index/TestSwappedIndexFiles.java index d11f50dc375..729b47b31bd 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSwappedIndexFiles.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSwappedIndexFiles.java @@ -26,10 +26,10 @@ import org.apache.lucene.store.BaseDirectoryWrapper; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; -import org.apache.lucene.util.LineFileDocs; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.SuppressFileSystems; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LineFileDocs; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressFileSystems; +import org.apache.lucene.tests.util.TestUtil; /** Test that the same file name, but from a different index, is detected as foreign. */ @SuppressFileSystems("ExtrasFS") diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTerm.java b/lucene/core/src/test/org/apache/lucene/index/TestTerm.java index 1c2b3db9631..fc1ea752520 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTerm.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTerm.java @@ -16,7 +16,7 @@ */ package org.apache.lucene.index; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestTerm extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTermStates.java b/lucene/core/src/test/org/apache/lucene/index/TestTermStates.java index ccfbcfb5da5..7ec5a1c1c37 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTermStates.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTermStates.java @@ -19,8 +19,8 @@ import org.apache.lucene.document.Document; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; public class TestTermStates extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTermVectors.java b/lucene/core/src/test/org/apache/lucene/index/TestTermVectors.java index 6c120e3e4cd..da141f8bab8 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTermVectors.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTermVectors.java @@ -26,10 +26,10 @@ import org.apache.lucene.document.FieldType; import org.apache.lucene.document.TextField; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestTermVectors extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java b/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java index 3ab1d5bba32..3a4d5c8455f 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java @@ -32,9 +32,9 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestTermVectorsReader extends LuceneTestCase { // Must be lexicographically sorted, will do in setup, versus trying to maintain here diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java b/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java index c019db8e980..eb984872ca1 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java @@ -35,9 +35,9 @@ import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.hamcrest.MatcherAssert; /** tests for writing term vectors */ diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java b/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java index 26c021cba4b..58a9b3a8233 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java @@ -26,9 +26,9 @@ import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; class RepeatingTokenizer extends Tokenizer { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTerms.java b/lucene/core/src/test/org/apache/lucene/index/TestTerms.java index 06cbd5e92ab..38d4bec5b15 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTerms.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTerms.java @@ -21,9 +21,9 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.TextField; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestTerms extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java b/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java index 547e80c2b63..0a84ef03407 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java @@ -34,11 +34,11 @@ import org.apache.lucene.document.NumericDocValuesField; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LineFileDocs; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LineFileDocs; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.automaton.Automata; import org.apache.lucene.util.automaton.Automaton; import org.apache.lucene.util.automaton.CompiledAutomaton; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java b/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java index eb5c7566412..cd936046d7a 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java @@ -33,9 +33,10 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; +import org.apache.lucene.tests.util.automaton.AutomatonTestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.automaton.*; public class TestTermsEnum2 extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTermsHashPerField.java b/lucene/core/src/test/org/apache/lucene/index/TestTermsHashPerField.java index 73bee8a0baf..8711c16fdd0 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTermsHashPerField.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTermsHashPerField.java @@ -28,11 +28,11 @@ import java.util.TreeMap; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.ByteBlockPool; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.Counter; import org.apache.lucene.util.IntBlockPool; -import org.apache.lucene.util.LuceneTestCase; public class TestTermsHashPerField extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestThreadedForceMerge.java b/lucene/core/src/test/org/apache/lucene/index/TestThreadedForceMerge.java index de1640fa880..f9de548c56a 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestThreadedForceMerge.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestThreadedForceMerge.java @@ -25,8 +25,8 @@ import org.apache.lucene.document.StringField; import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.English; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.English; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.BeforeClass; public class TestThreadedForceMerge extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java index 09c06b361e7..069246ab3cb 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java @@ -31,8 +31,8 @@ import org.apache.lucene.index.MergePolicy.MergeSpecification; import org.apache.lucene.index.MergePolicy.OneMerge; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.Version; public class TestTieredMergePolicy extends BaseMergePolicyTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTragicIndexWriterDeadlock.java b/lucene/core/src/test/org/apache/lucene/index/TestTragicIndexWriterDeadlock.java index a5d0cb8b405..de5a6f1fc1a 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTragicIndexWriterDeadlock.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTragicIndexWriterDeadlock.java @@ -23,7 +23,7 @@ import org.apache.lucene.document.Document; import org.apache.lucene.store.Directory; import org.apache.lucene.store.MockDirectoryWrapper; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestTragicIndexWriterDeadlock extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java b/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java index 2753ffaded0..228054d9c6a 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java @@ -27,8 +27,8 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.Bits; -import org.apache.lucene.util.LuceneTestCase; /** * Test class to illustrate using IndexDeletionPolicy to provide multi-level rollback capability. diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTransactions.java b/lucene/core/src/test/org/apache/lucene/index/TestTransactions.java index 85d3a7e79cd..5fa0a271335 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTransactions.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTransactions.java @@ -25,9 +25,9 @@ import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; import org.apache.lucene.store.MockDirectoryWrapper; -import org.apache.lucene.util.English; +import org.apache.lucene.tests.util.English; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; public class TestTransactions extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTryDelete.java b/lucene/core/src/test/org/apache/lucene/index/TestTryDelete.java index 8d3265ecab5..8d1019a9a1c 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTryDelete.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTryDelete.java @@ -30,7 +30,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestTryDelete extends LuceneTestCase { private static IndexWriter getWriter(Directory directory) throws IOException { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTwoPhaseCommitTool.java b/lucene/core/src/test/org/apache/lucene/index/TestTwoPhaseCommitTool.java index 585a1273665..39193340bad 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTwoPhaseCommitTool.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTwoPhaseCommitTool.java @@ -18,7 +18,7 @@ import java.io.IOException; import java.util.Map; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestTwoPhaseCommitTool extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java b/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java index 481df5cbec7..dc4b66bd302 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java @@ -26,8 +26,8 @@ import org.apache.lucene.search.TermStatistics; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; /** Tests the uniqueTermCount statistic in FieldInvertState */ public class TestUniqueTermCount extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestUpgradeIndexMergePolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestUpgradeIndexMergePolicy.java index c7531aa87ae..0ce2cfbeaee 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestUpgradeIndexMergePolicy.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestUpgradeIndexMergePolicy.java @@ -18,7 +18,7 @@ import java.io.IOException; import org.apache.lucene.index.MergePolicy.MergeSpecification; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; public class TestUpgradeIndexMergePolicy extends BaseMergePolicyTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java index 71ed126cdd0..4f7197fa169 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java @@ -33,13 +33,13 @@ import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.Rethrow; +import org.apache.lucene.tests.util.TestUtil; +import org.apache.lucene.tests.util.automaton.AutomatonTestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.Rethrow; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.automaton.Automata; import org.apache.lucene.util.automaton.Automaton; -import org.apache.lucene.util.automaton.AutomatonTestUtil; import org.apache.lucene.util.automaton.Operations; public class TestAutomatonQuery extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java b/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java index da00d5fc1f7..01ae823fb52 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java @@ -23,7 +23,7 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.automaton.Automaton; import org.apache.lucene.util.automaton.RegExp; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBaseRangeFilter.java b/lucene/core/src/test/org/apache/lucene/search/TestBaseRangeFilter.java index f3820219c1d..023ab561dae 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBaseRangeFilter.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBaseRangeFilter.java @@ -31,9 +31,9 @@ import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBlendedTermQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestBlendedTermQuery.java index 9710c4c57a2..1d47bcbe0e4 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBlendedTermQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBlendedTermQuery.java @@ -24,7 +24,7 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestBlendedTermQuery extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBlockMaxConjunction.java b/lucene/core/src/test/org/apache/lucene/search/TestBlockMaxConjunction.java index 8a3cf59d9c1..99247a0ff26 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBlockMaxConjunction.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBlockMaxConjunction.java @@ -26,8 +26,8 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestBlockMaxConjunction extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java b/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java index 5181c67a930..2c873c30222 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java @@ -33,9 +33,9 @@ import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.ArrayUtil; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBoolean2ScorerSupplier.java b/lucene/core/src/test/org/apache/lucene/search/TestBoolean2ScorerSupplier.java index 2dc968f13de..b35969aab86 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBoolean2ScorerSupplier.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBoolean2ScorerSupplier.java @@ -25,8 +25,8 @@ import java.util.Map; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.BooleanClause.Occur; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestBoolean2ScorerSupplier extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java b/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java index fee63f3d60e..b531090268a 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java @@ -26,7 +26,7 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java b/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java index a955cb6190c..c7fdb042179 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java @@ -30,10 +30,10 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; import org.apache.lucene.util.FixedBitSet; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestBooleanOr extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java index b287f0e8794..95bcee0ecf7 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java @@ -41,10 +41,10 @@ import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.NamedThreadFactory; -import org.apache.lucene.util.TestUtil; public class TestBooleanQuery extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java b/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java index f2290907775..d6fc2781d46 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java @@ -38,7 +38,7 @@ import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; // TODO: refactor to a base class, that collects freqs from the scorer tree // and test all queries with it diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBooleanRewrites.java b/lucene/core/src/test/org/apache/lucene/search/TestBooleanRewrites.java index 4870cd8343b..59a419d5a5f 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanRewrites.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanRewrites.java @@ -32,8 +32,8 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestBooleanRewrites extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java b/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java index f49a44140f2..56defc55f89 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java @@ -29,8 +29,8 @@ import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.Weight.DefaultBulkScorer; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.Bits; -import org.apache.lucene.util.LuceneTestCase; public class TestBooleanScorer extends LuceneTestCase { private static final String FIELD = "category"; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBoostQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestBoostQuery.java index 51a4f5b1b6f..6da06785ebf 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBoostQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBoostQuery.java @@ -20,7 +20,7 @@ import org.apache.lucene.index.MultiReader; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestBoostQuery extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestCachingCollector.java b/lucene/core/src/test/org/apache/lucene/search/TestCachingCollector.java index 8b88a5287a9..4b07e06dd0a 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestCachingCollector.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestCachingCollector.java @@ -17,7 +17,7 @@ package org.apache.lucene.search; import java.io.IOException; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestCachingCollector extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestCollectorManager.java b/lucene/core/src/test/org/apache/lucene/search/TestCollectorManager.java index 749888fdab5..0d9fc9a5255 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestCollectorManager.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestCollectorManager.java @@ -36,7 +36,7 @@ import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestCollectorManager extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestConjunctionDISI.java b/lucene/core/src/test/org/apache/lucene/search/TestConjunctionDISI.java index 7d5b46a5b1d..436982ffc59 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestConjunctionDISI.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestConjunctionDISI.java @@ -22,10 +22,10 @@ import java.util.LinkedList; import java.util.List; import org.apache.lucene.index.LeafReaderContext; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BitDocIdSet; import org.apache.lucene.util.FixedBitSet; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestConjunctionDISI extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestConjunctions.java b/lucene/core/src/test/org/apache/lucene/search/TestConjunctions.java index 24968aeae35..73ed5aec3e8 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestConjunctions.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestConjunctions.java @@ -36,8 +36,8 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; public class TestConjunctions extends LuceneTestCase { Analyzer analyzer; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreQuery.java index fbbf51731a1..45dfb578bb3 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreQuery.java @@ -26,8 +26,8 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; /** * This class only tests some basic functionality in CSQ, the main parts are mostly tested by diff --git a/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreScorer.java b/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreScorer.java index d43aed3ac85..0bd4c9b448e 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreScorer.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreScorer.java @@ -33,7 +33,7 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestConstantScoreScorer extends LuceneTestCase { private static final String FIELD = "f"; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestControlledRealTimeReopenThread.java b/lucene/core/src/test/org/apache/lucene/search/TestControlledRealTimeReopenThread.java index c1882e0683a..d1e9e7009fc 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestControlledRealTimeReopenThread.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestControlledRealTimeReopenThread.java @@ -40,9 +40,9 @@ import org.apache.lucene.index.ThreadedIndexingAndSearchingTestCase; import org.apache.lucene.store.Directory; import org.apache.lucene.store.NRTCachingDirectory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; import org.apache.lucene.util.ThreadInterruptedException; @SuppressCodecs({"SimpleText", "Direct"}) diff --git a/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java b/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java index f47fc74a8a5..6f2e52124ee 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java @@ -32,8 +32,8 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; /** Unit test for sorting code. */ public class TestCustomSearcherSort extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestDateSort.java b/lucene/core/src/test/org/apache/lucene/search/TestDateSort.java index fdbad355a30..ed962073957 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestDateSort.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestDateSort.java @@ -25,7 +25,7 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** * Test date sorting, i.e. auto-sorting of fields with type "long". See diff --git a/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java index e3818267126..f0f588f7375 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java @@ -42,7 +42,7 @@ import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** Test of the DisjunctionMaxQuery. */ @LuceneTestCase.SuppressCodecs("SimpleText") diff --git a/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionScoreBlockBoundaryPropagator.java b/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionScoreBlockBoundaryPropagator.java index 0ba0b4eb99a..57b0efb0179 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionScoreBlockBoundaryPropagator.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionScoreBlockBoundaryPropagator.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.List; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestDisjunctionScoreBlockBoundaryPropagator extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestDocIdSetIterator.java b/lucene/core/src/test/org/apache/lucene/search/TestDocIdSetIterator.java index 7b66cd74476..bfa5e1a4501 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestDocIdSetIterator.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestDocIdSetIterator.java @@ -19,7 +19,7 @@ import static org.apache.lucene.search.DocIdSetIterator.NO_MORE_DOCS; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestDocIdSetIterator extends LuceneTestCase { public void testRangeBasic() throws Exception { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestDocValuesFieldExistsQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestDocValuesFieldExistsQuery.java index ef400610720..215db89a0d6 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestDocValuesFieldExistsQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestDocValuesFieldExistsQuery.java @@ -31,10 +31,10 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestDocValuesFieldExistsQuery extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestDocValuesQueries.java b/lucene/core/src/test/org/apache/lucene/search/TestDocValuesQueries.java index 8c01a0b949b..5842b5c1175 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestDocValuesQueries.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestDocValuesQueries.java @@ -27,9 +27,9 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.NumericUtils; -import org.apache.lucene.util.TestUtil; public class TestDocValuesQueries extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestDocValuesRewriteMethod.java b/lucene/core/src/test/org/apache/lucene/search/TestDocValuesRewriteMethod.java index 2a0415c1ffc..cbf5fc5f48c 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestDocValuesRewriteMethod.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestDocValuesRewriteMethod.java @@ -29,11 +29,11 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; +import org.apache.lucene.tests.util.automaton.AutomatonTestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.UnicodeUtil; -import org.apache.lucene.util.automaton.AutomatonTestUtil; import org.apache.lucene.util.automaton.RegExp; /** Tests the DocValuesRewriteMethod */ diff --git a/lucene/core/src/test/org/apache/lucene/search/TestDoubleValuesSource.java b/lucene/core/src/test/org/apache/lucene/search/TestDoubleValuesSource.java index 42b8b0bd16d..bbf01e27134 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestDoubleValuesSource.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestDoubleValuesSource.java @@ -30,10 +30,10 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.English; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.ArrayUtil; -import org.apache.lucene.util.English; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestEarlyTermination.java b/lucene/core/src/test/org/apache/lucene/search/TestEarlyTermination.java index 3895812019e..ff89a5c0122 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestEarlyTermination.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestEarlyTermination.java @@ -22,7 +22,7 @@ import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestEarlyTermination extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestElevationComparator.java b/lucene/core/src/test/org/apache/lucene/search/TestElevationComparator.java index a5b1c75358f..05c16c1f4d0 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestElevationComparator.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestElevationComparator.java @@ -34,8 +34,8 @@ import org.apache.lucene.search.similarities.BM25Similarity; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; public class TestElevationComparator extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestFilterWeight.java b/lucene/core/src/test/org/apache/lucene/search/TestFilterWeight.java index 2d817e1024c..121aa7cb5fc 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestFilterWeight.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestFilterWeight.java @@ -19,7 +19,7 @@ import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.Arrays; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; public class TestFilterWeight extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java index c1f3f05e8ed..c45a069553e 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java @@ -38,11 +38,11 @@ import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.IntsRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.automaton.ByteRunAutomaton; import org.apache.lucene.util.automaton.LevenshteinAutomata; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestFuzzyTermOnShortTerms.java b/lucene/core/src/test/org/apache/lucene/search/TestFuzzyTermOnShortTerms.java index b60d70c77ff..78e76b3c2cb 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestFuzzyTermOnShortTerms.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestFuzzyTermOnShortTerms.java @@ -27,8 +27,8 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.junit.Test; public class TestFuzzyTermOnShortTerms extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestIndexOrDocValuesQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestIndexOrDocValuesQuery.java index 61b316b6441..8fb6be0930c 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestIndexOrDocValuesQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestIndexOrDocValuesQuery.java @@ -29,8 +29,8 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestIndexOrDocValuesQuery extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestIndexSearcher.java b/lucene/core/src/test/org/apache/lucene/search/TestIndexSearcher.java index bfd9c2c1fc6..2b4993e52a0 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestIndexSearcher.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestIndexSearcher.java @@ -45,10 +45,10 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.NamedThreadFactory; -import org.apache.lucene.util.TestUtil; import org.junit.Test; public class TestIndexSearcher extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestIndriAndQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestIndriAndQuery.java index 5be257ecbdc..1f7f1f88276 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestIndriAndQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestIndriAndQuery.java @@ -30,7 +30,7 @@ import org.apache.lucene.search.similarities.IndriDirichletSimilarity; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestIndriAndQuery extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestInetAddressRangeQueries.java b/lucene/core/src/test/org/apache/lucene/search/TestInetAddressRangeQueries.java index 4d955feae32..e2ccb8022f8 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestInetAddressRangeQueries.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestInetAddressRangeQueries.java @@ -21,7 +21,7 @@ import java.util.Arrays; import org.apache.lucene.document.InetAddressPoint; import org.apache.lucene.document.InetAddressRange; -import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; /** Random testing for {@link InetAddressRange} */ @SuppressCodecs({"Direct"}) diff --git a/lucene/core/src/test/org/apache/lucene/search/TestIntRangeFieldQueries.java b/lucene/core/src/test/org/apache/lucene/search/TestIntRangeFieldQueries.java index 56804de2157..aed95d20a63 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestIntRangeFieldQueries.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestIntRangeFieldQueries.java @@ -22,7 +22,7 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; /** Random testing for IntRange Queries. */ public class TestIntRangeFieldQueries extends BaseRangeFieldQueryTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestKnnVectorQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestKnnVectorQuery.java index 6e64d30c535..e0861a0f537 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestKnnVectorQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestKnnVectorQuery.java @@ -40,8 +40,8 @@ import org.apache.lucene.index.Term; import org.apache.lucene.index.VectorSimilarityFunction; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.Bits; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.VectorUtil; /** TestKnnVectorQuery tests KnnVectorQuery. */ diff --git a/lucene/core/src/test/org/apache/lucene/search/TestLRUQueryCache.java b/lucene/core/src/test/org/apache/lucene/search/TestLRUQueryCache.java index 2179b34a797..a1f8b8afa0c 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestLRUQueryCache.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestLRUQueryCache.java @@ -61,13 +61,13 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.RamUsageTester; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Accountable; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.Constants; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.RamUsageTester; -import org.apache.lucene.util.TestUtil; public class TestLRUQueryCache extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestLiveFieldValues.java b/lucene/core/src/test/org/apache/lucene/search/TestLiveFieldValues.java index 2c9e6661787..af5f6203c39 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestLiveFieldValues.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestLiveFieldValues.java @@ -34,8 +34,8 @@ import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestLiveFieldValues extends LuceneTestCase { public void test() throws Exception { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestLongRangeFieldQueries.java b/lucene/core/src/test/org/apache/lucene/search/TestLongRangeFieldQueries.java index 0df2224cd18..efb28819972 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestLongRangeFieldQueries.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestLongRangeFieldQueries.java @@ -22,7 +22,7 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; /** Random testing for LongRange Queries. */ // See: https://issues.apache.org/jira/browse/SOLR-12028 Tests cannot remove files on Windows diff --git a/lucene/core/src/test/org/apache/lucene/search/TestLongValuesSource.java b/lucene/core/src/test/org/apache/lucene/search/TestLongValuesSource.java index f90302a494c..ad8828386e5 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestLongValuesSource.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestLongValuesSource.java @@ -27,10 +27,10 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.English; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.ArrayUtil; -import org.apache.lucene.util.English; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestLongValuesSource extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java index 37a7e5a406a..cd15a071448 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java @@ -26,7 +26,7 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** Tests MatchAllDocsQuery. */ public class TestMatchAllDocsQuery extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMatchNoDocsQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestMatchNoDocsQuery.java index f92e15e433d..b886f9b6abd 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestMatchNoDocsQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestMatchNoDocsQuery.java @@ -26,7 +26,7 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** Tests MatchNoDocsQuery. */ public class TestMatchNoDocsQuery extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMaxClauseLimit.java b/lucene/core/src/test/org/apache/lucene/search/TestMaxClauseLimit.java index 7519723352f..d633b3e83db 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestMaxClauseLimit.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestMaxClauseLimit.java @@ -21,7 +21,7 @@ import java.util.Arrays; import org.apache.lucene.index.MultiReader; import org.apache.lucene.index.Term; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestMaxClauseLimit extends LuceneTestCase { public void testIllegalArgumentExceptionOnZero() { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMaxScoreAccumulator.java b/lucene/core/src/test/org/apache/lucene/search/TestMaxScoreAccumulator.java index 28bec9cc15d..700fba697c5 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestMaxScoreAccumulator.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestMaxScoreAccumulator.java @@ -17,7 +17,7 @@ package org.apache.lucene.search; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestMaxScoreAccumulator extends LuceneTestCase { public void testSimple() { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMaxScoreSumPropagator.java b/lucene/core/src/test/org/apache/lucene/search/TestMaxScoreSumPropagator.java index 70a42c6ccbd..8fc378405fa 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestMaxScoreSumPropagator.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestMaxScoreSumPropagator.java @@ -25,8 +25,8 @@ import java.util.Collections; import java.util.List; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestMaxScoreSumPropagator extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMinShouldMatch2.java b/lucene/core/src/test/org/apache/lucene/search/TestMinShouldMatch2.java index 918dca79800..26895c96a93 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestMinShouldMatch2.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestMinShouldMatch2.java @@ -36,9 +36,9 @@ import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.search.similarities.Similarity.SimScorer; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMultiCollector.java b/lucene/core/src/test/org/apache/lucene/search/TestMultiCollector.java index eef4447efc8..8d992eb1d1c 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestMultiCollector.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestMultiCollector.java @@ -31,8 +31,8 @@ import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.junit.Test; public class TestMultiCollector extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMultiCollectorManager.java b/lucene/core/src/test/org/apache/lucene/search/TestMultiCollectorManager.java index fb4e766cbce..8f033ca18ff 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestMultiCollectorManager.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestMultiCollectorManager.java @@ -31,7 +31,7 @@ import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestMultiCollectorManager extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseEnum.java b/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseEnum.java index 7b309ffe5c4..96f5bdd3206 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseEnum.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseEnum.java @@ -27,7 +27,7 @@ import org.apache.lucene.index.PostingsEnum; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** simple tests for unionpostingsenum */ public class TestMultiPhraseEnum extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java index 1e7a238394b..ad244ae895a 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java @@ -33,8 +33,8 @@ import org.apache.lucene.index.TermsEnum; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; import org.junit.Ignore; /** This class tests the MultiPhraseQuery class. */ diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMultiSliceMerge.java b/lucene/core/src/test/org/apache/lucene/search/TestMultiSliceMerge.java index 495604f8a8c..0dc4af86150 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestMultiSliceMerge.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestMultiSliceMerge.java @@ -25,8 +25,8 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; public class TestMultiSliceMerge extends LuceneTestCase { Directory dir1; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java b/lucene/core/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java index 77d4d59ffb2..3ea33e39029 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java @@ -29,9 +29,9 @@ import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.AttributeSource; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java b/lucene/core/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java index dfd3d2b6db2..ec91ac103bf 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java @@ -26,8 +26,8 @@ import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.English; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.English; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestMultiThreadTermVectors extends LuceneTestCase { private Directory directory; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMultiset.java b/lucene/core/src/test/org/apache/lucene/search/TestMultiset.java index 207981e7059..282bb13fe54 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestMultiset.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestMultiset.java @@ -18,7 +18,7 @@ import java.util.HashMap; import java.util.Map; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestMultiset extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestNGramPhraseQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestNGramPhraseQuery.java index e04cd8b60a1..0179ac034bb 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestNGramPhraseQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestNGramPhraseQuery.java @@ -21,7 +21,7 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestNeedsScores.java b/lucene/core/src/test/org/apache/lucene/search/TestNeedsScores.java index 309af27e933..9847964d031 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestNeedsScores.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestNeedsScores.java @@ -26,8 +26,8 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; public class TestNeedsScores extends LuceneTestCase { Directory dir; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestNormsFieldExistsQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestNormsFieldExistsQuery.java index 73fb21158aa..6305d2c6df3 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestNormsFieldExistsQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestNormsFieldExistsQuery.java @@ -31,9 +31,9 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestNormsFieldExistsQuery extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestNot.java b/lucene/core/src/test/org/apache/lucene/search/TestNot.java index 5924480789a..7c1de93558b 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestNot.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestNot.java @@ -22,7 +22,7 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** Similarity unit test. */ public class TestNot extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java index 80dcb2565bb..9b81bf8babb 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java @@ -26,8 +26,8 @@ import org.apache.lucene.index.Term; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; /** This class tests PhrasePrefixQuery class. */ public class TestPhrasePrefixQuery extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java index 9968c8fc8b0..4f6ca8bfaa8 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java @@ -50,10 +50,10 @@ import org.apache.lucene.search.similarities.BM25Similarity; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestPointQueries.java b/lucene/core/src/test/org/apache/lucene/search/TestPointQueries.java index 723f6772e05..345a17e0d82 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestPointQueries.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestPointQueries.java @@ -61,11 +61,11 @@ import org.apache.lucene.index.SegmentWriteState; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.NumericUtils; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.bkd.BKDConfig; import org.junit.BeforeClass; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java b/lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java index f7a122c400e..ba44ee64142 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java @@ -30,8 +30,8 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; /** Term position unit test. */ public class TestPositionIncrement extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java b/lucene/core/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java index de077d9d57f..acc789e33c2 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java @@ -22,7 +22,7 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestPositiveScoresOnlyCollector extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java index 2230319948b..d6ff15ea646 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java @@ -22,7 +22,7 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestPrefixQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestPrefixQuery.java index 49eb4f067e4..eb78c037ffd 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestPrefixQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestPrefixQuery.java @@ -27,10 +27,10 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.StringHelper; -import org.apache.lucene.util.TestUtil; /** Tests {@link PrefixQuery} class. */ public class TestPrefixQuery extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java b/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java index 5243a535ff0..9b447ba6c3f 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java @@ -28,11 +28,11 @@ import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.AttributeSource; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.StringHelper; -import org.apache.lucene.util.TestUtil; /** * Create an index with random unicode terms Generates random prefix queries, and validates against diff --git a/lucene/core/src/test/org/apache/lucene/search/TestQueryRescorer.java b/lucene/core/src/test/org/apache/lucene/search/TestQueryRescorer.java index ff72f6a22c0..c210eed888b 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestQueryRescorer.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestQueryRescorer.java @@ -33,9 +33,9 @@ import org.apache.lucene.search.similarities.BM25Similarity; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.ArrayUtil; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestQueryRescorer extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestQueryVisitor.java b/lucene/core/src/test/org/apache/lucene/search/TestQueryVisitor.java index 29966fe65c2..3c2c22c611c 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestQueryVisitor.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestQueryVisitor.java @@ -30,7 +30,7 @@ import java.util.Set; import java.util.stream.Collectors; import org.apache.lucene.index.Term; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestQueryVisitor extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestRangeFieldsDocValuesQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestRangeFieldsDocValuesQuery.java index a9cd67218ef..1456c8d3523 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestRangeFieldsDocValuesQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestRangeFieldsDocValuesQuery.java @@ -26,7 +26,7 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestRangeFieldsDocValuesQuery extends LuceneTestCase { public void testDoubleRangeDocValuesIntersectsQuery() throws IOException { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestRegexpQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestRegexpQuery.java index 7f05c7a3805..8c1d193ee50 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestRegexpQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestRegexpQuery.java @@ -26,7 +26,7 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.automaton.Automata; import org.apache.lucene.util.automaton.Automaton; import org.apache.lucene.util.automaton.AutomatonProvider; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java b/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java index 22d67595f71..740bd2d4696 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java @@ -29,8 +29,8 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; /** * Create an index with terms from 000-999. Generates random regexps according to simple patterns, diff --git a/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java b/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java index dca393a09ad..9dd27c1fd76 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java @@ -32,14 +32,14 @@ import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; +import org.apache.lucene.tests.util.automaton.AutomatonTestUtil; import org.apache.lucene.util.AttributeSource; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.CharsRefBuilder; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.UnicodeUtil; import org.apache.lucene.util.automaton.Automaton; -import org.apache.lucene.util.automaton.AutomatonTestUtil; import org.apache.lucene.util.automaton.CharacterRunAutomaton; import org.apache.lucene.util.automaton.Operations; import org.apache.lucene.util.automaton.RegExp; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestReqExclBulkScorer.java b/lucene/core/src/test/org/apache/lucene/search/TestReqExclBulkScorer.java index 5ba08dd11ee..4efda423c2e 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestReqExclBulkScorer.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestReqExclBulkScorer.java @@ -17,11 +17,11 @@ package org.apache.lucene.search; import java.io.IOException; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; import org.apache.lucene.util.DocIdSetBuilder; import org.apache.lucene.util.FixedBitSet; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestReqExclBulkScorer extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestReqOptSumScorer.java b/lucene/core/src/test/org/apache/lucene/search/TestReqOptSumScorer.java index 677b83ab3f7..b533902866c 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestReqOptSumScorer.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestReqOptSumScorer.java @@ -35,7 +35,7 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestReqOptSumScorer extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSameScoresWithThreads.java b/lucene/core/src/test/org/apache/lucene/search/TestSameScoresWithThreads.java index 45cd88b174d..258de52c29d 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSameScoresWithThreads.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSameScoresWithThreads.java @@ -32,10 +32,10 @@ import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LineFileDocs; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LineFileDocs; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestSameScoresWithThreads extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java b/lucene/core/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java index b5f1bcf9595..8361fde6eb0 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java @@ -21,7 +21,7 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestScoreCachingWrappingScorer extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestScorerPerf.java b/lucene/core/src/test/org/apache/lucene/search/TestScorerPerf.java index 9b4a6c880aa..f54fca5d68b 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestScorerPerf.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestScorerPerf.java @@ -27,9 +27,9 @@ import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BitSetIterator; import org.apache.lucene.util.FixedBitSet; -import org.apache.lucene.util.LuceneTestCase; public class TestScorerPerf extends LuceneTestCase { private final boolean validate = true; // set to false when doing performance testing diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java b/lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java index aa731512517..125ab9c81d9 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java @@ -33,10 +33,10 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.English; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.English; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; /** Tests IndexSearcher's searchAfter() method */ public class TestSearchAfter extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSearchWithThreads.java b/lucene/core/src/test/org/apache/lucene/search/TestSearchWithThreads.java index 901f8761b39..3d15e1b465a 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSearchWithThreads.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSearchWithThreads.java @@ -24,7 +24,7 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestSearchWithThreads extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java b/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java index e84b641beb0..e403f9e3a85 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java @@ -43,10 +43,10 @@ import org.apache.lucene.index.ThreadedIndexingAndSearchingTestCase; import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.NamedThreadFactory; -import org.apache.lucene.util.TestUtil; @SuppressCodecs({"SimpleText", "Direct"}) public class TestSearcherManager extends ThreadedIndexingAndSearchingTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSegmentCacheables.java b/lucene/core/src/test/org/apache/lucene/search/TestSegmentCacheables.java index aec3148c0d5..be7b4543f4b 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSegmentCacheables.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSegmentCacheables.java @@ -29,7 +29,7 @@ import org.apache.lucene.index.NoMergePolicy; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestSegmentCacheables extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestShardSearching.java b/lucene/core/src/test/org/apache/lucene/search/TestShardSearching.java index 825ba829598..31e6d168c79 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestShardSearching.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestShardSearching.java @@ -26,9 +26,9 @@ import org.apache.lucene.index.MultiTerms; import org.apache.lucene.index.Term; import org.apache.lucene.index.TermsEnum; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; -import org.apache.lucene.util.TestUtil; // TODO // - other queries besides PrefixQuery & TermQuery (but: diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSimilarity.java b/lucene/core/src/test/org/apache/lucene/search/TestSimilarity.java index ac7b683ed10..8a38b4066da 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSimilarity.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSimilarity.java @@ -26,7 +26,7 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** Similarity unit test. */ public class TestSimilarity extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java b/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java index 81d1b97375a..59515adfb7f 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java @@ -29,7 +29,7 @@ import org.apache.lucene.search.similarities.PerFieldSimilarityWrapper; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestSimilarityProvider extends LuceneTestCase { private Directory directory; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanationsWithFillerDocs.java b/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanationsWithFillerDocs.java index 949c63b5b8b..d671bdc7cd0 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanationsWithFillerDocs.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanationsWithFillerDocs.java @@ -20,8 +20,8 @@ import org.apache.lucene.document.Field; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.ArrayUtil; -import org.apache.lucene.util.TestUtil; import org.junit.Assume; import org.junit.BeforeClass; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java index f8fe426b9f8..9623d7f04c7 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java @@ -29,7 +29,7 @@ import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; import org.apache.lucene.store.MockDirectoryWrapper; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestSloppyPhraseQuery extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery2.java b/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery2.java index cfa590174d7..e4fb1a3c7d0 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery2.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery2.java @@ -18,7 +18,7 @@ import java.util.Random; import org.apache.lucene.index.Term; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; /** random sloppy phrase query tests */ public class TestSloppyPhraseQuery2 extends SearchEquivalenceTestBase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSort.java b/lucene/core/src/test/org/apache/lucene/search/TestSort.java index f94d932641d..6dc57d3d6c8 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSort.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSort.java @@ -27,7 +27,7 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /* * Very simple tests of sorting. diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSortOptimization.java b/lucene/core/src/test/org/apache/lucene/search/TestSortOptimization.java index ff915693105..114d051ccfd 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSortOptimization.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSortOptimization.java @@ -42,8 +42,8 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; public class TestSortOptimization extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java b/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java index 5637279a437..ffe87f72583 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java @@ -35,11 +35,11 @@ import org.apache.lucene.index.NumericDocValues; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BitSetIterator; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.FixedBitSet; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; /** random sorting tests */ public class TestSortRandom extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSortRescorer.java b/lucene/core/src/test/org/apache/lucene/search/TestSortRescorer.java index d69a093e997..eb446b5c3bc 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSortRescorer.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSortRescorer.java @@ -28,8 +28,8 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestSortRescorer extends LuceneTestCase { IndexSearcher searcher; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSortedNumericSortField.java b/lucene/core/src/test/org/apache/lucene/search/TestSortedNumericSortField.java index febc2096ccc..5d059203609 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSortedNumericSortField.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSortedNumericSortField.java @@ -24,7 +24,7 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.NumericUtils; /** Simple tests for SortedNumericSortField */ diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSelector.java b/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSelector.java index b2f6e5b3f86..8264912ef61 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSelector.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSelector.java @@ -22,8 +22,8 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; /** * Tests for SortedSetSortField selectors other than MIN, these require optional codec support diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSortField.java b/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSortField.java index d70db36b9c8..1fe1a099221 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSortField.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSortField.java @@ -24,7 +24,7 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** Simple tests for SortedSetSortField, indexing the sortedset up front */ public class TestSortedSetSortField extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java b/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java index 5b2ce4e337f..658868593b3 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java @@ -34,7 +34,7 @@ import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSynonymQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestSynonymQuery.java index 1772e248cda..07c6a251b22 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSynonymQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSynonymQuery.java @@ -37,9 +37,9 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestSynonymQuery extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTermInSetQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestTermInSetQuery.java index f2dae324202..c86c43a6e1c 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestTermInSetQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestTermInSetQuery.java @@ -39,11 +39,11 @@ import org.apache.lucene.index.TermsEnum; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.RamUsageTester; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.RamUsageTester; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.automaton.ByteRunAutomaton; public class TestTermInSetQuery extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTermQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestTermQuery.java index 5a35ff49ff7..ed2fd6f1fa8 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestTermQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestTermQuery.java @@ -34,10 +34,10 @@ import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestTermQuery extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java index 0efdbc96fc8..5169a0c2eeb 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java @@ -30,7 +30,7 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestTermRangeQuery extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java b/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java index 841613f0156..e16335e2309 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java @@ -36,8 +36,8 @@ import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestTermScorer extends LuceneTestCase { protected Directory directory; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java b/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java index 43827ee5afc..f4225d3ec04 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java @@ -28,10 +28,10 @@ import org.apache.lucene.search.TimeLimitingCollector.TimeExceededException; import org.apache.lucene.search.TimeLimitingCollector.TimerThread; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressSysoutChecks; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Counter; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.SuppressSysoutChecks; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.ThreadInterruptedException; /** diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTopDocsCollector.java b/lucene/core/src/test/org/apache/lucene/search/TestTopDocsCollector.java index ceecb82613e..6fedaea1767 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestTopDocsCollector.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestTopDocsCollector.java @@ -34,9 +34,9 @@ import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LineFileDocs; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LineFileDocs; -import org.apache.lucene.util.LuceneTestCase; public class TestTopDocsCollector extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTopDocsMerge.java b/lucene/core/src/test/org/apache/lucene/search/TestTopDocsMerge.java index d678cb96983..855e8e0fb97 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestTopDocsMerge.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestTopDocsMerge.java @@ -35,10 +35,10 @@ import org.apache.lucene.index.ReaderUtil; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestTopDocsMerge extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java b/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java index 9d99f87ed90..6a65c46733c 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java @@ -37,8 +37,8 @@ import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.FieldValueHitQueue.Entry; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestTopFieldCollector extends LuceneTestCase { private IndexSearcher is; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollectorEarlyTermination.java b/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollectorEarlyTermination.java index 5cdfb8b1745..9f157c9db9b 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollectorEarlyTermination.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollectorEarlyTermination.java @@ -36,8 +36,8 @@ import org.apache.lucene.index.SerialMergeScheduler; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestTopFieldCollectorEarlyTermination extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTotalHitCountCollector.java b/lucene/core/src/test/org/apache/lucene/search/TestTotalHitCountCollector.java index b02779ca0c3..fe3f142893d 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestTotalHitCountCollector.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestTotalHitCountCollector.java @@ -22,7 +22,7 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestTotalHitCountCollector extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTotalHits.java b/lucene/core/src/test/org/apache/lucene/search/TestTotalHits.java index 4bd74bf06a0..b27d551a46d 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestTotalHits.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestTotalHits.java @@ -18,7 +18,7 @@ package org.apache.lucene.search; import com.carrotsearch.randomizedtesting.RandomizedTest; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestTotalHits extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestUsageTrackingFilterCachingPolicy.java b/lucene/core/src/test/org/apache/lucene/search/TestUsageTrackingFilterCachingPolicy.java index 40e98391a7d..70205fa8a1e 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestUsageTrackingFilterCachingPolicy.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestUsageTrackingFilterCachingPolicy.java @@ -25,7 +25,7 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestUsageTrackingFilterCachingPolicy extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestWANDScorer.java b/lucene/core/src/test/org/apache/lucene/search/TestWANDScorer.java index 3d480c4588a..ea1b6efb6b0 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestWANDScorer.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestWANDScorer.java @@ -28,8 +28,8 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestWANDScorer extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestWildcard.java b/lucene/core/src/test/org/apache/lucene/search/TestWildcard.java index 4c5c2db3a11..3ecf962fd01 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestWildcard.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestWildcard.java @@ -27,7 +27,7 @@ import org.apache.lucene.index.Term; import org.apache.lucene.index.Terms; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** TestWildcard tests the '*' and '?' wildcard characters. */ public class TestWildcard extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java b/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java index 69ddd240c0e..51d2a036295 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java @@ -27,8 +27,8 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; /** * Create an index with terms from 000-999. Generates random wildcards according to patterns, and diff --git a/lucene/core/src/test/org/apache/lucene/search/TestXYPointDistanceSort.java b/lucene/core/src/test/org/apache/lucene/search/TestXYPointDistanceSort.java index 3586e50648a..462451053bb 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestXYPointDistanceSort.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestXYPointDistanceSort.java @@ -28,8 +28,8 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.SerialMergeScheduler; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; /** Simple tests for {@link XYDocValuesField#newDistanceSort} */ public class TestXYPointDistanceSort extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/similarities/TestAxiomaticSimilarity.java b/lucene/core/src/test/org/apache/lucene/search/similarities/TestAxiomaticSimilarity.java index e32e642a25d..b3c0245affa 100644 --- a/lucene/core/src/test/org/apache/lucene/search/similarities/TestAxiomaticSimilarity.java +++ b/lucene/core/src/test/org/apache/lucene/search/similarities/TestAxiomaticSimilarity.java @@ -16,7 +16,7 @@ */ package org.apache.lucene.search.similarities; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestAxiomaticSimilarity extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/similarities/TestBooleanSimilarity.java b/lucene/core/src/test/org/apache/lucene/search/similarities/TestBooleanSimilarity.java index 16316c7ae67..e0c4d6c4024 100644 --- a/lucene/core/src/test/org/apache/lucene/search/similarities/TestBooleanSimilarity.java +++ b/lucene/core/src/test/org/apache/lucene/search/similarities/TestBooleanSimilarity.java @@ -33,7 +33,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Version; public class TestBooleanSimilarity extends BaseSimilarityTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/similarities/TestClassicSimilarity.java b/lucene/core/src/test/org/apache/lucene/search/similarities/TestClassicSimilarity.java index f37a3fe4cab..ab301f0a0c1 100644 --- a/lucene/core/src/test/org/apache/lucene/search/similarities/TestClassicSimilarity.java +++ b/lucene/core/src/test/org/apache/lucene/search/similarities/TestClassicSimilarity.java @@ -36,8 +36,8 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.Version; public class TestClassicSimilarity extends BaseSimilarityTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java b/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java index 785d9cfdc77..eb7c02bc1ba 100644 --- a/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java +++ b/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java @@ -34,8 +34,8 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; /** Tests against all the similarities we have */ public class TestSimilarity2 extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java b/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java index 77788f3b347..543bf0f6713 100644 --- a/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java +++ b/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java @@ -37,9 +37,9 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.similarities.SimilarityBase.BasicSimScorer; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.Version; /** diff --git a/lucene/core/src/test/org/apache/lucene/store/BaseDataOutputTestCase.java b/lucene/core/src/test/org/apache/lucene/store/BaseDataOutputTestCase.java index 8d5e24d1716..e6907e7632b 100644 --- a/lucene/core/src/test/org/apache/lucene/store/BaseDataOutputTestCase.java +++ b/lucene/core/src/test/org/apache/lucene/store/BaseDataOutputTestCase.java @@ -27,9 +27,9 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.IOUtils.IOConsumer; -import org.apache.lucene.util.LuceneTestCase; import org.junit.Test; public abstract class BaseDataOutputTestCase extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/store/TestBufferedChecksum.java b/lucene/core/src/test/org/apache/lucene/store/TestBufferedChecksum.java index 12f296feed6..47d8be79728 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestBufferedChecksum.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestBufferedChecksum.java @@ -18,7 +18,7 @@ import java.util.zip.CRC32; import java.util.zip.Checksum; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestBufferedChecksum extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/store/TestBufferedIndexInput.java b/lucene/core/src/test/org/apache/lucene/store/TestBufferedIndexInput.java index 3a468525da6..546a2249397 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestBufferedIndexInput.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestBufferedIndexInput.java @@ -19,8 +19,8 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.util.Random; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.ArrayUtil; -import org.apache.lucene.util.LuceneTestCase; public class TestBufferedIndexInput extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/store/TestByteArrayDataInput.java b/lucene/core/src/test/org/apache/lucene/store/TestByteArrayDataInput.java index df0e8eaa5cd..1af0c152f3f 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestByteArrayDataInput.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestByteArrayDataInput.java @@ -18,7 +18,7 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestByteArrayDataInput extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/store/TestByteBuffersDataInput.java b/lucene/core/src/test/org/apache/lucene/store/TestByteBuffersDataInput.java index fdbcd42a650..c0786c56a12 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestByteBuffersDataInput.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestByteBuffersDataInput.java @@ -26,9 +26,9 @@ import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.IOUtils.IOConsumer; -import org.apache.lucene.util.LuceneTestCase; import org.junit.Test; public final class TestByteBuffersDataInput extends RandomizedTest { diff --git a/lucene/core/src/test/org/apache/lucene/store/TestByteBuffersDataOutput.java b/lucene/core/src/test/org/apache/lucene/store/TestByteBuffersDataOutput.java index 4594420fb4d..065606c3ba3 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestByteBuffersDataOutput.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestByteBuffersDataOutput.java @@ -21,10 +21,10 @@ import java.util.List; import java.util.Random; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.ArrayUtil; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.RamUsageEstimator; -import org.apache.lucene.util.TestUtil; import org.junit.Assert; import org.junit.Test; diff --git a/lucene/core/src/test/org/apache/lucene/store/TestByteBuffersDirectory.java b/lucene/core/src/test/org/apache/lucene/store/TestByteBuffersDirectory.java index c376d169647..9ebadce182c 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestByteBuffersDirectory.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestByteBuffersDirectory.java @@ -28,7 +28,7 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.IndexWriterConfig.OpenMode; -import org.apache.lucene.util.English; +import org.apache.lucene.tests.util.English; import org.junit.Test; public class TestByteBuffersDirectory extends BaseDirectoryTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/store/TestChecksumIndexInput.java b/lucene/core/src/test/org/apache/lucene/store/TestChecksumIndexInput.java index 05abce0f9a6..a23ff5dab6b 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestChecksumIndexInput.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestChecksumIndexInput.java @@ -17,8 +17,8 @@ package org.apache.lucene.store; import java.io.IOException; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestChecksumIndexInput extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/store/TestDirectory.java b/lucene/core/src/test/org/apache/lucene/store/TestDirectory.java index b0fa2ec5bf9..b81872dd33b 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestDirectory.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestDirectory.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Set; import org.apache.lucene.mockfile.ExtrasFS; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestDirectory extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java b/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java index 0ff95b4ed78..c10b79dfa67 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java @@ -36,8 +36,8 @@ import org.apache.lucene.index.TestIndexWriterReader; import org.apache.lucene.mockfile.FilterPath; import org.apache.lucene.mockfile.WindowsFS; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Constants; -import org.apache.lucene.util.TestUtil; public class TestFileSwitchDirectory extends BaseDirectoryTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/store/TestIndexOutputAlignment.java b/lucene/core/src/test/org/apache/lucene/store/TestIndexOutputAlignment.java index c71a151f42b..0570a17e119 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestIndexOutputAlignment.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestIndexOutputAlignment.java @@ -19,7 +19,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.stream.IntStream; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestIndexOutputAlignment extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/store/TestInputStreamDataInput.java b/lucene/core/src/test/org/apache/lucene/store/TestInputStreamDataInput.java index 26f8fd406b8..123cbd0964e 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestInputStreamDataInput.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestInputStreamDataInput.java @@ -21,8 +21,8 @@ import java.io.IOException; import java.io.InputStream; import java.util.Random; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; diff --git a/lucene/core/src/test/org/apache/lucene/store/TestLockFactory.java b/lucene/core/src/test/org/apache/lucene/store/TestLockFactory.java index 0c099c630dc..0b0dc2f3d21 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestLockFactory.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestLockFactory.java @@ -26,7 +26,7 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.IndexWriterConfig.OpenMode; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestLockFactory extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java b/lucene/core/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java index ee40c3aef61..2915d140073 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java @@ -30,9 +30,9 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.TermQuery; +import org.apache.lucene.tests.util.LineFileDocs; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LineFileDocs; -import org.apache.lucene.util.TestUtil; public class TestNRTCachingDirectory extends BaseDirectoryTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/store/TestNativeFSLockFactory.java b/lucene/core/src/test/org/apache/lucene/store/TestNativeFSLockFactory.java index cc1eff29ac9..f241ee6c410 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestNativeFSLockFactory.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestNativeFSLockFactory.java @@ -27,8 +27,8 @@ import java.util.Set; import org.apache.lucene.mockfile.FilterFileSystemProvider; import org.apache.lucene.mockfile.FilterPath; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.TestUtil; /** Simple tests for NativeFSLockFactory */ public class TestNativeFSLockFactory extends BaseLockFactoryTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/store/TestOutputStreamIndexOutput.java b/lucene/core/src/test/org/apache/lucene/store/TestOutputStreamIndexOutput.java index 9798dd32d87..d7e9fa57d9f 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestOutputStreamIndexOutput.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestOutputStreamIndexOutput.java @@ -19,7 +19,7 @@ import java.io.ByteArrayOutputStream; import java.nio.ByteBuffer; import java.nio.ByteOrder; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestOutputStreamIndexOutput extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/store/TestRateLimiter.java b/lucene/core/src/test/org/apache/lucene/store/TestRateLimiter.java index 137b83b20bf..5a7255e5615 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestRateLimiter.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestRateLimiter.java @@ -19,8 +19,8 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicLong; import org.apache.lucene.store.RateLimiter.SimpleRateLimiter; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.ThreadInterruptedException; /** Simple testcase for RateLimiter.SimpleRateLimiter */ diff --git a/lucene/core/src/test/org/apache/lucene/store/TestSleepingLockWrapper.java b/lucene/core/src/test/org/apache/lucene/store/TestSleepingLockWrapper.java index 55bca402310..6092d7c1967 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestSleepingLockWrapper.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestSleepingLockWrapper.java @@ -18,7 +18,7 @@ import java.io.IOException; import java.nio.file.Path; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; /** Simple tests for SleepingLockWrapper */ public class TestSleepingLockWrapper extends BaseLockFactoryTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/store/TestStressLockFactories.java b/lucene/core/src/test/org/apache/lucene/store/TestStressLockFactories.java index c364efdcf6d..0ff235389f0 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestStressLockFactories.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestStressLockFactories.java @@ -23,7 +23,7 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.SuppressForbidden; @LuceneTestCase.SuppressFileSystems("*") diff --git a/lucene/core/src/test/org/apache/lucene/util/BaseSortTestCase.java b/lucene/core/src/test/org/apache/lucene/util/BaseSortTestCase.java index 0e052995ac1..e887448578f 100644 --- a/lucene/core/src/test/org/apache/lucene/util/BaseSortTestCase.java +++ b/lucene/core/src/test/org/apache/lucene/util/BaseSortTestCase.java @@ -18,6 +18,8 @@ import java.util.Arrays; import java.util.Random; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public abstract class BaseSortTestCase extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/Test2BPagedBytes.java b/lucene/core/src/test/org/apache/lucene/util/Test2BPagedBytes.java index 764a1591e55..24d24ff7a76 100644 --- a/lucene/core/src/test/org/apache/lucene/util/Test2BPagedBytes.java +++ b/lucene/core/src/test/org/apache/lucene/util/Test2BPagedBytes.java @@ -22,7 +22,9 @@ import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; import org.apache.lucene.store.MockDirectoryWrapper; -import org.apache.lucene.util.LuceneTestCase.Monster; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.Monster; +import org.apache.lucene.tests.util.TestUtil; @Monster("You must increase heap to > 2 G to run this") public class Test2BPagedBytes extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestArrayUtil.java b/lucene/core/src/test/org/apache/lucene/util/TestArrayUtil.java index bc2c3556b09..cec1a0e3e41 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestArrayUtil.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestArrayUtil.java @@ -23,6 +23,8 @@ import java.util.Collections; import java.util.Comparator; import java.util.Random; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestArrayUtil extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestAttributeSource.java b/lucene/core/src/test/org/apache/lucene/util/TestAttributeSource.java index f4b16d7ba43..6b2f43441a3 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestAttributeSource.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestAttributeSource.java @@ -22,6 +22,7 @@ import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.*; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestAttributeSource extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestByteBlockPool.java b/lucene/core/src/test/org/apache/lucene/util/TestByteBlockPool.java index d136fd42c35..d958204b464 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestByteBlockPool.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestByteBlockPool.java @@ -20,6 +20,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestByteBlockPool extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestBytesRef.java b/lucene/core/src/test/org/apache/lucene/util/TestBytesRef.java index 004f5581738..e775e724a6e 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestBytesRef.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestBytesRef.java @@ -16,6 +16,9 @@ */ package org.apache.lucene.util; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; + public class TestBytesRef extends LuceneTestCase { public void testEmpty() { BytesRef b = new BytesRef(); diff --git a/lucene/core/src/test/org/apache/lucene/util/TestBytesRefArray.java b/lucene/core/src/test/org/apache/lucene/util/TestBytesRefArray.java index 72886a69a6b..d0cc3d3c2d3 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestBytesRefArray.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestBytesRefArray.java @@ -18,6 +18,8 @@ import java.io.IOException; import java.util.*; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestBytesRefArray extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestBytesRefHash.java b/lucene/core/src/test/org/apache/lucene/util/TestBytesRefHash.java index be1c8f5cb52..8a7db41c32a 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestBytesRefHash.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestBytesRefHash.java @@ -28,6 +28,8 @@ import java.util.TreeSet; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRefHash.MaxBytesLengthExceededException; import org.junit.Before; import org.junit.Test; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestCharsRef.java b/lucene/core/src/test/org/apache/lucene/util/TestCharsRef.java index 673c7145871..404fe73f61d 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestCharsRef.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestCharsRef.java @@ -17,6 +17,8 @@ package org.apache.lucene.util; import java.util.Arrays; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestCharsRef extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestCharsRefBuilder.java b/lucene/core/src/test/org/apache/lucene/util/TestCharsRefBuilder.java index 61a7e8ba497..5662b21a209 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestCharsRefBuilder.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestCharsRefBuilder.java @@ -16,6 +16,9 @@ */ package org.apache.lucene.util; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; + public class TestCharsRefBuilder extends LuceneTestCase { public void testAppend() { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestClassLoaderUtils.java b/lucene/core/src/test/org/apache/lucene/util/TestClassLoaderUtils.java index 92726825076..5c699794708 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestClassLoaderUtils.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestClassLoaderUtils.java @@ -18,6 +18,7 @@ import java.net.URL; import java.net.URLClassLoader; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestClassLoaderUtils extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestCloseableThreadLocal.java b/lucene/core/src/test/org/apache/lucene/util/TestCloseableThreadLocal.java index 58e0e851087..5a450bb32c7 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestCloseableThreadLocal.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestCloseableThreadLocal.java @@ -16,6 +16,8 @@ */ package org.apache.lucene.util; +import org.apache.lucene.tests.util.LuceneTestCase; + public class TestCloseableThreadLocal extends LuceneTestCase { public static final String TEST_VALUE = "initvaluetest"; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestCollectionUtil.java b/lucene/core/src/test/org/apache/lucene/util/TestCollectionUtil.java index fa95487fdc4..d9a93860551 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestCollectionUtil.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestCollectionUtil.java @@ -22,6 +22,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Random; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestCollectionUtil extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestDocIdSetBuilder.java b/lucene/core/src/test/org/apache/lucene/util/TestDocIdSetBuilder.java index 1c7171a8422..2fa146581c6 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestDocIdSetBuilder.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestDocIdSetBuilder.java @@ -22,6 +22,8 @@ import org.apache.lucene.index.TermsEnum; import org.apache.lucene.search.DocIdSet; import org.apache.lucene.search.DocIdSetIterator; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestDocIdSetBuilder extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestFilterIterator.java b/lucene/core/src/test/org/apache/lucene/util/TestFilterIterator.java index dccc48dc02f..a96cf4d40de 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestFilterIterator.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestFilterIterator.java @@ -21,6 +21,7 @@ import java.util.NoSuchElementException; import java.util.Set; import java.util.TreeSet; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestFilterIterator extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestFixedBitDocIdSet.java b/lucene/core/src/test/org/apache/lucene/util/TestFixedBitDocIdSet.java index ea3f9f5b176..4cd4d208bc0 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestFixedBitDocIdSet.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestFixedBitDocIdSet.java @@ -18,6 +18,7 @@ import java.io.IOException; import java.util.BitSet; +import org.apache.lucene.tests.util.BaseDocIdSetTestCase; public class TestFixedBitDocIdSet extends BaseDocIdSetTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestFixedBitSet.java b/lucene/core/src/test/org/apache/lucene/util/TestFixedBitSet.java index 280ec3eb3b4..558b0590159 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestFixedBitSet.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestFixedBitSet.java @@ -20,6 +20,8 @@ import java.util.Arrays; import java.util.Random; import org.apache.lucene.search.DocIdSetIterator; +import org.apache.lucene.tests.util.BaseBitSetTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestFixedBitSet extends BaseBitSetTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestFixedLengthBytesRefArray.java b/lucene/core/src/test/org/apache/lucene/util/TestFixedLengthBytesRefArray.java index e8d4116e1d3..d962e9ccece 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestFixedLengthBytesRefArray.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestFixedLengthBytesRefArray.java @@ -19,6 +19,8 @@ import java.util.Arrays; import java.util.Comparator; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestFixedLengthBytesRefArray extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestFrequencyTrackingRingBuffer.java b/lucene/core/src/test/org/apache/lucene/util/TestFrequencyTrackingRingBuffer.java index ddab10d42d9..eea1487485f 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestFrequencyTrackingRingBuffer.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestFrequencyTrackingRingBuffer.java @@ -20,6 +20,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.RamUsageTester; public class TestFrequencyTrackingRingBuffer extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestIOUtils.java b/lucene/core/src/test/org/apache/lucene/util/TestIOUtils.java index 0319bfec192..f0e4a564ccd 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestIOUtils.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestIOUtils.java @@ -34,6 +34,7 @@ import java.util.Set; import org.apache.lucene.mockfile.FilterFileSystemProvider; import org.apache.lucene.mockfile.FilterPath; +import org.apache.lucene.tests.util.LuceneTestCase; /** Simple test methods for IOUtils */ public class TestIOUtils extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestIntArrayDocIdSet.java b/lucene/core/src/test/org/apache/lucene/util/TestIntArrayDocIdSet.java index 52d5f0de8f8..5a4112229ed 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestIntArrayDocIdSet.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestIntArrayDocIdSet.java @@ -19,6 +19,7 @@ import java.io.IOException; import java.util.BitSet; import org.apache.lucene.search.DocIdSetIterator; +import org.apache.lucene.tests.util.BaseDocIdSetTestCase; public class TestIntArrayDocIdSet extends BaseDocIdSetTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestIntroSelector.java b/lucene/core/src/test/org/apache/lucene/util/TestIntroSelector.java index ef8b40993c0..713451097c5 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestIntroSelector.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestIntroSelector.java @@ -18,6 +18,8 @@ import java.util.Arrays; import java.util.Random; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestIntroSelector extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestIntsRef.java b/lucene/core/src/test/org/apache/lucene/util/TestIntsRef.java index 8144657385a..800c2f4772a 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestIntsRef.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestIntsRef.java @@ -16,6 +16,8 @@ */ package org.apache.lucene.util; +import org.apache.lucene.tests.util.LuceneTestCase; + public class TestIntsRef extends LuceneTestCase { public void testEmpty() { IntsRef i = new IntsRef(); diff --git a/lucene/core/src/test/org/apache/lucene/util/TestLSBRadixSorter.java b/lucene/core/src/test/org/apache/lucene/util/TestLSBRadixSorter.java index 9f8f024ef1a..dbaeb84ed9a 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestLSBRadixSorter.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestLSBRadixSorter.java @@ -17,6 +17,8 @@ package org.apache.lucene.util; import java.util.Arrays; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.packed.PackedInts; public class TestLSBRadixSorter extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestLongBitSet.java b/lucene/core/src/test/org/apache/lucene/util/TestLongBitSet.java index 9d534f3b550..24b2f5b8c52 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestLongBitSet.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestLongBitSet.java @@ -17,6 +17,8 @@ package org.apache.lucene.util; import java.io.IOException; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestLongBitSet extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestLongHeap.java b/lucene/core/src/test/org/apache/lucene/util/TestLongHeap.java index 9f2e3ba93b1..fa1a449b45a 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestLongHeap.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestLongHeap.java @@ -21,6 +21,8 @@ import java.util.ArrayList; import java.util.Random; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestLongHeap extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestLongsRef.java b/lucene/core/src/test/org/apache/lucene/util/TestLongsRef.java index 75437d8b6a4..f8c15d94ce9 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestLongsRef.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestLongsRef.java @@ -16,6 +16,8 @@ */ package org.apache.lucene.util; +import org.apache.lucene.tests.util.LuceneTestCase; + public class TestLongsRef extends LuceneTestCase { public void testEmpty() { LongsRef i = new LongsRef(); diff --git a/lucene/core/src/test/org/apache/lucene/util/TestMSBRadixSorter.java b/lucene/core/src/test/org/apache/lucene/util/TestMSBRadixSorter.java index c2a9d75e5d0..304b9f6e510 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestMSBRadixSorter.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestMSBRadixSorter.java @@ -19,6 +19,8 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestMSBRadixSorter extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestMathUtil.java b/lucene/core/src/test/org/apache/lucene/util/TestMathUtil.java index cd1ac5fea2a..1d8f0c3583f 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestMathUtil.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestMathUtil.java @@ -19,6 +19,7 @@ import com.carrotsearch.randomizedtesting.generators.RandomPicks; import java.math.BigInteger; import java.util.Arrays; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestMathUtil extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestMergedIterator.java b/lucene/core/src/test/org/apache/lucene/util/TestMergedIterator.java index d5a654630cb..36e03278314 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestMergedIterator.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestMergedIterator.java @@ -21,6 +21,7 @@ import java.util.Iterator; import java.util.List; import java.util.Random; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestMergedIterator extends LuceneTestCase { private static final int REPEATS = 2; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestNamedSPILoader.java b/lucene/core/src/test/org/apache/lucene/util/TestNamedSPILoader.java index 62ff9d1b642..ce8c7b77f2b 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestNamedSPILoader.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestNamedSPILoader.java @@ -18,6 +18,8 @@ import java.util.Set; import org.apache.lucene.codecs.Codec; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; // TODO: maybe we should test this with mocks, but it's easy // enough to test the basics via Codec diff --git a/lucene/core/src/test/org/apache/lucene/util/TestNotDocIdSet.java b/lucene/core/src/test/org/apache/lucene/util/TestNotDocIdSet.java index be52a7cd7cb..c747f97e18c 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestNotDocIdSet.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestNotDocIdSet.java @@ -19,6 +19,7 @@ import java.io.IOException; import java.util.BitSet; import org.apache.lucene.search.DocIdSet; +import org.apache.lucene.tests.util.BaseDocIdSetTestCase; public class TestNotDocIdSet extends BaseDocIdSetTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestNumericUtils.java b/lucene/core/src/test/org/apache/lucene/util/TestNumericUtils.java index 619607ff366..9089b5b4c53 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestNumericUtils.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestNumericUtils.java @@ -18,6 +18,8 @@ import java.math.BigInteger; import java.util.Arrays; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; /** Tests for NumericUtils static methods. */ public class TestNumericUtils extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestOfflineSorter.java b/lucene/core/src/test/org/apache/lucene/util/TestOfflineSorter.java index 627ac1ba777..9ba3fbe68cd 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestOfflineSorter.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestOfflineSorter.java @@ -36,6 +36,8 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.OfflineSorter.BufferSize; import org.apache.lucene.util.OfflineSorter.ByteSequencesWriter; import org.apache.lucene.util.OfflineSorter.SortInfo; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestPagedBytes.java b/lucene/core/src/test/org/apache/lucene/util/TestPagedBytes.java index 7bdf4b0b85e..db36968bdf7 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestPagedBytes.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestPagedBytes.java @@ -25,6 +25,9 @@ import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.RamUsageTester; +import org.apache.lucene.tests.util.TestUtil; import org.junit.Ignore; public class TestPagedBytes extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestPriorityQueue.java b/lucene/core/src/test/org/apache/lucene/util/TestPriorityQueue.java index b580d140a40..b6e131a38d6 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestPriorityQueue.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestPriorityQueue.java @@ -21,6 +21,8 @@ import java.util.List; import java.util.NoSuchElementException; import java.util.Random; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestQueryBuilder.java b/lucene/core/src/test/org/apache/lucene/util/TestQueryBuilder.java index e7cafbeeb3d..259f675c454 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestQueryBuilder.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestQueryBuilder.java @@ -39,6 +39,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.SynonymQuery; import org.apache.lucene.search.TermQuery; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.automaton.CharacterRunAutomaton; import org.apache.lucene.util.automaton.RegExp; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestRadixSelector.java b/lucene/core/src/test/org/apache/lucene/util/TestRadixSelector.java index ee9ce7685df..1f60dfb3555 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestRadixSelector.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestRadixSelector.java @@ -17,6 +17,8 @@ package org.apache.lucene.util; import java.util.Arrays; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestRadixSelector extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestRamUsageEstimator.java b/lucene/core/src/test/org/apache/lucene/util/TestRamUsageEstimator.java index f120af50b9b..5e405b912a4 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestRamUsageEstimator.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestRamUsageEstimator.java @@ -16,8 +16,8 @@ */ package org.apache.lucene.util; +import static org.apache.lucene.tests.util.RamUsageTester.ramUsed; import static org.apache.lucene.util.RamUsageEstimator.*; -import static org.apache.lucene.util.RamUsageTester.ramUsed; import java.util.ArrayList; import java.util.Arrays; @@ -31,6 +31,7 @@ import org.apache.lucene.search.DisjunctionMaxQuery; import org.apache.lucene.search.PhraseQuery; import org.apache.lucene.search.TermQuery; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestRamUsageEstimator extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestRecyclingByteBlockAllocator.java b/lucene/core/src/test/org/apache/lucene/util/TestRecyclingByteBlockAllocator.java index 7411b9be588..6a85f555da7 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestRecyclingByteBlockAllocator.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestRecyclingByteBlockAllocator.java @@ -19,6 +19,7 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Before; import org.junit.Test; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestRecyclingIntBlockAllocator.java b/lucene/core/src/test/org/apache/lucene/util/TestRecyclingIntBlockAllocator.java index efcdef91c87..bb9bc8792b5 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestRecyclingIntBlockAllocator.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestRecyclingIntBlockAllocator.java @@ -19,6 +19,7 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Before; import org.junit.Test; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestRoaringDocIdSet.java b/lucene/core/src/test/org/apache/lucene/util/TestRoaringDocIdSet.java index cae43dcafc1..fed8075b0f2 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestRoaringDocIdSet.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestRoaringDocIdSet.java @@ -18,6 +18,7 @@ import java.io.IOException; import java.util.BitSet; +import org.apache.lucene.tests.util.BaseDocIdSetTestCase; public class TestRoaringDocIdSet extends BaseDocIdSetTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestRollingBuffer.java b/lucene/core/src/test/org/apache/lucene/util/TestRollingBuffer.java index 2bfd913eea9..45fc3a01171 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestRollingBuffer.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestRollingBuffer.java @@ -17,6 +17,7 @@ package org.apache.lucene.util; import java.util.Random; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestRollingBuffer extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestSentinelIntSet.java b/lucene/core/src/test/org/apache/lucene/util/TestSentinelIntSet.java index 93e317cdc33..17424a276a3 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestSentinelIntSet.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestSentinelIntSet.java @@ -17,6 +17,7 @@ package org.apache.lucene.util; import java.util.HashSet; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; /** */ diff --git a/lucene/core/src/test/org/apache/lucene/util/TestSetOnce.java b/lucene/core/src/test/org/apache/lucene/util/TestSetOnce.java index bf237136bf9..72f4d269ef2 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestSetOnce.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestSetOnce.java @@ -17,6 +17,7 @@ package org.apache.lucene.util; import java.util.Random; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.SetOnce.AlreadySetException; import org.junit.Test; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestSloppyMath.java b/lucene/core/src/test/org/apache/lucene/util/TestSloppyMath.java index 8ef8aab8512..a06d278953e 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestSloppyMath.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestSloppyMath.java @@ -23,6 +23,7 @@ import java.util.Random; import org.apache.lucene.geo.GeoTestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestSloppyMath extends LuceneTestCase { // accuracy for cos() diff --git a/lucene/core/src/test/org/apache/lucene/util/TestSmallFloat.java b/lucene/core/src/test/org/apache/lucene/util/TestSmallFloat.java index 54483040fbc..4bd1c982fcd 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestSmallFloat.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestSmallFloat.java @@ -17,6 +17,8 @@ package org.apache.lucene.util; import java.util.Arrays; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.junit.Ignore; public class TestSmallFloat extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestSparseFixedBitDocIdSet.java b/lucene/core/src/test/org/apache/lucene/util/TestSparseFixedBitDocIdSet.java index 93832298733..ef648c2ce45 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestSparseFixedBitDocIdSet.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestSparseFixedBitDocIdSet.java @@ -21,6 +21,7 @@ import java.util.BitSet; import java.util.Collections; import java.util.List; +import org.apache.lucene.tests.util.BaseDocIdSetTestCase; public class TestSparseFixedBitDocIdSet extends BaseDocIdSetTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestSparseFixedBitSet.java b/lucene/core/src/test/org/apache/lucene/util/TestSparseFixedBitSet.java index e84bcdf75a8..594fbf57245 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestSparseFixedBitSet.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestSparseFixedBitSet.java @@ -18,6 +18,8 @@ import java.io.IOException; import org.apache.lucene.search.DocIdSetIterator; +import org.apache.lucene.tests.util.BaseBitSetTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestSparseFixedBitSet extends BaseBitSetTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestStableMSBRadixSorter.java b/lucene/core/src/test/org/apache/lucene/util/TestStableMSBRadixSorter.java index 387b6b60d0c..4e7e0621727 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestStableMSBRadixSorter.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestStableMSBRadixSorter.java @@ -19,6 +19,8 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestStableMSBRadixSorter extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestStressRamUsageEstimator.java b/lucene/core/src/test/org/apache/lucene/util/TestStressRamUsageEstimator.java index 6e9ff7e576e..fe77b6b6d5d 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestStressRamUsageEstimator.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestStressRamUsageEstimator.java @@ -16,6 +16,8 @@ */ package org.apache.lucene.util; +import org.apache.lucene.tests.util.LuceneTestCase; + /** * Estimates how {@link RamUsageEstimator} estimates physical memory consumption of Java objects. */ diff --git a/lucene/core/src/test/org/apache/lucene/util/TestStringHelper.java b/lucene/core/src/test/org/apache/lucene/util/TestStringHelper.java index ea8b98fbe39..b78c9a07bb9 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestStringHelper.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestStringHelper.java @@ -16,6 +16,8 @@ */ package org.apache.lucene.util; +import org.apache.lucene.tests.util.LuceneTestCase; + public class TestStringHelper extends LuceneTestCase { public void testBytesDifference() { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestStringMSBRadixSorter.java b/lucene/core/src/test/org/apache/lucene/util/TestStringMSBRadixSorter.java index 1065913afb9..aa06ac78635 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestStringMSBRadixSorter.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestStringMSBRadixSorter.java @@ -17,6 +17,8 @@ package org.apache.lucene.util; import java.util.Arrays; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestStringMSBRadixSorter extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestTimSorter.java b/lucene/core/src/test/org/apache/lucene/util/TestTimSorter.java index a2b857ed3e8..e256c09694e 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestTimSorter.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestTimSorter.java @@ -17,6 +17,7 @@ package org.apache.lucene.util; import java.util.Comparator; +import org.apache.lucene.tests.util.TestUtil; public class TestTimSorter extends BaseSortTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestTimSorterWorstCase.java b/lucene/core/src/test/org/apache/lucene/util/TestTimSorterWorstCase.java index d1bb3fb769c..fab69c5f686 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestTimSorterWorstCase.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestTimSorterWorstCase.java @@ -19,7 +19,8 @@ import com.carrotsearch.randomizedtesting.generators.RandomNumbers; import java.util.LinkedList; import java.util.List; -import org.apache.lucene.util.LuceneTestCase.Nightly; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.Nightly; import org.apache.lucene.util.packed.PackedInts; @Nightly diff --git a/lucene/core/src/test/org/apache/lucene/util/TestUnicodeUtil.java b/lucene/core/src/test/org/apache/lucene/util/TestUnicodeUtil.java index 065e47e27e8..8e0348b706c 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestUnicodeUtil.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestUnicodeUtil.java @@ -17,6 +17,8 @@ package org.apache.lucene.util; import java.util.Arrays; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; /* * Some of this code came from the excellent Unicode diff --git a/lucene/core/src/test/org/apache/lucene/util/TestVectorUtil.java b/lucene/core/src/test/org/apache/lucene/util/TestVectorUtil.java index ae85c7bef46..54ed53efdb1 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestVectorUtil.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestVectorUtil.java @@ -17,6 +17,7 @@ package org.apache.lucene.util; import java.util.Random; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestVectorUtil extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestVersion.java b/lucene/core/src/test/org/apache/lucene/util/TestVersion.java index d8f506b3ea6..16e392afb75 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestVersion.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestVersion.java @@ -21,6 +21,7 @@ import java.text.ParseException; import java.util.Locale; import java.util.Random; +import org.apache.lucene.tests.util.LuceneTestCase; @SuppressWarnings("deprecation") public class TestVersion extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestVirtualMethod.java b/lucene/core/src/test/org/apache/lucene/util/TestVirtualMethod.java index 45e706efcdd..d642fbf54a6 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestVirtualMethod.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestVirtualMethod.java @@ -16,6 +16,8 @@ */ package org.apache.lucene.util; +import org.apache.lucene.tests.util.LuceneTestCase; + public class TestVirtualMethod extends LuceneTestCase { private static final VirtualMethod publicTestMethod = new VirtualMethod<>(Base.class, "publicTest", String.class); diff --git a/lucene/core/src/test/org/apache/lucene/util/TestWeakIdentityMap.java b/lucene/core/src/test/org/apache/lucene/util/TestWeakIdentityMap.java index 6f5a7bd823e..3db8540e30a 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestWeakIdentityMap.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestWeakIdentityMap.java @@ -23,6 +23,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReferenceArray; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestWeakIdentityMap extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/automaton/TestAutomaton.java b/lucene/core/src/test/org/apache/lucene/util/automaton/TestAutomaton.java index c40891f4e4f..aba4107ebab 100644 --- a/lucene/core/src/test/org/apache/lucene/util/automaton/TestAutomaton.java +++ b/lucene/core/src/test/org/apache/lucene/util/automaton/TestAutomaton.java @@ -26,14 +26,15 @@ import java.util.Iterator; import java.util.List; import java.util.Set; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; +import org.apache.lucene.tests.util.automaton.AutomatonTestUtil; +import org.apache.lucene.tests.util.automaton.AutomatonTestUtil.RandomAcceptedStrings; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.IntsRef; import org.apache.lucene.util.IntsRefBuilder; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.UnicodeUtil; -import org.apache.lucene.util.automaton.AutomatonTestUtil.RandomAcceptedStrings; import org.apache.lucene.util.fst.Util; public class TestAutomaton extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/automaton/TestCompiledAutomaton.java b/lucene/core/src/test/org/apache/lucene/util/automaton/TestCompiledAutomaton.java index da9d68f846a..d24bed8c793 100644 --- a/lucene/core/src/test/org/apache/lucene/util/automaton/TestCompiledAutomaton.java +++ b/lucene/core/src/test/org/apache/lucene/util/automaton/TestCompiledAutomaton.java @@ -22,10 +22,10 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestCompiledAutomaton extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/automaton/TestDaciukMihovAutomatonBuilder.java b/lucene/core/src/test/org/apache/lucene/util/automaton/TestDaciukMihovAutomatonBuilder.java index db79e94f744..4b31eda98c6 100644 --- a/lucene/core/src/test/org/apache/lucene/util/automaton/TestDaciukMihovAutomatonBuilder.java +++ b/lucene/core/src/test/org/apache/lucene/util/automaton/TestDaciukMihovAutomatonBuilder.java @@ -18,9 +18,9 @@ import java.util.Arrays; import java.util.Collections; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; public class TestDaciukMihovAutomatonBuilder extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/automaton/TestDeterminism.java b/lucene/core/src/test/org/apache/lucene/util/automaton/TestDeterminism.java index b3a42380349..65616fa55b9 100644 --- a/lucene/core/src/test/org/apache/lucene/util/automaton/TestDeterminism.java +++ b/lucene/core/src/test/org/apache/lucene/util/automaton/TestDeterminism.java @@ -18,7 +18,8 @@ import static org.apache.lucene.util.automaton.Operations.DEFAULT_DETERMINIZE_WORK_LIMIT; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.automaton.AutomatonTestUtil; /** Not completely thorough, but tries to test determinism correctness somewhat randomly. */ public class TestDeterminism extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/automaton/TestDeterminizeLexicon.java b/lucene/core/src/test/org/apache/lucene/util/automaton/TestDeterminizeLexicon.java index 557c8ebbc61..6aef1562522 100644 --- a/lucene/core/src/test/org/apache/lucene/util/automaton/TestDeterminizeLexicon.java +++ b/lucene/core/src/test/org/apache/lucene/util/automaton/TestDeterminizeLexicon.java @@ -20,8 +20,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; /** * Not thorough, but tries to test determinism correctness somewhat randomly, by determinizing a diff --git a/lucene/core/src/test/org/apache/lucene/util/automaton/TestFiniteStringsIterator.java b/lucene/core/src/test/org/apache/lucene/util/automaton/TestFiniteStringsIterator.java index 8a1f4b59610..8070d7af479 100644 --- a/lucene/core/src/test/org/apache/lucene/util/automaton/TestFiniteStringsIterator.java +++ b/lucene/core/src/test/org/apache/lucene/util/automaton/TestFiniteStringsIterator.java @@ -23,11 +23,12 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; +import org.apache.lucene.tests.util.automaton.AutomatonTestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IntsRef; import org.apache.lucene.util.IntsRefBuilder; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.fst.Util; /** Test for {@link FiniteStringsIterator}. */ diff --git a/lucene/core/src/test/org/apache/lucene/util/automaton/TestIntSet.java b/lucene/core/src/test/org/apache/lucene/util/automaton/TestIntSet.java index 6ffdd6bc746..5b02437a38f 100644 --- a/lucene/core/src/test/org/apache/lucene/util/automaton/TestIntSet.java +++ b/lucene/core/src/test/org/apache/lucene/util/automaton/TestIntSet.java @@ -16,7 +16,7 @@ */ package org.apache.lucene.util.automaton; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; public class TestIntSet extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/automaton/TestLevenshteinAutomata.java b/lucene/core/src/test/org/apache/lucene/util/automaton/TestLevenshteinAutomata.java index 871109940b4..c112fd3fbc1 100644 --- a/lucene/core/src/test/org/apache/lucene/util/automaton/TestLevenshteinAutomata.java +++ b/lucene/core/src/test/org/apache/lucene/util/automaton/TestLevenshteinAutomata.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestLevenshteinAutomata extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/automaton/TestLimitedFiniteStringsIterator.java b/lucene/core/src/test/org/apache/lucene/util/automaton/TestLimitedFiniteStringsIterator.java index 2299df36da9..f99e41d5b09 100644 --- a/lucene/core/src/test/org/apache/lucene/util/automaton/TestLimitedFiniteStringsIterator.java +++ b/lucene/core/src/test/org/apache/lucene/util/automaton/TestLimitedFiniteStringsIterator.java @@ -19,10 +19,11 @@ import static org.apache.lucene.util.automaton.TestFiniteStringsIterator.getFiniteStrings; import java.util.List; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; +import org.apache.lucene.tests.util.automaton.AutomatonTestUtil; import org.apache.lucene.util.IntsRef; import org.apache.lucene.util.IntsRefBuilder; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.fst.Util; /** Test for {@link FiniteStringsIterator}. */ diff --git a/lucene/core/src/test/org/apache/lucene/util/automaton/TestMinimize.java b/lucene/core/src/test/org/apache/lucene/util/automaton/TestMinimize.java index 343ad8e2380..a43cc8ae8b1 100644 --- a/lucene/core/src/test/org/apache/lucene/util/automaton/TestMinimize.java +++ b/lucene/core/src/test/org/apache/lucene/util/automaton/TestMinimize.java @@ -16,7 +16,8 @@ */ package org.apache.lucene.util.automaton; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.automaton.AutomatonTestUtil; /** This test builds some randomish NFA/DFA and minimizes them. */ public class TestMinimize extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/automaton/TestOperations.java b/lucene/core/src/test/org/apache/lucene/util/automaton/TestOperations.java index f561275dc7a..55131c78126 100644 --- a/lucene/core/src/test/org/apache/lucene/util/automaton/TestOperations.java +++ b/lucene/core/src/test/org/apache/lucene/util/automaton/TestOperations.java @@ -20,6 +20,9 @@ import com.carrotsearch.randomizedtesting.generators.RandomNumbers; import java.util.*; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; +import org.apache.lucene.tests.util.automaton.AutomatonTestUtil; import org.apache.lucene.util.*; public class TestOperations extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/automaton/TestRegExp.java b/lucene/core/src/test/org/apache/lucene/util/automaton/TestRegExp.java index 7d6d9342228..eedf07caa46 100644 --- a/lucene/core/src/test/org/apache/lucene/util/automaton/TestRegExp.java +++ b/lucene/core/src/test/org/apache/lucene/util/automaton/TestRegExp.java @@ -18,8 +18,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; public class TestRegExp extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/automaton/TestRegExpParsing.java b/lucene/core/src/test/org/apache/lucene/util/automaton/TestRegExpParsing.java index 9671f1b1c12..7d0f062f36b 100644 --- a/lucene/core/src/test/org/apache/lucene/util/automaton/TestRegExpParsing.java +++ b/lucene/core/src/test/org/apache/lucene/util/automaton/TestRegExpParsing.java @@ -19,7 +19,7 @@ import java.io.IOException; import java.util.Map; import java.util.Set; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** * Simple unit tests for RegExp parsing. diff --git a/lucene/core/src/test/org/apache/lucene/util/automaton/TestUTF32ToUTF8.java b/lucene/core/src/test/org/apache/lucene/util/automaton/TestUTF32ToUTF8.java index ec191923502..89400fc6f72 100644 --- a/lucene/core/src/test/org/apache/lucene/util/automaton/TestUTF32ToUTF8.java +++ b/lucene/core/src/test/org/apache/lucene/util/automaton/TestUTF32ToUTF8.java @@ -20,11 +20,12 @@ import java.util.HashSet; import java.util.Random; import java.util.Set; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; +import org.apache.lucene.tests.util.automaton.AutomatonTestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IntsRef; import org.apache.lucene.util.IntsRefBuilder; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.UnicodeUtil; import org.apache.lucene.util.fst.Util; diff --git a/lucene/core/src/test/org/apache/lucene/util/bkd/Test2BBKDPoints.java b/lucene/core/src/test/org/apache/lucene/util/bkd/Test2BBKDPoints.java index 09707fedb95..28bbf2da0ce 100644 --- a/lucene/core/src/test/org/apache/lucene/util/bkd/Test2BBKDPoints.java +++ b/lucene/core/src/test/org/apache/lucene/util/bkd/Test2BBKDPoints.java @@ -24,8 +24,8 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.Monster; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.Monster; import org.apache.lucene.util.NumericUtils; // e.g. run like this: ant test -Dtestcase=Test2BBKDPoints -Dtests.nightly=true -Dtests.verbose=true diff --git a/lucene/core/src/test/org/apache/lucene/util/bkd/TestBKD.java b/lucene/core/src/test/org/apache/lucene/util/bkd/TestBKD.java index c7ffeaa6b90..3b0e54b3ec5 100644 --- a/lucene/core/src/test/org/apache/lucene/util/bkd/TestBKD.java +++ b/lucene/core/src/test/org/apache/lucene/util/bkd/TestBKD.java @@ -38,11 +38,11 @@ import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.NumericUtils; -import org.apache.lucene.util.TestUtil; public class TestBKD extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/bkd/TestBKDRadixSelector.java b/lucene/core/src/test/org/apache/lucene/util/bkd/TestBKDRadixSelector.java index 465f1dd947c..807daef88d4 100644 --- a/lucene/core/src/test/org/apache/lucene/util/bkd/TestBKDRadixSelector.java +++ b/lucene/core/src/test/org/apache/lucene/util/bkd/TestBKDRadixSelector.java @@ -20,10 +20,10 @@ import java.io.IOException; import java.util.Arrays; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.NumericUtils; -import org.apache.lucene.util.TestUtil; public class TestBKDRadixSelector extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/bkd/TestBKDRadixSort.java b/lucene/core/src/test/org/apache/lucene/util/bkd/TestBKDRadixSort.java index 0b1750b6b75..807f2304aaa 100644 --- a/lucene/core/src/test/org/apache/lucene/util/bkd/TestBKDRadixSort.java +++ b/lucene/core/src/test/org/apache/lucene/util/bkd/TestBKDRadixSort.java @@ -20,9 +20,9 @@ import java.io.IOException; import java.util.Arrays; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestBKDRadixSort extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/bkd/TestBKDUtil.java b/lucene/core/src/test/org/apache/lucene/util/bkd/TestBKDUtil.java index e264fc691f7..fa123a8b1fa 100644 --- a/lucene/core/src/test/org/apache/lucene/util/bkd/TestBKDUtil.java +++ b/lucene/core/src/test/org/apache/lucene/util/bkd/TestBKDUtil.java @@ -16,8 +16,8 @@ */ package org.apache.lucene.util.bkd; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestBKDUtil extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/bkd/TestDocIdsWriter.java b/lucene/core/src/test/org/apache/lucene/util/bkd/TestDocIdsWriter.java index 80d0d9f6e82..5b2281d6b36 100644 --- a/lucene/core/src/test/org/apache/lucene/util/bkd/TestDocIdsWriter.java +++ b/lucene/core/src/test/org/apache/lucene/util/bkd/TestDocIdsWriter.java @@ -26,8 +26,8 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestDocIdsWriter extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/bkd/TestMutablePointTreeReaderUtils.java b/lucene/core/src/test/org/apache/lucene/util/bkd/TestMutablePointTreeReaderUtils.java index e25824a3493..8c468bf5478 100644 --- a/lucene/core/src/test/org/apache/lucene/util/bkd/TestMutablePointTreeReaderUtils.java +++ b/lucene/core/src/test/org/apache/lucene/util/bkd/TestMutablePointTreeReaderUtils.java @@ -20,10 +20,10 @@ import java.util.Comparator; import org.apache.lucene.codecs.MutablePointTree; import org.apache.lucene.index.PointValues; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestMutablePointTreeReaderUtils extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/compress/LZ4TestCase.java b/lucene/core/src/test/org/apache/lucene/util/compress/LZ4TestCase.java index a9380e35216..8d8dfaeb978 100644 --- a/lucene/core/src/test/org/apache/lucene/util/compress/LZ4TestCase.java +++ b/lucene/core/src/test/org/apache/lucene/util/compress/LZ4TestCase.java @@ -22,9 +22,9 @@ import java.util.Random; import org.apache.lucene.store.ByteArrayDataInput; import org.apache.lucene.store.ByteBuffersDataOutput; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.ArrayUtil; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public abstract class LZ4TestCase extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/compress/TestLowercaseAsciiCompression.java b/lucene/core/src/test/org/apache/lucene/util/compress/TestLowercaseAsciiCompression.java index 0b06e462f8a..fd8374575e8 100644 --- a/lucene/core/src/test/org/apache/lucene/util/compress/TestLowercaseAsciiCompression.java +++ b/lucene/core/src/test/org/apache/lucene/util/compress/TestLowercaseAsciiCompression.java @@ -20,9 +20,9 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import org.apache.lucene.store.ByteBuffersDataOutput; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.ArrayUtil; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestLowercaseAsciiCompression extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/fst/Test2BFST.java b/lucene/core/src/test/org/apache/lucene/util/fst/Test2BFST.java index 350f8558583..cfd06d90a1e 100644 --- a/lucene/core/src/test/org/apache/lucene/util/fst/Test2BFST.java +++ b/lucene/core/src/test/org/apache/lucene/util/fst/Test2BFST.java @@ -24,10 +24,10 @@ import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; import org.apache.lucene.store.MMapDirectory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TimeUnits; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IntsRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TimeUnits; import org.junit.Ignore; @Ignore("Requires tons of heap to run (30 GB hits OOME but 35 GB passes after ~4.5 hours)") diff --git a/lucene/core/src/test/org/apache/lucene/util/fst/TestBitTableUtil.java b/lucene/core/src/test/org/apache/lucene/util/fst/TestBitTableUtil.java index 8155f7d8592..00280c2bc51 100644 --- a/lucene/core/src/test/org/apache/lucene/util/fst/TestBitTableUtil.java +++ b/lucene/core/src/test/org/apache/lucene/util/fst/TestBitTableUtil.java @@ -18,7 +18,7 @@ package org.apache.lucene.util.fst; import java.io.IOException; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestBitTableUtil extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/fst/TestBytesStore.java b/lucene/core/src/test/org/apache/lucene/util/fst/TestBytesStore.java index 4fd823bbeb7..20a4e918e6b 100644 --- a/lucene/core/src/test/org/apache/lucene/util/fst/TestBytesStore.java +++ b/lucene/core/src/test/org/apache/lucene/util/fst/TestBytesStore.java @@ -21,8 +21,8 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestBytesStore extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTDirectAddressing.java b/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTDirectAddressing.java index 60f727c7338..25e780e371f 100644 --- a/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTDirectAddressing.java +++ b/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTDirectAddressing.java @@ -34,10 +34,10 @@ import org.apache.lucene.store.ByteArrayDataInput; import org.apache.lucene.store.DataInput; import org.apache.lucene.store.InputStreamDataInput; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.CharsRef; import org.apache.lucene.util.IntsRefBuilder; -import org.apache.lucene.util.LuceneTestCase; public class TestFSTDirectAddressing extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java b/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java index bace8409521..4aafdb1f65d 100644 --- a/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java +++ b/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java @@ -16,9 +16,9 @@ */ package org.apache.lucene.util.fst; -import static org.apache.lucene.util.fst.FSTTester.getRandomString; -import static org.apache.lucene.util.fst.FSTTester.simpleRandomString; -import static org.apache.lucene.util.fst.FSTTester.toIntsRef; +import static org.apache.lucene.tests.util.fst.FSTTester.getRandomString; +import static org.apache.lucene.tests.util.fst.FSTTester.simpleRandomString; +import static org.apache.lucene.tests.util.fst.FSTTester.toIntsRef; import java.io.BufferedReader; import java.io.IOException; @@ -61,14 +61,15 @@ import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.util.LineFileDocs; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; +import org.apache.lucene.tests.util.TestUtil; +import org.apache.lucene.tests.util.fst.FSTTester; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.IntsRef; import org.apache.lucene.util.IntsRefBuilder; -import org.apache.lucene.util.LineFileDocs; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.automaton.Automata; import org.apache.lucene.util.automaton.Automaton; import org.apache.lucene.util.automaton.CompiledAutomaton; diff --git a/lucene/core/src/test/org/apache/lucene/util/fst/TestUtil.java b/lucene/core/src/test/org/apache/lucene/util/fst/TestUtil.java index 17295c55846..1eeb592de9a 100644 --- a/lucene/core/src/test/org/apache/lucene/util/fst/TestUtil.java +++ b/lucene/core/src/test/org/apache/lucene/util/fst/TestUtil.java @@ -18,9 +18,9 @@ import java.util.Arrays; import java.util.List; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IntsRefBuilder; -import org.apache.lucene.util.LuceneTestCase; public class TestUtil extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/graph/TestGraphTokenStreamFiniteStrings.java b/lucene/core/src/test/org/apache/lucene/util/graph/TestGraphTokenStreamFiniteStrings.java index f7dbaf1feb2..11da16ccf61 100644 --- a/lucene/core/src/test/org/apache/lucene/util/graph/TestGraphTokenStreamFiniteStrings.java +++ b/lucene/core/src/test/org/apache/lucene/util/graph/TestGraphTokenStreamFiniteStrings.java @@ -24,7 +24,7 @@ import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; import org.apache.lucene.analysis.tokenattributes.PositionLengthAttribute; import org.apache.lucene.index.Term; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** {@link GraphTokenStreamFiniteStrings} tests. */ public class TestGraphTokenStreamFiniteStrings extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/hnsw/MockVectorValues.java b/lucene/core/src/test/org/apache/lucene/util/hnsw/MockVectorValues.java index ee52a111cdf..4324a4e54a5 100644 --- a/lucene/core/src/test/org/apache/lucene/util/hnsw/MockVectorValues.java +++ b/lucene/core/src/test/org/apache/lucene/util/hnsw/MockVectorValues.java @@ -20,8 +20,8 @@ import org.apache.lucene.index.RandomAccessVectorValues; import org.apache.lucene.index.RandomAccessVectorValuesProducer; import org.apache.lucene.index.VectorValues; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; class MockVectorValues extends VectorValues implements RandomAccessVectorValues, RandomAccessVectorValuesProducer { diff --git a/lucene/core/src/test/org/apache/lucene/util/hnsw/TestHnswGraph.java b/lucene/core/src/test/org/apache/lucene/util/hnsw/TestHnswGraph.java index 69b478ca249..306c5621376 100644 --- a/lucene/core/src/test/org/apache/lucene/util/hnsw/TestHnswGraph.java +++ b/lucene/core/src/test/org/apache/lucene/util/hnsw/TestHnswGraph.java @@ -45,11 +45,11 @@ import org.apache.lucene.index.VectorSimilarityFunction; import org.apache.lucene.index.VectorValues; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.Bits; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.FixedBitSet; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.VectorUtil; /** Tests HNSW KNN graphs */ diff --git a/lucene/core/src/test/org/apache/lucene/util/hnsw/TestNeighbors.java b/lucene/core/src/test/org/apache/lucene/util/hnsw/TestNeighbors.java index 653cade1130..ef207c95dfd 100644 --- a/lucene/core/src/test/org/apache/lucene/util/hnsw/TestNeighbors.java +++ b/lucene/core/src/test/org/apache/lucene/util/hnsw/TestNeighbors.java @@ -17,7 +17,7 @@ package org.apache.lucene.util.hnsw; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestNeighbors extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/hppc/TestIntIntHashMap.java b/lucene/core/src/test/org/apache/lucene/util/hppc/TestIntIntHashMap.java index 62efe25f134..5a8598ac733 100644 --- a/lucene/core/src/test/org/apache/lucene/util/hppc/TestIntIntHashMap.java +++ b/lucene/core/src/test/org/apache/lucene/util/hppc/TestIntIntHashMap.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Random; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.After; import org.junit.Test; diff --git a/lucene/core/src/test/org/apache/lucene/util/mutable/TestMutableValues.java b/lucene/core/src/test/org/apache/lucene/util/mutable/TestMutableValues.java index da3d4f0400b..1c02b12a63d 100644 --- a/lucene/core/src/test/org/apache/lucene/util/mutable/TestMutableValues.java +++ b/lucene/core/src/test/org/apache/lucene/util/mutable/TestMutableValues.java @@ -16,8 +16,8 @@ */ package org.apache.lucene.util.mutable; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; /** Simple test of the basic contract of the various {@link MutableValue} implementaitons. */ public class TestMutableValues extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/packed/TestDirectMonotonic.java b/lucene/core/src/test/org/apache/lucene/util/packed/TestDirectMonotonic.java index 6739d44b7c6..ff7c3ccce22 100644 --- a/lucene/core/src/test/org/apache/lucene/util/packed/TestDirectMonotonic.java +++ b/lucene/core/src/test/org/apache/lucene/util/packed/TestDirectMonotonic.java @@ -25,10 +25,10 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.LongValues; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestDirectMonotonic extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/packed/TestDirectPacked.java b/lucene/core/src/test/org/apache/lucene/util/packed/TestDirectPacked.java index c4e4f98d4f4..b4e04e8d862 100644 --- a/lucene/core/src/test/org/apache/lucene/util/packed/TestDirectPacked.java +++ b/lucene/core/src/test/org/apache/lucene/util/packed/TestDirectPacked.java @@ -22,9 +22,9 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.LongValues; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestDirectPacked extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/packed/TestPackedInts.java b/lucene/core/src/test/org/apache/lucene/util/packed/TestPackedInts.java index 15875267a46..d1902028688 100644 --- a/lucene/core/src/test/org/apache/lucene/util/packed/TestPackedInts.java +++ b/lucene/core/src/test/org/apache/lucene/util/packed/TestPackedInts.java @@ -31,12 +31,12 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.RamUsageTester; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.LongValues; import org.apache.lucene.util.LongsRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.RamUsageTester; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.packed.PackedInts.Reader; import org.junit.Ignore; diff --git a/lucene/demo/src/test/org/apache/lucene/demo/TestDemo.java b/lucene/demo/src/test/org/apache/lucene/demo/TestDemo.java index da326951451..daefcd86ad2 100644 --- a/lucene/demo/src/test/org/apache/lucene/demo/TestDemo.java +++ b/lucene/demo/src/test/org/apache/lucene/demo/TestDemo.java @@ -20,7 +20,7 @@ import java.io.PrintStream; import java.nio.charset.Charset; import java.nio.file.Path; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestDemo extends LuceneTestCase { diff --git a/lucene/demo/src/test/org/apache/lucene/demo/facet/TestAssociationsFacetsExample.java b/lucene/demo/src/test/org/apache/lucene/demo/facet/TestAssociationsFacetsExample.java index ab6e76d0b36..ddb8e8f4c81 100644 --- a/lucene/demo/src/test/org/apache/lucene/demo/facet/TestAssociationsFacetsExample.java +++ b/lucene/demo/src/test/org/apache/lucene/demo/facet/TestAssociationsFacetsExample.java @@ -18,7 +18,7 @@ import java.util.List; import org.apache.lucene.facet.FacetResult; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; public class TestAssociationsFacetsExample extends LuceneTestCase { diff --git a/lucene/demo/src/test/org/apache/lucene/demo/facet/TestDistanceFacetsExample.java b/lucene/demo/src/test/org/apache/lucene/demo/facet/TestDistanceFacetsExample.java index b5a2b12e99a..5df2e63b2ef 100644 --- a/lucene/demo/src/test/org/apache/lucene/demo/facet/TestDistanceFacetsExample.java +++ b/lucene/demo/src/test/org/apache/lucene/demo/facet/TestDistanceFacetsExample.java @@ -18,7 +18,7 @@ import org.apache.lucene.facet.FacetResult; import org.apache.lucene.search.TopDocs; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestDistanceFacetsExample extends LuceneTestCase { diff --git a/lucene/demo/src/test/org/apache/lucene/demo/facet/TestExpressionAggregationFacetsExample.java b/lucene/demo/src/test/org/apache/lucene/demo/facet/TestExpressionAggregationFacetsExample.java index c7c4b1c8e5c..5f40f22d023 100644 --- a/lucene/demo/src/test/org/apache/lucene/demo/facet/TestExpressionAggregationFacetsExample.java +++ b/lucene/demo/src/test/org/apache/lucene/demo/facet/TestExpressionAggregationFacetsExample.java @@ -17,7 +17,7 @@ package org.apache.lucene.demo.facet; import org.apache.lucene.facet.FacetResult; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; public class TestExpressionAggregationFacetsExample extends LuceneTestCase { diff --git a/lucene/demo/src/test/org/apache/lucene/demo/facet/TestMultiCategoryListsFacetsExample.java b/lucene/demo/src/test/org/apache/lucene/demo/facet/TestMultiCategoryListsFacetsExample.java index 69d4bba3c76..1e4e401687c 100644 --- a/lucene/demo/src/test/org/apache/lucene/demo/facet/TestMultiCategoryListsFacetsExample.java +++ b/lucene/demo/src/test/org/apache/lucene/demo/facet/TestMultiCategoryListsFacetsExample.java @@ -18,7 +18,7 @@ import java.util.List; import org.apache.lucene.facet.FacetResult; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; public class TestMultiCategoryListsFacetsExample extends LuceneTestCase { diff --git a/lucene/demo/src/test/org/apache/lucene/demo/facet/TestRangeFacetsExample.java b/lucene/demo/src/test/org/apache/lucene/demo/facet/TestRangeFacetsExample.java index d49694db285..ccb21ce064d 100644 --- a/lucene/demo/src/test/org/apache/lucene/demo/facet/TestRangeFacetsExample.java +++ b/lucene/demo/src/test/org/apache/lucene/demo/facet/TestRangeFacetsExample.java @@ -18,7 +18,7 @@ import org.apache.lucene.facet.FacetResult; import org.apache.lucene.search.TopDocs; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; public class TestRangeFacetsExample extends LuceneTestCase { diff --git a/lucene/demo/src/test/org/apache/lucene/demo/facet/TestSimpleFacetsExample.java b/lucene/demo/src/test/org/apache/lucene/demo/facet/TestSimpleFacetsExample.java index 50cf2820cb7..30af60cc677 100644 --- a/lucene/demo/src/test/org/apache/lucene/demo/facet/TestSimpleFacetsExample.java +++ b/lucene/demo/src/test/org/apache/lucene/demo/facet/TestSimpleFacetsExample.java @@ -18,7 +18,7 @@ import java.util.List; import org.apache.lucene.facet.FacetResult; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; public class TestSimpleFacetsExample extends LuceneTestCase { diff --git a/lucene/demo/src/test/org/apache/lucene/demo/facet/TestSimpleSortedSetFacetsExample.java b/lucene/demo/src/test/org/apache/lucene/demo/facet/TestSimpleSortedSetFacetsExample.java index 624b5734d92..2f97b86834d 100644 --- a/lucene/demo/src/test/org/apache/lucene/demo/facet/TestSimpleSortedSetFacetsExample.java +++ b/lucene/demo/src/test/org/apache/lucene/demo/facet/TestSimpleSortedSetFacetsExample.java @@ -18,7 +18,7 @@ import java.util.List; import org.apache.lucene.facet.FacetResult; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; // We require sorted set DVs: diff --git a/lucene/demo/src/test/org/apache/lucene/demo/knn/TestDemoEmbeddings.java b/lucene/demo/src/test/org/apache/lucene/demo/knn/TestDemoEmbeddings.java index cbdacc3f1ab..24779b61ce4 100644 --- a/lucene/demo/src/test/org/apache/lucene/demo/knn/TestDemoEmbeddings.java +++ b/lucene/demo/src/test/org/apache/lucene/demo/knn/TestDemoEmbeddings.java @@ -21,8 +21,8 @@ import java.nio.ByteOrder; import java.nio.file.Path; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.VectorUtil; public class TestDemoEmbeddings extends LuceneTestCase { diff --git a/lucene/demo/src/test/org/apache/lucene/demo/knn/TestKnnVectorDict.java b/lucene/demo/src/test/org/apache/lucene/demo/knn/TestKnnVectorDict.java index 351fe8bb4c2..ac42fd6c294 100644 --- a/lucene/demo/src/test/org/apache/lucene/demo/knn/TestKnnVectorDict.java +++ b/lucene/demo/src/test/org/apache/lucene/demo/knn/TestKnnVectorDict.java @@ -20,8 +20,8 @@ import java.nio.file.Path; import java.util.Arrays; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; public class TestKnnVectorDict extends LuceneTestCase { diff --git a/lucene/expressions/src/test/org/apache/lucene/expressions/TestDemoExpressions.java b/lucene/expressions/src/test/org/apache/lucene/expressions/TestDemoExpressions.java index 1dba2a68ea7..4f109933abf 100644 --- a/lucene/expressions/src/test/org/apache/lucene/expressions/TestDemoExpressions.java +++ b/lucene/expressions/src/test/org/apache/lucene/expressions/TestDemoExpressions.java @@ -37,7 +37,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopFieldDocs; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** simple demo of using expressions */ public class TestDemoExpressions extends LuceneTestCase { diff --git a/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionRescorer.java b/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionRescorer.java index 56c3188d7d5..2d55f2511fc 100644 --- a/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionRescorer.java +++ b/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionRescorer.java @@ -32,7 +32,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestExpressionRescorer extends LuceneTestCase { IndexSearcher searcher; diff --git a/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSortField.java b/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSortField.java index 378cd741fec..e02fff5ed1b 100644 --- a/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSortField.java +++ b/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSortField.java @@ -19,7 +19,7 @@ import org.apache.lucene.expressions.js.JavascriptCompiler; import org.apache.lucene.search.DoubleValuesSource; import org.apache.lucene.search.SortField; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestExpressionSortField extends LuceneTestCase { diff --git a/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java b/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java index 3f33365b6b0..13b9c4ec04c 100644 --- a/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java +++ b/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java @@ -39,10 +39,10 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.English; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.ArrayUtil; -import org.apache.lucene.util.English; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; /** * Tests some basic expressions against different queries, and fieldcache/docvalues fields against diff --git a/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionValidation.java b/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionValidation.java index d62d3246a41..dbb98dbf749 100644 --- a/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionValidation.java +++ b/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionValidation.java @@ -18,7 +18,7 @@ import org.apache.lucene.expressions.js.JavascriptCompiler; import org.apache.lucene.search.DoubleValuesSource; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** Tests validation of bindings */ public class TestExpressionValidation extends LuceneTestCase { diff --git a/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionValueSource.java b/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionValueSource.java index 2d60d9828c7..ab3ab715ff5 100644 --- a/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionValueSource.java +++ b/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionValueSource.java @@ -30,7 +30,7 @@ import org.apache.lucene.search.DoubleValuesSource; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestExpressionValueSource extends LuceneTestCase { DirectoryReader reader; diff --git a/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestCustomFunctions.java b/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestCustomFunctions.java index 7789684d328..0542d7ef4ec 100644 --- a/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestCustomFunctions.java +++ b/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestCustomFunctions.java @@ -24,7 +24,7 @@ import java.util.HashMap; import java.util.Map; import org.apache.lucene.expressions.Expression; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.Opcodes; import org.objectweb.asm.Type; diff --git a/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestExpressionMath.java b/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestExpressionMath.java index 8b16730ba6e..5428a9e4e98 100644 --- a/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestExpressionMath.java +++ b/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestExpressionMath.java @@ -20,7 +20,7 @@ import static org.apache.lucene.expressions.js.ExpressionMath.haversinKilometers; import java.util.Random; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestExpressionMath extends LuceneTestCase { diff --git a/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestJavascriptCompiler.java b/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestJavascriptCompiler.java index 295eea8ea57..6c15afb1239 100644 --- a/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestJavascriptCompiler.java +++ b/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestJavascriptCompiler.java @@ -18,7 +18,7 @@ import java.text.ParseException; import org.apache.lucene.expressions.Expression; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestJavascriptCompiler extends LuceneTestCase { diff --git a/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestJavascriptFunction.java b/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestJavascriptFunction.java index d9a9859416f..3976ced9ae1 100644 --- a/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestJavascriptFunction.java +++ b/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestJavascriptFunction.java @@ -17,7 +17,7 @@ package org.apache.lucene.expressions.js; import org.apache.lucene.expressions.Expression; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestJavascriptFunction extends LuceneTestCase { private static double DELTA = 0.0000001; diff --git a/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestJavascriptOperations.java b/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestJavascriptOperations.java index ac1b125fa56..22ccc83d0eb 100644 --- a/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestJavascriptOperations.java +++ b/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestJavascriptOperations.java @@ -17,7 +17,7 @@ package org.apache.lucene.expressions.js; import org.apache.lucene.expressions.Expression; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestJavascriptOperations extends LuceneTestCase { private void assertEvaluatesTo(String expression, long expected) throws Exception { diff --git a/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestVariableContext.java b/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestVariableContext.java index a0a60d58cc9..5b75b78f071 100644 --- a/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestVariableContext.java +++ b/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestVariableContext.java @@ -21,7 +21,7 @@ import static org.apache.lucene.expressions.js.VariableContext.Type.METHOD; import static org.apache.lucene.expressions.js.VariableContext.Type.STR_INDEX; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestVariableContext extends LuceneTestCase { diff --git a/lucene/facet/src/test/org/apache/lucene/facet/FacetTestCase.java b/lucene/facet/src/test/org/apache/lucene/facet/FacetTestCase.java index 2f2976382f4..e83b3868388 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/FacetTestCase.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/FacetTestCase.java @@ -31,9 +31,9 @@ import org.apache.lucene.facet.taxonomy.TaxonomyFacetLabels.FacetLabelReader; import org.apache.lucene.facet.taxonomy.TaxonomyReader; import org.apache.lucene.search.DocIdSetIterator; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public abstract class FacetTestCase extends LuceneTestCase { diff --git a/lucene/facet/src/test/org/apache/lucene/facet/TestDrillSideways.java b/lucene/facet/src/test/org/apache/lucene/facet/TestDrillSideways.java index 4250fbf7332..12ea12afcd0 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/TestDrillSideways.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/TestDrillSideways.java @@ -75,12 +75,12 @@ import org.apache.lucene.search.TwoPhaseIterator; import org.apache.lucene.search.Weight; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.InPlaceMergeSorter; import org.apache.lucene.util.InfoStream; import org.apache.lucene.util.NamedThreadFactory; -import org.apache.lucene.util.TestUtil; public class TestDrillSideways extends FacetTestCase { diff --git a/lucene/facet/src/test/org/apache/lucene/facet/TestFacetUtils.java b/lucene/facet/src/test/org/apache/lucene/facet/TestFacetUtils.java index 910a329c276..67d58db09ce 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/TestFacetUtils.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/TestFacetUtils.java @@ -30,10 +30,10 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.Bits; import org.apache.lucene.util.FixedBitSet; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; public class TestFacetUtils extends LuceneTestCase { diff --git a/lucene/facet/src/test/org/apache/lucene/facet/TestFacetsConfig.java b/lucene/facet/src/test/org/apache/lucene/facet/TestFacetsConfig.java index fc15cf240e0..f53d538b78b 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/TestFacetsConfig.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/TestFacetsConfig.java @@ -26,8 +26,8 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.TestUtil; public class TestFacetsConfig extends FacetTestCase { diff --git a/lucene/facet/src/test/org/apache/lucene/facet/TestLongValueFacetCounts.java b/lucene/facet/src/test/org/apache/lucene/facet/TestLongValueFacetCounts.java index 08d70dcbcb7..d0ce164d933 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/TestLongValueFacetCounts.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/TestLongValueFacetCounts.java @@ -36,8 +36,8 @@ import org.apache.lucene.search.LongValuesSource; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; /** Tests long value facets. */ public class TestLongValueFacetCounts extends LuceneTestCase { diff --git a/lucene/facet/src/test/org/apache/lucene/facet/TestStringValueFacetCounts.java b/lucene/facet/src/test/org/apache/lucene/facet/TestStringValueFacetCounts.java index 2dc4ccc44bf..867a1cfe7e7 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/TestStringValueFacetCounts.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/TestStringValueFacetCounts.java @@ -35,9 +35,9 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; public class TestStringValueFacetCounts extends FacetTestCase { diff --git a/lucene/facet/src/test/org/apache/lucene/facet/range/TestRangeFacetCounts.java b/lucene/facet/src/test/org/apache/lucene/facet/range/TestRangeFacetCounts.java index e7959101ce7..af6a4d1c5dd 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/range/TestRangeFacetCounts.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/range/TestRangeFacetCounts.java @@ -59,9 +59,9 @@ import org.apache.lucene.search.Scorer; import org.apache.lucene.search.Weight; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.NumericUtils; -import org.apache.lucene.util.TestUtil; public class TestRangeFacetCounts extends FacetTestCase { diff --git a/lucene/facet/src/test/org/apache/lucene/facet/sortedset/TestSortedSetDocValuesFacets.java b/lucene/facet/src/test/org/apache/lucene/facet/sortedset/TestSortedSetDocValuesFacets.java index bd24a75918e..1c29ed18d61 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/sortedset/TestSortedSetDocValuesFacets.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/sortedset/TestSortedSetDocValuesFacets.java @@ -44,10 +44,10 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Accountable; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.NamedThreadFactory; -import org.apache.lucene.util.TestUtil; public class TestSortedSetDocValuesFacets extends FacetTestCase { diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestFacetLabel.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestFacetLabel.java index f1aa8c33638..90403610a62 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestFacetLabel.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestFacetLabel.java @@ -19,8 +19,8 @@ import org.apache.lucene.facet.FacetField; import org.apache.lucene.facet.FacetTestCase; import org.apache.lucene.facet.sortedset.SortedSetDocValuesFacetField; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.TestUtil; import org.junit.Test; public class TestFacetLabel extends FacetTestCase { diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestSearcherTaxonomyManager.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestSearcherTaxonomyManager.java index 2bb98f684bb..ca79ce0829b 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestSearcherTaxonomyManager.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestSearcherTaxonomyManager.java @@ -40,9 +40,9 @@ import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.ReferenceManager; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; @LuceneTestCase.SuppressCodecs("SimpleText") public class TestSearcherTaxonomyManager extends FacetTestCase { diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyCombined.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyCombined.java index 966a0ac6fa7..9ba03c4eb92 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyCombined.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyCombined.java @@ -27,7 +27,7 @@ import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader; import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; import org.junit.Test; @SuppressCodecs("SimpleText") diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts.java index 8cb23f0617c..08b956c9acc 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts.java @@ -54,8 +54,8 @@ import org.apache.lucene.search.similarities.PerFieldSimilarityWrapper; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.TestUtil; public class TestTaxonomyFacetCounts extends FacetTestCase { diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetSumValueSource.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetSumValueSource.java index 34a4d9af045..8f0e1fd88ab 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetSumValueSource.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetSumValueSource.java @@ -51,8 +51,8 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.TestUtil; public class TestTaxonomyFacetSumValueSource extends FacetTestCase { diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestAddTaxonomy.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestAddTaxonomy.java index 58d0a3de78f..88b88c176dd 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestAddTaxonomy.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestAddTaxonomy.java @@ -27,9 +27,9 @@ import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter.MemoryOrdinalMap; import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter.OrdinalMap; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; @LuceneTestCase.SuppressCodecs("SimpleText") public class TestAddTaxonomy extends FacetTestCase { diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyWriter.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyWriter.java index 6483c52d320..0893e1c3c8d 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyWriter.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyWriter.java @@ -44,8 +44,8 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.TestUtil; import org.junit.Test; public class TestDirectoryTaxonomyWriter extends FacetTestCase { diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/writercache/Test2GBCharBlockArray.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/writercache/Test2GBCharBlockArray.java index 55f06aa8469..64c195cd528 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/writercache/Test2GBCharBlockArray.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/writercache/Test2GBCharBlockArray.java @@ -16,9 +16,9 @@ */ package org.apache.lucene.facet.taxonomy.writercache; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.Monster; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.Monster; +import org.apache.lucene.tests.util.TestUtil; @Monster("uses lots of space and takes a few minutes") public class Test2GBCharBlockArray extends LuceneTestCase { diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/writercache/TestUTF8TaxonomyWriterCache.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/writercache/TestUTF8TaxonomyWriterCache.java index 85e60ac1b51..321d0a5098b 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/writercache/TestUTF8TaxonomyWriterCache.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/writercache/TestUTF8TaxonomyWriterCache.java @@ -24,7 +24,7 @@ import java.util.Set; import org.apache.lucene.facet.FacetTestCase; import org.apache.lucene.facet.taxonomy.FacetLabel; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; public class TestUTF8TaxonomyWriterCache extends FacetTestCase { public void testPageOverflow() throws Exception { diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/AbstractGroupingTestCase.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/AbstractGroupingTestCase.java index 0156acb395a..8537d1d2642 100644 --- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/AbstractGroupingTestCase.java +++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/AbstractGroupingTestCase.java @@ -23,9 +23,9 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; /** Base class for grouping related tests. */ // TODO (MvG) : The grouping tests contain a lot of code duplication. Try to move the common code to diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestAllGroupHeadsCollector.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestAllGroupHeadsCollector.java index a822f0965ae..841a9ff1132 100644 --- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestAllGroupHeadsCollector.java +++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestAllGroupHeadsCollector.java @@ -49,11 +49,11 @@ import org.apache.lucene.search.SortField; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.FixedBitSet; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestAllGroupHeadsCollector extends LuceneTestCase { diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestAllGroupsCollector.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestAllGroupsCollector.java index 73e7dc059fc..300a11055da 100644 --- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestAllGroupsCollector.java +++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestAllGroupsCollector.java @@ -30,8 +30,8 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; public class TestAllGroupsCollector extends LuceneTestCase { diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestDoubleRangeFactory.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestDoubleRangeFactory.java index 0e52ef24e54..d42f5818d5b 100644 --- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestDoubleRangeFactory.java +++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestDoubleRangeFactory.java @@ -17,7 +17,7 @@ package org.apache.lucene.search.grouping; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestDoubleRangeFactory extends LuceneTestCase { diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGroupFacetCollector.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGroupFacetCollector.java index 8060e152311..688868d1ef4 100644 --- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGroupFacetCollector.java +++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGroupFacetCollector.java @@ -44,8 +44,8 @@ import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.TestUtil; public class TestGroupFacetCollector extends AbstractGroupingTestCase { diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java index 1e0134141d3..47f6b06321b 100644 --- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java +++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java @@ -61,9 +61,9 @@ import org.apache.lucene.search.Weight; import org.apache.lucene.search.similarities.BM25Similarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.mutable.MutableValue; import org.apache.lucene.util.mutable.MutableValueStr; diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGroupingSearch.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGroupingSearch.java index bdaa12af5ac..ea404c757d7 100644 --- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGroupingSearch.java +++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGroupingSearch.java @@ -36,8 +36,8 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.similarities.BM25Similarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.mutable.MutableValueStr; public class TestGroupingSearch extends LuceneTestCase { diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestLongRangeFactory.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestLongRangeFactory.java index 70c1d94c039..eb9ae100175 100644 --- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestLongRangeFactory.java +++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestLongRangeFactory.java @@ -17,7 +17,7 @@ package org.apache.lucene.search.grouping; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestLongRangeFactory extends LuceneTestCase { diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestTopGroups.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestTopGroups.java index c547525398e..8740b639fa7 100644 --- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestTopGroups.java +++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestTopGroups.java @@ -19,7 +19,7 @@ import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.Sort; import org.apache.lucene.search.TotalHits; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestTopGroups extends LuceneTestCase { diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestHighlighter.java b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestHighlighter.java index 52e5c1bbb8e..9839d38834e 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestHighlighter.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestHighlighter.java @@ -88,8 +88,8 @@ import org.apache.lucene.search.WildcardQuery; import org.apache.lucene.search.highlight.SynonymTokenizer.TestHighlightRunner; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.automaton.Automata; import org.apache.lucene.util.automaton.CharacterRunAutomaton; import org.apache.lucene.util.automaton.RegExp; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestHighlighterPhrase.java b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestHighlighterPhrase.java index 33d3ee31ba5..4b0e012442a 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestHighlighterPhrase.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestHighlighterPhrase.java @@ -46,8 +46,8 @@ import org.apache.lucene.search.SimpleCollector; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.FixedBitSet; -import org.apache.lucene.util.LuceneTestCase; public class TestHighlighterPhrase extends LuceneTestCase { private static final String FIELD = "text"; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestMisses.java b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestMisses.java index ddbdb2f2bbd..da7ff555990 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestMisses.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestMisses.java @@ -29,7 +29,7 @@ import org.apache.lucene.search.PhraseQuery; import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestMisses extends LuceneTestCase { public void testTermQuery() throws IOException, InvalidTokenOffsetsException { diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestTokenSources.java b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestTokenSources.java index a3c7102c0ef..8a4ecfcc785 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestTokenSources.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestTokenSources.java @@ -47,8 +47,8 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.TestUtil; // LUCENE-2874 diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/custom/TestHighlightCustomQuery.java b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/custom/TestHighlightCustomQuery.java index 367b79620f3..5fc4bc77bec 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/custom/TestHighlightCustomQuery.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/custom/TestHighlightCustomQuery.java @@ -38,7 +38,7 @@ import org.apache.lucene.search.highlight.SimpleHTMLFormatter; import org.apache.lucene.search.highlight.WeightedSpanTerm; import org.apache.lucene.search.highlight.WeightedSpanTermExtractor; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** * Tests the extensibility of {@link WeightedSpanTermExtractor} and {@link QueryScorer} in a user diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/matchhighlight/IndexBuilder.java b/lucene/highlighter/src/test/org/apache/lucene/search/matchhighlight/IndexBuilder.java index 55d63cf17f2..37546e68698 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/matchhighlight/IndexBuilder.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/matchhighlight/IndexBuilder.java @@ -33,7 +33,7 @@ import org.apache.lucene.search.SortField; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** * Utility class for building an ephemeral document index and running a block of code on its reader. diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/matchhighlight/TestMatchHighlighter.java b/lucene/highlighter/src/test/org/apache/lucene/search/matchhighlight/TestMatchHighlighter.java index f22150464d2..c6a6261b8b3 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/matchhighlight/TestMatchHighlighter.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/matchhighlight/TestMatchHighlighter.java @@ -59,8 +59,8 @@ import org.apache.lucene.search.Sort; import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.CharsRef; -import org.apache.lucene.util.LuceneTestCase; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.Before; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/matchhighlight/TestMatchRegionRetriever.java b/lucene/highlighter/src/test/org/apache/lucene/search/matchhighlight/TestMatchRegionRetriever.java index dac77c141b6..16a769e2b9e 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/matchhighlight/TestMatchRegionRetriever.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/matchhighlight/TestMatchRegionRetriever.java @@ -63,7 +63,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.Before; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/matchhighlight/TestPassageSelector.java b/lucene/highlighter/src/test/org/apache/lucene/search/matchhighlight/TestPassageSelector.java index e7ffc63ca32..95fa8730991 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/matchhighlight/TestPassageSelector.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/matchhighlight/TestPassageSelector.java @@ -22,7 +22,7 @@ import java.util.Arrays; import java.util.List; import java.util.Objects; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestCustomSeparatorBreakIterator.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestCustomSeparatorBreakIterator.java index 0c4004f3ddb..eb7dd0b10cf 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestCustomSeparatorBreakIterator.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestCustomSeparatorBreakIterator.java @@ -22,7 +22,7 @@ import com.carrotsearch.randomizedtesting.generators.RandomPicks; import java.text.BreakIterator; import java.util.Locale; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestCustomSeparatorBreakIterator extends LuceneTestCase { diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestDefaultPassageFormatter.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestDefaultPassageFormatter.java index 15fb96eb26a..eb772acf0e1 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestDefaultPassageFormatter.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestDefaultPassageFormatter.java @@ -17,7 +17,7 @@ package org.apache.lucene.search.uhighlight; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestDefaultPassageFormatter extends LuceneTestCase { public void testBasic() throws Exception { diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestLengthGoalBreakIterator.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestLengthGoalBreakIterator.java index bc54425f218..aba37b2e56f 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestLengthGoalBreakIterator.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestLengthGoalBreakIterator.java @@ -23,7 +23,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.search.Query; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.QueryBuilder; public class TestLengthGoalBreakIterator extends LuceneTestCase { diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestSplittingBreakIterator.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestSplittingBreakIterator.java index e09056d6d61..084c5c20020 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestSplittingBreakIterator.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestSplittingBreakIterator.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.List; import java.util.Locale; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestSplittingBreakIterator extends LuceneTestCase { diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighter.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighter.java index 12c22599866..3991236648d 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighter.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighter.java @@ -56,7 +56,7 @@ import org.apache.lucene.search.Weight; import org.apache.lucene.search.uhighlight.UnifiedHighlighter.HighlightFlag; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.After; import org.junit.Before; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterMTQ.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterMTQ.java index b48d304fb13..a3fed393793 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterMTQ.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterMTQ.java @@ -65,8 +65,8 @@ import org.apache.lucene.search.WildcardQuery; import org.apache.lucene.search.uhighlight.UnifiedHighlighter.HighlightFlag; import org.apache.lucene.store.BaseDirectoryWrapper; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.UnicodeUtil; import org.junit.After; import org.junit.Before; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterRanking.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterRanking.java index 2854c96a523..4b4d6a16ad7 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterRanking.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterRanking.java @@ -40,9 +40,9 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestUnifiedHighlighterRanking extends LuceneTestCase { diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterReanalysis.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterReanalysis.java index 328caa43f6b..2ede77d70a9 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterReanalysis.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterReanalysis.java @@ -28,7 +28,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; public class TestUnifiedHighlighterReanalysis extends LuceneTestCase { diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterStrictPhrases.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterStrictPhrases.java index 1ecddb7fc89..b4fadf6d97c 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterStrictPhrases.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterStrictPhrases.java @@ -57,8 +57,8 @@ import org.apache.lucene.search.WildcardQuery; import org.apache.lucene.search.uhighlight.UnifiedHighlighter.HighlightFlag; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.QueryBuilder; import org.junit.After; import org.junit.Before; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermIntervals.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermIntervals.java index 13588c38b50..5bdef44b501 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermIntervals.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermIntervals.java @@ -50,7 +50,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.uhighlight.UnifiedHighlighter.HighlightFlag; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.After; import org.junit.Before; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermVec.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermVec.java index 002855e9a1d..1f93da57d1c 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermVec.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermVec.java @@ -47,7 +47,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestWholeBreakIterator.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestWholeBreakIterator.java index 16dcd49fdea..1fbca805f6a 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestWholeBreakIterator.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestWholeBreakIterator.java @@ -20,7 +20,7 @@ import java.text.CharacterIterator; import java.text.StringCharacterIterator; import java.util.Locale; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestWholeBreakIterator extends LuceneTestCase { diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/visibility/TestUnifiedHighlighterExtensibility.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/visibility/TestUnifiedHighlighterExtensibility.java index 2129e9cab51..74462ad4a96 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/visibility/TestUnifiedHighlighterExtensibility.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/visibility/TestUnifiedHighlighterExtensibility.java @@ -44,8 +44,8 @@ import org.apache.lucene.search.uhighlight.SplittingBreakIterator; import org.apache.lucene.search.uhighlight.UHComponents; import org.apache.lucene.search.uhighlight.UnifiedHighlighter; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; import org.junit.Test; /** Helps us be aware of visibility/extensibility concerns. */ diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java index cfb66c1f2d1..d5b0d0f57b0 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java @@ -41,8 +41,8 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; public abstract class AbstractTestCase extends LuceneTestCase { diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestBreakIteratorBoundaryScanner.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestBreakIteratorBoundaryScanner.java index 6b138b95ec4..3f56d345979 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestBreakIteratorBoundaryScanner.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestBreakIteratorBoundaryScanner.java @@ -18,7 +18,7 @@ import java.text.BreakIterator; import java.util.Locale; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestBreakIteratorBoundaryScanner extends LuceneTestCase { static final String TEXT = diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestFastVectorHighlighter.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestFastVectorHighlighter.java index 451bdc33933..91c0ba1d4d9 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestFastVectorHighlighter.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestFastVectorHighlighter.java @@ -53,7 +53,7 @@ import org.apache.lucene.search.highlight.DefaultEncoder; import org.apache.lucene.search.highlight.Encoder; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.automaton.CharacterRunAutomaton; import org.apache.lucene.util.automaton.RegExp; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestFieldPhraseList.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestFieldPhraseList.java index f96f5c1990c..8396423e37b 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestFieldPhraseList.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestFieldPhraseList.java @@ -22,7 +22,7 @@ import org.apache.lucene.search.vectorhighlight.FieldPhraseList.WeightedPhraseInfo; import org.apache.lucene.search.vectorhighlight.FieldPhraseList.WeightedPhraseInfo.Toffs; import org.apache.lucene.search.vectorhighlight.FieldTermStack.TermInfo; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; public class TestFieldPhraseList extends AbstractTestCase { diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestFieldTermStack.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestFieldTermStack.java index 72efd59f99b..6fb6fe4a124 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestFieldTermStack.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestFieldTermStack.java @@ -21,7 +21,7 @@ import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.WildcardQuery; import org.apache.lucene.search.vectorhighlight.FieldTermStack.TermInfo; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; public class TestFieldTermStack extends AbstractTestCase { diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestSimpleBoundaryScanner.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestSimpleBoundaryScanner.java index 7d01e5061c7..cff7f92ac3a 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestSimpleBoundaryScanner.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestSimpleBoundaryScanner.java @@ -16,7 +16,7 @@ */ package org.apache.lucene.search.vectorhighlight; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestSimpleBoundaryScanner extends LuceneTestCase { static final String TEXT = diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestSimpleFragmentsBuilder.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestSimpleFragmentsBuilder.java index c3ef1bb5c50..e24e03021ae 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestSimpleFragmentsBuilder.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestSimpleFragmentsBuilder.java @@ -40,7 +40,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.highlight.SimpleHTMLEncoder; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; public class TestSimpleFragmentsBuilder extends AbstractTestCase { diff --git a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java index 5f13d59a01d..e7e7ece9678 100644 --- a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java +++ b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java @@ -55,11 +55,11 @@ import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.search.similarities.SimilarityBase; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BitSet; import org.apache.lucene.util.Bits; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestBlockJoin extends LuceneTestCase { diff --git a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinScorer.java b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinScorer.java index 4e220dbeac5..76ba598b1c9 100644 --- a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinScorer.java +++ b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinScorer.java @@ -34,8 +34,8 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.Weight; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BitSet; -import org.apache.lucene.util.LuceneTestCase; public class TestBlockJoinScorer extends LuceneTestCase { public void testScoreNone() throws IOException { diff --git a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinSelector.java b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinSelector.java index 19510055540..bcf1abffe25 100644 --- a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinSelector.java +++ b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinSelector.java @@ -26,11 +26,11 @@ import org.apache.lucene.index.NumericDocValues; import org.apache.lucene.index.SortedDocValues; import org.apache.lucene.search.DocIdSetIterator; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BitSet; import org.apache.lucene.util.Bits; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.FixedBitSet; -import org.apache.lucene.util.LuceneTestCase; public class TestBlockJoinSelector extends LuceneTestCase { diff --git a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinSorting.java b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinSorting.java index c168173f90e..3b9480da86c 100644 --- a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinSorting.java +++ b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinSorting.java @@ -35,8 +35,8 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopFieldDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; import org.junit.Test; /** */ diff --git a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinValidation.java b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinValidation.java index ba94876a80f..72b35b3031c 100644 --- a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinValidation.java +++ b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinValidation.java @@ -37,9 +37,9 @@ import org.apache.lucene.search.Weight; import org.apache.lucene.search.WildcardQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestBlockJoinValidation extends LuceneTestCase { diff --git a/lucene/join/src/test/org/apache/lucene/search/join/TestCheckJoinIndex.java b/lucene/join/src/test/org/apache/lucene/search/join/TestCheckJoinIndex.java index d0ef29770e4..1a7c72e436e 100644 --- a/lucene/join/src/test/org/apache/lucene/search/join/TestCheckJoinIndex.java +++ b/lucene/join/src/test/org/apache/lucene/search/join/TestCheckJoinIndex.java @@ -30,8 +30,8 @@ import org.apache.lucene.search.MatchNoDocsQuery; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestCheckJoinIndex extends LuceneTestCase { diff --git a/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java b/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java index f5431af816b..5cd6c63d1e3 100644 --- a/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java +++ b/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java @@ -68,12 +68,12 @@ import org.apache.lucene.index.TermsEnum; import org.apache.lucene.search.*; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BitSet; import org.apache.lucene.util.BitSetIterator; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.FixedBitSet; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.packed.PackedInts; import org.junit.Test; diff --git a/lucene/join/src/test/org/apache/lucene/search/join/TestParentChildrenBlockJoinQuery.java b/lucene/join/src/test/org/apache/lucene/search/join/TestParentChildrenBlockJoinQuery.java index a6492cfc21f..b3baaf38b3a 100644 --- a/lucene/join/src/test/org/apache/lucene/search/join/TestParentChildrenBlockJoinQuery.java +++ b/lucene/join/src/test/org/apache/lucene/search/join/TestParentChildrenBlockJoinQuery.java @@ -37,7 +37,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestParentChildrenBlockJoinQuery extends LuceneTestCase { diff --git a/lucene/join/src/test/org/apache/lucene/search/join/TestQueryBitSetProducer.java b/lucene/join/src/test/org/apache/lucene/search/join/TestQueryBitSetProducer.java index 1d500daea03..2b9602013f7 100644 --- a/lucene/join/src/test/org/apache/lucene/search/join/TestQueryBitSetProducer.java +++ b/lucene/join/src/test/org/apache/lucene/search/join/TestQueryBitSetProducer.java @@ -28,9 +28,9 @@ import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.MatchNoDocsQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BitSet; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; public class TestQueryBitSetProducer extends LuceneTestCase { diff --git a/lucene/luke/src/test/org/apache/lucene/luke/app/desktop/util/inifile/TestSimpleIniFile.java b/lucene/luke/src/test/org/apache/lucene/luke/app/desktop/util/inifile/TestSimpleIniFile.java index 9f0c272cb9a..8db6c1c52c2 100644 --- a/lucene/luke/src/test/org/apache/lucene/luke/app/desktop/util/inifile/TestSimpleIniFile.java +++ b/lucene/luke/src/test/org/apache/lucene/luke/app/desktop/util/inifile/TestSimpleIniFile.java @@ -25,7 +25,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; public class TestSimpleIniFile extends LuceneTestCase { diff --git a/lucene/luke/src/test/org/apache/lucene/luke/models/analysis/TestAnalysisImpl.java b/lucene/luke/src/test/org/apache/lucene/luke/models/analysis/TestAnalysisImpl.java index 3bd789d3b0a..99d1f057358 100644 --- a/lucene/luke/src/test/org/apache/lucene/luke/models/analysis/TestAnalysisImpl.java +++ b/lucene/luke/src/test/org/apache/lucene/luke/models/analysis/TestAnalysisImpl.java @@ -29,7 +29,7 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.custom.CustomAnalyzer; import org.apache.lucene.luke.models.LukeException; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; public class TestAnalysisImpl extends LuceneTestCase { diff --git a/lucene/luke/src/test/org/apache/lucene/luke/models/commits/TestCommitsImpl.java b/lucene/luke/src/test/org/apache/lucene/luke/models/commits/TestCommitsImpl.java index 261347dbc4e..6e662f7d3d7 100644 --- a/lucene/luke/src/test/org/apache/lucene/luke/models/commits/TestCommitsImpl.java +++ b/lucene/luke/src/test/org/apache/lucene/luke/models/commits/TestCommitsImpl.java @@ -31,8 +31,8 @@ import org.apache.lucene.index.NoDeletionPolicy; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/lucene/luke/src/test/org/apache/lucene/luke/models/documents/DocumentsTestBase.java b/lucene/luke/src/test/org/apache/lucene/luke/models/documents/DocumentsTestBase.java index fded2b76bcb..958fe5cf8ec 100644 --- a/lucene/luke/src/test/org/apache/lucene/luke/models/documents/DocumentsTestBase.java +++ b/lucene/luke/src/test/org/apache/lucene/luke/models/documents/DocumentsTestBase.java @@ -29,8 +29,8 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.NumericUtils; import org.junit.After; import org.junit.Before; diff --git a/lucene/luke/src/test/org/apache/lucene/luke/models/documents/TestDocumentsImpl.java b/lucene/luke/src/test/org/apache/lucene/luke/models/documents/TestDocumentsImpl.java index 8162b571ca6..47dc6898c87 100644 --- a/lucene/luke/src/test/org/apache/lucene/luke/models/documents/TestDocumentsImpl.java +++ b/lucene/luke/src/test/org/apache/lucene/luke/models/documents/TestDocumentsImpl.java @@ -23,7 +23,7 @@ import org.apache.lucene.index.Term; import org.apache.lucene.luke.models.util.IndexUtils; import org.apache.lucene.store.AlreadyClosedException; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.NumericUtils; import org.junit.Test; diff --git a/lucene/luke/src/test/org/apache/lucene/luke/models/overview/OverviewTestBase.java b/lucene/luke/src/test/org/apache/lucene/luke/models/overview/OverviewTestBase.java index 25be9320501..f51669a6a7e 100644 --- a/lucene/luke/src/test/org/apache/lucene/luke/models/overview/OverviewTestBase.java +++ b/lucene/luke/src/test/org/apache/lucene/luke/models/overview/OverviewTestBase.java @@ -31,7 +31,7 @@ import org.apache.lucene.index.NoMergePolicy; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.After; import org.junit.Before; diff --git a/lucene/luke/src/test/org/apache/lucene/luke/models/search/TestSearchImpl.java b/lucene/luke/src/test/org/apache/lucene/luke/models/search/TestSearchImpl.java index 76c6fded59c..8efbc37d1a8 100644 --- a/lucene/luke/src/test/org/apache/lucene/luke/models/search/TestSearchImpl.java +++ b/lucene/luke/src/test/org/apache/lucene/luke/models/search/TestSearchImpl.java @@ -47,8 +47,8 @@ import org.apache.lucene.search.SortedNumericSortField; import org.apache.lucene.search.SortedSetSortField; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; import org.junit.Test; public class TestSearchImpl extends LuceneTestCase { diff --git a/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndex.java b/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndex.java index 25568c6863b..90cc8ecd3fd 100644 --- a/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndex.java +++ b/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndex.java @@ -71,9 +71,9 @@ import org.apache.lucene.search.similarities.BM25Similarity; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.search.similarities.Similarity; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.junit.Before; import org.junit.Test; diff --git a/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndexAgainstDirectory.java b/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndexAgainstDirectory.java index c0abada4fc0..2ab8cc6f7ed 100644 --- a/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndexAgainstDirectory.java +++ b/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndexAgainstDirectory.java @@ -67,10 +67,10 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LineFileDocs; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LineFileDocs; -import org.apache.lucene.util.TestUtil; /** * Verifies that Lucene MemoryIndex and RAM-resident Directory have the same behaviour, returning diff --git a/lucene/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java b/lucene/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java index a39a4d041ac..7a617be4306 100644 --- a/lucene/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java +++ b/lucene/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java @@ -25,8 +25,8 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/misc/src/test/org/apache/lucene/misc/TestIndexMergeTool.java b/lucene/misc/src/test/org/apache/lucene/misc/TestIndexMergeTool.java index ddb179a99ed..224bf9c7d5b 100644 --- a/lucene/misc/src/test/org/apache/lucene/misc/TestIndexMergeTool.java +++ b/lucene/misc/src/test/org/apache/lucene/misc/TestIndexMergeTool.java @@ -18,7 +18,7 @@ import org.apache.lucene.index.LogDocMergePolicy; import org.apache.lucene.misc.IndexMergeTool.Options; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.PrintStreamInfoStream; public class TestIndexMergeTool extends LuceneTestCase { diff --git a/lucene/misc/src/test/org/apache/lucene/misc/TestSweetSpotSimilarity.java b/lucene/misc/src/test/org/apache/lucene/misc/TestSweetSpotSimilarity.java index 9ca44d1cf53..17094692c7c 100644 --- a/lucene/misc/src/test/org/apache/lucene/misc/TestSweetSpotSimilarity.java +++ b/lucene/misc/src/test/org/apache/lucene/misc/TestSweetSpotSimilarity.java @@ -33,7 +33,7 @@ import org.apache.lucene.search.similarities.TFIDFSimilarity; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** Test of the SweetSpotSimilarity */ public class TestSweetSpotSimilarity extends LuceneTestCase { diff --git a/lucene/misc/src/test/org/apache/lucene/misc/document/TestLazyDocument.java b/lucene/misc/src/test/org/apache/lucene/misc/document/TestLazyDocument.java index 7315e9ba1cd..c4ca01afed3 100644 --- a/lucene/misc/src/test/org/apache/lucene/misc/document/TestLazyDocument.java +++ b/lucene/misc/src/test/org/apache/lucene/misc/document/TestLazyDocument.java @@ -31,7 +31,7 @@ import org.apache.lucene.index.*; import org.apache.lucene.search.*; import org.apache.lucene.store.*; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.After; import org.junit.Before; diff --git a/lucene/misc/src/test/org/apache/lucene/misc/index/TestIndexRearranger.java b/lucene/misc/src/test/org/apache/lucene/misc/index/TestIndexRearranger.java index fa111a664d1..5d56a702752 100644 --- a/lucene/misc/src/test/org/apache/lucene/misc/index/TestIndexRearranger.java +++ b/lucene/misc/src/test/org/apache/lucene/misc/index/TestIndexRearranger.java @@ -34,11 +34,11 @@ import org.apache.lucene.search.Sort; import org.apache.lucene.search.SortField; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BitSet; import org.apache.lucene.util.Bits; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.FixedBitSet; -import org.apache.lucene.util.LuceneTestCase; public class TestIndexRearranger extends LuceneTestCase { public void testRearrange() throws Exception { diff --git a/lucene/misc/src/test/org/apache/lucene/misc/index/TestIndexSplitter.java b/lucene/misc/src/test/org/apache/lucene/misc/index/TestIndexSplitter.java index e473d8f3062..1f03a3499a0 100644 --- a/lucene/misc/src/test/org/apache/lucene/misc/index/TestIndexSplitter.java +++ b/lucene/misc/src/test/org/apache/lucene/misc/index/TestIndexSplitter.java @@ -29,7 +29,7 @@ import org.apache.lucene.index.SegmentInfos; import org.apache.lucene.store.Directory; import org.apache.lucene.store.MockDirectoryWrapper; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestIndexSplitter extends LuceneTestCase { public void test() throws Exception { diff --git a/lucene/misc/src/test/org/apache/lucene/misc/index/TestMultiPassIndexSplitter.java b/lucene/misc/src/test/org/apache/lucene/misc/index/TestMultiPassIndexSplitter.java index 7924347b21d..156cbf51156 100644 --- a/lucene/misc/src/test/org/apache/lucene/misc/index/TestMultiPassIndexSplitter.java +++ b/lucene/misc/src/test/org/apache/lucene/misc/index/TestMultiPassIndexSplitter.java @@ -27,8 +27,8 @@ import org.apache.lucene.index.Term; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; public class TestMultiPassIndexSplitter extends LuceneTestCase { IndexReader input; diff --git a/lucene/misc/src/test/org/apache/lucene/misc/index/TestPKIndexSplitter.java b/lucene/misc/src/test/org/apache/lucene/misc/index/TestPKIndexSplitter.java index 2472dc2f2d0..8b2b92d44fb 100644 --- a/lucene/misc/src/test/org/apache/lucene/misc/index/TestPKIndexSplitter.java +++ b/lucene/misc/src/test/org/apache/lucene/misc/index/TestPKIndexSplitter.java @@ -32,8 +32,8 @@ import org.apache.lucene.index.NoMergePolicy; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.Bits; -import org.apache.lucene.util.LuceneTestCase; public class TestPKIndexSplitter extends LuceneTestCase { diff --git a/lucene/misc/src/test/org/apache/lucene/misc/search/TestDiversifiedTopDocsCollector.java b/lucene/misc/src/test/org/apache/lucene/misc/search/TestDiversifiedTopDocsCollector.java index 72aeaaa271c..39f2a4a75c9 100644 --- a/lucene/misc/src/test/org/apache/lucene/misc/search/TestDiversifiedTopDocsCollector.java +++ b/lucene/misc/src/test/org/apache/lucene/misc/search/TestDiversifiedTopDocsCollector.java @@ -48,8 +48,8 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.Weight; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; /** * Demonstrates an application of the {@link DiversifiedTopDocsCollector} in assembling a collection diff --git a/lucene/misc/src/test/org/apache/lucene/misc/search/TestDocValuesStatsCollector.java b/lucene/misc/src/test/org/apache/lucene/misc/search/TestDocValuesStatsCollector.java index ab021c251e1..9f9b3e7d49a 100644 --- a/lucene/misc/src/test/org/apache/lucene/misc/search/TestDocValuesStatsCollector.java +++ b/lucene/misc/src/test/org/apache/lucene/misc/search/TestDocValuesStatsCollector.java @@ -48,9 +48,9 @@ import org.apache.lucene.search.MultiCollector; import org.apache.lucene.search.TotalHitCountCollector; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; /** Unit tests for {@link DocValuesStatsCollector}. */ public class TestDocValuesStatsCollector extends LuceneTestCase { diff --git a/lucene/misc/src/test/org/apache/lucene/misc/search/TestMemoryAccountingBitsetCollector.java b/lucene/misc/src/test/org/apache/lucene/misc/search/TestMemoryAccountingBitsetCollector.java index 2329525731e..a2c2d5570a4 100644 --- a/lucene/misc/src/test/org/apache/lucene/misc/search/TestMemoryAccountingBitsetCollector.java +++ b/lucene/misc/src/test/org/apache/lucene/misc/search/TestMemoryAccountingBitsetCollector.java @@ -28,8 +28,8 @@ import org.apache.lucene.search.MultiCollector; import org.apache.lucene.search.TotalHitCountCollector; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; public class TestMemoryAccountingBitsetCollector extends LuceneTestCase { diff --git a/lucene/misc/src/test/org/apache/lucene/misc/store/TestWindowsDirectory.java b/lucene/misc/src/test/org/apache/lucene/misc/store/TestWindowsDirectory.java index 9ccc96a5cd5..c4326469f08 100644 --- a/lucene/misc/src/test/org/apache/lucene/misc/store/TestWindowsDirectory.java +++ b/lucene/misc/src/test/org/apache/lucene/misc/store/TestWindowsDirectory.java @@ -22,7 +22,7 @@ import java.util.EnumSet; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Rule; import org.junit.rules.TestRule; diff --git a/lucene/misc/src/test/org/apache/lucene/misc/util/TestCollectorMemoryTracker.java b/lucene/misc/src/test/org/apache/lucene/misc/util/TestCollectorMemoryTracker.java index 5c39d56e20e..4a1a35ff96d 100644 --- a/lucene/misc/src/test/org/apache/lucene/misc/util/TestCollectorMemoryTracker.java +++ b/lucene/misc/src/test/org/apache/lucene/misc/util/TestCollectorMemoryTracker.java @@ -18,7 +18,7 @@ package org.apache.lucene.misc.util; import org.apache.lucene.misc.CollectorMemoryTracker; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestCollectorMemoryTracker extends LuceneTestCase { public void testAdditionsAndDeletions() { diff --git a/lucene/misc/src/test/org/apache/lucene/misc/util/fst/TestFSTsMisc.java b/lucene/misc/src/test/org/apache/lucene/misc/util/fst/TestFSTsMisc.java index b1888b77582..f2441b80791 100644 --- a/lucene/misc/src/test/org/apache/lucene/misc/util/fst/TestFSTsMisc.java +++ b/lucene/misc/src/test/org/apache/lucene/misc/util/fst/TestFSTsMisc.java @@ -25,14 +25,14 @@ import java.util.Set; import org.apache.lucene.misc.util.fst.UpToTwoPositiveIntOutputs.TwoLongs; import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; +import org.apache.lucene.tests.util.fst.FSTTester; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IntsRef; import org.apache.lucene.util.IntsRefBuilder; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.fst.FST; import org.apache.lucene.util.fst.FSTCompiler; -import org.apache.lucene.util.fst.FSTTester; import org.apache.lucene.util.fst.PositiveIntOutputs; import org.apache.lucene.util.fst.Util; diff --git a/lucene/monitor/src/test/org/apache/lucene/monitor/ConcurrentMatcherTestBase.java b/lucene/monitor/src/test/org/apache/lucene/monitor/ConcurrentMatcherTestBase.java index 872571ad7fd..e7c88a94c01 100644 --- a/lucene/monitor/src/test/org/apache/lucene/monitor/ConcurrentMatcherTestBase.java +++ b/lucene/monitor/src/test/org/apache/lucene/monitor/ConcurrentMatcherTestBase.java @@ -25,7 +25,7 @@ import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.NamedThreadFactory; public abstract class ConcurrentMatcherTestBase extends LuceneTestCase { diff --git a/lucene/monitor/src/test/org/apache/lucene/monitor/MonitorTestBase.java b/lucene/monitor/src/test/org/apache/lucene/monitor/MonitorTestBase.java index b8fff7e0c77..65017e73247 100644 --- a/lucene/monitor/src/test/org/apache/lucene/monitor/MonitorTestBase.java +++ b/lucene/monitor/src/test/org/apache/lucene/monitor/MonitorTestBase.java @@ -27,7 +27,7 @@ import org.apache.lucene.queryparser.classic.QueryParser; import org.apache.lucene.search.Query; import org.apache.lucene.search.QueryVisitor; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public abstract class MonitorTestBase extends LuceneTestCase { diff --git a/lucene/monitor/src/test/org/apache/lucene/monitor/TestBooleanClauseWeightings.java b/lucene/monitor/src/test/org/apache/lucene/monitor/TestBooleanClauseWeightings.java index 83646ffcb9c..fcc26e085df 100644 --- a/lucene/monitor/src/test/org/apache/lucene/monitor/TestBooleanClauseWeightings.java +++ b/lucene/monitor/src/test/org/apache/lucene/monitor/TestBooleanClauseWeightings.java @@ -26,7 +26,7 @@ import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestBooleanClauseWeightings extends LuceneTestCase { diff --git a/lucene/monitor/src/test/org/apache/lucene/monitor/TestBooleanTermExtractor.java b/lucene/monitor/src/test/org/apache/lucene/monitor/TestBooleanTermExtractor.java index ce82237d9ce..80d8f3379f2 100644 --- a/lucene/monitor/src/test/org/apache/lucene/monitor/TestBooleanTermExtractor.java +++ b/lucene/monitor/src/test/org/apache/lucene/monitor/TestBooleanTermExtractor.java @@ -26,7 +26,7 @@ import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.Query; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestBooleanTermExtractor extends LuceneTestCase { diff --git a/lucene/monitor/src/test/org/apache/lucene/monitor/TestDocumentBatch.java b/lucene/monitor/src/test/org/apache/lucene/monitor/TestDocumentBatch.java index b21e3fe015e..b12df632e63 100644 --- a/lucene/monitor/src/test/org/apache/lucene/monitor/TestDocumentBatch.java +++ b/lucene/monitor/src/test/org/apache/lucene/monitor/TestDocumentBatch.java @@ -23,7 +23,7 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.document.Document; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; public class TestDocumentBatch extends LuceneTestCase { diff --git a/lucene/monitor/src/test/org/apache/lucene/monitor/TestExtractors.java b/lucene/monitor/src/test/org/apache/lucene/monitor/TestExtractors.java index 934e0299904..86274982050 100644 --- a/lucene/monitor/src/test/org/apache/lucene/monitor/TestExtractors.java +++ b/lucene/monitor/src/test/org/apache/lucene/monitor/TestExtractors.java @@ -30,7 +30,7 @@ import org.apache.lucene.search.PhraseQuery; import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestExtractors extends LuceneTestCase { diff --git a/lucene/monitor/src/test/org/apache/lucene/monitor/TestForceNoBulkScoringQuery.java b/lucene/monitor/src/test/org/apache/lucene/monitor/TestForceNoBulkScoringQuery.java index 3c7ab1a7da1..28f96c760b3 100644 --- a/lucene/monitor/src/test/org/apache/lucene/monitor/TestForceNoBulkScoringQuery.java +++ b/lucene/monitor/src/test/org/apache/lucene/monitor/TestForceNoBulkScoringQuery.java @@ -32,7 +32,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestForceNoBulkScoringQuery extends LuceneTestCase { diff --git a/lucene/monitor/src/test/org/apache/lucene/monitor/TestQueryAnalyzer.java b/lucene/monitor/src/test/org/apache/lucene/monitor/TestQueryAnalyzer.java index e15533f4c34..935bb745bbe 100644 --- a/lucene/monitor/src/test/org/apache/lucene/monitor/TestQueryAnalyzer.java +++ b/lucene/monitor/src/test/org/apache/lucene/monitor/TestQueryAnalyzer.java @@ -23,8 +23,8 @@ import java.util.Set; import org.apache.lucene.index.Term; import org.apache.lucene.search.Query; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; public class TestQueryAnalyzer extends LuceneTestCase { diff --git a/lucene/monitor/src/test/org/apache/lucene/monitor/TestQueryTermComparators.java b/lucene/monitor/src/test/org/apache/lucene/monitor/TestQueryTermComparators.java index d411e60d516..34e1b9687c3 100644 --- a/lucene/monitor/src/test/org/apache/lucene/monitor/TestQueryTermComparators.java +++ b/lucene/monitor/src/test/org/apache/lucene/monitor/TestQueryTermComparators.java @@ -23,8 +23,8 @@ import java.util.Map; import java.util.Set; import org.apache.lucene.index.Term; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; public class TestQueryTermComparators extends LuceneTestCase { diff --git a/lucene/monitor/src/test/org/apache/lucene/monitor/TestQueryTermFilter.java b/lucene/monitor/src/test/org/apache/lucene/monitor/TestQueryTermFilter.java index b9ef232489e..9deacc1316e 100644 --- a/lucene/monitor/src/test/org/apache/lucene/monitor/TestQueryTermFilter.java +++ b/lucene/monitor/src/test/org/apache/lucene/monitor/TestQueryTermFilter.java @@ -22,8 +22,8 @@ import java.util.function.BiPredicate; import org.apache.lucene.index.Term; import org.apache.lucene.search.TermQuery; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; public class TestQueryTermFilter extends LuceneTestCase { diff --git a/lucene/monitor/src/test/org/apache/lucene/monitor/TestSpanExtractors.java b/lucene/monitor/src/test/org/apache/lucene/monitor/TestSpanExtractors.java index 6032c10d0bd..d77dcd73f20 100644 --- a/lucene/monitor/src/test/org/apache/lucene/monitor/TestSpanExtractors.java +++ b/lucene/monitor/src/test/org/apache/lucene/monitor/TestSpanExtractors.java @@ -33,7 +33,7 @@ import org.apache.lucene.queries.spans.SpanWithinQuery; import org.apache.lucene.search.Query; import org.apache.lucene.search.RegexpQuery; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestSpanExtractors extends LuceneTestCase { diff --git a/lucene/monitor/src/test/org/apache/lucene/monitor/TestTermsEnumTokenFilter.java b/lucene/monitor/src/test/org/apache/lucene/monitor/TestTermsEnumTokenFilter.java index 3322e6fc391..8283a99274d 100644 --- a/lucene/monitor/src/test/org/apache/lucene/monitor/TestTermsEnumTokenFilter.java +++ b/lucene/monitor/src/test/org/apache/lucene/monitor/TestTermsEnumTokenFilter.java @@ -21,9 +21,9 @@ import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefIterator; -import org.apache.lucene.util.LuceneTestCase; public class TestTermsEnumTokenFilter extends LuceneTestCase { diff --git a/lucene/queries/src/test/org/apache/lucene/queries/TestCommonTermsQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/TestCommonTermsQuery.java index 72d3c6b52aa..5dae7e44217 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/TestCommonTermsQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/TestCommonTermsQuery.java @@ -47,12 +47,12 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.similarities.BM25Similarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LineFileDocs; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LineFileDocs; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.PriorityQueue; -import org.apache.lucene.util.TestUtil; import org.junit.Test; public class TestCommonTermsQuery extends LuceneTestCase { diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java b/lucene/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java index 068923d9af4..0b1db83f35e 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java @@ -34,10 +34,10 @@ import org.apache.lucene.queries.function.valuesource.MultiValuedIntFieldSource; import org.apache.lucene.search.SortedNumericSelector; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.NumericUtils; -import org.apache.lucene.util.TestUtil; import org.junit.AfterClass; import org.junit.Ignore; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestDocValuesFieldSources.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestDocValuesFieldSources.java index e71b651897e..03fb7ea810e 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestDocValuesFieldSources.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestDocValuesFieldSources.java @@ -35,10 +35,10 @@ import org.apache.lucene.queries.function.valuesource.MultiValuedLongFieldSource; import org.apache.lucene.search.SortedNumericSelector.Type; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.packed.PackedInts; public class TestDocValuesFieldSources extends LuceneTestCase { diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQuerySort.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQuerySort.java index 4c09da86142..4b852946a3c 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQuerySort.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQuerySort.java @@ -40,7 +40,7 @@ import org.apache.lucene.search.SortField.Type; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** Test that functionquery's getSortField() actually works */ public class TestFunctionQuerySort extends LuceneTestCase { diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestIndexReaderFunctions.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestIndexReaderFunctions.java index fa58d12d6c5..f12f8c82dc9 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestIndexReaderFunctions.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestIndexReaderFunctions.java @@ -43,9 +43,9 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.Weight; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestLongNormValueSource.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestLongNormValueSource.java index 24f33770bdb..8e90b8f6b99 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestLongNormValueSource.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestLongNormValueSource.java @@ -35,7 +35,7 @@ import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestSortedSetFieldSource.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestSortedSetFieldSource.java index c53197b90ed..7b2a0acd277 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestSortedSetFieldSource.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestSortedSetFieldSource.java @@ -26,8 +26,8 @@ import org.apache.lucene.queries.function.valuesource.SortedSetFieldSource; import org.apache.lucene.search.*; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; public class TestSortedSetFieldSource extends LuceneTestCase { public void testSimple() throws Exception { diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java index 8f343c78e56..ef5bc230886 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java @@ -52,8 +52,8 @@ import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.NumericUtils; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/docvalues/TestBoolValOfNumericDVs.java b/lucene/queries/src/test/org/apache/lucene/queries/function/docvalues/TestBoolValOfNumericDVs.java index 5d9be4e3c1f..46fceb49aee 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/function/docvalues/TestBoolValOfNumericDVs.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/function/docvalues/TestBoolValOfNumericDVs.java @@ -18,7 +18,7 @@ import java.io.IOException; import org.apache.lucene.queries.function.FunctionValues; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** * Sanity check that {@link FunctionValues#boolVal} behaves as expected for trivial subclasses of diff --git a/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestDisjunctionRewrites.java b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestDisjunctionRewrites.java index 2f03107ec1f..759cef5da9b 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestDisjunctionRewrites.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestDisjunctionRewrites.java @@ -19,7 +19,7 @@ import static org.apache.lucene.queries.intervals.Intervals.*; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestDisjunctionRewrites extends LuceneTestCase { diff --git a/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervalBuilder.java b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervalBuilder.java index a51a69062b4..cbe1004d301 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervalBuilder.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervalBuilder.java @@ -43,7 +43,7 @@ import org.apache.lucene.analysis.CachingTokenFilter; import org.apache.lucene.analysis.CannedTokenStream; import org.apache.lucene.analysis.Token; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestIntervalBuilder extends LuceneTestCase { public void testSimpleTerm() throws IOException { diff --git a/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervalQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervalQuery.java index f654631ce15..8d62b3b79d5 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervalQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervalQuery.java @@ -30,7 +30,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestIntervalQuery extends LuceneTestCase { diff --git a/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervals.java b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervals.java index a48c6ba201a..cc12d1d2b9a 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervals.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervals.java @@ -47,9 +47,9 @@ import org.apache.lucene.search.QueryVisitor; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.automaton.Automaton; import org.apache.lucene.util.automaton.CompiledAutomaton; import org.apache.lucene.util.automaton.Operations; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestPayloadFilteredInterval.java b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestPayloadFilteredInterval.java index bd408a88d7e..127aa333ead 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestPayloadFilteredInterval.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestPayloadFilteredInterval.java @@ -27,8 +27,8 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.MatchesIterator; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestPayloadFilteredInterval extends LuceneTestCase { diff --git a/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestSimplifications.java b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestSimplifications.java index 6bdc2d57418..aa60e678112 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestSimplifications.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestSimplifications.java @@ -17,7 +17,7 @@ package org.apache.lucene.queries.intervals; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestSimplifications extends LuceneTestCase { diff --git a/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java b/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java index 4e50ed8e2f9..3656cdb354a 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java @@ -49,8 +49,8 @@ import org.apache.lucene.search.QueryUtils; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.ArrayUtil; -import org.apache.lucene.util.LuceneTestCase; public class TestMoreLikeThis extends LuceneTestCase { diff --git a/lucene/queries/src/test/org/apache/lucene/queries/payloads/PayloadHelper.java b/lucene/queries/src/test/org/apache/lucene/queries/payloads/PayloadHelper.java index 7f6be05b6e7..544e04d44b3 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/payloads/PayloadHelper.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/payloads/PayloadHelper.java @@ -32,9 +32,9 @@ import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.util.English; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.English; -import org.apache.lucene.util.LuceneTestCase; /** */ public class PayloadHelper { diff --git a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadCheckQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadCheckQuery.java index 1cd71dab1e7..fc4c7e5a56a 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadCheckQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadCheckQuery.java @@ -44,10 +44,10 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.WildcardQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.English; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.English; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadScoreQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadScoreQuery.java index fec62de6d27..054b4f9c5ca 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadScoreQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadScoreQuery.java @@ -44,9 +44,9 @@ import org.apache.lucene.search.WildcardQuery; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.English; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.English; -import org.apache.lucene.util.LuceneTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpanPositions.java b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpanPositions.java index 46f38602d62..1920b78f155 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpanPositions.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpanPositions.java @@ -39,8 +39,8 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.ScoreMode; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; public class TestPayloadSpanPositions extends LuceneTestCase { diff --git a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpans.java b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpans.java index 4a643d0efcb..1883addd142 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpans.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpans.java @@ -51,8 +51,8 @@ import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; public class TestPayloadSpans extends LuceneTestCase { private IndexSearcher searcher; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadTermQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadTermQuery.java index 927bb413d9c..6934c1b5f14 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadTermQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadTermQuery.java @@ -43,9 +43,9 @@ import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.English; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.English; -import org.apache.lucene.util.LuceneTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestBasics.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestBasics.java index 9e5bf95d255..c0706b89f17 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestBasics.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestBasics.java @@ -41,9 +41,9 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopScoreDocCollector; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.English; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.English; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestFieldMaskingSpanQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestFieldMaskingSpanQuery.java index 604f78c58c8..e0312400667 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestFieldMaskingSpanQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestFieldMaskingSpanQuery.java @@ -35,7 +35,7 @@ import org.apache.lucene.search.ScoreMode; import org.apache.lucene.search.similarities.TFIDFSimilarity; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestFilterSpans.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestFilterSpans.java index ae2e3c1d1d5..565885777a6 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestFilterSpans.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestFilterSpans.java @@ -17,7 +17,7 @@ package org.apache.lucene.queries.spans; import java.lang.reflect.Method; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; public class TestFilterSpans extends LuceneTestCase { diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestNearSpansOrdered.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestNearSpansOrdered.java index 38b23e737e2..11edffc3c63 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestNearSpansOrdered.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestNearSpansOrdered.java @@ -35,7 +35,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.Weight; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestNearSpansOrdered extends LuceneTestCase { protected IndexSearcher searcher; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestQueryRescorerWithSpans.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestQueryRescorerWithSpans.java index 620a26a3c4c..ef36a880e6c 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestQueryRescorerWithSpans.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestQueryRescorerWithSpans.java @@ -30,7 +30,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestQueryRescorerWithSpans extends LuceneTestCase { diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanCollection.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanCollection.java index 9a4f3ed55a7..a5c8784ba80 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanCollection.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanCollection.java @@ -31,7 +31,7 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.ScoreMode; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; public class TestSpanCollection extends LuceneTestCase { diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanContainQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanContainQuery.java index 422fa50ba4f..6e7b28a9b43 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanContainQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanContainQuery.java @@ -28,7 +28,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.ScoreMode; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestSpanContainQuery extends LuceneTestCase { IndexSearcher searcher; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanFirstQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanFirstQuery.java index e57101dfb7b..5517187d148 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanFirstQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanFirstQuery.java @@ -27,7 +27,7 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.automaton.CharacterRunAutomaton; import org.apache.lucene.util.automaton.RegExp; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanMultiTermQueryWrapper.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanMultiTermQueryWrapper.java index 91588a20a04..e3a353dbe65 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanMultiTermQueryWrapper.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanMultiTermQueryWrapper.java @@ -29,7 +29,7 @@ import org.apache.lucene.search.RegexpQuery; import org.apache.lucene.search.WildcardQuery; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; /** Tests for {@link SpanMultiTermQueryWrapper}, wrapping a few MultiTermQueries. */ diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanNearQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanNearQuery.java index 01c4729c9ed..23ad13c165e 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanNearQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanNearQuery.java @@ -26,7 +26,7 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.QueryUtils; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** Basic tests for SpanNearQuery */ public class TestSpanNearQuery extends LuceneTestCase { diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanNotQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanNotQuery.java index 421721a309e..4244c020d25 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanNotQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanNotQuery.java @@ -26,7 +26,7 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.QueryUtils; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** Basic tests for SpanNotQuery */ public class TestSpanNotQuery extends LuceneTestCase { diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanOrQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanOrQuery.java index 8852387028f..6ab4c43b23e 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanOrQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanOrQuery.java @@ -18,7 +18,7 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.QueryUtils; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** Basic tests for SpanOrQuery */ public class TestSpanOrQuery extends LuceneTestCase { diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanQueryVisitor.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanQueryVisitor.java index 6051f1b6037..8fbb2f5362b 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanQueryVisitor.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanQueryVisitor.java @@ -31,7 +31,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.QueryVisitor; import org.apache.lucene.search.TermQuery; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestSpanQueryVisitor extends LuceneTestCase { diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanSimilarity.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanSimilarity.java index 46809c60c5d..93a899da542 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanSimilarity.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanSimilarity.java @@ -67,7 +67,7 @@ import org.apache.lucene.search.similarities.NormalizationZ; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestSpanSimilarity extends LuceneTestCase { diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanTermQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanTermQuery.java index efe1ad24cc4..786ee368693 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanTermQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanTermQuery.java @@ -26,7 +26,7 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.QueryUtils; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** Basic tests for SpanTermQuery */ public class TestSpanTermQuery extends LuceneTestCase { diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpans.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpans.java index 853832ae532..07f4b2afeae 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpans.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpans.java @@ -42,7 +42,7 @@ import org.apache.lucene.search.ScoreMode; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestSpans extends LuceneTestCase { private IndexSearcher searcher; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpansEnum.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpansEnum.java index c59fc608544..cc43bb44ddd 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpansEnum.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpansEnum.java @@ -28,9 +28,9 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.English; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.English; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java index 4aca1f0c756..be481c690c2 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java @@ -39,8 +39,8 @@ import org.apache.lucene.search.RegexpQuery; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; /** Tests QueryParser. */ public class TestMultiFieldQueryParser extends LuceneTestCase { diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiPhraseQueryParsing.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiPhraseQueryParsing.java index 92c11e1bbda..fb028b858d3 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiPhraseQueryParsing.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiPhraseQueryParsing.java @@ -24,7 +24,7 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.MultiPhraseQuery; import org.apache.lucene.search.Query; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestMultiPhraseQueryParsing extends LuceneTestCase { diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java index 01768bd7293..a8f0291216d 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java @@ -36,7 +36,7 @@ import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestComplexPhraseQuery extends LuceneTestCase { Directory rd; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/ext/TestExtensions.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/ext/TestExtensions.java index de1ed3c9117..1aaa58c6f9e 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/ext/TestExtensions.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/ext/TestExtensions.java @@ -16,7 +16,7 @@ */ package org.apache.lucene.queryparser.ext; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** Testcase for the {@link Extensions} class */ public class TestExtensions extends LuceneTestCase { diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/core/builders/TestQueryTreeBuilder.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/core/builders/TestQueryTreeBuilder.java index 8f13c6470a4..5c83dfa1c51 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/core/builders/TestQueryTreeBuilder.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/core/builders/TestQueryTreeBuilder.java @@ -22,7 +22,7 @@ import org.apache.lucene.queryparser.flexible.core.nodes.QueryNodeImpl; import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; import org.apache.lucene.queryparser.flexible.core.util.UnescapedCharSequence; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; public class TestQueryTreeBuilder extends LuceneTestCase { diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/core/nodes/TestQueryNode.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/core/nodes/TestQueryNode.java index 59edc6ca8fd..60dd48f5450 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/core/nodes/TestQueryNode.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/core/nodes/TestQueryNode.java @@ -18,7 +18,7 @@ import java.util.Arrays; import java.util.Collections; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestQueryNode extends LuceneTestCase { diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/messages/TestNLS.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/messages/TestNLS.java index 4cf2256291c..ba6b4131f14 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/messages/TestNLS.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/messages/TestNLS.java @@ -17,7 +17,7 @@ package org.apache.lucene.queryparser.flexible.messages; import java.util.Locale; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** */ public class TestNLS extends LuceneTestCase { diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/precedence/TestPrecedenceQueryParser.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/precedence/TestPrecedenceQueryParser.java index 7c5c1238847..305bae1c831 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/precedence/TestPrecedenceQueryParser.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/precedence/TestPrecedenceQueryParser.java @@ -45,7 +45,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TermRangeQuery; import org.apache.lucene.search.WildcardQuery; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.automaton.Automata; import org.apache.lucene.util.automaton.CharacterRunAutomaton; import org.junit.AfterClass; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/TestSpanQueryParser.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/TestSpanQueryParser.java index 7333238ba17..b02fdfeb1a5 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/TestSpanQueryParser.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/TestSpanQueryParser.java @@ -27,7 +27,7 @@ import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser; import org.apache.lucene.queryparser.flexible.standard.processors.WildcardQueryNodeProcessor; import org.apache.lucene.search.Query; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** * This test case demonstrates how the new query parser can be used.
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/TestSpanQueryParserSimpleSample.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/TestSpanQueryParserSimpleSample.java index 81e054dce3e..adce40045cd 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/TestSpanQueryParserSimpleSample.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/TestSpanQueryParserSimpleSample.java @@ -25,7 +25,7 @@ import org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessorPipeline; import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser; import org.apache.lucene.search.Query; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** * This test case demonstrates how the new query parser can be used.
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiAnalyzerQPHelper.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiAnalyzerQPHelper.java index 6df50644edc..bdebdff6ceb 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiAnalyzerQPHelper.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiAnalyzerQPHelper.java @@ -24,7 +24,7 @@ import org.apache.lucene.analysis.tokenattributes.TypeAttribute; import org.apache.lucene.queryparser.flexible.core.QueryNodeException; import org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** * This test case is a copy of the core Lucene query parser test, it was adapted to use new diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiFieldQPHelper.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiFieldQPHelper.java index 022e5a2ffc0..440b8a6b8d2 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiFieldQPHelper.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiFieldQPHelper.java @@ -35,8 +35,8 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; /** * This test case is a copy of the core Lucene query parser test, it was adapted to use new diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestPointQueryParser.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestPointQueryParser.java index e4010b774e0..8bfb75590b3 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestPointQueryParser.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestPointQueryParser.java @@ -25,7 +25,7 @@ import org.apache.lucene.document.IntPoint; import org.apache.lucene.document.LongPoint; import org.apache.lucene.queryparser.flexible.standard.config.PointsConfig; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** Simple test for point field integration into the flexible QP */ public class TestPointQueryParser extends LuceneTestCase { diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java index 81de1f127c7..219f5808e8d 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java @@ -74,7 +74,7 @@ import org.apache.lucene.search.TermRangeQuery; import org.apache.lucene.search.WildcardQuery; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.automaton.Automata; import org.apache.lucene.util.automaton.CharacterRunAutomaton; import org.apache.lucene.util.automaton.RegExp; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestStandardQPEnhancements.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestStandardQPEnhancements.java index de26e7c2724..f69bf96f2a9 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestStandardQPEnhancements.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestStandardQPEnhancements.java @@ -28,7 +28,7 @@ import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser; import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.Query; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/simple/TestSimpleQueryParser.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/simple/TestSimpleQueryParser.java index 5ae1f3483e9..496317b5894 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/simple/TestSimpleQueryParser.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/simple/TestSimpleQueryParser.java @@ -44,8 +44,8 @@ import org.apache.lucene.search.PrefixQuery; import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.automaton.LevenshteinAutomata; /** Tests for {@link SimpleQueryParser} */ 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.java index 3977c6523a4..75f751e5b8c 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 @@ -18,7 +18,7 @@ import junit.framework.TestSuite; import junit.textui.TestRunner; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class Test01Exceptions extends LuceneTestCase { /** Main for running test case by itself. */ 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.java index 85443c7ced5..1a726ecd9ba 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 @@ -18,7 +18,7 @@ import junit.framework.TestSuite; import junit.textui.TestRunner; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class Test02Boolean extends LuceneTestCase { public static void main(String[] args) { 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.java index d8ed0ec6b42..16f02a235d8 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 @@ -18,7 +18,7 @@ import junit.framework.TestSuite; import junit.textui.TestRunner; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class Test03Distance extends LuceneTestCase { public static void main(String[] args) { diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/TestSrndQuery.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/TestSrndQuery.java index 425d902be35..7a157cd8562 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/TestSrndQuery.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/TestSrndQuery.java @@ -19,7 +19,7 @@ import org.apache.lucene.queryparser.surround.parser.QueryParser; import org.apache.lucene.search.Query; import org.apache.lucene.search.QueryUtils; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; /** */ diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java index 1d79f176b9d..39a2ba5ecb5 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java @@ -63,7 +63,7 @@ import org.apache.lucene.search.TermRangeQuery; import org.apache.lucene.search.WildcardQuery; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.automaton.Automata; import org.apache.lucene.util.automaton.CharacterRunAutomaton; import org.apache.lucene.util.automaton.RegExp; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/CoreParserTestIndexData.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/CoreParserTestIndexData.java index 9911f9aa8be..759a110ebd9 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/CoreParserTestIndexData.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/CoreParserTestIndexData.java @@ -30,7 +30,7 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; class CoreParserTestIndexData implements Closeable { diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestCoreParser.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestCoreParser.java index 7a79f15d02e..7e03da8b952 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestCoreParser.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestCoreParser.java @@ -38,7 +38,7 @@ import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.AfterClass; import org.xml.sax.SAXException; diff --git a/lucene/replicator/src/java/module-info.java b/lucene/replicator/src/java/module-info.java index d44b9adfa9f..1c37c97c9da 100644 --- a/lucene/replicator/src/java/module-info.java +++ b/lucene/replicator/src/java/module-info.java @@ -20,6 +20,7 @@ module org.apache.lucene.replicator { requires javax.servlet.api; requires org.apache.httpcomponents.httpclient; + requires org.apache.httpcomponents.httpcore; requires org.apache.lucene.core; requires org.apache.lucene.facet; diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/ReplicatorTestCase.java b/lucene/replicator/src/test/org/apache/lucene/replicator/ReplicatorTestCase.java index d6d8bc4980d..443965745f7 100644 --- a/lucene/replicator/src/test/org/apache/lucene/replicator/ReplicatorTestCase.java +++ b/lucene/replicator/src/test/org/apache/lucene/replicator/ReplicatorTestCase.java @@ -20,7 +20,7 @@ import java.util.Random; import org.apache.http.conn.HttpClientConnectionManager; import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.HttpConfiguration; diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/TestIndexAndTaxonomyReplicationClient.java b/lucene/replicator/src/test/org/apache/lucene/replicator/TestIndexAndTaxonomyReplicationClient.java index 5da165ca5c6..ebc8fc9e787 100644 --- a/lucene/replicator/src/test/org/apache/lucene/replicator/TestIndexAndTaxonomyReplicationClient.java +++ b/lucene/replicator/src/test/org/apache/lucene/replicator/TestIndexAndTaxonomyReplicationClient.java @@ -49,8 +49,8 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.ThreadInterruptedException; import org.junit.After; import org.junit.Before; diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/TestIndexReplicationClient.java b/lucene/replicator/src/test/org/apache/lucene/replicator/TestIndexReplicationClient.java index 860465ff7b5..e31a5e10b2d 100644 --- a/lucene/replicator/src/test/org/apache/lucene/replicator/TestIndexReplicationClient.java +++ b/lucene/replicator/src/test/org/apache/lucene/replicator/TestIndexReplicationClient.java @@ -30,8 +30,8 @@ import org.apache.lucene.replicator.ReplicationClient.SourceDirectoryFactory; import org.apache.lucene.store.Directory; import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.ThreadInterruptedException; import org.junit.After; import org.junit.Before; diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimplePrimaryNode.java b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimplePrimaryNode.java index 8a7492fde9f..fc39c1ace82 100644 --- a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimplePrimaryNode.java +++ b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimplePrimaryNode.java @@ -61,9 +61,9 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.ThreadInterruptedException; /** A primary node that uses simple TCP connections to send commands and copy files */ diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleReplicaNode.java b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleReplicaNode.java index d4b7b5ee1cd..13244a4e810 100644 --- a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleReplicaNode.java +++ b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleReplicaNode.java @@ -49,7 +49,7 @@ import org.apache.lucene.store.MockDirectoryWrapper; import org.apache.lucene.store.RateLimitedIndexOutput; import org.apache.lucene.store.RateLimiter; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; class SimpleReplicaNode extends ReplicaNode { final int tcpPort; diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/TestNRTReplication.java b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/TestNRTReplication.java index 47a1f3a980c..18145db244e 100644 --- a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/TestNRTReplication.java +++ b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/TestNRTReplication.java @@ -33,14 +33,14 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.store.FSDirectory; import org.apache.lucene.store.LockObtainFailedException; +import org.apache.lucene.tests.util.LineFileDocs; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressSysoutChecks; +import org.apache.lucene.tests.util.TestRuleIgnoreTestSuites; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LineFileDocs; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; -import org.apache.lucene.util.LuceneTestCase.SuppressSysoutChecks; import org.apache.lucene.util.SuppressForbidden; -import org.apache.lucene.util.TestRuleIgnoreTestSuites; -import org.apache.lucene.util.TestUtil; // MockRandom's .sd file has no index header/footer: @SuppressCodecs({"MockRandom", "Direct", "SimpleText"}) diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/TestSimpleServer.java b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/TestSimpleServer.java index c776c29851e..2cfb6d4486b 100644 --- a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/TestSimpleServer.java +++ b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/TestSimpleServer.java @@ -40,14 +40,14 @@ import org.apache.lucene.store.DataOutput; import org.apache.lucene.store.InputStreamDataInput; import org.apache.lucene.store.OutputStreamDataOutput; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressSysoutChecks; +import org.apache.lucene.tests.util.TestRuleIgnoreTestSuites; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Constants; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; -import org.apache.lucene.util.LuceneTestCase.SuppressSysoutChecks; import org.apache.lucene.util.SuppressForbidden; -import org.apache.lucene.util.TestRuleIgnoreTestSuites; -import org.apache.lucene.util.TestUtil; import org.junit.Assume; import org.junit.AssumptionViolatedException; import org.junit.BeforeClass; diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/TestStressNRTReplication.java b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/TestStressNRTReplication.java index 197ba2f6dfa..a6d85507e90 100644 --- a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/TestStressNRTReplication.java +++ b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/TestStressNRTReplication.java @@ -45,14 +45,14 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.util.LineFileDocs; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressSysoutChecks; +import org.apache.lucene.tests.util.TestRuleIgnoreTestSuites; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LineFileDocs; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; -import org.apache.lucene.util.LuceneTestCase.SuppressSysoutChecks; import org.apache.lucene.util.SuppressForbidden; -import org.apache.lucene.util.TestRuleIgnoreTestSuites; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.ThreadInterruptedException; /* diff --git a/lucene/sandbox/src/test/org/apache/lucene/payloads/TestPayloadSpanUtil.java b/lucene/sandbox/src/test/org/apache/lucene/payloads/TestPayloadSpanUtil.java index d87b08d93ea..a2b4822fb09 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/payloads/TestPayloadSpanUtil.java +++ b/lucene/sandbox/src/test/org/apache/lucene/payloads/TestPayloadSpanUtil.java @@ -38,8 +38,8 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; public class TestPayloadSpanUtil extends LuceneTestCase { diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/codecs/idversion/TestIDVersionPostingsFormat.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/codecs/idversion/TestIDVersionPostingsFormat.java index fb4cd8f9f4a..2c2944f533c 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/codecs/idversion/TestIDVersionPostingsFormat.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/codecs/idversion/TestIDVersionPostingsFormat.java @@ -51,9 +51,9 @@ import org.apache.lucene.search.SearcherManager; import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; /** Basic tests for IDVersionPostingsFormat */ // Cannot extend BasePostingsFormatTestCase because this PF is not diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/document/TestBigIntegerPoint.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/document/TestBigIntegerPoint.java index d3d2adc2c27..ba7acb89457 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/document/TestBigIntegerPoint.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/document/TestBigIntegerPoint.java @@ -23,7 +23,7 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** Simple tests for {@link BigIntegerPoint} */ public class TestBigIntegerPoint extends LuceneTestCase { diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/document/TestDoubleRangeField.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/document/TestDoubleRangeField.java index d4c365cc794..0d59304af6b 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/document/TestDoubleRangeField.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/document/TestDoubleRangeField.java @@ -18,7 +18,7 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.DoubleRange; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** Random testing for RangeField type. */ public class TestDoubleRangeField extends LuceneTestCase { diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/document/TestFloatPointNearestNeighbor.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/document/TestFloatPointNearestNeighbor.java index 26dd8f48fc6..4e1cfea9a41 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/document/TestFloatPointNearestNeighbor.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/document/TestFloatPointNearestNeighbor.java @@ -34,8 +34,8 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestFloatPointNearestNeighbor extends LuceneTestCase { diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/document/TestHalfFloatPoint.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/document/TestHalfFloatPoint.java index d4212e0f08c..582053dc3e4 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/document/TestHalfFloatPoint.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/document/TestHalfFloatPoint.java @@ -22,9 +22,9 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.ArrayUtil; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestHalfFloatPoint extends LuceneTestCase { diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestFuzzyLikeThisQuery.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestFuzzyLikeThisQuery.java index 35adbce0757..bd7fe2825a6 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestFuzzyLikeThisQuery.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestFuzzyLikeThisQuery.java @@ -31,8 +31,8 @@ import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; public class TestFuzzyLikeThisQuery extends LuceneTestCase { private Directory directory; diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestCombinedFieldQuery.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestCombinedFieldQuery.java index 9460883668d..dbc452e26b1 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestCombinedFieldQuery.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestCombinedFieldQuery.java @@ -50,8 +50,8 @@ import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; import org.apache.lucene.store.MMapDirectory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; public class TestCombinedFieldQuery extends LuceneTestCase { public void testInvalid() { diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestCoveringQuery.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestCoveringQuery.java index c16685b73fd..5c1c51f7ba3 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestCoveringQuery.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestCoveringQuery.java @@ -39,7 +39,7 @@ import org.apache.lucene.search.QueryUtils; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestCoveringQuery extends LuceneTestCase { diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestDocValuesNumbersQuery.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestDocValuesNumbersQuery.java index 969c8e8054e..f88c925d44d 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestDocValuesNumbersQuery.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestDocValuesNumbersQuery.java @@ -39,9 +39,9 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestDocValuesNumbersQuery extends LuceneTestCase { diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestDocValuesTermsQuery.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestDocValuesTermsQuery.java index 24a5faca865..6411cb79c06 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestDocValuesTermsQuery.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestDocValuesTermsQuery.java @@ -36,10 +36,10 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestDocValuesTermsQuery extends LuceneTestCase { diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestFieldCacheTermsFilter.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestFieldCacheTermsFilter.java index 548fd3cc445..940405a0055 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestFieldCacheTermsFilter.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestFieldCacheTermsFilter.java @@ -26,8 +26,8 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; /** * A basic unit test for FieldCacheTermsFilter diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestIndexSortSortedNumericDocValuesRangeQuery.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestIndexSortSortedNumericDocValuesRangeQuery.java index 885e589b0e1..0c4d2bb12c2 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestIndexSortSortedNumericDocValuesRangeQuery.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestIndexSortSortedNumericDocValuesRangeQuery.java @@ -43,9 +43,9 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.Weight; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestIndexSortSortedNumericDocValuesRangeQuery extends LuceneTestCase { diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestLargeNumHitsTopDocsCollector.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestLargeNumHitsTopDocsCollector.java index 3dcd17057c4..fa300b53c87 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestLargeNumHitsTopDocsCollector.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestLargeNumHitsTopDocsCollector.java @@ -34,7 +34,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.TopScoreDocCollector; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestLargeNumHitsTopDocsCollector extends LuceneTestCase { private Directory dir; diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestLongHashSet.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestLongHashSet.java index 9c461c52412..564f186d9c7 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestLongHashSet.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestLongHashSet.java @@ -21,7 +21,7 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.LongStream; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestLongHashSet extends LuceneTestCase { diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestMultiRangeQueries.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestMultiRangeQueries.java index 71fc548b541..e6d83b47531 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestMultiRangeQueries.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestMultiRangeQueries.java @@ -38,9 +38,9 @@ import org.apache.lucene.search.Sort; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestMultiRangeQueries extends LuceneTestCase { diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestNearest.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestNearest.java index 2a16dc91818..5a00acc5ebe 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestNearest.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestNearest.java @@ -39,9 +39,9 @@ import org.apache.lucene.search.Sort; import org.apache.lucene.search.TopFieldDocs; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.SloppyMath; -import org.apache.lucene.util.TestUtil; public class TestNearest extends LuceneTestCase { diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestPhraseWildcardQuery.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestPhraseWildcardQuery.java index 90b1150df22..a351b971882 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestPhraseWildcardQuery.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestPhraseWildcardQuery.java @@ -51,8 +51,8 @@ import org.apache.lucene.search.Weight; import org.apache.lucene.search.WildcardQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; /** * Tests {@link PhraseWildcardQuery}. diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestProfilerCollector.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestProfilerCollector.java index 3d68ee144e3..073c2788dd8 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestProfilerCollector.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestProfilerCollector.java @@ -33,8 +33,8 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TotalHitCountCollector; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.hamcrest.MatcherAssert; public class TestProfilerCollector extends LuceneTestCase { diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestQueryProfilerIndexSearcher.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestQueryProfilerIndexSearcher.java index 3c3a69962f2..f05f3af8b7a 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestQueryProfilerIndexSearcher.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestQueryProfilerIndexSearcher.java @@ -36,9 +36,9 @@ import org.apache.lucene.search.Sort; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.hamcrest.MatcherAssert; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestQueryProfilerScorer.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestQueryProfilerScorer.java index c5647813e89..870ddfa051a 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestQueryProfilerScorer.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestQueryProfilerScorer.java @@ -26,7 +26,7 @@ import org.apache.lucene.search.ScoreMode; import org.apache.lucene.search.Scorer; import org.apache.lucene.search.Weight; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestQueryProfilerScorer extends LuceneTestCase { diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestTermAutomatonQuery.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestTermAutomatonQuery.java index 7ca592e5525..3cc63bd8279 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestTermAutomatonQuery.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestTermAutomatonQuery.java @@ -60,13 +60,13 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.Weight; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.AttributeSource; import org.apache.lucene.util.BitSetIterator; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.FixedBitSet; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.automaton.Automata; import org.apache.lucene.util.automaton.Automaton; import org.apache.lucene.util.automaton.Transition; diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/SpatialTestCase.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/SpatialTestCase.java index 45586ec7b98..a92ddaf1923 100644 --- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/SpatialTestCase.java +++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/SpatialTestCase.java @@ -32,9 +32,9 @@ import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressSysoutChecks; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.SuppressSysoutChecks; import org.locationtech.spatial4j.context.SpatialContext; import org.locationtech.spatial4j.distance.DistanceUtils; import org.locationtech.spatial4j.shape.Point; diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/TestQueryEqualsHashCode.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/TestQueryEqualsHashCode.java index 28854b12aaf..00aece9463d 100644 --- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/TestQueryEqualsHashCode.java +++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/TestQueryEqualsHashCode.java @@ -29,7 +29,7 @@ import org.apache.lucene.spatial.query.SpatialOperation; import org.apache.lucene.spatial.serialized.SerializedDVStrategy; import org.apache.lucene.spatial.vector.PointVectorStrategy; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; import org.locationtech.spatial4j.context.SpatialContext; import org.locationtech.spatial4j.shape.Shape; diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/TestSpatialArgs.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/TestSpatialArgs.java index 752497cc8a2..6a8286475ad 100644 --- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/TestSpatialArgs.java +++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/TestSpatialArgs.java @@ -18,7 +18,7 @@ import org.apache.lucene.spatial.query.SpatialArgs; import org.apache.lucene.spatial.spatial4j.Geo3dSpatialContextFactory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; import org.locationtech.spatial4j.context.SpatialContext; import org.locationtech.spatial4j.shape.Shape; diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/TestSpatialExample.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/TestSpatialExample.java index ec6e6638666..32cfb80a840 100644 --- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/TestSpatialExample.java +++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/TestSpatialExample.java @@ -41,7 +41,7 @@ import org.apache.lucene.spatial.query.SpatialOperation; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.locationtech.spatial4j.context.SpatialContext; import org.locationtech.spatial4j.distance.DistanceUtils; import org.locationtech.spatial4j.shape.Point; diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/TestTestFramework.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/TestTestFramework.java index ea18c35aa23..5cf491870e4 100644 --- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/TestTestFramework.java +++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/TestTestFramework.java @@ -23,7 +23,7 @@ import java.util.List; import org.apache.lucene.spatial.query.SpatialArgsParser; import org.apache.lucene.spatial.query.SpatialOperation; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Assert; import org.junit.Test; import org.locationtech.spatial4j.context.SpatialContext; diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestRecursivePrefixTreeStrategy.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestRecursivePrefixTreeStrategy.java index 91f21fce0bc..c9ac5fccef6 100644 --- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestRecursivePrefixTreeStrategy.java +++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestRecursivePrefixTreeStrategy.java @@ -24,7 +24,7 @@ import org.apache.lucene.spatial.prefix.tree.GeohashPrefixTree; import org.apache.lucene.spatial.query.SpatialArgs; import org.apache.lucene.spatial.query.SpatialOperation; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; import org.locationtech.spatial4j.context.SpatialContext; import org.locationtech.spatial4j.distance.DistanceUtils; diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/tree/TestDateRangePrefixTree.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/tree/TestDateRangePrefixTree.java index edc862c2f8a..60b2200cc88 100644 --- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/tree/TestDateRangePrefixTree.java +++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/tree/TestDateRangePrefixTree.java @@ -29,8 +29,8 @@ import java.util.Calendar; import java.util.GregorianCalendar; import org.apache.lucene.spatial.prefix.tree.NumberRangePrefixTree.UnitNRShape; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; import org.locationtech.spatial4j.shape.Shape; import org.locationtech.spatial4j.shape.SpatialRelation; diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/tree/TestS2PrefixTree.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/tree/TestS2PrefixTree.java index 96aa41b0d1d..97d50884e33 100644 --- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/tree/TestS2PrefixTree.java +++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/tree/TestS2PrefixTree.java @@ -21,8 +21,8 @@ import com.google.common.geometry.S2CellId; import com.google.common.geometry.S2Projections; import org.apache.lucene.spatial.spatial4j.Geo3dSpatialContextFactory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; import org.junit.Test; import org.locationtech.spatial4j.context.SpatialContext; import org.locationtech.spatial4j.shape.Point; diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/query/TestSpatialArgsParser.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/query/TestSpatialArgsParser.java index 015a16317d9..23e8e6a3877 100644 --- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/query/TestSpatialArgsParser.java +++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/query/TestSpatialArgsParser.java @@ -17,7 +17,7 @@ package org.apache.lucene.spatial.query; import java.text.ParseException; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; import org.locationtech.spatial4j.context.SpatialContext; import org.locationtech.spatial4j.shape.Rectangle; diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/RandomizedShapeTestCase.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/RandomizedShapeTestCase.java index eb5a7da3fdb..318d0093c71 100644 --- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/RandomizedShapeTestCase.java +++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/RandomizedShapeTestCase.java @@ -16,7 +16,7 @@ */ package org.apache.lucene.spatial.spatial4j; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.locationtech.spatial4j.context.SpatialContext; /** A base test class with utility methods to help test shapes. Extends from RandomizedTest. */ diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/TestGeo3d.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/TestGeo3d.java index 1ce896ae256..aaab077fc54 100644 --- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/TestGeo3d.java +++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/TestGeo3d.java @@ -17,7 +17,7 @@ package org.apache.lucene.spatial.spatial4j; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; import org.locationtech.spatial4j.context.SpatialContext; import org.locationtech.spatial4j.exception.InvalidShapeException; diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/TestGeo3DDocValues.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/TestGeo3DDocValues.java index 9a56c3e64a9..e1988666c1f 100644 --- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/TestGeo3DDocValues.java +++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/TestGeo3DDocValues.java @@ -19,8 +19,8 @@ import com.carrotsearch.randomizedtesting.generators.RandomPicks; import org.apache.lucene.spatial3d.geom.GeoPoint; import org.apache.lucene.spatial3d.geom.PlanetModel; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestGeo3DDocValues extends LuceneTestCase { diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/TestGeo3DPoint.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/TestGeo3DPoint.java index a2e5a9fa912..a7eec967c9a 100644 --- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/TestGeo3DPoint.java +++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/TestGeo3DPoint.java @@ -75,12 +75,12 @@ import org.apache.lucene.spatial3d.geom.XYZSolid; import org.apache.lucene.spatial3d.geom.XYZSolidFactory; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.DocIdSetBuilder; import org.apache.lucene.util.FixedBitSet; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.NumericUtils; -import org.apache.lucene.util.TestUtil; public class TestGeo3DPoint extends LuceneTestCase { diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestCompositeGeoPolygonRelationships.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestCompositeGeoPolygonRelationships.java index ca0b3b95664..5e8b9846646 100644 --- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestCompositeGeoPolygonRelationships.java +++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestCompositeGeoPolygonRelationships.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; /** diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoBBox.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoBBox.java index f32bbc3f242..f7d2bd688e6 100755 --- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoBBox.java +++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoBBox.java @@ -18,7 +18,7 @@ import java.util.ArrayList; import java.util.List; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; public class TestGeoBBox extends LuceneTestCase { diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoCircle.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoCircle.java index cf5e31f82c4..a29b6c37c7b 100755 --- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoCircle.java +++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoCircle.java @@ -16,7 +16,7 @@ */ package org.apache.lucene.spatial3d.geom; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; public class TestGeoCircle extends LuceneTestCase { diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoConvexPolygon.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoConvexPolygon.java index 9f8a0e4228a..b03c7a1ad01 100755 --- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoConvexPolygon.java +++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoConvexPolygon.java @@ -16,7 +16,7 @@ */ package org.apache.lucene.spatial3d.geom; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; public class TestGeoConvexPolygon extends LuceneTestCase { diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoExactCircle.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoExactCircle.java index 2ed41c96767..c99f6020011 100644 --- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoExactCircle.java +++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoExactCircle.java @@ -20,7 +20,7 @@ import static org.apache.lucene.spatial3d.geom.RandomGeo3dShapeGenerator.*; import com.carrotsearch.randomizedtesting.annotations.Repeat; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; /** Tests for GeoExactCircle. */ diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoModel.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoModel.java index b32dec53d3c..3c3a02c3dda 100644 --- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoModel.java +++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoModel.java @@ -16,7 +16,7 @@ */ package org.apache.lucene.spatial3d.geom; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; /** Test basic plane functionality. */ diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoPath.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoPath.java index a0c4594c731..a624cc4b6c6 100755 --- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoPath.java +++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoPath.java @@ -16,7 +16,7 @@ */ package org.apache.lucene.spatial3d.geom; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; public class TestGeoPath extends LuceneTestCase { diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoPoint.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoPoint.java index 326b0051156..de08b065433 100644 --- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoPoint.java +++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoPoint.java @@ -18,7 +18,7 @@ import static com.carrotsearch.randomizedtesting.RandomizedTest.randomFloat; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; /** Test basic GeoPoint functionality. */ diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoPolygon.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoPolygon.java index 685b763de44..071a5e983ac 100755 --- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoPolygon.java +++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestGeoPolygon.java @@ -20,7 +20,7 @@ import java.util.BitSet; import java.util.Collections; import java.util.List; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; public class TestGeoPolygon extends LuceneTestCase { diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestPlane.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestPlane.java index da690cbce3d..33ac5039174 100644 --- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestPlane.java +++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestPlane.java @@ -16,7 +16,7 @@ */ package org.apache.lucene.spatial3d.geom; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; /** Test basic plane functionality. */ diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestRandomBinaryCodec.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestRandomBinaryCodec.java index 4cde05f00ad..214ef7dff49 100644 --- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestRandomBinaryCodec.java +++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestRandomBinaryCodec.java @@ -23,7 +23,7 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; /** Test to check Serialization */ diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestRandomGeoPolygon.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestRandomGeoPolygon.java index cc6bcd457e9..e5a9d7d1a57 100644 --- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestRandomGeoPolygon.java +++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestRandomGeoPolygon.java @@ -22,7 +22,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; /** Random test for polygons. */ diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestRandomGeoShapeRelationship.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestRandomGeoShapeRelationship.java index ccc807889ed..9f3bd751738 100644 --- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestRandomGeoShapeRelationship.java +++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestRandomGeoShapeRelationship.java @@ -19,7 +19,7 @@ import static org.apache.lucene.spatial3d.geom.RandomGeo3dShapeGenerator.*; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; /** Random test to check relationship between GeoAreaShapes and GeoShapes. */ diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestRandomPlane.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestRandomPlane.java index c4cb115aa70..2ed0066cc76 100644 --- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestRandomPlane.java +++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestRandomPlane.java @@ -22,7 +22,7 @@ import com.carrotsearch.randomizedtesting.annotations.Repeat; import java.util.ArrayList; import java.util.List; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; /** Random test for planes. */ diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestSimpleGeoPolygonRelationships.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestSimpleGeoPolygonRelationships.java index 095925cf56f..1a832e358a7 100644 --- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestSimpleGeoPolygonRelationships.java +++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestSimpleGeoPolygonRelationships.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; /** diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestXYZSolid.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestXYZSolid.java index 6cf813b4c5b..5e56b683e48 100644 --- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestXYZSolid.java +++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/TestXYZSolid.java @@ -16,7 +16,7 @@ */ package org.apache.lucene.spatial3d.geom; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; public class TestXYZSolid extends LuceneTestCase { diff --git a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestDirectSpellChecker.java b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestDirectSpellChecker.java index 29d1afd9f12..3cac89e206c 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestDirectSpellChecker.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestDirectSpellChecker.java @@ -25,9 +25,9 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.English; +import org.apache.lucene.tests.util.English; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; public class TestDirectSpellChecker extends LuceneTestCase { diff --git a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestJaroWinklerDistance.java b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestJaroWinklerDistance.java index cb83c744276..081e9b813cd 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestJaroWinklerDistance.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestJaroWinklerDistance.java @@ -16,7 +16,7 @@ */ package org.apache.lucene.search.spell; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestJaroWinklerDistance extends LuceneTestCase { diff --git a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestLevenshteinDistance.java b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestLevenshteinDistance.java index 694d685cd64..e733847272b 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestLevenshteinDistance.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestLevenshteinDistance.java @@ -16,7 +16,7 @@ */ package org.apache.lucene.search.spell; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestLevenshteinDistance extends LuceneTestCase { diff --git a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java index f8d362ec696..9917fb5a692 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java @@ -26,9 +26,9 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefIterator; -import org.apache.lucene.util.LuceneTestCase; /** * Test case for LuceneDictionary. It first creates a simple index and then a couple of instances of diff --git a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestNGramDistance.java b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestNGramDistance.java index 6f3f208d9a0..ef27ba8fb27 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestNGramDistance.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestNGramDistance.java @@ -16,7 +16,7 @@ */ package org.apache.lucene.search.spell; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestNGramDistance extends LuceneTestCase { diff --git a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestPlainTextDictionary.java b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestPlainTextDictionary.java index 05f4684beac..592bb09b304 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestPlainTextDictionary.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestPlainTextDictionary.java @@ -19,7 +19,7 @@ import java.io.IOException; import java.io.StringReader; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** Test case for PlainTextDictionary */ public class TestPlainTextDictionary extends LuceneTestCase { diff --git a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestSpellChecker.java b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestSpellChecker.java index 60094058e58..a394322b774 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestSpellChecker.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestSpellChecker.java @@ -36,8 +36,8 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.English; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.English; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.NamedThreadFactory; /** Spell checker test case */ diff --git a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestWordBreakSpellChecker.java b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestWordBreakSpellChecker.java index 458aad2c7b9..da36788d048 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestWordBreakSpellChecker.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestWordBreakSpellChecker.java @@ -30,10 +30,10 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.spell.WordBreakSpellChecker.BreakSuggestionSortMethod; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.English; +import org.apache.lucene.tests.util.English; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.junit.Assert; public class TestWordBreakSpellChecker extends LuceneTestCase { diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestDocumentDictionary.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestDocumentDictionary.java index f20285f1b6a..dc65fb5b7b7 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestDocumentDictionary.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestDocumentDictionary.java @@ -41,9 +41,9 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.spell.Dictionary; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; import org.junit.Test; // See: https://issues.apache.org/jira/browse/SOLR-12028 Tests cannot remove files on Windows diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestDocumentValueSourceDictionary.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestDocumentValueSourceDictionary.java index 4706043c68a..ddc1735b386 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestDocumentValueSourceDictionary.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestDocumentValueSourceDictionary.java @@ -44,9 +44,9 @@ import org.apache.lucene.search.LongValuesSource; import org.apache.lucene.search.spell.Dictionary; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; import org.junit.Test; public class TestDocumentValueSourceDictionary extends LuceneTestCase { diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestFileDictionary.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestFileDictionary.java index 3fd5ce7216b..15803f1657f 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestFileDictionary.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestFileDictionary.java @@ -24,9 +24,9 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.junit.Test; public class TestFileDictionary extends LuceneTestCase { diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestHighFrequencyDictionary.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestHighFrequencyDictionary.java index c76c1a64bce..669d1e737bc 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestHighFrequencyDictionary.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestHighFrequencyDictionary.java @@ -23,8 +23,8 @@ import org.apache.lucene.search.spell.Dictionary; import org.apache.lucene.search.spell.HighFrequencyDictionary; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRefIterator; -import org.apache.lucene.util.LuceneTestCase; public class TestHighFrequencyDictionary extends LuceneTestCase { public void testEmpty() throws Exception { diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestInputIterator.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestInputIterator.java index af989a9b607..94ba3e3fdb8 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestInputIterator.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestInputIterator.java @@ -24,9 +24,9 @@ import java.util.Set; import java.util.TreeMap; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestInputIterator extends LuceneTestCase { diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestLookupBenchmark.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestLookupBenchmark.java index 69cc19755b6..afe9fe7192c 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestLookupBenchmark.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestLookupBenchmark.java @@ -42,7 +42,7 @@ import org.apache.lucene.search.suggest.tst.TSTLookup; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; -import org.apache.lucene.util.*; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.BeforeClass; import org.junit.Ignore; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestPersistence.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestPersistence.java index b18ea52c348..11cfa304271 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestPersistence.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestPersistence.java @@ -24,8 +24,8 @@ import org.apache.lucene.search.suggest.fst.FSTCompletionLookup; import org.apache.lucene.search.suggest.tst.TSTLookup; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; public class TestPersistence extends LuceneTestCase { public final String[] keys = diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestAnalyzingInfixSuggester.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestAnalyzingInfixSuggester.java index c32f36d9b5f..bdbc64873ea 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestAnalyzingInfixSuggester.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestAnalyzingInfixSuggester.java @@ -44,10 +44,10 @@ import org.apache.lucene.search.suggest.Lookup.LookupResult; import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.junit.Test; public class TestAnalyzingInfixSuggester extends LuceneTestCase { diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestAnalyzingSuggester.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestAnalyzingSuggester.java index bff93265de9..36063c56e43 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestAnalyzingSuggester.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestAnalyzingSuggester.java @@ -51,11 +51,11 @@ import org.apache.lucene.search.suggest.InputArrayIterator; import org.apache.lucene.search.suggest.Lookup.LookupResult; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LineFileDocs; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LineFileDocs; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestAnalyzingSuggester extends LuceneTestCase { diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestBlendedInfixSuggester.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestBlendedInfixSuggester.java index 605766293e3..d44d10a5a92 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestBlendedInfixSuggester.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestBlendedInfixSuggester.java @@ -31,9 +31,9 @@ import org.apache.lucene.search.suggest.Input; import org.apache.lucene.search.suggest.InputArrayIterator; import org.apache.lucene.search.suggest.Lookup; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestBlendedInfixSuggester extends LuceneTestCase { 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.java index 7096cef20a7..393fa8094ec 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 @@ -41,10 +41,10 @@ import org.apache.lucene.search.suggest.InputArrayIterator; import org.apache.lucene.search.suggest.InputIterator; import org.apache.lucene.search.suggest.Lookup.LookupResult; +import org.apache.lucene.tests.util.LineFileDocs; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LineFileDocs; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.junit.Ignore; public class TestFreeTextSuggester extends LuceneTestCase { diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestFuzzySuggester.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestFuzzySuggester.java index a5603cc0375..9de0b0daab0 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestFuzzySuggester.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestFuzzySuggester.java @@ -40,12 +40,12 @@ import org.apache.lucene.search.suggest.InputArrayIterator; import org.apache.lucene.search.suggest.Lookup.LookupResult; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.IntsRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.automaton.Automaton; import org.apache.lucene.util.automaton.FiniteStringsIterator; import org.apache.lucene.util.fst.Util; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestContextQuery.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestContextQuery.java index 43c7b95a375..99167017d3d 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestContextQuery.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestContextQuery.java @@ -32,9 +32,9 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.ArrayUtil; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestContextSuggestField.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestContextSuggestField.java index 39a4b8eda4e..695f8e9d63a 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestContextSuggestField.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestContextSuggestField.java @@ -33,9 +33,9 @@ import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; import org.apache.lucene.store.OutputStreamDataOutput; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.CharsRefBuilder; -import org.apache.lucene.util.LuceneTestCase; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestFuzzyCompletionQuery.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestFuzzyCompletionQuery.java index e8a5531d5a5..de05e4071ea 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestFuzzyCompletionQuery.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestFuzzyCompletionQuery.java @@ -27,7 +27,7 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestPrefixCompletionQuery.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestPrefixCompletionQuery.java index 172f43b285c..e896a27140b 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestPrefixCompletionQuery.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestPrefixCompletionQuery.java @@ -42,9 +42,9 @@ import org.apache.lucene.search.ScoreMode; import org.apache.lucene.search.suggest.BitsProducer; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.Bits; import org.apache.lucene.util.FixedBitSet; -import org.apache.lucene.util.LuceneTestCase; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestRegexCompletionQuery.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestRegexCompletionQuery.java index 738ce252ff7..a88fe1ba82b 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestRegexCompletionQuery.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestRegexCompletionQuery.java @@ -28,7 +28,7 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.ScoreMode; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestSuggestField.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestSuggestField.java index 9000e019337..37d91939945 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestSuggestField.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestSuggestField.java @@ -59,12 +59,12 @@ import org.apache.lucene.search.suggest.document.TopSuggestDocs.SuggestScoreDoc; import org.apache.lucene.store.Directory; import org.apache.lucene.store.OutputStreamDataOutput; +import org.apache.lucene.tests.util.LineFileDocs; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.CharsRefBuilder; -import org.apache.lucene.util.LineFileDocs; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/TestBytesRefSorters.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/TestBytesRefSorters.java index 80b7687131a..80a6351d571 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/TestBytesRefSorters.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/TestBytesRefSorters.java @@ -24,10 +24,10 @@ import java.util.Random; import org.apache.lucene.search.suggest.InMemorySorter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefIterator; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.OfflineSorter; import org.junit.Test; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/TestFSTCompletion.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/TestFSTCompletion.java index 29b388301fe..adcaaf12bba 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/TestFSTCompletion.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/TestFSTCompletion.java @@ -22,6 +22,8 @@ import org.apache.lucene.search.suggest.Lookup.LookupResult; import org.apache.lucene.search.suggest.fst.FSTCompletion.Completion; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.*; /** Unit tests for {@link FSTCompletion}. */ diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/TestWFSTCompletion.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/TestWFSTCompletion.java index c2f4fbe3598..cb31e2039af 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/TestWFSTCompletion.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/TestWFSTCompletion.java @@ -21,9 +21,9 @@ import org.apache.lucene.search.suggest.InputArrayIterator; import org.apache.lucene.search.suggest.Lookup.LookupResult; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestWFSTCompletion extends LuceneTestCase { diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java index 71cf29f734f..04d54c7b5db 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java @@ -36,6 +36,10 @@ import org.apache.lucene.index.IndexableFieldType; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.Rethrow; +import org.apache.lucene.tests.util.TestUtil; +import org.apache.lucene.tests.util.automaton.AutomatonTestUtil; import org.apache.lucene.util.Attribute; import org.apache.lucene.util.AttributeFactory; import org.apache.lucene.util.AttributeImpl; @@ -44,11 +48,7 @@ import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.IntsRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.Rethrow; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.automaton.Automaton; -import org.apache.lucene.util.automaton.AutomatonTestUtil; import org.apache.lucene.util.fst.Util; /** diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/CollationTestBase.java b/lucene/test-framework/src/java/org/apache/lucene/analysis/CollationTestBase.java index 80c2b0f5398..93f89561869 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/CollationTestBase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/analysis/CollationTestBase.java @@ -37,9 +37,9 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TermRangeQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; /** Base test class for testing Unicode collation. */ public abstract class CollationTestBase extends LuceneTestCase { diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockAnalyzer.java b/lucene/test-framework/src/java/org/apache/lucene/analysis/MockAnalyzer.java index a9a7501ab07..b818278ea53 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockAnalyzer.java +++ b/lucene/test-framework/src/java/org/apache/lucene/analysis/MockAnalyzer.java @@ -19,7 +19,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Random; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.automaton.CharacterRunAutomaton; /** diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockGraphTokenFilter.java b/lucene/test-framework/src/java/org/apache/lucene/analysis/MockGraphTokenFilter.java index 77021d6f001..6715ca88f83 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockGraphTokenFilter.java +++ b/lucene/test-framework/src/java/org/apache/lucene/analysis/MockGraphTokenFilter.java @@ -19,7 +19,7 @@ import java.io.IOException; import java.util.Random; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; // TODO: sometimes remove tokens too...? diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockHoleInjectingTokenFilter.java b/lucene/test-framework/src/java/org/apache/lucene/analysis/MockHoleInjectingTokenFilter.java index fdd20ab5d29..3ad3f717fa2 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockHoleInjectingTokenFilter.java +++ b/lucene/test-framework/src/java/org/apache/lucene/analysis/MockHoleInjectingTokenFilter.java @@ -20,7 +20,7 @@ import java.util.Random; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; import org.apache.lucene.analysis.tokenattributes.PositionLengthAttribute; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; // TODO: maybe, instead to be more "natural", we should make // a MockRemovesTokensTF, ideally subclassing FilteringTF diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockReaderWrapper.java b/lucene/test-framework/src/java/org/apache/lucene/analysis/MockReaderWrapper.java index 9a18e595d58..ae5d7a56b3c 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockReaderWrapper.java +++ b/lucene/test-framework/src/java/org/apache/lucene/analysis/MockReaderWrapper.java @@ -19,7 +19,7 @@ import java.io.IOException; import java.io.Reader; import java.util.Random; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; /** Wraps a Reader, and can throw random or fixed exceptions, and spoon feed read chars. */ public class MockReaderWrapper extends Reader { diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/VocabularyAssert.java b/lucene/test-framework/src/java/org/apache/lucene/analysis/VocabularyAssert.java index 5e2bbe1075a..1a8eb934e44 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/VocabularyAssert.java +++ b/lucene/test-framework/src/java/org/apache/lucene/analysis/VocabularyAssert.java @@ -23,8 +23,8 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.junit.Assert; /** Utility class for doing vocabulary-based stemming tests */ diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingCodec.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingCodec.java index f89b9d7905b..ac56dd9dbd9 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingCodec.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingCodec.java @@ -28,7 +28,7 @@ import org.apache.lucene.codecs.perfield.PerFieldDocValuesFormat; import org.apache.lucene.codecs.perfield.PerFieldKnnVectorsFormat; import org.apache.lucene.codecs.perfield.PerFieldPostingsFormat; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; /** Acts like the default codec but with additional asserts. */ public class AssertingCodec extends FilterCodec { diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingDocValuesFormat.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingDocValuesFormat.java index 5e7a7f23429..83abab14214 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingDocValuesFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingDocValuesFormat.java @@ -32,10 +32,10 @@ import org.apache.lucene.index.SortedDocValues; import org.apache.lucene.index.SortedNumericDocValues; import org.apache.lucene.index.SortedSetDocValues; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.FixedBitSet; import org.apache.lucene.util.LongBitSet; -import org.apache.lucene.util.TestUtil; /** Just like the default but with additional asserts. */ public class AssertingDocValuesFormat extends DocValuesFormat { diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingKnnVectorsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingKnnVectorsFormat.java index 180c6dfcf93..bc8fd84a3a5 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingKnnVectorsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingKnnVectorsFormat.java @@ -26,8 +26,8 @@ import org.apache.lucene.index.SegmentWriteState; import org.apache.lucene.index.VectorValues; import org.apache.lucene.search.TopDocs; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; -import org.apache.lucene.util.TestUtil; /** Wraps the default KnnVectorsFormat and provides additional assertions. */ public class AssertingKnnVectorsFormat extends KnnVectorsFormat { diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingLiveDocsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingLiveDocsFormat.java index 54f7ba1fe8b..95a82a3bec9 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingLiveDocsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingLiveDocsFormat.java @@ -22,8 +22,8 @@ import org.apache.lucene.index.SegmentCommitInfo; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; -import org.apache.lucene.util.TestUtil; /** Just like the default live docs format but with additional asserts. */ public class AssertingLiveDocsFormat extends LiveDocsFormat { diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingNormsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingNormsFormat.java index e2d11c4b59f..b034ac3d16e 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingNormsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingNormsFormat.java @@ -27,7 +27,7 @@ import org.apache.lucene.index.NumericDocValues; import org.apache.lucene.index.SegmentReadState; import org.apache.lucene.index.SegmentWriteState; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; /** Just like the default but with additional asserts. */ public class AssertingNormsFormat extends NormsFormat { diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPointsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPointsFormat.java index 5083d1b88b6..c10c0d84b38 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPointsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPointsFormat.java @@ -26,7 +26,7 @@ import org.apache.lucene.index.PointValues; import org.apache.lucene.index.SegmentReadState; import org.apache.lucene.index.SegmentWriteState; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; /** Just like the default point format but with additional asserts. */ public final class AssertingPointsFormat extends PointsFormat { diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java index d6012dc1f82..fd136f3d6ac 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java @@ -32,9 +32,9 @@ import org.apache.lucene.index.SegmentWriteState; import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; -import org.apache.lucene.util.TestUtil; /** Just like the default postings format but with additional asserts. */ public final class AssertingPostingsFormat extends PostingsFormat { diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingStoredFieldsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingStoredFieldsFormat.java index cd123d7a51b..af22cf85356 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingStoredFieldsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingStoredFieldsFormat.java @@ -28,8 +28,8 @@ import org.apache.lucene.index.StoredFieldVisitor; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Accountable; -import org.apache.lucene.util.TestUtil; /** Just like the default stored fields format but with additional asserts. */ public class AssertingStoredFieldsFormat extends StoredFieldsFormat { diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingTermVectorsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingTermVectorsFormat.java index 10433dd5b72..1bdb9b6b6c5 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingTermVectorsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingTermVectorsFormat.java @@ -29,9 +29,9 @@ import org.apache.lucene.index.SegmentInfo; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Accountable; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.TestUtil; /** Just like the default vectors format but with additional asserts. */ public class AssertingTermVectorsFormat extends TermVectorsFormat { diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/bloom/TestBloomFilteredLucenePostings.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/bloom/TestBloomFilteredLucenePostings.java index 29a14f8f01c..fd48f0f0a47 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/bloom/TestBloomFilteredLucenePostings.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/bloom/TestBloomFilteredLucenePostings.java @@ -23,7 +23,7 @@ import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.SegmentReadState; import org.apache.lucene.index.SegmentWriteState; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; /** * A class used for testing {@link BloomFilteringPostingsFormat} with a concrete delegate diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/cheapbastard/CheapBastardCodec.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/cheapbastard/CheapBastardCodec.java index 1da4301ea16..5dd7281cefe 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/cheapbastard/CheapBastardCodec.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/cheapbastard/CheapBastardCodec.java @@ -18,7 +18,7 @@ import org.apache.lucene.codecs.FilterCodec; import org.apache.lucene.codecs.PostingsFormat; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; /** Codec that tries to use as little ram as possible because he spent all his money on beer */ // TODO: better name :) diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/CompressingCodec.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/CompressingCodec.java index f379184c5e1..488d8274c3e 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/CompressingCodec.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/CompressingCodec.java @@ -24,7 +24,7 @@ import org.apache.lucene.codecs.compressing.dummy.DummyCompressingCodec; import org.apache.lucene.codecs.lucene90.compressing.Lucene90CompressingStoredFieldsFormat; import org.apache.lucene.codecs.lucene90.compressing.Lucene90CompressingTermVectorsFormat; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.packed.DirectMonotonicWriter; /** diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/mockrandom/MockRandomPostingsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/mockrandom/MockRandomPostingsFormat.java index c0914b3740a..a7d1416c250 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/mockrandom/MockRandomPostingsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/mockrandom/MockRandomPostingsFormat.java @@ -47,9 +47,9 @@ import org.apache.lucene.index.SegmentWriteState; import org.apache.lucene.store.ChecksumIndexInput; import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; /** Randomly combines terms index impl w/ postings impls. */ public final class MockRandomPostingsFormat extends PostingsFormat { diff --git a/lucene/test-framework/src/java/org/apache/lucene/geo/BaseGeoPointTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/geo/BaseGeoPointTestCase.java index 46da94fba80..611409253e9 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/geo/BaseGeoPointTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/geo/BaseGeoPointTestCase.java @@ -60,12 +60,12 @@ import org.apache.lucene.search.Sort; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; import org.apache.lucene.util.FixedBitSet; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.SloppyMath; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.bkd.BKDWriter; /** diff --git a/lucene/test-framework/src/java/org/apache/lucene/geo/BaseXYPointTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/geo/BaseXYPointTestCase.java index b533d3ebfb1..81a3689254b 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/geo/BaseXYPointTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/geo/BaseXYPointTestCase.java @@ -59,11 +59,11 @@ import org.apache.lucene.search.Sort; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; import org.apache.lucene.util.FixedBitSet; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.bkd.BKDWriter; /** Abstract class to do basic tests for a xy spatial impl (high level fields and queries) */ diff --git a/lucene/test-framework/src/java/org/apache/lucene/geo/GeoTestUtil.java b/lucene/test-framework/src/java/org/apache/lucene/geo/GeoTestUtil.java index 42540fe01ce..3500d2bb68a 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/geo/GeoTestUtil.java +++ b/lucene/test-framework/src/java/org/apache/lucene/geo/GeoTestUtil.java @@ -28,9 +28,9 @@ import java.util.List; import java.util.Random; import java.util.zip.GZIPInputStream; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.NumericUtils; import org.apache.lucene.util.SloppyMath; -import org.apache.lucene.util.TestUtil; /** static methods for testing geo */ public class GeoTestUtil { diff --git a/lucene/test-framework/src/java/org/apache/lucene/geo/ShapeTestUtil.java b/lucene/test-framework/src/java/org/apache/lucene/geo/ShapeTestUtil.java index 1cd77ccd31b..ff2d18358d6 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/geo/ShapeTestUtil.java +++ b/lucene/test-framework/src/java/org/apache/lucene/geo/ShapeTestUtil.java @@ -20,8 +20,8 @@ import com.carrotsearch.randomizedtesting.generators.BiasedNumbers; import java.util.ArrayList; import java.util.Random; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; /** generates random cartesian geometry; heavy reuse of {@link GeoTestUtil} */ public class ShapeTestUtil { diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/AlcoholicMergePolicy.java b/lucene/test-framework/src/java/org/apache/lucene/index/AlcoholicMergePolicy.java index 3291ec00760..ef77439cecc 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/AlcoholicMergePolicy.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/AlcoholicMergePolicy.java @@ -22,7 +22,7 @@ import java.util.Locale; import java.util.Random; import java.util.TimeZone; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; /** * Merge policy for testing, it is like an alcoholic. It drinks (merges) at night, and randomly diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseCompoundFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BaseCompoundFormatTestCase.java index 46fab1cbe95..32e1782f07c 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseCompoundFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BaseCompoundFormatTestCase.java @@ -39,9 +39,9 @@ import org.apache.lucene.store.IndexOutput; import org.apache.lucene.store.MockDirectoryWrapper; import org.apache.lucene.store.NRTCachingDirectory; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.FixedBitSet; import org.apache.lucene.util.StringHelper; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.Version; /** diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseCompressingDocValuesFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BaseCompressingDocValuesFormatTestCase.java index fc6d23c6a55..9d73abd037b 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseCompressingDocValuesFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BaseCompressingDocValuesFormatTestCase.java @@ -25,7 +25,7 @@ import org.apache.lucene.document.NumericDocValuesField; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.packed.PackedInts; /** Extends {@link BaseDocValuesFormatTestCase} to add compression checks. */ diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseDocValuesFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BaseDocValuesFormatTestCase.java index 9e494b07e2d..09e0dcb0bf7 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseDocValuesFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BaseDocValuesFormatTestCase.java @@ -62,13 +62,13 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BitSet; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.BytesRefHash; import org.apache.lucene.util.FixedBitSet; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.automaton.CompiledAutomaton; import org.apache.lucene.util.automaton.Operations; import org.apache.lucene.util.automaton.RegExp; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseFieldInfoFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BaseFieldInfoFormatTestCase.java index a66266e93a3..2f0856dea5c 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseFieldInfoFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BaseFieldInfoFormatTestCase.java @@ -34,8 +34,8 @@ import org.apache.lucene.store.MockDirectoryWrapper; import org.apache.lucene.store.MockDirectoryWrapper.Failure; import org.apache.lucene.store.MockDirectoryWrapper.FakeIOException; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.StringHelper; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.Version; /** diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java index 5eeddf89ddf..c3780b289c7 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java @@ -61,16 +61,16 @@ import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.RamUsageTester; +import org.apache.lucene.tests.util.Rethrow; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.CloseableThreadLocal; import org.apache.lucene.util.FixedBitSet; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.RamUsageEstimator; -import org.apache.lucene.util.RamUsageTester; -import org.apache.lucene.util.Rethrow; import org.apache.lucene.util.StringHelper; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.Version; /** Common tests to all index formats. */ diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseKnnVectorsFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BaseKnnVectorsFormatTestCase.java index 1d881e1da88..be638abdcbb 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseKnnVectorsFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BaseKnnVectorsFormatTestCase.java @@ -34,9 +34,9 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.VectorUtil; /** diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseLiveDocsFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BaseLiveDocsFormatTestCase.java index 74bc4def1b1..1ca18846214 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseLiveDocsFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BaseLiveDocsFormatTestCase.java @@ -22,11 +22,11 @@ import org.apache.lucene.codecs.LiveDocsFormat; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; import org.apache.lucene.util.FixedBitSet; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.StringHelper; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.Version; /** Abstract class that performs basic testing of a codec's {@link LiveDocsFormat}. */ diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseMergePolicyTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BaseMergePolicyTestCase.java index 1fa1cd465d6..28042c68e25 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseMergePolicyTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BaseMergePolicyTestCase.java @@ -37,11 +37,11 @@ import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; import org.apache.lucene.store.Lock; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.NullInfoStream; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.InfoStream; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.NullInfoStream; import org.apache.lucene.util.StringHelper; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.Version; /** Base test case for {@link MergePolicy}. */ diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseNormsFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BaseNormsFormatTestCase.java index c47aa001b71..7e249f33597 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseNormsFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BaseNormsFormatTestCase.java @@ -37,9 +37,9 @@ import org.apache.lucene.search.TermStatistics; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.FixedBitSet; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.TestUtil; /** * Abstract class to do basic tests for a norms format. NOTE: This test focuses on the norms impl, diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BasePointsFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BasePointsFormatTestCase.java index a89b3113d2d..0a346dd6625 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BasePointsFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BasePointsFormatTestCase.java @@ -38,12 +38,12 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.store.Directory; import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.util.Rethrow; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.NumericUtils; -import org.apache.lucene.util.Rethrow; -import org.apache.lucene.util.TestUtil; /** * Abstract class to do basic tests for a points format. NOTE: This test focuses on the points impl, diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java index cc585904031..cc9dae5f7e5 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java @@ -51,10 +51,10 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; +import org.apache.lucene.tests.util.LineFileDocs; +import org.apache.lucene.tests.util.RamUsageTester; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LineFileDocs; -import org.apache.lucene.util.RamUsageTester; -import org.apache.lucene.util.TestUtil; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseSegmentInfoFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BaseSegmentInfoFormatTestCase.java index 069d0418f13..83181632bab 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseSegmentInfoFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BaseSegmentInfoFormatTestCase.java @@ -34,8 +34,8 @@ import org.apache.lucene.store.MockDirectoryWrapper; import org.apache.lucene.store.MockDirectoryWrapper.Failure; import org.apache.lucene.store.MockDirectoryWrapper.FakeIOException; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.StringHelper; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.Version; /** diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java index cc57c5612ac..56679007bdd 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java @@ -56,9 +56,9 @@ import org.apache.lucene.store.MMapDirectory; import org.apache.lucene.store.MockDirectoryWrapper; import org.apache.lucene.store.MockDirectoryWrapper.Throttling; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.TestUtil; /** * Base class aiming at testing {@link StoredFieldsFormat stored fields formats}. To test a new diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseTermVectorsFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BaseTermVectorsFormatTestCase.java index 70e7c849d31..e0aaf90ddec 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseTermVectorsFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BaseTermVectorsFormatTestCase.java @@ -61,11 +61,11 @@ import org.apache.lucene.search.SortField; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.AttributeImpl; import org.apache.lucene.util.AttributeReflector; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.TestUtil; /** * Base class aiming at testing {@link TermVectorsFormat term vectors formats}. To test a new diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseTestCheckIndex.java b/lucene/test-framework/src/java/org/apache/lucene/index/BaseTestCheckIndex.java index 35c5458ece5..73142e7a2d7 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseTestCheckIndex.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BaseTestCheckIndex.java @@ -27,10 +27,10 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.store.Directory; import org.apache.lucene.store.LockObtainFailedException; +import org.apache.lucene.tests.util.LineFileDocs; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LineFileDocs; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; /** Base class for CheckIndex tests. */ public class BaseTestCheckIndex extends LuceneTestCase { diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/IndexWriterMaxDocsChanger.java b/lucene/test-framework/src/java/org/apache/lucene/index/IndexWriterMaxDocsChanger.java index 8a3497174e1..4f30dd9b147 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/IndexWriterMaxDocsChanger.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/IndexWriterMaxDocsChanger.java @@ -16,7 +16,7 @@ */ package org.apache.lucene.index; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** * Accessor to make some package protected methods in {@link IndexWriter} available for testing. diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/MockRandomMergePolicy.java b/lucene/test-framework/src/java/org/apache/lucene/index/MockRandomMergePolicy.java index 3549bf30141..a9e8fecebdd 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/MockRandomMergePolicy.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/MockRandomMergePolicy.java @@ -23,8 +23,8 @@ import java.util.Map; import java.util.Random; import java.util.Set; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; /** MergePolicy that makes random decisions for testing. */ public class MockRandomMergePolicy extends MergePolicy { diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java b/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java index 8f717679c38..7d800a9bf1a 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java @@ -47,8 +47,8 @@ import org.apache.lucene.codecs.mockrandom.MockRandomPostingsFormat; import org.apache.lucene.index.PointValues.IntersectVisitor; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.bkd.BKDConfig; import org.apache.lucene.util.bkd.BKDWriter; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java b/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java index acf21776313..1e60eb488b7 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java @@ -29,12 +29,12 @@ import org.apache.lucene.document.NumericDocValuesField; import org.apache.lucene.search.Query; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.NullInfoStream; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.InfoStream; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.NullInfoStream; -import org.apache.lucene.util.TestUtil; /** * Silly class that randomizes the indexing experience. EG it may swap in a different merge diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/RandomPostingsTester.java b/lucene/test-framework/src/java/org/apache/lucene/index/RandomPostingsTester.java index 26db06401d7..6a0895a3aff 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/RandomPostingsTester.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/RandomPostingsTester.java @@ -49,16 +49,16 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.FlushInfo; import org.apache.lucene.store.IOContext; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; +import org.apache.lucene.tests.util.automaton.AutomatonTestUtil; +import org.apache.lucene.tests.util.automaton.AutomatonTestUtil.RandomAcceptedStrings; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.StringHelper; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.UnicodeUtil; import org.apache.lucene.util.Version; import org.apache.lucene.util.automaton.Automaton; -import org.apache.lucene.util.automaton.AutomatonTestUtil; -import org.apache.lucene.util.automaton.AutomatonTestUtil.RandomAcceptedStrings; import org.apache.lucene.util.automaton.CompiledAutomaton; import org.apache.lucene.util.automaton.Operations; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java index 17822296c8f..bd5a8d92e11 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java @@ -44,14 +44,14 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.BaseDirectoryWrapper; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.FailOnNonBulkMergesInfoStream; +import org.apache.lucene.tests.util.LineFileDocs; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.FailOnNonBulkMergesInfoStream; -import org.apache.lucene.util.LineFileDocs; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.NamedThreadFactory; import org.apache.lucene.util.PrintStreamInfoStream; -import org.apache.lucene.util.TestUtil; // TODO // - mix in forceMerge, addIndexes diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/MockFileSystemTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/mockfile/MockFileSystemTestCase.java index 5ba6a675dd4..cbb934e2289 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/MockFileSystemTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/mockfile/MockFileSystemTestCase.java @@ -23,9 +23,9 @@ import java.nio.file.Files; import java.nio.file.InvalidPathException; import java.nio.file.Path; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressFileSystems; import org.apache.lucene.util.Constants; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.SuppressFileSystems; /** * Base class for testing mockfilesystems. This tests things that really need to work: Path diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/VirusCheckingFS.java b/lucene/test-framework/src/java/org/apache/lucene/mockfile/VirusCheckingFS.java index e1b54563e98..eead2661a89 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/VirusCheckingFS.java +++ b/lucene/test-framework/src/java/org/apache/lucene/mockfile/VirusCheckingFS.java @@ -24,7 +24,7 @@ import java.nio.file.Path; import java.util.concurrent.atomic.AtomicLong; import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** * Acts like a virus checker on Windows, where random programs may open the files you just wrote in diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/AssertingWeight.java b/lucene/test-framework/src/java/org/apache/lucene/search/AssertingWeight.java index 857e2dc954e..4b6151c415a 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/AssertingWeight.java +++ b/lucene/test-framework/src/java/org/apache/lucene/search/AssertingWeight.java @@ -16,7 +16,7 @@ */ package org.apache.lucene.search; -import static org.apache.lucene.util.LuceneTestCase.usually; +import static org.apache.lucene.tests.util.LuceneTestCase.usually; import java.io.IOException; import java.util.Random; diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/BaseExplanationTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/search/BaseExplanationTestCase.java index e16747d1e11..63b933c2e83 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/BaseExplanationTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/search/BaseExplanationTestCase.java @@ -25,8 +25,8 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/BaseRangeFieldQueryTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/search/BaseRangeFieldQueryTestCase.java index 6e1f705a356..ceede3fdc9a 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/BaseRangeFieldQueryTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/search/BaseRangeFieldQueryTestCase.java @@ -34,11 +34,11 @@ import org.apache.lucene.index.SerialMergeScheduler; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; import org.apache.lucene.util.FixedBitSet; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; /** * Abstract class to do basic tests for a RangeField query. Testing rigor inspired by {@code diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/CheckHits.java b/lucene/test-framework/src/java/org/apache/lucene/search/CheckHits.java index 13ba68d3146..73f12b61e16 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/CheckHits.java +++ b/lucene/test-framework/src/java/org/apache/lucene/search/CheckHits.java @@ -26,7 +26,7 @@ import java.util.regex.Pattern; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** Utility class for asserting expected hits in tests. */ public class CheckHits { diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/MatchesTestBase.java b/lucene/test-framework/src/java/org/apache/lucene/search/MatchesTestBase.java index d232c187dd1..03315108be5 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/MatchesTestBase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/search/MatchesTestBase.java @@ -36,7 +36,7 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.ReaderUtil; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** * Base class for tests checking the {@link Weight#matches(LeafReaderContext, int)} implementations diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java b/lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java index 318f101c473..8dcf6a6fab5 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java +++ b/lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java @@ -39,8 +39,8 @@ import org.apache.lucene.index.StoredFieldVisitor; import org.apache.lucene.index.Terms; import org.apache.lucene.index.VectorValues; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.Bits; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.Version; import org.junit.Assert; diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/SearchEquivalenceTestBase.java b/lucene/test-framework/src/java/org/apache/lucene/search/SearchEquivalenceTestBase.java index 23c1ee07c0a..fd187136e76 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/SearchEquivalenceTestBase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/search/SearchEquivalenceTestBase.java @@ -30,9 +30,9 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.automaton.Automata; import org.apache.lucene.util.automaton.CharacterRunAutomaton; import org.junit.AfterClass; diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/ShardSearchingTestBase.java b/lucene/test-framework/src/java/org/apache/lucene/search/ShardSearchingTestBase.java index 7f62db17a22..4e89e073a7b 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/ShardSearchingTestBase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/search/ShardSearchingTestBase.java @@ -31,10 +31,10 @@ import org.apache.lucene.index.Term; import org.apache.lucene.index.TermStates; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LineFileDocs; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LineFileDocs; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.PrintStreamInfoStream; -import org.apache.lucene.util.TestUtil; // TODO // - doc blocks? so we can test joins/grouping... diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/similarities/BaseSimilarityTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/search/similarities/BaseSimilarityTestCase.java index 15613f3dd33..4e560cb5e4b 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/similarities/BaseSimilarityTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/search/similarities/BaseSimilarityTestCase.java @@ -29,11 +29,11 @@ import org.apache.lucene.search.TermStatistics; import org.apache.lucene.search.similarities.Similarity.SimScorer; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.SmallFloat; -import org.apache.lucene.util.TestUtil; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/test-framework/src/java/org/apache/lucene/store/BaseChunkedDirectoryTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/store/BaseChunkedDirectoryTestCase.java index db5be49477c..1d2c1213dc8 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/store/BaseChunkedDirectoryTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/store/BaseChunkedDirectoryTestCase.java @@ -24,8 +24,8 @@ import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.TestUtil; /** * Base class for Directories that "chunk" the input into blocks. diff --git a/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryTestCase.java index ddc6084f2c9..101e84d7c44 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryTestCase.java @@ -46,9 +46,9 @@ import org.apache.lucene.index.IndexFileNames; import org.apache.lucene.index.IndexNotFoundException; import org.apache.lucene.mockfile.ExtrasFS; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.junit.Assert; /** Base class for {@link Directory} implementations. */ diff --git a/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryWrapper.java b/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryWrapper.java index 5d4cbb1e0e0..6a9f63aeb93 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryWrapper.java +++ b/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryWrapper.java @@ -18,7 +18,7 @@ import java.io.IOException; import org.apache.lucene.index.DirectoryReader; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.TestUtil; /** Calls check index on close. */ // do NOT make any methods in this class synchronized, volatile diff --git a/lucene/test-framework/src/java/org/apache/lucene/store/BaseLockFactoryTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/store/BaseLockFactoryTestCase.java index 152dfa754df..42d8e1f87b7 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/store/BaseLockFactoryTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/store/BaseLockFactoryTestCase.java @@ -38,10 +38,10 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Constants; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.PrintStreamInfoStream; -import org.apache.lucene.util.TestUtil; /** Base class for per-LockFactory tests. */ public abstract class BaseLockFactoryTestCase extends LuceneTestCase { diff --git a/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java b/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java index bb1f5a63921..bcd58bdabf5 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java +++ b/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java @@ -46,11 +46,11 @@ import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.NoDeletionPolicy; import org.apache.lucene.index.SegmentInfos; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; +import org.apache.lucene.tests.util.ThrottledIndexOutput; import org.apache.lucene.util.CollectionUtil; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; -import org.apache.lucene.util.ThrottledIndexOutput; /** * This is a Directory Wrapper that adds methods intended to be used only by unit tests. It also diff --git a/lucene/test-framework/src/java/org/apache/lucene/store/MockIndexOutputWrapper.java b/lucene/test-framework/src/java/org/apache/lucene/store/MockIndexOutputWrapper.java index 939b8184eae..c591687e4c2 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/store/MockIndexOutputWrapper.java +++ b/lucene/test-framework/src/java/org/apache/lucene/store/MockIndexOutputWrapper.java @@ -18,7 +18,7 @@ import java.io.Closeable; import java.io.IOException; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; /** * Used to create an output stream that will throw an IOException on fake disk full, track max disk diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/AbstractBeforeAfterRule.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/AbstractBeforeAfterRule.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/util/AbstractBeforeAfterRule.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/util/AbstractBeforeAfterRule.java index e0633c54934..7129f9e28d6 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/AbstractBeforeAfterRule.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/AbstractBeforeAfterRule.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import java.util.ArrayList; import org.junit.After; diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/BaseBitSetTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/BaseBitSetTestCase.java similarity index 96% rename from lucene/test-framework/src/java/org/apache/lucene/util/BaseBitSetTestCase.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/util/BaseBitSetTestCase.java index 6f7bb7d72bd..fa001cfe411 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/BaseBitSetTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/BaseBitSetTestCase.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import java.io.IOException; import java.util.Collection; @@ -22,6 +22,13 @@ import java.util.Random; import org.apache.lucene.search.DocIdSet; import org.apache.lucene.search.DocIdSetIterator; +import org.apache.lucene.util.Accountable; +import org.apache.lucene.util.BitDocIdSet; +import org.apache.lucene.util.BitSet; +import org.apache.lucene.util.BitSetIterator; +import org.apache.lucene.util.FixedBitSet; +import org.apache.lucene.util.RoaringDocIdSet; +import org.apache.lucene.util.SparseFixedBitSet; import org.junit.Ignore; /** Base test case for BitSets. */ diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/BaseDocIdSetTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/BaseDocIdSetTestCase.java similarity index 97% rename from lucene/test-framework/src/java/org/apache/lucene/util/BaseDocIdSetTestCase.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/util/BaseDocIdSetTestCase.java index 546999cb939..2c1dfc72a31 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/BaseDocIdSetTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/BaseDocIdSetTestCase.java @@ -14,15 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; -import static org.apache.lucene.util.BaseBitSetTestCase.randomSet; +import static org.apache.lucene.tests.util.BaseBitSetTestCase.randomSet; import java.io.IOException; import java.util.BitSet; import java.util.Random; import org.apache.lucene.search.DocIdSet; import org.apache.lucene.search.DocIdSetIterator; +import org.apache.lucene.util.Bits; /** Base test class for {@link DocIdSet}s. */ public abstract class BaseDocIdSetTestCase extends LuceneTestCase { diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/CloseableDirectory.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/CloseableDirectory.java similarity index 97% rename from lucene/test-framework/src/java/org/apache/lucene/util/CloseableDirectory.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/util/CloseableDirectory.java index 541f4a5bf32..859cb20b89c 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/CloseableDirectory.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/CloseableDirectory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import java.io.Closeable; import org.apache.lucene.store.BaseDirectoryWrapper; diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/English.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/English.java similarity index 99% rename from lucene/test-framework/src/java/org/apache/lucene/util/English.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/util/English.java index b245cb7b740..c78fb7ac362 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/English.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/English.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; /** * Converts numbers to english strings for testing. diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/FailOnNonBulkMergesInfoStream.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/FailOnNonBulkMergesInfoStream.java similarity index 94% rename from lucene/test-framework/src/java/org/apache/lucene/util/FailOnNonBulkMergesInfoStream.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/util/FailOnNonBulkMergesInfoStream.java index e43a7040d97..9e36265609e 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/FailOnNonBulkMergesInfoStream.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/FailOnNonBulkMergesInfoStream.java @@ -14,9 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import java.io.IOException; +import org.apache.lucene.util.InfoStream; /** Hackidy-Häck-Hack to cause a test to fail on non-bulk merges */ // TODO: we should probably be a wrapper so verbose still works... diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/FailureMarker.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/FailureMarker.java similarity index 97% rename from lucene/test-framework/src/java/org/apache/lucene/util/FailureMarker.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/util/FailureMarker.java index 517057897b9..5e36fff0fdd 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/FailureMarker.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/FailureMarker.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import java.util.concurrent.atomic.AtomicInteger; import org.junit.runner.notification.Failure; diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/LineFileDocs.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/LineFileDocs.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/util/LineFileDocs.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/util/LineFileDocs.java index 34554be49e4..812582fe714 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/LineFileDocs.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/LineFileDocs.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import java.io.BufferedReader; import java.io.Closeable; @@ -44,6 +44,9 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexOptions; import org.apache.lucene.index.IndexableField; +import org.apache.lucene.util.BytesRef; +import org.apache.lucene.util.CloseableThreadLocal; +import org.apache.lucene.util.IOUtils; /** * Minimal port of benchmark's LneDocSource + DocMaker, so tests can enum docs from a line file diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/LuceneJUnit3MethodProvider.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneJUnit3MethodProvider.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/util/LuceneJUnit3MethodProvider.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneJUnit3MethodProvider.java index 6ff9af53a5b..06147f510e0 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/LuceneJUnit3MethodProvider.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneJUnit3MethodProvider.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import com.carrotsearch.randomizedtesting.ClassModel; import com.carrotsearch.randomizedtesting.ClassModel.MethodModel; diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java similarity index 99% rename from lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java index 70587b0596d..9ded32c1c94 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import static com.carrotsearch.randomizedtesting.RandomizedTest.systemPropertyAsBoolean; import static com.carrotsearch.randomizedtesting.RandomizedTest.systemPropertyAsInt; @@ -135,8 +135,15 @@ import org.apache.lucene.store.MockDirectoryWrapper.Throttling; import org.apache.lucene.store.NRTCachingDirectory; import org.apache.lucene.store.RawDirectoryWrapper; +import org.apache.lucene.tests.util.automaton.AutomatonTestUtil; +import org.apache.lucene.util.Bits; +import org.apache.lucene.util.BytesRef; +import org.apache.lucene.util.CommandLineUtil; +import org.apache.lucene.util.Constants; +import org.apache.lucene.util.InfoStream; +import org.apache.lucene.util.NamedThreadFactory; +import org.apache.lucene.util.SuppressForbidden; import org.apache.lucene.util.automaton.Automaton; -import org.apache.lucene.util.automaton.AutomatonTestUtil; import org.apache.lucene.util.automaton.CompiledAutomaton; import org.apache.lucene.util.automaton.Operations; import org.apache.lucene.util.automaton.RegExp; diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/NullInfoStream.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/NullInfoStream.java similarity index 94% rename from lucene/test-framework/src/java/org/apache/lucene/util/NullInfoStream.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/util/NullInfoStream.java index fb69c684b8a..6b9cf271c4e 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/NullInfoStream.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/NullInfoStream.java @@ -14,9 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import java.io.IOException; +import org.apache.lucene.util.InfoStream; /** * Prints nothing. Just to make sure tests pass w/ and without enabled InfoStream without actually diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/QuickPatchThreadsFilter.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/QuickPatchThreadsFilter.java similarity index 94% rename from lucene/test-framework/src/java/org/apache/lucene/util/QuickPatchThreadsFilter.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/util/QuickPatchThreadsFilter.java index c9e590fb9f4..480c86438f3 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/QuickPatchThreadsFilter.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/QuickPatchThreadsFilter.java @@ -14,9 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import com.carrotsearch.randomizedtesting.ThreadFilter; +import org.apache.lucene.util.Constants; /** Last minute patches. */ public class QuickPatchThreadsFilter implements ThreadFilter { diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/RamUsageTester.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/RamUsageTester.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/util/RamUsageTester.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/util/RamUsageTester.java index 3662e098f68..870509d011c 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/RamUsageTester.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/RamUsageTester.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import java.io.ByteArrayOutputStream; import java.io.File; @@ -44,6 +44,9 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import java.util.stream.StreamSupport; +import org.apache.lucene.util.Constants; +import org.apache.lucene.util.RamUsageEstimator; +import org.apache.lucene.util.SuppressForbidden; /** Crawls object graph to collect RAM usage for testing */ public final class RamUsageTester { diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/RemoveUponClose.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/RemoveUponClose.java similarity index 96% rename from lucene/test-framework/src/java/org/apache/lucene/util/RemoveUponClose.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/util/RemoveUponClose.java index 5d5c17207e4..3149bfd9209 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/RemoveUponClose.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/RemoveUponClose.java @@ -14,12 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import java.io.Closeable; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; +import org.apache.lucene.util.IOUtils; /** A {@link Closeable} that attempts to remove a given file/folder. */ final class RemoveUponClose implements Closeable { diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/Rethrow.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/Rethrow.java similarity index 97% rename from lucene/test-framework/src/java/org/apache/lucene/util/Rethrow.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/util/Rethrow.java index f80155128f2..bf5c2c65bfb 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/Rethrow.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/Rethrow.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; /** * Sneaky: rethrowing checked exceptions as unchecked ones. Eh, it is sometimes useful... diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/RunListenerPrintReproduceInfo.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/RunListenerPrintReproduceInfo.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/util/RunListenerPrintReproduceInfo.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/util/RunListenerPrintReproduceInfo.java index 1d3a53f2e9b..8162ce6a506 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/RunListenerPrintReproduceInfo.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/RunListenerPrintReproduceInfo.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; -import static org.apache.lucene.util.LuceneTestCase.*; +import static org.apache.lucene.tests.util.LuceneTestCase.*; import com.carrotsearch.randomizedtesting.LifecycleScope; import com.carrotsearch.randomizedtesting.RandomizedContext; @@ -24,6 +24,7 @@ import java.util.Arrays; import java.util.List; import java.util.regex.Pattern; +import org.apache.lucene.util.Constants; import org.junit.runner.Description; import org.junit.runner.Result; import org.junit.runner.notification.Failure; diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleAssertionsRequired.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleAssertionsRequired.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/util/TestRuleAssertionsRequired.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleAssertionsRequired.java index 44111979c30..6bc2020a8f6 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleAssertionsRequired.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleAssertionsRequired.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import org.junit.rules.TestRule; import org.junit.runner.Description; diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleDelegate.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleDelegate.java similarity index 97% rename from lucene/test-framework/src/java/org/apache/lucene/util/TestRuleDelegate.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleDelegate.java index 29ba4e42777..1e315eaa477 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleDelegate.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleDelegate.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import java.util.concurrent.atomic.AtomicReference; import org.junit.rules.TestRule; diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleIgnoreAfterMaxFailures.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleIgnoreAfterMaxFailures.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/util/TestRuleIgnoreAfterMaxFailures.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleIgnoreAfterMaxFailures.java index b0f0b3038ba..0d6b0ec8de4 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleIgnoreAfterMaxFailures.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleIgnoreAfterMaxFailures.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import com.carrotsearch.randomizedtesting.RandomizedTest; import com.carrotsearch.randomizedtesting.annotations.Repeat; diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleIgnoreTestSuites.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleIgnoreTestSuites.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/util/TestRuleIgnoreTestSuites.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleIgnoreTestSuites.java index 7182e34b7b3..ca30739d27e 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleIgnoreTestSuites.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleIgnoreTestSuites.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import org.junit.rules.TestRule; import org.junit.runner.Description; diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleLimitSysouts.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleLimitSysouts.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/util/TestRuleLimitSysouts.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleLimitSysouts.java index cfa8689ed1a..9eed105f113 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleLimitSysouts.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleLimitSysouts.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import com.carrotsearch.randomizedtesting.RandomizedTest; import com.carrotsearch.randomizedtesting.rules.TestRuleAdapter; @@ -34,8 +34,8 @@ import java.util.Locale; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import org.apache.lucene.util.LuceneTestCase.Monster; -import org.apache.lucene.util.LuceneTestCase.SuppressSysoutChecks; +import org.apache.lucene.tests.util.LuceneTestCase.Monster; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressSysoutChecks; /** * This test rule serves two purposes: diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleMarkFailure.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleMarkFailure.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/util/TestRuleMarkFailure.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleMarkFailure.java index e706af2803c..4394986a037 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleMarkFailure.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleMarkFailure.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import java.util.ArrayList; import java.util.List; diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleRestoreSystemProperties.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleRestoreSystemProperties.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/util/TestRuleRestoreSystemProperties.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleRestoreSystemProperties.java index 23ff9b58f8f..b609264e23f 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleRestoreSystemProperties.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleRestoreSystemProperties.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule; import com.carrotsearch.randomizedtesting.rules.TestRuleAdapter; diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleSetupAndRestoreClassEnv.java similarity index 91% rename from lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleSetupAndRestoreClassEnv.java index feaafe2f76d..bb325e455d5 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleSetupAndRestoreClassEnv.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; - -import static org.apache.lucene.util.LuceneTestCase.INFOSTREAM; -import static org.apache.lucene.util.LuceneTestCase.TEST_CODEC; -import static org.apache.lucene.util.LuceneTestCase.TEST_DOCVALUESFORMAT; -import static org.apache.lucene.util.LuceneTestCase.TEST_POSTINGSFORMAT; -import static org.apache.lucene.util.LuceneTestCase.VERBOSE; -import static org.apache.lucene.util.LuceneTestCase.assumeFalse; -import static org.apache.lucene.util.LuceneTestCase.localeForLanguageTag; -import static org.apache.lucene.util.LuceneTestCase.random; -import static org.apache.lucene.util.LuceneTestCase.randomLocale; -import static org.apache.lucene.util.LuceneTestCase.randomTimeZone; +package org.apache.lucene.tests.util; + +import static org.apache.lucene.tests.util.LuceneTestCase.INFOSTREAM; +import static org.apache.lucene.tests.util.LuceneTestCase.TEST_CODEC; +import static org.apache.lucene.tests.util.LuceneTestCase.TEST_DOCVALUESFORMAT; +import static org.apache.lucene.tests.util.LuceneTestCase.TEST_POSTINGSFORMAT; +import static org.apache.lucene.tests.util.LuceneTestCase.VERBOSE; +import static org.apache.lucene.tests.util.LuceneTestCase.assumeFalse; +import static org.apache.lucene.tests.util.LuceneTestCase.localeForLanguageTag; +import static org.apache.lucene.tests.util.LuceneTestCase.random; +import static org.apache.lucene.tests.util.LuceneTestCase.randomLocale; +import static org.apache.lucene.tests.util.LuceneTestCase.randomTimeZone; import com.carrotsearch.randomizedtesting.RandomizedContext; import com.carrotsearch.randomizedtesting.generators.RandomPicks; @@ -50,8 +50,10 @@ import org.apache.lucene.search.similarities.AssertingSimilarity; import org.apache.lucene.search.similarities.RandomSimilarity; import org.apache.lucene.search.similarities.Similarity; -import org.apache.lucene.util.LuceneTestCase.LiveIWCFlushMode; -import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; +import org.apache.lucene.tests.util.LuceneTestCase.LiveIWCFlushMode; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; +import org.apache.lucene.util.InfoStream; +import org.apache.lucene.util.PrintStreamInfoStream; import org.junit.internal.AssumptionViolatedException; /** Setup and restore suite-level environment (fine grained junk that doesn't fit anywhere else). */ diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreInstanceEnv.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleSetupAndRestoreInstanceEnv.java similarity index 97% rename from lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreInstanceEnv.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleSetupAndRestoreInstanceEnv.java index c97a05d97d1..4dff8ce4bf8 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreInstanceEnv.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleSetupAndRestoreInstanceEnv.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import org.apache.lucene.search.IndexSearcher; diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupTeardownChained.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleSetupTeardownChained.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupTeardownChained.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleSetupTeardownChained.java index 8871bdf9ee4..ec8110bd5b2 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupTeardownChained.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleSetupTeardownChained.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import org.junit.Assert; import org.junit.rules.TestRule; diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleStoreClassName.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleStoreClassName.java similarity index 97% rename from lucene/test-framework/src/java/org/apache/lucene/util/TestRuleStoreClassName.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleStoreClassName.java index 6ed86333cc3..c6e9c56e71a 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleStoreClassName.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleStoreClassName.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import org.junit.rules.TestRule; import org.junit.runner.Description; diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleTemporaryFilesCleanup.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleTemporaryFilesCleanup.java similarity index 97% rename from lucene/test-framework/src/java/org/apache/lucene/util/TestRuleTemporaryFilesCleanup.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleTemporaryFilesCleanup.java index 6c67efd2523..da3116b3eb5 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleTemporaryFilesCleanup.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleTemporaryFilesCleanup.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import com.carrotsearch.randomizedtesting.RandomizedContext; import com.carrotsearch.randomizedtesting.rules.TestRuleAdapter; @@ -40,9 +40,11 @@ import org.apache.lucene.mockfile.ShuffleFS; import org.apache.lucene.mockfile.VerboseFS; import org.apache.lucene.mockfile.WindowsFS; -import org.apache.lucene.util.LuceneTestCase.SuppressFileSystems; -import org.apache.lucene.util.LuceneTestCase.SuppressFsync; -import org.apache.lucene.util.LuceneTestCase.SuppressTempFileChecks; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressFileSystems; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressFsync; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressTempFileChecks; +import org.apache.lucene.util.Constants; +import org.apache.lucene.util.IOUtils; /** * Checks and cleans up temporary files. diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleThreadAndTestName.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleThreadAndTestName.java similarity index 97% rename from lucene/test-framework/src/java/org/apache/lucene/util/TestRuleThreadAndTestName.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleThreadAndTestName.java index a9aef8e7529..2c230ef8ec4 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleThreadAndTestName.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleThreadAndTestName.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import org.junit.rules.TestRule; import org.junit.runner.Description; diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/TestSecurityManager.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestSecurityManager.java similarity index 99% rename from lucene/test-framework/src/java/org/apache/lucene/util/TestSecurityManager.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/util/TestSecurityManager.java index 622572b3e05..75cabea770d 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/TestSecurityManager.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestSecurityManager.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import java.lang.StackWalker.StackFrame; import java.util.Locale; diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestUtil.java similarity index 99% rename from lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/util/TestUtil.java index fb8a845fd03..25e3bf6cbaa 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestUtil.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import com.carrotsearch.randomizedtesting.RandomizedTest; import com.carrotsearch.randomizedtesting.generators.RandomNumbers; @@ -101,6 +101,13 @@ import org.apache.lucene.store.FilterDirectory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.NoLockFactory; +import org.apache.lucene.util.Attribute; +import org.apache.lucene.util.AttributeImpl; +import org.apache.lucene.util.AttributeReflector; +import org.apache.lucene.util.BytesRef; +import org.apache.lucene.util.CharsRef; +import org.apache.lucene.util.IOUtils; +import org.apache.lucene.util.UnicodeUtil; import org.junit.Assert; /** General utility methods for Lucene unit tests. */ diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/ThrottledIndexOutput.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/ThrottledIndexOutput.java similarity index 97% rename from lucene/test-framework/src/java/org/apache/lucene/util/ThrottledIndexOutput.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/util/ThrottledIndexOutput.java index 692945da20a..d24368ee5af 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/ThrottledIndexOutput.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/ThrottledIndexOutput.java @@ -14,11 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import java.io.IOException; import org.apache.lucene.store.DataInput; import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.util.ThreadInterruptedException; /** Intentionally slow IndexOutput for testing. */ public class ThrottledIndexOutput extends IndexOutput { diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/TimeUnits.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TimeUnits.java similarity index 96% rename from lucene/test-framework/src/java/org/apache/lucene/util/TimeUnits.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/util/TimeUnits.java index 43190650e0b..bedfec04f3e 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/TimeUnits.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TimeUnits.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; /** time unit constants for use in annotations. */ public final class TimeUnits { diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/VerifyTestClassNamingConvention.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/VerifyTestClassNamingConvention.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/util/VerifyTestClassNamingConvention.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/util/VerifyTestClassNamingConvention.java index 00a8321c10c..4926f90a809 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/VerifyTestClassNamingConvention.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/VerifyTestClassNamingConvention.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import com.carrotsearch.randomizedtesting.RandomizedContext; import java.util.regex.Matcher; diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/automaton/AutomatonTestUtil.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/automaton/AutomatonTestUtil.java similarity index 97% rename from lucene/test-framework/src/java/org/apache/lucene/util/automaton/AutomatonTestUtil.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/util/automaton/AutomatonTestUtil.java index a27e28a9a14..a4cd40a3bd1 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/automaton/AutomatonTestUtil.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/automaton/AutomatonTestUtil.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util.automaton; +package org.apache.lucene.tests.util.automaton; import java.util.ArrayList; import java.util.HashMap; @@ -24,11 +24,16 @@ import java.util.Map; import java.util.Random; import java.util.Set; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.IntsRef; import org.apache.lucene.util.IntsRefBuilder; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.UnicodeUtil; +import org.apache.lucene.util.automaton.Automaton; +import org.apache.lucene.util.automaton.Operations; +import org.apache.lucene.util.automaton.RegExp; +import org.apache.lucene.util.automaton.TooComplexToDeterminizeException; +import org.apache.lucene.util.automaton.Transition; /** * Utilities for testing automata. diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/automaton/package.html b/lucene/test-framework/src/java/org/apache/lucene/tests/util/automaton/package.html similarity index 100% rename from lucene/test-framework/src/java/org/apache/lucene/util/automaton/package.html rename to lucene/test-framework/src/java/org/apache/lucene/tests/util/automaton/package.html diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/fst/FSTTester.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/fst/FSTTester.java similarity index 97% rename from lucene/test-framework/src/java/org/apache/lucene/util/fst/FSTTester.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/util/fst/FSTTester.java index d5d26844653..e2d8bf0d83c 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/fst/FSTTester.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/fst/FSTTester.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util.fst; +package org.apache.lucene.tests.util.fst; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -37,23 +37,27 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IntsRef; import org.apache.lucene.util.IntsRefBuilder; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.UnicodeUtil; +import org.apache.lucene.util.fst.FST; +import org.apache.lucene.util.fst.FSTCompiler; +import org.apache.lucene.util.fst.IntsRefFSTEnum; +import org.apache.lucene.util.fst.Outputs; +import org.apache.lucene.util.fst.Util; /** Helper class to test FSTs. */ public class FSTTester { - - final Random random; - final List> pairs; - final int inputMode; - final Outputs outputs; - final Directory dir; - long nodeCount; - long arcCount; + public final Random random; + public final List> pairs; + public final int inputMode; + public final Outputs outputs; + public final Directory dir; + public long nodeCount; + public long arcCount; public FSTTester( Random random, Directory dir, int inputMode, List> pairs, Outputs outputs) { @@ -109,7 +113,7 @@ public static String getRandomString(Random random) { return term; } - static String simpleRandomString(Random r) { + public static String simpleRandomString(Random r) { final int end = r.nextInt(10); if (end == 0) { // allow 0 length @@ -126,7 +130,7 @@ public static IntsRef toIntsRef(String s, int inputMode) { return toIntsRef(s, inputMode, new IntsRefBuilder()); } - static IntsRef toIntsRef(String s, int inputMode, IntsRefBuilder ir) { + public static IntsRef toIntsRef(String s, int inputMode, IntsRefBuilder ir) { if (inputMode == 0) { // utf8 return toIntsRef(new BytesRef(s), ir); @@ -263,7 +267,8 @@ private T randomAcceptedWord(FST fst, IntsRefBuilder in) throws IOException { return output; } - FST doTest(int prune1, int prune2, boolean allowRandomSuffixSharing) throws IOException { + public FST doTest(int prune1, int prune2, boolean allowRandomSuffixSharing) + throws IOException { if (LuceneTestCase.VERBOSE) { System.out.println("\nTEST: prune1=" + prune1 + " prune2=" + prune2); } diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/fst/package.html b/lucene/test-framework/src/java/org/apache/lucene/tests/util/fst/package.html similarity index 100% rename from lucene/test-framework/src/java/org/apache/lucene/util/fst/package.html rename to lucene/test-framework/src/java/org/apache/lucene/tests/util/fst/package.html diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/package.html b/lucene/test-framework/src/java/org/apache/lucene/tests/util/package.html similarity index 100% rename from lucene/test-framework/src/java/org/apache/lucene/util/package.html rename to lucene/test-framework/src/java/org/apache/lucene/tests/util/package.html diff --git a/lucene/test-framework/src/resources/org/apache/lucene/util/europarl.lines.txt.gz b/lucene/test-framework/src/resources/org/apache/lucene/tests/util/europarl.lines.txt.gz similarity index 100% rename from lucene/test-framework/src/resources/org/apache/lucene/util/europarl.lines.txt.gz rename to lucene/test-framework/src/resources/org/apache/lucene/tests/util/europarl.lines.txt.gz diff --git a/lucene/test-framework/src/resources/org/apache/lucene/util/europarl.lines.txt.seek b/lucene/test-framework/src/resources/org/apache/lucene/tests/util/europarl.lines.txt.seek similarity index 100% rename from lucene/test-framework/src/resources/org/apache/lucene/util/europarl.lines.txt.seek rename to lucene/test-framework/src/resources/org/apache/lucene/tests/util/europarl.lines.txt.seek diff --git a/lucene/test-framework/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java b/lucene/test-framework/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java index b8eb3738460..fd8914f824e 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java +++ b/lucene/test-framework/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java @@ -32,11 +32,11 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; +import org.apache.lucene.tests.util.TestUtil; +import org.apache.lucene.tests.util.automaton.AutomatonTestUtil; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.automaton.Automata; import org.apache.lucene.util.automaton.Automaton; -import org.apache.lucene.util.automaton.AutomatonTestUtil; import org.apache.lucene.util.automaton.CharacterRunAutomaton; import org.apache.lucene.util.automaton.Operations; import org.apache.lucene.util.automaton.RegExp; diff --git a/lucene/test-framework/src/test/org/apache/lucene/analysis/TestToken.java b/lucene/test-framework/src/test/org/apache/lucene/analysis/TestToken.java index 6dd2508cf02..dedd0ceff30 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/analysis/TestToken.java +++ b/lucene/test-framework/src/test/org/apache/lucene/analysis/TestToken.java @@ -27,12 +27,12 @@ import org.apache.lucene.analysis.tokenattributes.TermFrequencyAttribute; import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute; import org.apache.lucene.analysis.tokenattributes.TypeAttribute; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Attribute; import org.apache.lucene.util.AttributeImpl; import org.apache.lucene.util.AttributeReflector; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; public class TestToken extends LuceneTestCase { diff --git a/lucene/test-framework/src/test/org/apache/lucene/index/TestAssertingLeafReader.java b/lucene/test-framework/src/test/org/apache/lucene/index/TestAssertingLeafReader.java index 031351d32f2..3227d8364c8 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/index/TestAssertingLeafReader.java +++ b/lucene/test-framework/src/test/org/apache/lucene/index/TestAssertingLeafReader.java @@ -19,8 +19,8 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; public class TestAssertingLeafReader extends LuceneTestCase { public void testAssertBits() throws Exception { diff --git a/lucene/test-framework/src/test/org/apache/lucene/index/TestForceMergePolicy.java b/lucene/test-framework/src/test/org/apache/lucene/index/TestForceMergePolicy.java index 180d23e01e3..4236ecf5512 100755 --- a/lucene/test-framework/src/test/org/apache/lucene/index/TestForceMergePolicy.java +++ b/lucene/test-framework/src/test/org/apache/lucene/index/TestForceMergePolicy.java @@ -16,7 +16,7 @@ */ package org.apache.lucene.index; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.tests.util.LuceneTestCase; public class TestForceMergePolicy extends LuceneTestCase { diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/SorePoint.java b/lucene/test-framework/src/test/org/apache/lucene/tests/util/SorePoint.java similarity index 96% rename from lucene/test-framework/src/test/org/apache/lucene/util/SorePoint.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/util/SorePoint.java index 8be80295ea6..4b4b4fedc2f 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/SorePoint.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/util/SorePoint.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; /** A pointcut-like definition where we should trigger an assumption or error. */ public enum SorePoint { diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/SoreType.java b/lucene/test-framework/src/test/org/apache/lucene/tests/util/SoreType.java similarity index 95% rename from lucene/test-framework/src/test/org/apache/lucene/util/SoreType.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/util/SoreType.java index 4bb6fb8886a..e91ca931cd3 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/SoreType.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/util/SoreType.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; public enum SoreType { ASSUMPTION, diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/TestBeforeAfterOverrides.java b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestBeforeAfterOverrides.java similarity index 98% rename from lucene/test-framework/src/test/org/apache/lucene/util/TestBeforeAfterOverrides.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/util/TestBeforeAfterOverrides.java index 5ccf6db32c1..89c09d0f736 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/TestBeforeAfterOverrides.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestBeforeAfterOverrides.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import org.junit.After; import org.junit.Assert; diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/TestCodecReported.java b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestCodecReported.java similarity index 96% rename from lucene/test-framework/src/test/org/apache/lucene/util/TestCodecReported.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/util/TestCodecReported.java index 910d939c62e..52c2e2ecb32 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/TestCodecReported.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestCodecReported.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import org.apache.lucene.codecs.Codec; import org.junit.Assert; @@ -32,7 +32,7 @@ public static class Nested1 extends WithNestedTests.AbstractNestedTest { public void testDummy() { codecName = Codec.getDefault().getName(); - fail(); + Assert.fail(); } } diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/TestExceptionInBeforeClassHooks.java b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestExceptionInBeforeClassHooks.java similarity index 99% rename from lucene/test-framework/src/test/org/apache/lucene/util/TestExceptionInBeforeClassHooks.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/util/TestExceptionInBeforeClassHooks.java index 470262a098c..7a31b41f762 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/TestExceptionInBeforeClassHooks.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestExceptionInBeforeClassHooks.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import java.util.*; import java.util.regex.Matcher; diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/TestExpectThrows.java b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestExpectThrows.java similarity index 99% rename from lucene/test-framework/src/test/org/apache/lucene/util/TestExpectThrows.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/util/TestExpectThrows.java index 6b4a597e01d..d6f646c098a 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/TestExpectThrows.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestExpectThrows.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import java.io.IOException; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/TestFailIfDirectoryNotClosed.java b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestFailIfDirectoryNotClosed.java similarity index 94% rename from lucene/test-framework/src/test/org/apache/lucene/util/TestFailIfDirectoryNotClosed.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/util/TestFailIfDirectoryNotClosed.java index a5ec8285e3d..f622d326c3f 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/TestFailIfDirectoryNotClosed.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestFailIfDirectoryNotClosed.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import com.carrotsearch.randomizedtesting.RandomizedTest; import org.apache.lucene.store.Directory; @@ -30,7 +30,7 @@ public TestFailIfDirectoryNotClosed() { public static class Nested1 extends WithNestedTests.AbstractNestedTest { public void testDummy() throws Exception { - Directory dir = newDirectory(); + Directory dir = LuceneTestCase.newDirectory(); System.out.println(dir.toString()); } } diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/TestFailIfUnreferencedFiles.java b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestFailIfUnreferencedFiles.java similarity index 96% rename from lucene/test-framework/src/test/org/apache/lucene/util/TestFailIfUnreferencedFiles.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/util/TestFailIfUnreferencedFiles.java index c28d3b6c5af..f6bb246803f 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/TestFailIfUnreferencedFiles.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestFailIfUnreferencedFiles.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import com.carrotsearch.randomizedtesting.RandomizedTest; import java.util.Collections; @@ -38,7 +38,7 @@ public TestFailIfUnreferencedFiles() { public static class Nested1 extends WithNestedTests.AbstractNestedTest { public void testDummy() throws Exception { - MockDirectoryWrapper dir = newMockDirectory(); + MockDirectoryWrapper dir = LuceneTestCase.newMockDirectory(); dir.setAssertNoUnrefencedFilesOnClose(true); IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(null)); iw.addDocument(new Document()); diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/TestGroupFiltering.java b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestGroupFiltering.java similarity index 97% rename from lucene/test-framework/src/test/org/apache/lucene/util/TestGroupFiltering.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/util/TestGroupFiltering.java index 76f1a06cbe6..da7f0179570 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/TestGroupFiltering.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestGroupFiltering.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import com.carrotsearch.randomizedtesting.annotations.TestGroup; import java.lang.annotation.Documented; diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/TestJUnitRuleOrder.java b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestJUnitRuleOrder.java similarity index 98% rename from lucene/test-framework/src/test/org/apache/lucene/util/TestJUnitRuleOrder.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/util/TestJUnitRuleOrder.java index 686b7c84999..490f4b7504e 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/TestJUnitRuleOrder.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestJUnitRuleOrder.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import java.util.Arrays; import java.util.Stack; diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/TestJvmInfo.java b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestJvmInfo.java similarity index 97% rename from lucene/test-framework/src/test/org/apache/lucene/util/TestJvmInfo.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/util/TestJvmInfo.java index c580eed003a..aba7cc0b368 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/TestJvmInfo.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestJvmInfo.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import com.carrotsearch.randomizedtesting.RandomizedTest; import java.util.Locale; diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/TestMaxFailuresRule.java b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestMaxFailuresRule.java similarity index 97% rename from lucene/test-framework/src/test/org/apache/lucene/util/TestMaxFailuresRule.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/util/TestMaxFailuresRule.java index 4a5ba93be04..2556648e5a9 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/TestMaxFailuresRule.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestMaxFailuresRule.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import com.carrotsearch.randomizedtesting.annotations.Repeat; import com.carrotsearch.randomizedtesting.annotations.ThreadLeakAction; @@ -48,13 +48,13 @@ public static class Nested extends WithNestedTests.AbstractNestedTest { @Repeat(iterations = TOTAL_ITERS) public void testFailSometimes() { numIters++; - boolean fail = random().nextInt(5) == 0; + boolean fail = LuceneTestCase.random().nextInt(5) == 0; if (fail) numFails++; // some seeds are really lucky ... so cheat. if (numFails < DESIRED_FAILURES && DESIRED_FAILURES <= TOTAL_ITERS - numIters) { fail = true; } - assertFalse(fail); + Assert.assertFalse(fail); } } diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/TestPleaseFail.java b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestPleaseFail.java similarity index 97% rename from lucene/test-framework/src/test/org/apache/lucene/util/TestPleaseFail.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/util/TestPleaseFail.java index 99d3c375fe6..f38041892ed 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/TestPleaseFail.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestPleaseFail.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import org.junit.Assert; diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/TestRamUsageTesterOnWildAnimals.java b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestRamUsageTesterOnWildAnimals.java similarity index 97% rename from lucene/test-framework/src/test/org/apache/lucene/util/TestRamUsageTesterOnWildAnimals.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/util/TestRamUsageTesterOnWildAnimals.java index 0a6096da280..410907ce4be 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/TestRamUsageTesterOnWildAnimals.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestRamUsageTesterOnWildAnimals.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import org.junit.Assert; diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/TestReproduceMessage.java b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestReproduceMessage.java similarity index 99% rename from lucene/test-framework/src/test/org/apache/lucene/util/TestReproduceMessage.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/util/TestReproduceMessage.java index 21f66962a40..8f3dc0d96c6 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/TestReproduceMessage.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestReproduceMessage.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import org.hamcrest.Matchers; import org.junit.After; diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/TestReproduceMessageWithRepeated.java b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestReproduceMessageWithRepeated.java similarity index 97% rename from lucene/test-framework/src/test/org/apache/lucene/util/TestReproduceMessageWithRepeated.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/util/TestReproduceMessageWithRepeated.java index bfe4e6aadb3..93fb3b3fae6 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/TestReproduceMessageWithRepeated.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestReproduceMessageWithRepeated.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import com.carrotsearch.randomizedtesting.annotations.Repeat; import org.junit.Test; diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/TestRunWithRestrictedPermissions.java b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestRunWithRestrictedPermissions.java similarity index 98% rename from lucene/test-framework/src/test/org/apache/lucene/util/TestRunWithRestrictedPermissions.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/util/TestRunWithRestrictedPermissions.java index 0e41b172cf0..33e1fae621f 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/TestRunWithRestrictedPermissions.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestRunWithRestrictedPermissions.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import java.io.IOException; import java.nio.file.Files; diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/TestSeedFromUncaught.java b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestSeedFromUncaught.java similarity index 98% rename from lucene/test-framework/src/test/org/apache/lucene/util/TestSeedFromUncaught.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/util/TestSeedFromUncaught.java index 08fba0c4c1f..11f5fae32a7 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/TestSeedFromUncaught.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestSeedFromUncaught.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import org.junit.Assert; import org.junit.Test; diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/TestSetupTeardownChaining.java b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestSetupTeardownChaining.java similarity index 98% rename from lucene/test-framework/src/test/org/apache/lucene/util/TestSetupTeardownChaining.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/util/TestSetupTeardownChaining.java index bc6803d84c2..c32bcede32b 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/TestSetupTeardownChaining.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestSetupTeardownChaining.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import org.junit.Assert; import org.junit.Test; diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/TestSysoutsLimits.java b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestSysoutsLimits.java similarity index 98% rename from lucene/test-framework/src/test/org/apache/lucene/util/TestSysoutsLimits.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/util/TestSysoutsLimits.java index ddeb3e80766..eb23321be05 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/TestSysoutsLimits.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestSysoutsLimits.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import com.carrotsearch.randomizedtesting.RandomizedTest; import java.util.stream.Collectors; diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/TestWorstCaseTestBehavior.java b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestWorstCaseTestBehavior.java similarity index 98% rename from lucene/test-framework/src/test/org/apache/lucene/util/TestWorstCaseTestBehavior.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/util/TestWorstCaseTestBehavior.java index 67141afb8cd..e8b4f8eab33 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/TestWorstCaseTestBehavior.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestWorstCaseTestBehavior.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import com.carrotsearch.randomizedtesting.RandomizedTest; import com.carrotsearch.randomizedtesting.annotations.Timeout; diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/WithNestedTests.java b/lucene/test-framework/src/test/org/apache/lucene/tests/util/WithNestedTests.java similarity index 97% rename from lucene/test-framework/src/test/org/apache/lucene/util/WithNestedTests.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/util/WithNestedTests.java index 567b4e3d7de..d50b9a63b3f 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/WithNestedTests.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/util/WithNestedTests.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.util; +package org.apache.lucene.tests.util; import com.carrotsearch.randomizedtesting.RandomizedRunner; import com.carrotsearch.randomizedtesting.RandomizedTest; @@ -25,7 +25,8 @@ import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; import java.util.List; -import org.apache.lucene.util.LuceneTestCase.SuppressSysoutChecks; +import org.apache.lucene.tests.util.LuceneTestCase.SuppressSysoutChecks; +import org.apache.lucene.util.IOUtils; import org.junit.After; import org.junit.Assert; import org.junit.Assume; From c1d88f586e7dcc610ea93f8f528655b8fe0df81a Mon Sep 17 00:00:00 2001 From: Dawid Weiss Date: Sun, 19 Dec 2021 13:24:26 +0100 Subject: [PATCH 02/32] Move package docs to java files. --- .../tests/util/automaton/package-info.java | 23 ++++++++++++++++ .../lucene/tests/util/automaton/package.html | 27 ------------------- .../lucene/tests/util/fst/package-info.java | 19 +++++++++++++ .../apache/lucene/tests/util/fst/package.html | 26 ------------------ .../lucene/tests/util/package-info.java | 22 +++++++++++++++ .../org/apache/lucene/tests/util/package.html | 27 ------------------- 6 files changed, 64 insertions(+), 80 deletions(-) create mode 100644 lucene/test-framework/src/java/org/apache/lucene/tests/util/automaton/package-info.java delete mode 100644 lucene/test-framework/src/java/org/apache/lucene/tests/util/automaton/package.html create mode 100644 lucene/test-framework/src/java/org/apache/lucene/tests/util/fst/package-info.java delete mode 100644 lucene/test-framework/src/java/org/apache/lucene/tests/util/fst/package.html create mode 100644 lucene/test-framework/src/java/org/apache/lucene/tests/util/package-info.java delete mode 100644 lucene/test-framework/src/java/org/apache/lucene/tests/util/package.html diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/util/automaton/package-info.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/automaton/package-info.java new file mode 100644 index 00000000000..44a0db31c11 --- /dev/null +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/automaton/package-info.java @@ -0,0 +1,23 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * Support for testing automata. The primary class is {@link + * org.apache.lucene.tests.util.automaton.AutomatonTestUtil}, which can generate random automata, + * has simplified implementations for testing, etc. + */ +package org.apache.lucene.tests.util.automaton; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/util/automaton/package.html b/lucene/test-framework/src/java/org/apache/lucene/tests/util/automaton/package.html deleted file mode 100644 index e6f69909fc6..00000000000 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/util/automaton/package.html +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - -Support for testing automata. The primary class is {@link org.apache.lucene.util.automaton.AutomatonTestUtil}, -which can generate random automata, has simplified implementations for testing, etc. - - diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/util/fst/package-info.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/fst/package-info.java new file mode 100644 index 00000000000..bd994cc1cfd --- /dev/null +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/fst/package-info.java @@ -0,0 +1,19 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** Support for FST testing. */ +package org.apache.lucene.tests.util.fst; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/util/fst/package.html b/lucene/test-framework/src/java/org/apache/lucene/tests/util/fst/package.html deleted file mode 100644 index 8e882fc88ec..00000000000 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/util/fst/package.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - -Support for FST testing. - - diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/util/package-info.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/package-info.java new file mode 100644 index 00000000000..a9405a4afbc --- /dev/null +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/package-info.java @@ -0,0 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * General test support. The primary class is {@link org.apache.lucene.tests.util.LuceneTestCase}, + * which extends JUnit with additional functionality. + */ +package org.apache.lucene.tests.util; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/util/package.html b/lucene/test-framework/src/java/org/apache/lucene/tests/util/package.html deleted file mode 100644 index 7abad7cfce5..00000000000 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/util/package.html +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - -General test support. The primary class is {@link org.apache.lucene.util.LuceneTestCase}, -which extends JUnit with additional functionality. - - From fe5a0a411c18df4992651005e16861d68ca7ab0a Mon Sep 17 00:00:00 2001 From: Dawid Weiss Date: Sun, 19 Dec 2021 13:28:41 +0100 Subject: [PATCH 03/32] Fix security manager. --- gradle/testing/randomization.gradle | 4 ++-- .../org/apache/lucene/tests/util/TestSecurityManager.java | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gradle/testing/randomization.gradle b/gradle/testing/randomization.gradle index 938ca396db2..90406f4adcd 100644 --- a/gradle/testing/randomization.gradle +++ b/gradle/testing/randomization.gradle @@ -167,10 +167,10 @@ allprojects { if (project.path.endsWith(".tests")) { // LUCENE-10301: for now, do not use the security manager for modular tests (test framework is not available). } else if (project.path == ":lucene:replicator") { - systemProperty 'java.security.manager', "org.apache.lucene.util.TestSecurityManager" + systemProperty 'java.security.manager', "org.apache.lucene.tests.util.TestSecurityManager" systemProperty 'java.security.policy', file("${resources}/policies/replicator-tests.policy") } else if (project.path.startsWith(":lucene")) { - systemProperty 'java.security.manager', "org.apache.lucene.util.TestSecurityManager" + systemProperty 'java.security.manager', "org.apache.lucene.tests.util.TestSecurityManager" systemProperty 'java.security.policy', file("${resources}/policies/tests.policy") } diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestSecurityManager.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestSecurityManager.java index 75cabea770d..51b53127adc 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestSecurityManager.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestSecurityManager.java @@ -25,7 +25,8 @@ * runner itself is allowed to exit the JVM. All other security checks are handled by the default * security policy. * - *

Use this with {@code -Djava.security.manager=org.apache.lucene.util.TestSecurityManager}. + *

Use this with {@code + * -Djava.security.manager=org.apache.lucene.tests.util.TestSecurityManager}. */ public final class TestSecurityManager extends SecurityManager { @@ -41,7 +42,7 @@ public final class TestSecurityManager extends SecurityManager { /** * Creates a new TestSecurityManager. This ctor is called on JVM startup, when {@code - * -Djava.security.manager=org.apache.lucene.util.TestSecurityManager} is passed to JVM. + * -Djava.security.manager=org.apache.lucene.tests.util.TestSecurityManager} is passed to JVM. */ public TestSecurityManager() { super(); From 8e5344a210a229672d42db03b1547943dad71e2c Mon Sep 17 00:00:00 2001 From: Dawid Weiss Date: Sun, 19 Dec 2021 13:42:04 +0100 Subject: [PATCH 04/32] Moved store -> tests.store --- .../hunspell/TestAllDictionaries.java | 2 +- .../TestBackwardsCompatibility.java | 2 +- .../TestManyPointsInOldIndex.java | 2 +- .../utils/TestDataSplitter.java | 2 +- .../apache/lucene/store/FilterDirectory.java | 5 ++++ .../org/apache/lucene/TestExternalCodecs.java | 2 +- .../lucene/TestMergeSchedulerExternal.java | 2 +- .../lucene/index/Test2BBinaryDocValues.java | 4 +-- .../org/apache/lucene/index/Test2BDocs.java | 4 +-- .../lucene/index/Test2BNumericDocValues.java | 4 +-- .../apache/lucene/index/Test2BPositions.java | 4 +-- .../apache/lucene/index/Test2BPostings.java | 4 +-- .../lucene/index/Test2BPostingsBytes.java | 4 +-- .../Test2BSortedDocValuesFixedSorted.java | 4 +-- .../index/Test2BSortedDocValuesOrds.java | 4 +-- .../org/apache/lucene/index/Test2BTerms.java | 4 +-- .../lucene/index/Test4GBStoredFields.java | 2 +- .../apache/lucene/index/TestAddIndexes.java | 4 +-- .../index/TestAllFilesCheckIndexHeader.java | 4 +-- .../index/TestAllFilesDetectBitFlips.java | 2 +- .../index/TestAllFilesDetectTruncation.java | 2 +- .../apache/lucene/index/TestAtomicUpdate.java | 2 +- .../lucene/index/TestCodecHoldsOpenFiles.java | 2 +- .../index/TestConcurrentMergeScheduler.java | 2 +- .../org/apache/lucene/index/TestCrash.java | 2 +- .../index/TestDemoParallelLeafReader.java | 4 +-- .../lucene/index/TestDirectoryReader.java | 2 +- .../index/TestDirectoryReaderReopen.java | 4 +-- .../test/org/apache/lucene/index/TestDoc.java | 2 +- .../lucene/index/TestFilterLeafReader.java | 2 +- .../index/TestFlushByRamOrCountsPolicy.java | 2 +- .../lucene/index/TestForTooMuchCloning.java | 2 +- .../lucene/index/TestIndexFileDeleter.java | 2 +- .../apache/lucene/index/TestIndexWriter.java | 4 +-- .../lucene/index/TestIndexWriterCommit.java | 2 +- .../lucene/index/TestIndexWriterDelete.java | 2 +- .../index/TestIndexWriterExceptions.java | 6 ++-- .../index/TestIndexWriterExceptions2.java | 2 +- .../index/TestIndexWriterForceMerge.java | 2 +- .../lucene/index/TestIndexWriterMaxDocs.java | 2 +- .../index/TestIndexWriterOnDiskFull.java | 2 +- .../index/TestIndexWriterOnJRECrash.java | 2 +- .../index/TestIndexWriterOnVMError.java | 4 +-- .../TestIndexWriterOutOfFileDescriptors.java | 2 +- .../lucene/index/TestIndexWriterReader.java | 4 +-- .../index/TestIndexWriterWithThreads.java | 4 +-- .../lucene/index/TestLazyProxSkipping.java | 2 +- .../lucene/index/TestMultiLevelSkipList.java | 2 +- .../lucene/index/TestNRTReaderCleanup.java | 2 +- .../index/TestNRTReaderWithThreads.java | 2 +- .../apache/lucene/index/TestNRTThreads.java | 2 +- .../apache/lucene/index/TestNeverDelete.java | 2 +- .../lucene/index/TestPerSegmentDeletes.java | 2 +- .../TestPersistentSnapshotDeletionPolicy.java | 2 +- .../lucene/index/TestRollingUpdates.java | 1 + .../apache/lucene/index/TestSegmentInfos.java | 2 +- .../lucene/index/TestStressIndexing.java | 1 + .../lucene/index/TestSwappedIndexFiles.java | 2 +- .../lucene/index/TestTermVectorsWriter.java | 2 +- .../index/TestTragicIndexWriterDeadlock.java | 2 +- .../apache/lucene/index/TestTransactions.java | 2 +- .../lucene/search/TestSloppyPhraseQuery.java | 2 +- .../store/TestByteBuffersDirectory.java | 1 + .../lucene/store/TestFileSwitchDirectory.java | 2 ++ .../lucene/store/TestFilterDirectory.java | 1 + .../apache/lucene/store/TestLockFactory.java | 1 + .../lucene/store/TestMmapDirectory.java | 1 + .../store/TestMultiByteBuffersDirectory.java | 1 + .../apache/lucene/store/TestMultiMMap.java | 1 + .../lucene/store/TestNIOFSDirectory.java | 1 + .../lucene/store/TestNRTCachingDirectory.java | 1 + .../lucene/store/TestNativeFSLockFactory.java | 1 + .../lucene/store/TestSimpleFSLockFactory.java | 1 + .../store/TestSingleInstanceLockFactory.java | 1 + .../lucene/store/TestSleepingLockWrapper.java | 1 + .../store/TestTrackingDirectoryWrapper.java | 1 + .../apache/lucene/util/Test2BPagedBytes.java | 4 +-- .../apache/lucene/util/TestOfflineSorter.java | 2 +- .../apache/lucene/util/TestPagedBytes.java | 4 +-- .../org/apache/lucene/util/bkd/TestBKD.java | 4 +-- .../org/apache/lucene/util/fst/TestFSTs.java | 2 +- .../uhighlight/TestUnifiedHighlighterMTQ.java | 2 +- .../lucene/misc/index/TestIndexSplitter.java | 2 +- .../misc/store/TestDirectIODirectory.java | 1 + .../TestHardLinkCopyDirectoryWrapper.java | 2 +- .../lucene/misc/store/TestRAFDirectory.java | 2 +- .../lucene/misc/util/fst/TestFSTsMisc.java | 2 +- .../queries/payloads/PayloadHelper.java | 2 +- .../surround/query/SingleFieldTestDb.java | 2 +- ...TestIndexAndTaxonomyReplicationClient.java | 2 +- .../TestIndexReplicationClient.java | 2 +- .../replicator/nrt/SimpleReplicaNode.java | 2 +- .../nrt/TestStressNRTReplication.java | 2 +- .../index/BaseCompoundFormatTestCase.java | 2 +- .../index/BaseFieldInfoFormatTestCase.java | 6 ++-- .../index/BaseIndexFileFormatTestCase.java | 2 +- .../index/BasePointsFormatTestCase.java | 2 +- .../index/BaseSegmentInfoFormatTestCase.java | 6 ++-- .../index/BaseStoredFieldsFormatTestCase.java | 4 +-- .../ThreadedIndexingAndSearchingTestCase.java | 2 +- .../java/org/apache/lucene/store/package.html | 29 ------------------- .../store/BaseChunkedDirectoryTestCase.java | 8 ++++- .../store/BaseDirectoryTestCase.java | 10 ++++++- .../store/BaseDirectoryWrapper.java | 4 ++- .../store/BaseLockFactoryTestCase.java | 6 +++- .../store/CorruptingIndexOutput.java | 6 +++- .../store/MockDirectoryWrapper.java | 9 +++++- .../store/MockIndexInputWrapper.java | 3 +- .../store/MockIndexOutputWrapper.java | 5 +++- .../store/RawDirectoryWrapper.java | 10 +++---- .../SlowClosingMockIndexInputWrapper.java | 3 +- .../SlowOpeningMockIndexInputWrapper.java | 3 +- .../lucene/tests/store/package-info.java | 24 +++++++++++++++ .../lucene/tests/util/CloseableDirectory.java | 2 +- .../lucene/tests/util/LuceneTestCase.java | 8 ++--- .../store/TestMockDirectoryWrapper.java | 9 +++++- .../util/TestFailIfUnreferencedFiles.java | 2 +- 117 files changed, 221 insertions(+), 161 deletions(-) delete mode 100644 lucene/test-framework/src/java/org/apache/lucene/store/package.html rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/store/BaseChunkedDirectoryTestCase.java (97%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/store/BaseDirectoryTestCase.java (99%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/store/BaseDirectoryWrapper.java (94%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/store/BaseLockFactoryTestCase.java (97%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/store/CorruptingIndexOutput.java (93%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/store/MockDirectoryWrapper.java (99%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/store/MockIndexInputWrapper.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/store/MockIndexOutputWrapper.java (96%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/store/RawDirectoryWrapper.java (90%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/store/SlowClosingMockIndexInputWrapper.java (95%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/store/SlowOpeningMockIndexInputWrapper.java (95%) create mode 100644 lucene/test-framework/src/java/org/apache/lucene/tests/store/package-info.java rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/store/TestMockDirectoryWrapper.java (94%) diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestAllDictionaries.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestAllDictionaries.java index 51f9c702a9e..999ee2b234b 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestAllDictionaries.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestAllDictionaries.java @@ -41,7 +41,7 @@ import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.apache.lucene.store.BaseDirectoryWrapper; +import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressSysoutChecks; import org.apache.lucene.tests.util.RamUsageTester; diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestBackwardsCompatibility.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestBackwardsCompatibility.java index 379fa99d390..a513e8813ad 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestBackwardsCompatibility.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestBackwardsCompatibility.java @@ -103,12 +103,12 @@ import org.apache.lucene.search.SortField; import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; -import org.apache.lucene.store.BaseDirectoryWrapper; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.NIOFSDirectory; +import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestManyPointsInOldIndex.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestManyPointsInOldIndex.java index 23167e4470b..0a7571bcc2f 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestManyPointsInOldIndex.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestManyPointsInOldIndex.java @@ -24,9 +24,9 @@ import org.apache.lucene.document.IntPoint; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; -import org.apache.lucene.store.BaseDirectoryWrapper; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; +import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/classification/src/test/org/apache/lucene/classification/utils/TestDataSplitter.java b/lucene/classification/src/test/org/apache/lucene/classification/utils/TestDataSplitter.java index 62668749aa6..34488c3da49 100644 --- a/lucene/classification/src/test/org/apache/lucene/classification/utils/TestDataSplitter.java +++ b/lucene/classification/src/test/org/apache/lucene/classification/utils/TestDataSplitter.java @@ -28,8 +28,8 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.RandomIndexWriter; -import org.apache.lucene.store.BaseDirectoryWrapper; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/java/org/apache/lucene/store/FilterDirectory.java b/lucene/core/src/java/org/apache/lucene/store/FilterDirectory.java index 4df9239c028..43185a54f45 100644 --- a/lucene/core/src/java/org/apache/lucene/store/FilterDirectory.java +++ b/lucene/core/src/java/org/apache/lucene/store/FilterDirectory.java @@ -120,4 +120,9 @@ public String toString() { public Set getPendingDeletions() throws IOException { return in.getPendingDeletions(); } + + @Override + protected void ensureOpen() throws AlreadyClosedException { + in.ensureOpen(); + } } diff --git a/lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java b/lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java index 4686de83e5b..e84871aefdb 100644 --- a/lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java +++ b/lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java @@ -27,7 +27,7 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.TermQuery; -import org.apache.lucene.store.BaseDirectoryWrapper; +import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java b/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java index 3a154a61c21..5a92e905749 100644 --- a/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java +++ b/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java @@ -35,7 +35,7 @@ import org.apache.lucene.index.MergeTrigger; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.InfoStream; diff --git a/lucene/core/src/test/org/apache/lucene/index/Test2BBinaryDocValues.java b/lucene/core/src/test/org/apache/lucene/index/Test2BBinaryDocValues.java index b09286a1408..62e37df5d73 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test2BBinaryDocValues.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test2BBinaryDocValues.java @@ -20,10 +20,10 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.BinaryDocValuesField; import org.apache.lucene.document.Document; -import org.apache.lucene.store.BaseDirectoryWrapper; import org.apache.lucene.store.ByteArrayDataInput; import org.apache.lucene.store.ByteArrayDataOutput; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.BaseDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.Monster; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; diff --git a/lucene/core/src/test/org/apache/lucene/index/Test2BDocs.java b/lucene/core/src/test/org/apache/lucene/index/Test2BDocs.java index 50491e3d7b5..012a8c40906 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test2BDocs.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test2BDocs.java @@ -23,8 +23,8 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.StringField; -import org.apache.lucene.store.BaseDirectoryWrapper; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.BaseDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.Monster; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; diff --git a/lucene/core/src/test/org/apache/lucene/index/Test2BNumericDocValues.java b/lucene/core/src/test/org/apache/lucene/index/Test2BNumericDocValues.java index 163a589a2d2..3041681b192 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test2BNumericDocValues.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test2BNumericDocValues.java @@ -20,8 +20,8 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.NumericDocValuesField; -import org.apache.lucene.store.BaseDirectoryWrapper; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.BaseDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.Monster; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; diff --git a/lucene/core/src/test/org/apache/lucene/index/Test2BPositions.java b/lucene/core/src/test/org/apache/lucene/index/Test2BPositions.java index 054e5866080..9f227127e52 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test2BPositions.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test2BPositions.java @@ -24,8 +24,8 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; import org.apache.lucene.document.TextField; -import org.apache.lucene.store.BaseDirectoryWrapper; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.BaseDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.Monster; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; diff --git a/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java b/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java index c6355f710ae..0900d7944f1 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java @@ -24,8 +24,8 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; import org.apache.lucene.document.TextField; -import org.apache.lucene.store.BaseDirectoryWrapper; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.BaseDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; import org.apache.lucene.tests.util.TimeUnits; diff --git a/lucene/core/src/test/org/apache/lucene/index/Test2BPostingsBytes.java b/lucene/core/src/test/org/apache/lucene/index/Test2BPostingsBytes.java index d958872f422..5ab2075d7c1 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test2BPostingsBytes.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test2BPostingsBytes.java @@ -28,8 +28,8 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; import org.apache.lucene.document.TextField; -import org.apache.lucene.store.BaseDirectoryWrapper; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.BaseDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.Monster; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; diff --git a/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValuesFixedSorted.java b/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValuesFixedSorted.java index 5f24a544520..05b341a622c 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValuesFixedSorted.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValuesFixedSorted.java @@ -20,8 +20,8 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.SortedDocValuesField; -import org.apache.lucene.store.BaseDirectoryWrapper; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.BaseDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.Monster; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; diff --git a/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValuesOrds.java b/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValuesOrds.java index 98ed31a9c04..838ecd30b9f 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValuesOrds.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValuesOrds.java @@ -20,8 +20,8 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.SortedDocValuesField; -import org.apache.lucene.store.BaseDirectoryWrapper; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.BaseDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.Monster; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; diff --git a/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java b/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java index e2567c00f02..fd78de02d97 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java @@ -32,8 +32,8 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.TermQuery; -import org.apache.lucene.store.BaseDirectoryWrapper; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.BaseDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.Monster; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; diff --git a/lucene/core/src/test/org/apache/lucene/index/Test4GBStoredFields.java b/lucene/core/src/test/org/apache/lucene/index/Test4GBStoredFields.java index 7e870fc41b5..7e6e1ae3b3d 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test4GBStoredFields.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test4GBStoredFields.java @@ -24,7 +24,7 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; import org.apache.lucene.store.MMapDirectory; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; import org.apache.lucene.tests.util.TimeUnits; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java b/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java index 4f44457949f..ca95cae53c0 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java @@ -40,11 +40,11 @@ import org.apache.lucene.search.Sort; import org.apache.lucene.search.SortField; import org.apache.lucene.store.AlreadyClosedException; -import org.apache.lucene.store.BaseDirectoryWrapper; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; import org.apache.lucene.store.LockObtainFailedException; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.BaseDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesCheckIndexHeader.java b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesCheckIndexHeader.java index 15d30d23e9f..291f55207a6 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesCheckIndexHeader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesCheckIndexHeader.java @@ -21,13 +21,13 @@ import java.util.Arrays; import java.util.Collections; import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.store.BaseDirectoryWrapper; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.BaseDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressFileSystems; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesDetectBitFlips.java b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesDetectBitFlips.java index 589a1bfde0d..f75f8b3b8b2 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesDetectBitFlips.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesDetectBitFlips.java @@ -21,11 +21,11 @@ import java.util.Collections; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.CodecUtil; -import org.apache.lucene.store.BaseDirectoryWrapper; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.AwaitsFix; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesDetectTruncation.java b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesDetectTruncation.java index 40a50311fd6..33953df7257 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesDetectTruncation.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesDetectTruncation.java @@ -21,11 +21,11 @@ import java.util.Arrays; import java.util.Collections; import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.store.BaseDirectoryWrapper; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.AwaitsFix; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestAtomicUpdate.java b/lucene/core/src/test/org/apache/lucene/index/TestAtomicUpdate.java index 831d49fdbf4..8b891c80333 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestAtomicUpdate.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestAtomicUpdate.java @@ -26,7 +26,7 @@ import org.apache.lucene.document.IntPoint; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.English; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestCodecHoldsOpenFiles.java b/lucene/core/src/test/org/apache/lucene/index/TestCodecHoldsOpenFiles.java index 261601abe15..42c715da9aa 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestCodecHoldsOpenFiles.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestCodecHoldsOpenFiles.java @@ -20,7 +20,7 @@ import org.apache.lucene.document.IntPoint; import org.apache.lucene.document.NumericDocValuesField; import org.apache.lucene.document.TextField; -import org.apache.lucene.store.BaseDirectoryWrapper; +import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java b/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java index 90e7b814106..cba9c7c64b9 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java @@ -38,7 +38,7 @@ import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.InfoStream; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestCrash.java b/lucene/core/src/test/org/apache/lucene/index/TestCrash.java index 080785de427..9fa8624f58e 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestCrash.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestCrash.java @@ -22,8 +22,8 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockDirectoryWrapper; import org.apache.lucene.store.NoLockFactory; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; public class TestCrash extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDemoParallelLeafReader.java b/lucene/core/src/test/org/apache/lucene/index/TestDemoParallelLeafReader.java index 56a8f964064..03b2ecc7830 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDemoParallelLeafReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDemoParallelLeafReader.java @@ -46,8 +46,8 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; import org.apache.lucene.store.IOContext; -import org.apache.lucene.store.MockDirectoryWrapper; -import org.apache.lucene.store.MockDirectoryWrapper.Throttling; +import org.apache.lucene.tests.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper.Throttling; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java b/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java index 097d04ad6a1..04f39c965ab 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java @@ -39,8 +39,8 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.search.DocIdSetIterator; -import org.apache.lucene.store.BaseDirectoryWrapper; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReaderReopen.java b/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReaderReopen.java index 7105afea0ae..95ed5b08543 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReaderReopen.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReaderReopen.java @@ -39,8 +39,8 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockDirectoryWrapper; -import org.apache.lucene.store.MockDirectoryWrapper.FakeIOException; +import org.apache.lucene.tests.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper.FakeIOException; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDoc.java b/lucene/core/src/test/org/apache/lucene/index/TestDoc.java index 475631ded15..2c869e6bdd0 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDoc.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDoc.java @@ -40,8 +40,8 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.MergeInfo; -import org.apache.lucene.store.MockDirectoryWrapper; import org.apache.lucene.store.TrackingDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.Bits; import org.apache.lucene.util.InfoStream; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestFilterLeafReader.java b/lucene/core/src/test/org/apache/lucene/index/TestFilterLeafReader.java index 44676d34b1e..0ad32968c54 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestFilterLeafReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestFilterLeafReader.java @@ -23,8 +23,8 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.search.DocIdSetIterator; -import org.apache.lucene.store.BaseDirectoryWrapper; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.FixedBitSet; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java index 520d673745f..b04da5a4d1c 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java @@ -23,7 +23,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestForTooMuchCloning.java b/lucene/core/src/test/org/apache/lucene/index/TestForTooMuchCloning.java index 02a71039da8..98f70aba507 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestForTooMuchCloning.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestForTooMuchCloning.java @@ -23,7 +23,7 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.TermRangeQuery; import org.apache.lucene.search.TopDocs; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java index aa125db0dc0..8057fc77bf0 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java @@ -30,7 +30,7 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.InfoStream; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java index 951ccdfd1ad..d23b09d968d 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java @@ -88,7 +88,6 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.AlreadyClosedException; -import org.apache.lucene.store.BaseDirectoryWrapper; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; @@ -98,10 +97,11 @@ import org.apache.lucene.store.IndexOutput; import org.apache.lucene.store.LockObtainFailedException; import org.apache.lucene.store.MMapDirectory; -import org.apache.lucene.store.MockDirectoryWrapper; import org.apache.lucene.store.NIOFSDirectory; import org.apache.lucene.store.NoLockFactory; import org.apache.lucene.store.SimpleFSLockFactory; +import org.apache.lucene.tests.store.BaseDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java index 47ae874063c..5512c390bce 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java @@ -29,7 +29,7 @@ import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java index 5d909585afd..c06922c9bdf 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java @@ -42,7 +42,7 @@ import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java index 006e706e007..6d588130664 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java @@ -51,15 +51,15 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.PhraseQuery; import org.apache.lucene.store.AlreadyClosedException; -import org.apache.lucene.store.BaseDirectoryWrapper; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FilterDirectory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; -import org.apache.lucene.store.MockDirectoryWrapper; -import org.apache.lucene.store.MockDirectoryWrapper.FakeIOException; +import org.apache.lucene.tests.store.BaseDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper.FakeIOException; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions2.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions2.java index 5880ebdef0d..a6c78d187fd 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions2.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions2.java @@ -41,7 +41,7 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; import org.apache.lucene.tests.util.Rethrow; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java index eedaa2dd3ab..838722ed0f5 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java @@ -26,7 +26,7 @@ import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMaxDocs.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMaxDocs.java index 51baac59deb..9abe2763354 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMaxDocs.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMaxDocs.java @@ -31,8 +31,8 @@ import org.apache.lucene.search.TopScoreDocCollector; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FilterDirectory; -import org.apache.lucene.store.MockDirectoryWrapper; import org.apache.lucene.store.NoLockFactory; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java index 4e906f9666f..6723c266836 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java @@ -32,7 +32,7 @@ import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOSupplier; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnJRECrash.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnJRECrash.java index 0ec5066102d..fca6b065c0c 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnJRECrash.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnJRECrash.java @@ -32,7 +32,7 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.lucene.store.BaseDirectoryWrapper; +import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Constants; import org.apache.lucene.util.SuppressForbidden; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnVMError.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnVMError.java index d591cc37a0b..36df9a2fa2a 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnVMError.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnVMError.java @@ -37,8 +37,8 @@ import org.apache.lucene.document.StoredField; import org.apache.lucene.document.TextField; import org.apache.lucene.store.AlreadyClosedException; -import org.apache.lucene.store.MockDirectoryWrapper; -import org.apache.lucene.store.MockDirectoryWrapper.Failure; +import org.apache.lucene.tests.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper.Failure; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; import org.apache.lucene.tests.util.Rethrow; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOutOfFileDescriptors.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOutOfFileDescriptors.java index 712ca31843f..c21668e9219 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOutOfFileDescriptors.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOutOfFileDescriptors.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java index 2ff53c67d7a..a9baae0f477 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java @@ -40,8 +40,8 @@ import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockDirectoryWrapper; -import org.apache.lucene.store.MockDirectoryWrapper.FakeIOException; +import org.apache.lucene.tests.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper.FakeIOException; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java index f0b544c23d1..e4a6127945f 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java @@ -33,10 +33,10 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.AlreadyClosedException; -import org.apache.lucene.store.BaseDirectoryWrapper; import org.apache.lucene.store.Directory; import org.apache.lucene.store.LockObtainFailedException; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.BaseDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.Slow; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestLazyProxSkipping.java b/lucene/core/src/test/org/apache/lucene/index/TestLazyProxSkipping.java index 3ae550e9e1d..a1853c4f3ef 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestLazyProxSkipping.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestLazyProxSkipping.java @@ -27,7 +27,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java b/lucene/core/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java index b4153d3f3c5..cccaebedca9 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java @@ -26,7 +26,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderCleanup.java b/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderCleanup.java index d3f01e842bb..e711d28d76e 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderCleanup.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderCleanup.java @@ -21,7 +21,7 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.TextField; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressFileSystems; import org.apache.lucene.util.Constants; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java b/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java index 6dde958c8d1..e98bc37b877 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java @@ -21,7 +21,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; public class TestNRTReaderWithThreads extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNRTThreads.java b/lucene/core/src/test/org/apache/lucene/index/TestNRTThreads.java index 55030d58a5e..667bcb56067 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestNRTThreads.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNRTThreads.java @@ -20,7 +20,7 @@ import java.util.concurrent.ExecutorService; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; import org.junit.Before; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNeverDelete.java b/lucene/core/src/test/org/apache/lucene/index/TestNeverDelete.java index 352f7d1f08c..901432d481d 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestNeverDelete.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNeverDelete.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import org.apache.lucene.store.BaseDirectoryWrapper; +import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java b/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java index 31734ef5a4b..7fd43aaf0e2 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java @@ -23,7 +23,7 @@ import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.ArrayUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestPersistentSnapshotDeletionPolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestPersistentSnapshotDeletionPolicy.java index 17814d88560..fdbd2b16632 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestPersistentSnapshotDeletionPolicy.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestPersistentSnapshotDeletionPolicy.java @@ -20,7 +20,7 @@ import org.apache.lucene.document.Document; import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java b/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java index ccf54358c1e..5fb8cf26f1e 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java @@ -25,6 +25,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.*; +import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSegmentInfos.java b/lucene/core/src/test/org/apache/lucene/index/TestSegmentInfos.java index 33e09c9c6a1..d1621c186ac 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSegmentInfos.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSegmentInfos.java @@ -25,11 +25,11 @@ import org.apache.lucene.codecs.CodecUtil; import org.apache.lucene.mockfile.ExtrasFS; import org.apache.lucene.search.Sort; -import org.apache.lucene.store.BaseDirectoryWrapper; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.StringHelper; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing.java b/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing.java index 343755c0a62..fb87b8d9bd7 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing.java @@ -20,6 +20,7 @@ import org.apache.lucene.document.*; import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.store.*; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.English; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSwappedIndexFiles.java b/lucene/core/src/test/org/apache/lucene/index/TestSwappedIndexFiles.java index 729b47b31bd..d33685c76b7 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSwappedIndexFiles.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSwappedIndexFiles.java @@ -23,9 +23,9 @@ import java.util.Random; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; -import org.apache.lucene.store.BaseDirectoryWrapper; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; +import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressFileSystems; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java b/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java index eb984872ca1..4f70ddc7488 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java @@ -34,7 +34,7 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTragicIndexWriterDeadlock.java b/lucene/core/src/test/org/apache/lucene/index/TestTragicIndexWriterDeadlock.java index de5a6f1fc1a..57df7d326ba 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTragicIndexWriterDeadlock.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTragicIndexWriterDeadlock.java @@ -22,7 +22,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.apache.lucene.document.Document; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; public class TestTragicIndexWriterDeadlock extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTransactions.java b/lucene/core/src/test/org/apache/lucene/index/TestTransactions.java index 5fa0a271335..db6c06e4315 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTransactions.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTransactions.java @@ -24,7 +24,7 @@ import org.apache.lucene.document.StringField; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.English; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java index 9623d7f04c7..ab7c28daeba 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java @@ -28,7 +28,7 @@ import org.apache.lucene.index.Term; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; public class TestSloppyPhraseQuery extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/store/TestByteBuffersDirectory.java b/lucene/core/src/test/org/apache/lucene/store/TestByteBuffersDirectory.java index 9ebadce182c..1e0449c4749 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestByteBuffersDirectory.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestByteBuffersDirectory.java @@ -28,6 +28,7 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.IndexWriterConfig.OpenMode; +import org.apache.lucene.tests.store.BaseDirectoryTestCase; import org.apache.lucene.tests.util.English; import org.junit.Test; diff --git a/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java b/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java index c10b79dfa67..e718d4b4040 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java @@ -36,6 +36,8 @@ import org.apache.lucene.index.TestIndexWriterReader; import org.apache.lucene.mockfile.FilterPath; import org.apache.lucene.mockfile.WindowsFS; +import org.apache.lucene.tests.store.BaseDirectoryTestCase; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Constants; diff --git a/lucene/core/src/test/org/apache/lucene/store/TestFilterDirectory.java b/lucene/core/src/test/org/apache/lucene/store/TestFilterDirectory.java index e48c472a9fb..058b6be059e 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestFilterDirectory.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestFilterDirectory.java @@ -21,6 +21,7 @@ import java.nio.file.Path; import java.util.HashSet; import java.util.Set; +import org.apache.lucene.tests.store.BaseDirectoryTestCase; import org.junit.Test; public class TestFilterDirectory extends BaseDirectoryTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/store/TestLockFactory.java b/lucene/core/src/test/org/apache/lucene/store/TestLockFactory.java index 0b0dc2f3d21..1f81d0824f2 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestLockFactory.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestLockFactory.java @@ -26,6 +26,7 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.IndexWriterConfig.OpenMode; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; public class TestLockFactory extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/store/TestMmapDirectory.java b/lucene/core/src/test/org/apache/lucene/store/TestMmapDirectory.java index 1ae552b7bce..38316df7ebc 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestMmapDirectory.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestMmapDirectory.java @@ -20,6 +20,7 @@ import java.nio.file.Path; import java.util.Random; import java.util.concurrent.CountDownLatch; +import org.apache.lucene.tests.store.BaseDirectoryTestCase; import org.junit.Ignore; /** Tests MMapDirectory */ diff --git a/lucene/core/src/test/org/apache/lucene/store/TestMultiByteBuffersDirectory.java b/lucene/core/src/test/org/apache/lucene/store/TestMultiByteBuffersDirectory.java index 643f7c8b215..77dc36c2fe3 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestMultiByteBuffersDirectory.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestMultiByteBuffersDirectory.java @@ -19,6 +19,7 @@ import java.io.IOException; import java.nio.file.Path; import java.util.function.Supplier; +import org.apache.lucene.tests.store.BaseChunkedDirectoryTestCase; import org.apache.lucene.util.BitUtil; /** Tests ByteBuffersDirectory's chunking */ diff --git a/lucene/core/src/test/org/apache/lucene/store/TestMultiMMap.java b/lucene/core/src/test/org/apache/lucene/store/TestMultiMMap.java index b5d22e8ac94..49cedf4200e 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestMultiMMap.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestMultiMMap.java @@ -18,6 +18,7 @@ import java.io.IOException; import java.nio.file.Path; +import org.apache.lucene.tests.store.BaseChunkedDirectoryTestCase; import org.apache.lucene.util.BytesRef; /** diff --git a/lucene/core/src/test/org/apache/lucene/store/TestNIOFSDirectory.java b/lucene/core/src/test/org/apache/lucene/store/TestNIOFSDirectory.java index e702b682461..8a093f14667 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestNIOFSDirectory.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestNIOFSDirectory.java @@ -27,6 +27,7 @@ import org.apache.lucene.mockfile.FilterFileChannel; import org.apache.lucene.mockfile.FilterPath; import org.apache.lucene.mockfile.LeakFS; +import org.apache.lucene.tests.store.BaseDirectoryTestCase; /** Tests NIOFSDirectory */ public class TestNIOFSDirectory extends BaseDirectoryTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java b/lucene/core/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java index 2915d140073..d51108f4cc0 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java @@ -30,6 +30,7 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.TermQuery; +import org.apache.lucene.tests.store.BaseDirectoryTestCase; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/store/TestNativeFSLockFactory.java b/lucene/core/src/test/org/apache/lucene/store/TestNativeFSLockFactory.java index f241ee6c410..2b52ad4ad40 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestNativeFSLockFactory.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestNativeFSLockFactory.java @@ -27,6 +27,7 @@ import java.util.Set; import org.apache.lucene.mockfile.FilterFileSystemProvider; import org.apache.lucene.mockfile.FilterPath; +import org.apache.lucene.tests.store.BaseLockFactoryTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; diff --git a/lucene/core/src/test/org/apache/lucene/store/TestSimpleFSLockFactory.java b/lucene/core/src/test/org/apache/lucene/store/TestSimpleFSLockFactory.java index f9058933d69..3bfc921df36 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestSimpleFSLockFactory.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestSimpleFSLockFactory.java @@ -18,6 +18,7 @@ import java.io.IOException; import java.nio.file.Path; +import org.apache.lucene.tests.store.BaseLockFactoryTestCase; import org.apache.lucene.util.IOUtils; /** Simple tests for SimpleFSLockFactory */ diff --git a/lucene/core/src/test/org/apache/lucene/store/TestSingleInstanceLockFactory.java b/lucene/core/src/test/org/apache/lucene/store/TestSingleInstanceLockFactory.java index 16b0f3dde10..bc2fe2d7c29 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestSingleInstanceLockFactory.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestSingleInstanceLockFactory.java @@ -22,6 +22,7 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.IndexWriterConfig.OpenMode; +import org.apache.lucene.tests.store.BaseLockFactoryTestCase; /** Simple tests for SingleInstanceLockFactory */ public class TestSingleInstanceLockFactory extends BaseLockFactoryTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/store/TestSleepingLockWrapper.java b/lucene/core/src/test/org/apache/lucene/store/TestSleepingLockWrapper.java index 6092d7c1967..99ba2589856 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestSleepingLockWrapper.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestSleepingLockWrapper.java @@ -18,6 +18,7 @@ import java.io.IOException; import java.nio.file.Path; +import org.apache.lucene.tests.store.BaseLockFactoryTestCase; import org.apache.lucene.tests.util.TestUtil; /** Simple tests for SleepingLockWrapper */ diff --git a/lucene/core/src/test/org/apache/lucene/store/TestTrackingDirectoryWrapper.java b/lucene/core/src/test/org/apache/lucene/store/TestTrackingDirectoryWrapper.java index 2feda0f7e4d..87bba47d734 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestTrackingDirectoryWrapper.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestTrackingDirectoryWrapper.java @@ -19,6 +19,7 @@ import java.io.IOException; import java.nio.file.Path; import java.util.Collections; +import org.apache.lucene.tests.store.BaseDirectoryTestCase; public class TestTrackingDirectoryWrapper extends BaseDirectoryTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/Test2BPagedBytes.java b/lucene/core/src/test/org/apache/lucene/util/Test2BPagedBytes.java index 24d24ff7a76..062d53dc72b 100644 --- a/lucene/core/src/test/org/apache/lucene/util/Test2BPagedBytes.java +++ b/lucene/core/src/test/org/apache/lucene/util/Test2BPagedBytes.java @@ -17,11 +17,11 @@ package org.apache.lucene.util; import java.util.Random; -import org.apache.lucene.store.BaseDirectoryWrapper; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.BaseDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.Monster; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestOfflineSorter.java b/lucene/core/src/test/org/apache/lucene/util/TestOfflineSorter.java index 9ba3fbe68cd..6423e1e807c 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestOfflineSorter.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestOfflineSorter.java @@ -30,12 +30,12 @@ import org.apache.lucene.codecs.CodecUtil; import org.apache.lucene.index.CorruptIndexException; import org.apache.lucene.store.ChecksumIndexInput; -import org.apache.lucene.store.CorruptingIndexOutput; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FilterDirectory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.tests.store.CorruptingIndexOutput; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.OfflineSorter.BufferSize; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestPagedBytes.java b/lucene/core/src/test/org/apache/lucene/util/TestPagedBytes.java index db36968bdf7..0163ed4f6bd 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestPagedBytes.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestPagedBytes.java @@ -18,13 +18,13 @@ import java.io.IOException; import java.util.*; -import org.apache.lucene.store.BaseDirectoryWrapper; import org.apache.lucene.store.DataInput; import org.apache.lucene.store.DataOutput; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.BaseDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.RamUsageTester; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/util/bkd/TestBKD.java b/lucene/core/src/test/org/apache/lucene/util/bkd/TestBKD.java index 3b0e54b3ec5..6ac3a29e496 100644 --- a/lucene/core/src/test/org/apache/lucene/util/bkd/TestBKD.java +++ b/lucene/core/src/test/org/apache/lucene/util/bkd/TestBKD.java @@ -31,13 +31,13 @@ import org.apache.lucene.index.PointValues.Relation; import org.apache.lucene.mockfile.ExtrasFS; import org.apache.lucene.search.DocIdSetIterator; -import org.apache.lucene.store.CorruptingIndexOutput; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FilterDirectory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.CorruptingIndexOutput; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java b/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java index 4aafdb1f65d..cbc883405f4 100644 --- a/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java +++ b/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java @@ -60,7 +60,7 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterMTQ.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterMTQ.java index a3fed393793..9b70a435b31 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterMTQ.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterMTQ.java @@ -64,7 +64,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.WildcardQuery; import org.apache.lucene.search.uhighlight.UnifiedHighlighter.HighlightFlag; -import org.apache.lucene.store.BaseDirectoryWrapper; +import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.UnicodeUtil; diff --git a/lucene/misc/src/test/org/apache/lucene/misc/index/TestIndexSplitter.java b/lucene/misc/src/test/org/apache/lucene/misc/index/TestIndexSplitter.java index 1f03a3499a0..d35d4b45f0c 100644 --- a/lucene/misc/src/test/org/apache/lucene/misc/index/TestIndexSplitter.java +++ b/lucene/misc/src/test/org/apache/lucene/misc/index/TestIndexSplitter.java @@ -28,7 +28,7 @@ import org.apache.lucene.index.MergePolicy; import org.apache.lucene.index.SegmentInfos; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; public class TestIndexSplitter extends LuceneTestCase { diff --git a/lucene/misc/src/test/org/apache/lucene/misc/store/TestDirectIODirectory.java b/lucene/misc/src/test/org/apache/lucene/misc/store/TestDirectIODirectory.java index b24fc4cefbe..52fe4c31828 100644 --- a/lucene/misc/src/test/org/apache/lucene/misc/store/TestDirectIODirectory.java +++ b/lucene/misc/src/test/org/apache/lucene/misc/store/TestDirectIODirectory.java @@ -29,6 +29,7 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.PhraseQuery; import org.apache.lucene.store.*; +import org.apache.lucene.tests.store.BaseDirectoryTestCase; import org.junit.BeforeClass; public class TestDirectIODirectory extends BaseDirectoryTestCase { diff --git a/lucene/misc/src/test/org/apache/lucene/misc/store/TestHardLinkCopyDirectoryWrapper.java b/lucene/misc/src/test/org/apache/lucene/misc/store/TestHardLinkCopyDirectoryWrapper.java index ef2204ad086..1446803a2c6 100644 --- a/lucene/misc/src/test/org/apache/lucene/misc/store/TestHardLinkCopyDirectoryWrapper.java +++ b/lucene/misc/src/test/org/apache/lucene/misc/store/TestHardLinkCopyDirectoryWrapper.java @@ -27,7 +27,6 @@ import org.apache.lucene.codecs.CodecUtil; import org.apache.lucene.mockfile.FilterPath; import org.apache.lucene.mockfile.WindowsFS; -import org.apache.lucene.store.BaseDirectoryTestCase; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.ChecksumIndexInput; import org.apache.lucene.store.Directory; @@ -36,6 +35,7 @@ import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; import org.apache.lucene.store.NIOFSDirectory; +import org.apache.lucene.tests.store.BaseDirectoryTestCase; import org.apache.lucene.util.Constants; import org.apache.lucene.util.IOUtils; diff --git a/lucene/misc/src/test/org/apache/lucene/misc/store/TestRAFDirectory.java b/lucene/misc/src/test/org/apache/lucene/misc/store/TestRAFDirectory.java index 2d34f0a5c97..a1732b88d78 100644 --- a/lucene/misc/src/test/org/apache/lucene/misc/store/TestRAFDirectory.java +++ b/lucene/misc/src/test/org/apache/lucene/misc/store/TestRAFDirectory.java @@ -18,8 +18,8 @@ import java.io.IOException; import java.nio.file.Path; -import org.apache.lucene.store.BaseDirectoryTestCase; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.store.BaseDirectoryTestCase; /** Tests RAFDirectory */ // See: https://issues.apache.org/jira/browse/SOLR-12028 Tests cannot remove files on Windows diff --git a/lucene/misc/src/test/org/apache/lucene/misc/util/fst/TestFSTsMisc.java b/lucene/misc/src/test/org/apache/lucene/misc/util/fst/TestFSTsMisc.java index f2441b80791..207b5fbf105 100644 --- a/lucene/misc/src/test/org/apache/lucene/misc/util/fst/TestFSTsMisc.java +++ b/lucene/misc/src/test/org/apache/lucene/misc/util/fst/TestFSTsMisc.java @@ -24,7 +24,7 @@ import java.util.Random; import java.util.Set; import org.apache.lucene.misc.util.fst.UpToTwoPositiveIntOutputs.TwoLongs; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.tests.util.fst.FSTTester; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/payloads/PayloadHelper.java b/lucene/queries/src/test/org/apache/lucene/queries/payloads/PayloadHelper.java index 544e04d44b3..0cf05e69bf2 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/payloads/PayloadHelper.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/payloads/PayloadHelper.java @@ -31,7 +31,7 @@ import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.English; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/SingleFieldTestDb.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/SingleFieldTestDb.java index fde5f7a1f8f..55e8021e4a4 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/SingleFieldTestDb.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/SingleFieldTestDb.java @@ -25,7 +25,7 @@ import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; public class SingleFieldTestDb { private Directory db; diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/TestIndexAndTaxonomyReplicationClient.java b/lucene/replicator/src/test/org/apache/lucene/replicator/TestIndexAndTaxonomyReplicationClient.java index ebc8fc9e787..ce8dae50741 100644 --- a/lucene/replicator/src/test/org/apache/lucene/replicator/TestIndexAndTaxonomyReplicationClient.java +++ b/lucene/replicator/src/test/org/apache/lucene/replicator/TestIndexAndTaxonomyReplicationClient.java @@ -48,7 +48,7 @@ import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.ThreadInterruptedException; diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/TestIndexReplicationClient.java b/lucene/replicator/src/test/org/apache/lucene/replicator/TestIndexReplicationClient.java index e31a5e10b2d..0b3b1388ccd 100644 --- a/lucene/replicator/src/test/org/apache/lucene/replicator/TestIndexReplicationClient.java +++ b/lucene/replicator/src/test/org/apache/lucene/replicator/TestIndexReplicationClient.java @@ -29,7 +29,7 @@ import org.apache.lucene.replicator.ReplicationClient.ReplicationHandler; import org.apache.lucene.replicator.ReplicationClient.SourceDirectoryFactory; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.ThreadInterruptedException; diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleReplicaNode.java b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleReplicaNode.java index 13244a4e810..121cab09880 100644 --- a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleReplicaNode.java +++ b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleReplicaNode.java @@ -46,9 +46,9 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexOutput; -import org.apache.lucene.store.MockDirectoryWrapper; import org.apache.lucene.store.RateLimitedIndexOutput; import org.apache.lucene.store.RateLimiter; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; class SimpleReplicaNode extends ReplicaNode { diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/TestStressNRTReplication.java b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/TestStressNRTReplication.java index a6d85507e90..917a73865f6 100644 --- a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/TestStressNRTReplication.java +++ b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/TestStressNRTReplication.java @@ -44,7 +44,7 @@ import java.util.regex.Pattern; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseCompoundFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BaseCompoundFormatTestCase.java index 32e1782f07c..c6bb20dfedb 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseCompoundFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BaseCompoundFormatTestCase.java @@ -37,8 +37,8 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; -import org.apache.lucene.store.MockDirectoryWrapper; import org.apache.lucene.store.NRTCachingDirectory; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.FixedBitSet; import org.apache.lucene.util.StringHelper; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseFieldInfoFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BaseFieldInfoFormatTestCase.java index 2f0856dea5c..c9c02031c1f 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseFieldInfoFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BaseFieldInfoFormatTestCase.java @@ -31,9 +31,9 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; -import org.apache.lucene.store.MockDirectoryWrapper; -import org.apache.lucene.store.MockDirectoryWrapper.Failure; -import org.apache.lucene.store.MockDirectoryWrapper.FakeIOException; +import org.apache.lucene.tests.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper.Failure; +import org.apache.lucene.tests.store.MockDirectoryWrapper.FakeIOException; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.StringHelper; import org.apache.lucene.util.Version; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java index c3780b289c7..dcf33dac60d 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java @@ -60,7 +60,7 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.RamUsageTester; import org.apache.lucene.tests.util.Rethrow; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BasePointsFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BasePointsFormatTestCase.java index 0a346dd6625..557dc5430cc 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BasePointsFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BasePointsFormatTestCase.java @@ -37,7 +37,7 @@ import org.apache.lucene.index.PointValues.Relation; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.Rethrow; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseSegmentInfoFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BaseSegmentInfoFormatTestCase.java index 83181632bab..fee1a3ec983 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseSegmentInfoFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BaseSegmentInfoFormatTestCase.java @@ -31,9 +31,9 @@ import org.apache.lucene.search.SortedSetSortField; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; -import org.apache.lucene.store.MockDirectoryWrapper; -import org.apache.lucene.store.MockDirectoryWrapper.Failure; -import org.apache.lucene.store.MockDirectoryWrapper.FakeIOException; +import org.apache.lucene.tests.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper.Failure; +import org.apache.lucene.tests.store.MockDirectoryWrapper.FakeIOException; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.StringHelper; import org.apache.lucene.util.Version; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java index 56679007bdd..67aa3301981 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java @@ -54,8 +54,8 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; import org.apache.lucene.store.MMapDirectory; -import org.apache.lucene.store.MockDirectoryWrapper; -import org.apache.lucene.store.MockDirectoryWrapper.Throttling; +import org.apache.lucene.tests.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper.Throttling; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java index bd5a8d92e11..2ee4d32626d 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java @@ -42,8 +42,8 @@ import org.apache.lucene.search.SortField; import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; -import org.apache.lucene.store.BaseDirectoryWrapper; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.util.FailOnNonBulkMergesInfoStream; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/test-framework/src/java/org/apache/lucene/store/package.html b/lucene/test-framework/src/java/org/apache/lucene/store/package.html deleted file mode 100644 index 84c72a348ed..00000000000 --- a/lucene/test-framework/src/java/org/apache/lucene/store/package.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - -Support for testing store mechanisms. -

-The primary class is {@link org.apache.lucene.store.MockDirectoryWrapper}, which -wraps any Directory implementation and provides additional checks. - - diff --git a/lucene/test-framework/src/java/org/apache/lucene/store/BaseChunkedDirectoryTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/store/BaseChunkedDirectoryTestCase.java similarity index 97% rename from lucene/test-framework/src/java/org/apache/lucene/store/BaseChunkedDirectoryTestCase.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/store/BaseChunkedDirectoryTestCase.java index 1d2c1213dc8..d2ddcca6e36 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/store/BaseChunkedDirectoryTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/store/BaseChunkedDirectoryTestCase.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.store; +package org.apache.lucene.tests.store; import java.io.IOException; import java.nio.file.Path; @@ -24,6 +24,12 @@ import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; +import org.apache.lucene.store.AlreadyClosedException; +import org.apache.lucene.store.Directory; +import org.apache.lucene.store.IOContext; +import org.apache.lucene.store.IndexInput; +import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.store.MMapDirectory; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/store/BaseDirectoryTestCase.java similarity index 99% rename from lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryTestCase.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/store/BaseDirectoryTestCase.java index 101e84d7c44..a5139cf01c9 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/store/BaseDirectoryTestCase.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.store; +package org.apache.lucene.tests.store; import com.carrotsearch.randomizedtesting.RandomizedTest; import com.carrotsearch.randomizedtesting.generators.RandomBytes; @@ -46,6 +46,14 @@ import org.apache.lucene.index.IndexFileNames; import org.apache.lucene.index.IndexNotFoundException; import org.apache.lucene.mockfile.ExtrasFS; +import org.apache.lucene.store.AlreadyClosedException; +import org.apache.lucene.store.ChecksumIndexInput; +import org.apache.lucene.store.Directory; +import org.apache.lucene.store.FSDirectory; +import org.apache.lucene.store.IOContext; +import org.apache.lucene.store.IndexInput; +import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.store.RandomAccessInput; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; diff --git a/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryWrapper.java b/lucene/test-framework/src/java/org/apache/lucene/tests/store/BaseDirectoryWrapper.java similarity index 94% rename from lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryWrapper.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/store/BaseDirectoryWrapper.java index 6a9f63aeb93..a440d2712f9 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryWrapper.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/store/BaseDirectoryWrapper.java @@ -14,10 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.store; +package org.apache.lucene.tests.store; import java.io.IOException; import org.apache.lucene.index.DirectoryReader; +import org.apache.lucene.store.Directory; +import org.apache.lucene.store.FilterDirectory; import org.apache.lucene.tests.util.TestUtil; /** Calls check index on close. */ diff --git a/lucene/test-framework/src/java/org/apache/lucene/store/BaseLockFactoryTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/store/BaseLockFactoryTestCase.java similarity index 97% rename from lucene/test-framework/src/java/org/apache/lucene/store/BaseLockFactoryTestCase.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/store/BaseLockFactoryTestCase.java index 42d8e1f87b7..19bd7d92cc0 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/store/BaseLockFactoryTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/store/BaseLockFactoryTestCase.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.store; +package org.apache.lucene.tests.store; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -38,6 +38,10 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; +import org.apache.lucene.store.AlreadyClosedException; +import org.apache.lucene.store.Directory; +import org.apache.lucene.store.Lock; +import org.apache.lucene.store.LockObtainFailedException; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Constants; diff --git a/lucene/test-framework/src/java/org/apache/lucene/store/CorruptingIndexOutput.java b/lucene/test-framework/src/java/org/apache/lucene/tests/store/CorruptingIndexOutput.java similarity index 93% rename from lucene/test-framework/src/java/org/apache/lucene/store/CorruptingIndexOutput.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/store/CorruptingIndexOutput.java index 09209a4c66b..c0d65b31001 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/store/CorruptingIndexOutput.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/store/CorruptingIndexOutput.java @@ -15,9 +15,13 @@ * limitations under the License. */ -package org.apache.lucene.store; +package org.apache.lucene.tests.store; import java.io.IOException; +import org.apache.lucene.store.Directory; +import org.apache.lucene.store.IOContext; +import org.apache.lucene.store.IndexInput; +import org.apache.lucene.store.IndexOutput; /** Corrupts on bit of a file after close */ public class CorruptingIndexOutput extends IndexOutput { diff --git a/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java b/lucene/test-framework/src/java/org/apache/lucene/tests/store/MockDirectoryWrapper.java similarity index 99% rename from lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/store/MockDirectoryWrapper.java index bcd58bdabf5..7229a592cc3 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/store/MockDirectoryWrapper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.store; +package org.apache.lucene.tests.store; import java.io.Closeable; import java.io.FileNotFoundException; @@ -46,6 +46,13 @@ import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.NoDeletionPolicy; import org.apache.lucene.index.SegmentInfos; +import org.apache.lucene.store.AlreadyClosedException; +import org.apache.lucene.store.ChecksumIndexInput; +import org.apache.lucene.store.Directory; +import org.apache.lucene.store.IOContext; +import org.apache.lucene.store.IndexInput; +import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.store.Lock; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.tests.util.ThrottledIndexOutput; diff --git a/lucene/test-framework/src/java/org/apache/lucene/store/MockIndexInputWrapper.java b/lucene/test-framework/src/java/org/apache/lucene/tests/store/MockIndexInputWrapper.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/store/MockIndexInputWrapper.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/store/MockIndexInputWrapper.java index fa9043e6571..d1b034a1237 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/store/MockIndexInputWrapper.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/store/MockIndexInputWrapper.java @@ -14,12 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.store; +package org.apache.lucene.tests.store; import java.io.Closeable; import java.io.IOException; import java.util.Map; import java.util.Set; +import org.apache.lucene.store.IndexInput; /** * Used by MockDirectoryWrapper to create an input stream that keeps track of when it's been closed. diff --git a/lucene/test-framework/src/java/org/apache/lucene/store/MockIndexOutputWrapper.java b/lucene/test-framework/src/java/org/apache/lucene/tests/store/MockIndexOutputWrapper.java similarity index 96% rename from lucene/test-framework/src/java/org/apache/lucene/store/MockIndexOutputWrapper.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/store/MockIndexOutputWrapper.java index c591687e4c2..005542a2e90 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/store/MockIndexOutputWrapper.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/store/MockIndexOutputWrapper.java @@ -14,10 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.store; +package org.apache.lucene.tests.store; import java.io.Closeable; import java.io.IOException; +import org.apache.lucene.store.AlreadyClosedException; +import org.apache.lucene.store.DataInput; +import org.apache.lucene.store.IndexOutput; import org.apache.lucene.tests.util.LuceneTestCase; /** diff --git a/lucene/test-framework/src/java/org/apache/lucene/store/RawDirectoryWrapper.java b/lucene/test-framework/src/java/org/apache/lucene/tests/store/RawDirectoryWrapper.java similarity index 90% rename from lucene/test-framework/src/java/org/apache/lucene/store/RawDirectoryWrapper.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/store/RawDirectoryWrapper.java index 8886101472d..2ef79200c1d 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/store/RawDirectoryWrapper.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/store/RawDirectoryWrapper.java @@ -14,9 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.store; +package org.apache.lucene.tests.store; import java.io.IOException; +import org.apache.lucene.store.ChecksumIndexInput; +import org.apache.lucene.store.Directory; +import org.apache.lucene.store.IOContext; /** * Delegates all operations, even optional ones, to the wrapped directory. @@ -40,9 +43,4 @@ public void copyFrom(Directory from, String src, String dest, IOContext context) public ChecksumIndexInput openChecksumInput(String name, IOContext context) throws IOException { return in.openChecksumInput(name, context); } - - @Override - protected void ensureOpen() throws AlreadyClosedException { - in.ensureOpen(); - } } diff --git a/lucene/test-framework/src/java/org/apache/lucene/store/SlowClosingMockIndexInputWrapper.java b/lucene/test-framework/src/java/org/apache/lucene/tests/store/SlowClosingMockIndexInputWrapper.java similarity index 95% rename from lucene/test-framework/src/java/org/apache/lucene/store/SlowClosingMockIndexInputWrapper.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/store/SlowClosingMockIndexInputWrapper.java index d79d0e6ac3b..436f456cd92 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/store/SlowClosingMockIndexInputWrapper.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/store/SlowClosingMockIndexInputWrapper.java @@ -14,9 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.store; +package org.apache.lucene.tests.store; import java.io.IOException; +import org.apache.lucene.store.IndexInput; import org.apache.lucene.util.ThreadInterruptedException; /** diff --git a/lucene/test-framework/src/java/org/apache/lucene/store/SlowOpeningMockIndexInputWrapper.java b/lucene/test-framework/src/java/org/apache/lucene/tests/store/SlowOpeningMockIndexInputWrapper.java similarity index 95% rename from lucene/test-framework/src/java/org/apache/lucene/store/SlowOpeningMockIndexInputWrapper.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/store/SlowOpeningMockIndexInputWrapper.java index affd0c778d6..68e38543ce5 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/store/SlowOpeningMockIndexInputWrapper.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/store/SlowOpeningMockIndexInputWrapper.java @@ -14,9 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.store; +package org.apache.lucene.tests.store; import java.io.IOException; +import org.apache.lucene.store.IndexInput; import org.apache.lucene.util.ThreadInterruptedException; /** diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/store/package-info.java b/lucene/test-framework/src/java/org/apache/lucene/tests/store/package-info.java new file mode 100644 index 00000000000..50f09912eb5 --- /dev/null +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/store/package-info.java @@ -0,0 +1,24 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * Support for testing store mechanisms. + * + *

The primary class is {@link org.apache.lucene.tests.store.MockDirectoryWrapper}, which wraps + * any Directory implementation and provides additional checks. + */ +package org.apache.lucene.tests.store; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/util/CloseableDirectory.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/CloseableDirectory.java index 859cb20b89c..4df65884150 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/util/CloseableDirectory.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/CloseableDirectory.java @@ -17,7 +17,7 @@ package org.apache.lucene.tests.util; import java.io.Closeable; -import org.apache.lucene.store.BaseDirectoryWrapper; +import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.junit.Assert; /** diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java index 9ded32c1c94..f9667274efd 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java @@ -120,7 +120,6 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.QueryCache; import org.apache.lucene.search.QueryCachingPolicy; -import org.apache.lucene.store.BaseDirectoryWrapper; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; @@ -131,10 +130,11 @@ import org.apache.lucene.store.LockFactory; import org.apache.lucene.store.MMapDirectory; import org.apache.lucene.store.MergeInfo; -import org.apache.lucene.store.MockDirectoryWrapper; -import org.apache.lucene.store.MockDirectoryWrapper.Throttling; import org.apache.lucene.store.NRTCachingDirectory; -import org.apache.lucene.store.RawDirectoryWrapper; +import org.apache.lucene.tests.store.BaseDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper.Throttling; +import org.apache.lucene.tests.store.RawDirectoryWrapper; import org.apache.lucene.tests.util.automaton.AutomatonTestUtil; import org.apache.lucene.util.Bits; import org.apache.lucene.util.BytesRef; diff --git a/lucene/test-framework/src/test/org/apache/lucene/store/TestMockDirectoryWrapper.java b/lucene/test-framework/src/test/org/apache/lucene/tests/store/TestMockDirectoryWrapper.java similarity index 94% rename from lucene/test-framework/src/test/org/apache/lucene/store/TestMockDirectoryWrapper.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/store/TestMockDirectoryWrapper.java index b8607b3a159..c2687458add 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/store/TestMockDirectoryWrapper.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/store/TestMockDirectoryWrapper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.store; +package org.apache.lucene.tests.store; import java.io.EOFException; import java.io.FileNotFoundException; @@ -23,6 +23,13 @@ import java.nio.file.Path; import org.apache.lucene.document.Document; import org.apache.lucene.index.RandomIndexWriter; +import org.apache.lucene.store.ByteArrayDataInput; +import org.apache.lucene.store.ByteBuffersDirectory; +import org.apache.lucene.store.Directory; +import org.apache.lucene.store.FilterDirectory; +import org.apache.lucene.store.IOContext; +import org.apache.lucene.store.IndexInput; +import org.apache.lucene.store.IndexOutput; // See: https://issues.apache.org/jira/browse/SOLR-12028 Tests cannot remove files on Windows // machines occasionally diff --git a/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestFailIfUnreferencedFiles.java b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestFailIfUnreferencedFiles.java index f6bb246803f..403ec45637f 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestFailIfUnreferencedFiles.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestFailIfUnreferencedFiles.java @@ -23,7 +23,7 @@ import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexOutput; -import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.junit.Assert; import org.junit.Test; import org.junit.runner.JUnitCore; From f80aaf28c9dd2c80e2abc096a403d338eb17d85a Mon Sep 17 00:00:00 2001 From: Dawid Weiss Date: Sun, 19 Dec 2021 13:48:07 +0100 Subject: [PATCH 05/32] Moved geo -> tests.geo --- .../apache/lucene/geo/XYEncodingUtils.java | 8 +++++- .../document/BaseLatLonPointTestCase.java | 2 +- .../document/BaseLatLonShapeTestCase.java | 2 +- .../document/BaseLatLonSpatialTestCase.java | 6 ++-- .../lucene/document/BaseXYShapeTestCase.java | 2 +- .../document/TestLatLonLineShapeQueries.java | 2 +- .../document/TestLatLonPointDistanceSort.java | 2 +- .../document/TestLatLonPointShapeQueries.java | 2 +- .../lucene/document/TestLatLonShape.java | 2 +- .../document/TestLatLonShapeEncoding.java | 2 +- .../document/TestXYLineShapeQueries.java | 2 +- .../TestXYMultiPointShapeQueries.java | 2 +- .../document/TestXYPointShapeQueries.java | 2 +- .../apache/lucene/document/TestXYShape.java | 2 +- .../lucene/document/TestXYShapeEncoding.java | 2 +- .../org/apache/lucene/geo/TestCircle.java | 1 + .../org/apache/lucene/geo/TestCircle2D.java | 2 ++ .../org/apache/lucene/geo/TestGeoUtils.java | 2 ++ .../org/apache/lucene/geo/TestLine2D.java | 1 + .../org/apache/lucene/geo/TestPoint2D.java | 1 + .../org/apache/lucene/geo/TestPolygon2D.java | 11 ++++---- .../apache/lucene/geo/TestRectangle2D.java | 1 + .../apache/lucene/geo/TestTessellator.java | 3 +- .../org/apache/lucene/geo/TestXYCircle.java | 1 + .../org/apache/lucene/geo/TestXYLine.java | 1 + .../org/apache/lucene/geo/TestXYPoint.java | 1 + .../org/apache/lucene/geo/TestXYPolygon.java | 1 + .../apache/lucene/geo/TestXYRectangle.java | 1 + .../search/TestLatLonDocValuesQueries.java | 2 +- .../lucene/search/TestLatLonPointQueries.java | 2 +- .../lucene/search/TestXYDocValuesQueries.java | 2 +- .../search/TestXYPointDistanceSort.java | 2 +- .../lucene/search/TestXYPointQueries.java | 2 +- .../apache/lucene/util/TestSloppyMath.java | 2 +- .../search/TestLatLonBoundingBoxQueries.java | 2 +- .../lucene/sandbox/search/TestNearest.java | 2 +- .../lucene/spatial3d/TestGeo3DPoint.java | 2 +- .../java/org/apache/lucene/geo/package.html | 26 ------------------ .../{ => tests}/geo/BaseGeoPointTestCase.java | 18 ++++++++---- .../{ => tests}/geo/BaseXYPointTestCase.java | 8 +++++- .../lucene/{ => tests}/geo/EarthDebugger.java | 4 ++- .../lucene/{ => tests}/geo/GeoTestUtil.java | 8 +++++- .../lucene/{ => tests}/geo/ShapeTestUtil.java | 9 +++++- .../apache/lucene/tests/geo/package-info.java | 19 +++++++++++++ .../lucene/{ => tests}/geo/lucene-9251.wkt.gz | Bin .../{ => tests}/geo/lucene-9417.geojson.gz | Bin .../geo/lucene-9538-invalid.geojson.gz | Bin 47 files changed, 109 insertions(+), 68 deletions(-) delete mode 100644 lucene/test-framework/src/java/org/apache/lucene/geo/package.html rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/geo/BaseGeoPointTestCase.java (99%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/geo/BaseXYPointTestCase.java (99%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/geo/EarthDebugger.java (99%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/geo/GeoTestUtil.java (99%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/geo/ShapeTestUtil.java (97%) create mode 100644 lucene/test-framework/src/java/org/apache/lucene/tests/geo/package-info.java rename lucene/test-framework/src/resources/org/apache/lucene/{ => tests}/geo/lucene-9251.wkt.gz (100%) rename lucene/test-framework/src/resources/org/apache/lucene/{ => tests}/geo/lucene-9417.geojson.gz (100%) rename lucene/test-framework/src/resources/org/apache/lucene/{ => tests}/geo/lucene-9538-invalid.geojson.gz (100%) diff --git a/lucene/core/src/java/org/apache/lucene/geo/XYEncodingUtils.java b/lucene/core/src/java/org/apache/lucene/geo/XYEncodingUtils.java index b3dede3c391..113cbb15dfc 100644 --- a/lucene/core/src/java/org/apache/lucene/geo/XYEncodingUtils.java +++ b/lucene/core/src/java/org/apache/lucene/geo/XYEncodingUtils.java @@ -74,7 +74,13 @@ public static float decode(byte[] src, int offset) { return decode(NumericUtils.sortableBytesToInt(src, offset)); } - static double[] floatArrayToDoubleArray(float[] f) { + /** + * Convert an array of {@code float} numbers to {@code double} numbers. + * + * @param f The input floats + * @return Corresponding double array. + */ + public static double[] floatArrayToDoubleArray(float[] f) { double[] d = new double[f.length]; for (int i = 0; i < f.length; i++) { d[i] = f[i]; diff --git a/lucene/core/src/test/org/apache/lucene/document/BaseLatLonPointTestCase.java b/lucene/core/src/test/org/apache/lucene/document/BaseLatLonPointTestCase.java index d886979ec6e..b01dc9a396b 100644 --- a/lucene/core/src/test/org/apache/lucene/document/BaseLatLonPointTestCase.java +++ b/lucene/core/src/test/org/apache/lucene/document/BaseLatLonPointTestCase.java @@ -20,7 +20,6 @@ import java.util.Arrays; import org.apache.lucene.document.ShapeField.QueryRelation; import org.apache.lucene.geo.Circle; -import org.apache.lucene.geo.GeoTestUtil; import org.apache.lucene.geo.Line; import org.apache.lucene.geo.Point; import org.apache.lucene.geo.Polygon; @@ -31,6 +30,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.QueryUtils; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.geo.GeoTestUtil; import org.apache.lucene.util.IOUtils; /** diff --git a/lucene/core/src/test/org/apache/lucene/document/BaseLatLonShapeTestCase.java b/lucene/core/src/test/org/apache/lucene/document/BaseLatLonShapeTestCase.java index 36898a86e39..4b969cc983b 100644 --- a/lucene/core/src/test/org/apache/lucene/document/BaseLatLonShapeTestCase.java +++ b/lucene/core/src/test/org/apache/lucene/document/BaseLatLonShapeTestCase.java @@ -20,7 +20,6 @@ import java.util.Arrays; import org.apache.lucene.document.ShapeField.QueryRelation; import org.apache.lucene.geo.Circle; -import org.apache.lucene.geo.GeoTestUtil; import org.apache.lucene.geo.Line; import org.apache.lucene.geo.Polygon; import org.apache.lucene.geo.Rectangle; @@ -30,6 +29,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.QueryUtils; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.geo.GeoTestUtil; import org.apache.lucene.util.IOUtils; /** diff --git a/lucene/core/src/test/org/apache/lucene/document/BaseLatLonSpatialTestCase.java b/lucene/core/src/test/org/apache/lucene/document/BaseLatLonSpatialTestCase.java index 4cf9e4fb129..e93541ba386 100644 --- a/lucene/core/src/test/org/apache/lucene/document/BaseLatLonSpatialTestCase.java +++ b/lucene/core/src/test/org/apache/lucene/document/BaseLatLonSpatialTestCase.java @@ -22,15 +22,14 @@ import static org.apache.lucene.geo.GeoEncodingUtils.encodeLatitudeCeil; import static org.apache.lucene.geo.GeoEncodingUtils.encodeLongitude; import static org.apache.lucene.geo.GeoEncodingUtils.encodeLongitudeCeil; -import static org.apache.lucene.geo.GeoTestUtil.nextLatitude; -import static org.apache.lucene.geo.GeoTestUtil.nextLongitude; +import static org.apache.lucene.tests.geo.GeoTestUtil.nextLatitude; +import static org.apache.lucene.tests.geo.GeoTestUtil.nextLongitude; import com.carrotsearch.randomizedtesting.generators.RandomPicks; import java.util.Arrays; import org.apache.lucene.document.ShapeField.QueryRelation; import org.apache.lucene.geo.Circle; import org.apache.lucene.geo.Component2D; -import org.apache.lucene.geo.GeoTestUtil; import org.apache.lucene.geo.GeoUtils; import org.apache.lucene.geo.LatLonGeometry; import org.apache.lucene.geo.Line; @@ -39,6 +38,7 @@ import org.apache.lucene.geo.Rectangle; import org.apache.lucene.geo.Tessellator; import org.apache.lucene.search.Query; +import org.apache.lucene.tests.geo.GeoTestUtil; import org.apache.lucene.tests.util.TestUtil; /** Base test case for testing geospatial indexing and search functionality * */ diff --git a/lucene/core/src/test/org/apache/lucene/document/BaseXYShapeTestCase.java b/lucene/core/src/test/org/apache/lucene/document/BaseXYShapeTestCase.java index 30c4411cdb7..dfe29753d2b 100644 --- a/lucene/core/src/test/org/apache/lucene/document/BaseXYShapeTestCase.java +++ b/lucene/core/src/test/org/apache/lucene/document/BaseXYShapeTestCase.java @@ -24,7 +24,6 @@ import java.util.Random; import org.apache.lucene.document.ShapeField.QueryRelation; import org.apache.lucene.geo.Component2D; -import org.apache.lucene.geo.ShapeTestUtil; import org.apache.lucene.geo.Tessellator; import org.apache.lucene.geo.XYCircle; import org.apache.lucene.geo.XYGeometry; @@ -33,6 +32,7 @@ import org.apache.lucene.geo.XYPolygon; import org.apache.lucene.geo.XYRectangle; import org.apache.lucene.search.Query; +import org.apache.lucene.tests.geo.ShapeTestUtil; import org.apache.lucene.tests.util.TestUtil; /** Base test case for testing indexing and search functionality of cartesian geometry * */ diff --git a/lucene/core/src/test/org/apache/lucene/document/TestLatLonLineShapeQueries.java b/lucene/core/src/test/org/apache/lucene/document/TestLatLonLineShapeQueries.java index 942ac06fe83..9b96f1280ca 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestLatLonLineShapeQueries.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestLatLonLineShapeQueries.java @@ -19,8 +19,8 @@ import com.carrotsearch.randomizedtesting.generators.RandomNumbers; import org.apache.lucene.document.ShapeField.QueryRelation; import org.apache.lucene.geo.Component2D; -import org.apache.lucene.geo.GeoTestUtil; import org.apache.lucene.geo.Line; +import org.apache.lucene.tests.geo.GeoTestUtil; /** random bounding box, line, and polygon query tests for random generated {@link Line} types */ @SuppressWarnings("SimpleText") diff --git a/lucene/core/src/test/org/apache/lucene/document/TestLatLonPointDistanceSort.java b/lucene/core/src/test/org/apache/lucene/document/TestLatLonPointDistanceSort.java index 1bc33e64771..9bb43c3d3c5 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestLatLonPointDistanceSort.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestLatLonPointDistanceSort.java @@ -23,7 +23,6 @@ import java.io.IOException; import java.util.Arrays; -import org.apache.lucene.geo.GeoTestUtil; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.RandomIndexWriter; @@ -35,6 +34,7 @@ import org.apache.lucene.search.SortField; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.geo.GeoTestUtil; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.SloppyMath; diff --git a/lucene/core/src/test/org/apache/lucene/document/TestLatLonPointShapeQueries.java b/lucene/core/src/test/org/apache/lucene/document/TestLatLonPointShapeQueries.java index 1c37875ca91..76ee5e834c4 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestLatLonPointShapeQueries.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestLatLonPointShapeQueries.java @@ -19,9 +19,9 @@ import com.carrotsearch.randomizedtesting.generators.RandomNumbers; import org.apache.lucene.document.ShapeField.QueryRelation; import org.apache.lucene.geo.Component2D; -import org.apache.lucene.geo.GeoTestUtil; import org.apache.lucene.geo.Line; import org.apache.lucene.geo.Point; +import org.apache.lucene.tests.geo.GeoTestUtil; /** * random bounding box, line, and polygon query tests for random generated {@code latitude, diff --git a/lucene/core/src/test/org/apache/lucene/document/TestLatLonShape.java b/lucene/core/src/test/org/apache/lucene/document/TestLatLonShape.java index d867084be73..98207971f95 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestLatLonShape.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestLatLonShape.java @@ -26,7 +26,6 @@ import org.apache.lucene.geo.Circle; import org.apache.lucene.geo.Component2D; import org.apache.lucene.geo.GeoEncodingUtils; -import org.apache.lucene.geo.GeoTestUtil; import org.apache.lucene.geo.GeoUtils; import org.apache.lucene.geo.LatLonGeometry; import org.apache.lucene.geo.Line; @@ -44,6 +43,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.geo.GeoTestUtil; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; diff --git a/lucene/core/src/test/org/apache/lucene/document/TestLatLonShapeEncoding.java b/lucene/core/src/test/org/apache/lucene/document/TestLatLonShapeEncoding.java index ab8973e98b7..68618b134b8 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestLatLonShapeEncoding.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestLatLonShapeEncoding.java @@ -18,9 +18,9 @@ import org.apache.lucene.geo.Component2D; import org.apache.lucene.geo.GeoEncodingUtils; -import org.apache.lucene.geo.GeoTestUtil; import org.apache.lucene.geo.LatLonGeometry; import org.apache.lucene.geo.Polygon; +import org.apache.lucene.tests.geo.GeoTestUtil; /** Test case for LatLonShape encoding */ public class TestLatLonShapeEncoding extends BaseShapeEncodingTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/document/TestXYLineShapeQueries.java b/lucene/core/src/test/org/apache/lucene/document/TestXYLineShapeQueries.java index 7338be27cf5..b81787d6f64 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestXYLineShapeQueries.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestXYLineShapeQueries.java @@ -20,8 +20,8 @@ import java.util.Random; import org.apache.lucene.document.ShapeField.QueryRelation; import org.apache.lucene.geo.Component2D; -import org.apache.lucene.geo.ShapeTestUtil; import org.apache.lucene.geo.XYLine; +import org.apache.lucene.tests.geo.ShapeTestUtil; /** * random cartesian bounding box, line, and polygon query tests for random generated cartesian diff --git a/lucene/core/src/test/org/apache/lucene/document/TestXYMultiPointShapeQueries.java b/lucene/core/src/test/org/apache/lucene/document/TestXYMultiPointShapeQueries.java index dbf5e7287ac..fdbbf826286 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestXYMultiPointShapeQueries.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestXYMultiPointShapeQueries.java @@ -20,8 +20,8 @@ import java.util.List; import org.apache.lucene.document.ShapeField.QueryRelation; import org.apache.lucene.geo.Component2D; -import org.apache.lucene.geo.ShapeTestUtil; import org.apache.lucene.geo.XYPoint; +import org.apache.lucene.tests.geo.ShapeTestUtil; /** * random cartesian bounding box, line, and polygon query tests for random indexed arrays of {@code diff --git a/lucene/core/src/test/org/apache/lucene/document/TestXYPointShapeQueries.java b/lucene/core/src/test/org/apache/lucene/document/TestXYPointShapeQueries.java index 519f83e2567..29e7b75dada 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestXYPointShapeQueries.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestXYPointShapeQueries.java @@ -20,9 +20,9 @@ import java.util.Random; import org.apache.lucene.document.ShapeField.QueryRelation; import org.apache.lucene.geo.Component2D; -import org.apache.lucene.geo.ShapeTestUtil; import org.apache.lucene.geo.XYLine; import org.apache.lucene.geo.XYPoint; +import org.apache.lucene.tests.geo.ShapeTestUtil; /** * random cartesian bounding box, line, and polygon query tests for random generated {@code x, y} diff --git a/lucene/core/src/test/org/apache/lucene/document/TestXYShape.java b/lucene/core/src/test/org/apache/lucene/document/TestXYShape.java index 7a4f6bbb2f3..7607c75ee8a 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestXYShape.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestXYShape.java @@ -19,7 +19,6 @@ import java.util.Random; import org.apache.lucene.document.ShapeField.QueryRelation; import org.apache.lucene.geo.Component2D; -import org.apache.lucene.geo.ShapeTestUtil; import org.apache.lucene.geo.Tessellator; import org.apache.lucene.geo.XYCircle; import org.apache.lucene.geo.XYGeometry; @@ -33,6 +32,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.geo.ShapeTestUtil; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; diff --git a/lucene/core/src/test/org/apache/lucene/document/TestXYShapeEncoding.java b/lucene/core/src/test/org/apache/lucene/document/TestXYShapeEncoding.java index ca4e4b6ca79..5b89eab2283 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestXYShapeEncoding.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestXYShapeEncoding.java @@ -17,10 +17,10 @@ package org.apache.lucene.document; import org.apache.lucene.geo.Component2D; -import org.apache.lucene.geo.ShapeTestUtil; import org.apache.lucene.geo.XYEncodingUtils; import org.apache.lucene.geo.XYGeometry; import org.apache.lucene.geo.XYPolygon; +import org.apache.lucene.tests.geo.ShapeTestUtil; /** tests XYShape encoding */ public class TestXYShapeEncoding extends BaseShapeEncodingTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/geo/TestCircle.java b/lucene/core/src/test/org/apache/lucene/geo/TestCircle.java index 16098fca1a8..f7329338d57 100644 --- a/lucene/core/src/test/org/apache/lucene/geo/TestCircle.java +++ b/lucene/core/src/test/org/apache/lucene/geo/TestCircle.java @@ -16,6 +16,7 @@ */ package org.apache.lucene.geo; +import org.apache.lucene.tests.geo.GeoTestUtil; import org.apache.lucene.tests.util.LuceneTestCase; public class TestCircle extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/geo/TestCircle2D.java b/lucene/core/src/test/org/apache/lucene/geo/TestCircle2D.java index 22b39026121..394a3fcb3d1 100644 --- a/lucene/core/src/test/org/apache/lucene/geo/TestCircle2D.java +++ b/lucene/core/src/test/org/apache/lucene/geo/TestCircle2D.java @@ -18,6 +18,8 @@ package org.apache.lucene.geo; import org.apache.lucene.index.PointValues; +import org.apache.lucene.tests.geo.GeoTestUtil; +import org.apache.lucene.tests.geo.ShapeTestUtil; import org.apache.lucene.tests.util.LuceneTestCase; public class TestCircle2D extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/geo/TestGeoUtils.java b/lucene/core/src/test/org/apache/lucene/geo/TestGeoUtils.java index 56e9e04a8c0..3d96108d6b6 100644 --- a/lucene/core/src/test/org/apache/lucene/geo/TestGeoUtils.java +++ b/lucene/core/src/test/org/apache/lucene/geo/TestGeoUtils.java @@ -18,6 +18,8 @@ import java.util.Locale; import java.util.Random; +import org.apache.lucene.tests.geo.EarthDebugger; +import org.apache.lucene.tests.geo.GeoTestUtil; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.SloppyMath; diff --git a/lucene/core/src/test/org/apache/lucene/geo/TestLine2D.java b/lucene/core/src/test/org/apache/lucene/geo/TestLine2D.java index 570a5216f56..46c383ace50 100644 --- a/lucene/core/src/test/org/apache/lucene/geo/TestLine2D.java +++ b/lucene/core/src/test/org/apache/lucene/geo/TestLine2D.java @@ -18,6 +18,7 @@ package org.apache.lucene.geo; import org.apache.lucene.index.PointValues.Relation; +import org.apache.lucene.tests.geo.GeoTestUtil; import org.apache.lucene.tests.util.LuceneTestCase; public class TestLine2D extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/geo/TestPoint2D.java b/lucene/core/src/test/org/apache/lucene/geo/TestPoint2D.java index b1030fffcd3..1413e682a8e 100644 --- a/lucene/core/src/test/org/apache/lucene/geo/TestPoint2D.java +++ b/lucene/core/src/test/org/apache/lucene/geo/TestPoint2D.java @@ -18,6 +18,7 @@ package org.apache.lucene.geo; import org.apache.lucene.index.PointValues.Relation; +import org.apache.lucene.tests.geo.GeoTestUtil; import org.apache.lucene.tests.util.LuceneTestCase; public class TestPoint2D extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/geo/TestPolygon2D.java b/lucene/core/src/test/org/apache/lucene/geo/TestPolygon2D.java index 9d36d8a6175..1660cd69dcd 100644 --- a/lucene/core/src/test/org/apache/lucene/geo/TestPolygon2D.java +++ b/lucene/core/src/test/org/apache/lucene/geo/TestPolygon2D.java @@ -16,14 +16,15 @@ */ package org.apache.lucene.geo; -import static org.apache.lucene.geo.GeoTestUtil.createRegularPolygon; -import static org.apache.lucene.geo.GeoTestUtil.nextLatitude; -import static org.apache.lucene.geo.GeoTestUtil.nextLongitude; -import static org.apache.lucene.geo.GeoTestUtil.nextPointNear; -import static org.apache.lucene.geo.GeoTestUtil.nextPolygon; +import static org.apache.lucene.tests.geo.GeoTestUtil.createRegularPolygon; +import static org.apache.lucene.tests.geo.GeoTestUtil.nextLatitude; +import static org.apache.lucene.tests.geo.GeoTestUtil.nextLongitude; +import static org.apache.lucene.tests.geo.GeoTestUtil.nextPointNear; +import static org.apache.lucene.tests.geo.GeoTestUtil.nextPolygon; import com.carrotsearch.randomizedtesting.generators.RandomNumbers; import org.apache.lucene.index.PointValues.Relation; +import org.apache.lucene.tests.geo.GeoTestUtil; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/geo/TestRectangle2D.java b/lucene/core/src/test/org/apache/lucene/geo/TestRectangle2D.java index c5907039892..0d19d2b5027 100644 --- a/lucene/core/src/test/org/apache/lucene/geo/TestRectangle2D.java +++ b/lucene/core/src/test/org/apache/lucene/geo/TestRectangle2D.java @@ -19,6 +19,7 @@ import java.util.Random; import org.apache.lucene.index.PointValues; +import org.apache.lucene.tests.geo.ShapeTestUtil; import org.apache.lucene.tests.util.LuceneTestCase; public class TestRectangle2D extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/geo/TestTessellator.java b/lucene/core/src/test/org/apache/lucene/geo/TestTessellator.java index b3c0d1cc461..7162814ada2 100644 --- a/lucene/core/src/test/org/apache/lucene/geo/TestTessellator.java +++ b/lucene/core/src/test/org/apache/lucene/geo/TestTessellator.java @@ -16,10 +16,11 @@ */ package org.apache.lucene.geo; -import static org.apache.lucene.geo.GeoTestUtil.nextBoxNotCrossingDateline; +import static org.apache.lucene.tests.geo.GeoTestUtil.nextBoxNotCrossingDateline; import java.text.ParseException; import java.util.List; +import org.apache.lucene.tests.geo.GeoTestUtil; import org.apache.lucene.tests.util.LuceneTestCase; /** Test case for the Polygon {@link Tessellator} class */ diff --git a/lucene/core/src/test/org/apache/lucene/geo/TestXYCircle.java b/lucene/core/src/test/org/apache/lucene/geo/TestXYCircle.java index ab61af4ffa0..21aae005cbb 100644 --- a/lucene/core/src/test/org/apache/lucene/geo/TestXYCircle.java +++ b/lucene/core/src/test/org/apache/lucene/geo/TestXYCircle.java @@ -16,6 +16,7 @@ */ package org.apache.lucene.geo; +import org.apache.lucene.tests.geo.ShapeTestUtil; import org.apache.lucene.tests.util.LuceneTestCase; public class TestXYCircle extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/geo/TestXYLine.java b/lucene/core/src/test/org/apache/lucene/geo/TestXYLine.java index 6eac9e57b04..b3c7c602ec9 100644 --- a/lucene/core/src/test/org/apache/lucene/geo/TestXYLine.java +++ b/lucene/core/src/test/org/apache/lucene/geo/TestXYLine.java @@ -17,6 +17,7 @@ package org.apache.lucene.geo; import java.util.Arrays; +import org.apache.lucene.tests.geo.ShapeTestUtil; import org.apache.lucene.tests.util.LuceneTestCase; public class TestXYLine extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/geo/TestXYPoint.java b/lucene/core/src/test/org/apache/lucene/geo/TestXYPoint.java index 1f50164fed5..08794a4a59d 100644 --- a/lucene/core/src/test/org/apache/lucene/geo/TestXYPoint.java +++ b/lucene/core/src/test/org/apache/lucene/geo/TestXYPoint.java @@ -16,6 +16,7 @@ */ package org.apache.lucene.geo; +import org.apache.lucene.tests.geo.ShapeTestUtil; import org.apache.lucene.tests.util.LuceneTestCase; public class TestXYPoint extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/geo/TestXYPolygon.java b/lucene/core/src/test/org/apache/lucene/geo/TestXYPolygon.java index 671a8913d20..0f6f668d02a 100644 --- a/lucene/core/src/test/org/apache/lucene/geo/TestXYPolygon.java +++ b/lucene/core/src/test/org/apache/lucene/geo/TestXYPolygon.java @@ -17,6 +17,7 @@ package org.apache.lucene.geo; import java.util.Arrays; +import org.apache.lucene.tests.geo.ShapeTestUtil; import org.apache.lucene.tests.util.LuceneTestCase; public class TestXYPolygon extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/geo/TestXYRectangle.java b/lucene/core/src/test/org/apache/lucene/geo/TestXYRectangle.java index 8f33bdb9a18..edaecba14d9 100644 --- a/lucene/core/src/test/org/apache/lucene/geo/TestXYRectangle.java +++ b/lucene/core/src/test/org/apache/lucene/geo/TestXYRectangle.java @@ -16,6 +16,7 @@ */ package org.apache.lucene.geo; +import org.apache.lucene.tests.geo.ShapeTestUtil; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestLatLonDocValuesQueries.java b/lucene/core/src/test/org/apache/lucene/search/TestLatLonDocValuesQueries.java index 2d3e6b2e10f..3e88aeb986c 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestLatLonDocValuesQueries.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestLatLonDocValuesQueries.java @@ -19,10 +19,10 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.LatLonDocValuesField; import org.apache.lucene.document.ShapeField; -import org.apache.lucene.geo.BaseGeoPointTestCase; import org.apache.lucene.geo.GeoEncodingUtils; import org.apache.lucene.geo.LatLonGeometry; import org.apache.lucene.geo.Polygon; +import org.apache.lucene.tests.geo.BaseGeoPointTestCase; public class TestLatLonDocValuesQueries extends BaseGeoPointTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestLatLonPointQueries.java b/lucene/core/src/test/org/apache/lucene/search/TestLatLonPointQueries.java index c2cea11f40f..b6f78727994 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestLatLonPointQueries.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestLatLonPointQueries.java @@ -20,7 +20,6 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.LatLonPoint; import org.apache.lucene.document.ShapeField; -import org.apache.lucene.geo.BaseGeoPointTestCase; import org.apache.lucene.geo.GeoEncodingUtils; import org.apache.lucene.geo.LatLonGeometry; import org.apache.lucene.geo.Polygon; @@ -28,6 +27,7 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.geo.BaseGeoPointTestCase; import org.apache.lucene.util.bkd.BKDConfig; public class TestLatLonPointQueries extends BaseGeoPointTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestXYDocValuesQueries.java b/lucene/core/src/test/org/apache/lucene/search/TestXYDocValuesQueries.java index 8a7c8f75a26..3e1a7bc9266 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestXYDocValuesQueries.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestXYDocValuesQueries.java @@ -18,9 +18,9 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.XYDocValuesField; -import org.apache.lucene.geo.BaseXYPointTestCase; import org.apache.lucene.geo.XYGeometry; import org.apache.lucene.geo.XYPolygon; +import org.apache.lucene.tests.geo.BaseXYPointTestCase; public class TestXYDocValuesQueries extends BaseXYPointTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestXYPointDistanceSort.java b/lucene/core/src/test/org/apache/lucene/search/TestXYPointDistanceSort.java index 462451053bb..37d359b9f2e 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestXYPointDistanceSort.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestXYPointDistanceSort.java @@ -22,12 +22,12 @@ import org.apache.lucene.document.NumericDocValuesField; import org.apache.lucene.document.StoredField; import org.apache.lucene.document.XYDocValuesField; -import org.apache.lucene.geo.ShapeTestUtil; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.SerialMergeScheduler; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.geo.ShapeTestUtil; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestXYPointQueries.java b/lucene/core/src/test/org/apache/lucene/search/TestXYPointQueries.java index 6337a895e4c..ef428d60338 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestXYPointQueries.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestXYPointQueries.java @@ -18,9 +18,9 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.XYPointField; -import org.apache.lucene.geo.BaseXYPointTestCase; import org.apache.lucene.geo.XYGeometry; import org.apache.lucene.geo.XYPolygon; +import org.apache.lucene.tests.geo.BaseXYPointTestCase; public class TestXYPointQueries extends BaseXYPointTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestSloppyMath.java b/lucene/core/src/test/org/apache/lucene/util/TestSloppyMath.java index a06d278953e..18c128aeff7 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestSloppyMath.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestSloppyMath.java @@ -22,7 +22,7 @@ import static org.apache.lucene.util.SloppyMath.haversinSortKey; import java.util.Random; -import org.apache.lucene.geo.GeoTestUtil; +import org.apache.lucene.tests.geo.GeoTestUtil; import org.apache.lucene.tests.util.LuceneTestCase; public class TestSloppyMath extends LuceneTestCase { diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestLatLonBoundingBoxQueries.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestLatLonBoundingBoxQueries.java index d66bbd95b32..c800fdf4544 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestLatLonBoundingBoxQueries.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestLatLonBoundingBoxQueries.java @@ -22,7 +22,6 @@ import static org.apache.lucene.geo.GeoEncodingUtils.encodeLongitude; import org.apache.lucene.document.Document; -import org.apache.lucene.geo.GeoTestUtil; import org.apache.lucene.geo.Rectangle; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; @@ -31,6 +30,7 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.geo.GeoTestUtil; /** Random testing for GeoBoundingBoxField type. */ public class TestLatLonBoundingBoxQueries extends BaseRangeFieldQueryTestCase { diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestNearest.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestNearest.java index 5a00acc5ebe..ea746364e54 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestNearest.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestNearest.java @@ -25,7 +25,6 @@ import org.apache.lucene.document.StoredField; import org.apache.lucene.document.StringField; import org.apache.lucene.geo.GeoEncodingUtils; -import org.apache.lucene.geo.GeoTestUtil; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; @@ -39,6 +38,7 @@ import org.apache.lucene.search.Sort; import org.apache.lucene.search.TopFieldDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.geo.GeoTestUtil; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.SloppyMath; diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/TestGeo3DPoint.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/TestGeo3DPoint.java index a7eec967c9a..80d0ed82149 100644 --- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/TestGeo3DPoint.java +++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/TestGeo3DPoint.java @@ -37,7 +37,6 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.NumericDocValuesField; -import org.apache.lucene.geo.GeoTestUtil; import org.apache.lucene.geo.Polygon; import org.apache.lucene.geo.Rectangle; import org.apache.lucene.index.DirectoryReader; @@ -75,6 +74,7 @@ import org.apache.lucene.spatial3d.geom.XYZSolid; import org.apache.lucene.spatial3d.geom.XYZSolidFactory; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.geo.GeoTestUtil; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.DocIdSetBuilder; diff --git a/lucene/test-framework/src/java/org/apache/lucene/geo/package.html b/lucene/test-framework/src/java/org/apache/lucene/geo/package.html deleted file mode 100644 index 874d1a581d0..00000000000 --- a/lucene/test-framework/src/java/org/apache/lucene/geo/package.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - -Reusable Geo test utilities. - - diff --git a/lucene/test-framework/src/java/org/apache/lucene/geo/BaseGeoPointTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/geo/BaseGeoPointTestCase.java similarity index 99% rename from lucene/test-framework/src/java/org/apache/lucene/geo/BaseGeoPointTestCase.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/geo/BaseGeoPointTestCase.java index 611409253e9..5213c12607e 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/geo/BaseGeoPointTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/geo/BaseGeoPointTestCase.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.geo; +package org.apache.lucene.tests.geo; import java.io.IOException; import java.text.DecimalFormat; @@ -38,6 +38,12 @@ import org.apache.lucene.document.NumericDocValuesField; import org.apache.lucene.document.StoredField; import org.apache.lucene.document.StringField; +import org.apache.lucene.geo.Circle; +import org.apache.lucene.geo.Component2D; +import org.apache.lucene.geo.GeoUtils; +import org.apache.lucene.geo.LatLonGeometry; +import org.apache.lucene.geo.Polygon; +import org.apache.lucene.geo.Rectangle; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; @@ -83,23 +89,23 @@ public abstract class BaseGeoPointTestCase extends LuceneTestCase { // TODO: remove these hooks once all subclasses can pass with new random! protected double nextLongitude() { - return org.apache.lucene.geo.GeoTestUtil.nextLongitude(); + return GeoTestUtil.nextLongitude(); } protected double nextLatitude() { - return org.apache.lucene.geo.GeoTestUtil.nextLatitude(); + return GeoTestUtil.nextLatitude(); } protected Rectangle nextBox() { - return org.apache.lucene.geo.GeoTestUtil.nextBox(); + return GeoTestUtil.nextBox(); } protected Circle nextCircle() { - return org.apache.lucene.geo.GeoTestUtil.nextCircle(); + return GeoTestUtil.nextCircle(); } protected Polygon nextPolygon() { - return org.apache.lucene.geo.GeoTestUtil.nextPolygon(); + return GeoTestUtil.nextPolygon(); } protected LatLonGeometry[] nextGeometry() { diff --git a/lucene/test-framework/src/java/org/apache/lucene/geo/BaseXYPointTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/geo/BaseXYPointTestCase.java similarity index 99% rename from lucene/test-framework/src/java/org/apache/lucene/geo/BaseXYPointTestCase.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/geo/BaseXYPointTestCase.java index 81a3689254b..84698530082 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/geo/BaseXYPointTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/geo/BaseXYPointTestCase.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.geo; +package org.apache.lucene.tests.geo; import java.io.IOException; import java.text.DecimalFormat; @@ -38,6 +38,12 @@ import org.apache.lucene.document.NumericDocValuesField; import org.apache.lucene.document.StoredField; import org.apache.lucene.document.StringField; +import org.apache.lucene.geo.Component2D; +import org.apache.lucene.geo.XYCircle; +import org.apache.lucene.geo.XYGeometry; +import org.apache.lucene.geo.XYPoint; +import org.apache.lucene.geo.XYPolygon; +import org.apache.lucene.geo.XYRectangle; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; diff --git a/lucene/test-framework/src/java/org/apache/lucene/geo/EarthDebugger.java b/lucene/test-framework/src/java/org/apache/lucene/tests/geo/EarthDebugger.java similarity index 99% rename from lucene/test-framework/src/java/org/apache/lucene/geo/EarthDebugger.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/geo/EarthDebugger.java index 4bd06e1e29d..d95979502ad 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/geo/EarthDebugger.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/geo/EarthDebugger.java @@ -15,8 +15,10 @@ * limitations under the License. */ -package org.apache.lucene.geo; +package org.apache.lucene.tests.geo; +import org.apache.lucene.geo.Polygon; +import org.apache.lucene.geo.Rectangle; import org.apache.lucene.util.SloppyMath; /** diff --git a/lucene/test-framework/src/java/org/apache/lucene/geo/GeoTestUtil.java b/lucene/test-framework/src/java/org/apache/lucene/tests/geo/GeoTestUtil.java similarity index 99% rename from lucene/test-framework/src/java/org/apache/lucene/geo/GeoTestUtil.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/geo/GeoTestUtil.java index 3500d2bb68a..165f6288be4 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/geo/GeoTestUtil.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/geo/GeoTestUtil.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.geo; +package org.apache.lucene.tests.geo; import com.carrotsearch.randomizedtesting.RandomizedContext; import java.io.BufferedReader; @@ -28,6 +28,12 @@ import java.util.List; import java.util.Random; import java.util.zip.GZIPInputStream; +import org.apache.lucene.geo.Circle; +import org.apache.lucene.geo.GeoUtils; +import org.apache.lucene.geo.Line; +import org.apache.lucene.geo.Point; +import org.apache.lucene.geo.Polygon; +import org.apache.lucene.geo.Rectangle; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.NumericUtils; import org.apache.lucene.util.SloppyMath; diff --git a/lucene/test-framework/src/java/org/apache/lucene/geo/ShapeTestUtil.java b/lucene/test-framework/src/java/org/apache/lucene/tests/geo/ShapeTestUtil.java similarity index 97% rename from lucene/test-framework/src/java/org/apache/lucene/geo/ShapeTestUtil.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/geo/ShapeTestUtil.java index ff2d18358d6..e0e8c6964fc 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/geo/ShapeTestUtil.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/geo/ShapeTestUtil.java @@ -14,12 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.geo; +package org.apache.lucene.tests.geo; import com.carrotsearch.randomizedtesting.RandomizedContext; import com.carrotsearch.randomizedtesting.generators.BiasedNumbers; import java.util.ArrayList; import java.util.Random; +import org.apache.lucene.geo.GeoUtils; +import org.apache.lucene.geo.XYCircle; +import org.apache.lucene.geo.XYEncodingUtils; +import org.apache.lucene.geo.XYLine; +import org.apache.lucene.geo.XYPoint; +import org.apache.lucene.geo.XYPolygon; +import org.apache.lucene.geo.XYRectangle; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/geo/package-info.java b/lucene/test-framework/src/java/org/apache/lucene/tests/geo/package-info.java new file mode 100644 index 00000000000..a57eee43c5c --- /dev/null +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/geo/package-info.java @@ -0,0 +1,19 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** Reusable geo test utilities. */ +package org.apache.lucene.tests.geo; diff --git a/lucene/test-framework/src/resources/org/apache/lucene/geo/lucene-9251.wkt.gz b/lucene/test-framework/src/resources/org/apache/lucene/tests/geo/lucene-9251.wkt.gz similarity index 100% rename from lucene/test-framework/src/resources/org/apache/lucene/geo/lucene-9251.wkt.gz rename to lucene/test-framework/src/resources/org/apache/lucene/tests/geo/lucene-9251.wkt.gz diff --git a/lucene/test-framework/src/resources/org/apache/lucene/geo/lucene-9417.geojson.gz b/lucene/test-framework/src/resources/org/apache/lucene/tests/geo/lucene-9417.geojson.gz similarity index 100% rename from lucene/test-framework/src/resources/org/apache/lucene/geo/lucene-9417.geojson.gz rename to lucene/test-framework/src/resources/org/apache/lucene/tests/geo/lucene-9417.geojson.gz diff --git a/lucene/test-framework/src/resources/org/apache/lucene/geo/lucene-9538-invalid.geojson.gz b/lucene/test-framework/src/resources/org/apache/lucene/tests/geo/lucene-9538-invalid.geojson.gz similarity index 100% rename from lucene/test-framework/src/resources/org/apache/lucene/geo/lucene-9538-invalid.geojson.gz rename to lucene/test-framework/src/resources/org/apache/lucene/tests/geo/lucene-9538-invalid.geojson.gz From d77735b90077de3794119bedbc4bad320f7b1d25 Mon Sep 17 00:00:00 2001 From: Dawid Weiss Date: Sun, 19 Dec 2021 17:06:01 +0100 Subject: [PATCH 06/32] Moved mockfile -> tests.mockfile --- .../apache/lucene/index/TestIndexWriter.java | 6 +++--- .../index/TestIndexWriterMergePolicy.java | 2 +- .../apache/lucene/index/TestSegmentInfos.java | 2 +- .../apache/lucene/store/TestDirectory.java | 2 +- .../lucene/store/TestFileSwitchDirectory.java | 4 ++-- .../lucene/store/TestNIOFSDirectory.java | 6 +++--- .../lucene/store/TestNativeFSLockFactory.java | 4 ++-- .../org/apache/lucene/util/TestIOUtils.java | 4 ++-- .../org/apache/lucene/util/bkd/TestBKD.java | 2 +- .../TestHardLinkCopyDirectoryWrapper.java | 4 ++-- .../{ => tests}/mockfile/DisableFsyncFS.java | 2 +- .../lucene/{ => tests}/mockfile/ExtrasFS.java | 2 +- .../FilterAsynchronousFileChannel.java | 2 +- .../mockfile/FilterDirectoryStream.java | 2 +- .../mockfile/FilterFileChannel.java | 2 +- .../{ => tests}/mockfile/FilterFileStore.java | 2 +- .../mockfile/FilterFileSystem.java | 2 +- .../mockfile/FilterFileSystemProvider.java | 2 +- .../mockfile/FilterInputStream2.java | 2 +- .../mockfile/FilterOutputStream2.java | 2 +- .../{ => tests}/mockfile/FilterPath.java | 2 +- .../mockfile/FilterSeekableByteChannel.java | 2 +- .../{ => tests}/mockfile/HandleLimitFS.java | 2 +- .../mockfile/HandleTrackingFS.java | 2 +- .../lucene/{ => tests}/mockfile/LeakFS.java | 2 +- .../mockfile/MockFileSystemTestCase.java | 2 +- .../{ => tests}/mockfile/ShuffleFS.java | 2 +- .../{ => tests}/mockfile/VerboseFS.java | 2 +- .../{ => tests}/mockfile/VirusCheckingFS.java | 2 +- .../{ => tests}/mockfile/WindowsFS.java | 2 +- .../{ => tests}/mockfile/package-info.java | 19 ++++++++++--------- .../tests/store/BaseDirectoryTestCase.java | 2 +- .../lucene/tests/util/LuceneTestCase.java | 4 ++-- .../util/TestRuleTemporaryFilesCleanup.java | 14 +++++++------- .../apache/lucene/tests/util/TestUtil.java | 6 +++--- .../mockfile/TestDisableFsyncFS.java | 2 +- .../{ => tests}/mockfile/TestExtrasFS.java | 2 +- .../mockfile/TestHandleLimitFS.java | 2 +- .../mockfile/TestHandleTrackingFS.java | 2 +- .../{ => tests}/mockfile/TestLeakFS.java | 2 +- .../{ => tests}/mockfile/TestShuffleFS.java | 2 +- .../{ => tests}/mockfile/TestVerboseFS.java | 2 +- .../mockfile/TestVirusCheckingFS.java | 2 +- .../{ => tests}/mockfile/TestWindowsFS.java | 2 +- 44 files changed, 70 insertions(+), 69 deletions(-) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/mockfile/DisableFsyncFS.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/mockfile/ExtrasFS.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/mockfile/FilterAsynchronousFileChannel.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/mockfile/FilterDirectoryStream.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/mockfile/FilterFileChannel.java (99%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/mockfile/FilterFileStore.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/mockfile/FilterFileSystem.java (99%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/mockfile/FilterFileSystemProvider.java (99%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/mockfile/FilterInputStream2.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/mockfile/FilterOutputStream2.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/mockfile/FilterPath.java (99%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/mockfile/FilterSeekableByteChannel.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/mockfile/HandleLimitFS.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/mockfile/HandleTrackingFS.java (99%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/mockfile/LeakFS.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/mockfile/MockFileSystemTestCase.java (99%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/mockfile/ShuffleFS.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/mockfile/VerboseFS.java (99%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/mockfile/VirusCheckingFS.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/mockfile/WindowsFS.java (99%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/mockfile/package-info.java (57%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/mockfile/TestDisableFsyncFS.java (97%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/mockfile/TestExtrasFS.java (98%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/mockfile/TestHandleLimitFS.java (98%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/mockfile/TestHandleTrackingFS.java (98%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/mockfile/TestLeakFS.java (99%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/mockfile/TestShuffleFS.java (99%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/mockfile/TestVerboseFS.java (99%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/mockfile/TestVirusCheckingFS.java (98%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/mockfile/TestWindowsFS.java (99%) diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java index d23b09d968d..8799de7cea9 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java @@ -75,9 +75,6 @@ import org.apache.lucene.document.StringField; import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexWriterConfig.OpenMode; -import org.apache.lucene.mockfile.ExtrasFS; -import org.apache.lucene.mockfile.FilterPath; -import org.apache.lucene.mockfile.WindowsFS; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchAllDocsQuery; @@ -100,6 +97,9 @@ import org.apache.lucene.store.NIOFSDirectory; import org.apache.lucene.store.NoLockFactory; import org.apache.lucene.store.SimpleFSLockFactory; +import org.apache.lucene.tests.mockfile.ExtrasFS; +import org.apache.lucene.tests.mockfile.FilterPath; +import org.apache.lucene.tests.mockfile.WindowsFS; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java index 5352c012dd2..134f373604e 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java @@ -28,11 +28,11 @@ import org.apache.lucene.document.NumericDocValuesField; import org.apache.lucene.document.StringField; import org.apache.lucene.index.IndexWriterConfig.OpenMode; -import org.apache.lucene.mockfile.HandleLimitFS; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.mockfile.HandleLimitFS; import org.apache.lucene.tests.util.LuceneTestCase; @HandleLimitFS.MaxOpenHandles(limit = HandleLimitFS.MaxOpenHandles.MAX_OPEN_FILES * 2) diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSegmentInfos.java b/lucene/core/src/test/org/apache/lucene/index/TestSegmentInfos.java index d1621c186ac..87369a770a4 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSegmentInfos.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSegmentInfos.java @@ -23,12 +23,12 @@ import java.util.Map; import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.CodecUtil; -import org.apache.lucene.mockfile.ExtrasFS; import org.apache.lucene.search.Sort; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.tests.mockfile.ExtrasFS; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/store/TestDirectory.java b/lucene/core/src/test/org/apache/lucene/store/TestDirectory.java index b81872dd33b..eef3d70340d 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestDirectory.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestDirectory.java @@ -25,7 +25,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.lucene.mockfile.ExtrasFS; +import org.apache.lucene.tests.mockfile.ExtrasFS; import org.apache.lucene.tests.util.LuceneTestCase; public class TestDirectory extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java b/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java index e718d4b4040..3c12277d8f7 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java @@ -34,8 +34,8 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.TestIndexWriterReader; -import org.apache.lucene.mockfile.FilterPath; -import org.apache.lucene.mockfile.WindowsFS; +import org.apache.lucene.tests.mockfile.FilterPath; +import org.apache.lucene.tests.mockfile.WindowsFS; import org.apache.lucene.tests.store.BaseDirectoryTestCase; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/store/TestNIOFSDirectory.java b/lucene/core/src/test/org/apache/lucene/store/TestNIOFSDirectory.java index 8a093f14667..01c79c1a4eb 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestNIOFSDirectory.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestNIOFSDirectory.java @@ -24,9 +24,9 @@ import java.nio.file.Path; import java.nio.file.attribute.FileAttribute; import java.util.Set; -import org.apache.lucene.mockfile.FilterFileChannel; -import org.apache.lucene.mockfile.FilterPath; -import org.apache.lucene.mockfile.LeakFS; +import org.apache.lucene.tests.mockfile.FilterFileChannel; +import org.apache.lucene.tests.mockfile.FilterPath; +import org.apache.lucene.tests.mockfile.LeakFS; import org.apache.lucene.tests.store.BaseDirectoryTestCase; /** Tests NIOFSDirectory */ diff --git a/lucene/core/src/test/org/apache/lucene/store/TestNativeFSLockFactory.java b/lucene/core/src/test/org/apache/lucene/store/TestNativeFSLockFactory.java index 2b52ad4ad40..0c87b5a0a0d 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestNativeFSLockFactory.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestNativeFSLockFactory.java @@ -25,8 +25,8 @@ import java.nio.file.Path; import java.nio.file.attribute.FileAttribute; import java.util.Set; -import org.apache.lucene.mockfile.FilterFileSystemProvider; -import org.apache.lucene.mockfile.FilterPath; +import org.apache.lucene.tests.mockfile.FilterFileSystemProvider; +import org.apache.lucene.tests.mockfile.FilterPath; import org.apache.lucene.tests.store.BaseLockFactoryTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestIOUtils.java b/lucene/core/src/test/org/apache/lucene/util/TestIOUtils.java index f0e4a564ccd..288e25523f1 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestIOUtils.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestIOUtils.java @@ -32,8 +32,8 @@ import java.util.Arrays; import java.util.Objects; import java.util.Set; -import org.apache.lucene.mockfile.FilterFileSystemProvider; -import org.apache.lucene.mockfile.FilterPath; +import org.apache.lucene.tests.mockfile.FilterFileSystemProvider; +import org.apache.lucene.tests.mockfile.FilterPath; import org.apache.lucene.tests.util.LuceneTestCase; /** Simple test methods for IOUtils */ diff --git a/lucene/core/src/test/org/apache/lucene/util/bkd/TestBKD.java b/lucene/core/src/test/org/apache/lucene/util/bkd/TestBKD.java index 6ac3a29e496..d187f5e9fd0 100644 --- a/lucene/core/src/test/org/apache/lucene/util/bkd/TestBKD.java +++ b/lucene/core/src/test/org/apache/lucene/util/bkd/TestBKD.java @@ -29,13 +29,13 @@ import org.apache.lucene.index.PointValues; import org.apache.lucene.index.PointValues.IntersectVisitor; import org.apache.lucene.index.PointValues.Relation; -import org.apache.lucene.mockfile.ExtrasFS; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FilterDirectory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.tests.mockfile.ExtrasFS; import org.apache.lucene.tests.store.CorruptingIndexOutput; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/misc/src/test/org/apache/lucene/misc/store/TestHardLinkCopyDirectoryWrapper.java b/lucene/misc/src/test/org/apache/lucene/misc/store/TestHardLinkCopyDirectoryWrapper.java index 1446803a2c6..f58530f9fb4 100644 --- a/lucene/misc/src/test/org/apache/lucene/misc/store/TestHardLinkCopyDirectoryWrapper.java +++ b/lucene/misc/src/test/org/apache/lucene/misc/store/TestHardLinkCopyDirectoryWrapper.java @@ -25,8 +25,6 @@ import java.nio.file.attribute.BasicFileAttributes; import java.util.Collections; import org.apache.lucene.codecs.CodecUtil; -import org.apache.lucene.mockfile.FilterPath; -import org.apache.lucene.mockfile.WindowsFS; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.ChecksumIndexInput; import org.apache.lucene.store.Directory; @@ -35,6 +33,8 @@ import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; import org.apache.lucene.store.NIOFSDirectory; +import org.apache.lucene.tests.mockfile.FilterPath; +import org.apache.lucene.tests.mockfile.WindowsFS; import org.apache.lucene.tests.store.BaseDirectoryTestCase; import org.apache.lucene.util.Constants; import org.apache.lucene.util.IOUtils; diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/DisableFsyncFS.java b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/DisableFsyncFS.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/mockfile/DisableFsyncFS.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/DisableFsyncFS.java index b1eea65349a..403477b61b7 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/DisableFsyncFS.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/DisableFsyncFS.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.mockfile; +package org.apache.lucene.tests.mockfile; import java.io.IOException; import java.nio.channels.AsynchronousFileChannel; diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/ExtrasFS.java b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/ExtrasFS.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/mockfile/ExtrasFS.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/ExtrasFS.java index 27978a268f4..124731b801b 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/ExtrasFS.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/ExtrasFS.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.mockfile; +package org.apache.lucene.tests.mockfile; import java.io.IOException; import java.nio.file.FileSystem; diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterAsynchronousFileChannel.java b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/FilterAsynchronousFileChannel.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterAsynchronousFileChannel.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/FilterAsynchronousFileChannel.java index 950e17d5dbf..f65fc5df50f 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterAsynchronousFileChannel.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/FilterAsynchronousFileChannel.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.mockfile; +package org.apache.lucene.tests.mockfile; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterDirectoryStream.java b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/FilterDirectoryStream.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterDirectoryStream.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/FilterDirectoryStream.java index 95639741507..e05f7db9ad3 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterDirectoryStream.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/FilterDirectoryStream.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.mockfile; +package org.apache.lucene.tests.mockfile; import java.io.IOException; import java.nio.file.DirectoryStream; diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterFileChannel.java b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/FilterFileChannel.java similarity index 99% rename from lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterFileChannel.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/FilterFileChannel.java index df2f1d4d83c..3f8ed3bc361 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterFileChannel.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/FilterFileChannel.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.mockfile; +package org.apache.lucene.tests.mockfile; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterFileStore.java b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/FilterFileStore.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterFileStore.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/FilterFileStore.java index dd936435797..71b93841a33 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterFileStore.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/FilterFileStore.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.mockfile; +package org.apache.lucene.tests.mockfile; import java.io.IOException; import java.nio.file.FileStore; diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterFileSystem.java b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/FilterFileSystem.java similarity index 99% rename from lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterFileSystem.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/FilterFileSystem.java index b3737ad52fc..f9576f480d7 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterFileSystem.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/FilterFileSystem.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.mockfile; +package org.apache.lucene.tests.mockfile; import java.io.IOException; import java.nio.file.FileStore; diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterFileSystemProvider.java b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/FilterFileSystemProvider.java similarity index 99% rename from lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterFileSystemProvider.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/FilterFileSystemProvider.java index b9f771a952e..700d3d7a40f 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterFileSystemProvider.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/FilterFileSystemProvider.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.mockfile; +package org.apache.lucene.tests.mockfile; import java.io.IOException; import java.io.InputStream; diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterInputStream2.java b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/FilterInputStream2.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterInputStream2.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/FilterInputStream2.java index 5c4ff32f591..c46aa4b2da9 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterInputStream2.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/FilterInputStream2.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.mockfile; +package org.apache.lucene.tests.mockfile; import java.io.FilterInputStream; import java.io.IOException; diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterOutputStream2.java b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/FilterOutputStream2.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterOutputStream2.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/FilterOutputStream2.java index 9abfd12968e..e2ea1079b13 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterOutputStream2.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/FilterOutputStream2.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.mockfile; +package org.apache.lucene.tests.mockfile; import java.io.FilterOutputStream; import java.io.IOException; diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterPath.java b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/FilterPath.java similarity index 99% rename from lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterPath.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/FilterPath.java index 73f496fcb91..8af517cf72e 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterPath.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/FilterPath.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.mockfile; +package org.apache.lucene.tests.mockfile; import java.io.File; import java.io.IOException; diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterSeekableByteChannel.java b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/FilterSeekableByteChannel.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterSeekableByteChannel.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/FilterSeekableByteChannel.java index d5b587909b5..ed3f99baa0b 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterSeekableByteChannel.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/FilterSeekableByteChannel.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.mockfile; +package org.apache.lucene.tests.mockfile; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/HandleLimitFS.java b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/HandleLimitFS.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/mockfile/HandleLimitFS.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/HandleLimitFS.java index ece3ba2c648..7939fc4452a 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/HandleLimitFS.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/HandleLimitFS.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.mockfile; +package org.apache.lucene.tests.mockfile; import java.io.IOException; import java.lang.annotation.Documented; diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/HandleTrackingFS.java b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/HandleTrackingFS.java similarity index 99% rename from lucene/test-framework/src/java/org/apache/lucene/mockfile/HandleTrackingFS.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/HandleTrackingFS.java index 056e0882240..44c89b619dd 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/HandleTrackingFS.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/HandleTrackingFS.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.mockfile; +package org.apache.lucene.tests.mockfile; import java.io.Closeable; import java.io.IOException; diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/LeakFS.java b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/LeakFS.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/mockfile/LeakFS.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/LeakFS.java index 296c4a889e2..d3f398d5fce 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/LeakFS.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/LeakFS.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.mockfile; +package org.apache.lucene.tests.mockfile; import java.nio.file.FileSystem; import java.nio.file.Path; diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/MockFileSystemTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/MockFileSystemTestCase.java similarity index 99% rename from lucene/test-framework/src/java/org/apache/lucene/mockfile/MockFileSystemTestCase.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/MockFileSystemTestCase.java index cbb934e2289..f513581d734 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/MockFileSystemTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/MockFileSystemTestCase.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.mockfile; +package org.apache.lucene.tests.mockfile; import java.io.IOException; import java.io.OutputStream; diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/ShuffleFS.java b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/ShuffleFS.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/mockfile/ShuffleFS.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/ShuffleFS.java index 212760252e1..004acbe7419 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/ShuffleFS.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/ShuffleFS.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.mockfile; +package org.apache.lucene.tests.mockfile; import java.io.IOException; import java.nio.file.DirectoryStream; diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/VerboseFS.java b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/VerboseFS.java similarity index 99% rename from lucene/test-framework/src/java/org/apache/lucene/mockfile/VerboseFS.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/VerboseFS.java index 166f1a14dea..a848a106c9a 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/VerboseFS.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/VerboseFS.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.mockfile; +package org.apache.lucene.tests.mockfile; import java.io.IOException; import java.io.OutputStream; diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/VirusCheckingFS.java b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/VirusCheckingFS.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/mockfile/VirusCheckingFS.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/VirusCheckingFS.java index eead2661a89..9a969362c15 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/VirusCheckingFS.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/VirusCheckingFS.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.mockfile; +package org.apache.lucene.tests.mockfile; import java.io.IOException; import java.nio.file.AccessDeniedException; diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/WindowsFS.java b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/WindowsFS.java similarity index 99% rename from lucene/test-framework/src/java/org/apache/lucene/mockfile/WindowsFS.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/WindowsFS.java index c3061d24417..23575d770cd 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/WindowsFS.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/WindowsFS.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.mockfile; +package org.apache.lucene.tests.mockfile; import java.io.IOException; import java.nio.file.CopyOption; diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/package-info.java b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/package-info.java similarity index 57% rename from lucene/test-framework/src/java/org/apache/lucene/mockfile/package-info.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/package-info.java index 543d0d64b33..6def9318c74 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/package-info.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/mockfile/package-info.java @@ -21,14 +21,15 @@ *

The primary classes are: * *

*/ -package org.apache.lucene.mockfile; +package org.apache.lucene.tests.mockfile; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/store/BaseDirectoryTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/store/BaseDirectoryTestCase.java index a5139cf01c9..81b39f712bf 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/store/BaseDirectoryTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/store/BaseDirectoryTestCase.java @@ -45,7 +45,6 @@ import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexFileNames; import org.apache.lucene.index.IndexNotFoundException; -import org.apache.lucene.mockfile.ExtrasFS; import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.ChecksumIndexInput; import org.apache.lucene.store.Directory; @@ -54,6 +53,7 @@ import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; import org.apache.lucene.store.RandomAccessInput; +import org.apache.lucene.tests.mockfile.ExtrasFS; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java index f9667274efd..c3ee84a3eab 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java @@ -111,8 +111,6 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.index.*; import org.apache.lucene.index.TermsEnum.SeekStatus; -import org.apache.lucene.mockfile.FilterPath; -import org.apache.lucene.mockfile.VirusCheckingFS; import org.apache.lucene.search.AssertingIndexSearcher; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.search.IndexSearcher; @@ -131,6 +129,8 @@ import org.apache.lucene.store.MMapDirectory; import org.apache.lucene.store.MergeInfo; import org.apache.lucene.store.NRTCachingDirectory; +import org.apache.lucene.tests.mockfile.FilterPath; +import org.apache.lucene.tests.mockfile.VirusCheckingFS; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.store.MockDirectoryWrapper.Throttling; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleTemporaryFilesCleanup.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleTemporaryFilesCleanup.java index da3116b3eb5..8d000f509e9 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleTemporaryFilesCleanup.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleTemporaryFilesCleanup.java @@ -33,13 +33,13 @@ import java.util.Locale; import java.util.Random; import java.util.Set; -import org.apache.lucene.mockfile.DisableFsyncFS; -import org.apache.lucene.mockfile.ExtrasFS; -import org.apache.lucene.mockfile.HandleLimitFS; -import org.apache.lucene.mockfile.LeakFS; -import org.apache.lucene.mockfile.ShuffleFS; -import org.apache.lucene.mockfile.VerboseFS; -import org.apache.lucene.mockfile.WindowsFS; +import org.apache.lucene.tests.mockfile.DisableFsyncFS; +import org.apache.lucene.tests.mockfile.ExtrasFS; +import org.apache.lucene.tests.mockfile.HandleLimitFS; +import org.apache.lucene.tests.mockfile.LeakFS; +import org.apache.lucene.tests.mockfile.ShuffleFS; +import org.apache.lucene.tests.mockfile.VerboseFS; +import org.apache.lucene.tests.mockfile.WindowsFS; import org.apache.lucene.tests.util.LuceneTestCase.SuppressFileSystems; import org.apache.lucene.tests.util.LuceneTestCase.SuppressFsync; import org.apache.lucene.tests.util.LuceneTestCase.SuppressTempFileChecks; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestUtil.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestUtil.java index 25e3bf6cbaa..c289658c387 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestUtil.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestUtil.java @@ -88,9 +88,6 @@ import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.index.TieredMergePolicy; -import org.apache.lucene.mockfile.FilterFileSystem; -import org.apache.lucene.mockfile.VirusCheckingFS; -import org.apache.lucene.mockfile.WindowsFS; import org.apache.lucene.search.FieldDoc; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TopDocs; @@ -101,6 +98,9 @@ import org.apache.lucene.store.FilterDirectory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.NoLockFactory; +import org.apache.lucene.tests.mockfile.FilterFileSystem; +import org.apache.lucene.tests.mockfile.VirusCheckingFS; +import org.apache.lucene.tests.mockfile.WindowsFS; import org.apache.lucene.util.Attribute; import org.apache.lucene.util.AttributeImpl; import org.apache.lucene.util.AttributeReflector; diff --git a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestDisableFsyncFS.java b/lucene/test-framework/src/test/org/apache/lucene/tests/mockfile/TestDisableFsyncFS.java similarity index 97% rename from lucene/test-framework/src/test/org/apache/lucene/mockfile/TestDisableFsyncFS.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/mockfile/TestDisableFsyncFS.java index 49c6ebe4744..4c925350ae6 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestDisableFsyncFS.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/mockfile/TestDisableFsyncFS.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.mockfile; +package org.apache.lucene.tests.mockfile; import java.net.URI; import java.nio.ByteBuffer; diff --git a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestExtrasFS.java b/lucene/test-framework/src/test/org/apache/lucene/tests/mockfile/TestExtrasFS.java similarity index 98% rename from lucene/test-framework/src/test/org/apache/lucene/mockfile/TestExtrasFS.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/mockfile/TestExtrasFS.java index ab7e75ca899..4d65d61d727 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestExtrasFS.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/mockfile/TestExtrasFS.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.mockfile; +package org.apache.lucene.tests.mockfile; import java.net.URI; import java.nio.file.DirectoryStream; diff --git a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestHandleLimitFS.java b/lucene/test-framework/src/test/org/apache/lucene/tests/mockfile/TestHandleLimitFS.java similarity index 98% rename from lucene/test-framework/src/test/org/apache/lucene/mockfile/TestHandleLimitFS.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/mockfile/TestHandleLimitFS.java index 1c0434aff67..85da76229a9 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestHandleLimitFS.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/mockfile/TestHandleLimitFS.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.mockfile; +package org.apache.lucene.tests.mockfile; import java.io.Closeable; import java.io.IOException; diff --git a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestHandleTrackingFS.java b/lucene/test-framework/src/test/org/apache/lucene/tests/mockfile/TestHandleTrackingFS.java similarity index 98% rename from lucene/test-framework/src/test/org/apache/lucene/mockfile/TestHandleTrackingFS.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/mockfile/TestHandleTrackingFS.java index 8bf78d79aed..54d12ecbe19 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestHandleTrackingFS.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/mockfile/TestHandleTrackingFS.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.mockfile; +package org.apache.lucene.tests.mockfile; import java.io.IOException; import java.io.InputStream; diff --git a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestLeakFS.java b/lucene/test-framework/src/test/org/apache/lucene/tests/mockfile/TestLeakFS.java similarity index 99% rename from lucene/test-framework/src/test/org/apache/lucene/mockfile/TestLeakFS.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/mockfile/TestLeakFS.java index 30438890459..44bb91a012a 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestLeakFS.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/mockfile/TestLeakFS.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.mockfile; +package org.apache.lucene.tests.mockfile; import java.io.IOException; import java.io.InputStream; diff --git a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestShuffleFS.java b/lucene/test-framework/src/test/org/apache/lucene/tests/mockfile/TestShuffleFS.java similarity index 99% rename from lucene/test-framework/src/test/org/apache/lucene/mockfile/TestShuffleFS.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/mockfile/TestShuffleFS.java index 6fa80c9a640..28ed882d12e 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestShuffleFS.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/mockfile/TestShuffleFS.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.mockfile; +package org.apache.lucene.tests.mockfile; import java.io.IOException; import java.net.URI; diff --git a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestVerboseFS.java b/lucene/test-framework/src/test/org/apache/lucene/tests/mockfile/TestVerboseFS.java similarity index 99% rename from lucene/test-framework/src/test/org/apache/lucene/mockfile/TestVerboseFS.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/mockfile/TestVerboseFS.java index 2278c31182b..a335011b920 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestVerboseFS.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/mockfile/TestVerboseFS.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.mockfile; +package org.apache.lucene.tests.mockfile; import java.io.IOException; import java.io.OutputStream; diff --git a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestVirusCheckingFS.java b/lucene/test-framework/src/test/org/apache/lucene/tests/mockfile/TestVirusCheckingFS.java similarity index 98% rename from lucene/test-framework/src/test/org/apache/lucene/mockfile/TestVirusCheckingFS.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/mockfile/TestVirusCheckingFS.java index 0f9dff7cf74..3dea0de94d6 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestVirusCheckingFS.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/mockfile/TestVirusCheckingFS.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.mockfile; +package org.apache.lucene.tests.mockfile; import java.io.IOException; import java.io.OutputStream; diff --git a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestWindowsFS.java b/lucene/test-framework/src/test/org/apache/lucene/tests/mockfile/TestWindowsFS.java similarity index 99% rename from lucene/test-framework/src/test/org/apache/lucene/mockfile/TestWindowsFS.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/mockfile/TestWindowsFS.java index a8f8e025cd7..6fb0285515a 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestWindowsFS.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/mockfile/TestWindowsFS.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.mockfile; +package org.apache.lucene.tests.mockfile; import java.io.FileNotFoundException; import java.io.IOException; From 950585285545ff8a03a67ec0309ea32c300a13e5 Mon Sep 17 00:00:00 2001 From: Dawid Weiss Date: Sun, 19 Dec 2021 20:03:03 +0100 Subject: [PATCH 07/32] Moved search -> tests.search --- .../apache/lucene/search/FilterScorer.java | 8 +++- .../apache/lucene/search/IndexSearcher.java | 10 +++++ .../document/BaseLatLonPointTestCase.java | 2 +- .../document/BaseLatLonShapeTestCase.java | 2 +- .../lucene/document/TestFeatureField.java | 2 +- .../lucene/document/TestFeatureSort.java | 2 +- .../TestLatLonPointDistanceFeatureQuery.java | 4 +- .../TestLongDistanceFeatureQuery.java | 4 +- .../apache/lucene/index/TestTermsEnum2.java | 2 +- .../TestApproximationSearchEquivalence.java | 2 + .../lucene/search/TestBlendedTermQuery.java | 1 + .../search/TestBlockMaxConjunction.java | 4 ++ .../apache/lucene/search/TestBoolean2.java | 2 + .../search/TestBooleanMinShouldMatch.java | 2 + .../apache/lucene/search/TestBooleanOr.java | 1 + .../lucene/search/TestBooleanQuery.java | 1 + .../TestBooleanQueryVisitSubscorers.java | 1 + .../lucene/search/TestBooleanScorer.java | 1 + .../search/TestComplexExplanations.java | 1 + .../TestComplexExplanationsOfNonMatches.java | 2 + .../lucene/search/TestConstantScoreQuery.java | 1 + .../search/TestDisjunctionMaxQuery.java | 2 + .../lucene/search/TestDocValuesQueries.java | 1 + .../search/TestDocValuesRewriteMethod.java | 2 + .../search/TestDoubleRangeFieldQueries.java | 1 + .../lucene/search/TestDoubleValuesSource.java | 1 + .../search/TestFieldCacheRewriteMethod.java | 2 + .../search/TestFloatRangeFieldQueries.java | 1 + .../search/TestInetAddressRangeQueries.java | 1 + .../search/TestIntRangeFieldQueries.java | 1 + .../lucene/search/TestLRUQueryCache.java | 2 + .../search/TestLongRangeFieldQueries.java | 1 + .../lucene/search/TestLongValuesSource.java | 1 + .../lucene/search/TestMatchNoDocsQuery.java | 1 + .../lucene/search/TestMatchesIterator.java | 2 + .../lucene/search/TestMinShouldMatch2.java | 1 + .../lucene/search/TestMultiSliceMerge.java | 1 + .../search/TestMultiTermConstantScore.java | 1 + .../apache/lucene/search/TestPhraseQuery.java | 2 + .../lucene/search/TestPrefixRandom.java | 1 + .../lucene/search/TestQueryRescorer.java | 1 + .../lucene/search/TestRegexpRandom2.java | 1 + .../lucene/search/TestReqOptSumScorer.java | 2 + .../lucene/search/TestShardSearching.java | 1 + .../lucene/search/TestSimpleExplanations.java | 1 + .../TestSimpleExplanationsOfNonMatches.java | 2 + .../search/TestSimpleSearchEquivalence.java | 2 + .../lucene/search/TestSloppyPhraseQuery.java | 2 + .../lucene/search/TestSloppyPhraseQuery2.java | 1 + .../lucene/search/TestSubScorerFreqs.java | 1 + .../lucene/search/TestSynonymQuery.java | 2 + .../lucene/search/TestTermInSetQuery.java | 1 + .../apache/lucene/search/TestTermQuery.java | 1 + .../apache/lucene/search/TestTermScorer.java | 1 + .../lucene/search/TestTopDocsCollector.java | 1 + .../lucene/search/TestTopFieldCollector.java | 1 + ...TestTopFieldCollectorEarlyTermination.java | 1 + .../apache/lucene/search/TestWANDScorer.java | 3 ++ .../similarities/AxiomaticTestCase.java | 1 + .../similarities/BasicModelTestCase.java | 1 + .../similarities/DistributionTestCase.java | 1 + .../similarities/TestBM25Similarity.java | 1 + .../similarities/TestBooleanSimilarity.java | 1 + .../similarities/TestClassicSimilarity.java | 1 + .../TestIndependenceChiSquared.java | 1 + .../TestIndependenceSaturated.java | 1 + .../TestIndependenceStandardized.java | 1 + .../TestIndriDirichletSimilarity.java | 1 + .../TestLMDirichletSimilarity.java | 1 + .../TestLMJelinekMercerSimilarity.java | 1 + .../expressions/TestExpressionSorts.java | 2 +- .../lucene/facet/TestDrillDownQuery.java | 2 +- .../lucene/search/join/TestBlockJoin.java | 3 ++ .../lucene/queries/TestCommonTermsQuery.java | 2 +- .../queries/function/TestFieldScoreQuery.java | 2 +- .../function/TestFunctionMatchQuery.java | 2 +- .../TestFunctionQueryExplanations.java | 2 +- .../TestFunctionScoreExplanations.java | 2 +- .../function/TestFunctionScoreQuery.java | 2 +- .../function/TestIndexReaderFunctions.java | 2 +- .../function/TestLongNormValueSource.java | 2 +- .../queries/function/TestValueSources.java | 2 +- .../queries/intervals/TestComplexMatches.java | 2 +- .../queries/intervals/TestIntervalQuery.java | 2 +- .../lucene/queries/mlt/TestMoreLikeThis.java | 2 +- .../payloads/TestPayloadCheckQuery.java | 2 +- .../payloads/TestPayloadExplanations.java | 2 +- .../payloads/TestPayloadScoreQuery.java | 2 +- .../payloads/TestPayloadTermQuery.java | 4 +- .../spans/BaseSpanExplanationTestCase.java | 2 +- .../lucene/queries/spans/SpanTestUtil.java | 2 +- .../lucene/queries/spans/TestBasics.java | 2 +- .../spans/TestFieldMaskingSpanQuery.java | 4 +- .../queries/spans/TestNearSpansOrdered.java | 2 +- .../queries/spans/TestSpanContainQuery.java | 2 +- .../TestSpanExplanationsOfNonMatches.java | 2 +- .../lucene/queries/spans/TestSpanMatches.java | 2 +- .../queries/spans/TestSpanNearQuery.java | 2 +- .../queries/spans/TestSpanNotQuery.java | 2 +- .../lucene/queries/spans/TestSpanOrQuery.java | 2 +- .../spans/TestSpanSearchEquivalence.java | 2 +- .../queries/spans/TestSpanTermQuery.java | 2 +- .../lucene/queries/spans/TestSpans.java | 2 +- .../lucene/queries/spans/TestSpansEnum.java | 2 +- .../surround/query/TestSrndQuery.java | 2 +- .../search/TestCombinedFieldQuery.java | 2 +- .../sandbox/search/TestCoveringQuery.java | 2 +- ...xSortSortedNumericDocValuesRangeQuery.java | 2 +- .../TestLargeNumHitsTopDocsCollector.java | 2 +- .../search/TestLatLonBoundingBoxQueries.java | 2 +- .../sandbox/search/TestMultiRangeQueries.java | 2 +- .../TestQueryProfilerIndexSearcher.java | 2 +- .../org/apache/lucene/search/package.html | 32 --------------- .../lucene/search/similarities/package.html | 31 --------------- .../search/AssertingBulkScorer.java | 6 ++- .../search/AssertingCollector.java | 6 ++- .../search/AssertingIndexSearcher.java | 7 +++- .../search/AssertingLeafCollector.java | 6 ++- .../{ => tests}/search/AssertingMatches.java | 9 +++-- .../search/AssertingMatchesIterator.java | 4 +- .../{ => tests}/search/AssertingQuery.java | 7 +++- .../{ => tests}/search/AssertingScorable.java | 9 ++++- .../{ => tests}/search/AssertingScorer.java | 8 +++- .../{ => tests}/search/AssertingWeight.java | 9 ++++- .../search/BaseExplanationTestCase.java | 7 +++- .../search/BaseRangeFieldQueryTestCase.java | 6 ++- .../search/BlockScoreQueryWrapper.java | 10 ++++- .../search/BulkScorerWrapperScorer.java | 8 +++- .../lucene/{ => tests}/search/CheckHits.java | 27 ++++++++++--- .../{ => tests}/search/MatchesTestBase.java | 36 ++++++++++------- .../lucene/{ => tests}/search/QueryUtils.java | 14 ++++++- .../search/RandomApproximationQuery.java | 13 ++++++- .../search/ScorerIndexSearcher.java | 9 ++++- .../search/SearchEquivalenceTestBase.java | 10 ++++- .../search/ShardSearchingTestBase.java | 15 ++++++- .../lucene/tests/search/package-info.java | 30 ++++++++++++++ .../similarities/AssertingSimilarity.java | 3 +- .../similarities/BaseSimilarityTestCase.java | 6 ++- .../search/similarities/RandomSimilarity.java | 39 ++++++++++++++++++- .../search/similarities/package-info.java | 26 +++++++++++++ .../lucene/tests/util/LuceneTestCase.java | 2 +- .../util/TestRuleSetupAndRestoreClassEnv.java | 4 +- .../search/TestBaseExplanationTestCase.java | 9 ++++- 143 files changed, 446 insertions(+), 168 deletions(-) delete mode 100644 lucene/test-framework/src/java/org/apache/lucene/search/package.html delete mode 100644 lucene/test-framework/src/java/org/apache/lucene/search/similarities/package.html rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/search/AssertingBulkScorer.java (94%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/search/AssertingCollector.java (90%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/search/AssertingIndexSearcher.java (91%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/search/AssertingLeafCollector.java (89%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/search/AssertingMatches.java (83%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/search/AssertingMatchesIterator.java (94%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/search/AssertingQuery.java (90%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/search/AssertingScorable.java (90%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/search/AssertingScorer.java (97%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/search/AssertingWeight.java (91%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/search/BaseExplanationTestCase.java (95%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/search/BaseRangeFieldQueryTestCase.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/search/BlockScoreQueryWrapper.java (94%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/search/BulkScorerWrapperScorer.java (91%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/search/CheckHits.java (96%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/search/MatchesTestBase.java (90%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/search/QueryUtils.java (97%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/search/RandomApproximationQuery.java (91%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/search/ScorerIndexSearcher.java (88%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/search/SearchEquivalenceTestBase.java (95%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/search/ShardSearchingTestBase.java (97%) create mode 100644 lucene/test-framework/src/java/org/apache/lucene/tests/search/package-info.java rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/search/similarities/AssertingSimilarity.java (97%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/search/similarities/BaseSimilarityTestCase.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/search/similarities/RandomSimilarity.java (65%) create mode 100644 lucene/test-framework/src/java/org/apache/lucene/tests/search/similarities/package-info.java rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/search/TestBaseExplanationTestCase.java (92%) diff --git a/lucene/core/src/java/org/apache/lucene/search/FilterScorer.java b/lucene/core/src/java/org/apache/lucene/search/FilterScorer.java index 5d27cc9a473..337531dbb32 100644 --- a/lucene/core/src/java/org/apache/lucene/search/FilterScorer.java +++ b/lucene/core/src/java/org/apache/lucene/search/FilterScorer.java @@ -17,6 +17,7 @@ package org.apache.lucene.search; import java.io.IOException; +import org.apache.lucene.util.Unwrappable; /** * A {@code FilterScorer} contains another {@code Scorer}, which it uses as its basic source of @@ -25,7 +26,7 @@ * versions that pass all requests to the contained scorer. Subclasses of {@code FilterScorer} may * further override some of these methods and may also provide additional methods and fields. */ -public abstract class FilterScorer extends Scorer { +public abstract class FilterScorer extends Scorer implements Unwrappable { protected final Scorer in; /** @@ -74,4 +75,9 @@ public final DocIdSetIterator iterator() { public final TwoPhaseIterator twoPhaseIterator() { return in.twoPhaseIterator(); } + + @Override + public Scorer unwrap() { + return in; + } } diff --git a/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java b/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java index d771cd9ec57..c07d5e28b0f 100644 --- a/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java +++ b/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java @@ -137,6 +137,16 @@ public static Similarity getDefaultSimilarity() { return defaultSimilarity; } + /** + * Expert: returns leaf contexts associated with this searcher. This is an internal method exposed + * for tests only. + * + * @lucene.internal + */ + public List getLeafContexts() { + return leafContexts; + } + /** * Expert: Get the default {@link QueryCache} or {@code null} if the cache is disabled. * diff --git a/lucene/core/src/test/org/apache/lucene/document/BaseLatLonPointTestCase.java b/lucene/core/src/test/org/apache/lucene/document/BaseLatLonPointTestCase.java index b01dc9a396b..0a78ad9eb48 100644 --- a/lucene/core/src/test/org/apache/lucene/document/BaseLatLonPointTestCase.java +++ b/lucene/core/src/test/org/apache/lucene/document/BaseLatLonPointTestCase.java @@ -28,9 +28,9 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; -import org.apache.lucene.search.QueryUtils; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.geo.GeoTestUtil; +import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.util.IOUtils; /** diff --git a/lucene/core/src/test/org/apache/lucene/document/BaseLatLonShapeTestCase.java b/lucene/core/src/test/org/apache/lucene/document/BaseLatLonShapeTestCase.java index 4b969cc983b..0ddbe0e44d9 100644 --- a/lucene/core/src/test/org/apache/lucene/document/BaseLatLonShapeTestCase.java +++ b/lucene/core/src/test/org/apache/lucene/document/BaseLatLonShapeTestCase.java @@ -27,9 +27,9 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; -import org.apache.lucene.search.QueryUtils; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.geo.GeoTestUtil; +import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.util.IOUtils; /** diff --git a/lucene/core/src/test/org/apache/lucene/document/TestFeatureField.java b/lucene/core/src/test/org/apache/lucene/document/TestFeatureField.java index 88ac68f4e4a..1247a9fedbe 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestFeatureField.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestFeatureField.java @@ -27,7 +27,6 @@ import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; -import org.apache.lucene.search.QueryUtils; import org.apache.lucene.search.ScoreMode; import org.apache.lucene.search.Scorer; import org.apache.lucene.search.TermQuery; @@ -36,6 +35,7 @@ import org.apache.lucene.search.similarities.BM25Similarity; import org.apache.lucene.search.similarities.Similarity.SimScorer; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; public class TestFeatureField extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/document/TestFeatureSort.java b/lucene/core/src/test/org/apache/lucene/document/TestFeatureSort.java index ceba664a619..eae1cd9ce76 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestFeatureSort.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestFeatureSort.java @@ -20,13 +20,13 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.RandomIndexWriter; -import org.apache.lucene.search.CheckHits; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.Sort; import org.apache.lucene.search.SortField; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/document/TestLatLonPointDistanceFeatureQuery.java b/lucene/core/src/test/org/apache/lucene/document/TestLatLonPointDistanceFeatureQuery.java index e626846c2d9..d73d1c90438 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestLatLonPointDistanceFeatureQuery.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestLatLonPointDistanceFeatureQuery.java @@ -24,17 +24,17 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.MultiReader; import org.apache.lucene.index.RandomIndexWriter; -import org.apache.lucene.search.CheckHits; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.Query; -import org.apache.lucene.search.QueryUtils; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.Sort; import org.apache.lucene.search.SortField; import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.TopScoreDocCollector; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.CheckHits; +import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.SloppyMath; diff --git a/lucene/core/src/test/org/apache/lucene/document/TestLongDistanceFeatureQuery.java b/lucene/core/src/test/org/apache/lucene/document/TestLongDistanceFeatureQuery.java index e26d4c2b786..47afd93d2ec 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestLongDistanceFeatureQuery.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestLongDistanceFeatureQuery.java @@ -22,14 +22,14 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.MultiReader; import org.apache.lucene.index.RandomIndexWriter; -import org.apache.lucene.search.CheckHits; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; -import org.apache.lucene.search.QueryUtils; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.TopScoreDocCollector; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.CheckHits; +import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; public class TestLongDistanceFeatureQuery extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java b/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java index cd936046d7a..cc0985ad19e 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java @@ -29,10 +29,10 @@ import org.apache.lucene.document.Field; import org.apache.lucene.index.TermsEnum.SeekStatus; import org.apache.lucene.search.AutomatonQuery; -import org.apache.lucene.search.CheckHits; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.tests.util.automaton.AutomatonTestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestApproximationSearchEquivalence.java b/lucene/core/src/test/org/apache/lucene/search/TestApproximationSearchEquivalence.java index 386e8fe4505..faee48b5c53 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestApproximationSearchEquivalence.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestApproximationSearchEquivalence.java @@ -18,6 +18,8 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; +import org.apache.lucene.tests.search.RandomApproximationQuery; +import org.apache.lucene.tests.search.SearchEquivalenceTestBase; /** Basic equivalence tests for approximations. */ public class TestApproximationSearchEquivalence extends SearchEquivalenceTestBase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBlendedTermQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestBlendedTermQuery.java index 1d47bcbe0e4..ba6e1ab6715 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBlendedTermQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBlendedTermQuery.java @@ -24,6 +24,7 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; public class TestBlendedTermQuery extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBlockMaxConjunction.java b/lucene/core/src/test/org/apache/lucene/search/TestBlockMaxConjunction.java index 99247a0ff26..35812ab7775 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBlockMaxConjunction.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBlockMaxConjunction.java @@ -26,6 +26,10 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.AssertingQuery; +import org.apache.lucene.tests.search.BlockScoreQueryWrapper; +import org.apache.lucene.tests.search.CheckHits; +import org.apache.lucene.tests.search.RandomApproximationQuery; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java b/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java index 2c873c30222..fa600bc8720 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java @@ -33,6 +33,8 @@ import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; +import org.apache.lucene.tests.search.CheckHits; +import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.ArrayUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java b/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java index b531090268a..561fdf76f66 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java @@ -26,6 +26,8 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.CheckHits; +import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java b/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java index c7fdb042179..71a615f8c15 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java @@ -30,6 +30,7 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java index 95bcee0ecf7..84058ad599e 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java @@ -41,6 +41,7 @@ import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java b/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java index d6fc2781d46..1a2b3434ae1 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java @@ -38,6 +38,7 @@ import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.ScorerIndexSearcher; import org.apache.lucene.tests.util.LuceneTestCase; // TODO: refactor to a base class, that collects freqs from the scorer tree diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java b/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java index 56defc55f89..2257f4cc752 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java @@ -29,6 +29,7 @@ import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.Weight.DefaultBulkScorer; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.Bits; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestComplexExplanations.java b/lucene/core/src/test/org/apache/lucene/search/TestComplexExplanations.java index 5f02458d972..da18b5091d0 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestComplexExplanations.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestComplexExplanations.java @@ -20,6 +20,7 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.similarities.ClassicSimilarity; +import org.apache.lucene.tests.search.BaseExplanationTestCase; /** * TestExplanations subclass that builds up super crazy complex queries on the assumption that if diff --git a/lucene/core/src/test/org/apache/lucene/search/TestComplexExplanationsOfNonMatches.java b/lucene/core/src/test/org/apache/lucene/search/TestComplexExplanationsOfNonMatches.java index c092b77d511..3fdfe390ddb 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestComplexExplanationsOfNonMatches.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestComplexExplanationsOfNonMatches.java @@ -16,6 +16,8 @@ */ package org.apache.lucene.search; +import org.apache.lucene.tests.search.CheckHits; + /** subclass of TestSimpleExplanations that verifies non matches. */ public class TestComplexExplanationsOfNonMatches extends TestComplexExplanations { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreQuery.java index 45dfb578bb3..9ea1e5b98e8 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreQuery.java @@ -26,6 +26,7 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java index f0f588f7375..b892ad5ff8d 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java @@ -42,6 +42,8 @@ import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.CheckHits; +import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; /** Test of the DisjunctionMaxQuery. */ diff --git a/lucene/core/src/test/org/apache/lucene/search/TestDocValuesQueries.java b/lucene/core/src/test/org/apache/lucene/search/TestDocValuesQueries.java index 5842b5c1175..64849e00fe3 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestDocValuesQueries.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestDocValuesQueries.java @@ -27,6 +27,7 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.NumericUtils; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestDocValuesRewriteMethod.java b/lucene/core/src/test/org/apache/lucene/search/TestDocValuesRewriteMethod.java index cbf5fc5f48c..51a7cf3f443 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestDocValuesRewriteMethod.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestDocValuesRewriteMethod.java @@ -29,6 +29,8 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.CheckHits; +import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.tests.util.automaton.AutomatonTestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestDoubleRangeFieldQueries.java b/lucene/core/src/test/org/apache/lucene/search/TestDoubleRangeFieldQueries.java index 3e5a98a5194..4b0a9a6413d 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestDoubleRangeFieldQueries.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestDoubleRangeFieldQueries.java @@ -22,6 +22,7 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.BaseRangeFieldQueryTestCase; /** Random testing for RangeFieldQueries. */ public class TestDoubleRangeFieldQueries extends BaseRangeFieldQueryTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestDoubleValuesSource.java b/lucene/core/src/test/org/apache/lucene/search/TestDoubleValuesSource.java index bbf01e27134..a855025111b 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestDoubleValuesSource.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestDoubleValuesSource.java @@ -30,6 +30,7 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.English; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheRewriteMethod.java b/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheRewriteMethod.java index 7b6dfce0ac6..ca78ac3c682 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheRewriteMethod.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheRewriteMethod.java @@ -18,6 +18,8 @@ import java.io.IOException; import org.apache.lucene.index.Term; +import org.apache.lucene.tests.search.CheckHits; +import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.util.automaton.RegExp; /** Tests the FieldcacheRewriteMethod with random regular expressions */ diff --git a/lucene/core/src/test/org/apache/lucene/search/TestFloatRangeFieldQueries.java b/lucene/core/src/test/org/apache/lucene/search/TestFloatRangeFieldQueries.java index 4ac8c1f4f5f..7467bfbb981 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestFloatRangeFieldQueries.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestFloatRangeFieldQueries.java @@ -22,6 +22,7 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.BaseRangeFieldQueryTestCase; /** Random testing for FloatRange Queries. */ public class TestFloatRangeFieldQueries extends BaseRangeFieldQueryTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestInetAddressRangeQueries.java b/lucene/core/src/test/org/apache/lucene/search/TestInetAddressRangeQueries.java index e2ccb8022f8..e4c2aca4e0b 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestInetAddressRangeQueries.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestInetAddressRangeQueries.java @@ -21,6 +21,7 @@ import java.util.Arrays; import org.apache.lucene.document.InetAddressPoint; import org.apache.lucene.document.InetAddressRange; +import org.apache.lucene.tests.search.BaseRangeFieldQueryTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; /** Random testing for {@link InetAddressRange} */ diff --git a/lucene/core/src/test/org/apache/lucene/search/TestIntRangeFieldQueries.java b/lucene/core/src/test/org/apache/lucene/search/TestIntRangeFieldQueries.java index aed95d20a63..af10f88cdc7 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestIntRangeFieldQueries.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestIntRangeFieldQueries.java @@ -22,6 +22,7 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.BaseRangeFieldQueryTestCase; import org.apache.lucene.tests.util.TestUtil; /** Random testing for IntRange Queries. */ diff --git a/lucene/core/src/test/org/apache/lucene/search/TestLRUQueryCache.java b/lucene/core/src/test/org/apache/lucene/search/TestLRUQueryCache.java index a1f8b8afa0c..db70da7b5d8 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestLRUQueryCache.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestLRUQueryCache.java @@ -61,6 +61,8 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.AssertingIndexSearcher; +import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.RamUsageTester; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestLongRangeFieldQueries.java b/lucene/core/src/test/org/apache/lucene/search/TestLongRangeFieldQueries.java index efb28819972..99b61c57585 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestLongRangeFieldQueries.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestLongRangeFieldQueries.java @@ -22,6 +22,7 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.BaseRangeFieldQueryTestCase; import org.apache.lucene.tests.util.TestUtil; /** Random testing for LongRange Queries. */ diff --git a/lucene/core/src/test/org/apache/lucene/search/TestLongValuesSource.java b/lucene/core/src/test/org/apache/lucene/search/TestLongValuesSource.java index ad8828386e5..3684979f60d 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestLongValuesSource.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestLongValuesSource.java @@ -27,6 +27,7 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.English; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMatchNoDocsQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestMatchNoDocsQuery.java index b886f9b6abd..aae21c099ce 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestMatchNoDocsQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestMatchNoDocsQuery.java @@ -26,6 +26,7 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; /** Tests MatchNoDocsQuery. */ diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMatchesIterator.java b/lucene/core/src/test/org/apache/lucene/search/TestMatchesIterator.java index 484dd133989..b62d1ec69f1 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestMatchesIterator.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestMatchesIterator.java @@ -33,6 +33,8 @@ import org.apache.lucene.index.Term; import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; +import org.apache.lucene.tests.search.AssertingMatches; +import org.apache.lucene.tests.search.MatchesTestBase; import org.apache.lucene.util.BytesRef; public class TestMatchesIterator extends MatchesTestBase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMinShouldMatch2.java b/lucene/core/src/test/org/apache/lucene/search/TestMinShouldMatch2.java index 26895c96a93..d78cb755c56 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestMinShouldMatch2.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestMinShouldMatch2.java @@ -36,6 +36,7 @@ import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.search.similarities.Similarity.SimScorer; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.BulkScorerWrapperScorer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMultiSliceMerge.java b/lucene/core/src/test/org/apache/lucene/search/TestMultiSliceMerge.java index 0dc4af86150..ecacceff55a 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestMultiSliceMerge.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestMultiSliceMerge.java @@ -25,6 +25,7 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java b/lucene/core/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java index 0cd8013e3dd..5fb0d94abe4 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java @@ -27,6 +27,7 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.QueryUtils; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java index 4f6ca8bfaa8..c6b624a3ece 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java @@ -50,6 +50,8 @@ import org.apache.lucene.search.similarities.BM25Similarity; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.CheckHits; +import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.ArrayUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java b/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java index 9b447ba6c3f..dc9acd9dcfd 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java @@ -28,6 +28,7 @@ import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.AttributeSource; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestQueryRescorer.java b/lucene/core/src/test/org/apache/lucene/search/TestQueryRescorer.java index c210eed888b..f2c253c64f5 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestQueryRescorer.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestQueryRescorer.java @@ -33,6 +33,7 @@ import org.apache.lucene.search.similarities.BM25Similarity; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.ArrayUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java b/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java index 9dd27c1fd76..8fb012ab1fc 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java @@ -32,6 +32,7 @@ import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.tests.util.automaton.AutomatonTestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestReqOptSumScorer.java b/lucene/core/src/test/org/apache/lucene/search/TestReqOptSumScorer.java index b533902866c..77d9bc6d52e 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestReqOptSumScorer.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestReqOptSumScorer.java @@ -35,6 +35,8 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.CheckHits; +import org.apache.lucene.tests.search.RandomApproximationQuery; import org.apache.lucene.tests.util.LuceneTestCase; public class TestReqOptSumScorer extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestShardSearching.java b/lucene/core/src/test/org/apache/lucene/search/TestShardSearching.java index 31e6d168c79..f30c2846c0d 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestShardSearching.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestShardSearching.java @@ -26,6 +26,7 @@ import org.apache.lucene.index.MultiTerms; import org.apache.lucene.index.Term; import org.apache.lucene.index.TermsEnum; +import org.apache.lucene.tests.search.ShardSearchingTestBase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanations.java b/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanations.java index 70b778b8947..26f1a19fd77 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanations.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanations.java @@ -18,6 +18,7 @@ import java.util.Arrays; import org.apache.lucene.index.Term; +import org.apache.lucene.tests.search.BaseExplanationTestCase; import org.junit.Test; /** TestExplanations subclass focusing on basic query types */ diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanationsOfNonMatches.java b/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanationsOfNonMatches.java index acc44bb1a79..c5180c5734e 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanationsOfNonMatches.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanationsOfNonMatches.java @@ -16,6 +16,8 @@ */ package org.apache.lucene.search; +import org.apache.lucene.tests.search.CheckHits; + /** subclass of TestSimpleExplanations that verifies non matches. */ public class TestSimpleExplanationsOfNonMatches extends TestSimpleExplanations { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSimpleSearchEquivalence.java b/lucene/core/src/test/org/apache/lucene/search/TestSimpleSearchEquivalence.java index 58ba19fea20..30680d0cf00 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSimpleSearchEquivalence.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSimpleSearchEquivalence.java @@ -19,6 +19,8 @@ import java.util.Arrays; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; +import org.apache.lucene.tests.search.AssertingQuery; +import org.apache.lucene.tests.search.SearchEquivalenceTestBase; /** Basic equivalence tests for core queries */ public class TestSimpleSearchEquivalence extends SearchEquivalenceTestBase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java index ab7c28daeba..1493212814d 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java @@ -28,6 +28,8 @@ import org.apache.lucene.index.Term; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.AssertingScorable; +import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery2.java b/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery2.java index e4fb1a3c7d0..050dd67193a 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery2.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery2.java @@ -18,6 +18,7 @@ import java.util.Random; import org.apache.lucene.index.Term; +import org.apache.lucene.tests.search.SearchEquivalenceTestBase; import org.apache.lucene.tests.util.TestUtil; /** random sloppy phrase query tests */ diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java b/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java index 658868593b3..f4b69dc82b2 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java @@ -34,6 +34,7 @@ import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.AssertingScorable; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSynonymQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestSynonymQuery.java index 07c6a251b22..ee5d5a0ee31 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSynonymQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSynonymQuery.java @@ -37,6 +37,8 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.CheckHits; +import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTermInSetQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestTermInSetQuery.java index c86c43a6e1c..80129f10c28 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestTermInSetQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestTermInSetQuery.java @@ -39,6 +39,7 @@ import org.apache.lucene.index.TermsEnum; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.RamUsageTester; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTermQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestTermQuery.java index ed2fd6f1fa8..8d10763acee 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestTermQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestTermQuery.java @@ -34,6 +34,7 @@ import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java b/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java index e16335e2309..eeab9e560d5 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java @@ -36,6 +36,7 @@ import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTopDocsCollector.java b/lucene/core/src/test/org/apache/lucene/search/TestTopDocsCollector.java index 6fedaea1767..15cdde11f2d 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestTopDocsCollector.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestTopDocsCollector.java @@ -34,6 +34,7 @@ import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java b/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java index 6a65c46733c..16ebcdeeb0f 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java @@ -37,6 +37,7 @@ import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.FieldValueHitQueue.Entry; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollectorEarlyTermination.java b/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollectorEarlyTermination.java index 9f157c9db9b..d0419fb9c3a 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollectorEarlyTermination.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollectorEarlyTermination.java @@ -36,6 +36,7 @@ import org.apache.lucene.index.SerialMergeScheduler; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestWANDScorer.java b/lucene/core/src/test/org/apache/lucene/search/TestWANDScorer.java index ea1b6efb6b0..e09f3131eb5 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestWANDScorer.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestWANDScorer.java @@ -28,6 +28,9 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.AssertingQuery; +import org.apache.lucene.tests.search.BlockScoreQueryWrapper; +import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/similarities/AxiomaticTestCase.java b/lucene/core/src/test/org/apache/lucene/search/similarities/AxiomaticTestCase.java index f242aecbe8a..6211c723644 100644 --- a/lucene/core/src/test/org/apache/lucene/search/similarities/AxiomaticTestCase.java +++ b/lucene/core/src/test/org/apache/lucene/search/similarities/AxiomaticTestCase.java @@ -17,6 +17,7 @@ package org.apache.lucene.search.similarities; import java.util.Random; +import org.apache.lucene.tests.search.similarities.BaseSimilarityTestCase; public abstract class AxiomaticTestCase extends BaseSimilarityTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/similarities/BasicModelTestCase.java b/lucene/core/src/test/org/apache/lucene/search/similarities/BasicModelTestCase.java index 2439be63797..19b05c0de42 100644 --- a/lucene/core/src/test/org/apache/lucene/search/similarities/BasicModelTestCase.java +++ b/lucene/core/src/test/org/apache/lucene/search/similarities/BasicModelTestCase.java @@ -17,6 +17,7 @@ package org.apache.lucene.search.similarities; import java.util.Random; +import org.apache.lucene.tests.search.similarities.BaseSimilarityTestCase; public abstract class BasicModelTestCase extends BaseSimilarityTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/similarities/DistributionTestCase.java b/lucene/core/src/test/org/apache/lucene/search/similarities/DistributionTestCase.java index 7e1bfd15600..7febf079d97 100644 --- a/lucene/core/src/test/org/apache/lucene/search/similarities/DistributionTestCase.java +++ b/lucene/core/src/test/org/apache/lucene/search/similarities/DistributionTestCase.java @@ -17,6 +17,7 @@ package org.apache.lucene.search.similarities; import java.util.Random; +import org.apache.lucene.tests.search.similarities.BaseSimilarityTestCase; public abstract class DistributionTestCase extends BaseSimilarityTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/similarities/TestBM25Similarity.java b/lucene/core/src/test/org/apache/lucene/search/similarities/TestBM25Similarity.java index c77ef632671..463d62e85cd 100644 --- a/lucene/core/src/test/org/apache/lucene/search/similarities/TestBM25Similarity.java +++ b/lucene/core/src/test/org/apache/lucene/search/similarities/TestBM25Similarity.java @@ -17,6 +17,7 @@ package org.apache.lucene.search.similarities; import java.util.Random; +import org.apache.lucene.tests.search.similarities.BaseSimilarityTestCase; public class TestBM25Similarity extends BaseSimilarityTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/similarities/TestBooleanSimilarity.java b/lucene/core/src/test/org/apache/lucene/search/similarities/TestBooleanSimilarity.java index e0c4d6c4024..441506f2e37 100644 --- a/lucene/core/src/test/org/apache/lucene/search/similarities/TestBooleanSimilarity.java +++ b/lucene/core/src/test/org/apache/lucene/search/similarities/TestBooleanSimilarity.java @@ -33,6 +33,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.similarities.BaseSimilarityTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Version; diff --git a/lucene/core/src/test/org/apache/lucene/search/similarities/TestClassicSimilarity.java b/lucene/core/src/test/org/apache/lucene/search/similarities/TestClassicSimilarity.java index ab301f0a0c1..9a7db0f8348 100644 --- a/lucene/core/src/test/org/apache/lucene/search/similarities/TestClassicSimilarity.java +++ b/lucene/core/src/test/org/apache/lucene/search/similarities/TestClassicSimilarity.java @@ -36,6 +36,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.similarities.BaseSimilarityTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.Version; diff --git a/lucene/core/src/test/org/apache/lucene/search/similarities/TestIndependenceChiSquared.java b/lucene/core/src/test/org/apache/lucene/search/similarities/TestIndependenceChiSquared.java index 650269a59f1..bc14a3bd1b0 100644 --- a/lucene/core/src/test/org/apache/lucene/search/similarities/TestIndependenceChiSquared.java +++ b/lucene/core/src/test/org/apache/lucene/search/similarities/TestIndependenceChiSquared.java @@ -17,6 +17,7 @@ package org.apache.lucene.search.similarities; import java.util.Random; +import org.apache.lucene.tests.search.similarities.BaseSimilarityTestCase; public class TestIndependenceChiSquared extends BaseSimilarityTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/similarities/TestIndependenceSaturated.java b/lucene/core/src/test/org/apache/lucene/search/similarities/TestIndependenceSaturated.java index d323767104d..0c8d8dd47f1 100644 --- a/lucene/core/src/test/org/apache/lucene/search/similarities/TestIndependenceSaturated.java +++ b/lucene/core/src/test/org/apache/lucene/search/similarities/TestIndependenceSaturated.java @@ -17,6 +17,7 @@ package org.apache.lucene.search.similarities; import java.util.Random; +import org.apache.lucene.tests.search.similarities.BaseSimilarityTestCase; public class TestIndependenceSaturated extends BaseSimilarityTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/similarities/TestIndependenceStandardized.java b/lucene/core/src/test/org/apache/lucene/search/similarities/TestIndependenceStandardized.java index b98e856a430..31379261c4d 100644 --- a/lucene/core/src/test/org/apache/lucene/search/similarities/TestIndependenceStandardized.java +++ b/lucene/core/src/test/org/apache/lucene/search/similarities/TestIndependenceStandardized.java @@ -17,6 +17,7 @@ package org.apache.lucene.search.similarities; import java.util.Random; +import org.apache.lucene.tests.search.similarities.BaseSimilarityTestCase; public class TestIndependenceStandardized extends BaseSimilarityTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/similarities/TestIndriDirichletSimilarity.java b/lucene/core/src/test/org/apache/lucene/search/similarities/TestIndriDirichletSimilarity.java index 39300d0c93c..b6ed29ab650 100644 --- a/lucene/core/src/test/org/apache/lucene/search/similarities/TestIndriDirichletSimilarity.java +++ b/lucene/core/src/test/org/apache/lucene/search/similarities/TestIndriDirichletSimilarity.java @@ -17,6 +17,7 @@ package org.apache.lucene.search.similarities; import java.util.Random; +import org.apache.lucene.tests.search.similarities.BaseSimilarityTestCase; public class TestIndriDirichletSimilarity extends BaseSimilarityTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/similarities/TestLMDirichletSimilarity.java b/lucene/core/src/test/org/apache/lucene/search/similarities/TestLMDirichletSimilarity.java index e4ce17b7650..b382935dd88 100644 --- a/lucene/core/src/test/org/apache/lucene/search/similarities/TestLMDirichletSimilarity.java +++ b/lucene/core/src/test/org/apache/lucene/search/similarities/TestLMDirichletSimilarity.java @@ -17,6 +17,7 @@ package org.apache.lucene.search.similarities; import java.util.Random; +import org.apache.lucene.tests.search.similarities.BaseSimilarityTestCase; public class TestLMDirichletSimilarity extends BaseSimilarityTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/similarities/TestLMJelinekMercerSimilarity.java b/lucene/core/src/test/org/apache/lucene/search/similarities/TestLMJelinekMercerSimilarity.java index c747c37058e..fb8c14f135d 100644 --- a/lucene/core/src/test/org/apache/lucene/search/similarities/TestLMJelinekMercerSimilarity.java +++ b/lucene/core/src/test/org/apache/lucene/search/similarities/TestLMJelinekMercerSimilarity.java @@ -17,6 +17,7 @@ package org.apache.lucene.search.similarities; import java.util.Random; +import org.apache.lucene.tests.search.similarities.BaseSimilarityTestCase; public class TestLMJelinekMercerSimilarity extends BaseSimilarityTestCase { diff --git a/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java b/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java index 13b9c4ec04c..aadc2c4b0bc 100644 --- a/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java +++ b/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java @@ -29,7 +29,6 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; -import org.apache.lucene.search.CheckHits; import org.apache.lucene.search.DoubleValuesSource; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchAllDocsQuery; @@ -39,6 +38,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.English; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/TestDrillDownQuery.java b/lucene/facet/src/test/org/apache/lucene/facet/TestDrillDownQuery.java index 8f216f3abd3..63ba26d3859 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/TestDrillDownQuery.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/TestDrillDownQuery.java @@ -34,11 +34,11 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.Query; -import org.apache.lucene.search.QueryUtils; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.util.IOUtils; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java index e7e7ece9678..5698d7d0f69 100644 --- a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java +++ b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java @@ -55,6 +55,9 @@ import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.search.similarities.SimilarityBase; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.CheckHits; +import org.apache.lucene.tests.search.QueryUtils; +import org.apache.lucene.tests.search.RandomApproximationQuery; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BitSet; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/TestCommonTermsQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/TestCommonTermsQuery.java index 5dae7e44217..0ccee64c3f8 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/TestCommonTermsQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/TestCommonTermsQuery.java @@ -41,12 +41,12 @@ import org.apache.lucene.search.BoostQuery; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; -import org.apache.lucene.search.QueryUtils; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.similarities.BM25Similarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestFieldScoreQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestFieldScoreQuery.java index d1984e116cc..e935be87a43 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestFieldScoreQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestFieldScoreQuery.java @@ -20,9 +20,9 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; -import org.apache.lucene.search.QueryUtils; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TopDocs; +import org.apache.lucene.tests.search.QueryUtils; import org.junit.BeforeClass; import org.junit.Test; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionMatchQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionMatchQuery.java index 06627227ab6..793bcc256fe 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionMatchQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionMatchQuery.java @@ -26,9 +26,9 @@ import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.DoubleValuesSource; import org.apache.lucene.search.IndexSearcher; -import org.apache.lucene.search.QueryUtils; import org.apache.lucene.search.ScoreMode; import org.apache.lucene.search.TopDocs; +import org.apache.lucene.tests.search.QueryUtils; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQueryExplanations.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQueryExplanations.java index 2c7fe0190c3..cfc588e670e 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQueryExplanations.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQueryExplanations.java @@ -18,9 +18,9 @@ import org.apache.lucene.queries.function.valuesource.ConstValueSource; import org.apache.lucene.queries.function.valuesource.RangeMapFloatFunction; -import org.apache.lucene.search.BaseExplanationTestCase; import org.apache.lucene.search.BoostQuery; import org.apache.lucene.search.Query; +import org.apache.lucene.tests.search.BaseExplanationTestCase; public class TestFunctionQueryExplanations extends BaseExplanationTestCase { diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionScoreExplanations.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionScoreExplanations.java index b694842d4a9..1efc9bf3a69 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionScoreExplanations.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionScoreExplanations.java @@ -19,7 +19,6 @@ import java.io.IOException; import org.apache.lucene.index.Term; -import org.apache.lucene.search.BaseExplanationTestCase; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.BoostQuery; @@ -31,6 +30,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.similarities.BM25Similarity; import org.apache.lucene.search.similarities.ClassicSimilarity; +import org.apache.lucene.tests.search.BaseExplanationTestCase; public class TestFunctionScoreExplanations extends BaseExplanationTestCase { diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionScoreQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionScoreQuery.java index 0c1666cb978..a7751c753de 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionScoreQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionScoreQuery.java @@ -40,12 +40,12 @@ import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.PhraseQuery; import org.apache.lucene.search.Query; -import org.apache.lucene.search.QueryUtils; import org.apache.lucene.search.ScoreMode; import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.Weight; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.QueryUtils; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestIndexReaderFunctions.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestIndexReaderFunctions.java index f12f8c82dc9..08b697a2359 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestIndexReaderFunctions.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestIndexReaderFunctions.java @@ -30,7 +30,6 @@ import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; -import org.apache.lucene.search.CheckHits; import org.apache.lucene.search.DoubleValuesSource; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.LongValuesSource; @@ -43,6 +42,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.Weight; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestLongNormValueSource.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestLongNormValueSource.java index 8e90b8f6b99..8435e88b154 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestLongNormValueSource.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestLongNormValueSource.java @@ -25,7 +25,6 @@ import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.queries.function.valuesource.NormValueSource; -import org.apache.lucene.search.CheckHits; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; import org.apache.lucene.search.ScoreDoc; @@ -35,6 +34,7 @@ import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java index ef5bc230886..79c93b7865d 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java @@ -37,7 +37,6 @@ import org.apache.lucene.index.Term; import org.apache.lucene.queries.function.docvalues.FloatDocValues; import org.apache.lucene.queries.function.valuesource.*; -import org.apache.lucene.search.CheckHits; import org.apache.lucene.search.DoubleValuesSource; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchNoDocsQuery; @@ -52,6 +51,7 @@ import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.NumericUtils; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestComplexMatches.java b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestComplexMatches.java index a44fe82f092..6b52f4aca04 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestComplexMatches.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestComplexMatches.java @@ -18,8 +18,8 @@ package org.apache.lucene.queries.intervals; import java.io.IOException; -import org.apache.lucene.search.MatchesTestBase; import org.apache.lucene.search.Query; +import org.apache.lucene.tests.search.MatchesTestBase; import org.apache.lucene.util.BytesRef; public class TestComplexMatches extends MatchesTestBase { diff --git a/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervalQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervalQuery.java index 8d62b3b79d5..ba598859c77 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervalQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervalQuery.java @@ -24,12 +24,12 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.BoostQuery; -import org.apache.lucene.search.CheckHits; import org.apache.lucene.search.Explanation; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; public class TestIntervalQuery extends LuceneTestCase { diff --git a/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java b/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java index 3656cdb354a..5d415d783d7 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java @@ -46,9 +46,9 @@ import org.apache.lucene.search.BoostQuery; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; -import org.apache.lucene.search.QueryUtils; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.ArrayUtil; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadCheckQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadCheckQuery.java index fc4c7e5a56a..ecbdc82a248 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadCheckQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadCheckQuery.java @@ -39,11 +39,11 @@ import org.apache.lucene.queries.spans.SpanPositionRangeQuery; import org.apache.lucene.queries.spans.SpanQuery; import org.apache.lucene.queries.spans.SpanTermQuery; -import org.apache.lucene.search.CheckHits; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; import org.apache.lucene.search.WildcardQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.English; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadExplanations.java b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadExplanations.java index 6abd0d171f2..854e245006a 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadExplanations.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadExplanations.java @@ -21,7 +21,7 @@ import org.apache.lucene.queries.spans.SpanOrQuery; import org.apache.lucene.queries.spans.SpanQuery; import org.apache.lucene.queries.spans.SpanTermQuery; -import org.apache.lucene.search.BaseExplanationTestCase; +import org.apache.lucene.tests.search.BaseExplanationTestCase; /** TestExplanations subclass focusing on payload queries */ public class TestPayloadExplanations extends BaseExplanationTestCase { diff --git a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadScoreQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadScoreQuery.java index 054b4f9c5ca..332fdcd855b 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadScoreQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadScoreQuery.java @@ -38,12 +38,12 @@ import org.apache.lucene.search.CollectionStatistics; import org.apache.lucene.search.Explanation; import org.apache.lucene.search.IndexSearcher; -import org.apache.lucene.search.QueryUtils; import org.apache.lucene.search.TermStatistics; import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.WildcardQuery; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.English; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadTermQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadTermQuery.java index 6934c1b5f14..d171985745e 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadTermQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadTermQuery.java @@ -34,15 +34,15 @@ import org.apache.lucene.queries.spans.Spans; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; -import org.apache.lucene.search.CheckHits; import org.apache.lucene.search.IndexSearcher; -import org.apache.lucene.search.QueryUtils; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.ScoreMode; import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.CheckHits; +import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.English; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/BaseSpanExplanationTestCase.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/BaseSpanExplanationTestCase.java index 6caccf5de7b..e17b5a67a5d 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/BaseSpanExplanationTestCase.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/BaseSpanExplanationTestCase.java @@ -24,7 +24,7 @@ import static org.apache.lucene.queries.spans.SpanTestUtil.spanOrQuery; import static org.apache.lucene.queries.spans.SpanTestUtil.spanTermQuery; -import org.apache.lucene.search.BaseExplanationTestCase; +import org.apache.lucene.tests.search.BaseExplanationTestCase; public abstract class BaseSpanExplanationTestCase extends BaseExplanationTestCase { diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/SpanTestUtil.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/SpanTestUtil.java index 39e8eabbb37..f7c6363f3d7 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/SpanTestUtil.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/SpanTestUtil.java @@ -20,7 +20,7 @@ import java.io.IOException; import org.apache.lucene.index.Term; -import org.apache.lucene.search.QueryUtils; +import org.apache.lucene.tests.search.QueryUtils; /** Some utility methods used for testing span queries */ public class SpanTestUtil { diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestBasics.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestBasics.java index c0706b89f17..ec6a149b730 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestBasics.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestBasics.java @@ -32,7 +32,6 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; -import org.apache.lucene.search.CheckHits; import org.apache.lucene.search.DisjunctionMaxQuery; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.PhraseQuery; @@ -41,6 +40,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopScoreDocCollector; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.English; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestFieldMaskingSpanQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestFieldMaskingSpanQuery.java index e0312400667..f1dd7b688bc 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestFieldMaskingSpanQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestFieldMaskingSpanQuery.java @@ -27,14 +27,14 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; -import org.apache.lucene.search.CheckHits; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; -import org.apache.lucene.search.QueryUtils; import org.apache.lucene.search.QueryVisitor; import org.apache.lucene.search.ScoreMode; import org.apache.lucene.search.similarities.TFIDFSimilarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.CheckHits; +import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestNearSpansOrdered.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestNearSpansOrdered.java index 11edffc3c63..9d767152c42 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestNearSpansOrdered.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestNearSpansOrdered.java @@ -27,7 +27,6 @@ import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; -import org.apache.lucene.search.CheckHits; import org.apache.lucene.search.Explanation; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.ScoreMode; @@ -35,6 +34,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.Weight; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; public class TestNearSpansOrdered extends LuceneTestCase { diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanContainQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanContainQuery.java index 6e7b28a9b43..5f2d8272c19 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanContainQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanContainQuery.java @@ -23,11 +23,11 @@ import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; -import org.apache.lucene.search.CheckHits; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; import org.apache.lucene.search.ScoreMode; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; public class TestSpanContainQuery extends LuceneTestCase { diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanExplanationsOfNonMatches.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanExplanationsOfNonMatches.java index 8110de6b974..8f4fea2cb3f 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanExplanationsOfNonMatches.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanExplanationsOfNonMatches.java @@ -16,8 +16,8 @@ */ package org.apache.lucene.queries.spans; -import org.apache.lucene.search.CheckHits; import org.apache.lucene.search.Query; +import org.apache.lucene.tests.search.CheckHits; /** subclass of TestSimpleExplanations that verifies non matches. */ public class TestSpanExplanationsOfNonMatches extends TestSpanExplanations { diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanMatches.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanMatches.java index 232c53cbbfa..dd809982275 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanMatches.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanMatches.java @@ -19,8 +19,8 @@ import java.io.IOException; import org.apache.lucene.index.Term; -import org.apache.lucene.search.MatchesTestBase; import org.apache.lucene.search.Query; +import org.apache.lucene.tests.search.MatchesTestBase; public class TestSpanMatches extends MatchesTestBase { diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanNearQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanNearQuery.java index 23ad13c165e..82bc04ac4c2 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanNearQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanNearQuery.java @@ -24,8 +24,8 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.IndexSearcher; -import org.apache.lucene.search.QueryUtils; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; /** Basic tests for SpanNearQuery */ diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanNotQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanNotQuery.java index 4244c020d25..caac2421d18 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanNotQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanNotQuery.java @@ -24,8 +24,8 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.IndexSearcher; -import org.apache.lucene.search.QueryUtils; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; /** Basic tests for SpanNotQuery */ diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanOrQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanOrQuery.java index 6ab4c43b23e..68cbcedf6b4 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanOrQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanOrQuery.java @@ -17,7 +17,7 @@ package org.apache.lucene.queries.spans; import org.apache.lucene.index.Term; -import org.apache.lucene.search.QueryUtils; +import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; /** Basic tests for SpanOrQuery */ diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanSearchEquivalence.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanSearchEquivalence.java index e2a6d319144..77444ac73cb 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanSearchEquivalence.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanSearchEquivalence.java @@ -23,8 +23,8 @@ import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.PhraseQuery; import org.apache.lucene.search.Query; -import org.apache.lucene.search.SearchEquivalenceTestBase; import org.apache.lucene.search.TermQuery; +import org.apache.lucene.tests.search.SearchEquivalenceTestBase; /** Basic equivalence tests for span queries */ public class TestSpanSearchEquivalence extends SearchEquivalenceTestBase { diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanTermQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanTermQuery.java index 786ee368693..cfdb7b3a9c5 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanTermQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanTermQuery.java @@ -24,8 +24,8 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.IndexSearcher; -import org.apache.lucene.search.QueryUtils; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; /** Basic tests for SpanTermQuery */ diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpans.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpans.java index 07f4b2afeae..955d18a541a 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpans.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpans.java @@ -34,7 +34,6 @@ import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; -import org.apache.lucene.search.CheckHits; import org.apache.lucene.search.FuzzyQuery; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.PrefixQuery; @@ -42,6 +41,7 @@ import org.apache.lucene.search.ScoreMode; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; public class TestSpans extends LuceneTestCase { diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpansEnum.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpansEnum.java index cc43bb44ddd..f9df0401ff1 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpansEnum.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpansEnum.java @@ -24,10 +24,10 @@ import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; -import org.apache.lucene.search.CheckHits; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.English; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/TestSrndQuery.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/TestSrndQuery.java index 7a157cd8562..1dd8419bc93 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/TestSrndQuery.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/TestSrndQuery.java @@ -18,7 +18,7 @@ import org.apache.lucene.queryparser.surround.parser.QueryParser; import org.apache.lucene.search.Query; -import org.apache.lucene.search.QueryUtils; +import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestCombinedFieldQuery.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestCombinedFieldQuery.java index dbc452e26b1..1530ce76684 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestCombinedFieldQuery.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestCombinedFieldQuery.java @@ -32,7 +32,6 @@ import org.apache.lucene.index.MultiReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; -import org.apache.lucene.search.CheckHits; import org.apache.lucene.search.CollectionStatistics; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchNoDocsQuery; @@ -50,6 +49,7 @@ import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; import org.apache.lucene.store.MMapDirectory; +import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestCoveringQuery.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestCoveringQuery.java index 5c1c51f7ba3..4627ce2c264 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestCoveringQuery.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestCoveringQuery.java @@ -36,9 +36,9 @@ import org.apache.lucene.search.LongValuesSource; import org.apache.lucene.search.PhraseQuery; import org.apache.lucene.search.Query; -import org.apache.lucene.search.QueryUtils; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; public class TestCoveringQuery extends LuceneTestCase { diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestIndexSortSortedNumericDocValuesRangeQuery.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestIndexSortSortedNumericDocValuesRangeQuery.java index 0c4d2bb12c2..0b5fc71626d 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestIndexSortSortedNumericDocValuesRangeQuery.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestIndexSortSortedNumericDocValuesRangeQuery.java @@ -34,7 +34,6 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchNoDocsQuery; import org.apache.lucene.search.Query; -import org.apache.lucene.search.QueryUtils; import org.apache.lucene.search.ScoreMode; import org.apache.lucene.search.Scorer; import org.apache.lucene.search.Sort; @@ -43,6 +42,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.Weight; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestLargeNumHitsTopDocsCollector.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestLargeNumHitsTopDocsCollector.java index fa300b53c87..7ebbd5e8165 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestLargeNumHitsTopDocsCollector.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestLargeNumHitsTopDocsCollector.java @@ -25,7 +25,6 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; -import org.apache.lucene.search.CheckHits; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.Query; @@ -34,6 +33,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.TopScoreDocCollector; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; public class TestLargeNumHitsTopDocsCollector extends LuceneTestCase { diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestLatLonBoundingBoxQueries.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestLatLonBoundingBoxQueries.java index c800fdf4544..b33462d70bc 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestLatLonBoundingBoxQueries.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestLatLonBoundingBoxQueries.java @@ -26,11 +26,11 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.sandbox.document.LatLonBoundingBox; -import org.apache.lucene.search.BaseRangeFieldQueryTestCase; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.geo.GeoTestUtil; +import org.apache.lucene.tests.search.BaseRangeFieldQueryTestCase; /** Random testing for GeoBoundingBoxField type. */ public class TestLatLonBoundingBoxQueries extends BaseRangeFieldQueryTestCase { diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestMultiRangeQueries.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestMultiRangeQueries.java index e6d83b47531..df3d4df9ca7 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestMultiRangeQueries.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestMultiRangeQueries.java @@ -34,10 +34,10 @@ import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; -import org.apache.lucene.search.QueryUtils; import org.apache.lucene.search.Sort; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestQueryProfilerIndexSearcher.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestQueryProfilerIndexSearcher.java index f05f3af8b7a..50aad278517 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestQueryProfilerIndexSearcher.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestQueryProfilerIndexSearcher.java @@ -32,10 +32,10 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.LRUQueryCache; import org.apache.lucene.search.Query; -import org.apache.lucene.search.RandomApproximationQuery; import org.apache.lucene.search.Sort; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.RandomApproximationQuery; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/package.html b/lucene/test-framework/src/java/org/apache/lucene/search/package.html deleted file mode 100644 index c0360fdd3c7..00000000000 --- a/lucene/test-framework/src/java/org/apache/lucene/search/package.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - -Support for testing search components. -

-The primary classes are: -

    -
  • {@link org.apache.lucene.search.QueryUtils}: Useful methods for testing Query classes. -
  • {@link org.apache.lucene.search.ShardSearchingTestBase}: Base class for simulating distributed search. -
- - diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/similarities/package.html b/lucene/test-framework/src/java/org/apache/lucene/search/similarities/package.html deleted file mode 100644 index aaabf2c127b..00000000000 --- a/lucene/test-framework/src/java/org/apache/lucene/search/similarities/package.html +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - -Support for testing similarities -

-The primary classes are: -

    -
  • {@link org.apache.lucene.search.similarities.RandomSimilarity}: Randomizes similarity per-field in tests. -
- - diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/AssertingBulkScorer.java b/lucene/test-framework/src/java/org/apache/lucene/tests/search/AssertingBulkScorer.java similarity index 94% rename from lucene/test-framework/src/java/org/apache/lucene/search/AssertingBulkScorer.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/search/AssertingBulkScorer.java index a44523adf29..6d9c5e0fcd3 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/AssertingBulkScorer.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/search/AssertingBulkScorer.java @@ -14,12 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.search; +package org.apache.lucene.tests.search; import com.carrotsearch.randomizedtesting.generators.RandomNumbers; import java.io.IOException; import java.util.Random; import org.apache.lucene.index.PostingsEnum; +import org.apache.lucene.search.BulkScorer; +import org.apache.lucene.search.DocIdSetIterator; +import org.apache.lucene.search.LeafCollector; +import org.apache.lucene.search.ScoreMode; import org.apache.lucene.util.Bits; /** Wraps a Scorer with additional checks */ diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/AssertingCollector.java b/lucene/test-framework/src/java/org/apache/lucene/tests/search/AssertingCollector.java similarity index 90% rename from lucene/test-framework/src/java/org/apache/lucene/search/AssertingCollector.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/search/AssertingCollector.java index 4e6aef7b0af..7ffa9350e2b 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/AssertingCollector.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/search/AssertingCollector.java @@ -14,10 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.search; +package org.apache.lucene.tests.search; import java.io.IOException; import org.apache.lucene.index.LeafReaderContext; +import org.apache.lucene.search.Collector; +import org.apache.lucene.search.DocIdSetIterator; +import org.apache.lucene.search.FilterCollector; +import org.apache.lucene.search.LeafCollector; /** A collector that asserts that it is used correctly. */ class AssertingCollector extends FilterCollector { diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/AssertingIndexSearcher.java b/lucene/test-framework/src/java/org/apache/lucene/tests/search/AssertingIndexSearcher.java similarity index 91% rename from lucene/test-framework/src/java/org/apache/lucene/search/AssertingIndexSearcher.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/search/AssertingIndexSearcher.java index 626139625bc..83abd788309 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/AssertingIndexSearcher.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/search/AssertingIndexSearcher.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.search; +package org.apache.lucene.tests.search; import java.io.IOException; import java.util.List; @@ -23,6 +23,11 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReaderContext; import org.apache.lucene.index.LeafReaderContext; +import org.apache.lucene.search.Collector; +import org.apache.lucene.search.IndexSearcher; +import org.apache.lucene.search.Query; +import org.apache.lucene.search.ScoreMode; +import org.apache.lucene.search.Weight; /** * Helper class that adds some extra checks to ensure correct usage of {@code IndexSearcher} and diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/AssertingLeafCollector.java b/lucene/test-framework/src/java/org/apache/lucene/tests/search/AssertingLeafCollector.java similarity index 89% rename from lucene/test-framework/src/java/org/apache/lucene/search/AssertingLeafCollector.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/search/AssertingLeafCollector.java index e61b3b9bf4c..5c7801e5122 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/AssertingLeafCollector.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/search/AssertingLeafCollector.java @@ -14,9 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.search; +package org.apache.lucene.tests.search; import java.io.IOException; +import org.apache.lucene.search.DocIdSetIterator; +import org.apache.lucene.search.FilterLeafCollector; +import org.apache.lucene.search.LeafCollector; +import org.apache.lucene.search.Scorable; /** Wraps another Collector and checks that order is respected. */ class AssertingLeafCollector extends FilterLeafCollector { diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/AssertingMatches.java b/lucene/test-framework/src/java/org/apache/lucene/tests/search/AssertingMatches.java similarity index 83% rename from lucene/test-framework/src/java/org/apache/lucene/search/AssertingMatches.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/search/AssertingMatches.java index 53827783473..8c6121b3e3e 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/AssertingMatches.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/search/AssertingMatches.java @@ -15,18 +15,21 @@ * limitations under the License. */ -package org.apache.lucene.search; +package org.apache.lucene.tests.search; import java.io.IOException; import java.util.Collection; import java.util.Collections; import java.util.Iterator; +import org.apache.lucene.search.Matches; +import org.apache.lucene.search.MatchesIterator; -class AssertingMatches implements Matches { +/** An implementation of {@link Matches} with additional consistency checks. */ +public class AssertingMatches implements Matches { private final Matches in; - AssertingMatches(Matches matches) { + public AssertingMatches(Matches matches) { this.in = matches; } diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/AssertingMatchesIterator.java b/lucene/test-framework/src/java/org/apache/lucene/tests/search/AssertingMatchesIterator.java similarity index 94% rename from lucene/test-framework/src/java/org/apache/lucene/search/AssertingMatchesIterator.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/search/AssertingMatchesIterator.java index 40239590dee..ccb3fbc69fe 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/AssertingMatchesIterator.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/search/AssertingMatchesIterator.java @@ -15,9 +15,11 @@ * limitations under the License. */ -package org.apache.lucene.search; +package org.apache.lucene.tests.search; import java.io.IOException; +import org.apache.lucene.search.MatchesIterator; +import org.apache.lucene.search.Query; class AssertingMatchesIterator implements MatchesIterator { diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/AssertingQuery.java b/lucene/test-framework/src/java/org/apache/lucene/tests/search/AssertingQuery.java similarity index 90% rename from lucene/test-framework/src/java/org/apache/lucene/search/AssertingQuery.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/search/AssertingQuery.java index 2bea8003838..0947ff908bb 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/AssertingQuery.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/search/AssertingQuery.java @@ -14,11 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.search; +package org.apache.lucene.tests.search; import java.io.IOException; import java.util.Random; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.search.IndexSearcher; +import org.apache.lucene.search.Query; +import org.apache.lucene.search.QueryVisitor; +import org.apache.lucene.search.ScoreMode; +import org.apache.lucene.search.Weight; /** Assertion-enabled query. */ public final class AssertingQuery extends Query { diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/AssertingScorable.java b/lucene/test-framework/src/java/org/apache/lucene/tests/search/AssertingScorable.java similarity index 90% rename from lucene/test-framework/src/java/org/apache/lucene/search/AssertingScorable.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/search/AssertingScorable.java index 9cc40bd2ce3..2a431ab1cfd 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/AssertingScorable.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/search/AssertingScorable.java @@ -15,9 +15,14 @@ * limitations under the License. */ -package org.apache.lucene.search; +package org.apache.lucene.tests.search; import java.io.IOException; +import org.apache.lucene.search.DocIdSetIterator; +import org.apache.lucene.search.FilterScorable; +import org.apache.lucene.search.FilterScorer; +import org.apache.lucene.search.Scorable; +import org.apache.lucene.search.Scorer; /** Wraps another Scorable and asserts that scores are reasonable and only called when positioned */ public class AssertingScorable extends FilterScorable { @@ -79,7 +84,7 @@ public static Scorable unwrap(Scorable in) { while (true) { if (in instanceof AssertingScorable) in = ((AssertingScorable) in).in; else if (in instanceof AssertingScorer) in = ((AssertingScorer) in).in; - else if (in instanceof WrappedScorer) in = ((WrappedScorer) in).in; + else if (in instanceof WrappedScorer) in = ((WrappedScorer) in).unwrap(); else return in; } } diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/AssertingScorer.java b/lucene/test-framework/src/java/org/apache/lucene/tests/search/AssertingScorer.java similarity index 97% rename from lucene/test-framework/src/java/org/apache/lucene/search/AssertingScorer.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/search/AssertingScorer.java index 83ffc789b40..8792535375d 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/AssertingScorer.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/search/AssertingScorer.java @@ -14,12 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.search; +package org.apache.lucene.tests.search; import java.io.IOException; import java.util.Collection; import java.util.Collections; import java.util.Random; +import org.apache.lucene.search.DocIdSetIterator; +import org.apache.lucene.search.ScoreMode; +import org.apache.lucene.search.Scorer; +import org.apache.lucene.search.TwoPhaseIterator; /** Wraps a Scorer with additional checks */ public class AssertingScorer extends Scorer { @@ -48,7 +52,7 @@ public static Scorer wrap(Random random, Scorer other, ScoreMode scoreMode) { int lastShallowTarget = -1; private AssertingScorer(Random random, Scorer in, ScoreMode scoreMode) { - super(in.weight); + super(in.getWeight()); this.random = random; this.in = in; this.scoreMode = scoreMode; diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/AssertingWeight.java b/lucene/test-framework/src/java/org/apache/lucene/tests/search/AssertingWeight.java similarity index 91% rename from lucene/test-framework/src/java/org/apache/lucene/search/AssertingWeight.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/search/AssertingWeight.java index 4b6151c415a..9dec127789b 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/AssertingWeight.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/search/AssertingWeight.java @@ -14,13 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.search; +package org.apache.lucene.tests.search; import static org.apache.lucene.tests.util.LuceneTestCase.usually; import java.io.IOException; import java.util.Random; import org.apache.lucene.index.LeafReaderContext; +import org.apache.lucene.search.BulkScorer; +import org.apache.lucene.search.FilterWeight; +import org.apache.lucene.search.Matches; +import org.apache.lucene.search.ScoreMode; +import org.apache.lucene.search.Scorer; +import org.apache.lucene.search.ScorerSupplier; +import org.apache.lucene.search.Weight; class AssertingWeight extends FilterWeight { diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/BaseExplanationTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/search/BaseExplanationTestCase.java similarity index 95% rename from lucene/test-framework/src/java/org/apache/lucene/search/BaseExplanationTestCase.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/search/BaseExplanationTestCase.java index 63b933c2e83..be87c18b0d6 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/BaseExplanationTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/search/BaseExplanationTestCase.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.search; +package org.apache.lucene.tests.search; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.MockAnalyzer; @@ -24,6 +24,11 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; +import org.apache.lucene.search.BooleanClause; +import org.apache.lucene.search.BooleanQuery; +import org.apache.lucene.search.IndexSearcher; +import org.apache.lucene.search.Query; +import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/BaseRangeFieldQueryTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/search/BaseRangeFieldQueryTestCase.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/search/BaseRangeFieldQueryTestCase.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/search/BaseRangeFieldQueryTestCase.java index ceede3fdc9a..ffbc2ef091c 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/BaseRangeFieldQueryTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/search/BaseRangeFieldQueryTestCase.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.search; +package org.apache.lucene.tests.search; import java.io.IOException; import java.util.Arrays; @@ -33,6 +33,10 @@ import org.apache.lucene.index.NumericDocValues; import org.apache.lucene.index.SerialMergeScheduler; import org.apache.lucene.index.Term; +import org.apache.lucene.search.IndexSearcher; +import org.apache.lucene.search.Query; +import org.apache.lucene.search.ScoreMode; +import org.apache.lucene.search.SimpleCollector; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/BlockScoreQueryWrapper.java b/lucene/test-framework/src/java/org/apache/lucene/tests/search/BlockScoreQueryWrapper.java similarity index 94% rename from lucene/test-framework/src/java/org/apache/lucene/search/BlockScoreQueryWrapper.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/search/BlockScoreQueryWrapper.java index be55abad03b..ebb5c4bd132 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/BlockScoreQueryWrapper.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/search/BlockScoreQueryWrapper.java @@ -14,13 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.search; +package org.apache.lucene.tests.search; import java.io.IOException; import java.util.Arrays; import java.util.Objects; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.LeafReaderContext; +import org.apache.lucene.search.DocIdSetIterator; +import org.apache.lucene.search.Explanation; +import org.apache.lucene.search.IndexSearcher; +import org.apache.lucene.search.Query; +import org.apache.lucene.search.QueryVisitor; +import org.apache.lucene.search.ScoreMode; +import org.apache.lucene.search.Scorer; +import org.apache.lucene.search.Weight; import org.apache.lucene.util.ArrayUtil; /** diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/BulkScorerWrapperScorer.java b/lucene/test-framework/src/java/org/apache/lucene/tests/search/BulkScorerWrapperScorer.java similarity index 91% rename from lucene/test-framework/src/java/org/apache/lucene/search/BulkScorerWrapperScorer.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/search/BulkScorerWrapperScorer.java index 54bd6699ce7..e7476ecdcb8 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/BulkScorerWrapperScorer.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/search/BulkScorerWrapperScorer.java @@ -14,10 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.search; +package org.apache.lucene.tests.search; import java.io.IOException; import java.util.Arrays; +import org.apache.lucene.search.BulkScorer; +import org.apache.lucene.search.DocIdSetIterator; +import org.apache.lucene.search.LeafCollector; +import org.apache.lucene.search.Scorable; +import org.apache.lucene.search.Scorer; +import org.apache.lucene.search.Weight; /** A {@link BulkScorer}-backed scorer. */ public class BulkScorerWrapperScorer extends Scorer { diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/CheckHits.java b/lucene/test-framework/src/java/org/apache/lucene/tests/search/CheckHits.java similarity index 96% rename from lucene/test-framework/src/java/org/apache/lucene/search/CheckHits.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/search/CheckHits.java index 73f12b61e16..7936490523b 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/CheckHits.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/search/CheckHits.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.search; +package org.apache.lucene.tests.search; import static org.junit.Assert.*; @@ -26,6 +26,23 @@ import java.util.regex.Pattern; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.LeafReaderContext; +import org.apache.lucene.search.Collector; +import org.apache.lucene.search.DocIdSetIterator; +import org.apache.lucene.search.Explanation; +import org.apache.lucene.search.IndexSearcher; +import org.apache.lucene.search.Matches; +import org.apache.lucene.search.Query; +import org.apache.lucene.search.Scorable; +import org.apache.lucene.search.ScoreDoc; +import org.apache.lucene.search.ScoreMode; +import org.apache.lucene.search.Scorer; +import org.apache.lucene.search.SimpleCollector; +import org.apache.lucene.search.Sort; +import org.apache.lucene.search.TopDocs; +import org.apache.lucene.search.TopFieldDocs; +import org.apache.lucene.search.TopScoreDocCollector; +import org.apache.lucene.search.TwoPhaseIterator; +import org.apache.lucene.search.Weight; import org.apache.lucene.tests.util.LuceneTestCase; /** Utility class for asserting expected hits in tests. */ @@ -641,8 +658,8 @@ private static void doCheckMaxScores(Random random, Query query, IndexSearcher s } TwoPhaseIterator twoPhase1 = s1.twoPhaseIterator(); TwoPhaseIterator twoPhase2 = s2.twoPhaseIterator(); - DocIdSetIterator approx1 = twoPhase1 == null ? s1.iterator() : twoPhase1.approximation; - DocIdSetIterator approx2 = twoPhase2 == null ? s2.iterator() : twoPhase2.approximation; + DocIdSetIterator approx1 = twoPhase1 == null ? s1.iterator() : twoPhase1.approximation(); + DocIdSetIterator approx2 = twoPhase2 == null ? s2.iterator() : twoPhase2.approximation(); int upTo = -1; float maxScore = 0; float minScore = 0; @@ -689,8 +706,8 @@ private static void doCheckMaxScores(Random random, Query query, IndexSearcher s } TwoPhaseIterator twoPhase1 = s1.twoPhaseIterator(); TwoPhaseIterator twoPhase2 = s2.twoPhaseIterator(); - DocIdSetIterator approx1 = twoPhase1 == null ? s1.iterator() : twoPhase1.approximation; - DocIdSetIterator approx2 = twoPhase2 == null ? s2.iterator() : twoPhase2.approximation; + DocIdSetIterator approx1 = twoPhase1 == null ? s1.iterator() : twoPhase1.approximation(); + DocIdSetIterator approx2 = twoPhase2 == null ? s2.iterator() : twoPhase2.approximation(); int upTo = -1; float minScore = 0; diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/MatchesTestBase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/search/MatchesTestBase.java similarity index 90% rename from lucene/test-framework/src/java/org/apache/lucene/search/MatchesTestBase.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/search/MatchesTestBase.java index 03315108be5..c4a9b719f28 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/MatchesTestBase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/search/MatchesTestBase.java @@ -15,12 +15,13 @@ * limitations under the License. */ -package org.apache.lucene.search; +package org.apache.lucene.tests.search; import java.io.IOException; import java.util.Arrays; import java.util.HashSet; import java.util.IdentityHashMap; +import java.util.List; import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; @@ -35,6 +36,13 @@ import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.ReaderUtil; +import org.apache.lucene.search.IndexSearcher; +import org.apache.lucene.search.Matches; +import org.apache.lucene.search.MatchesIterator; +import org.apache.lucene.search.NamedMatches; +import org.apache.lucene.search.Query; +import org.apache.lucene.search.ScoreMode; +import org.apache.lucene.search.Weight; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.util.LuceneTestCase; @@ -120,8 +128,8 @@ public void setUp() throws Exception { protected void checkMatches(Query q, String field, int[][] expected) throws IOException { Weight w = searcher.createWeight(searcher.rewrite(q), ScoreMode.COMPLETE, 1); for (int i = 0; i < expected.length; i++) { - LeafReaderContext ctx = - searcher.leafContexts.get(ReaderUtil.subIndex(expected[i][0], searcher.leafContexts)); + List leafContexts = searcher.getLeafContexts(); + LeafReaderContext ctx = leafContexts.get(ReaderUtil.subIndex(expected[i][0], leafContexts)); int doc = expected[i][0] - ctx.docBase; Matches matches = w.matches(ctx, doc); if (matches == null) { @@ -148,8 +156,8 @@ protected void checkMatches(Query q, String field, int[][] expected) throws IOEx protected void checkLabelCount(Query q, String field, int[] expected) throws IOException { Weight w = searcher.createWeight(searcher.rewrite(q), ScoreMode.COMPLETE, 1); for (int i = 0; i < expected.length; i++) { - LeafReaderContext ctx = - searcher.leafContexts.get(ReaderUtil.subIndex(i, searcher.leafContexts)); + List leafContexts = searcher.getLeafContexts(); + LeafReaderContext ctx = leafContexts.get(ReaderUtil.subIndex(i, leafContexts)); int doc = i - ctx.docBase; Matches matches = w.matches(ctx, doc); if (matches == null) { @@ -204,8 +212,8 @@ protected void checkNoPositionsMatches(Query q, String field, boolean[] expected throws IOException { Weight w = searcher.createWeight(searcher.rewrite(q), ScoreMode.COMPLETE, 1); for (int i = 0; i < expected.length; i++) { - LeafReaderContext ctx = - searcher.leafContexts.get(ReaderUtil.subIndex(i, searcher.leafContexts)); + List leafContexts = searcher.getLeafContexts(); + LeafReaderContext ctx = leafContexts.get(ReaderUtil.subIndex(i, leafContexts)); int doc = i - ctx.docBase; Matches matches = w.matches(ctx, doc); if (expected[i]) { @@ -231,8 +239,8 @@ protected void checkNoPositionsMatches(Query q, String field, boolean[] expected protected void checkSubMatches(Query q, String[][] expectedNames) throws IOException { Weight w = searcher.createWeight(searcher.rewrite(q), ScoreMode.COMPLETE_NO_SCORES, 1); for (int i = 0; i < expectedNames.length; i++) { - LeafReaderContext ctx = - searcher.leafContexts.get(ReaderUtil.subIndex(i, searcher.leafContexts)); + List leafContexts = searcher.getLeafContexts(); + LeafReaderContext ctx = leafContexts.get(ReaderUtil.subIndex(i, leafContexts)); int doc = i - ctx.docBase; Matches matches = w.matches(ctx, doc); if (matches == null) { @@ -262,9 +270,9 @@ protected void checkSubMatches(Query q, String[][] expectedNames) throws IOExcep */ protected void assertIsLeafMatch(Query q, String field) throws IOException { Weight w = searcher.createWeight(searcher.rewrite(q), ScoreMode.COMPLETE, 1); - for (int i = 0; i < searcher.reader.maxDoc(); i++) { - LeafReaderContext ctx = - searcher.leafContexts.get(ReaderUtil.subIndex(i, searcher.leafContexts)); + for (int i = 0; i < searcher.getIndexReader().maxDoc(); i++) { + List leafContexts = searcher.getLeafContexts(); + LeafReaderContext ctx = leafContexts.get(ReaderUtil.subIndex(i, leafContexts)); int doc = i - ctx.docBase; Matches matches = w.matches(ctx, doc); if (matches == null) { @@ -291,8 +299,8 @@ protected void checkTermMatches(Query q, String field, TermMatch[][][] expected) throws IOException { Weight w = searcher.createWeight(searcher.rewrite(q), ScoreMode.COMPLETE, 1); for (int i = 0; i < expected.length; i++) { - LeafReaderContext ctx = - searcher.leafContexts.get(ReaderUtil.subIndex(i, searcher.leafContexts)); + List leafContexts = searcher.getLeafContexts(); + LeafReaderContext ctx = leafContexts.get(ReaderUtil.subIndex(i, leafContexts)); int doc = i - ctx.docBase; Matches matches = w.matches(ctx, doc); if (matches == null) { diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java b/lucene/test-framework/src/java/org/apache/lucene/tests/search/QueryUtils.java similarity index 97% rename from lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/search/QueryUtils.java index 8dcf6a6fab5..e5465ed6435 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/search/QueryUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.search; +package org.apache.lucene.tests.search; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -39,6 +39,18 @@ import org.apache.lucene.index.StoredFieldVisitor; import org.apache.lucene.index.Terms; import org.apache.lucene.index.VectorValues; +import org.apache.lucene.search.BulkScorer; +import org.apache.lucene.search.DocIdSetIterator; +import org.apache.lucene.search.IndexSearcher; +import org.apache.lucene.search.LeafCollector; +import org.apache.lucene.search.Query; +import org.apache.lucene.search.QueryVisitor; +import org.apache.lucene.search.Scorable; +import org.apache.lucene.search.ScoreMode; +import org.apache.lucene.search.Scorer; +import org.apache.lucene.search.SimpleCollector; +import org.apache.lucene.search.TopDocs; +import org.apache.lucene.search.Weight; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.Bits; import org.apache.lucene.util.Version; diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/RandomApproximationQuery.java b/lucene/test-framework/src/java/org/apache/lucene/tests/search/RandomApproximationQuery.java similarity index 91% rename from lucene/test-framework/src/java/org/apache/lucene/search/RandomApproximationQuery.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/search/RandomApproximationQuery.java index 48318a7625c..78dc60732fb 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/RandomApproximationQuery.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/search/RandomApproximationQuery.java @@ -14,13 +14,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.search; +package org.apache.lucene.tests.search; import com.carrotsearch.randomizedtesting.generators.RandomNumbers; import java.io.IOException; import java.util.Random; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.LeafReaderContext; +import org.apache.lucene.search.DocIdSetIterator; +import org.apache.lucene.search.FilterWeight; +import org.apache.lucene.search.IndexSearcher; +import org.apache.lucene.search.Query; +import org.apache.lucene.search.QueryVisitor; +import org.apache.lucene.search.ScoreMode; +import org.apache.lucene.search.Scorer; +import org.apache.lucene.search.TwoPhaseIterator; +import org.apache.lucene.search.Weight; /** A {@link Query} that adds random approximations to its scorers. */ public class RandomApproximationQuery extends Query { @@ -111,7 +120,7 @@ public float score() throws IOException { @Override public int advanceShallow(int target) throws IOException { - if (scorer.docID() > target && twoPhaseView.approximation.docID() != scorer.docID()) { + if (scorer.docID() > target && twoPhaseView.approximation().docID() != scorer.docID()) { // The random approximation can return doc ids that are not present in the underlying // scorer. These additional doc ids are always *before* the next matching doc so we // cannot use them to shallow advance the main scorer which is already ahead. diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/ScorerIndexSearcher.java b/lucene/test-framework/src/java/org/apache/lucene/tests/search/ScorerIndexSearcher.java similarity index 88% rename from lucene/test-framework/src/java/org/apache/lucene/search/ScorerIndexSearcher.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/search/ScorerIndexSearcher.java index 5a7d0f3db1c..d3a414bc988 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/ScorerIndexSearcher.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/search/ScorerIndexSearcher.java @@ -14,13 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.search; +package org.apache.lucene.tests.search; import java.io.IOException; import java.util.List; import java.util.concurrent.Executor; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.LeafReaderContext; +import org.apache.lucene.search.BulkScorer; +import org.apache.lucene.search.Collector; +import org.apache.lucene.search.DocIdSetIterator; +import org.apache.lucene.search.IndexSearcher; +import org.apache.lucene.search.LeafCollector; +import org.apache.lucene.search.Scorer; +import org.apache.lucene.search.Weight; import org.apache.lucene.util.Bits; /** An {@link IndexSearcher} that always uses the {@link Scorer} API, never {@link BulkScorer}. */ diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/SearchEquivalenceTestBase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/search/SearchEquivalenceTestBase.java similarity index 95% rename from lucene/test-framework/src/java/org/apache/lucene/search/SearchEquivalenceTestBase.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/search/SearchEquivalenceTestBase.java index fd187136e76..7e469247251 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/SearchEquivalenceTestBase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/search/SearchEquivalenceTestBase.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.search; +package org.apache.lucene.tests.search; import java.util.BitSet; import java.util.Random; @@ -29,6 +29,14 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; +import org.apache.lucene.search.BooleanQuery; +import org.apache.lucene.search.IndexSearcher; +import org.apache.lucene.search.PhraseQuery; +import org.apache.lucene.search.Query; +import org.apache.lucene.search.Sort; +import org.apache.lucene.search.TermQuery; +import org.apache.lucene.search.TermRangeQuery; +import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/ShardSearchingTestBase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/search/ShardSearchingTestBase.java similarity index 97% rename from lucene/test-framework/src/java/org/apache/lucene/search/ShardSearchingTestBase.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/search/ShardSearchingTestBase.java index 4e89e073a7b..a198ebae0f8 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/ShardSearchingTestBase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/search/ShardSearchingTestBase.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.search; +package org.apache.lucene.tests.search; import java.io.Closeable; import java.io.IOException; @@ -30,6 +30,17 @@ import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.Term; import org.apache.lucene.index.TermStates; +import org.apache.lucene.search.CollectionStatistics; +import org.apache.lucene.search.IndexSearcher; +import org.apache.lucene.search.Query; +import org.apache.lucene.search.QueryVisitor; +import org.apache.lucene.search.ScoreDoc; +import org.apache.lucene.search.SearcherLifetimeManager; +import org.apache.lucene.search.SearcherManager; +import org.apache.lucene.search.Sort; +import org.apache.lucene.search.TermStatistics; +import org.apache.lucene.search.TopDocs; +import org.apache.lucene.search.TopFieldDocs; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; @@ -607,7 +618,7 @@ public void run() { protected NodeState[] nodes; int maxSearcherAgeSeconds; - long endTimeNanos; + public long endTimeNanos; private Thread changeIndicesThread; protected void start(int numNodes, double runTimeSec, int maxSearcherAgeSeconds) diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/search/package-info.java b/lucene/test-framework/src/java/org/apache/lucene/tests/search/package-info.java new file mode 100644 index 00000000000..68b03661ea4 --- /dev/null +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/search/package-info.java @@ -0,0 +1,30 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * Support for testing search components. + * + *

The primary classes are: + * + *

    + *
  • {@link org.apache.lucene.tests.search.QueryUtils}: Useful methods for testing Query + * classes. + *
  • {@link org.apache.lucene.tests.search.ShardSearchingTestBase}: Base class for simulating + * distributed search. + *
+ */ +package org.apache.lucene.tests.search; diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/similarities/AssertingSimilarity.java b/lucene/test-framework/src/java/org/apache/lucene/tests/search/similarities/AssertingSimilarity.java similarity index 97% rename from lucene/test-framework/src/java/org/apache/lucene/search/similarities/AssertingSimilarity.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/search/similarities/AssertingSimilarity.java index 1f5c3a01f4e..b4bf4af31ba 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/similarities/AssertingSimilarity.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/search/similarities/AssertingSimilarity.java @@ -14,12 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.search.similarities; +package org.apache.lucene.tests.search.similarities; import org.apache.lucene.index.FieldInvertState; import org.apache.lucene.search.CollectionStatistics; import org.apache.lucene.search.Explanation; import org.apache.lucene.search.TermStatistics; +import org.apache.lucene.search.similarities.Similarity; /** wraps a similarity with checks for testing */ public class AssertingSimilarity extends Similarity { diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/similarities/BaseSimilarityTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/search/similarities/BaseSimilarityTestCase.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/search/similarities/BaseSimilarityTestCase.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/search/similarities/BaseSimilarityTestCase.java index 4e560cb5e4b..f7898031903 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/similarities/BaseSimilarityTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/search/similarities/BaseSimilarityTestCase.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.search.similarities; +package org.apache.lucene.tests.search.similarities; import java.io.IOException; import java.util.Random; @@ -23,12 +23,14 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.RandomIndexWriter; -import org.apache.lucene.search.CheckHits; import org.apache.lucene.search.CollectionStatistics; import org.apache.lucene.search.Explanation; import org.apache.lucene.search.TermStatistics; +import org.apache.lucene.search.similarities.IndriDirichletSimilarity; +import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.search.similarities.Similarity.SimScorer; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/similarities/RandomSimilarity.java b/lucene/test-framework/src/java/org/apache/lucene/tests/search/similarities/RandomSimilarity.java similarity index 65% rename from lucene/test-framework/src/java/org/apache/lucene/search/similarities/RandomSimilarity.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/search/similarities/RandomSimilarity.java index 08f917f2a98..3f50989bcf9 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/similarities/RandomSimilarity.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/search/similarities/RandomSimilarity.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.search.similarities; +package org.apache.lucene.tests.search.similarities; import java.util.ArrayList; import java.util.Collections; @@ -22,6 +22,43 @@ import java.util.List; import java.util.Map; import java.util.Random; +import org.apache.lucene.search.similarities.AfterEffect; +import org.apache.lucene.search.similarities.AfterEffectB; +import org.apache.lucene.search.similarities.AfterEffectL; +import org.apache.lucene.search.similarities.AxiomaticF1EXP; +import org.apache.lucene.search.similarities.AxiomaticF1LOG; +import org.apache.lucene.search.similarities.AxiomaticF2EXP; +import org.apache.lucene.search.similarities.AxiomaticF2LOG; +import org.apache.lucene.search.similarities.BM25Similarity; +import org.apache.lucene.search.similarities.BasicModel; +import org.apache.lucene.search.similarities.BasicModelG; +import org.apache.lucene.search.similarities.BasicModelIF; +import org.apache.lucene.search.similarities.BasicModelIn; +import org.apache.lucene.search.similarities.BasicModelIne; +import org.apache.lucene.search.similarities.BooleanSimilarity; +import org.apache.lucene.search.similarities.ClassicSimilarity; +import org.apache.lucene.search.similarities.DFISimilarity; +import org.apache.lucene.search.similarities.DFRSimilarity; +import org.apache.lucene.search.similarities.Distribution; +import org.apache.lucene.search.similarities.DistributionLL; +import org.apache.lucene.search.similarities.DistributionSPL; +import org.apache.lucene.search.similarities.IBSimilarity; +import org.apache.lucene.search.similarities.Independence; +import org.apache.lucene.search.similarities.IndependenceChiSquared; +import org.apache.lucene.search.similarities.IndependenceSaturated; +import org.apache.lucene.search.similarities.IndependenceStandardized; +import org.apache.lucene.search.similarities.LMDirichletSimilarity; +import org.apache.lucene.search.similarities.LMJelinekMercerSimilarity; +import org.apache.lucene.search.similarities.Lambda; +import org.apache.lucene.search.similarities.LambdaDF; +import org.apache.lucene.search.similarities.LambdaTTF; +import org.apache.lucene.search.similarities.Normalization; +import org.apache.lucene.search.similarities.NormalizationH1; +import org.apache.lucene.search.similarities.NormalizationH2; +import org.apache.lucene.search.similarities.NormalizationH3; +import org.apache.lucene.search.similarities.NormalizationZ; +import org.apache.lucene.search.similarities.PerFieldSimilarityWrapper; +import org.apache.lucene.search.similarities.Similarity; /** * Similarity implementation that randomizes Similarity implementations per-field. diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/search/similarities/package-info.java b/lucene/test-framework/src/java/org/apache/lucene/tests/search/similarities/package-info.java new file mode 100644 index 00000000000..86f8a6dd336 --- /dev/null +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/search/similarities/package-info.java @@ -0,0 +1,26 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * Support for testing similarities. + * + *
    + *
  • {@link org.apache.lucene.tests.search.similarities.RandomSimilarity}: Randomizes similarity + * per-field in tests. + *
+ */ +package org.apache.lucene.tests.search.similarities; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java index c3ee84a3eab..5ae0dba4ad9 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java @@ -111,7 +111,6 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.index.*; import org.apache.lucene.index.TermsEnum.SeekStatus; -import org.apache.lucene.search.AssertingIndexSearcher; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.LRUQueryCache; @@ -131,6 +130,7 @@ import org.apache.lucene.store.NRTCachingDirectory; import org.apache.lucene.tests.mockfile.FilterPath; import org.apache.lucene.tests.mockfile.VirusCheckingFS; +import org.apache.lucene.tests.search.AssertingIndexSearcher; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.store.MockDirectoryWrapper.Throttling; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleSetupAndRestoreClassEnv.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleSetupAndRestoreClassEnv.java index bb325e455d5..e3eb25ffd47 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleSetupAndRestoreClassEnv.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleSetupAndRestoreClassEnv.java @@ -47,9 +47,9 @@ import org.apache.lucene.codecs.mockrandom.MockRandomPostingsFormat; import org.apache.lucene.codecs.simpletext.SimpleTextCodec; import org.apache.lucene.index.RandomCodec; -import org.apache.lucene.search.similarities.AssertingSimilarity; -import org.apache.lucene.search.similarities.RandomSimilarity; import org.apache.lucene.search.similarities.Similarity; +import org.apache.lucene.tests.search.similarities.AssertingSimilarity; +import org.apache.lucene.tests.search.similarities.RandomSimilarity; import org.apache.lucene.tests.util.LuceneTestCase.LiveIWCFlushMode; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; import org.apache.lucene.util.InfoStream; diff --git a/lucene/test-framework/src/test/org/apache/lucene/search/TestBaseExplanationTestCase.java b/lucene/test-framework/src/test/org/apache/lucene/tests/search/TestBaseExplanationTestCase.java similarity index 92% rename from lucene/test-framework/src/test/org/apache/lucene/search/TestBaseExplanationTestCase.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/search/TestBaseExplanationTestCase.java index f69e22eef52..1b37ed53130 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/search/TestBaseExplanationTestCase.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/search/TestBaseExplanationTestCase.java @@ -14,11 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.search; +package org.apache.lucene.tests.search; import java.io.IOException; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.Term; +import org.apache.lucene.search.BulkScorer; +import org.apache.lucene.search.Explanation; +import org.apache.lucene.search.FilterWeight; +import org.apache.lucene.search.IndexSearcher; +import org.apache.lucene.search.ScoreMode; +import org.apache.lucene.search.TermQuery; +import org.apache.lucene.search.Weight; /** * Tests that the {@link BaseExplanationTestCase} helper code, as well as {@link From 4c01ac454bca555e145f394f3608536d5fea6e65 Mon Sep 17 00:00:00 2001 From: Dawid Weiss Date: Sun, 19 Dec 2021 21:15:15 +0100 Subject: [PATCH 08/32] Moved analysis -> tests.analysios --- .../analysis/ar/TestArabicAnalyzer.java | 2 +- .../lucene/analysis/ar/TestArabicFilters.java | 2 +- .../ar/TestArabicNormalizationFilter.java | 4 +- .../analysis/ar/TestArabicStemFilter.java | 4 +- .../analysis/bg/TestBulgarianAnalyzer.java | 2 +- .../bg/TestBulgarianStemFilterFactory.java | 2 +- .../analysis/bg/TestBulgarianStemmer.java | 4 +- .../analysis/bn/TestBengaliAnalyzer.java | 2 +- .../analysis/bn/TestBengaliFilters.java | 2 +- .../analysis/bn/TestBengaliNormalizer.java | 2 +- .../analysis/bn/TestBengaliStemmer.java | 2 +- .../boost/TestDelimitedBoostTokenFilter.java | 2 +- .../analysis/br/TestBrazilianAnalyzer.java | 2 +- .../br/TestBrazilianStemFilterFactory.java | 4 +- .../analysis/ca/TestCatalanAnalyzer.java | 2 +- .../charfilter/TestHTMLStripCharFilter.java | 4 +- .../TestHTMLStripCharFilterFactory.java | 2 +- .../charfilter/TestMappingCharFilter.java | 4 +- .../TestMappingCharFilterFactory.java | 2 +- .../lucene/analysis/cjk/TestCJKAnalyzer.java | 4 +- .../analysis/cjk/TestCJKBigramFilter.java | 2 +- .../cjk/TestCJKBigramFilterFactory.java | 2 +- .../analysis/cjk/TestCJKWidthCharFilter.java | 4 +- .../cjk/TestCJKWidthCharFilterFactory.java | 2 +- .../analysis/cjk/TestCJKWidthFilter.java | 4 +- .../cjk/TestCJKWidthFilterFactory.java | 2 +- .../analysis/ckb/TestSoraniAnalyzer.java | 2 +- .../ckb/TestSoraniNormalizationFilter.java | 4 +- .../TestSoraniNormalizationFilterFactory.java | 2 +- .../analysis/ckb/TestSoraniStemFilter.java | 6 +-- .../ckb/TestSoraniStemFilterFactory.java | 4 +- .../analysis/classic/TestClassicAnalyzer.java | 2 +- .../classic/TestClassicFactories.java | 2 +- .../commongrams/TestCommonGramsFilter.java | 4 +- .../TestCommonGramsFilterFactory.java | 4 +- .../TestCommonGramsQueryFilterFactory.java | 2 +- .../compound/TestCompoundWordTokenFilter.java | 4 +- ...tionaryCompoundWordTokenFilterFactory.java | 4 +- ...enationCompoundWordTokenFilterFactory.java | 4 +- .../core/TestAllAnalyzersHaveFactories.java | 26 ++++++------ .../lucene/analysis/core/TestAnalyzers.java | 2 +- .../analysis/core/TestBugInSomething.java | 8 ++-- .../analysis/core/TestCoreFactories.java | 2 +- .../analysis/core/TestDecimalDigitFilter.java | 4 +- .../core/TestDecimalDigitFilterFactory.java | 2 +- .../analysis/core/TestDuelingAnalyzers.java | 6 +-- .../lucene/analysis/core/TestFactories.java | 4 +- .../analysis/core/TestFlattenGraphFilter.java | 8 ++-- .../analysis/core/TestKeywordAnalyzer.java | 2 +- .../analysis/core/TestKeywordTokenizer.java | 2 +- .../analysis/core/TestRandomChains.java | 10 ++--- .../analysis/core/TestStopAnalyzer.java | 2 +- .../analysis/core/TestStopFilterFactory.java | 2 +- .../analysis/core/TestTypeTokenFilter.java | 2 +- .../core/TestTypeTokenFilterFactory.java | 4 +- .../core/TestUnicodeWhitespaceTokenizer.java | 2 +- .../analysis/core/TestWhitespaceAnalyzer.java | 2 +- .../analysis/custom/TestCustomAnalyzer.java | 2 +- .../lucene/analysis/cz/TestCzechAnalyzer.java | 2 +- .../cz/TestCzechStemFilterFactory.java | 4 +- .../lucene/analysis/cz/TestCzechStemmer.java | 4 +- .../analysis/da/TestDanishAnalyzer.java | 2 +- .../analysis/de/TestGermanAnalyzer.java | 2 +- .../de/TestGermanLightStemFilter.java | 6 +-- .../de/TestGermanLightStemFilterFactory.java | 2 +- .../de/TestGermanMinimalStemFilter.java | 6 +-- .../TestGermanMinimalStemFilterFactory.java | 4 +- .../de/TestGermanNormalizationFilter.java | 4 +- .../TestGermanNormalizationFilterFactory.java | 4 +- .../analysis/de/TestGermanStemFilter.java | 6 +-- .../de/TestGermanStemFilterFactory.java | 4 +- .../lucene/analysis/el/TestGreekAnalyzer.java | 2 +- .../el/TestGreekLowerCaseFilterFactory.java | 2 +- .../el/TestGreekStemFilterFactory.java | 2 +- .../lucene/analysis/el/TestGreekStemmer.java | 2 +- .../email/TestUAX29URLEmailAnalyzer.java | 2 +- .../email/TestUAX29URLEmailTokenizer.java | 6 +-- .../TestUAX29URLEmailTokenizerFactory.java | 2 +- .../analysis/en/TestEnglishAnalyzer.java | 2 +- .../en/TestEnglishMinimalStemFilter.java | 4 +- .../TestEnglishMinimalStemFilterFactory.java | 2 +- .../analysis/en/TestKStemFilterFactory.java | 2 +- .../lucene/analysis/en/TestKStemmer.java | 6 +-- .../analysis/en/TestPorterStemFilter.java | 6 +-- .../en/TestPorterStemFilterFactory.java | 2 +- .../analysis/es/TestSpanishAnalyzer.java | 2 +- .../es/TestSpanishLightStemFilter.java | 6 +-- .../es/TestSpanishLightStemFilterFactory.java | 4 +- .../es/TestSpanishMinimalStemFilter.java | 4 +- .../TestSpanishMinimalStemFilterFactory.java | 4 +- .../es/TestSpanishPluralStemFilter.java | 6 +-- .../TestSpanishPluralStemFilterFactory.java | 4 +- .../analysis/et/TestEstonianAnalyzer.java | 2 +- .../analysis/eu/TestBasqueAnalyzer.java | 2 +- .../analysis/fa/TestPersianAnalyzer.java | 2 +- .../analysis/fa/TestPersianCharFilter.java | 4 +- .../fa/TestPersianNormalizationFilter.java | 4 +- ...TestPersianNormalizationFilterFactory.java | 2 +- .../analysis/fi/TestFinnishAnalyzer.java | 2 +- .../fi/TestFinnishLightStemFilter.java | 6 +-- .../fi/TestFinnishLightStemFilterFactory.java | 4 +- .../analysis/fr/TestFrenchAnalyzer.java | 2 +- .../fr/TestFrenchLightStemFilter.java | 6 +-- .../fr/TestFrenchLightStemFilterFactory.java | 2 +- .../fr/TestFrenchMinimalStemFilter.java | 6 +-- .../TestFrenchMinimalStemFilterFactory.java | 2 +- .../lucene/analysis/ga/TestIrishAnalyzer.java | 2 +- .../analysis/ga/TestIrishLowerCaseFilter.java | 2 +- .../ga/TestIrishLowerCaseFilterFactory.java | 2 +- .../analysis/gl/TestGalicianAnalyzer.java | 2 +- .../gl/TestGalicianMinimalStemFilter.java | 4 +- .../TestGalicianMinimalStemFilterFactory.java | 2 +- .../analysis/gl/TestGalicianStemFilter.java | 6 +-- .../gl/TestGalicianStemFilterFactory.java | 2 +- .../lucene/analysis/hi/TestHindiAnalyzer.java | 2 +- .../lucene/analysis/hi/TestHindiFilters.java | 2 +- .../analysis/hi/TestHindiNormalizer.java | 2 +- .../lucene/analysis/hi/TestHindiStemmer.java | 2 +- .../analysis/hu/TestHungarianAnalyzer.java | 2 +- .../hu/TestHungarianLightStemFilter.java | 6 +-- .../TestHungarianLightStemFilterFactory.java | 2 +- .../hunspell/TestHunspellStemFilter.java | 4 +- .../TestHunspellStemFilterFactory.java | 2 +- .../analysis/hy/TestArmenianAnalyzer.java | 2 +- .../analysis/id/TestIndonesianAnalyzer.java | 2 +- .../id/TestIndonesianStemFilterFactory.java | 4 +- .../analysis/id/TestIndonesianStemmer.java | 4 +- .../analysis/in/TestIndicNormalizer.java | 4 +- .../analysis/it/TestItalianAnalyzer.java | 2 +- .../it/TestItalianLightStemFilter.java | 6 +-- .../it/TestItalianLightStemFilterFactory.java | 2 +- .../analysis/lt/TestLithuanianAnalyzer.java | 2 +- .../analysis/lt/TestLithuanianStemming.java | 4 +- .../analysis/lv/TestLatvianAnalyzer.java | 2 +- .../lv/TestLatvianStemFilterFactory.java | 4 +- .../analysis/lv/TestLatvianStemmer.java | 4 +- .../analysis/minhash/TestMinHashFilter.java | 4 +- .../miscellaneous/TestASCIIFoldingFilter.java | 4 +- .../TestAsciiFoldingFilterFactory.java | 6 +-- .../TestCapitalizationFilter.java | 4 +- .../TestCapitalizationFilterFactory.java | 2 +- .../TestCodepointCountFilter.java | 2 +- .../TestCodepointCountFilterFactory.java | 4 +- .../TestConcatenateGraphFilter.java | 4 +- .../TestConcatenateGraphFilterFactory.java | 4 +- .../TestConcatenatingTokenStream.java | 8 ++-- .../TestConditionalTokenFilter.java | 10 ++--- .../TestDateRecognizerFilter.java | 2 +- .../TestDateRecognizerFilterFactory.java | 2 +- ...TestDelimitedTermFrequencyTokenFilter.java | 2 +- .../TestDropIfFlaggedFilter.java | 6 +-- .../TestDropIfFlaggedFilterFactory.java | 6 +-- .../miscellaneous/TestEmptyTokenStream.java | 2 +- .../miscellaneous/TestFingerprintFilter.java | 4 +- .../TestFingerprintFilterFactory.java | 4 +- .../TestFixBrokenOffsetsFilter.java | 6 +-- .../TestHyphenatedWordsFilter.java | 4 +- .../miscellaneous/TestKeepFilterFactory.java | 2 +- .../miscellaneous/TestKeepWordFilter.java | 4 +- .../TestKeywordMarkerFilter.java | 2 +- .../TestKeywordMarkerFilterFactory.java | 2 +- .../TestKeywordRepeatFilter.java | 2 +- .../miscellaneous/TestLengthFilter.java | 2 +- .../TestLengthFilterFactory.java | 4 +- .../TestLimitTokenCountAnalyzer.java | 4 +- .../TestLimitTokenCountFilter.java | 4 +- .../TestLimitTokenCountFilterFactory.java | 4 +- .../TestLimitTokenOffsetFilter.java | 4 +- .../TestLimitTokenOffsetFilterFactory.java | 4 +- .../TestLimitTokenPositionFilter.java | 4 +- .../TestLimitTokenPositionFilterFactory.java | 4 +- .../TestMiscellaneousFactories.java | 2 +- .../TestPerFieldAnalyzerWrapper.java | 6 +-- .../TestProtectedTermFilter.java | 6 +-- .../TestProtectedTermFilterFactory.java | 2 +- .../TestRemoveDuplicatesTokenFilter.java | 6 +-- ...estRemoveDuplicatesTokenFilterFactory.java | 6 +-- .../TestScandinavianFoldingFilter.java | 4 +- .../TestScandinavianFoldingFilterFactory.java | 2 +- .../TestScandinavianNormalizationFilter.java | 2 + ...candinavianNormalizationFilterFactory.java | 2 +- .../TestScandinavianNormalizer.java | 2 + .../TestStemmerOverrideFilter.java | 2 +- .../TestStemmerOverrideFilterFactory.java | 2 +- .../miscellaneous/TestTrimFilter.java | 8 ++-- .../miscellaneous/TestTrimFilterFactory.java | 2 +- .../TestTruncateTokenFilter.java | 2 +- .../TestTruncateTokenFilterFactory.java | 4 +- .../TestTypeAsSynonymFilter.java | 6 +-- .../TestTypeAsSynonymFilterFactory.java | 6 +-- .../TestWordDelimiterFilter.java | 8 ++-- .../TestWordDelimiterGraphFilter.java | 8 ++-- .../analysis/ne/TestNepaliAnalyzer.java | 2 +- .../ngram/TestEdgeNGramTokenFilter.java | 4 +- .../ngram/TestEdgeNGramTokenizer.java | 2 +- .../analysis/ngram/TestNGramFilters.java | 2 +- .../analysis/ngram/TestNGramTokenFilter.java | 4 +- .../analysis/ngram/TestNGramTokenizer.java | 2 +- .../lucene/analysis/nl/TestDutchAnalyzer.java | 2 +- .../analysis/no/TestNorwegianAnalyzer.java | 2 +- .../no/TestNorwegianLightStemFilter.java | 6 +-- .../TestNorwegianLightStemFilterFactory.java | 2 +- .../no/TestNorwegianMinimalStemFilter.java | 6 +-- ...TestNorwegianMinimalStemFilterFactory.java | 4 +- .../no/TestNorwegianNormalizationFilter.java | 2 + ...stNorwegianNormalizationFilterFactory.java | 2 +- .../path/TestPathHierarchyTokenizer.java | 2 +- .../TestReversePathHierarchyTokenizer.java | 2 +- .../TestPatternCaptureGroupTokenFilter.java | 4 +- .../pattern/TestPatternReplaceCharFilter.java | 4 +- .../TestPatternReplaceCharFilterFactory.java | 2 +- .../pattern/TestPatternReplaceFilter.java | 4 +- .../TestPatternReplaceFilterFactory.java | 2 +- .../pattern/TestPatternTokenizer.java | 2 +- .../pattern/TestPatternTokenizerFactory.java | 2 +- .../pattern/TestPatternTypingFilter.java | 6 +-- .../TestPatternTypingFilterFactory.java | 6 +-- .../TestSimplePatternSplitTokenizer.java | 2 +- .../pattern/TestSimplePatternTokenizer.java | 2 +- .../TestDelimitedPayloadTokenFilter.java | 2 +- ...estDelimitedPayloadTokenFilterFactory.java | 4 +- .../TestNumericPayloadTokenFilter.java | 4 +- .../TestTokenOffsetPayloadTokenFilter.java | 2 +- .../TestTypeAsPayloadTokenFilter.java | 2 +- .../analysis/pt/TestPortugueseAnalyzer.java | 2 +- .../pt/TestPortugueseLightStemFilter.java | 6 +-- .../TestPortugueseLightStemFilterFactory.java | 4 +- .../pt/TestPortugueseMinimalStemFilter.java | 6 +-- ...estPortugueseMinimalStemFilterFactory.java | 4 +- .../analysis/pt/TestPortugueseStemFilter.java | 6 +-- .../pt/TestPortugueseStemFilterFactory.java | 2 +- .../query/TestQueryAutoStopWordAnalyzer.java | 3 ++ .../reverse/TestReverseStringFilter.java | 4 +- .../TestReverseStringFilterFactory.java | 2 +- .../analysis/ro/TestRomanianAnalyzer.java | 2 +- .../analysis/ru/TestRussianAnalyzer.java | 2 +- .../ru/TestRussianLightStemFilter.java | 6 +-- .../ru/TestRussianLightStemFilterFactory.java | 2 +- .../shingle/TestFixedShingleFilter.java | 6 +-- .../shingle/TestShingleAnalyzerWrapper.java | 6 +-- .../analysis/shingle/TestShingleFilter.java | 8 ++-- .../shingle/TestShingleFilterFactory.java | 2 +- .../sinks/TestTeeSinkTokenFilter.java | 6 +-- .../analysis/snowball/TestSnowball.java | 4 +- .../TestSnowballPorterFilterFactory.java | 2 +- .../analysis/snowball/TestSnowballVocab.java | 2 +- .../analysis/sr/TestSerbianAnalyzer.java | 2 +- .../sr/TestSerbianNormalizationFilter.java | 4 +- ...TestSerbianNormalizationFilterFactory.java | 4 +- ...TestSerbianNormalizationRegularFilter.java | 4 +- .../analysis/sv/TestSwedishAnalyzer.java | 2 +- .../sv/TestSwedishLightStemFilter.java | 6 +-- .../sv/TestSwedishLightStemFilterFactory.java | 2 +- .../sv/TestSwedishMinimalStemFilter.java | 4 +- .../synonym/BaseSynonymParserTestCase.java | 2 +- .../synonym/TestMultiWordSynonyms.java | 2 +- .../synonym/TestSolrSynonymParser.java | 4 +- .../synonym/TestSynonymFilterFactory.java | 2 +- .../synonym/TestSynonymGraphFilter.java | 8 ++-- .../synonym/TestSynonymMapFilter.java | 8 ++-- .../synonym/TestWordnetSynonymParser.java | 6 +-- .../lucene/analysis/ta/TestTamilAnalyzer.java | 2 +- .../analysis/te/TestTeluguAnalyzer.java | 2 +- .../lucene/analysis/te/TestTeluguFilters.java | 2 +- .../analysis/te/TestTeluguNormalizer.java | 2 +- .../lucene/analysis/te/TestTeluguStemmer.java | 2 +- .../lucene/analysis/th/TestThaiAnalyzer.java | 2 +- .../analysis/th/TestThaiTokenizerFactory.java | 2 +- .../analysis/tr/TestApostropheFilter.java | 2 +- .../tr/TestApostropheFilterFactory.java | 4 +- .../analysis/tr/TestTurkishAnalyzer.java | 2 +- .../tr/TestTurkishLowerCaseFilter.java | 2 +- .../tr/TestTurkishLowerCaseFilterFactory.java | 4 +- .../analysis/util/TestCharTokenizers.java | 2 +- .../lucene/analysis/util/TestElision.java | 2 +- .../util/TestElisionFilterFactory.java | 4 +- .../util/TestSegmentingTokenizerBase.java | 2 +- .../wikipedia/TestWikipediaTokenizer.java | 2 +- .../TestWikipediaTokenizerFactory.java | 2 +- .../collation/TestCollationKeyAnalyzer.java | 2 +- .../icu/TestICUCollationKeyAnalyzer.java | 2 +- .../analysis/icu/TestICUFoldingFilter.java | 4 +- .../icu/TestICUFoldingFilterFactory.java | 2 +- .../icu/TestICUNormalizer2CharFilter.java | 4 +- .../TestICUNormalizer2CharFilterFactory.java | 2 +- .../icu/TestICUNormalizer2Filter.java | 4 +- .../icu/TestICUNormalizer2FilterFactory.java | 2 +- .../analysis/icu/TestICUTransformFilter.java | 4 +- .../icu/TestICUTransformFilterFactory.java | 2 +- .../icu/segmentation/TestICUTokenizer.java | 2 +- .../icu/segmentation/TestICUTokenizerCJK.java | 2 +- .../segmentation/TestICUTokenizerFactory.java | 2 +- .../icu/segmentation/TestMyanmarSyllable.java | 2 +- .../segmentation/TestWithCJKBigramFilter.java | 2 +- .../lucene/analysis/ja/TestExtendedMode.java | 2 +- .../lucene/analysis/ja/TestFactories.java | 4 +- .../analysis/ja/TestJapaneseAnalyzer.java | 2 +- .../ja/TestJapaneseBaseFormFilter.java | 2 +- .../ja/TestJapaneseBaseFormFilterFactory.java | 2 +- .../ja/TestJapaneseCompletionAnalyzer.java | 2 +- .../ja/TestJapaneseCompletionFilter.java | 2 +- .../TestJapaneseCompletionFilterFactory.java | 2 +- .../TestJapaneseIterationMarkCharFilter.java | 4 +- ...apaneseIterationMarkCharFilterFactory.java | 4 +- .../ja/TestJapaneseKatakanaStemFilter.java | 4 +- ...TestJapaneseKatakanaStemFilterFactory.java | 2 +- .../analysis/ja/TestJapaneseNumberFilter.java | 2 +- .../ja/TestJapaneseNumberFilterFactory.java | 2 +- ...JapanesePartOfSpeechStopFilterFactory.java | 2 +- .../ja/TestJapaneseReadingFormFilter.java | 2 +- .../TestJapaneseReadingFormFilterFactory.java | 2 +- .../analysis/ja/TestJapaneseTokenizer.java | 4 +- .../ja/TestJapaneseTokenizerFactory.java | 2 +- .../lucene/analysis/ja/TestSearchMode.java | 2 +- .../morfologik/TestMorfologikAnalyzer.java | 2 +- .../TestMorfologikFilterFactory.java | 2 +- .../analysis/uk/TestUkrainianAnalyzer.java | 2 +- .../analysis/ko/TestKoreanAnalyzer.java | 2 +- .../analysis/ko/TestKoreanNumberFilter.java | 2 +- .../ko/TestKoreanNumberFilterFactory.java | 2 +- ...stKoreanPartOfSpeechStopFilterFactory.java | 2 +- .../ko/TestKoreanReadingFormFilter.java | 2 +- .../TestKoreanReadingFormFilterFactory.java | 2 +- .../analysis/ko/TestKoreanTokenizer.java | 4 +- .../ko/TestKoreanTokenizerFactory.java | 2 +- .../TestOpenNLPChunkerFilterFactory.java | 2 +- .../TestOpenNLPLemmatizerFilterFactory.java | 2 +- .../opennlp/TestOpenNLPPOSFilterFactory.java | 2 +- .../opennlp/TestOpenNLPTokenizerFactory.java | 2 +- .../phonetic/TestBeiderMorseFilter.java | 4 +- .../TestBeiderMorseFilterFactory.java | 2 +- .../TestDaitchMokotoffSoundexFilter.java | 4 +- ...estDaitchMokotoffSoundexFilterFactory.java | 4 +- .../phonetic/TestDoubleMetaphoneFilter.java | 4 +- .../TestDoubleMetaphoneFilterFactory.java | 2 +- .../analysis/phonetic/TestPhoneticFilter.java | 4 +- .../phonetic/TestPhoneticFilterFactory.java | 2 +- .../smart/TestHMMChineseTokenizerFactory.java | 2 +- .../cn/smart/TestSmartChineseAnalyzer.java | 2 +- .../analysis/pl/TestPolishAnalyzer.java | 2 +- .../TestStempelPolishStemFilterFactory.java | 2 +- .../lucene50/TestBlockPostingsFormat.java | 2 +- .../lucene50/TestBlockPostingsFormat2.java | 2 +- .../lucene50/TestBlockPostingsFormat3.java | 6 +-- .../BaseLucene80DocValuesFormatTestCase.java | 2 +- .../lucene84/TestLucene84PostingsFormat.java | 2 +- .../TestBackwardsCompatibility.java | 2 +- .../benchmark/byTask/TestPerfTasksLogic.java | 4 +- .../classification/TestBM25NBClassifier.java | 2 +- .../TestBooleanPerceptronClassifier.java | 2 +- .../TestCachingNaiveBayesClassifier.java | 2 +- .../TestKNearestFuzzyClassifier.java | 2 +- .../TestKNearestNeighborClassifier.java | 2 +- .../TestSimpleNaiveBayesClassifier.java | 2 +- .../utils/TestConfusionMatrixGenerator.java | 2 +- .../utils/TestDataSplitter.java | 2 +- .../blocktreeords/TestOrdsBlockTree.java | 2 +- .../apache/lucene/analysis/TokenFilter.java | 8 +++- .../org/apache/lucene/analysis/Tokenizer.java | 4 +- .../org/apache/lucene/TestExternalCodecs.java | 2 +- .../lucene/TestMergeSchedulerExternal.java | 2 +- .../test/org/apache/lucene/TestSearch.java | 1 + .../lucene/TestSearchForDuplicates.java | 2 +- .../lucene/analysis/TestAnalyzerWrapper.java | 1 + .../analysis/TestAutomatonToTokenStream.java | 1 + .../analysis/TestCachingTokenFilter.java | 2 + .../TestDelegatingAnalyzerWrapper.java | 3 ++ .../lucene/analysis/TestGraphTokenFilter.java | 3 ++ .../lucene/analysis/TestGraphTokenizers.java | 7 ++++ .../lucene/analysis/TestStopFilter.java | 2 + .../standard/TestStandardAnalyzer.java | 6 ++- .../standard/TestStandardFactories.java | 2 +- .../TestPackedTokenAttributeImpl.java | 2 +- .../lucene90/TestLucene90DocValuesFormat.java | 2 +- .../lucene90/TestLucene90PostingsFormat.java | 2 +- .../perfield/TestPerFieldDocValuesFormat.java | 2 +- .../TestPerFieldKnnVectorsFormat.java | 2 +- .../perfield/TestPerFieldPostingsFormat2.java | 2 +- .../apache/lucene/document/TestDocument.java | 2 +- .../org/apache/lucene/document/TestField.java | 4 +- .../lucene/index/Test2BBinaryDocValues.java | 2 +- .../org/apache/lucene/index/Test2BDocs.java | 2 +- .../lucene/index/Test2BNumericDocValues.java | 2 +- .../org/apache/lucene/index/Test2BPoints.java | 2 +- .../apache/lucene/index/Test2BPositions.java | 2 +- .../apache/lucene/index/Test2BPostings.java | 2 +- .../lucene/index/Test2BPostingsBytes.java | 2 +- .../Test2BSortedDocValuesFixedSorted.java | 2 +- .../index/Test2BSortedDocValuesOrds.java | 2 +- .../org/apache/lucene/index/Test2BTerms.java | 2 +- .../lucene/index/Test4GBStoredFields.java | 2 +- .../apache/lucene/index/TestAddIndexes.java | 2 +- .../index/TestAllFilesCheckIndexHeader.java | 2 +- .../index/TestAllFilesDetectBitFlips.java | 2 +- .../index/TestAllFilesDetectTruncation.java | 2 +- .../index/TestAllFilesHaveChecksumFooter.java | 2 +- .../index/TestAllFilesHaveCodecHeader.java | 2 +- .../apache/lucene/index/TestAtomicUpdate.java | 2 +- .../lucene/index/TestBagOfPositions.java | 2 +- .../lucene/index/TestBagOfPostings.java | 2 +- .../index/TestBinaryDocValuesUpdates.java | 4 +- .../apache/lucene/index/TestCheckIndex.java | 4 +- .../org/apache/lucene/index/TestCodecs.java | 2 +- .../index/TestConcurrentMergeScheduler.java | 4 +- .../index/TestConsistentFieldNumbers.java | 2 +- .../org/apache/lucene/index/TestCrash.java | 2 +- .../index/TestCrashCausesCorruptIndex.java | 2 +- .../apache/lucene/index/TestCustomNorms.java | 2 +- .../lucene/index/TestCustomTermFreq.java | 2 +- .../lucene/index/TestDeletionPolicy.java | 2 +- .../lucene/index/TestDirectoryReader.java | 2 +- .../index/TestDirectoryReaderReopen.java | 2 +- .../test/org/apache/lucene/index/TestDoc.java | 2 +- .../TestDocInverterPerFieldErrorInfo.java | 2 +- .../lucene/index/TestDocValuesIndexing.java | 2 +- .../lucene/index/TestDocsAndPositions.java | 2 +- .../lucene/index/TestDocumentWriter.java | 4 +- .../lucene/index/TestDuelingCodecs.java | 2 +- .../lucene/index/TestExceedMaxTermLength.java | 2 +- .../index/TestExitableDirectoryReader.java | 2 +- .../apache/lucene/index/TestFieldInfos.java | 2 +- .../lucene/index/TestFieldInvertState.java | 6 +-- .../apache/lucene/index/TestFieldReuse.java | 6 +-- .../apache/lucene/index/TestFieldsReader.java | 2 +- .../lucene/index/TestFilterLeafReader.java | 2 +- .../org/apache/lucene/index/TestFlex.java | 2 +- .../index/TestFlushByRamOrCountsPolicy.java | 2 +- .../lucene/index/TestForTooMuchCloning.java | 2 +- .../lucene/index/TestForceMergeForever.java | 2 +- .../lucene/index/TestIndexFileDeleter.java | 2 +- .../lucene/index/TestIndexReaderClose.java | 2 +- .../apache/lucene/index/TestIndexSorting.java | 4 +- .../apache/lucene/index/TestIndexWriter.java | 10 ++--- .../lucene/index/TestIndexWriterCommit.java | 3 ++ .../lucene/index/TestIndexWriterConfig.java | 2 +- .../lucene/index/TestIndexWriterDelete.java | 4 +- .../index/TestIndexWriterExceptions.java | 4 +- .../index/TestIndexWriterExceptions2.java | 6 +-- .../index/TestIndexWriterForceMerge.java | 4 +- .../index/TestIndexWriterLockRelease.java | 2 +- .../index/TestIndexWriterMergePolicy.java | 2 +- .../lucene/index/TestIndexWriterMerging.java | 2 +- .../index/TestIndexWriterNRTIsCurrent.java | 2 +- .../index/TestIndexWriterOnDiskFull.java | 2 +- .../index/TestIndexWriterOnVMError.java | 4 +- .../TestIndexWriterOutOfFileDescriptors.java | 2 +- .../lucene/index/TestIndexWriterReader.java | 2 +- .../TestIndexWriterThreadsToSegments.java | 2 +- .../lucene/index/TestIndexWriterUnicode.java | 2 +- .../index/TestIndexWriterWithThreads.java | 2 +- .../lucene/index/TestLazyProxSkipping.java | 2 + .../apache/lucene/index/TestLongPostings.java | 2 +- .../apache/lucene/index/TestManyFields.java | 2 +- .../apache/lucene/index/TestMaxPosition.java | 4 +- .../lucene/index/TestMaxTermFrequency.java | 4 +- .../apache/lucene/index/TestMixedCodecs.java | 2 +- .../index/TestMixedDocValuesUpdates.java | 2 +- .../apache/lucene/index/TestMultiFields.java | 2 +- .../lucene/index/TestMultiLevelSkipList.java | 1 + .../lucene/index/TestMultiTermsEnum.java | 2 +- .../lucene/index/TestNRTReaderCleanup.java | 2 +- .../index/TestNRTReaderWithThreads.java | 2 +- .../apache/lucene/index/TestNeverDelete.java | 2 +- .../lucene/index/TestNewestSegment.java | 2 +- .../lucene/index/TestNoDeletionPolicy.java | 2 +- .../org/apache/lucene/index/TestNorms.java | 2 +- .../index/TestNumericDocValuesUpdates.java | 4 +- .../apache/lucene/index/TestOmitNorms.java | 2 +- .../lucene/index/TestOmitPositions.java | 2 +- .../org/apache/lucene/index/TestOmitTf.java | 2 +- .../apache/lucene/index/TestOrdinalMap.java | 2 +- .../index/TestParallelCompositeReader.java | 2 +- .../lucene/index/TestParallelLeafReader.java | 2 +- .../index/TestParallelReaderEmptyIndex.java | 2 +- .../lucene/index/TestParallelTermEnum.java | 2 +- .../org/apache/lucene/index/TestPayloads.java | 8 ++-- .../lucene/index/TestPayloadsOnVectors.java | 8 ++-- .../lucene/index/TestPerSegmentDeletes.java | 2 +- .../apache/lucene/index/TestPointValues.java | 2 +- .../lucene/index/TestPostingsOffsets.java | 10 ++--- .../lucene/index/TestReadOnlyIndex.java | 2 +- .../apache/lucene/index/TestReaderClosed.java | 4 +- .../index/TestReaderWrapperDVTypeCheck.java | 2 +- .../org/apache/lucene/index/TestRollback.java | 2 +- .../lucene/index/TestRollingUpdates.java | 2 +- .../lucene/index/TestSegmentTermDocs.java | 2 +- .../lucene/index/TestSegmentTermEnum.java | 2 +- .../index/TestSnapshotDeletionPolicy.java | 2 +- .../lucene/index/TestSortingCodecReader.java | 2 +- .../lucene/index/TestStressDeletes.java | 2 +- .../lucene/index/TestStressIndexing.java | 2 +- .../lucene/index/TestStressIndexing2.java | 2 +- .../apache/lucene/index/TestStressNRT.java | 2 +- .../lucene/index/TestSwappedIndexFiles.java | 2 +- .../apache/lucene/index/TestTermVectors.java | 2 +- .../lucene/index/TestTermVectorsReader.java | 1 + .../lucene/index/TestTermVectorsWriter.java | 6 +-- .../org/apache/lucene/index/TestTerms.java | 2 +- .../apache/lucene/index/TestTermsEnum.java | 2 +- .../apache/lucene/index/TestTermsEnum2.java | 4 +- .../lucene/index/TestThreadedForceMerge.java | 4 +- .../lucene/index/TestTieredMergePolicy.java | 2 +- .../lucene/index/TestTransactionRollback.java | 2 +- .../apache/lucene/index/TestTransactions.java | 2 +- .../apache/lucene/index/TestTryDelete.java | 2 +- .../lucene/index/TestUniqueTermCount.java | 4 +- .../lucene/search/TestBaseRangeFilter.java | 2 +- .../apache/lucene/search/TestBoolean2.java | 2 +- .../apache/lucene/search/TestBooleanOr.java | 2 +- .../lucene/search/TestBooleanQuery.java | 2 +- .../TestBooleanQueryVisitSubscorers.java | 2 +- .../lucene/search/TestConjunctions.java | 2 +- .../search/TestConstantScoreScorer.java | 2 +- .../TestControlledRealTimeReopenThread.java | 2 +- .../search/TestDisjunctionMaxQuery.java | 2 +- .../search/TestDocValuesRewriteMethod.java | 4 +- .../search/TestElevationComparator.java | 2 +- .../apache/lucene/search/TestFuzzyQuery.java | 4 +- .../search/TestFuzzyTermOnShortTerms.java | 2 +- .../lucene/search/TestIndriAndQuery.java | 6 +-- .../lucene/search/TestLiveFieldValues.java | 2 +- .../lucene/search/TestMatchAllDocsQuery.java | 2 +- .../lucene/search/TestMatchNoDocsQuery.java | 2 +- .../lucene/search/TestMultiPhraseQuery.java | 4 +- .../search/TestMultiTermConstantScore.java | 4 +- .../search/TestMultiTermQueryRewrites.java | 2 +- .../search/TestMultiThreadTermVectors.java | 2 +- .../apache/lucene/search/TestPhraseQuery.java | 10 ++--- .../lucene/search/TestPointQueries.java | 2 +- .../lucene/search/TestPrefixRandom.java | 4 +- .../lucene/search/TestRegexpRandom.java | 2 +- .../lucene/search/TestRegexpRandom2.java | 4 +- .../search/TestSameScoresWithThreads.java | 2 +- .../apache/lucene/search/TestScorerPerf.java | 2 +- .../lucene/search/TestSearcherManager.java | 2 +- .../apache/lucene/search/TestSimilarity.java | 2 +- .../lucene/search/TestSimilarityProvider.java | 2 +- .../lucene/search/TestSloppyPhraseQuery.java | 4 +- .../lucene/search/TestSubScorerFreqs.java | 2 +- .../lucene/search/TestTermRangeQuery.java | 4 +- .../apache/lucene/search/TestTermScorer.java | 2 +- .../search/TestTimeLimitingCollector.java | 2 +- ...TestTopFieldCollectorEarlyTermination.java | 2 +- .../apache/lucene/search/TestWildcard.java | 2 +- .../lucene/search/TestWildcardRandom.java | 2 +- .../store/TestByteBuffersDirectory.java | 2 +- .../lucene/store/TestFileSwitchDirectory.java | 2 +- .../apache/lucene/store/TestLockFactory.java | 2 +- .../lucene/store/TestNRTCachingDirectory.java | 2 +- .../store/TestSingleInstanceLockFactory.java | 2 +- .../lucene/util/TestAttributeSource.java | 2 +- .../apache/lucene/util/TestQueryBuilder.java | 8 ++-- .../org/apache/lucene/util/fst/TestFSTs.java | 2 +- .../TestGraphTokenStreamFiniteStrings.java | 4 +- .../TestExpressionValueSource.java | 2 +- .../lucene/facet/TestDrillDownQuery.java | 4 +- .../lucene/facet/TestDrillSideways.java | 2 +- .../apache/lucene/facet/TestFacetQuery.java | 4 +- .../apache/lucene/facet/TestFacetsConfig.java | 2 +- .../lucene/facet/TestMultipleIndexFields.java | 4 +- .../taxonomy/TestSearcherTaxonomyManager.java | 2 +- .../taxonomy/TestTaxonomyFacetCounts.java | 2 +- .../taxonomy/TestTaxonomyFacetCounts2.java | 2 +- .../TestTaxonomyFacetSumValueSource.java | 2 +- .../TestDirectoryTaxonomyReader.java | 2 +- .../TestDirectoryTaxonomyWriter.java | 2 +- .../grouping/AbstractGroupingTestCase.java | 2 +- .../grouping/TestAllGroupHeadsCollector.java | 2 +- .../grouping/TestAllGroupsCollector.java | 2 +- .../grouping/TestDistinctValuesCollector.java | 2 +- .../grouping/TestGroupFacetCollector.java | 2 +- .../lucene/search/grouping/TestGrouping.java | 2 +- .../search/grouping/TestGroupingSearch.java | 2 +- .../search/highlight/TestHighlighter.java | 14 +++---- .../highlight/TestHighlighterPhrase.java | 8 ++-- .../lucene/search/highlight/TestMisses.java | 4 +- .../highlight/TestOffsetLimitTokenFilter.java | 2 + .../search/highlight/TestTokenSources.java | 8 ++-- .../custom/TestHighlightCustomQuery.java | 8 ++-- .../TestLengthGoalBreakIterator.java | 4 +- .../uhighlight/TestUnifiedHighlighter.java | 4 +- .../uhighlight/TestUnifiedHighlighterMTQ.java | 4 +- .../TestUnifiedHighlighterRanking.java | 4 +- .../TestUnifiedHighlighterReanalysis.java | 4 +- .../TestUnifiedHighlighterStrictPhrases.java | 4 +- .../TestUnifiedHighlighterTermIntervals.java | 4 +- .../TestUnifiedHighlighterTermVec.java | 4 +- .../TestUnifiedHighlighterExtensibility.java | 2 +- .../vectorhighlight/AbstractTestCase.java | 2 + .../TestFastVectorHighlighter.java | 10 ++--- .../vectorhighlight/TestIndexTimeSynonym.java | 1 + .../TestSimpleFragmentsBuilder.java | 2 +- .../lucene/search/join/TestBlockJoin.java | 2 +- .../search/join/TestBlockJoinSorting.java | 2 +- .../search/join/TestBlockJoinValidation.java | 2 +- .../lucene/search/join/TestJoinUtil.java | 4 +- .../luke/models/commits/TestCommitsImpl.java | 2 +- .../documents/TestDocValuesAdapter.java | 2 +- .../models/overview/OverviewTestBase.java | 2 +- .../lucene/index/memory/TestMemoryIndex.java | 4 +- .../TestMemoryIndexAgainstDirectory.java | 12 +++--- .../apache/lucene/misc/TestHighFreqTerms.java | 4 +- .../misc/document/TestLazyDocument.java | 1 + .../lucene/misc/index/TestIndexSplitter.java | 2 +- .../index/TestMultiPassIndexSplitter.java | 2 +- .../misc/index/TestPKIndexSplitter.java | 4 +- .../monitor/TestRegexpQueryHandler.java | 2 +- .../monitor/TestSuffixingNGramTokenizer.java | 2 +- .../lucene/queries/TestCommonTermsQuery.java | 2 +- .../queries/function/FunctionTestSetup.java | 2 +- .../function/TestDocValuesFieldSources.java | 2 +- .../function/TestIndexReaderFunctions.java | 2 +- .../function/TestLongNormValueSource.java | 2 +- .../queries/function/TestValueSources.java | 2 +- .../intervals/TestIntervalBuilder.java | 4 +- .../queries/intervals/TestIntervalQuery.java | 2 +- .../TestPayloadFilteredInterval.java | 4 +- .../lucene/queries/mlt/TestMoreLikeThis.java | 6 +-- .../queries/payloads/PayloadHelper.java | 1 + .../payloads/TestPayloadCheckQuery.java | 4 +- .../payloads/TestPayloadScoreQuery.java | 2 +- .../payloads/TestPayloadSpanPositions.java | 2 +- .../queries/payloads/TestPayloadSpans.java | 2 +- .../payloads/TestPayloadTermQuery.java | 2 +- .../lucene/queries/spans/TestBasics.java | 2 + .../spans/TestFieldMaskingSpanQuery.java | 2 +- .../queries/spans/TestNearSpansOrdered.java | 2 +- .../queries/spans/TestSpanCollection.java | 2 +- .../queries/spans/TestSpanContainQuery.java | 2 +- .../queries/spans/TestSpanFirstQuery.java | 4 +- .../lucene/queries/spans/TestSpans.java | 2 +- .../lucene/queries/spans/TestSpansEnum.java | 2 +- .../classic/TestMultiAnalyzer.java | 4 +- .../classic/TestMultiFieldQueryParser.java | 6 +-- .../queryparser/classic/TestQueryParser.java | 10 ++--- .../complexPhrase/TestComplexPhraseQuery.java | 4 +- .../ext/TestExtendableQueryParser.java | 4 +- .../precedence/TestPrecedenceQueryParser.java | 3 ++ .../standard/TestMultiAnalyzerQPHelper.java | 1 + .../standard/TestMultiFieldQPHelper.java | 1 + .../flexible/standard/TestQPHelper.java | 6 +-- .../flexible/standard/TestStandardQP.java | 4 +- .../standard/TestStandardQPEnhancements.java | 2 +- .../simple/TestSimpleQueryParser.java | 4 +- .../surround/query/SingleFieldTestDb.java | 2 +- .../queryparser/util/QueryParserTestBase.java | 8 ++-- .../queryparser/xml/TestCoreParser.java | 6 +-- .../replicator/nrt/SimplePrimaryNode.java | 2 +- .../lucene/payloads/TestPayloadSpanUtil.java | 2 +- .../TestIDVersionPostingsFormat.java | 6 +-- .../queries/TestFuzzyLikeThisQuery.java | 2 +- ...xSortSortedNumericDocValuesRangeQuery.java | 2 +- .../search/TestTermAutomatonQuery.java | 8 ++-- .../lucene/spatial/SpatialTestCase.java | 2 +- .../search/spell/TestDirectSpellChecker.java | 4 +- .../search/spell/TestLuceneDictionary.java | 4 +- .../lucene/search/spell/TestSpellChecker.java | 2 +- .../spell/TestWordBreakSpellChecker.java | 4 +- .../suggest/TestDocumentDictionary.java | 2 +- .../TestDocumentValueSourceDictionary.java | 2 +- .../suggest/TestHighFrequencyDictionary.java | 2 +- .../search/suggest/TestLookupBenchmark.java | 4 +- .../TestAnalyzingInfixSuggester.java | 4 +- .../analyzing/TestAnalyzingSuggester.java | 16 +++---- .../analyzing/TestBlendedInfixSuggester.java | 4 +- .../analyzing/TestFreeTextSuggester.java | 4 +- .../suggest/analyzing/TestFuzzySuggester.java | 10 ++--- .../analyzing/TestSuggestStopFilter.java | 4 +- .../TestSuggestStopFilterFactory.java | 2 +- .../suggest/document/TestContextQuery.java | 2 +- .../document/TestContextSuggestField.java | 4 +- .../document/TestFuzzyCompletionQuery.java | 2 +- .../document/TestPrefixCompletionQuery.java | 6 +-- .../document/TestRegexCompletionQuery.java | 2 +- .../suggest/document/TestSuggestField.java | 4 +- .../org/apache/lucene/analysis/package.html | 42 ------------------- .../lucene/analysis/standard/package.html | 26 ------------ ...aseCompressingDocValuesFormatTestCase.java | 2 +- .../index/BaseDocValuesFormatTestCase.java | 2 +- .../index/BaseIndexFileFormatTestCase.java | 2 +- .../lucene/index/BaseMergePolicyTestCase.java | 2 +- .../lucene/index/BaseNormsFormatTestCase.java | 4 +- .../index/BasePointsFormatTestCase.java | 2 +- .../index/BasePostingsFormatTestCase.java | 8 ++-- .../index/BaseStoredFieldsFormatTestCase.java | 2 +- .../index/BaseTermVectorsFormatTestCase.java | 6 +-- .../lucene/index/BaseTestCheckIndex.java | 2 +- .../org/apache/lucene/index/DocHelper.java | 4 +- .../lucene/index/RandomIndexWriter.java | 2 +- .../ThreadedIndexingAndSearchingTestCase.java | 2 +- .../BaseTokenStreamFactoryTestCase.java | 6 ++- .../analysis/BaseTokenStreamTestCase.java | 5 ++- .../analysis/CannedBinaryTokenStream.java | 3 +- .../analysis/CannedTokenStream.java | 3 +- .../analysis/CollationTestBase.java | 4 +- .../analysis/CrankyTokenFilter.java | 4 +- .../analysis/LookaheadTokenFilter.java | 4 +- .../{ => tests}/analysis/MockAnalyzer.java | 5 ++- .../analysis/MockBytesAnalyzer.java | 4 +- .../{ => tests}/analysis/MockCharFilter.java | 3 +- .../MockFixedLengthPayloadFilter.java | 4 +- .../analysis/MockGraphTokenFilter.java | 3 +- .../MockHoleInjectingTokenFilter.java | 4 +- .../analysis/MockLowerCaseFilter.java | 5 ++- .../analysis/MockPayloadAnalyzer.java | 6 ++- .../MockRandomLookaheadTokenFilter.java | 3 +- .../analysis/MockReaderWrapper.java | 2 +- .../analysis/MockSynonymAnalyzer.java | 4 +- .../analysis/MockSynonymFilter.java | 4 +- .../{ => tests}/analysis/MockTokenFilter.java | 4 +- .../{ => tests}/analysis/MockTokenizer.java | 5 ++- .../analysis/MockUTF16TermAttributeImpl.java | 2 +- .../MockVariableLengthPayloadFilter.java | 4 +- .../analysis/SimplePayloadFilter.java | 4 +- .../lucene/{ => tests}/analysis/Token.java | 2 +- .../analysis/TokenStreamToDot.java | 3 +- .../analysis/ValidatingTokenFilter.java | 6 ++- .../analysis/VocabularyAssert.java | 3 +- .../lucene/tests/analysis/package-info.java | 39 +++++++++++++++++ .../EmojiTokenizationTestUnicode_12_1.java | 4 +- .../standard/WordBreakTestUnicode_12_1_0.java | 4 +- .../standard/generateEmojiTokenizationTest.pl | 2 +- .../generateJavaUnicodeWordBreakTest.pl | 2 +- .../tests/analysis/standard/package-info.java | 22 ++++++++++ .../tests/geo/BaseGeoPointTestCase.java | 2 +- .../lucene/tests/geo/BaseXYPointTestCase.java | 2 +- .../tests/search/BaseExplanationTestCase.java | 2 +- .../lucene/tests/search/MatchesTestBase.java | 2 +- .../search/SearchEquivalenceTestBase.java | 4 +- .../tests/search/ShardSearchingTestBase.java | 2 +- .../store/BaseChunkedDirectoryTestCase.java | 2 +- .../tests/store/BaseLockFactoryTestCase.java | 2 +- .../lucene/tests/util/LuceneTestCase.java | 2 +- .../TestCompressingStoredFieldsFormat.java | 2 +- .../TestCompressingTermVectorsFormat.java | 2 +- .../analysis/TestLookaheadTokenFilter.java | 5 ++- .../analysis/TestMockAnalyzer.java | 7 +++- .../analysis/TestMockCharFilter.java | 4 +- .../analysis/TestMockSynonymFilter.java | 3 +- .../{ => tests}/analysis/TestPosition.java | 2 +- .../{ => tests}/analysis/TestToken.java | 4 +- .../analysis/TrivialLookaheadFilter.java | 3 +- 742 files changed, 1283 insertions(+), 1167 deletions(-) delete mode 100644 lucene/test-framework/src/java/org/apache/lucene/analysis/package.html delete mode 100644 lucene/test-framework/src/java/org/apache/lucene/analysis/standard/package.html rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/analysis/BaseTokenStreamFactoryTestCase.java (96%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/analysis/BaseTokenStreamTestCase.java (99%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/analysis/CannedBinaryTokenStream.java (97%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/analysis/CannedTokenStream.java (96%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/analysis/CollationTestBase.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/analysis/CrankyTokenFilter.java (94%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/analysis/LookaheadTokenFilter.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/analysis/MockAnalyzer.java (97%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/analysis/MockBytesAnalyzer.java (91%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/analysis/MockCharFilter.java (97%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/analysis/MockFixedLengthPayloadFilter.java (92%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/analysis/MockGraphTokenFilter.java (97%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/analysis/MockHoleInjectingTokenFilter.java (95%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/analysis/MockLowerCaseFilter.java (88%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/analysis/MockPayloadAnalyzer.java (92%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/analysis/MockRandomLookaheadTokenFilter.java (96%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/analysis/MockReaderWrapper.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/analysis/MockSynonymAnalyzer.java (93%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/analysis/MockSynonymFilter.java (96%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/analysis/MockTokenFilter.java (97%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/analysis/MockTokenizer.java (99%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/analysis/MockUTF16TermAttributeImpl.java (97%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/analysis/MockVariableLengthPayloadFilter.java (92%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/analysis/SimplePayloadFilter.java (93%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/analysis/Token.java (99%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/analysis/TokenStreamToDot.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/analysis/ValidatingTokenFilter.java (97%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/analysis/VocabularyAssert.java (97%) create mode 100644 lucene/test-framework/src/java/org/apache/lucene/tests/analysis/package-info.java rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/analysis/standard/EmojiTokenizationTestUnicode_12_1.java (99%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/analysis/standard/WordBreakTestUnicode_12_1_0.java (99%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/analysis/standard/generateEmojiTokenizationTest.pl (99%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/analysis/standard/generateJavaUnicodeWordBreakTest.pl (99%) create mode 100644 lucene/test-framework/src/java/org/apache/lucene/tests/analysis/standard/package-info.java rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/analysis/TestLookaheadTokenFilter.java (95%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/analysis/TestMockAnalyzer.java (97%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/analysis/TestMockCharFilter.java (93%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/analysis/TestMockSynonymFilter.java (98%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/analysis/TestPosition.java (96%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/analysis/TestToken.java (98%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/analysis/TrivialLookaheadFilter.java (97%) diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicAnalyzer.java index a4591d0a8a9..6d3c7b967ba 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicAnalyzer.java @@ -17,8 +17,8 @@ package org.apache.lucene.analysis.ar; import java.io.IOException; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** Test the Arabic Analyzer */ public class TestArabicAnalyzer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicFilters.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicFilters.java index 246210e76f6..c4f409d899b 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicFilters.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicFilters.java @@ -18,9 +18,9 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure the Arabic filter Factories are working. */ public class TestArabicFilters extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicNormalizationFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicNormalizationFilter.java index d833b3047c3..9ac351b420b 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicNormalizationFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicNormalizationFilter.java @@ -19,10 +19,10 @@ import java.io.IOException; import java.io.StringReader; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Test the Arabic Normalization Filter */ public class TestArabicNormalizationFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicStemFilter.java index 403a1af20ea..f00d9fa3a61 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicStemFilter.java @@ -18,12 +18,12 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Test the Arabic Normalization Filter */ public class TestArabicStemFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianAnalyzer.java index 52411fc131c..c37052eb0c5 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianAnalyzer.java @@ -18,8 +18,8 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** Test the Bulgarian analyzer */ public class TestBulgarianAnalyzer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemFilterFactory.java index 35e8a4ba059..7e34b4c85d2 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemFilterFactory.java @@ -18,9 +18,9 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure the Bulgarian stem filter factory is working. */ public class TestBulgarianStemFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemmer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemmer.java index d55fe0c7c89..e90a1422d87 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemmer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemmer.java @@ -19,12 +19,12 @@ import java.io.IOException; import java.io.StringReader; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Test the Bulgarian Stemmer */ public class TestBulgarianStemmer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/bn/TestBengaliAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/bn/TestBengaliAnalyzer.java index d199dfeb6b6..148b9f147ac 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/bn/TestBengaliAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/bn/TestBengaliAnalyzer.java @@ -17,7 +17,7 @@ package org.apache.lucene.analysis.bn; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** Tests the BengaliAnalyzer */ public class TestBengaliAnalyzer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/bn/TestBengaliFilters.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/bn/TestBengaliFilters.java index 54a06618079..c652aace321 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/bn/TestBengaliFilters.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/bn/TestBengaliFilters.java @@ -18,8 +18,8 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Test Bengali Filter Factory */ public class TestBengaliFilters extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/bn/TestBengaliNormalizer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/bn/TestBengaliNormalizer.java index 7c5855debc9..eda8775a024 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/bn/TestBengaliNormalizer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/bn/TestBengaliNormalizer.java @@ -18,10 +18,10 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.apache.lucene.tests.util.TestUtil; /** Test BengaliNormalizer */ diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/bn/TestBengaliStemmer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/bn/TestBengaliStemmer.java index 756008a173d..8e7063e9d88 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/bn/TestBengaliStemmer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/bn/TestBengaliStemmer.java @@ -18,10 +18,10 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** Test Codes for BengaliStemmer */ public class TestBengaliStemmer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/boost/TestDelimitedBoostTokenFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/boost/TestDelimitedBoostTokenFilter.java index 17b5c151018..3a4774c465a 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/boost/TestDelimitedBoostTokenFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/boost/TestDelimitedBoostTokenFilter.java @@ -16,10 +16,10 @@ */ package org.apache.lucene.analysis.boost; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.search.BoostAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestDelimitedBoostTokenFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianAnalyzer.java index b1f7adac47c..7bf8da847c3 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianAnalyzer.java @@ -19,13 +19,13 @@ import java.io.IOException; import java.io.StringReader; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.core.LetterTokenizer; import org.apache.lucene.analysis.core.LowerCaseFilter; import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** * Test the Brazilian Stem Filter, which only modifies the term text. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemFilterFactory.java index 81dd93b6cd7..0a7e2a2c6ea 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemFilterFactory.java @@ -18,10 +18,10 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests to ensure the Brazilian stem filter factory is working. */ public class TestBrazilianStemFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ca/TestCatalanAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ca/TestCatalanAnalyzer.java index 444eef3d641..048e08e3d55 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ca/TestCatalanAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ca/TestCatalanAnalyzer.java @@ -18,8 +18,8 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestCatalanAnalyzer extends BaseTokenStreamTestCase { /** This test fails with NPE when the stopwords file is missing in classpath */ diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilter.java index f49bb796dc1..de07c9d9878 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilter.java @@ -26,9 +26,9 @@ import java.util.HashSet; import java.util.Set; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.TestUtil; public class TestHTMLStripCharFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilterFactory.java index 8c28f442b0d..72eddd3083d 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilterFactory.java @@ -18,8 +18,8 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure this factory is working */ public class TestHTMLStripCharFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilter.java index 43aa9e86cb3..07b8f6a560a 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilter.java @@ -26,11 +26,11 @@ import java.util.Random; import java.util.Set; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharFilter; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.UnicodeUtil; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilterFactory.java index eb14290920d..240daebb119 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilterFactory.java @@ -16,7 +16,7 @@ */ package org.apache.lucene.analysis.charfilter; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; public class TestMappingCharFilterFactory extends BaseTokenStreamFactoryTestCase { public void testParseString() throws Exception { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKAnalyzer.java index e22bb1454c0..60de5c516b4 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKAnalyzer.java @@ -19,9 +19,7 @@ import java.io.IOException; import java.io.Reader; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.StopFilter; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; @@ -31,6 +29,8 @@ import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.standard.StandardTokenizer; import org.apache.lucene.analysis.tokenattributes.TypeAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Most tests adopted from TestCJKTokenizer */ public class TestCJKAnalyzer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilter.java index e8271e51634..4e6499ed96f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilter.java @@ -18,9 +18,9 @@ import java.util.Random; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.standard.StandardTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.apache.lucene.util.IOUtils; public class TestCJKBigramFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilterFactory.java index 2bf8bedb955..428292c3a46 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilterFactory.java @@ -18,9 +18,9 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure the CJK bigram factory is working. */ public class TestCJKBigramFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthCharFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthCharFilter.java index 8f9239654f9..038b41fd9f2 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthCharFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthCharFilter.java @@ -21,11 +21,11 @@ import java.io.Reader; import java.io.StringReader; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharFilter; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; public class TestCJKWidthCharFilter extends BaseTokenStreamTestCase { /** Full-width ASCII forms normalized to half-width (basic latin) */ diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthCharFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthCharFilterFactory.java index 8b3ecec8114..833845003c4 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthCharFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthCharFilterFactory.java @@ -19,8 +19,8 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure {@link CJKWidthCharFilter} is working */ public class TestCJKWidthCharFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthFilter.java index 9cdde2ff05c..967af7fce01 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthFilter.java @@ -18,10 +18,10 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Tests for {@link CJKWidthFilter} */ public class TestCJKWidthFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthFilterFactory.java index 611bd5fb9b3..20e610a59be 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthFilterFactory.java @@ -18,8 +18,8 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure the CJKWidthFilterFactory is working */ public class TestCJKWidthFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniAnalyzer.java index 3309da0cd55..42f6a521775 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniAnalyzer.java @@ -18,8 +18,8 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** Test the Sorani analyzer */ public class TestSoraniAnalyzer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniNormalizationFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniNormalizationFilter.java index 6a6f9ed2fc9..44c73657090 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniNormalizationFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniNormalizationFilter.java @@ -18,10 +18,10 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Tests normalization for Sorani (this is more critical than stemming...) */ public class TestSoraniNormalizationFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniNormalizationFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniNormalizationFilterFactory.java index af51b813b02..acbd6454bd4 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniNormalizationFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniNormalizationFilterFactory.java @@ -18,8 +18,8 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure the Sorani normalization factory is working. */ public class TestSoraniNormalizationFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniStemFilter.java index 41591a64f18..d2f4e9ec460 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniStemFilter.java @@ -16,15 +16,15 @@ */ package org.apache.lucene.analysis.ckb; -import static org.apache.lucene.analysis.VocabularyAssert.assertVocabulary; +import static org.apache.lucene.tests.analysis.VocabularyAssert.assertVocabulary; import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Test the Sorani Stemmer. */ public class TestSoraniStemFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniStemFilterFactory.java index 7a5693d9326..317d29abf21 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniStemFilterFactory.java @@ -18,10 +18,10 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests to ensure the Sorani stem factory is working. */ public class TestSoraniStemFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/classic/TestClassicAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/classic/TestClassicAnalyzer.java index b649807045d..c84918bc00d 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/classic/TestClassicAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/classic/TestClassicAnalyzer.java @@ -19,7 +19,6 @@ import java.io.IOException; import java.util.Arrays; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.TextField; @@ -33,6 +32,7 @@ import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.apache.lucene.util.BytesRef; /** tests for classicanalyzer */ diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/classic/TestClassicFactories.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/classic/TestClassicFactories.java index 27643fe487b..3eb2b03cce7 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/classic/TestClassicFactories.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/classic/TestClassicFactories.java @@ -18,9 +18,9 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure the classic lucene factories are working. */ public class TestClassicFactories extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsFilter.java index 2ce0d3aec2e..9f708612058 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsFilter.java @@ -19,13 +19,13 @@ import java.io.StringReader; import java.util.Arrays; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Tests CommonGrams(Query)Filter */ public class TestCommonGramsFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsFilterFactory.java index d93cd6078eb..ab3c3641899 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsFilterFactory.java @@ -17,11 +17,11 @@ package org.apache.lucene.analysis.commongrams; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.util.ClasspathResourceLoader; import org.apache.lucene.util.ResourceLoader; import org.apache.lucene.util.Version; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsQueryFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsQueryFilterFactory.java index 309f731dd9e..4296a7a4fcc 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsQueryFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsQueryFilterFactory.java @@ -16,11 +16,11 @@ */ package org.apache.lucene.analysis.commongrams; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.TestStopFilterFactory; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.util.ClasspathResourceLoader; import org.apache.lucene.util.ResourceLoader; import org.apache.lucene.util.Version; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestCompoundWordTokenFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestCompoundWordTokenFilter.java index 4d36c19025b..67a36f94223 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestCompoundWordTokenFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestCompoundWordTokenFilter.java @@ -21,9 +21,7 @@ import java.io.StringReader; import java.util.Arrays; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; @@ -32,6 +30,8 @@ import org.apache.lucene.analysis.compound.hyphenation.HyphenationTree; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.util.Attribute; import org.apache.lucene.util.AttributeImpl; import org.apache.lucene.util.AttributeReflector; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestDictionaryCompoundWordTokenFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestDictionaryCompoundWordTokenFilterFactory.java index 1f861408d99..cfe2f432b65 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestDictionaryCompoundWordTokenFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestDictionaryCompoundWordTokenFilterFactory.java @@ -18,10 +18,10 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests to ensure the Dictionary compound filter factory is working. */ public class TestDictionaryCompoundWordTokenFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestHyphenationCompoundWordTokenFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestHyphenationCompoundWordTokenFilterFactory.java index de51ed6fb93..d13e518faed 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestHyphenationCompoundWordTokenFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestHyphenationCompoundWordTokenFilterFactory.java @@ -18,10 +18,10 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests to ensure the Hyphenation compound filter factory is working. */ public class TestHyphenationCompoundWordTokenFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAllAnalyzersHaveFactories.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAllAnalyzersHaveFactories.java index e0ed581d79f..945177b69af 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAllAnalyzersHaveFactories.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAllAnalyzersHaveFactories.java @@ -29,24 +29,11 @@ import org.apache.lucene.analysis.CachingTokenFilter; import org.apache.lucene.analysis.CharFilter; import org.apache.lucene.analysis.CharFilterFactory; -import org.apache.lucene.analysis.CrankyTokenFilter; -import org.apache.lucene.analysis.MockCharFilter; -import org.apache.lucene.analysis.MockFixedLengthPayloadFilter; -import org.apache.lucene.analysis.MockGraphTokenFilter; -import org.apache.lucene.analysis.MockHoleInjectingTokenFilter; -import org.apache.lucene.analysis.MockLowerCaseFilter; -import org.apache.lucene.analysis.MockRandomLookaheadTokenFilter; -import org.apache.lucene.analysis.MockSynonymFilter; -import org.apache.lucene.analysis.MockTokenFilter; -import org.apache.lucene.analysis.MockTokenizer; -import org.apache.lucene.analysis.MockVariableLengthPayloadFilter; -import org.apache.lucene.analysis.SimplePayloadFilter; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenFilterFactory; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.TokenizerFactory; -import org.apache.lucene.analysis.ValidatingTokenFilter; import org.apache.lucene.analysis.miscellaneous.PatternKeywordMarkerFilter; import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; import org.apache.lucene.analysis.path.ReversePathHierarchyTokenizer; @@ -54,6 +41,19 @@ import org.apache.lucene.analysis.snowball.SnowballFilter; import org.apache.lucene.analysis.sr.SerbianNormalizationRegularFilter; import org.apache.lucene.analysis.util.StringMockResourceLoader; +import org.apache.lucene.tests.analysis.CrankyTokenFilter; +import org.apache.lucene.tests.analysis.MockCharFilter; +import org.apache.lucene.tests.analysis.MockFixedLengthPayloadFilter; +import org.apache.lucene.tests.analysis.MockGraphTokenFilter; +import org.apache.lucene.tests.analysis.MockHoleInjectingTokenFilter; +import org.apache.lucene.tests.analysis.MockLowerCaseFilter; +import org.apache.lucene.tests.analysis.MockRandomLookaheadTokenFilter; +import org.apache.lucene.tests.analysis.MockSynonymFilter; +import org.apache.lucene.tests.analysis.MockTokenFilter; +import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.analysis.MockVariableLengthPayloadFilter; +import org.apache.lucene.tests.analysis.SimplePayloadFilter; +import org.apache.lucene.tests.analysis.ValidatingTokenFilter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.ResourceLoader; import org.apache.lucene.util.ResourceLoaderAware; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAnalyzers.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAnalyzers.java index 305c9f9543e..7ca07cfb8a3 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAnalyzers.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAnalyzers.java @@ -19,7 +19,6 @@ import java.io.IOException; import java.io.StringReader; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.LowerCaseFilter; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; @@ -28,6 +27,7 @@ import org.apache.lucene.analysis.standard.StandardTokenizer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.PayloadAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestBugInSomething.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestBugInSomething.java index 0f187938213..28777e8fdb6 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestBugInSomething.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestBugInSomething.java @@ -23,12 +23,8 @@ import java.util.Arrays; import java.util.HashSet; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.CharFilter; -import org.apache.lucene.analysis.MockCharFilter; -import org.apache.lucene.analysis.MockTokenFilter; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; @@ -40,6 +36,10 @@ import org.apache.lucene.analysis.ngram.NGramTokenFilter; import org.apache.lucene.analysis.shingle.ShingleFilter; import org.apache.lucene.analysis.wikipedia.WikipediaTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockCharFilter; +import org.apache.lucene.tests.analysis.MockTokenFilter; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; @SuppressCodecs("Direct") diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestCoreFactories.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestCoreFactories.java index fcd0b5108ff..90368c772cd 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestCoreFactories.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestCoreFactories.java @@ -18,8 +18,8 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure the core lucene factories are working. */ public class TestCoreFactories extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDecimalDigitFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDecimalDigitFilter.java index 9566e12ec0f..c91da6314bd 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDecimalDigitFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDecimalDigitFilter.java @@ -18,10 +18,10 @@ import java.util.Random; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.search.DocIdSetIterator; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.SparseFixedBitSet; import org.junit.AfterClass; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDecimalDigitFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDecimalDigitFilterFactory.java index e0f4df3fc3f..ccb9719a7c4 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDecimalDigitFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDecimalDigitFilterFactory.java @@ -18,8 +18,8 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure the digit normalization factory is working. */ public class TestDecimalDigitFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDuelingAnalyzers.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDuelingAnalyzers.java index a8d46b8ecd2..8f336c269da 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDuelingAnalyzers.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDuelingAnalyzers.java @@ -20,14 +20,14 @@ import java.io.StringReader; import java.util.Random; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockReaderWrapper; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockReaderWrapper; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.automaton.Automaton; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFactories.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFactories.java index dad9ff0e389..95b8bddb114 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFactories.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFactories.java @@ -27,15 +27,15 @@ import java.util.Set; import org.apache.lucene.analysis.AbstractAnalysisFactory; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharFilterFactory; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenFilterFactory; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.TokenizerFactory; import org.apache.lucene.analysis.boost.DelimitedBoostTokenFilterFactory; import org.apache.lucene.analysis.miscellaneous.DelimitedTermFrequencyTokenFilterFactory; import org.apache.lucene.analysis.util.StringMockResourceLoader; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase.Nightly; import org.apache.lucene.util.AttributeFactory; import org.apache.lucene.util.ResourceLoaderAware; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFlattenGraphFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFlattenGraphFilter.java index 2452a36a04f..7b35f56016c 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFlattenGraphFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFlattenGraphFilter.java @@ -26,17 +26,17 @@ import java.util.stream.Collectors; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.AutomatonToTokenStream; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.CannedTokenStream; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.StopFilter; -import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.TokenStreamToAutomaton; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.synonym.SynonymGraphFilter; import org.apache.lucene.analysis.synonym.SynonymMap; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.analysis.Token; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.CharsRef; import org.apache.lucene.util.CharsRefBuilder; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java index ee83d8543d6..f2800154f30 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java @@ -18,7 +18,6 @@ import java.io.StringReader; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.document.Document; @@ -33,6 +32,7 @@ import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordTokenizer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordTokenizer.java index 229761d3f20..03ee77593d9 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordTokenizer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordTokenizer.java @@ -20,8 +20,8 @@ import java.io.StringReader; import java.util.HashMap; import java.util.Map; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.apache.lucene.util.AttributeFactory; public class TestKeywordTokenizer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java index f739b22f356..98256b3b6f2 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java @@ -48,18 +48,13 @@ import java.util.function.Predicate; import java.util.regex.Pattern; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CachingTokenFilter; import org.apache.lucene.analysis.CharArrayMap; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.CharFilter; -import org.apache.lucene.analysis.CrankyTokenFilter; -import org.apache.lucene.analysis.MockTokenFilter; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.ValidatingTokenFilter; import org.apache.lucene.analysis.boost.DelimitedBoostTokenFilter; import org.apache.lucene.analysis.charfilter.NormalizeCharMap; import org.apache.lucene.analysis.cjk.CJKBigramFilter; @@ -95,6 +90,11 @@ import org.apache.lucene.analysis.synonym.SynonymMap; import org.apache.lucene.analysis.wikipedia.WikipediaTokenizer; import org.apache.lucene.store.ByteBuffersDirectory; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.CrankyTokenFilter; +import org.apache.lucene.tests.analysis.MockTokenFilter; +import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.analysis.ValidatingTokenFilter; import org.apache.lucene.tests.util.Rethrow; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.tests.util.automaton.AutomatonTestUtil; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopAnalyzer.java index a012e44ed5e..29b3089a819 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopAnalyzer.java @@ -20,12 +20,12 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.en.EnglishAnalyzer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestStopAnalyzer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilterFactory.java index e82a356bf8e..0946a922439 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilterFactory.java @@ -16,9 +16,9 @@ */ package org.apache.lucene.analysis.core; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.en.EnglishAnalyzer; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.util.ClasspathResourceLoader; import org.apache.lucene.util.ResourceLoader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilter.java index 0198d8ef462..0de7e525bd3 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilter.java @@ -20,12 +20,12 @@ import java.io.StringReader; import java.util.Collections; import java.util.Set; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.standard.StandardTokenizer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; import org.apache.lucene.analysis.tokenattributes.TypeAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.apache.lucene.tests.util.English; public class TestTypeTokenFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilterFactory.java index fa7b9430324..ffcbcbcc583 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilterFactory.java @@ -17,9 +17,9 @@ package org.apache.lucene.analysis.core; import java.util.Set; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.CannedTokenStream; import org.apache.lucene.analysis.TokenFilterFactory; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.tests.analysis.CannedTokenStream; /** Testcase for {@link TypeTokenFilterFactory} */ public class TestTypeTokenFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestUnicodeWhitespaceTokenizer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestUnicodeWhitespaceTokenizer.java index f9510eb0e50..f8f3fe11496 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestUnicodeWhitespaceTokenizer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestUnicodeWhitespaceTokenizer.java @@ -20,8 +20,8 @@ import java.io.StringReader; import java.util.HashMap; import java.util.Map; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.apache.lucene.util.AttributeFactory; public class TestUnicodeWhitespaceTokenizer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestWhitespaceAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestWhitespaceAnalyzer.java index 384b2944820..3d0b538a678 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestWhitespaceAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestWhitespaceAnalyzer.java @@ -19,7 +19,7 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestWhitespaceAnalyzer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/custom/TestCustomAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/custom/TestCustomAnalyzer.java index f87551279f6..cd4e77cca5e 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/custom/TestCustomAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/custom/TestCustomAnalyzer.java @@ -23,7 +23,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharFilter; import org.apache.lucene.analysis.CharFilterFactory; import org.apache.lucene.analysis.LowerCaseFilter; @@ -41,6 +40,7 @@ import org.apache.lucene.analysis.miscellaneous.ASCIIFoldingFilterFactory; import org.apache.lucene.analysis.reverse.ReverseStringFilterFactory; import org.apache.lucene.analysis.standard.StandardTokenizerFactory; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.apache.lucene.util.AttributeFactory; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.SetOnce.AlreadySetException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java index baa517df7db..0dc4547c379 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java @@ -18,8 +18,8 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** * Test the CzechAnalyzer diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemFilterFactory.java index 1a7f620fdac..0e28d8157ce 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemFilterFactory.java @@ -18,10 +18,10 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests to ensure the Czech stem filter factory is working. */ public class TestCzechStemFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemmer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemmer.java index 8890b0c37a2..61047d23f6d 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemmer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemmer.java @@ -19,12 +19,12 @@ import java.io.IOException; import java.io.StringReader; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** * Test the Czech Stemmer. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/da/TestDanishAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/da/TestDanishAnalyzer.java index c7619ac2314..d04d9795ab2 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/da/TestDanishAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/da/TestDanishAnalyzer.java @@ -18,8 +18,8 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestDanishAnalyzer extends BaseTokenStreamTestCase { /** This test fails with NPE when the stopwords file is missing in classpath */ diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanAnalyzer.java index 0159130dba5..faa3ab9038e 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanAnalyzer.java @@ -19,12 +19,12 @@ import java.io.IOException; import java.io.StringReader; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.LowerCaseFilter; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.LetterTokenizer; import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestGermanAnalyzer extends BaseTokenStreamTestCase { public void testReusableTokenStream() throws Exception { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilter.java index 5e557fab28b..564bb569f27 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilter.java @@ -16,17 +16,17 @@ */ package org.apache.lucene.analysis.de; -import static org.apache.lucene.analysis.VocabularyAssert.*; +import static org.apache.lucene.tests.analysis.VocabularyAssert.*; import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests for {@link GermanLightStemFilter} */ public class TestGermanLightStemFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilterFactory.java index 52baa3f8abf..d7d9dc49939 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilterFactory.java @@ -18,8 +18,8 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure the German light stem factory is working. */ public class TestGermanLightStemFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilter.java index 08cc577b036..3154478b7d9 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilter.java @@ -16,17 +16,17 @@ */ package org.apache.lucene.analysis.de; -import static org.apache.lucene.analysis.VocabularyAssert.*; +import static org.apache.lucene.tests.analysis.VocabularyAssert.*; import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests for {@link GermanMinimalStemFilter} */ public class TestGermanMinimalStemFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilterFactory.java index d0d93a7f837..eb55a201e40 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilterFactory.java @@ -18,10 +18,10 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests to ensure the German minimal stem factory is working. */ public class TestGermanMinimalStemFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanNormalizationFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanNormalizationFilter.java index f0613f6bc11..357c70d9fba 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanNormalizationFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanNormalizationFilter.java @@ -18,11 +18,11 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Tests {@link GermanNormalizationFilter} */ public class TestGermanNormalizationFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanNormalizationFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanNormalizationFilterFactory.java index bd1fc23cc9d..d05fddc4af8 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanNormalizationFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanNormalizationFilterFactory.java @@ -18,10 +18,10 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests to ensure the German normalization factory is working. */ public class TestGermanNormalizationFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java index 0b9c5235693..5ebe4f13ce4 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java @@ -16,19 +16,19 @@ */ package org.apache.lucene.analysis.de; -import static org.apache.lucene.analysis.VocabularyAssert.*; +import static org.apache.lucene.tests.analysis.VocabularyAssert.*; import java.io.IOException; import java.io.InputStream; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.LowerCaseFilter; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** * Test the German stemmer. The stemming algorithm is known to work less than perfect, as it doesn't diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilterFactory.java index 95554470c66..658d366d276 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilterFactory.java @@ -18,10 +18,10 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests to ensure the German stem filter factory is working. */ public class TestGermanStemFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekAnalyzer.java index 30d2965754a..91cf775c322 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekAnalyzer.java @@ -17,7 +17,7 @@ package org.apache.lucene.analysis.el; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** A unit test class for verifying the correct operation of the GreekAnalyzer. */ public class TestGreekAnalyzer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekLowerCaseFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekLowerCaseFilterFactory.java index 57d14fd6c19..b10909536dc 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekLowerCaseFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekLowerCaseFilterFactory.java @@ -18,8 +18,8 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure the Greek lowercase filter factory is working. */ public class TestGreekLowerCaseFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemFilterFactory.java index 40595ba4783..965acdd48fe 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemFilterFactory.java @@ -18,8 +18,8 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure the Greek stem filter factory is working. */ public class TestGreekStemFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemmer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemmer.java index 0eb34890811..9b5ddc42449 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemmer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemmer.java @@ -18,9 +18,9 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestGreekStemmer extends BaseTokenStreamTestCase { private Analyzer a; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/email/TestUAX29URLEmailAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/email/TestUAX29URLEmailAnalyzer.java index 90586037084..52f89647278 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/email/TestUAX29URLEmailAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/email/TestUAX29URLEmailAnalyzer.java @@ -19,7 +19,7 @@ import java.io.IOException; import java.util.Arrays; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestUAX29URLEmailAnalyzer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/email/TestUAX29URLEmailTokenizer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/email/TestUAX29URLEmailTokenizer.java index 461fd69935f..c72c9073c66 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/email/TestUAX29URLEmailTokenizer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/email/TestUAX29URLEmailTokenizer.java @@ -30,13 +30,13 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.standard.EmojiTokenizationTestUnicode_12_1; -import org.apache.lucene.analysis.standard.WordBreakTestUnicode_12_1_0; import org.apache.lucene.analysis.tokenattributes.TypeAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.standard.EmojiTokenizationTestUnicode_12_1; +import org.apache.lucene.tests.analysis.standard.WordBreakTestUnicode_12_1_0; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/email/TestUAX29URLEmailTokenizerFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/email/TestUAX29URLEmailTokenizerFactory.java index bb038ca3de7..1d590cad1cc 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/email/TestUAX29URLEmailTokenizerFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/email/TestUAX29URLEmailTokenizerFactory.java @@ -18,8 +18,8 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** A few tests based on org.apache.lucene.analysis.TestUAX29URLEmailTokenizer */ public class TestUAX29URLEmailTokenizerFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishAnalyzer.java index 54021509c40..69698d5bd61 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishAnalyzer.java @@ -18,8 +18,8 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestEnglishAnalyzer extends BaseTokenStreamTestCase { /** This test fails with NPE when the stopwords file is missing in classpath */ diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishMinimalStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishMinimalStemFilter.java index b915f8d1a57..f4b15ebc739 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishMinimalStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishMinimalStemFilter.java @@ -18,10 +18,10 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests for {@link EnglishMinimalStemFilter} */ public class TestEnglishMinimalStemFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishMinimalStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishMinimalStemFilterFactory.java index 018fbb846be..404ce2241de 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishMinimalStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishMinimalStemFilterFactory.java @@ -18,8 +18,8 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure the English minimal stem factory is working. */ public class TestEnglishMinimalStemFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemFilterFactory.java index 021758d08d9..3997fff70f1 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemFilterFactory.java @@ -18,8 +18,8 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure the kstem filter factory is working. */ public class TestKStemFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemmer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemmer.java index fb2091d8713..385f0a76e17 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemmer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemmer.java @@ -16,14 +16,14 @@ */ package org.apache.lucene.analysis.en; -import static org.apache.lucene.analysis.VocabularyAssert.assertVocabulary; +import static org.apache.lucene.tests.analysis.VocabularyAssert.assertVocabulary; import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.junit.Ignore; /** Tests for {@link KStemmer} */ diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilter.java index 5a3a32dfaa7..87ece3a96cc 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilter.java @@ -16,18 +16,18 @@ */ package org.apache.lucene.analysis.en; -import static org.apache.lucene.analysis.VocabularyAssert.*; +import static org.apache.lucene.tests.analysis.VocabularyAssert.*; import java.io.IOException; import java.io.StringReader; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Test the PorterStemFilter with Martin Porter's test data. */ public class TestPorterStemFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilterFactory.java index 20c26dad910..1e8e815a7d3 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilterFactory.java @@ -18,8 +18,8 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure the Porter stem filter factory is working. */ public class TestPorterStemFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishAnalyzer.java index 68f42da08e2..b2017bbd9f7 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishAnalyzer.java @@ -18,8 +18,8 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestSpanishAnalyzer extends BaseTokenStreamTestCase { /** This test fails with NPE when the stopwords file is missing in classpath */ diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishLightStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishLightStemFilter.java index 10f8da23697..a0770bafb72 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishLightStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishLightStemFilter.java @@ -16,14 +16,14 @@ */ package org.apache.lucene.analysis.es; -import static org.apache.lucene.analysis.VocabularyAssert.*; +import static org.apache.lucene.tests.analysis.VocabularyAssert.*; import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests for {@link SpanishLightStemFilter} */ public class TestSpanishLightStemFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishLightStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishLightStemFilterFactory.java index 5b17ce2110b..f2099451b1d 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishLightStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishLightStemFilterFactory.java @@ -18,10 +18,10 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests to ensure the Spanish Light stem factory is working. */ public class TestSpanishLightStemFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishMinimalStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishMinimalStemFilter.java index 7cd511ebb78..d170f379554 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishMinimalStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishMinimalStemFilter.java @@ -19,11 +19,11 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.en.EnglishMinimalStemFilter; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** * Simple tests for {@link SpanishMinimalStemFilter} diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishMinimalStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishMinimalStemFilterFactory.java index d71615e6fa3..ebb9fc458e6 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishMinimalStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishMinimalStemFilterFactory.java @@ -19,10 +19,10 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** * Simple tests to ensure the spanish minimal stem factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishPluralStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishPluralStemFilter.java index 9381b900b11..49173904eb9 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishPluralStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishPluralStemFilter.java @@ -16,14 +16,14 @@ */ package org.apache.lucene.analysis.es; -import static org.apache.lucene.analysis.VocabularyAssert.assertVocabulary; +import static org.apache.lucene.tests.analysis.VocabularyAssert.assertVocabulary; import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests for {@link SpanishPluralStemFilter} */ public class TestSpanishPluralStemFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishPluralStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishPluralStemFilterFactory.java index 8abe7121942..a639d614516 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishPluralStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishPluralStemFilterFactory.java @@ -18,10 +18,10 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests to ensure the Spanish Plural stem factory is working. */ public class TestSpanishPluralStemFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/et/TestEstonianAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/et/TestEstonianAnalyzer.java index e6169b0051a..6bde0723a12 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/et/TestEstonianAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/et/TestEstonianAnalyzer.java @@ -18,7 +18,7 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestEstonianAnalyzer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/eu/TestBasqueAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/eu/TestBasqueAnalyzer.java index 263a9aa813e..9042c218280 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/eu/TestBasqueAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/eu/TestBasqueAnalyzer.java @@ -18,8 +18,8 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestBasqueAnalyzer extends BaseTokenStreamTestCase { /** This test fails with NPE when the stopwords file is missing in classpath */ diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianAnalyzer.java index e1c642134f3..e6498d58fb4 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianAnalyzer.java @@ -17,8 +17,8 @@ package org.apache.lucene.analysis.fa; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** Test the Persian Analyzer */ public class TestPersianAnalyzer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianCharFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianCharFilter.java index 13cd9e0a195..ba6a257eb3a 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianCharFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianCharFilter.java @@ -18,8 +18,8 @@ import java.io.Reader; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; public class TestPersianCharFilter extends BaseTokenStreamTestCase { private Analyzer analyzer; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianNormalizationFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianNormalizationFilter.java index a1180cb0c32..89609df93ac 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianNormalizationFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianNormalizationFilter.java @@ -18,10 +18,10 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Test the Persian Normalization Filter */ public class TestPersianNormalizationFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianNormalizationFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianNormalizationFilterFactory.java index 667325e2de0..e3716228216 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianNormalizationFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianNormalizationFilterFactory.java @@ -18,8 +18,8 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure the Persian normalization factory is working. */ public class TestPersianNormalizationFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishAnalyzer.java index fe2cc1197c3..74facc196d5 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishAnalyzer.java @@ -18,8 +18,8 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestFinnishAnalyzer extends BaseTokenStreamTestCase { /** This test fails with NPE when the stopwords file is missing in classpath */ diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilter.java index 145aa55ac08..cac78c260e5 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilter.java @@ -16,17 +16,17 @@ */ package org.apache.lucene.analysis.fi; -import static org.apache.lucene.analysis.VocabularyAssert.*; +import static org.apache.lucene.tests.analysis.VocabularyAssert.*; import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests for {@link FinnishLightStemFilter} */ public class TestFinnishLightStemFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilterFactory.java index 82d930ab458..8ec532ec1f3 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilterFactory.java @@ -18,10 +18,10 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests to ensure the Finnish light stem factory is working. */ public class TestFinnishLightStemFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchAnalyzer.java index 2e3a64e4e48..a975b619c8e 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchAnalyzer.java @@ -18,8 +18,8 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** Test case for FrenchAnalyzer. */ public class TestFrenchAnalyzer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilter.java index 53aba98fcb4..5844472004d 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilter.java @@ -16,17 +16,17 @@ */ package org.apache.lucene.analysis.fr; -import static org.apache.lucene.analysis.VocabularyAssert.*; +import static org.apache.lucene.tests.analysis.VocabularyAssert.*; import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests for {@link FrenchLightStemFilter} */ public class TestFrenchLightStemFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilterFactory.java index d6cbeab2c0b..ea9de378de9 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilterFactory.java @@ -18,8 +18,8 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure the French light stem factory is working. */ public class TestFrenchLightStemFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilter.java index 036f9584917..e0880db43ad 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilter.java @@ -16,17 +16,17 @@ */ package org.apache.lucene.analysis.fr; -import static org.apache.lucene.analysis.VocabularyAssert.*; +import static org.apache.lucene.tests.analysis.VocabularyAssert.*; import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests for {@link FrenchMinimalStemFilter} */ public class TestFrenchMinimalStemFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilterFactory.java index 19ebea7ff35..73545a13526 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilterFactory.java @@ -18,8 +18,8 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure the French minimal stem factory is working. */ public class TestFrenchMinimalStemFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishAnalyzer.java index 138d189df46..02a5ad29875 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishAnalyzer.java @@ -18,8 +18,8 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestIrishAnalyzer extends BaseTokenStreamTestCase { /** This test fails with NPE when the stopwords file is missing in classpath */ diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishLowerCaseFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishLowerCaseFilter.java index 08167c9a8df..d85d8b3bcc1 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishLowerCaseFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishLowerCaseFilter.java @@ -18,10 +18,10 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** Test the Irish lowercase filter. */ public class TestIrishLowerCaseFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishLowerCaseFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishLowerCaseFilterFactory.java index ccf7a00deb8..520f3844da2 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishLowerCaseFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishLowerCaseFilterFactory.java @@ -18,8 +18,8 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure the Irish lowercase filter factory is working. */ public class TestIrishLowerCaseFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianAnalyzer.java index e0dcaeb7cea..91b1d6a1d72 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianAnalyzer.java @@ -18,8 +18,8 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestGalicianAnalyzer extends BaseTokenStreamTestCase { /** This test fails with NPE when the stopwords file is missing in classpath */ diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilter.java index d3d79e63740..d744eddca59 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilter.java @@ -18,13 +18,13 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests for {@link GalicianMinimalStemmer} */ public class TestGalicianMinimalStemFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilterFactory.java index 18318a1e59d..6e927660844 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilterFactory.java @@ -18,8 +18,8 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure the Galician plural stem factory is working. */ public class TestGalicianMinimalStemFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianStemFilter.java index 2a84d8aa3e1..f26e67c7eba 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianStemFilter.java @@ -16,14 +16,14 @@ */ package org.apache.lucene.analysis.gl; -import static org.apache.lucene.analysis.VocabularyAssert.assertVocabulary; +import static org.apache.lucene.tests.analysis.VocabularyAssert.assertVocabulary; import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests for {@link GalicianStemFilter} */ public class TestGalicianStemFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianStemFilterFactory.java index 5f088a26d7f..fc613332d36 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianStemFilterFactory.java @@ -18,8 +18,8 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure the Galician stem factory is working. */ public class TestGalicianStemFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiAnalyzer.java index a61ea9b8a47..bc5c98e6b0b 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiAnalyzer.java @@ -17,8 +17,8 @@ package org.apache.lucene.analysis.hi; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** Tests the HindiAnalyzer */ public class TestHindiAnalyzer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiFilters.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiFilters.java index b795997a758..45e20120b91 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiFilters.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiFilters.java @@ -18,8 +18,8 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure the Hindi filter Factories are working. */ public class TestHindiFilters extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiNormalizer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiNormalizer.java index 0a9e3be49a3..d71391805cf 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiNormalizer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiNormalizer.java @@ -18,10 +18,10 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** Test HindiNormalizer */ public class TestHindiNormalizer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiStemmer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiStemmer.java index 14208b84387..6f5a1b72669 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiStemmer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiStemmer.java @@ -18,10 +18,10 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** Test HindiStemmer */ public class TestHindiStemmer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianAnalyzer.java index f9782d420c4..1d977f8d402 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianAnalyzer.java @@ -18,8 +18,8 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestHungarianAnalyzer extends BaseTokenStreamTestCase { /** This test fails with NPE when the stopwords file is missing in classpath */ diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilter.java index 2162d5dc5c6..7c8ce773ca4 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilter.java @@ -16,17 +16,17 @@ */ package org.apache.lucene.analysis.hu; -import static org.apache.lucene.analysis.VocabularyAssert.*; +import static org.apache.lucene.tests.analysis.VocabularyAssert.*; import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests for {@link HungarianLightStemFilter} */ public class TestHungarianLightStemFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilterFactory.java index 01a79d340c1..26e6aa67c98 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilterFactory.java @@ -18,8 +18,8 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure the Hungarian light stem factory is working. */ public class TestHungarianLightStemFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspellStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspellStemFilter.java index b5d44064266..ccd1a250515 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspellStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspellStemFilter.java @@ -21,13 +21,13 @@ import java.util.Arrays; import java.util.Collections; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.util.IOUtils; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspellStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspellStemFilterFactory.java index 6fbfa9dc262..54abd095684 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspellStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspellStemFilterFactory.java @@ -18,8 +18,8 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure the Hunspell stemmer loads from factory */ public class TestHunspellStemFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hy/TestArmenianAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hy/TestArmenianAnalyzer.java index cb9db24a86c..23951fde2a8 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hy/TestArmenianAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hy/TestArmenianAnalyzer.java @@ -18,8 +18,8 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestArmenianAnalyzer extends BaseTokenStreamTestCase { /** This test fails with NPE when the stopwords file is missing in classpath */ diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianAnalyzer.java index 300bcfc5bb1..ff5fc53f4e1 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianAnalyzer.java @@ -18,8 +18,8 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestIndonesianAnalyzer extends BaseTokenStreamTestCase { /** This test fails with NPE when the stopwords file is missing in classpath */ diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianStemFilterFactory.java index bb19b488449..1e7ef1bc6fd 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianStemFilterFactory.java @@ -18,10 +18,10 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests to ensure the Indonesian stem filter factory is working. */ public class TestIndonesianStemFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianStemmer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianStemmer.java index f98ad3f71e8..8a63ae5c394 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianStemmer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianStemmer.java @@ -18,10 +18,10 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.util.IOUtils; /** Tests {@link IndonesianStemmer} */ diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/in/TestIndicNormalizer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/in/TestIndicNormalizer.java index ec389c69bc7..e214620c61e 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/in/TestIndicNormalizer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/in/TestIndicNormalizer.java @@ -19,11 +19,11 @@ import java.io.IOException; import java.io.StringReader; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Test IndicNormalizer */ public class TestIndicNormalizer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianAnalyzer.java index 8cc3d5bb8b2..5c667524113 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianAnalyzer.java @@ -18,8 +18,8 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestItalianAnalyzer extends BaseTokenStreamTestCase { /** This test fails with NPE when the stopwords file is missing in classpath */ diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianLightStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianLightStemFilter.java index 78724847def..929cd911665 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianLightStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianLightStemFilter.java @@ -16,14 +16,14 @@ */ package org.apache.lucene.analysis.it; -import static org.apache.lucene.analysis.VocabularyAssert.*; +import static org.apache.lucene.tests.analysis.VocabularyAssert.*; import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests for {@link ItalianLightStemFilter} */ public class TestItalianLightStemFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianLightStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianLightStemFilterFactory.java index d2d0754d0c7..600bb3e5833 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianLightStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianLightStemFilterFactory.java @@ -18,8 +18,8 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure the Italian light stem factory is working. */ public class TestItalianLightStemFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/lt/TestLithuanianAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/lt/TestLithuanianAnalyzer.java index 6a071df38b6..f8e37ec2e99 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/lt/TestLithuanianAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/lt/TestLithuanianAnalyzer.java @@ -18,8 +18,8 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestLithuanianAnalyzer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/lt/TestLithuanianStemming.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/lt/TestLithuanianStemming.java index c1976bc62fe..329f9ef44b7 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/lt/TestLithuanianStemming.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/lt/TestLithuanianStemming.java @@ -18,10 +18,10 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.snowball.SnowballFilter; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.tartarus.snowball.ext.LithuanianStemmer; /** diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianAnalyzer.java index db1df0efb84..8ede4d58765 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianAnalyzer.java @@ -18,8 +18,8 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestLatvianAnalyzer extends BaseTokenStreamTestCase { /** This test fails with NPE when the stopwords file is missing in classpath */ diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianStemFilterFactory.java index e88a1ea1ce2..a55e300be8c 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianStemFilterFactory.java @@ -18,10 +18,10 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests to ensure the Latvian stem factory is working. */ public class TestLatvianStemFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianStemmer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianStemmer.java index 192b25b31d3..3cd170101eb 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianStemmer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianStemmer.java @@ -18,10 +18,10 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Basic tests for {@link LatvianStemmer} */ public class TestLatvianStemmer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/minhash/TestMinHashFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/minhash/TestMinHashFilter.java index e14077743ac..e6b9525a5e7 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/minhash/TestMinHashFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/minhash/TestMinHashFilter.java @@ -23,13 +23,13 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.minhash.MinHashFilter.FixedSizeTreeSet; import org.apache.lucene.analysis.minhash.MinHashFilter.LongPair; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.util.automaton.CharacterRunAutomaton; import org.apache.lucene.util.automaton.Operations; import org.apache.lucene.util.automaton.RegExp; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestASCIIFoldingFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestASCIIFoldingFilter.java index d42ac6c5934..706952abbf0 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestASCIIFoldingFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestASCIIFoldingFilter.java @@ -21,12 +21,12 @@ import java.util.Iterator; import java.util.List; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; public class TestASCIIFoldingFilter extends BaseTokenStreamTestCase { /** Pop one input token's worth of tokens off the filter and verify that they are as expected. */ diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestAsciiFoldingFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestAsciiFoldingFilterFactory.java index 03761e0726d..67abfc81e08 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestAsciiFoldingFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestAsciiFoldingFilterFactory.java @@ -19,11 +19,11 @@ import java.io.IOException; import java.util.Collections; import java.util.HashMap; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.CannedTokenStream; -import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenFilterFactory; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.Token; public class TestAsciiFoldingFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCapitalizationFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCapitalizationFilter.java index 88d3d3200b7..a4ca04efdf3 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCapitalizationFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCapitalizationFilter.java @@ -25,11 +25,11 @@ import java.util.Collection; import java.util.List; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.junit.Test; /** Tests {@link CapitalizationFilter} */ diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCapitalizationFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCapitalizationFilterFactory.java index 4d83ebdbfbb..1d9876d97cd 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCapitalizationFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCapitalizationFilterFactory.java @@ -18,8 +18,8 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; public class TestCapitalizationFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCodepointCountFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCodepointCountFilter.java index a5345d98810..e9d319bd971 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCodepointCountFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCodepointCountFilter.java @@ -19,10 +19,10 @@ import java.io.IOException; import java.io.StringReader; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.apache.lucene.tests.util.TestUtil; import org.junit.Test; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCodepointCountFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCodepointCountFilterFactory.java index 0f9d7dc6426..eba7df9a014 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCodepointCountFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCodepointCountFilterFactory.java @@ -18,10 +18,10 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; public class TestCodepointCountFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestConcatenateGraphFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestConcatenateGraphFilter.java index 4e13d036909..48a331237fa 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestConcatenateGraphFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestConcatenateGraphFilter.java @@ -18,8 +18,6 @@ import java.io.IOException; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.StopFilter; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; @@ -27,6 +25,8 @@ import org.apache.lucene.analysis.synonym.SynonymFilter; import org.apache.lucene.analysis.synonym.SynonymGraphFilter; import org.apache.lucene.analysis.synonym.SynonymMap; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.util.CharsRef; import org.apache.lucene.util.CharsRefBuilder; import org.junit.Test; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestConcatenateGraphFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestConcatenateGraphFilterFactory.java index 3b60c2374f5..9cee7e59cb9 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestConcatenateGraphFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestConcatenateGraphFilterFactory.java @@ -19,10 +19,10 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.StopFilter; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; public class TestConcatenateGraphFilterFactory extends BaseTokenStreamFactoryTestCase { public void test() throws Exception { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestConcatenatingTokenStream.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestConcatenatingTokenStream.java index 51dd1389861..00efa01bf2d 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestConcatenatingTokenStream.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestConcatenatingTokenStream.java @@ -19,13 +19,13 @@ import java.io.IOException; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.CannedTokenStream; -import org.apache.lucene.analysis.MockTokenizer; -import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.FlagsAttribute; import org.apache.lucene.analysis.tokenattributes.PayloadAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.analysis.Token; import org.apache.lucene.util.AttributeFactory; public class TestConcatenatingTokenStream extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestConditionalTokenFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestConditionalTokenFilter.java index 8058c116f1b..272dfd6a546 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestConditionalTokenFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestConditionalTokenFilter.java @@ -24,17 +24,12 @@ import java.util.function.Function; import java.util.regex.Pattern; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.CannedTokenStream; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.CharacterUtils; import org.apache.lucene.analysis.FilteringTokenFilter; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.ValidatingTokenFilter; import org.apache.lucene.analysis.classic.ClassicTokenizer; import org.apache.lucene.analysis.core.TypeTokenFilter; import org.apache.lucene.analysis.de.GermanStemFilter; @@ -49,6 +44,11 @@ import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.Token; +import org.apache.lucene.tests.analysis.ValidatingTokenFilter; public class TestConditionalTokenFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestDateRecognizerFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestDateRecognizerFilter.java index 5c5afec2fff..236bc1cb2fe 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestDateRecognizerFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestDateRecognizerFilter.java @@ -20,8 +20,8 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Locale; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestDateRecognizerFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestDateRecognizerFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestDateRecognizerFilterFactory.java index 28831b01205..7b15a1fff85 100755 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestDateRecognizerFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestDateRecognizerFilterFactory.java @@ -18,7 +18,7 @@ import java.util.HashMap; import java.util.Map; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestDateRecognizerFilterFactory extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestDelimitedTermFrequencyTokenFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestDelimitedTermFrequencyTokenFilter.java index 3c84f82a14a..8724873a7bd 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestDelimitedTermFrequencyTokenFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestDelimitedTermFrequencyTokenFilter.java @@ -17,10 +17,10 @@ package org.apache.lucene.analysis.miscellaneous; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.TermFrequencyAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestDelimitedTermFrequencyTokenFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestDropIfFlaggedFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestDropIfFlaggedFilter.java index 84e13950513..8d062759fdb 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestDropIfFlaggedFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestDropIfFlaggedFilter.java @@ -16,10 +16,10 @@ */ package org.apache.lucene.analysis.miscellaneous; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.CannedTokenStream; -import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.Token; /** Test that this filter removes tokens that match a particular set of flags. */ public class TestDropIfFlaggedFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestDropIfFlaggedFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestDropIfFlaggedFilterFactory.java index c1afbbfa645..ca9ff4fb8f4 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestDropIfFlaggedFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestDropIfFlaggedFilterFactory.java @@ -17,11 +17,11 @@ package org.apache.lucene.analysis.miscellaneous; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.CannedTokenStream; -import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenFilterFactory; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.Token; /** This test just ensures the factory works, detailed tests in {@link TestDropIfFlaggedFilter} */ public class TestDropIfFlaggedFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestEmptyTokenStream.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestEmptyTokenStream.java index d4f5b683391..8aa86e76891 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestEmptyTokenStream.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestEmptyTokenStream.java @@ -17,7 +17,6 @@ package org.apache.lucene.analysis.miscellaneous; import java.io.IOException; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute; import org.apache.lucene.document.Document; @@ -26,6 +25,7 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestEmptyTokenStream extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestFingerprintFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestFingerprintFilter.java index 3746f006fa3..77690c49dae 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestFingerprintFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestFingerprintFilter.java @@ -16,9 +16,9 @@ */ package org.apache.lucene.analysis.miscellaneous; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; public class TestFingerprintFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestFingerprintFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestFingerprintFilterFactory.java index ee59c540121..82a8908cf86 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestFingerprintFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestFingerprintFilterFactory.java @@ -18,9 +18,9 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; public class TestFingerprintFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestFixBrokenOffsetsFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestFixBrokenOffsetsFilter.java index afdffd2f66f..4b9c8e17424 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestFixBrokenOffsetsFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestFixBrokenOffsetsFilter.java @@ -18,15 +18,15 @@ package org.apache.lucene.analysis.miscellaneous; import java.io.IOException; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.CannedTokenStream; -import org.apache.lucene.analysis.Token; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.Token; @Deprecated public class TestFixBrokenOffsetsFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestHyphenatedWordsFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestHyphenatedWordsFilter.java index 0590d5ca5ce..26ba7ce5ec7 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestHyphenatedWordsFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestHyphenatedWordsFilter.java @@ -19,11 +19,11 @@ import java.io.IOException; import java.io.StringReader; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** HyphenatedWordsFilter test */ public class TestHyphenatedWordsFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeepFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeepFilterFactory.java index baf6a711740..0f362002fcc 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeepFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeepFilterFactory.java @@ -16,8 +16,8 @@ */ package org.apache.lucene.analysis.miscellaneous; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.util.ClasspathResourceLoader; import org.apache.lucene.util.ResourceLoader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeepWordFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeepWordFilter.java index 4cfbce7ff27..a390b71a699 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeepWordFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeepWordFilter.java @@ -19,11 +19,11 @@ import java.util.HashSet; import java.util.Set; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Test {@link KeepWordFilter} */ public class TestKeepWordFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilter.java index 7f627130c80..3652a2b5d14 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilter.java @@ -19,12 +19,12 @@ import java.io.IOException; import java.util.Locale; import java.util.regex.Pattern; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.KeywordAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.junit.Test; /** Testcase for {@link KeywordMarkerFilter} */ diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilterFactory.java index 60add0eecc2..52854280c12 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilterFactory.java @@ -18,9 +18,9 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.util.StringMockResourceLoader; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.util.Version; /** Simple tests to ensure the keyword marker filter factory is working. */ diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordRepeatFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordRepeatFilter.java index b43270c8d74..33576a0c0c5 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordRepeatFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordRepeatFilter.java @@ -17,9 +17,9 @@ package org.apache.lucene.analysis.miscellaneous; import java.io.IOException; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.snowball.SnowballFilter; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestKeywordRepeatFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLengthFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLengthFilter.java index 932e7335bc4..2121a6f34f1 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLengthFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLengthFilter.java @@ -18,10 +18,10 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.junit.Test; public class TestLengthFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLengthFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLengthFilterFactory.java index 8dbe483523e..d932100315f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLengthFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLengthFilterFactory.java @@ -18,10 +18,10 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; public class TestLengthFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java index 37925920d83..74a948a0093 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java @@ -18,8 +18,6 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.DirectoryReader; @@ -28,6 +26,8 @@ import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.TestUtil; public class TestLimitTokenCountAnalyzer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountFilter.java index 93f21a4d52b..46b7c654ee9 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountFilter.java @@ -16,9 +16,9 @@ */ package org.apache.lucene.analysis.miscellaneous; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.junit.Test; public class TestLimitTokenCountFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountFilterFactory.java index c02005b7edd..ed145d5143c 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountFilterFactory.java @@ -18,9 +18,9 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; public class TestLimitTokenCountFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenOffsetFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenOffsetFilter.java index 814637c2051..9bf640b9eea 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenOffsetFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenOffsetFilter.java @@ -16,9 +16,9 @@ */ package org.apache.lucene.analysis.miscellaneous; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.junit.Test; public class TestLimitTokenOffsetFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenOffsetFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenOffsetFilterFactory.java index fc76fb9b805..ef19049d67b 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenOffsetFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenOffsetFilterFactory.java @@ -18,9 +18,9 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; public class TestLimitTokenOffsetFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenPositionFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenPositionFilter.java index 52ee974a4ac..9349d35ff66 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenPositionFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenPositionFilter.java @@ -19,11 +19,11 @@ import java.io.IOException; import java.io.StringReader; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.synonym.SynonymFilter; import org.apache.lucene.analysis.synonym.SynonymMap; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.util.CharsRef; import org.apache.lucene.util.CharsRefBuilder; import org.junit.Test; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenPositionFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenPositionFilterFactory.java index 17cf8b3c1aa..8515b81de9a 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenPositionFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenPositionFilterFactory.java @@ -18,9 +18,9 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; public class TestLimitTokenPositionFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestMiscellaneousFactories.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestMiscellaneousFactories.java index 2418e961542..add0aa0bdef 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestMiscellaneousFactories.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestMiscellaneousFactories.java @@ -18,8 +18,8 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure the miscellaneous lucene factories are working. */ public class TestMiscellaneousFactories extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPerFieldAnalyzerWrapper.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPerFieldAnalyzerWrapper.java index 2b8cd7dda63..7a49b025f18 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPerFieldAnalyzerWrapper.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPerFieldAnalyzerWrapper.java @@ -21,14 +21,14 @@ import java.util.Map; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.AnalyzerWrapper; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockCharFilter; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.core.SimpleAnalyzer; import org.apache.lucene.analysis.core.WhitespaceAnalyzer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockCharFilter; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.util.IOUtils; public class TestPerFieldAnalyzerWrapper extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestProtectedTermFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestProtectedTermFilter.java index b222d1799f6..05e31d0a255 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestProtectedTermFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestProtectedTermFilter.java @@ -18,12 +18,12 @@ package org.apache.lucene.analysis.miscellaneous; import java.io.IOException; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.CannedTokenStream; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.core.LowerCaseFilter; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.Token; public class TestProtectedTermFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestProtectedTermFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestProtectedTermFilterFactory.java index 150e9d13659..219c823b8ec 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestProtectedTermFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestProtectedTermFilterFactory.java @@ -16,9 +16,9 @@ */ package org.apache.lucene.analysis.miscellaneous; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure the simple truncation filter factory is working. */ public class TestProtectedTermFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestRemoveDuplicatesTokenFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestRemoveDuplicatesTokenFilter.java index 6f3553ccade..bc149822e1b 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestRemoveDuplicatesTokenFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestRemoveDuplicatesTokenFilter.java @@ -20,9 +20,6 @@ import java.util.Arrays; import java.util.Iterator; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; -import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; @@ -31,6 +28,9 @@ import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.analysis.Token; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.CharsRef; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestRemoveDuplicatesTokenFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestRemoveDuplicatesTokenFilterFactory.java index f369a884d5d..ca9b1655fba 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestRemoveDuplicatesTokenFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestRemoveDuplicatesTokenFilterFactory.java @@ -16,10 +16,10 @@ */ package org.apache.lucene.analysis.miscellaneous; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.CannedTokenStream; -import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.Token; /** Simple tests to ensure this factory is working */ public class TestRemoveDuplicatesTokenFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianFoldingFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianFoldingFilter.java index 5a20b8d1680..67ee8dcf03c 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianFoldingFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianFoldingFilter.java @@ -17,11 +17,11 @@ package org.apache.lucene.analysis.miscellaneous; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; public class TestScandinavianFoldingFilter extends BaseTokenStreamTestCase { private Analyzer analyzer; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianFoldingFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianFoldingFilterFactory.java index 596b49391de..72df59f00aa 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianFoldingFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianFoldingFilterFactory.java @@ -18,8 +18,8 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; public class TestScandinavianFoldingFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianNormalizationFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianNormalizationFilter.java index d26f7a02c8f..0b5ca7857cd 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianNormalizationFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianNormalizationFilter.java @@ -18,6 +18,8 @@ import org.apache.lucene.analysis.*; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; public class TestScandinavianNormalizationFilter extends BaseTokenStreamTestCase { public void testDefault() throws Exception { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianNormalizationFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianNormalizationFilterFactory.java index 2966fd47846..3fe52b3b067 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianNormalizationFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianNormalizationFilterFactory.java @@ -16,8 +16,8 @@ */ package org.apache.lucene.analysis.miscellaneous; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; public class TestScandinavianNormalizationFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianNormalizer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianNormalizer.java index 2bea5346318..2014b206050 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianNormalizer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianNormalizer.java @@ -22,6 +22,8 @@ import org.apache.lucene.analysis.*; import org.apache.lucene.analysis.miscellaneous.ScandinavianNormalizer.Foldings; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Tests low level the normalizer functionality */ public class TestScandinavianNormalizer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilter.java index ea819937d40..e2dec98cbf4 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilter.java @@ -25,7 +25,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharacterUtils; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; @@ -33,6 +32,7 @@ import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.apache.lucene.analysis.en.PorterStemFilter; import org.apache.lucene.analysis.miscellaneous.StemmerOverrideFilter.StemmerOverrideMap; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.apache.lucene.tests.util.TestUtil; /** */ diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilterFactory.java index bc4e9c50059..9e366bc4930 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilterFactory.java @@ -18,9 +18,9 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.util.StringMockResourceLoader; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.util.Version; /** Simple tests to ensure the stemmer override filter factory is working. */ diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTrimFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTrimFilter.java index cfc9e398458..5b315cf3ce9 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTrimFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTrimFilter.java @@ -18,13 +18,13 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.CannedTokenStream; -import org.apache.lucene.analysis.MockTokenizer; -import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.analysis.Token; /** */ public class TestTrimFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTrimFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTrimFilterFactory.java index 980b01e3b06..d1e4e513422 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTrimFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTrimFilterFactory.java @@ -18,8 +18,8 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure this factory is working */ public class TestTrimFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTruncateTokenFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTruncateTokenFilter.java index df3f0454069..0ce3932bd91 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTruncateTokenFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTruncateTokenFilter.java @@ -16,8 +16,8 @@ */ package org.apache.lucene.analysis.miscellaneous; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.junit.Test; /** Test the truncate token filter. */ diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTruncateTokenFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTruncateTokenFilterFactory.java index 14da3b53d01..2fed6c2ae21 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTruncateTokenFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTruncateTokenFilterFactory.java @@ -18,10 +18,10 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests to ensure the simple truncation filter factory is working. */ public class TestTruncateTokenFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTypeAsSynonymFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTypeAsSynonymFilter.java index ead884dfa46..66ef9052ce9 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTypeAsSynonymFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTypeAsSynonymFilter.java @@ -18,10 +18,10 @@ import java.util.Collections; import java.util.Set; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.CannedTokenStream; -import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.Token; /** * Test that this filter moves the value in type to a synonym token with the same offsets. This is diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTypeAsSynonymFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTypeAsSynonymFilterFactory.java index 4175b181b76..192197231d1 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTypeAsSynonymFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTypeAsSynonymFilterFactory.java @@ -17,10 +17,10 @@ package org.apache.lucene.analysis.miscellaneous; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.CannedTokenStream; -import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.Token; public class TestTypeAsSynonymFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java index 9f8ab64dddc..9eccfd53f9f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java @@ -21,12 +21,8 @@ import java.util.HashSet; import java.util.Random; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.CannedTokenStream; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.StopFilter; -import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; @@ -34,6 +30,10 @@ import org.apache.lucene.analysis.en.EnglishAnalyzer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.analysis.Token; import org.apache.lucene.util.IOUtils; /** diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterGraphFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterGraphFilter.java index 5336b0aa752..d9258396e7a 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterGraphFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterGraphFilter.java @@ -36,12 +36,8 @@ import java.util.Random; import java.util.Set; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.CannedTokenStream; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.StopFilter; -import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; @@ -49,6 +45,10 @@ import org.apache.lucene.analysis.en.EnglishAnalyzer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.analysis.Token; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ne/TestNepaliAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ne/TestNepaliAnalyzer.java index e81dea97930..32f0275b555 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ne/TestNepaliAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ne/TestNepaliAnalyzer.java @@ -17,8 +17,8 @@ package org.apache.lucene.analysis.ne; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** Tests the NepaliAnalyzer */ public class TestNepaliAnalyzer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestEdgeNGramTokenFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestEdgeNGramTokenFilter.java index 8955527961a..aea268e6def 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestEdgeNGramTokenFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestEdgeNGramTokenFilter.java @@ -20,8 +20,6 @@ import java.io.StringReader; import java.util.Random; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; @@ -32,6 +30,8 @@ import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.TestUtil; /** Tests {@link EdgeNGramTokenFilter} for correctness. */ diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestEdgeNGramTokenizer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestEdgeNGramTokenizer.java index 165ea09b2cb..434a552eaf7 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestEdgeNGramTokenizer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestEdgeNGramTokenizer.java @@ -21,8 +21,8 @@ import java.io.StringReader; import java.util.Arrays; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.apache.lucene.tests.util.TestUtil; /** Tests {@link EdgeNGramTokenizer} for correctness. */ diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestNGramFilters.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestNGramFilters.java index a2bd8821eae..14c168c1837 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestNGramFilters.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestNGramFilters.java @@ -18,11 +18,11 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.payloads.PayloadHelper; import org.apache.lucene.analysis.tokenattributes.PayloadAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.util.BytesRef; /** Simple tests to ensure the NGram filter factories are working. */ diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestNGramTokenFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestNGramTokenFilter.java index 628597df2a8..207a6f43514 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestNGramTokenFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestNGramTokenFilter.java @@ -20,8 +20,6 @@ import java.io.StringReader; import java.util.Random; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; @@ -31,6 +29,8 @@ import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.TestUtil; /** Tests {@link NGramTokenFilter} for correctness. */ diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestNGramTokenizer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestNGramTokenizer.java index 1c6d7a219a8..23240c5ca95 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestNGramTokenizer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestNGramTokenizer.java @@ -21,12 +21,12 @@ import java.io.StringReader; import java.util.Arrays; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; import org.apache.lucene.analysis.tokenattributes.PositionLengthAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.ArrayUtil; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/nl/TestDutchAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/nl/TestDutchAnalyzer.java index 1fcd2132195..3c5db968fc4 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/nl/TestDutchAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/nl/TestDutchAnalyzer.java @@ -18,9 +18,9 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArrayMap; import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** * Test the Dutch Stem Filter, which only modifies the term text. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianAnalyzer.java index 08baac94452..5aedfc78646 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianAnalyzer.java @@ -18,8 +18,8 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestNorwegianAnalyzer extends BaseTokenStreamTestCase { /** This test fails with NPE when the stopwords file is missing in classpath */ diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianLightStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianLightStemFilter.java index 3f65de24363..a15121abbb7 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianLightStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianLightStemFilter.java @@ -16,21 +16,21 @@ */ package org.apache.lucene.analysis.no; -import static org.apache.lucene.analysis.VocabularyAssert.*; import static org.apache.lucene.analysis.no.NorwegianLightStemmer.BOKMAAL; import static org.apache.lucene.analysis.no.NorwegianLightStemmer.NYNORSK; +import static org.apache.lucene.tests.analysis.VocabularyAssert.*; import java.io.IOException; import java.nio.file.Files; import java.util.Random; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests for {@link NorwegianLightStemFilter} */ public class TestNorwegianLightStemFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianLightStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianLightStemFilterFactory.java index a2f1eb15022..41ea448dbda 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianLightStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianLightStemFilterFactory.java @@ -18,8 +18,8 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure the Norwegian Light stem factory is working. */ public class TestNorwegianLightStemFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianMinimalStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianMinimalStemFilter.java index c43451a304d..c572a2ef2cd 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianMinimalStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianMinimalStemFilter.java @@ -16,21 +16,21 @@ */ package org.apache.lucene.analysis.no; -import static org.apache.lucene.analysis.VocabularyAssert.*; import static org.apache.lucene.analysis.no.NorwegianLightStemmer.BOKMAAL; import static org.apache.lucene.analysis.no.NorwegianLightStemmer.NYNORSK; +import static org.apache.lucene.tests.analysis.VocabularyAssert.*; import java.io.IOException; import java.nio.file.Files; import java.util.Random; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests for {@link NorwegianMinimalStemFilter} */ public class TestNorwegianMinimalStemFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianMinimalStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianMinimalStemFilterFactory.java index eace942e89e..6e7f28214f6 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianMinimalStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianMinimalStemFilterFactory.java @@ -18,10 +18,10 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests to ensure the Norwegian Minimal stem factory is working. */ public class TestNorwegianMinimalStemFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianNormalizationFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianNormalizationFilter.java index c897fcb57a6..0662de2a6db 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianNormalizationFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianNormalizationFilter.java @@ -19,6 +19,8 @@ import org.apache.lucene.analysis.*; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.miscellaneous.ScandinavianNormalizationFilter; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; public class TestNorwegianNormalizationFilter extends BaseTokenStreamTestCase { public void testDefault() throws Exception { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianNormalizationFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianNormalizationFilterFactory.java index 88ed19af6e0..04f6a3629d5 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianNormalizationFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianNormalizationFilterFactory.java @@ -16,8 +16,8 @@ */ package org.apache.lucene.analysis.no; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; public class TestNorwegianNormalizationFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/path/TestPathHierarchyTokenizer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/path/TestPathHierarchyTokenizer.java index e78d7be361b..238319be73e 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/path/TestPathHierarchyTokenizer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/path/TestPathHierarchyTokenizer.java @@ -23,10 +23,10 @@ import java.io.StringReader; import java.util.Random; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.charfilter.MappingCharFilter; import org.apache.lucene.analysis.charfilter.NormalizeCharMap; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestPathHierarchyTokenizer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/path/TestReversePathHierarchyTokenizer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/path/TestReversePathHierarchyTokenizer.java index df9adcd6000..683faf72f9c 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/path/TestReversePathHierarchyTokenizer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/path/TestReversePathHierarchyTokenizer.java @@ -22,8 +22,8 @@ import java.io.StringReader; import java.util.Random; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestReversePathHierarchyTokenizer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternCaptureGroupTokenFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternCaptureGroupTokenFilter.java index ad7339d9515..35cac143a87 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternCaptureGroupTokenFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternCaptureGroupTokenFilter.java @@ -19,10 +19,10 @@ import java.io.StringReader; import java.util.regex.Pattern; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; public class TestPatternCaptureGroupTokenFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceCharFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceCharFilter.java index 5602bbdd2b6..119859bc775 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceCharFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceCharFilter.java @@ -23,11 +23,11 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharFilter; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.TestUtil; import org.junit.Ignore; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceCharFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceCharFilterFactory.java index e6d08ecde72..14263bc4c17 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceCharFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceCharFilterFactory.java @@ -18,8 +18,8 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure this factory is working */ public class TestPatternReplaceCharFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceFilter.java index 8665517bdfc..c45b1388900 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceFilter.java @@ -19,11 +19,11 @@ import java.io.IOException; import java.util.regex.Pattern; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; public class TestPatternReplaceFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceFilterFactory.java index 90efdbdd1c4..a63cc3ca2c8 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceFilterFactory.java @@ -18,8 +18,8 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure this factory is working */ public class TestPatternReplaceFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTokenizer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTokenizer.java index 5f11f44916f..620cdd860c1 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTokenizer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTokenizer.java @@ -22,13 +22,13 @@ import java.util.List; import java.util.regex.Pattern; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.charfilter.MappingCharFilter; import org.apache.lucene.analysis.charfilter.NormalizeCharMap; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestPatternTokenizer extends BaseTokenStreamTestCase { public void testSplitting() throws Exception { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTokenizerFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTokenizerFactory.java index e870100bce4..9302bdcdd6c 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTokenizerFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTokenizerFactory.java @@ -18,8 +18,8 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple Tests to ensure this factory is working */ public class TestPatternTokenizerFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTypingFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTypingFilter.java index 2611ff22e01..54835a4c3d1 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTypingFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTypingFilter.java @@ -18,11 +18,11 @@ import java.io.IOException; import java.util.regex.Pattern; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.CannedTokenStream; -import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.pattern.PatternTypingFilter.PatternTypingRule; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.Token; /** Test that this filter sets a type for tokens matching patterns defined in a patterns.txt file */ public class TestPatternTypingFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTypingFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTypingFilterFactory.java index dce0b59e6c8..37006580507 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTypingFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTypingFilterFactory.java @@ -17,12 +17,12 @@ package org.apache.lucene.analysis.pattern; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.CannedTokenStream; -import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenFilterFactory; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.util.StringMockResourceLoader; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.Token; import org.apache.lucene.util.Version; /** This test just ensures the factory works */ diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestSimplePatternSplitTokenizer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestSimplePatternSplitTokenizer.java index 6b68efa0545..3de03f4853a 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestSimplePatternSplitTokenizer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestSimplePatternSplitTokenizer.java @@ -21,7 +21,6 @@ import java.util.ArrayList; import java.util.List; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; @@ -29,6 +28,7 @@ import org.apache.lucene.analysis.charfilter.NormalizeCharMap; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.automaton.Automaton; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestSimplePatternTokenizer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestSimplePatternTokenizer.java index 61ff88f6237..e66ae7a049d 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestSimplePatternTokenizer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestSimplePatternTokenizer.java @@ -21,7 +21,6 @@ import java.util.ArrayList; import java.util.List; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; @@ -29,6 +28,7 @@ import org.apache.lucene.analysis.charfilter.NormalizeCharMap; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.automaton.Automaton; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TestDelimitedPayloadTokenFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TestDelimitedPayloadTokenFilter.java index 6ac7219b4b1..2f804f2ea6e 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TestDelimitedPayloadTokenFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TestDelimitedPayloadTokenFilter.java @@ -17,10 +17,10 @@ package org.apache.lucene.analysis.payloads; import java.nio.charset.StandardCharsets; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.PayloadAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.apache.lucene.util.BytesRef; public class TestDelimitedPayloadTokenFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TestDelimitedPayloadTokenFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TestDelimitedPayloadTokenFilterFactory.java index b81a4c9858f..a812d9837eb 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TestDelimitedPayloadTokenFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TestDelimitedPayloadTokenFilterFactory.java @@ -18,11 +18,11 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.tokenattributes.PayloadAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; public class TestDelimitedPayloadTokenFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TestNumericPayloadTokenFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TestNumericPayloadTokenFilter.java index 98f2f40bc5d..237bf6605c6 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TestNumericPayloadTokenFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TestNumericPayloadTokenFilter.java @@ -18,13 +18,13 @@ import java.io.IOException; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.PayloadAttribute; import org.apache.lucene.analysis.tokenattributes.TypeAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; public class TestNumericPayloadTokenFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TestTokenOffsetPayloadTokenFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TestTokenOffsetPayloadTokenFilter.java index eaef32b2fd2..3ff23cc0d7d 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TestTokenOffsetPayloadTokenFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TestTokenOffsetPayloadTokenFilter.java @@ -17,9 +17,9 @@ package org.apache.lucene.analysis.payloads; import java.io.IOException; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.analysis.tokenattributes.PayloadAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.apache.lucene.util.BytesRef; public class TestTokenOffsetPayloadTokenFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TestTypeAsPayloadTokenFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TestTypeAsPayloadTokenFilter.java index 2a07c0e3f4c..e3ded643c27 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TestTypeAsPayloadTokenFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TestTypeAsPayloadTokenFilter.java @@ -17,12 +17,12 @@ package org.apache.lucene.analysis.payloads; import java.io.IOException; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.PayloadAttribute; import org.apache.lucene.analysis.tokenattributes.TypeAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestTypeAsPayloadTokenFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseAnalyzer.java index e8a1d59720e..1655761668d 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseAnalyzer.java @@ -18,8 +18,8 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestPortugueseAnalyzer extends BaseTokenStreamTestCase { /** This test fails with NPE when the stopwords file is missing in classpath */ diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseLightStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseLightStemFilter.java index 56ed6b681a5..1f6034b3147 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseLightStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseLightStemFilter.java @@ -16,17 +16,17 @@ */ package org.apache.lucene.analysis.pt; -import static org.apache.lucene.analysis.VocabularyAssert.*; +import static org.apache.lucene.tests.analysis.VocabularyAssert.*; import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests for {@link PortugueseLightStemFilter} */ public class TestPortugueseLightStemFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseLightStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseLightStemFilterFactory.java index 4ee09ea4541..5aff1b114c8 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseLightStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseLightStemFilterFactory.java @@ -18,10 +18,10 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests to ensure the Portuguese Light stem factory is working. */ public class TestPortugueseLightStemFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseMinimalStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseMinimalStemFilter.java index 370f07eda49..81a1497da35 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseMinimalStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseMinimalStemFilter.java @@ -16,17 +16,17 @@ */ package org.apache.lucene.analysis.pt; -import static org.apache.lucene.analysis.VocabularyAssert.*; +import static org.apache.lucene.tests.analysis.VocabularyAssert.*; import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests for {@link PortugueseMinimalStemFilter} */ public class TestPortugueseMinimalStemFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseMinimalStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseMinimalStemFilterFactory.java index f028c83a26a..b28bd34edeb 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseMinimalStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseMinimalStemFilterFactory.java @@ -18,10 +18,10 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests to ensure the Portuguese Minimal stem factory is working. */ public class TestPortugueseMinimalStemFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseStemFilter.java index fd1d2385811..662e63f18fb 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseStemFilter.java @@ -16,17 +16,17 @@ */ package org.apache.lucene.analysis.pt; -import static org.apache.lucene.analysis.VocabularyAssert.assertVocabulary; +import static org.apache.lucene.tests.analysis.VocabularyAssert.assertVocabulary; import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests for {@link PortugueseStemFilter} */ public class TestPortugueseStemFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseStemFilterFactory.java index 2352bcf3660..a4e8dbbed48 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseStemFilterFactory.java @@ -18,8 +18,8 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure the Portuguese stem factory is working. */ public class TestPortugueseStemFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/query/TestQueryAutoStopWordAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/query/TestQueryAutoStopWordAnalyzer.java index 3a41880f4e2..09e2b363530 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/query/TestQueryAutoStopWordAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/query/TestQueryAutoStopWordAnalyzer.java @@ -28,6 +28,9 @@ import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; public class TestQueryAutoStopWordAnalyzer extends BaseTokenStreamTestCase { String[] variedFieldValues = { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/reverse/TestReverseStringFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/reverse/TestReverseStringFilter.java index 3db436ba905..c48dedcf6d9 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/reverse/TestReverseStringFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/reverse/TestReverseStringFilter.java @@ -19,11 +19,11 @@ import java.io.IOException; import java.io.StringReader; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; public class TestReverseStringFilter extends BaseTokenStreamTestCase { public void testFilter() throws Exception { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/reverse/TestReverseStringFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/reverse/TestReverseStringFilterFactory.java index d9fdb9f3b88..044e692a198 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/reverse/TestReverseStringFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/reverse/TestReverseStringFilterFactory.java @@ -18,8 +18,8 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure the Reverse string filter factory is working. */ public class TestReverseStringFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ro/TestRomanianAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ro/TestRomanianAnalyzer.java index 726f8920ac0..d41b76ba741 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ro/TestRomanianAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ro/TestRomanianAnalyzer.java @@ -18,8 +18,8 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestRomanianAnalyzer extends BaseTokenStreamTestCase { /** This test fails with NPE when the stopwords file is missing in classpath */ diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianAnalyzer.java index 105797e4b2d..145fa23672a 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianAnalyzer.java @@ -18,8 +18,8 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** Test case for RussianAnalyzer. */ public class TestRussianAnalyzer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianLightStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianLightStemFilter.java index f5a6cbd7156..af98205ba3b 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianLightStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianLightStemFilter.java @@ -16,17 +16,17 @@ */ package org.apache.lucene.analysis.ru; -import static org.apache.lucene.analysis.VocabularyAssert.*; +import static org.apache.lucene.tests.analysis.VocabularyAssert.*; import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests for {@link RussianLightStemFilter} */ public class TestRussianLightStemFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianLightStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianLightStemFilterFactory.java index 1fec812a3b8..53b1a1f6df4 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianLightStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianLightStemFilterFactory.java @@ -18,8 +18,8 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure the Russian light stem factory is working. */ public class TestRussianLightStemFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/TestFixedShingleFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/TestFixedShingleFilter.java index db085f268a3..9c849e254cd 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/TestFixedShingleFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/TestFixedShingleFilter.java @@ -19,10 +19,10 @@ import java.io.IOException; import java.util.Iterator; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.CannedTokenStream; -import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.Token; import org.apache.lucene.util.graph.GraphTokenStreamFiniteStrings; public class TestFixedShingleFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/TestShingleAnalyzerWrapper.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/TestShingleAnalyzerWrapper.java index 269d48dc749..ad76023576e 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/TestShingleAnalyzerWrapper.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/TestShingleAnalyzerWrapper.java @@ -17,10 +17,7 @@ package org.apache.lucene.analysis.shingle; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.StopFilter; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; @@ -42,6 +39,9 @@ import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; /** A test class for ShingleAnalyzerWrapper as regards queries and scoring. */ public class TestShingleAnalyzerWrapper extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/TestShingleFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/TestShingleFilter.java index 5f3a44c1858..34076678f5f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/TestShingleFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/TestShingleFilter.java @@ -20,15 +20,15 @@ import java.io.StringReader; import java.util.Random; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.CannedTokenStream; -import org.apache.lucene.analysis.MockTokenizer; -import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.apache.lucene.analysis.tokenattributes.TypeAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.analysis.Token; public class TestShingleFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/TestShingleFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/TestShingleFilterFactory.java index beb23199a6c..b0bf2eb6e38 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/TestShingleFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/TestShingleFilterFactory.java @@ -18,8 +18,8 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure the Shingle filter factory works. */ public class TestShingleFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java index 9ff684474c0..74863fd1264 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java @@ -20,12 +20,9 @@ import java.io.StringReader; import java.util.Locale; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CachingTokenFilter; import org.apache.lucene.analysis.FilteringTokenFilter; import org.apache.lucene.analysis.LowerCaseFilter; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.standard.StandardTokenizer; @@ -43,6 +40,9 @@ import org.apache.lucene.index.TermsEnum; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.English; /** tests for the TestTeeSinkTokenFilter */ diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java index a30274a85dc..dfbdfe1f5bc 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java @@ -22,8 +22,6 @@ import java.nio.charset.StandardCharsets; import java.util.List; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.WordlistLoader; @@ -34,6 +32,8 @@ import org.apache.lucene.analysis.tokenattributes.PayloadAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; import org.apache.lucene.analysis.tokenattributes.TypeAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.util.BytesRef; public class TestSnowball extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballPorterFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballPorterFilterFactory.java index f1f5b1f7141..b55542a83d4 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballPorterFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballPorterFilterFactory.java @@ -18,9 +18,9 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.util.StringMockResourceLoader; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.util.Version; import org.tartarus.snowball.ext.EnglishStemmer; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java index 41cfd998fe2..9f0ea35d051 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java @@ -16,7 +16,7 @@ */ package org.apache.lucene.analysis.snowball; -import static org.apache.lucene.analysis.VocabularyAssert.*; +import static org.apache.lucene.tests.analysis.VocabularyAssert.*; import java.io.IOException; import java.io.InputStream; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sr/TestSerbianAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sr/TestSerbianAnalyzer.java index 1e29c6fd3ee..0898083a5d6 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sr/TestSerbianAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sr/TestSerbianAnalyzer.java @@ -18,8 +18,8 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** Test the SerbianAnalyzer */ public class TestSerbianAnalyzer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sr/TestSerbianNormalizationFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sr/TestSerbianNormalizationFilter.java index 1ec88933295..4f9d74d7111 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sr/TestSerbianNormalizationFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sr/TestSerbianNormalizationFilter.java @@ -18,11 +18,11 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Tests {@link SerbianNormalizationFilter} */ public class TestSerbianNormalizationFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sr/TestSerbianNormalizationFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sr/TestSerbianNormalizationFilterFactory.java index 971a83c2369..106ed24d127 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sr/TestSerbianNormalizationFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sr/TestSerbianNormalizationFilterFactory.java @@ -18,10 +18,10 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests to ensure the Serbian normalization factory is working. */ public class TestSerbianNormalizationFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sr/TestSerbianNormalizationRegularFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sr/TestSerbianNormalizationRegularFilter.java index a1d9d464f36..8d4deee1c52 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sr/TestSerbianNormalizationRegularFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sr/TestSerbianNormalizationRegularFilter.java @@ -18,11 +18,11 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Tests {@link SerbianNormalizationFilter} */ public class TestSerbianNormalizationRegularFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishAnalyzer.java index d56d6cfeb82..ce14ea42357 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishAnalyzer.java @@ -18,8 +18,8 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestSwedishAnalyzer extends BaseTokenStreamTestCase { /** This test fails with NPE when the stopwords file is missing in classpath */ diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishLightStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishLightStemFilter.java index 6565a535510..2aece6bd12d 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishLightStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishLightStemFilter.java @@ -16,17 +16,17 @@ */ package org.apache.lucene.analysis.sv; -import static org.apache.lucene.analysis.VocabularyAssert.*; +import static org.apache.lucene.tests.analysis.VocabularyAssert.*; import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests for {@link SwedishLightStemFilter} */ public class TestSwedishLightStemFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishLightStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishLightStemFilterFactory.java index a37ab4eed47..02b8d918912 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishLightStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishLightStemFilterFactory.java @@ -18,8 +18,8 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure the Swedish Light stem factory is working. */ public class TestSwedishLightStemFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishMinimalStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishMinimalStemFilter.java index ca337fee37a..701f0c8ccdb 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishMinimalStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishMinimalStemFilter.java @@ -16,13 +16,15 @@ */ package org.apache.lucene.analysis.sv; -import static org.apache.lucene.analysis.VocabularyAssert.assertVocabulary; +import static org.apache.lucene.tests.analysis.VocabularyAssert.assertVocabulary; import java.io.IOException; import java.nio.file.Files; import org.apache.lucene.analysis.*; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests for {@link SwedishMinimalStemFilter} */ public class TestSwedishMinimalStemFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/BaseSynonymParserTestCase.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/BaseSynonymParserTestCase.java index 4a3fd721be2..9cbd49df26d 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/BaseSynonymParserTestCase.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/BaseSynonymParserTestCase.java @@ -21,8 +21,8 @@ import java.util.HashSet; import java.util.Set; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.store.ByteArrayDataInput; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.CharsRef; import org.apache.lucene.util.IntsRefBuilder; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestMultiWordSynonyms.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestMultiWordSynonyms.java index c71e94e73f6..7cd538c750b 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestMultiWordSynonyms.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestMultiWordSynonyms.java @@ -18,9 +18,9 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.util.StringMockResourceLoader; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.util.Version; /** @since solr 1.4 */ diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSolrSynonymParser.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSolrSynonymParser.java index 4fd10221b84..4a983ab48bb 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSolrSynonymParser.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSolrSynonymParser.java @@ -19,10 +19,10 @@ import java.io.StringReader; import java.text.ParseException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.en.EnglishAnalyzer; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; /** * Tests parser for the Solr synonyms format diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymFilterFactory.java index f2cfdd23c6f..8df8e4bfeb4 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymFilterFactory.java @@ -18,12 +18,12 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenFilterFactory; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.cjk.CJKAnalyzer; import org.apache.lucene.analysis.pattern.PatternTokenizerFactory; import org.apache.lucene.analysis.util.StringMockResourceLoader; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.util.Version; @Deprecated diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymGraphFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymGraphFilter.java index e5373329e5c..3837bdee663 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymGraphFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymGraphFilter.java @@ -26,10 +26,6 @@ import java.util.Locale; import java.util.Set; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockGraphTokenFilter; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.FlattenGraphFilter; @@ -42,6 +38,10 @@ import org.apache.lucene.search.PhraseQuery; import org.apache.lucene.store.ByteArrayDataInput; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockGraphTokenFilter; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.tests.util.automaton.AutomatonTestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymMapFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymMapFilter.java index ee40248e26e..0415fae77b5 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymMapFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymMapFilter.java @@ -27,14 +27,14 @@ import java.util.Random; import java.util.Set; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockGraphTokenFilter; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.tokenattributes.*; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockGraphTokenFilter; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.CharsRefBuilder; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestWordnetSynonymParser.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestWordnetSynonymParser.java index 5d26829cfa5..c9da33ba2cf 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestWordnetSynonymParser.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestWordnetSynonymParser.java @@ -18,10 +18,10 @@ import java.io.StringReader; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; public class TestWordnetSynonymParser extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ta/TestTamilAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ta/TestTamilAnalyzer.java index 44d77120807..f97b5f7d94b 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ta/TestTamilAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ta/TestTamilAnalyzer.java @@ -17,8 +17,8 @@ package org.apache.lucene.analysis.ta; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** Tests the TamilAnalyzer */ public class TestTamilAnalyzer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/te/TestTeluguAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/te/TestTeluguAnalyzer.java index 1eb47efdfbd..5c3145a5677 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/te/TestTeluguAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/te/TestTeluguAnalyzer.java @@ -17,8 +17,8 @@ package org.apache.lucene.analysis.te; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestTeluguAnalyzer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/te/TestTeluguFilters.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/te/TestTeluguFilters.java index bf08a41a05a..d0b6087b722 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/te/TestTeluguFilters.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/te/TestTeluguFilters.java @@ -18,8 +18,8 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure the Telugu filter Factories are working. */ public class TestTeluguFilters extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/te/TestTeluguNormalizer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/te/TestTeluguNormalizer.java index 0571b6f1282..1a9aa10b613 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/te/TestTeluguNormalizer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/te/TestTeluguNormalizer.java @@ -18,10 +18,10 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** Test TeluguNormalizer */ public class TestTeluguNormalizer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/te/TestTeluguStemmer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/te/TestTeluguStemmer.java index bd1b271764f..cd1dc10fc89 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/te/TestTeluguStemmer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/te/TestTeluguStemmer.java @@ -18,10 +18,10 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** Test TeluguStemmer */ public class TestTeluguStemmer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiAnalyzer.java index 6cb3d2134e9..ff4591a1079 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiAnalyzer.java @@ -17,11 +17,11 @@ package org.apache.lucene.analysis.th; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.en.EnglishAnalyzer; import org.apache.lucene.analysis.tokenattributes.FlagsAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** Test case for ThaiAnalyzer, modified from TestFrenchAnalyzer */ public class TestThaiAnalyzer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiTokenizerFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiTokenizerFactory.java index 21da9f76350..e77a749564f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiTokenizerFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiTokenizerFactory.java @@ -17,8 +17,8 @@ package org.apache.lucene.analysis.th; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure the Thai word filter factory is working. */ public class TestThaiTokenizerFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestApostropheFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestApostropheFilter.java index 900a7adf387..43127090a74 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestApostropheFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestApostropheFilter.java @@ -16,8 +16,8 @@ */ package org.apache.lucene.analysis.tr; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestApostropheFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestApostropheFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestApostropheFilterFactory.java index 4eb6af1bc1b..095616312b2 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestApostropheFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestApostropheFilterFactory.java @@ -18,10 +18,10 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests to ensure the apostrophe filter factory is working. */ public class TestApostropheFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishAnalyzer.java index 1d3744eed20..59dffc2e7b8 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishAnalyzer.java @@ -18,8 +18,8 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestTurkishAnalyzer extends BaseTokenStreamTestCase { /** This test fails with NPE when the stopwords file is missing in classpath */ diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishLowerCaseFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishLowerCaseFilter.java index 6bf290b8a7d..6285925236d 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishLowerCaseFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishLowerCaseFilter.java @@ -18,10 +18,10 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** Test the Turkish lowercase filter. */ public class TestTurkishLowerCaseFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishLowerCaseFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishLowerCaseFilterFactory.java index 8ecb1b8535b..37929639f7c 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishLowerCaseFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishLowerCaseFilterFactory.java @@ -18,10 +18,10 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests to ensure the Turkish lowercase filter factory is working. */ public class TestTurkishLowerCaseFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharTokenizers.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharTokenizers.java index 82494ca9d60..48afa0dee98 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharTokenizers.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharTokenizers.java @@ -19,12 +19,12 @@ import java.io.IOException; import java.io.StringReader; import java.util.Locale; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.LowerCaseFilter; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.core.LetterTokenizer; import org.apache.lucene.analysis.core.WhitespaceTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** Testcase for {@link CharTokenizer} subclasses */ public class TestCharTokenizers extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestElision.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestElision.java index 5d707734bdd..c16e0f7b30f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestElision.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestElision.java @@ -21,7 +21,6 @@ import java.util.ArrayList; import java.util.List; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.Tokenizer; @@ -29,6 +28,7 @@ import org.apache.lucene.analysis.fr.FrenchAnalyzer; import org.apache.lucene.analysis.standard.StandardTokenizer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** */ public class TestElision extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestElisionFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestElisionFilterFactory.java index 60cec0e6e5c..942a5fd177f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestElisionFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestElisionFilterFactory.java @@ -18,10 +18,10 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests to ensure the French elision filter factory is working. */ public class TestElisionFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestSegmentingTokenizerBase.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestSegmentingTokenizerBase.java index ffe8863139b..20af3bd0e08 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestSegmentingTokenizerBase.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestSegmentingTokenizerBase.java @@ -21,10 +21,10 @@ import java.util.Arrays; import java.util.Locale; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.apache.lucene.util.IOUtils; /** Basic tests for {@link SegmentingTokenizerBase} */ diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/TestWikipediaTokenizer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/TestWikipediaTokenizer.java index 98055cd6c66..639d4086fd6 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/TestWikipediaTokenizer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/TestWikipediaTokenizer.java @@ -26,9 +26,9 @@ import java.util.Random; import java.util.Set; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.tokenattributes.FlagsAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** Basic Tests for {@link WikipediaTokenizer} */ public class TestWikipediaTokenizer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/TestWikipediaTokenizerFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/TestWikipediaTokenizerFactory.java index ae2491f68e4..d6c2a5330c9 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/TestWikipediaTokenizerFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/TestWikipediaTokenizerFactory.java @@ -19,8 +19,8 @@ import java.io.StringReader; import java.util.HashSet; import java.util.Set; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure the wikipedia tokenizer is working. */ public class TestWikipediaTokenizerFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/collation/TestCollationKeyAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/collation/TestCollationKeyAnalyzer.java index efc3c2df256..7ecfb7b58b3 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/collation/TestCollationKeyAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/collation/TestCollationKeyAnalyzer.java @@ -19,7 +19,7 @@ import java.text.Collator; import java.util.Locale; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CollationTestBase; +import org.apache.lucene.tests.analysis.CollationTestBase; import org.apache.lucene.util.BytesRef; public class TestCollationKeyAnalyzer extends CollationTestBase { diff --git a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUCollationKeyAnalyzer.java b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUCollationKeyAnalyzer.java index 877d34aa452..e9141c242b8 100644 --- a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUCollationKeyAnalyzer.java +++ b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUCollationKeyAnalyzer.java @@ -19,7 +19,7 @@ import com.ibm.icu.text.Collator; import java.util.Locale; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CollationTestBase; +import org.apache.lucene.tests.analysis.CollationTestBase; import org.apache.lucene.util.BytesRef; public class TestICUCollationKeyAnalyzer extends CollationTestBase { diff --git a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUFoldingFilter.java b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUFoldingFilter.java index 67d065c2a0e..30a402d95bb 100644 --- a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUFoldingFilter.java +++ b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUFoldingFilter.java @@ -18,10 +18,10 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Tests ICUFoldingFilter */ public class TestICUFoldingFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUFoldingFilterFactory.java b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUFoldingFilterFactory.java index bf19a4d745d..d57235293a1 100644 --- a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUFoldingFilterFactory.java +++ b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUFoldingFilterFactory.java @@ -19,8 +19,8 @@ import java.io.Reader; import java.io.StringReader; import java.util.HashMap; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** basic tests for {@link ICUFoldingFilterFactory} */ public class TestICUFoldingFilterFactory extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2CharFilter.java b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2CharFilter.java index f114048311a..42891c2a59a 100644 --- a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2CharFilter.java +++ b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2CharFilter.java @@ -22,12 +22,12 @@ import java.io.StringReader; import java.util.Arrays; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharFilter; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.ngram.NGramTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.TestUtil; public class TestICUNormalizer2CharFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2CharFilterFactory.java b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2CharFilterFactory.java index 217a6c9149f..5842809d511 100644 --- a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2CharFilterFactory.java +++ b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2CharFilterFactory.java @@ -20,8 +20,8 @@ import java.io.StringReader; import java.util.HashMap; import java.util.Map; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** basic tests for {@link ICUNormalizer2CharFilterFactory} */ public class TestICUNormalizer2CharFilterFactory extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2Filter.java b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2Filter.java index e26db30ba22..feed9d2640c 100644 --- a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2Filter.java +++ b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2Filter.java @@ -19,10 +19,10 @@ import com.ibm.icu.text.Normalizer2; import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Tests the ICUNormalizer2Filter */ public class TestICUNormalizer2Filter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2FilterFactory.java b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2FilterFactory.java index ea80a5bc193..821d92d3556 100644 --- a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2FilterFactory.java +++ b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2FilterFactory.java @@ -20,8 +20,8 @@ import java.io.StringReader; import java.util.HashMap; import java.util.Map; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** basic tests for {@link ICUNormalizer2FilterFactory} */ public class TestICUNormalizer2FilterFactory extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUTransformFilter.java b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUTransformFilter.java index 61f51b113d4..e3320367c4b 100644 --- a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUTransformFilter.java +++ b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUTransformFilter.java @@ -21,11 +21,11 @@ import java.io.IOException; import java.io.StringReader; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Test the ICUTransformFilter with some basic examples. */ public class TestICUTransformFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUTransformFilterFactory.java b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUTransformFilterFactory.java index 982c9717734..11d0b59d6a9 100644 --- a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUTransformFilterFactory.java +++ b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUTransformFilterFactory.java @@ -20,8 +20,8 @@ import java.io.StringReader; import java.util.HashMap; import java.util.Map; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** basic tests for {@link ICUTransformFilterFactory} */ public class TestICUTransformFilterFactory extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizer.java b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizer.java index bd9403a0b10..822d1743833 100644 --- a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizer.java +++ b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizer.java @@ -24,10 +24,10 @@ import java.util.Random; import java.util.concurrent.CountDownLatch; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.icu.tokenattributes.ScriptAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestICUTokenizer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizerCJK.java b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizerCJK.java index f3873e8380b..7b7d57b1baf 100644 --- a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizerCJK.java +++ b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizerCJK.java @@ -18,7 +18,7 @@ import java.util.Random; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.apache.lucene.tests.util.LuceneTestCase.AwaitsFix; /** test ICUTokenizer with dictionary-based CJ segmentation */ diff --git a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizerFactory.java b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizerFactory.java index 4ea9542b676..d1511c0b006 100644 --- a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizerFactory.java +++ b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizerFactory.java @@ -20,8 +20,8 @@ import java.io.StringReader; import java.util.HashMap; import java.util.Map; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.apache.lucene.util.ClasspathResourceLoader; /** basic tests for {@link ICUTokenizerFactory} * */ diff --git a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestMyanmarSyllable.java b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestMyanmarSyllable.java index 33bfa017681..a8cb0b77328 100644 --- a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestMyanmarSyllable.java +++ b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestMyanmarSyllable.java @@ -17,8 +17,8 @@ package org.apache.lucene.analysis.icu.segmentation; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** Test tokenizing Myanmar text into syllables */ public class TestMyanmarSyllable extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestWithCJKBigramFilter.java b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestWithCJKBigramFilter.java index 7e053ae1b78..8fe60a45fea 100644 --- a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestWithCJKBigramFilter.java +++ b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestWithCJKBigramFilter.java @@ -18,13 +18,13 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.StopFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.cjk.CJKBigramFilter; import org.apache.lucene.analysis.icu.ICUNormalizer2Filter; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.apache.lucene.util.IOUtils; /** diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestExtendedMode.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestExtendedMode.java index 6c0400138c2..605cdcfdd78 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestExtendedMode.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestExtendedMode.java @@ -19,11 +19,11 @@ import java.io.IOException; import java.util.Random; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.ja.JapaneseTokenizer.Mode; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.UnicodeUtil; diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestFactories.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestFactories.java index da5bf808812..ee6232fa411 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestFactories.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestFactories.java @@ -27,14 +27,14 @@ import java.util.Set; import org.apache.lucene.analysis.AbstractAnalysisFactory; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharFilterFactory; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenFilterFactory; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.TokenizerFactory; import org.apache.lucene.analysis.boost.DelimitedBoostTokenFilterFactory; import org.apache.lucene.analysis.miscellaneous.DelimitedTermFrequencyTokenFilterFactory; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase.Nightly; import org.apache.lucene.util.AttributeFactory; import org.apache.lucene.util.ResourceLoaderAware; diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseAnalyzer.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseAnalyzer.java index e5536fceed3..58074336d6a 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseAnalyzer.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseAnalyzer.java @@ -19,8 +19,8 @@ import java.io.IOException; import java.util.Random; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.ja.JapaneseTokenizer.Mode; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** Test Kuromoji Japanese morphological analyzer */ public class TestJapaneseAnalyzer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseBaseFormFilter.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseBaseFormFilter.java index 99b2c855c0c..5da671ace3b 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseBaseFormFilter.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseBaseFormFilter.java @@ -18,12 +18,12 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestJapaneseBaseFormFilter extends BaseTokenStreamTestCase { private Analyzer analyzer; diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseBaseFormFilterFactory.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseBaseFormFilterFactory.java index d58943bb919..470ce0c8f2d 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseBaseFormFilterFactory.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseBaseFormFilterFactory.java @@ -19,9 +19,9 @@ import java.io.IOException; import java.io.StringReader; import java.util.HashMap; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** Simple tests for {@link JapaneseBaseFormFilterFactory} */ public class TestJapaneseBaseFormFilterFactory extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseCompletionAnalyzer.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseCompletionAnalyzer.java index bae627af921..8077ed02550 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseCompletionAnalyzer.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseCompletionAnalyzer.java @@ -19,7 +19,7 @@ import java.io.IOException; import java.util.Random; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.junit.Test; public class TestJapaneseCompletionAnalyzer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseCompletionFilter.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseCompletionFilter.java index 302ae3e5a49..20f55f7e89b 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseCompletionFilter.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseCompletionFilter.java @@ -19,10 +19,10 @@ import java.io.IOException; import java.io.Reader; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.cjk.CJKWidthCharFilter; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.apache.lucene.util.IOUtils; import org.junit.Test; diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseCompletionFilterFactory.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseCompletionFilterFactory.java index 6295dbfbfc1..5f30d8f90cb 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseCompletionFilterFactory.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseCompletionFilterFactory.java @@ -20,10 +20,10 @@ import java.io.StringReader; import java.util.HashMap; import java.util.Map; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.cjk.CJKWidthFilterFactory; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; import org.junit.Test; public class TestJapaneseCompletionFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseIterationMarkCharFilter.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseIterationMarkCharFilter.java index e8e76ff65e2..a07e561fd15 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseIterationMarkCharFilter.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseIterationMarkCharFilter.java @@ -20,10 +20,10 @@ import java.io.Reader; import java.io.StringReader; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharFilter; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.util.IOUtils; // See: https://issues.apache.org/jira/browse/SOLR-12028 Tests cannot remove files on Windows diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseIterationMarkCharFilterFactory.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseIterationMarkCharFilterFactory.java index ab3e93a554e..6ac6dcc6981 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseIterationMarkCharFilterFactory.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseIterationMarkCharFilterFactory.java @@ -21,10 +21,10 @@ import java.io.StringReader; import java.util.HashMap; import java.util.Map; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Simple tests for {@link JapaneseIterationMarkCharFilterFactory} */ public class TestJapaneseIterationMarkCharFilterFactory extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseKatakanaStemFilter.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseKatakanaStemFilter.java index 15c526f0df3..d082f3b5e81 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseKatakanaStemFilter.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseKatakanaStemFilter.java @@ -18,13 +18,13 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Tests for {@link JapaneseKatakanaStemFilter} */ public class TestJapaneseKatakanaStemFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseKatakanaStemFilterFactory.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseKatakanaStemFilterFactory.java index a24aa74f30c..53d8e9c8d1b 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseKatakanaStemFilterFactory.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseKatakanaStemFilterFactory.java @@ -19,9 +19,9 @@ import java.io.IOException; import java.io.StringReader; import java.util.HashMap; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** Simple tests for {@link JapaneseKatakanaStemFilterFactory} */ public class TestJapaneseKatakanaStemFilterFactory extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseNumberFilter.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseNumberFilter.java index 0b6459c8eba..ced49e2fe74 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseNumberFilter.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseNumberFilter.java @@ -24,12 +24,12 @@ import java.nio.file.Path; import java.nio.file.Paths; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.junit.Ignore; import org.junit.Test; diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseNumberFilterFactory.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseNumberFilterFactory.java index a215097b3c3..5b260d87e0d 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseNumberFilterFactory.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseNumberFilterFactory.java @@ -20,9 +20,9 @@ import java.io.StringReader; import java.util.HashMap; import java.util.Map; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** Simple tests for {@link org.apache.lucene.analysis.ja.JapaneseNumberFilterFactory} */ public class TestJapaneseNumberFilterFactory extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapanesePartOfSpeechStopFilterFactory.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapanesePartOfSpeechStopFilterFactory.java index be1dc1ea3d9..c3d403811db 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapanesePartOfSpeechStopFilterFactory.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapanesePartOfSpeechStopFilterFactory.java @@ -20,9 +20,9 @@ import java.io.StringReader; import java.util.HashMap; import java.util.Map; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.apache.lucene.util.ClasspathResourceLoader; import org.apache.lucene.util.Version; diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseReadingFormFilter.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseReadingFormFilter.java index 3bcab4412af..70996b53eee 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseReadingFormFilter.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseReadingFormFilter.java @@ -19,11 +19,11 @@ import java.io.IOException; import java.util.Random; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.cjk.CJKWidthFilter; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.apache.lucene.util.IOUtils; /** Tests for {@link TestJapaneseReadingFormFilter} */ diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseReadingFormFilterFactory.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseReadingFormFilterFactory.java index eb6dea58086..e5ed23c904f 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseReadingFormFilterFactory.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseReadingFormFilterFactory.java @@ -19,9 +19,9 @@ import java.io.IOException; import java.io.StringReader; import java.util.HashMap; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** Simple tests for {@link JapaneseReadingFormFilterFactory} */ public class TestJapaneseReadingFormFilterFactory extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java index b0009fcdd56..e3f11edbaba 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java @@ -27,8 +27,6 @@ import java.util.List; import java.util.Random; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockGraphTokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.ja.JapaneseTokenizer.Mode; @@ -39,6 +37,8 @@ import org.apache.lucene.analysis.ja.dict.UserDictionary; import org.apache.lucene.analysis.ja.tokenattributes.*; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockGraphTokenFilter; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.UnicodeUtil; diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizerFactory.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizerFactory.java index 8a2a9389145..3c11270f5fc 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizerFactory.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizerFactory.java @@ -20,9 +20,9 @@ import java.io.StringReader; import java.util.HashMap; import java.util.Map; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** Simple tests for {@link JapaneseTokenizerFactory} */ public class TestJapaneseTokenizerFactory extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestSearchMode.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestSearchMode.java index 6f3c3aa81fe..afe7dca1c76 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestSearchMode.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestSearchMode.java @@ -25,9 +25,9 @@ import java.util.ArrayList; import java.util.List; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.ja.JapaneseTokenizer.Mode; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestSearchMode extends BaseTokenStreamTestCase { private static final String SEGMENTATION_FILENAME = "search-segmentation-tests.txt"; diff --git a/lucene/analysis/morfologik/src/test/org/apache/lucene/analysis/morfologik/TestMorfologikAnalyzer.java b/lucene/analysis/morfologik/src/test/org/apache/lucene/analysis/morfologik/TestMorfologikAnalyzer.java index dbb718a517f..6e66771b760 100644 --- a/lucene/analysis/morfologik/src/test/org/apache/lucene/analysis/morfologik/TestMorfologikAnalyzer.java +++ b/lucene/analysis/morfologik/src/test/org/apache/lucene/analysis/morfologik/TestMorfologikAnalyzer.java @@ -19,13 +19,13 @@ import java.io.IOException; import java.util.TreeSet; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; import org.apache.lucene.analysis.standard.StandardTokenizer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** TODO: The tests below rely on the order of returned lemmas, which is probably not good. */ public class TestMorfologikAnalyzer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/morfologik/src/test/org/apache/lucene/analysis/morfologik/TestMorfologikFilterFactory.java b/lucene/analysis/morfologik/src/test/org/apache/lucene/analysis/morfologik/TestMorfologikFilterFactory.java index b3051459197..19ad5a4cae0 100644 --- a/lucene/analysis/morfologik/src/test/org/apache/lucene/analysis/morfologik/TestMorfologikFilterFactory.java +++ b/lucene/analysis/morfologik/src/test/org/apache/lucene/analysis/morfologik/TestMorfologikFilterFactory.java @@ -22,8 +22,8 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.apache.lucene.util.ClasspathResourceLoader; import org.apache.lucene.util.ResourceLoader; diff --git a/lucene/analysis/morfologik/src/test/org/apache/lucene/analysis/uk/TestUkrainianAnalyzer.java b/lucene/analysis/morfologik/src/test/org/apache/lucene/analysis/uk/TestUkrainianAnalyzer.java index 880d1eca9b7..e04f62639db 100644 --- a/lucene/analysis/morfologik/src/test/org/apache/lucene/analysis/uk/TestUkrainianAnalyzer.java +++ b/lucene/analysis/morfologik/src/test/org/apache/lucene/analysis/uk/TestUkrainianAnalyzer.java @@ -18,7 +18,7 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** Test case for UkrainianAnalyzer. */ public class TestUkrainianAnalyzer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/TestKoreanAnalyzer.java b/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/TestKoreanAnalyzer.java index 2338c92d876..cb71a7641a4 100644 --- a/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/TestKoreanAnalyzer.java +++ b/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/TestKoreanAnalyzer.java @@ -22,7 +22,7 @@ import java.util.Random; import java.util.Set; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** Test Korean morphological analyzer */ public class TestKoreanAnalyzer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/TestKoreanNumberFilter.java b/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/TestKoreanNumberFilter.java index f10d209a814..7da469db582 100644 --- a/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/TestKoreanNumberFilter.java +++ b/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/TestKoreanNumberFilter.java @@ -28,13 +28,13 @@ import java.util.HashSet; import java.util.Set; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.ko.dict.UserDictionary; import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.junit.Ignore; import org.junit.Test; diff --git a/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/TestKoreanNumberFilterFactory.java b/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/TestKoreanNumberFilterFactory.java index 85a759a475f..2a519e8c723 100644 --- a/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/TestKoreanNumberFilterFactory.java +++ b/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/TestKoreanNumberFilterFactory.java @@ -20,9 +20,9 @@ import java.io.StringReader; import java.util.HashMap; import java.util.Map; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** Simple tests for {@link org.apache.lucene.analysis.ko.KoreanNumberFilterFactory} */ public class TestKoreanNumberFilterFactory extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/TestKoreanPartOfSpeechStopFilterFactory.java b/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/TestKoreanPartOfSpeechStopFilterFactory.java index 2c73f31cc9f..68fd7faa312 100644 --- a/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/TestKoreanPartOfSpeechStopFilterFactory.java +++ b/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/TestKoreanPartOfSpeechStopFilterFactory.java @@ -20,9 +20,9 @@ import java.io.StringReader; import java.util.HashMap; import java.util.Map; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.apache.lucene.util.Version; /** Simple tests for {@link KoreanPartOfSpeechStopFilterFactory} */ diff --git a/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/TestKoreanReadingFormFilter.java b/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/TestKoreanReadingFormFilter.java index 0695e49db8d..27e45cb9ae1 100644 --- a/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/TestKoreanReadingFormFilter.java +++ b/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/TestKoreanReadingFormFilter.java @@ -19,9 +19,9 @@ import java.io.IOException; import java.util.Random; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.apache.lucene.util.IOUtils; /** Tests for {@link TestKoreanReadingFormFilter} */ diff --git a/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/TestKoreanReadingFormFilterFactory.java b/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/TestKoreanReadingFormFilterFactory.java index 88eab97b670..46b910c92a3 100644 --- a/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/TestKoreanReadingFormFilterFactory.java +++ b/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/TestKoreanReadingFormFilterFactory.java @@ -19,8 +19,8 @@ import java.io.IOException; import java.io.StringReader; import java.util.HashMap; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** Simple tests for {@link KoreanReadingFormFilterFactory} */ public class TestKoreanReadingFormFilterFactory extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/TestKoreanTokenizer.java b/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/TestKoreanTokenizer.java index f1e0d3f5227..ec72e8a089b 100644 --- a/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/TestKoreanTokenizer.java +++ b/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/TestKoreanTokenizer.java @@ -23,8 +23,6 @@ import java.nio.charset.StandardCharsets; import java.util.Random; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockGraphTokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.ko.KoreanTokenizer.DecompoundMode; @@ -35,6 +33,8 @@ import org.apache.lucene.analysis.ko.dict.UserDictionary; import org.apache.lucene.analysis.ko.tokenattributes.PartOfSpeechAttribute; import org.apache.lucene.analysis.ko.tokenattributes.ReadingAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockGraphTokenFilter; public class TestKoreanTokenizer extends BaseTokenStreamTestCase { private Analyzer analyzer, diff --git a/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/TestKoreanTokenizerFactory.java b/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/TestKoreanTokenizerFactory.java index d8fa2b674a5..93bd20d663e 100644 --- a/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/TestKoreanTokenizerFactory.java +++ b/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/TestKoreanTokenizerFactory.java @@ -21,8 +21,8 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** Simple tests for {@link KoreanTokenizerFactory} */ public class TestKoreanTokenizerFactory extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPChunkerFilterFactory.java b/lucene/analysis/opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPChunkerFilterFactory.java index 27e10413149..1132be3ffe6 100644 --- a/lucene/analysis/opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPChunkerFilterFactory.java +++ b/lucene/analysis/opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPChunkerFilterFactory.java @@ -19,9 +19,9 @@ import java.nio.charset.StandardCharsets; import java.util.Arrays; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.custom.CustomAnalyzer; import org.apache.lucene.analysis.payloads.TypeAsPayloadTokenFilterFactory; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.apache.lucene.util.ClasspathResourceLoader; /** diff --git a/lucene/analysis/opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPLemmatizerFilterFactory.java b/lucene/analysis/opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPLemmatizerFilterFactory.java index 42c1d93942b..d74bc451d93 100644 --- a/lucene/analysis/opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPLemmatizerFilterFactory.java +++ b/lucene/analysis/opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPLemmatizerFilterFactory.java @@ -17,10 +17,10 @@ package org.apache.lucene.analysis.opennlp; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.custom.CustomAnalyzer; import org.apache.lucene.analysis.miscellaneous.KeywordRepeatFilterFactory; import org.apache.lucene.analysis.miscellaneous.RemoveDuplicatesTokenFilterFactory; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.apache.lucene.util.ClasspathResourceLoader; public class TestOpenNLPLemmatizerFilterFactory extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPPOSFilterFactory.java b/lucene/analysis/opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPPOSFilterFactory.java index bf188b0dc53..e9ac0f796d6 100644 --- a/lucene/analysis/opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPPOSFilterFactory.java +++ b/lucene/analysis/opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPPOSFilterFactory.java @@ -20,9 +20,9 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.Arrays; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.custom.CustomAnalyzer; import org.apache.lucene.analysis.payloads.TypeAsPayloadTokenFilterFactory; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.apache.lucene.util.ClasspathResourceLoader; /** diff --git a/lucene/analysis/opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPTokenizerFactory.java b/lucene/analysis/opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPTokenizerFactory.java index 315af01ee0e..b8ea21a3bcd 100644 --- a/lucene/analysis/opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPTokenizerFactory.java +++ b/lucene/analysis/opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPTokenizerFactory.java @@ -21,9 +21,9 @@ import java.io.StringReader; import java.util.HashMap; import java.util.Map; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.custom.CustomAnalyzer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.apache.lucene.util.ClasspathResourceLoader; import org.junit.Test; diff --git a/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestBeiderMorseFilter.java b/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestBeiderMorseFilter.java index 8f77840e711..9352a60ccdd 100644 --- a/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestBeiderMorseFilter.java +++ b/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestBeiderMorseFilter.java @@ -25,13 +25,13 @@ import org.apache.commons.codec.language.bm.PhoneticEngine; import org.apache.commons.codec.language.bm.RuleType; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.miscellaneous.PatternKeywordMarkerFilter; import org.apache.lucene.analysis.tokenattributes.KeywordAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Tests {@link BeiderMorseFilter} */ public class TestBeiderMorseFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestBeiderMorseFilterFactory.java b/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestBeiderMorseFilterFactory.java index c4463a490b3..505af486c97 100644 --- a/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestBeiderMorseFilterFactory.java +++ b/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestBeiderMorseFilterFactory.java @@ -18,8 +18,8 @@ import java.util.HashMap; import java.util.Map; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** Simple tests for {@link BeiderMorseFilterFactory} */ public class TestBeiderMorseFilterFactory extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDaitchMokotoffSoundexFilter.java b/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDaitchMokotoffSoundexFilter.java index e7dd16b77da..b728ef34ee6 100644 --- a/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDaitchMokotoffSoundexFilter.java +++ b/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDaitchMokotoffSoundexFilter.java @@ -19,11 +19,11 @@ import java.io.IOException; import java.io.StringReader; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.core.WhitespaceTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Tests {@link DaitchMokotoffSoundexFilter} */ public class TestDaitchMokotoffSoundexFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDaitchMokotoffSoundexFilterFactory.java b/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDaitchMokotoffSoundexFilterFactory.java index ca50c7afaab..390136cc325 100644 --- a/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDaitchMokotoffSoundexFilterFactory.java +++ b/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDaitchMokotoffSoundexFilterFactory.java @@ -19,10 +19,10 @@ import java.io.StringReader; import java.util.HashMap; import java.util.Map; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; public class TestDaitchMokotoffSoundexFilterFactory extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDoubleMetaphoneFilter.java b/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDoubleMetaphoneFilter.java index 3e9d6354151..fde7769eec6 100644 --- a/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDoubleMetaphoneFilter.java +++ b/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDoubleMetaphoneFilter.java @@ -18,11 +18,11 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.TestUtil; public class TestDoubleMetaphoneFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDoubleMetaphoneFilterFactory.java b/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDoubleMetaphoneFilterFactory.java index 5ae14246b3a..4d8fae9ad95 100644 --- a/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDoubleMetaphoneFilterFactory.java +++ b/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDoubleMetaphoneFilterFactory.java @@ -18,8 +18,8 @@ import java.util.HashMap; import java.util.Map; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestDoubleMetaphoneFilterFactory extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestPhoneticFilter.java b/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestPhoneticFilter.java index e740cc32fcd..5a29785f26b 100644 --- a/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestPhoneticFilter.java +++ b/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestPhoneticFilter.java @@ -26,10 +26,10 @@ import org.apache.commons.codec.language.RefinedSoundex; import org.apache.commons.codec.language.Soundex; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Tests {@link PhoneticFilter} */ public class TestPhoneticFilter extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestPhoneticFilterFactory.java b/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestPhoneticFilterFactory.java index e5afb179f69..65aebd8f881 100644 --- a/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestPhoneticFilterFactory.java +++ b/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestPhoneticFilterFactory.java @@ -21,9 +21,9 @@ import java.util.Map; import org.apache.commons.codec.language.Caverphone2; import org.apache.commons.codec.language.Metaphone; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.apache.lucene.util.ClasspathResourceLoader; public class TestPhoneticFilterFactory extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/smartcn/src/test/org/apache/lucene/analysis/cn/smart/TestHMMChineseTokenizerFactory.java b/lucene/analysis/smartcn/src/test/org/apache/lucene/analysis/cn/smart/TestHMMChineseTokenizerFactory.java index a191302d5ae..888e60a3bcf 100644 --- a/lucene/analysis/smartcn/src/test/org/apache/lucene/analysis/cn/smart/TestHMMChineseTokenizerFactory.java +++ b/lucene/analysis/smartcn/src/test/org/apache/lucene/analysis/cn/smart/TestHMMChineseTokenizerFactory.java @@ -19,9 +19,9 @@ import java.io.Reader; import java.io.StringReader; import java.util.HashMap; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.TokenizerFactory; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** Tests for {@link HMMChineseTokenizerFactory} */ public class TestHMMChineseTokenizerFactory extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/smartcn/src/test/org/apache/lucene/analysis/cn/smart/TestSmartChineseAnalyzer.java b/lucene/analysis/smartcn/src/test/org/apache/lucene/analysis/cn/smart/TestSmartChineseAnalyzer.java index 79a89b0f820..e3492c383d3 100644 --- a/lucene/analysis/smartcn/src/test/org/apache/lucene/analysis/cn/smart/TestSmartChineseAnalyzer.java +++ b/lucene/analysis/smartcn/src/test/org/apache/lucene/analysis/cn/smart/TestSmartChineseAnalyzer.java @@ -19,8 +19,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.apache.lucene.util.IOUtils; public class TestSmartChineseAnalyzer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/stempel/src/test/org/apache/lucene/analysis/pl/TestPolishAnalyzer.java b/lucene/analysis/stempel/src/test/org/apache/lucene/analysis/pl/TestPolishAnalyzer.java index d688db77cc8..c1687cc119d 100644 --- a/lucene/analysis/stempel/src/test/org/apache/lucene/analysis/pl/TestPolishAnalyzer.java +++ b/lucene/analysis/stempel/src/test/org/apache/lucene/analysis/pl/TestPolishAnalyzer.java @@ -18,8 +18,8 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestPolishAnalyzer extends BaseTokenStreamTestCase { /** This test fails with NPE when the stopwords file is missing in classpath */ diff --git a/lucene/analysis/stempel/src/test/org/apache/lucene/analysis/stempel/TestStempelPolishStemFilterFactory.java b/lucene/analysis/stempel/src/test/org/apache/lucene/analysis/stempel/TestStempelPolishStemFilterFactory.java index ff14bc5cc0c..0f9bb4df32b 100644 --- a/lucene/analysis/stempel/src/test/org/apache/lucene/analysis/stempel/TestStempelPolishStemFilterFactory.java +++ b/lucene/analysis/stempel/src/test/org/apache/lucene/analysis/stempel/TestStempelPolishStemFilterFactory.java @@ -19,8 +19,8 @@ import java.io.Reader; import java.io.StringReader; import java.util.HashMap; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; /** Tests for {@link StempelPolishStemFilterFactory} */ public class TestStempelPolishStemFilterFactory extends BaseTokenStreamTestCase { diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestBlockPostingsFormat.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestBlockPostingsFormat.java index 48a1d96e61c..fc00ccd1261 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestBlockPostingsFormat.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestBlockPostingsFormat.java @@ -20,7 +20,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.backward_codecs.lucene40.blocktree.FieldReader; import org.apache.lucene.backward_codecs.lucene40.blocktree.Stats; import org.apache.lucene.backward_codecs.lucene50.Lucene50ScoreSkipReader.MutableImpactList; @@ -39,6 +38,7 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase.Nightly; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestBlockPostingsFormat2.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestBlockPostingsFormat2.java index c899ff02a79..6d8b9171410 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestBlockPostingsFormat2.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestBlockPostingsFormat2.java @@ -16,7 +16,6 @@ */ package org.apache.lucene.backward_codecs.lucene50; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; @@ -28,6 +27,7 @@ import org.apache.lucene.index.IndexableField; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.Nightly; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestBlockPostingsFormat3.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestBlockPostingsFormat3.java index 51ff8305f7c..a7ee452aa01 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestBlockPostingsFormat3.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestBlockPostingsFormat3.java @@ -21,9 +21,6 @@ import java.util.HashSet; import java.util.Random; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockFixedLengthPayloadFilter; -import org.apache.lucene.analysis.MockTokenizer; -import org.apache.lucene.analysis.MockVariableLengthPayloadFilter; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.document.Document; @@ -44,6 +41,9 @@ import org.apache.lucene.index.TermsEnum.SeekStatus; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockFixedLengthPayloadFilter; +import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.analysis.MockVariableLengthPayloadFilter; import org.apache.lucene.tests.util.English; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.Nightly; diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/BaseLucene80DocValuesFormatTestCase.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/BaseLucene80DocValuesFormatTestCase.java index 4d7440e0094..33e1b9813da 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/BaseLucene80DocValuesFormatTestCase.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/BaseLucene80DocValuesFormatTestCase.java @@ -26,7 +26,6 @@ import java.util.TreeSet; import java.util.function.LongSupplier; import java.util.function.Supplier; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.DocValuesFormat; import org.apache.lucene.codecs.PostingsFormat; import org.apache.lucene.codecs.asserting.AssertingCodec; @@ -63,6 +62,7 @@ import org.apache.lucene.store.ByteBuffersDataInput; import org.apache.lucene.store.ByteBuffersDataOutput; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene84/TestLucene84PostingsFormat.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene84/TestLucene84PostingsFormat.java index a6239f9ad5f..3d037e75a73 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene84/TestLucene84PostingsFormat.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene84/TestLucene84PostingsFormat.java @@ -20,7 +20,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.backward_codecs.lucene40.blocktree.FieldReader; import org.apache.lucene.backward_codecs.lucene40.blocktree.Stats; import org.apache.lucene.backward_codecs.lucene84.Lucene84ScoreSkipReader.MutableImpactList; @@ -39,6 +38,7 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase.Nightly; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestBackwardsCompatibility.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestBackwardsCompatibility.java index a513e8813ad..b9d09c60c94 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestBackwardsCompatibility.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestBackwardsCompatibility.java @@ -39,7 +39,6 @@ import java.util.TimeZone; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.Codec; import org.apache.lucene.document.BinaryDocValuesField; import org.apache.lucene.document.BinaryPoint; @@ -108,6 +107,7 @@ import org.apache.lucene.store.FSDirectory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.NIOFSDirectory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java index 8e257e6ba84..4b8b390f4c6 100644 --- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java +++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java @@ -25,8 +25,6 @@ import java.util.List; import java.util.Locale; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute; import org.apache.lucene.benchmark.BenchmarkTestCase; @@ -53,6 +51,8 @@ import org.apache.lucene.index.TermsEnum; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/classification/src/test/org/apache/lucene/classification/TestBM25NBClassifier.java b/lucene/classification/src/test/org/apache/lucene/classification/TestBM25NBClassifier.java index f1220d2a750..b392b6a1fe1 100644 --- a/lucene/classification/src/test/org/apache/lucene/classification/TestBM25NBClassifier.java +++ b/lucene/classification/src/test/org/apache/lucene/classification/TestBM25NBClassifier.java @@ -17,7 +17,6 @@ package org.apache.lucene.classification; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.ngram.EdgeNGramTokenFilter; @@ -29,6 +28,7 @@ import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.search.TermQuery; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.util.BytesRef; import org.junit.Test; diff --git a/lucene/classification/src/test/org/apache/lucene/classification/TestBooleanPerceptronClassifier.java b/lucene/classification/src/test/org/apache/lucene/classification/TestBooleanPerceptronClassifier.java index ba6a485c95b..a6abd5796c8 100644 --- a/lucene/classification/src/test/org/apache/lucene/classification/TestBooleanPerceptronClassifier.java +++ b/lucene/classification/src/test/org/apache/lucene/classification/TestBooleanPerceptronClassifier.java @@ -16,7 +16,6 @@ */ package org.apache.lucene.classification; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.classification.utils.ConfusionMatrixGenerator; import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.MultiTerms; @@ -24,6 +23,7 @@ import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.search.TermQuery; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.util.BytesRef; import org.junit.Test; diff --git a/lucene/classification/src/test/org/apache/lucene/classification/TestCachingNaiveBayesClassifier.java b/lucene/classification/src/test/org/apache/lucene/classification/TestCachingNaiveBayesClassifier.java index e69e10f857c..c4868c0549e 100644 --- a/lucene/classification/src/test/org/apache/lucene/classification/TestCachingNaiveBayesClassifier.java +++ b/lucene/classification/src/test/org/apache/lucene/classification/TestCachingNaiveBayesClassifier.java @@ -17,7 +17,6 @@ package org.apache.lucene.classification; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.ngram.EdgeNGramTokenFilter; @@ -29,6 +28,7 @@ import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.search.TermQuery; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.util.BytesRef; import org.junit.Test; diff --git a/lucene/classification/src/test/org/apache/lucene/classification/TestKNearestFuzzyClassifier.java b/lucene/classification/src/test/org/apache/lucene/classification/TestKNearestFuzzyClassifier.java index 2ba1c0885e3..e4428ada7bd 100644 --- a/lucene/classification/src/test/org/apache/lucene/classification/TestKNearestFuzzyClassifier.java +++ b/lucene/classification/src/test/org/apache/lucene/classification/TestKNearestFuzzyClassifier.java @@ -16,7 +16,6 @@ */ package org.apache.lucene.classification; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.classification.utils.ConfusionMatrixGenerator; import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.MultiTerms; @@ -24,6 +23,7 @@ import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.search.TermQuery; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.util.BytesRef; import org.junit.Test; diff --git a/lucene/classification/src/test/org/apache/lucene/classification/TestKNearestNeighborClassifier.java b/lucene/classification/src/test/org/apache/lucene/classification/TestKNearestNeighborClassifier.java index 95e4f505524..364758dc034 100644 --- a/lucene/classification/src/test/org/apache/lucene/classification/TestKNearestNeighborClassifier.java +++ b/lucene/classification/src/test/org/apache/lucene/classification/TestKNearestNeighborClassifier.java @@ -18,7 +18,6 @@ import java.util.List; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.en.EnglishAnalyzer; import org.apache.lucene.classification.utils.ConfusionMatrixGenerator; import org.apache.lucene.index.LeafReader; @@ -29,6 +28,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.similarities.BM25Similarity; import org.apache.lucene.search.similarities.LMDirichletSimilarity; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.util.BytesRef; import org.junit.Test; diff --git a/lucene/classification/src/test/org/apache/lucene/classification/TestSimpleNaiveBayesClassifier.java b/lucene/classification/src/test/org/apache/lucene/classification/TestSimpleNaiveBayesClassifier.java index 18538907b22..82c2b871c9c 100644 --- a/lucene/classification/src/test/org/apache/lucene/classification/TestSimpleNaiveBayesClassifier.java +++ b/lucene/classification/src/test/org/apache/lucene/classification/TestSimpleNaiveBayesClassifier.java @@ -17,7 +17,6 @@ package org.apache.lucene.classification; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.ngram.EdgeNGramTokenFilter; @@ -29,6 +28,7 @@ import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.search.TermQuery; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.util.BytesRef; import org.junit.Test; diff --git a/lucene/classification/src/test/org/apache/lucene/classification/utils/TestConfusionMatrixGenerator.java b/lucene/classification/src/test/org/apache/lucene/classification/utils/TestConfusionMatrixGenerator.java index ba03ec34fc2..41e6575483e 100644 --- a/lucene/classification/src/test/org/apache/lucene/classification/utils/TestConfusionMatrixGenerator.java +++ b/lucene/classification/src/test/org/apache/lucene/classification/utils/TestConfusionMatrixGenerator.java @@ -18,7 +18,6 @@ import java.io.IOException; import java.util.List; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.classification.BM25NBClassifier; import org.apache.lucene.classification.BooleanPerceptronClassifier; import org.apache.lucene.classification.CachingNaiveBayesClassifier; @@ -29,6 +28,7 @@ import org.apache.lucene.classification.KNearestNeighborClassifier; import org.apache.lucene.classification.SimpleNaiveBayesClassifier; import org.apache.lucene.index.LeafReader; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.util.BytesRef; import org.junit.Test; diff --git a/lucene/classification/src/test/org/apache/lucene/classification/utils/TestDataSplitter.java b/lucene/classification/src/test/org/apache/lucene/classification/utils/TestDataSplitter.java index 34488c3da49..a15ba02cd30 100644 --- a/lucene/classification/src/test/org/apache/lucene/classification/utils/TestDataSplitter.java +++ b/lucene/classification/src/test/org/apache/lucene/classification/utils/TestDataSplitter.java @@ -18,7 +18,6 @@ import java.io.IOException; import java.util.Random; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; @@ -29,6 +28,7 @@ import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/blocktreeords/TestOrdsBlockTree.java b/lucene/codecs/src/test/org/apache/lucene/codecs/blocktreeords/TestOrdsBlockTree.java index 52ad7625468..bb154e154ab 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/blocktreeords/TestOrdsBlockTree.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/blocktreeords/TestOrdsBlockTree.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.Codec; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -33,6 +32,7 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/java/org/apache/lucene/analysis/TokenFilter.java b/lucene/core/src/java/org/apache/lucene/analysis/TokenFilter.java index 9e05e9050e3..e83fcfe8ae4 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/TokenFilter.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/TokenFilter.java @@ -17,6 +17,7 @@ package org.apache.lucene.analysis; import java.io.IOException; +import org.apache.lucene.util.Unwrappable; /** * A TokenFilter is a TokenStream whose input is another TokenStream. @@ -25,7 +26,7 @@ * * @see TokenStream */ -public abstract class TokenFilter extends TokenStream { +public abstract class TokenFilter extends TokenStream implements Unwrappable { /** The source of tokens for this filter. */ protected final TokenStream input; @@ -67,4 +68,9 @@ public void close() throws IOException { public void reset() throws IOException { input.reset(); } + + @Override + public TokenStream unwrap() { + return input; + } } diff --git a/lucene/core/src/java/org/apache/lucene/analysis/Tokenizer.java b/lucene/core/src/java/org/apache/lucene/analysis/Tokenizer.java index 343e01154d1..1e30737ce4a 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/Tokenizer.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/Tokenizer.java @@ -103,8 +103,8 @@ public void reset() throws IOException { inputPending = ILLEGAL_STATE_READER; } - // only used for testing - void setReaderTestPoint() {} + /** @lucene.internal */ + protected void setReaderTestPoint() {} private static final Reader ILLEGAL_STATE_READER = new Reader() { diff --git a/lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java b/lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java index e84871aefdb..a12f4cbc984 100644 --- a/lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java +++ b/lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java @@ -16,7 +16,6 @@ */ package org.apache.lucene; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.PostingsFormat; import org.apache.lucene.codecs.asserting.AssertingCodec; import org.apache.lucene.document.Document; @@ -27,6 +26,7 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.TermQuery; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java b/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java index 5a92e905749..da2e062d278 100644 --- a/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java +++ b/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java @@ -22,7 +22,6 @@ import java.io.PrintStream; import java.io.PrintWriter; import java.io.StringWriter; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.ConcurrentMergeScheduler; @@ -35,6 +34,7 @@ import org.apache.lucene.index.MergeTrigger; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; diff --git a/lucene/core/src/test/org/apache/lucene/TestSearch.java b/lucene/core/src/test/org/apache/lucene/TestSearch.java index d0381e61144..727a571f9c0 100644 --- a/lucene/core/src/test/org/apache/lucene/TestSearch.java +++ b/lucene/core/src/test/org/apache/lucene/TestSearch.java @@ -26,6 +26,7 @@ import org.apache.lucene.index.*; import org.apache.lucene.search.*; import org.apache.lucene.store.*; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; /** JUnit adaptation of an older test case SearchTest. */ diff --git a/lucene/core/src/test/org/apache/lucene/TestSearchForDuplicates.java b/lucene/core/src/test/org/apache/lucene/TestSearchForDuplicates.java index 427859296e2..22ad98bf5e6 100644 --- a/lucene/core/src/test/org/apache/lucene/TestSearchForDuplicates.java +++ b/lucene/core/src/test/org/apache/lucene/TestSearchForDuplicates.java @@ -21,7 +21,6 @@ import java.io.StringWriter; import java.util.Random; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.NumericDocValuesField; @@ -41,6 +40,7 @@ import org.apache.lucene.search.SortField; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; public class TestSearchForDuplicates extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/analysis/TestAnalyzerWrapper.java b/lucene/core/src/test/org/apache/lucene/analysis/TestAnalyzerWrapper.java index cf468af467e..99f8204ec7c 100644 --- a/lucene/core/src/test/org/apache/lucene/analysis/TestAnalyzerWrapper.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/TestAnalyzerWrapper.java @@ -19,6 +19,7 @@ import java.io.IOException; import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.lucene.tests.analysis.CannedTokenStream; import org.apache.lucene.tests.util.LuceneTestCase; public class TestAnalyzerWrapper extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/analysis/TestAutomatonToTokenStream.java b/lucene/core/src/test/org/apache/lucene/analysis/TestAutomatonToTokenStream.java index 369856eaf89..27d2c72ddb0 100644 --- a/lucene/core/src/test/org/apache/lucene/analysis/TestAutomatonToTokenStream.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/TestAutomatonToTokenStream.java @@ -20,6 +20,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.automaton.Automaton; import org.apache.lucene.util.automaton.DaciukMihovAutomatonBuilder; diff --git a/lucene/core/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java b/lucene/core/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java index 87cacb83927..8d298904a3d 100644 --- a/lucene/core/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java @@ -28,6 +28,8 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.util.BytesRef; public class TestCachingTokenFilter extends BaseTokenStreamTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/analysis/TestDelegatingAnalyzerWrapper.java b/lucene/core/src/test/org/apache/lucene/analysis/TestDelegatingAnalyzerWrapper.java index 9d107c7020a..4efbe52d765 100644 --- a/lucene/core/src/test/org/apache/lucene/analysis/TestDelegatingAnalyzerWrapper.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/TestDelegatingAnalyzerWrapper.java @@ -19,6 +19,9 @@ import java.io.IOException; import java.io.Reader; import java.nio.charset.StandardCharsets; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockBytesAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/analysis/TestGraphTokenFilter.java b/lucene/core/src/test/org/apache/lucene/analysis/TestGraphTokenFilter.java index 627cef9af8c..6afa522cd2c 100644 --- a/lucene/core/src/test/org/apache/lucene/analysis/TestGraphTokenFilter.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/TestGraphTokenFilter.java @@ -21,6 +21,9 @@ import java.io.StringReader; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.Token; public class TestGraphTokenFilter extends BaseTokenStreamTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/analysis/TestGraphTokenizers.java b/lucene/core/src/test/org/apache/lucene/analysis/TestGraphTokenizers.java index ce50f2f629a..6e51a6bbb0c 100644 --- a/lucene/core/src/test/org/apache/lucene/analysis/TestGraphTokenizers.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/TestGraphTokenizers.java @@ -31,6 +31,13 @@ import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; import org.apache.lucene.analysis.tokenattributes.PositionLengthAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.MockGraphTokenFilter; +import org.apache.lucene.tests.analysis.MockHoleInjectingTokenFilter; +import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.analysis.Token; +import org.apache.lucene.tests.analysis.TokenStreamToDot; import org.apache.lucene.tests.util.automaton.AutomatonTestUtil; import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.IntsRef; diff --git a/lucene/core/src/test/org/apache/lucene/analysis/TestStopFilter.java b/lucene/core/src/test/org/apache/lucene/analysis/TestStopFilter.java index 3f92ba58155..99a16048642 100644 --- a/lucene/core/src/test/org/apache/lucene/analysis/TestStopFilter.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/TestStopFilter.java @@ -29,6 +29,8 @@ import java.util.Set; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.English; public class TestStopFilter extends BaseTokenStreamTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/analysis/standard/TestStandardAnalyzer.java b/lucene/core/src/test/org/apache/lucene/analysis/standard/TestStandardAnalyzer.java index 23f72161206..7befe923cee 100644 --- a/lucene/core/src/test/org/apache/lucene/analysis/standard/TestStandardAnalyzer.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/standard/TestStandardAnalyzer.java @@ -24,11 +24,13 @@ import java.util.List; import java.util.Random; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockGraphTokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockGraphTokenFilter; +import org.apache.lucene.tests.analysis.standard.EmojiTokenizationTestUnicode_12_1; +import org.apache.lucene.tests.analysis.standard.WordBreakTestUnicode_12_1_0; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/analysis/standard/TestStandardFactories.java b/lucene/core/src/test/org/apache/lucene/analysis/standard/TestStandardFactories.java index 2efd04624a5..133add81c3f 100644 --- a/lucene/core/src/test/org/apache/lucene/analysis/standard/TestStandardFactories.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/standard/TestStandardFactories.java @@ -18,8 +18,8 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure the standard lucene factories are working. */ public class TestStandardFactories extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestPackedTokenAttributeImpl.java b/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestPackedTokenAttributeImpl.java index b06acea9b06..49b2e10c69c 100644 --- a/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestPackedTokenAttributeImpl.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestPackedTokenAttributeImpl.java @@ -18,9 +18,9 @@ import java.io.StringReader; import java.util.HashMap; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90DocValuesFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90DocValuesFormat.java index 5fee1966ae1..81d012f0a41 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90DocValuesFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90DocValuesFormat.java @@ -27,7 +27,6 @@ import java.util.function.LongSupplier; import java.util.function.Supplier; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.DocValuesFormat; @@ -66,6 +65,7 @@ import org.apache.lucene.store.ByteBuffersDataInput; import org.apache.lucene.store.ByteBuffersDataOutput; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90PostingsFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90PostingsFormat.java index 6eb68cd6810..6e60e42391e 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90PostingsFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90PostingsFormat.java @@ -20,7 +20,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.CompetitiveImpactAccumulator; import org.apache.lucene.codecs.lucene90.Lucene90ScoreSkipReader.MutableImpactList; @@ -38,6 +37,7 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.TestUtil; public class TestLucene90PostingsFormat extends BasePostingsFormatTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java index ec4cc16d6fb..afa28f758bd 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java @@ -24,7 +24,6 @@ import java.util.List; import java.util.Random; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.DocValuesConsumer; import org.apache.lucene.codecs.DocValuesFormat; @@ -53,6 +52,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldKnnVectorsFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldKnnVectorsFormat.java index 0cd31167ff8..769669e8100 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldKnnVectorsFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldKnnVectorsFormat.java @@ -23,7 +23,6 @@ import java.util.HashSet; import java.util.Random; import java.util.Set; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.KnnVectorsFormat; import org.apache.lucene.codecs.KnnVectorsReader; @@ -46,6 +45,7 @@ import org.apache.lucene.index.VectorValues; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.TestUtil; import org.hamcrest.MatcherAssert; diff --git a/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat2.java b/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat2.java index 0c77b7b4c9c..9e0e50cccbf 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat2.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat2.java @@ -22,7 +22,6 @@ import java.util.Collections; import java.util.HashSet; import java.util.List; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.FieldsConsumer; import org.apache.lucene.codecs.FieldsProducer; @@ -54,6 +53,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.junit.Test; diff --git a/lucene/core/src/test/org/apache/lucene/document/TestDocument.java b/lucene/core/src/test/org/apache/lucene/document/TestDocument.java index 79efd71fe75..3efee8c90ba 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestDocument.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestDocument.java @@ -19,7 +19,6 @@ import java.io.StringReader; import java.nio.charset.StandardCharsets; import java.util.List; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexOptions; @@ -33,6 +32,7 @@ import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/document/TestField.java b/lucene/core/src/test/org/apache/lucene/document/TestField.java index 909a41f9fd4..964900ea7e6 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestField.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestField.java @@ -18,8 +18,6 @@ import java.io.StringReader; import java.nio.charset.StandardCharsets; -import org.apache.lucene.analysis.CannedTokenStream; -import org.apache.lucene.analysis.Token; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; @@ -27,6 +25,8 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.Token; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/Test2BBinaryDocValues.java b/lucene/core/src/test/org/apache/lucene/index/Test2BBinaryDocValues.java index 62e37df5d73..2faf281b3e8 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test2BBinaryDocValues.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test2BBinaryDocValues.java @@ -17,11 +17,11 @@ package org.apache.lucene.index; import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.BinaryDocValuesField; import org.apache.lucene.document.Document; import org.apache.lucene.store.ByteArrayDataInput; import org.apache.lucene.store.ByteArrayDataOutput; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/Test2BDocs.java b/lucene/core/src/test/org/apache/lucene/index/Test2BDocs.java index 012a8c40906..8c30aaa6bba 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test2BDocs.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test2BDocs.java @@ -19,10 +19,10 @@ import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite; import java.util.Random; import java.util.concurrent.TimeUnit; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.StringField; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/Test2BNumericDocValues.java b/lucene/core/src/test/org/apache/lucene/index/Test2BNumericDocValues.java index 3041681b192..0ee78973cf7 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test2BNumericDocValues.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test2BNumericDocValues.java @@ -17,9 +17,9 @@ package org.apache.lucene.index; import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.NumericDocValuesField; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/Test2BPoints.java b/lucene/core/src/test/org/apache/lucene/index/Test2BPoints.java index e2334c53b8b..1975b6d1188 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test2BPoints.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test2BPoints.java @@ -17,13 +17,13 @@ package org.apache.lucene.index; import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.Codec; import org.apache.lucene.document.Document; import org.apache.lucene.document.LongPoint; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.Monster; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; diff --git a/lucene/core/src/test/org/apache/lucene/index/Test2BPositions.java b/lucene/core/src/test/org/apache/lucene/index/Test2BPositions.java index 9f227127e52..76867c92afa 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test2BPositions.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test2BPositions.java @@ -16,7 +16,6 @@ */ package org.apache.lucene.index; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; @@ -24,6 +23,7 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; import org.apache.lucene.document.TextField; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java b/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java index 0900d7944f1..6813d8f0f75 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java @@ -17,13 +17,13 @@ package org.apache.lucene.index; import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; import org.apache.lucene.document.TextField; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/Test2BPostingsBytes.java b/lucene/core/src/test/org/apache/lucene/index/Test2BPostingsBytes.java index 5ab2075d7c1..5c9398bf757 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test2BPostingsBytes.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test2BPostingsBytes.java @@ -19,7 +19,6 @@ import java.util.Arrays; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.codecs.Codec; @@ -28,6 +27,7 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; import org.apache.lucene.document.TextField; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValuesFixedSorted.java b/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValuesFixedSorted.java index 05b341a622c..599fa2811b8 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValuesFixedSorted.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValuesFixedSorted.java @@ -17,9 +17,9 @@ package org.apache.lucene.index; import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.SortedDocValuesField; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValuesOrds.java b/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValuesOrds.java index 838ecd30b9f..41664442181 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValuesOrds.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValuesOrds.java @@ -17,9 +17,9 @@ package org.apache.lucene.index; import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.SortedDocValuesField; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java b/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java index fd78de02d97..7d7872c7d17 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java @@ -22,7 +22,6 @@ import java.util.Collections; import java.util.List; import java.util.Random; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute; @@ -32,6 +31,7 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.TermQuery; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/Test4GBStoredFields.java b/lucene/core/src/test/org/apache/lucene/index/Test4GBStoredFields.java index 7e6e1ae3b3d..832ab0a6d9a 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test4GBStoredFields.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test4GBStoredFields.java @@ -18,12 +18,12 @@ import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite; import com.carrotsearch.randomizedtesting.generators.RandomNumbers; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.compressing.CompressingCodec; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; import org.apache.lucene.store.MMapDirectory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java b/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java index ca95cae53c0..5f91a074715 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java @@ -21,7 +21,6 @@ import java.nio.file.NoSuchFileException; import java.util.ArrayList; import java.util.List; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.FilterCodec; import org.apache.lucene.codecs.PostingsFormat; @@ -43,6 +42,7 @@ import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; import org.apache.lucene.store.LockObtainFailedException; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesCheckIndexHeader.java b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesCheckIndexHeader.java index 291f55207a6..74587586bfb 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesCheckIndexHeader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesCheckIndexHeader.java @@ -20,12 +20,12 @@ import java.io.IOException; import java.util.Arrays; import java.util.Collections; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LineFileDocs; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesDetectBitFlips.java b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesDetectBitFlips.java index f75f8b3b8b2..1c9d0d68796 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesDetectBitFlips.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesDetectBitFlips.java @@ -19,12 +19,12 @@ import java.io.IOException; import java.util.Arrays; import java.util.Collections; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.CodecUtil; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesDetectTruncation.java b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesDetectTruncation.java index 33953df7257..5debc0e636a 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesDetectTruncation.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesDetectTruncation.java @@ -20,11 +20,11 @@ import java.io.IOException; import java.util.Arrays; import java.util.Collections; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveChecksumFooter.java b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveChecksumFooter.java index a4cebe3b391..aefa12a2c05 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveChecksumFooter.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveChecksumFooter.java @@ -17,10 +17,10 @@ package org.apache.lucene.index; import java.io.IOException; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.CodecUtil; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IndexInput; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveCodecHeader.java b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveCodecHeader.java index cbe2c418532..30ec4493420 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveCodecHeader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveCodecHeader.java @@ -19,10 +19,10 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.CodecUtil; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IndexInput; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestAtomicUpdate.java b/lucene/core/src/test/org/apache/lucene/index/TestAtomicUpdate.java index 8b891c80333..55387da6820 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestAtomicUpdate.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestAtomicUpdate.java @@ -20,12 +20,12 @@ import java.nio.file.Path; import java.util.ArrayList; import java.util.List; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.IntPoint; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.English; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestBagOfPositions.java b/lucene/core/src/test/org/apache/lucene/index/TestBagOfPositions.java index f94db022698..afbfeaca7dc 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestBagOfPositions.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestBagOfPositions.java @@ -22,12 +22,12 @@ import java.util.Random; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.CountDownLatch; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; import org.apache.lucene.document.TextField; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestBagOfPostings.java b/lucene/core/src/test/org/apache/lucene/index/TestBagOfPostings.java index 279c28305e4..93161f68c7a 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestBagOfPostings.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestBagOfPostings.java @@ -23,10 +23,10 @@ import java.util.Set; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.CountDownLatch; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestBinaryDocValuesUpdates.java b/lucene/core/src/test/org/apache/lucene/index/TestBinaryDocValuesUpdates.java index e7eef5537e9..74ca3cbd153 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestBinaryDocValuesUpdates.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestBinaryDocValuesUpdates.java @@ -27,8 +27,6 @@ import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.codecs.DocValuesFormat; import org.apache.lucene.codecs.asserting.AssertingCodec; import org.apache.lucene.codecs.asserting.AssertingDocValuesFormat; @@ -44,6 +42,8 @@ import org.apache.lucene.search.SortField; import org.apache.lucene.store.Directory; import org.apache.lucene.store.NRTCachingDirectory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestCheckIndex.java b/lucene/core/src/test/org/apache/lucene/index/TestCheckIndex.java index 3ac36ba40c8..7a655a34226 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestCheckIndex.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestCheckIndex.java @@ -18,13 +18,13 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; -import org.apache.lucene.analysis.CannedTokenStream; -import org.apache.lucene.analysis.Token; import org.apache.lucene.document.*; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.Sort; import org.apache.lucene.search.SortField; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.Token; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java b/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java index a77a2d79ed0..e2ca2ea2e36 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java @@ -23,7 +23,6 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Random; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.FieldsConsumer; import org.apache.lucene.codecs.FieldsProducer; @@ -33,6 +32,7 @@ import org.apache.lucene.document.StringField; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java b/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java index cba9c7c64b9..fb736a3ee9a 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java @@ -29,8 +29,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; -import org.apache.lucene.analysis.CannedTokenStream; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.StringField; @@ -38,6 +36,8 @@ import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java b/lucene/core/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java index 7748e0111ab..de1d4ca98a4 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java @@ -17,13 +17,13 @@ package org.apache.lucene.index; import java.io.IOException; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; import org.apache.lucene.document.StoredField; import org.apache.lucene.document.TextField; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.FailOnNonBulkMergesInfoStream; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestCrash.java b/lucene/core/src/test/org/apache/lucene/index/TestCrash.java index 9fa8624f58e..e50517eb5fa 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestCrash.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestCrash.java @@ -18,11 +18,11 @@ import java.io.IOException; import java.util.Random; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.store.Directory; import org.apache.lucene.store.NoLockFactory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java b/lucene/core/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java index 17d4049263c..5ed2149963a 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java @@ -18,7 +18,6 @@ import java.io.IOException; import java.nio.file.Path; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.search.IndexSearcher; @@ -29,6 +28,7 @@ import org.apache.lucene.store.FilterDirectory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; public class TestCrashCausesCorruptIndex extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestCustomNorms.java b/lucene/core/src/test/org/apache/lucene/index/TestCustomNorms.java index 9bf9bef958a..12da52fd846 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestCustomNorms.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestCustomNorms.java @@ -19,7 +19,6 @@ import java.io.IOException; import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.TextField; @@ -29,6 +28,7 @@ import org.apache.lucene.search.similarities.PerFieldSimilarityWrapper; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestCustomTermFreq.java b/lucene/core/src/test/org/apache/lucene/index/TestCustomTermFreq.java index bb46fbdc47a..4679cc306e7 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestCustomTermFreq.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestCustomTermFreq.java @@ -19,7 +19,6 @@ import static org.apache.lucene.index.PostingsEnum.NO_MORE_DOCS; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.TermFrequencyAttribute; @@ -31,6 +30,7 @@ import org.apache.lucene.search.TermStatistics; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDeletionPolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestDeletionPolicy.java index 04ad8284d30..83524d4f02f 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDeletionPolicy.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDeletionPolicy.java @@ -23,7 +23,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexWriterConfig.OpenMode; @@ -32,6 +31,7 @@ import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Version; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java b/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java index 04f39c965ab..0fbf3d1f85d 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java @@ -30,7 +30,6 @@ import java.util.Random; import java.util.Set; import java.util.TreeSet; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; @@ -40,6 +39,7 @@ import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReaderReopen.java b/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReaderReopen.java index 95ed5b08543..462343f6bcf 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReaderReopen.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReaderReopen.java @@ -26,7 +26,6 @@ import java.util.Map; import java.util.Random; import java.util.Set; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; @@ -39,6 +38,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.store.MockDirectoryWrapper.FakeIOException; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDoc.java b/lucene/core/src/test/org/apache/lucene/index/TestDoc.java index 2c869e6bdd0..90195ede06a 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDoc.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDoc.java @@ -31,7 +31,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.Codec; import org.apache.lucene.document.Document; import org.apache.lucene.document.TextField; @@ -41,6 +40,7 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.MergeInfo; import org.apache.lucene.store.TrackingDirectoryWrapper; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.Bits; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDocInverterPerFieldErrorInfo.java b/lucene/core/src/test/org/apache/lucene/index/TestDocInverterPerFieldErrorInfo.java index 846d6e09271..8cb632e01a7 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDocInverterPerFieldErrorInfo.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDocInverterPerFieldErrorInfo.java @@ -20,13 +20,13 @@ import java.io.IOException; import java.io.PrintStream; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.FieldType; import org.apache.lucene.document.TextField; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.PrintStreamInfoStream; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java b/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java index 3a9984c5938..731f9bf33de 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java @@ -20,7 +20,6 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicBoolean; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.document.BinaryDocValuesField; import org.apache.lucene.document.Document; @@ -33,6 +32,7 @@ import org.apache.lucene.document.StringField; import org.apache.lucene.document.TextField; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java b/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java index e48ef664e0b..60fd25c945e 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java @@ -19,13 +19,13 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; import org.apache.lucene.document.TextField; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java b/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java index 8b11496f857..65b53bd6bbd 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java @@ -19,8 +19,6 @@ import java.io.IOException; import java.util.function.Function; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; @@ -43,6 +41,8 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.AttributeSource; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java b/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java index 056766e8938..f206358bb82 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java @@ -18,13 +18,13 @@ import java.io.IOException; import java.util.Random; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.Codec; import org.apache.lucene.document.Document; import org.apache.lucene.document.NumericDocValuesField; import org.apache.lucene.document.SortedNumericDocValuesField; import org.apache.lucene.document.SortedSetDocValuesField; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.Slow; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestExceedMaxTermLength.java b/lucene/core/src/test/org/apache/lucene/index/TestExceedMaxTermLength.java index 5bc9c2c6b7f..e992bb8c638 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestExceedMaxTermLength.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestExceedMaxTermLength.java @@ -17,11 +17,11 @@ package org.apache.lucene.index; import java.io.IOException; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.junit.After; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestExitableDirectoryReader.java b/lucene/core/src/test/org/apache/lucene/index/TestExitableDirectoryReader.java index 5595c3ded98..84c466e4aed 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestExitableDirectoryReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestExitableDirectoryReader.java @@ -18,7 +18,6 @@ import java.io.IOException; import java.util.Arrays; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.*; import org.apache.lucene.index.ExitableDirectoryReader.ExitingReaderException; import org.apache.lucene.search.DocIdSetIterator; @@ -26,6 +25,7 @@ import org.apache.lucene.search.PrefixQuery; import org.apache.lucene.search.Query; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestFieldInfos.java b/lucene/core/src/test/org/apache/lucene/index/TestFieldInfos.java index 7c8e3323ad5..dcf1272e6d4 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestFieldInfos.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestFieldInfos.java @@ -22,12 +22,12 @@ import java.io.IOException; import java.util.HashMap; import java.util.Iterator; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; import org.apache.lucene.document.StringField; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; public class TestFieldInfos extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestFieldInvertState.java b/lucene/core/src/test/org/apache/lucene/index/TestFieldInvertState.java index f3e74eac06a..378388d86cb 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestFieldInvertState.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestFieldInvertState.java @@ -19,9 +19,6 @@ import java.util.HashMap; import java.util.Map; -import org.apache.lucene.analysis.CannedTokenStream; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.Token; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.TextField; @@ -29,6 +26,9 @@ import org.apache.lucene.search.TermStatistics; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.Token; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestFieldReuse.java b/lucene/core/src/test/org/apache/lucene/index/TestFieldReuse.java index af28507e98f..a1c8bd89f91 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestFieldReuse.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestFieldReuse.java @@ -20,13 +20,13 @@ import java.io.Reader; import java.util.Collections; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.CannedTokenStream; -import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.document.Field; import org.apache.lucene.document.StringField; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.Token; import org.apache.lucene.util.BytesRef; /** test tokenstream reuse by DefaultIndexingChain */ diff --git a/lucene/core/src/test/org/apache/lucene/index/TestFieldsReader.java b/lucene/core/src/test/org/apache/lucene/index/TestFieldsReader.java index f19390f4e0b..e929a284ceb 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestFieldsReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestFieldsReader.java @@ -21,7 +21,6 @@ import java.nio.file.Path; import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.DocumentStoredFieldVisitor; import org.apache.lucene.document.Field; @@ -31,6 +30,7 @@ import org.apache.lucene.store.FilterDirectory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestFilterLeafReader.java b/lucene/core/src/test/org/apache/lucene/index/TestFilterLeafReader.java index 0ad32968c54..b5552eadcc2 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestFilterLeafReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestFilterLeafReader.java @@ -19,11 +19,11 @@ import java.io.IOException; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestFlex.java b/lucene/core/src/test/org/apache/lucene/index/TestFlex.java index f4ee4842ce7..bb6dec94b07 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestFlex.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestFlex.java @@ -16,10 +16,10 @@ */ package org.apache.lucene.index; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java index b04da5a4d1c..7d2b7f0e151 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java @@ -20,9 +20,9 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestForTooMuchCloning.java b/lucene/core/src/test/org/apache/lucene/index/TestForTooMuchCloning.java index 98f70aba507..5b2d5ebb212 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestForTooMuchCloning.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestForTooMuchCloning.java @@ -16,13 +16,13 @@ */ package org.apache.lucene.index; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.TextField; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.TermRangeQuery; import org.apache.lucene.search.TopDocs; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestForceMergeForever.java b/lucene/core/src/test/org/apache/lucene/index/TestForceMergeForever.java index 9a7933f593b..96cac192560 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestForceMergeForever.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestForceMergeForever.java @@ -19,8 +19,8 @@ import java.io.IOException; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java index 8057fc77bf0..8834df3b8bd 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java @@ -20,7 +20,6 @@ import java.nio.file.Path; import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.simpletext.SimpleTextCodec; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -30,6 +29,7 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexReaderClose.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexReaderClose.java index 2ef757b1ec3..dd81a2b6f0a 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexReaderClose.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexReaderClose.java @@ -20,10 +20,10 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java index df118f78a9d..eb67c4e5537 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java @@ -36,8 +36,6 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; @@ -79,6 +77,8 @@ import org.apache.lucene.search.TopFieldCollector; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java index 8799de7cea9..81c79748b53 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java @@ -51,11 +51,6 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CannedTokenStream; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenFilter; -import org.apache.lucene.analysis.MockTokenizer; -import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; @@ -97,6 +92,11 @@ import org.apache.lucene.store.NIOFSDirectory; import org.apache.lucene.store.NoLockFactory; import org.apache.lucene.store.SimpleFSLockFactory; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenFilter; +import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.analysis.Token; import org.apache.lucene.tests.mockfile.ExtrasFS; import org.apache.lucene.tests.mockfile.FilterPath; import org.apache.lucene.tests.mockfile.WindowsFS; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java index 5512c390bce..a2088f7cf5c 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java @@ -29,6 +29,9 @@ import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockFixedLengthPayloadFilter; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java index 7a2a6f9b89d..f30ca7a0031 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java @@ -21,7 +21,6 @@ import java.lang.reflect.Modifier; import java.util.HashSet; import java.util.Set; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.Codec; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field.Store; @@ -29,6 +28,7 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.InfoStream; import org.junit.Test; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java index c06922c9bdf..635430d73fe 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java @@ -30,8 +30,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; @@ -42,6 +40,8 @@ import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java index 6d588130664..25d473348fb 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java @@ -29,8 +29,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.BooleanSupplier; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; @@ -57,6 +55,8 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.store.MockDirectoryWrapper.FakeIOException; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions2.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions2.java index a6c78d187fd..45f16e10527 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions2.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions2.java @@ -21,9 +21,6 @@ import java.util.Arrays; import java.util.Random; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CrankyTokenFilter; -import org.apache.lucene.analysis.MockTokenizer; -import org.apache.lucene.analysis.MockVariableLengthPayloadFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.asserting.AssertingCodec; @@ -41,6 +38,9 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.CrankyTokenFilter; +import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.analysis.MockVariableLengthPayloadFilter; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java index 838722ed0f5..e1e10c9aaaf 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java @@ -19,13 +19,13 @@ import java.io.IOException; import java.util.Locale; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterLockRelease.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterLockRelease.java index 3028b39d141..8c96e3603fa 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterLockRelease.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterLockRelease.java @@ -19,9 +19,9 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.nio.file.NoSuchFileException; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; /** diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java index 134f373604e..e212ce326bb 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java @@ -22,7 +22,6 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.NumericDocValuesField; @@ -32,6 +31,7 @@ import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.mockfile.HandleLimitFS; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java index 057b400a1b5..d302f462afd 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java @@ -19,7 +19,6 @@ import java.io.IOException; import java.util.Random; import java.util.concurrent.atomic.AtomicReference; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; @@ -27,6 +26,7 @@ import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; public class TestIndexWriterMerging extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterNRTIsCurrent.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterNRTIsCurrent.java index fd15c7d5af6..08a215b1c4d 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterNRTIsCurrent.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterNRTIsCurrent.java @@ -19,11 +19,11 @@ import java.io.IOException; import java.util.Random; import java.util.concurrent.CountDownLatch; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.TextField; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java index 6723c266836..4001fb982ba 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java @@ -17,7 +17,6 @@ package org.apache.lucene.index; import java.io.IOException; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.LiveDocsFormat; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -32,6 +31,7 @@ import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnVMError.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnVMError.java index 36df9a2fa2a..7b1a4d821a7 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnVMError.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnVMError.java @@ -22,8 +22,6 @@ import java.util.Arrays; import java.util.Random; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockTokenizer; -import org.apache.lucene.analysis.MockVariableLengthPayloadFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.document.BinaryDocValuesField; import org.apache.lucene.document.Document; @@ -37,6 +35,8 @@ import org.apache.lucene.document.StoredField; import org.apache.lucene.document.TextField; import org.apache.lucene.store.AlreadyClosedException; +import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.analysis.MockVariableLengthPayloadFilter; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.store.MockDirectoryWrapper.Failure; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOutOfFileDescriptors.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOutOfFileDescriptors.java index c21668e9219..22b26f9cae4 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOutOfFileDescriptors.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOutOfFileDescriptors.java @@ -19,9 +19,9 @@ import java.io.IOException; import java.util.HashSet; import java.util.Set; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java index a9baae0f477..247de39f4ff 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java @@ -29,7 +29,6 @@ import java.util.Random; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.LongPoint; @@ -40,6 +39,7 @@ import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.store.MockDirectoryWrapper.FakeIOException; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterThreadsToSegments.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterThreadsToSegments.java index 0f80ea71630..12e0b668ba4 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterThreadsToSegments.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterThreadsToSegments.java @@ -24,7 +24,6 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.CyclicBarrier; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.Codec; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -33,6 +32,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java index 33b79818f2f..cce2a2bebc6 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java @@ -23,10 +23,10 @@ import java.util.Iterator; import java.util.Random; import java.util.Set; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java index e4a6127945f..c99bd8488b7 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java @@ -24,7 +24,6 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; @@ -35,6 +34,7 @@ import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.Directory; import org.apache.lucene.store.LockObtainFailedException; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LineFileDocs; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestLazyProxSkipping.java b/lucene/core/src/test/org/apache/lucene/index/TestLazyProxSkipping.java index a1853c4f3ef..61c563bdbf9 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestLazyProxSkipping.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestLazyProxSkipping.java @@ -27,6 +27,8 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestLongPostings.java b/lucene/core/src/test/org/apache/lucene/index/TestLongPostings.java index d860501342e..b0433b7042b 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestLongPostings.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestLongPostings.java @@ -18,7 +18,6 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute; import org.apache.lucene.document.Document; @@ -27,6 +26,7 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestManyFields.java b/lucene/core/src/test/org/apache/lucene/index/TestManyFields.java index b3e68a8c372..23b623c3456 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestManyFields.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestManyFields.java @@ -17,7 +17,6 @@ package org.apache.lucene.index; import java.io.IOException; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; @@ -25,6 +24,7 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; /** Test that creates way, way, way too many fields */ diff --git a/lucene/core/src/test/org/apache/lucene/index/TestMaxPosition.java b/lucene/core/src/test/org/apache/lucene/index/TestMaxPosition.java index d60dbe73d5a..4a5b5d8574f 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestMaxPosition.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestMaxPosition.java @@ -16,11 +16,11 @@ */ package org.apache.lucene.index; -import org.apache.lucene.analysis.CannedTokenStream; -import org.apache.lucene.analysis.Token; import org.apache.lucene.document.Document; import org.apache.lucene.document.TextField; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.Token; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java b/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java index 91b1428da59..f0ec157fc97 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java @@ -20,14 +20,14 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.search.CollectionStatistics; import org.apache.lucene.search.TermStatistics; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestMixedCodecs.java b/lucene/core/src/test/org/apache/lucene/index/TestMixedCodecs.java index 9c4ede21f7e..4578102eec8 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestMixedCodecs.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestMixedCodecs.java @@ -18,11 +18,11 @@ import java.util.HashSet; import java.util.Set; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.Codec; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestMixedDocValuesUpdates.java b/lucene/core/src/test/org/apache/lucene/index/TestMixedDocValuesUpdates.java index 0b0c80a0f98..edc82f6197e 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestMixedDocValuesUpdates.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestMixedDocValuesUpdates.java @@ -27,7 +27,6 @@ import java.util.concurrent.CyclicBarrier; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.ReentrantLock; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.BinaryDocValuesField; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -41,6 +40,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java b/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java index d6229cf9e2d..bbe0d57558e 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java @@ -23,11 +23,11 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java b/lucene/core/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java index cccaebedca9..ea948c7b33e 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java @@ -26,6 +26,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestMultiTermsEnum.java b/lucene/core/src/test/org/apache/lucene/index/TestMultiTermsEnum.java index 0335242f468..0f35bda4e59 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestMultiTermsEnum.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestMultiTermsEnum.java @@ -19,13 +19,13 @@ import java.io.IOException; import java.util.Iterator; import java.util.List; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.FieldsProducer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.StringField; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderCleanup.java b/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderCleanup.java index e711d28d76e..faae8b01342 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderCleanup.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderCleanup.java @@ -17,10 +17,10 @@ package org.apache.lucene.index; import java.io.IOException; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.TextField; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressFileSystems; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java b/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java index e98bc37b877..e1c3a3cd8e3 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java @@ -18,9 +18,9 @@ import java.util.Random; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNeverDelete.java b/lucene/core/src/test/org/apache/lucene/index/TestNeverDelete.java index 901432d481d..31f8cd0eeee 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestNeverDelete.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNeverDelete.java @@ -19,9 +19,9 @@ import java.nio.file.Path; import java.util.HashSet; import java.util.Set; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNewestSegment.java b/lucene/core/src/test/org/apache/lucene/index/TestNewestSegment.java index 92d3620984b..36534daeac3 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestNewestSegment.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNewestSegment.java @@ -16,8 +16,8 @@ */ package org.apache.lucene.index; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; public class TestNewestSegment extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java index 4e2978d0fa1..0a349e8d952 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java @@ -20,10 +20,10 @@ import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.Arrays; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNorms.java b/lucene/core/src/test/org/apache/lucene/index/TestNorms.java index 0df33c55880..6fd29e7bccb 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestNorms.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNorms.java @@ -20,7 +20,6 @@ import java.util.Random; import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.Field.Store; @@ -31,6 +30,7 @@ import org.apache.lucene.search.similarities.PerFieldSimilarityWrapper; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java b/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java index 4125902d7c4..2f277718330 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java @@ -27,8 +27,6 @@ import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.codecs.DocValuesFormat; import org.apache.lucene.codecs.asserting.AssertingCodec; import org.apache.lucene.codecs.asserting.AssertingDocValuesFormat; @@ -49,6 +47,8 @@ import org.apache.lucene.search.TopFieldDocs; import org.apache.lucene.store.Directory; import org.apache.lucene.store.NRTCachingDirectory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestOmitNorms.java b/lucene/core/src/test/org/apache/lucene/index/TestOmitNorms.java index d97e1a145c9..1d088ca7dd3 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestOmitNorms.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestOmitNorms.java @@ -17,12 +17,12 @@ package org.apache.lucene.index; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; import org.apache.lucene.document.TextField; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; public class TestOmitNorms extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestOmitPositions.java b/lucene/core/src/test/org/apache/lucene/index/TestOmitPositions.java index 3780dead776..63efeffc69f 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestOmitPositions.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestOmitPositions.java @@ -17,13 +17,13 @@ package org.apache.lucene.index; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; import org.apache.lucene.document.TextField; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java b/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java index ad787a0c8d6..35c1c984aa2 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java @@ -18,7 +18,6 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; @@ -36,6 +35,7 @@ import org.apache.lucene.search.TermStatistics; import org.apache.lucene.search.similarities.TFIDFSimilarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestOrdinalMap.java b/lucene/core/src/test/org/apache/lucene/index/TestOrdinalMap.java index 8d09ef3b860..78afe478a30 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestOrdinalMap.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestOrdinalMap.java @@ -19,11 +19,11 @@ import java.io.IOException; import java.lang.reflect.Field; import java.util.HashMap; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.SortedDocValuesField; import org.apache.lucene.document.SortedSetDocValuesField; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.RamUsageTester; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestParallelCompositeReader.java b/lucene/core/src/test/org/apache/lucene/index/TestParallelCompositeReader.java index c39c359631e..c4f90c4bb7b 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestParallelCompositeReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestParallelCompositeReader.java @@ -18,7 +18,6 @@ import java.io.IOException; import java.util.Random; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.search.BooleanClause.Occur; @@ -29,6 +28,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; public class TestParallelCompositeReader extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestParallelLeafReader.java b/lucene/core/src/test/org/apache/lucene/index/TestParallelLeafReader.java index 5313e96b555..ca6f26c78fd 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestParallelLeafReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestParallelLeafReader.java @@ -18,7 +18,6 @@ import java.io.IOException; import java.util.Random; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.NumericDocValuesField; @@ -26,6 +25,7 @@ import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java b/lucene/core/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java index 7b4cd234a23..d918b9c3ffd 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java @@ -19,13 +19,13 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; /** Some tests for {@link ParallelLeafReader}s with empty indexes */ diff --git a/lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java b/lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java index 76ec0a90550..4a19dfb100e 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java @@ -17,11 +17,11 @@ package org.apache.lucene.index; import java.io.IOException; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java b/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java index 32b0876aa02..7e64e5a81b5 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java @@ -25,10 +25,6 @@ import java.util.List; import java.util.Map; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CannedTokenStream; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; -import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; @@ -40,6 +36,10 @@ import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.analysis.Token; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestPayloadsOnVectors.java b/lucene/core/src/test/org/apache/lucene/index/TestPayloadsOnVectors.java index edac9e5c946..d4db1f8c40b 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestPayloadsOnVectors.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestPayloadsOnVectors.java @@ -17,10 +17,6 @@ package org.apache.lucene.index; import java.io.StringReader; -import org.apache.lucene.analysis.CannedTokenStream; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; -import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.tokenattributes.PayloadAttribute; @@ -29,6 +25,10 @@ import org.apache.lucene.document.FieldType; import org.apache.lucene.document.TextField; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.analysis.Token; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java b/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java index 7fd43aaf0e2..4e22d310d99 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java @@ -19,10 +19,10 @@ import java.io.IOException; import java.util.Map; import java.util.Random; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestPointValues.java b/lucene/core/src/test/org/apache/lucene/index/TestPointValues.java index 6e7211539f6..07cfe2f850b 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestPointValues.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestPointValues.java @@ -18,7 +18,6 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.Codec; import org.apache.lucene.document.BinaryPoint; import org.apache.lucene.document.Document; @@ -34,6 +33,7 @@ import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java b/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java index 0f58a1c05c9..095a22d3105 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java @@ -22,11 +22,6 @@ import java.util.List; import java.util.Map; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CannedTokenStream; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockPayloadAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; -import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -36,6 +31,11 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockPayloadAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.analysis.Token; import org.apache.lucene.tests.util.English; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestReadOnlyIndex.java b/lucene/core/src/test/org/apache/lucene/index/TestReadOnlyIndex.java index 9e9836c8b35..08bcea33e8c 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestReadOnlyIndex.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestReadOnlyIndex.java @@ -21,7 +21,6 @@ import java.nio.file.Path; import java.util.PropertyPermission; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.search.IndexSearcher; @@ -31,6 +30,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java b/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java index bdb3bd5d2ea..f7ee9760bdb 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java @@ -17,14 +17,14 @@ package org.apache.lucene.index; import java.util.concurrent.RejectedExecutionException; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.TermRangeQuery; import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestReaderWrapperDVTypeCheck.java b/lucene/core/src/test/org/apache/lucene/index/TestReaderWrapperDVTypeCheck.java index d57d11f98ce..6b1e638746c 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestReaderWrapperDVTypeCheck.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestReaderWrapperDVTypeCheck.java @@ -18,12 +18,12 @@ import java.io.IOException; import java.util.Random; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field.Store; import org.apache.lucene.document.SortedDocValuesField; import org.apache.lucene.document.SortedSetDocValuesField; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestRollback.java b/lucene/core/src/test/org/apache/lucene/index/TestRollback.java index f07cf65f142..b20b22c95aa 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestRollback.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestRollback.java @@ -16,10 +16,10 @@ */ package org.apache.lucene.index; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; public class TestRollback extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java b/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java index 5fb8cf26f1e..c16ef947f68 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java @@ -17,7 +17,6 @@ package org.apache.lucene.index; import java.util.Random; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.memory.DirectPostingsFormat; import org.apache.lucene.document.*; @@ -25,6 +24,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.*; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java b/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java index 2ca6daecdd3..f59169ccaa5 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java @@ -17,11 +17,11 @@ package org.apache.lucene.index; import java.io.IOException; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermEnum.java b/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermEnum.java index 98a99d64124..18e2ee598a1 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermEnum.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermEnum.java @@ -17,11 +17,11 @@ package org.apache.lucene.index; import java.io.IOException; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java index 289296a76d7..9635bdcda81 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java @@ -22,12 +22,12 @@ import java.util.List; import java.util.Random; import java.util.concurrent.CountDownLatch; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.FieldType; import org.apache.lucene.document.TextField; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IndexInput; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.ThreadInterruptedException; import org.junit.Test; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSortingCodecReader.java b/lucene/core/src/test/org/apache/lucene/index/TestSortingCodecReader.java index 8adb6e52651..0db2b7bd953 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSortingCodecReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSortingCodecReader.java @@ -25,7 +25,6 @@ import java.util.Collections; import java.util.List; import java.util.Locale; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.TermVectorsReader; import org.apache.lucene.document.BinaryDocValuesField; import org.apache.lucene.document.Document; @@ -48,6 +47,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestStressDeletes.java b/lucene/core/src/test/org/apache/lucene/index/TestStressDeletes.java index 28b62c7443b..9faa85550e3 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestStressDeletes.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestStressDeletes.java @@ -19,13 +19,13 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CountDownLatch; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing.java b/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing.java index fb87b8d9bd7..41f4baed4e1 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing.java @@ -16,10 +16,10 @@ */ package org.apache.lucene.index; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.*; import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.store.*; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.English; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java b/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java index 0ba751f262c..16da210f712 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java @@ -27,7 +27,6 @@ import java.util.Map; import java.util.Random; import java.util.concurrent.ConcurrentHashMap; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; @@ -36,6 +35,7 @@ import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java b/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java index 33cf6c9403e..9ba7dfb2987 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java @@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; @@ -34,6 +33,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSwappedIndexFiles.java b/lucene/core/src/test/org/apache/lucene/index/TestSwappedIndexFiles.java index d33685c76b7..68ded659528 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSwappedIndexFiles.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSwappedIndexFiles.java @@ -21,10 +21,10 @@ import java.util.Arrays; import java.util.Collections; import java.util.Random; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTermVectors.java b/lucene/core/src/test/org/apache/lucene/index/TestTermVectors.java index da141f8bab8..0e92f7c0e0e 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTermVectors.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTermVectors.java @@ -19,13 +19,13 @@ import static com.carrotsearch.randomizedtesting.RandomizedTest.randomIntBetween; import java.io.IOException; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; import org.apache.lucene.document.TextField; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java b/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java index 3a4d5c8455f..c029633403d 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java @@ -32,6 +32,7 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java b/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java index 4f70ddc7488..eb78e838f1d 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java @@ -22,9 +22,6 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.CachingTokenFilter; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenFilter; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -34,6 +31,9 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenFilter; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTerms.java b/lucene/core/src/test/org/apache/lucene/index/TestTerms.java index 38d4bec5b15..634d963097f 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTerms.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTerms.java @@ -16,11 +16,11 @@ */ package org.apache.lucene.index; -import org.apache.lucene.analysis.CannedBinaryTokenStream; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.TextField; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.CannedBinaryTokenStream; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java b/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java index 0a84ef03407..09035a806f7 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java @@ -28,12 +28,12 @@ import java.util.Random; import java.util.Set; import java.util.TreeSet; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.NumericDocValuesField; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java b/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java index cc0985ad19e..1d1d692a2fa 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java @@ -23,8 +23,6 @@ import java.util.List; import java.util.SortedSet; import java.util.TreeSet; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.TermsEnum.SeekStatus; @@ -32,6 +30,8 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestThreadedForceMerge.java b/lucene/core/src/test/org/apache/lucene/index/TestThreadedForceMerge.java index f9de548c56a..f2fd56eabcd 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestThreadedForceMerge.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestThreadedForceMerge.java @@ -18,13 +18,13 @@ import java.util.Random; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.FieldType; import org.apache.lucene.document.StringField; import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.English; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.BeforeClass; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java index 069246ab3cb..e1c8e3f6017 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java @@ -24,13 +24,13 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.StoredField; import org.apache.lucene.index.MergePolicy.MergeSpecification; import org.apache.lucene.index.MergePolicy.OneMerge; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.Version; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java b/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java index 228054d9c6a..1efae1a6fab 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java @@ -23,10 +23,10 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.Bits; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTransactions.java b/lucene/core/src/test/org/apache/lucene/index/TestTransactions.java index db6c06e4315..fd3905c4152 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTransactions.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTransactions.java @@ -17,13 +17,13 @@ package org.apache.lucene.index; import java.io.IOException; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; import org.apache.lucene.document.StringField; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.English; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTryDelete.java b/lucene/core/src/test/org/apache/lucene/index/TestTryDelete.java index 8d1019a9a1c..78d00a1eec4 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTryDelete.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTryDelete.java @@ -17,7 +17,6 @@ package org.apache.lucene.index; import java.io.IOException; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field.Store; import org.apache.lucene.document.StringField; @@ -30,6 +29,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; public class TestTryDelete extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java b/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java index dc4b66bd302..68eaf795c8d 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java @@ -18,14 +18,14 @@ import java.util.ArrayList; import java.util.HashSet; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.search.CollectionStatistics; import org.apache.lucene.search.TermStatistics; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBaseRangeFilter.java b/lucene/core/src/test/org/apache/lucene/search/TestBaseRangeFilter.java index 023ab561dae..c01e4404943 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBaseRangeFilter.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBaseRangeFilter.java @@ -18,7 +18,6 @@ import java.io.IOException; import java.util.Random; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.DoublePoint; import org.apache.lucene.document.Field; @@ -31,6 +30,7 @@ import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java b/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java index fa600bc8720..d572f1b5564 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java @@ -19,7 +19,6 @@ import java.io.IOException; import java.util.Collections; import java.util.Random; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; @@ -33,6 +32,7 @@ import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java b/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java index 71a615f8c15..2ebcc1c38be 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java @@ -23,13 +23,13 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java index 84058ad599e..8cfdb0adc98 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java @@ -27,7 +27,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.TextField; @@ -41,6 +40,7 @@ import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java b/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java index 1a2b3434ae1..5e8691c8cdd 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java @@ -24,7 +24,6 @@ import java.util.Map; import java.util.Set; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field.Store; import org.apache.lucene.document.TextField; @@ -38,6 +37,7 @@ import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.search.ScorerIndexSearcher; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestConjunctions.java b/lucene/core/src/test/org/apache/lucene/search/TestConjunctions.java index 73ed5aec3e8..14cf2d1a580 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestConjunctions.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestConjunctions.java @@ -21,7 +21,6 @@ import java.util.HashSet; import java.util.Set; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.Field.Store; @@ -36,6 +35,7 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreScorer.java b/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreScorer.java index 0bd4c9b448e..bb95906f9a8 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreScorer.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreScorer.java @@ -23,7 +23,6 @@ import java.io.IOException; import java.util.List; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.DirectoryReader; @@ -33,6 +32,7 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; public class TestConstantScoreScorer extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestControlledRealTimeReopenThread.java b/lucene/core/src/test/org/apache/lucene/search/TestControlledRealTimeReopenThread.java index d1e9e7009fc..1df4a5a85f4 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestControlledRealTimeReopenThread.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestControlledRealTimeReopenThread.java @@ -22,7 +22,6 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.TextField; @@ -40,6 +39,7 @@ import org.apache.lucene.index.ThreadedIndexingAndSearchingTestCase; import org.apache.lucene.store.Directory; import org.apache.lucene.store.NRTCachingDirectory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; import org.apache.lucene.util.IOUtils; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java index b892ad5ff8d..ecd28421fc1 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java @@ -25,7 +25,6 @@ import java.util.Collections; import java.util.List; import java.util.Locale; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -42,6 +41,7 @@ import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestDocValuesRewriteMethod.java b/lucene/core/src/test/org/apache/lucene/search/TestDocValuesRewriteMethod.java index 51a7cf3f443..40d93f9f9cc 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestDocValuesRewriteMethod.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestDocValuesRewriteMethod.java @@ -20,8 +20,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.SortedSetDocValuesField; @@ -29,6 +27,8 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestElevationComparator.java b/lucene/core/src/test/org/apache/lucene/search/TestElevationComparator.java index 05c16c1f4d0..2cb8e3a6477 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestElevationComparator.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestElevationComparator.java @@ -19,7 +19,6 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.SortedDocValuesField; @@ -34,6 +33,7 @@ import org.apache.lucene.search.similarities.BM25Similarity; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java index c45a069553e..a67c0635b44 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java @@ -25,8 +25,6 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Supplier; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.StringField; @@ -38,6 +36,8 @@ import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestFuzzyTermOnShortTerms.java b/lucene/core/src/test/org/apache/lucene/search/TestFuzzyTermOnShortTerms.java index 78e76b3c2cb..44315fe2b7d 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestFuzzyTermOnShortTerms.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestFuzzyTermOnShortTerms.java @@ -18,7 +18,6 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -27,6 +26,7 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.junit.Test; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestIndriAndQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestIndriAndQuery.java index 1f7f1f88276..e09530af30d 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestIndriAndQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestIndriAndQuery.java @@ -17,9 +17,6 @@ package org.apache.lucene.search; import java.util.Arrays; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenFilter; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.TextField; @@ -30,6 +27,9 @@ import org.apache.lucene.search.similarities.IndriDirichletSimilarity; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenFilter; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; public class TestIndriAndQuery extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestLiveFieldValues.java b/lucene/core/src/test/org/apache/lucene/search/TestLiveFieldValues.java index af5f6203c39..03f3770ab35 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestLiveFieldValues.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestLiveFieldValues.java @@ -25,7 +25,6 @@ import java.util.Map; import java.util.Random; import java.util.concurrent.CountDownLatch; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.StoredField; @@ -34,6 +33,7 @@ import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java index cd15a071448..5963af7aef1 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java @@ -18,7 +18,6 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.DirectoryReader; @@ -26,6 +25,7 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; /** Tests MatchAllDocsQuery. */ diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMatchNoDocsQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestMatchNoDocsQuery.java index aae21c099ce..d8e558b450e 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestMatchNoDocsQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestMatchNoDocsQuery.java @@ -18,7 +18,6 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.DirectoryReader; @@ -26,6 +25,7 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java index ad244ae895a..157de2ca796 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java @@ -18,8 +18,6 @@ import java.io.IOException; import java.util.LinkedList; -import org.apache.lucene.analysis.CannedTokenStream; -import org.apache.lucene.analysis.Token; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.TextField; @@ -33,6 +31,8 @@ import org.apache.lucene.index.TermsEnum; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.Token; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.junit.Ignore; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java b/lucene/core/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java index 5fb0d94abe4..4ff014e82ed 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java @@ -17,8 +17,6 @@ package org.apache.lucene.search; import java.io.IOException; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; @@ -27,6 +25,8 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.search.QueryUtils; import org.junit.AfterClass; import org.junit.Assert; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java b/lucene/core/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java index 3ea33e39029..5e1a684a9e7 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java @@ -17,7 +17,6 @@ package org.apache.lucene.search; import java.io.IOException; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.DirectoryReader; @@ -29,6 +28,7 @@ import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.AttributeSource; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java b/lucene/core/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java index ec91ac103bf..91403717d97 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java @@ -17,7 +17,6 @@ package org.apache.lucene.search; import java.io.IOException; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.*; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.Fields; @@ -26,6 +25,7 @@ import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.English; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java index c6b624a3ece..c723ec0a734 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java @@ -25,11 +25,6 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CannedTokenStream; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenFilter; -import org.apache.lucene.analysis.MockTokenizer; -import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.document.Document; @@ -50,6 +45,11 @@ import org.apache.lucene.search.similarities.BM25Similarity; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenFilter; +import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.analysis.Token; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestPointQueries.java b/lucene/core/src/test/org/apache/lucene/search/TestPointQueries.java index 345a17e0d82..7b311dbb0e4 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestPointQueries.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestPointQueries.java @@ -30,7 +30,6 @@ import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.FilterCodec; import org.apache.lucene.codecs.PointsFormat; @@ -61,6 +60,7 @@ import org.apache.lucene.index.SegmentWriteState; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java b/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java index dc9acd9dcfd..a5f956631d1 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java @@ -17,8 +17,6 @@ package org.apache.lucene.search; import java.io.IOException; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.FilteredTermsEnum; @@ -28,6 +26,8 @@ import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java b/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java index 740bd2d4696..51dc53f57a1 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java @@ -20,7 +20,6 @@ import java.text.DecimalFormatSymbols; import java.text.NumberFormat; import java.util.Locale; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; @@ -29,6 +28,7 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java b/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java index 8fb012ab1fc..03e847312fa 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java @@ -20,8 +20,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.SortedDocValuesField; @@ -32,6 +30,8 @@ import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSameScoresWithThreads.java b/lucene/core/src/test/org/apache/lucene/search/TestSameScoresWithThreads.java index 258de52c29d..15cb1201b2c 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSameScoresWithThreads.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSameScoresWithThreads.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.CountDownLatch; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; @@ -32,6 +31,7 @@ import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestScorerPerf.java b/lucene/core/src/test/org/apache/lucene/search/TestScorerPerf.java index f54fca5d68b..03a5e27a033 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestScorerPerf.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestScorerPerf.java @@ -18,7 +18,6 @@ import java.io.IOException; import java.util.BitSet; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.DirectoryReader; @@ -27,6 +26,7 @@ import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BitSetIterator; import org.apache.lucene.util.FixedBitSet; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java b/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java index e403f9e3a85..472cb82aa7d 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java @@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.ConcurrentMergeScheduler; @@ -43,6 +42,7 @@ import org.apache.lucene.index.ThreadedIndexingAndSearchingTestCase; import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSimilarity.java b/lucene/core/src/test/org/apache/lucene/search/TestSimilarity.java index 8a38b4066da..46a7a88afa1 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSimilarity.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSimilarity.java @@ -17,7 +17,6 @@ package org.apache.lucene.search; import java.io.IOException; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; @@ -26,6 +25,7 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; /** Similarity unit test. */ diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java b/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java index 59515adfb7f..581bef1087f 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java @@ -16,7 +16,6 @@ */ package org.apache.lucene.search; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.DirectoryReader; @@ -29,6 +28,7 @@ import org.apache.lucene.search.similarities.PerFieldSimilarityWrapper; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; public class TestSimilarityProvider extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java index 1493212814d..401b1686265 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java @@ -17,8 +17,6 @@ package org.apache.lucene.search; import java.io.IOException; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; @@ -28,6 +26,8 @@ import org.apache.lucene.index.Term; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.search.AssertingScorable; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.store.MockDirectoryWrapper; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java b/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java index f4b69dc82b2..9c3ae26b059 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java @@ -23,7 +23,6 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.FieldInvertState; @@ -34,6 +33,7 @@ import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.search.AssertingScorable; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.AfterClass; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java index 5169a0c2eeb..6cde85a5b55 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java @@ -19,8 +19,6 @@ import java.io.IOException; import java.util.Set; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.document.Document; @@ -30,6 +28,8 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; public class TestTermRangeQuery extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java b/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java index eeab9e560d5..741ccf00e00 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java @@ -19,7 +19,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.Field.Store; @@ -36,6 +35,7 @@ import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java b/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java index f4225d3ec04..3d4b5b99760 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java @@ -18,7 +18,6 @@ import java.io.IOException; import java.util.BitSet; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; @@ -28,6 +27,7 @@ import org.apache.lucene.search.TimeLimitingCollector.TimeExceededException; import org.apache.lucene.search.TimeLimitingCollector.TimerThread; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressSysoutChecks; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollectorEarlyTermination.java b/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollectorEarlyTermination.java index d0419fb9c3a..237d2286129 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollectorEarlyTermination.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollectorEarlyTermination.java @@ -23,7 +23,6 @@ import java.util.List; import java.util.Random; import java.util.Set; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field.Store; import org.apache.lucene.document.NumericDocValuesField; @@ -36,6 +35,7 @@ import org.apache.lucene.index.SerialMergeScheduler; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestWildcard.java b/lucene/core/src/test/org/apache/lucene/search/TestWildcard.java index 3ecf962fd01..711c12e5381 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestWildcard.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestWildcard.java @@ -17,7 +17,6 @@ package org.apache.lucene.search; import java.io.IOException; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.DirectoryReader; @@ -27,6 +26,7 @@ import org.apache.lucene.index.Term; import org.apache.lucene.index.Terms; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; /** TestWildcard tests the '*' and '?' wildcard characters. */ diff --git a/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java b/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java index 51d2a036295..191811171ff 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java @@ -20,13 +20,13 @@ import java.text.DecimalFormatSymbols; import java.text.NumberFormat; import java.util.Locale; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/store/TestByteBuffersDirectory.java b/lucene/core/src/test/org/apache/lucene/store/TestByteBuffersDirectory.java index 1e0449c4749..87cfee6e7c4 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestByteBuffersDirectory.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestByteBuffersDirectory.java @@ -22,12 +22,12 @@ import java.nio.file.Path; import java.util.Arrays; import java.util.function.Supplier; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.IndexWriterConfig.OpenMode; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.BaseDirectoryTestCase; import org.apache.lucene.tests.util.English; import org.junit.Test; diff --git a/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java b/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java index 3c12277d8f7..e09d71c3098 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java @@ -26,7 +26,6 @@ import java.util.HashSet; import java.util.Set; import java.util.function.Function; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.lucene90.compressing.Lucene90CompressingStoredFieldsWriter; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexNotFoundException; @@ -34,6 +33,7 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.TestIndexWriterReader; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.mockfile.FilterPath; import org.apache.lucene.tests.mockfile.WindowsFS; import org.apache.lucene.tests.store.BaseDirectoryTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/store/TestLockFactory.java b/lucene/core/src/test/org/apache/lucene/store/TestLockFactory.java index 1f81d0824f2..518c8369a52 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestLockFactory.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestLockFactory.java @@ -20,12 +20,12 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.IndexWriterConfig.OpenMode; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java b/lucene/core/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java index d51108f4cc0..2bd82bf9e78 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java @@ -21,7 +21,6 @@ import java.util.ArrayList; import java.util.List; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexWriter; @@ -30,6 +29,7 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.TermQuery; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.BaseDirectoryTestCase; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/store/TestSingleInstanceLockFactory.java b/lucene/core/src/test/org/apache/lucene/store/TestSingleInstanceLockFactory.java index bc2fe2d7c29..72526d097e5 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestSingleInstanceLockFactory.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestSingleInstanceLockFactory.java @@ -18,10 +18,10 @@ import java.io.IOException; import java.nio.file.Path; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.IndexWriterConfig.OpenMode; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.BaseLockFactoryTestCase; /** Simple tests for SingleInstanceLockFactory */ diff --git a/lucene/core/src/test/org/apache/lucene/util/TestAttributeSource.java b/lucene/core/src/test/org/apache/lucene/util/TestAttributeSource.java index 6b2f43441a3..ea403e1fd9f 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestAttributeSource.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestAttributeSource.java @@ -19,9 +19,9 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.*; +import org.apache.lucene.tests.analysis.Token; import org.apache.lucene.tests.util.LuceneTestCase; public class TestAttributeSource extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestQueryBuilder.java b/lucene/core/src/test/org/apache/lucene/util/TestQueryBuilder.java index 259f675c454..2ea575d5274 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestQueryBuilder.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestQueryBuilder.java @@ -19,10 +19,6 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.AnalyzerWrapper; -import org.apache.lucene.analysis.CannedBinaryTokenStream; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockSynonymFilter; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; @@ -39,6 +35,10 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.SynonymQuery; import org.apache.lucene.search.TermQuery; +import org.apache.lucene.tests.analysis.CannedBinaryTokenStream; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockSynonymFilter; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.automaton.CharacterRunAutomaton; import org.apache.lucene.util.automaton.RegExp; diff --git a/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java b/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java index cbc883405f4..854a4639227 100644 --- a/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java +++ b/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java @@ -41,7 +41,6 @@ import java.util.TreeMap; import java.util.TreeSet; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.DirectoryReader; @@ -60,6 +59,7 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/util/graph/TestGraphTokenStreamFiniteStrings.java b/lucene/core/src/test/org/apache/lucene/util/graph/TestGraphTokenStreamFiniteStrings.java index 11da16ccf61..e68b892d01c 100644 --- a/lucene/core/src/test/org/apache/lucene/util/graph/TestGraphTokenStreamFiniteStrings.java +++ b/lucene/core/src/test/org/apache/lucene/util/graph/TestGraphTokenStreamFiniteStrings.java @@ -17,13 +17,13 @@ package org.apache.lucene.util.graph; import java.util.Iterator; -import org.apache.lucene.analysis.CannedTokenStream; -import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; import org.apache.lucene.analysis.tokenattributes.PositionLengthAttribute; import org.apache.lucene.index.Term; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.Token; import org.apache.lucene.tests.util.LuceneTestCase; /** {@link GraphTokenStreamFiniteStrings} tests. */ diff --git a/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionValueSource.java b/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionValueSource.java index ab3ab715ff5..2eb454d510b 100644 --- a/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionValueSource.java +++ b/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionValueSource.java @@ -17,7 +17,6 @@ package org.apache.lucene.expressions; import java.io.IOException; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.NumericDocValuesField; @@ -30,6 +29,7 @@ import org.apache.lucene.search.DoubleValuesSource; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; public class TestExpressionValueSource extends LuceneTestCase { diff --git a/lucene/facet/src/test/org/apache/lucene/facet/TestDrillDownQuery.java b/lucene/facet/src/test/org/apache/lucene/facet/TestDrillDownQuery.java index 63ba26d3859..83f83f5c877 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/TestDrillDownQuery.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/TestDrillDownQuery.java @@ -19,8 +19,6 @@ import java.io.IOException; import java.util.Arrays; import java.util.Random; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.TextField; @@ -38,6 +36,8 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.util.IOUtils; import org.junit.AfterClass; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/TestDrillSideways.java b/lucene/facet/src/test/org/apache/lucene/facet/TestDrillSideways.java index 12ea12afcd0..bfbb71babe1 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/TestDrillSideways.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/TestDrillSideways.java @@ -30,7 +30,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.stream.Collectors; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.SortedDocValuesField; @@ -75,6 +74,7 @@ import org.apache.lucene.search.TwoPhaseIterator; import org.apache.lucene.search.Weight; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/TestFacetQuery.java b/lucene/facet/src/test/org/apache/lucene/facet/TestFacetQuery.java index 6da83b93e33..d1906cd7757 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/TestFacetQuery.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/TestFacetQuery.java @@ -17,8 +17,6 @@ package org.apache.lucene.facet; import java.io.IOException; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.TextField; @@ -29,6 +27,8 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.util.IOUtils; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/TestFacetsConfig.java b/lucene/facet/src/test/org/apache/lucene/facet/TestFacetsConfig.java index f53d538b78b..c9aafbb67a5 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/TestFacetsConfig.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/TestFacetsConfig.java @@ -17,7 +17,6 @@ package org.apache.lucene.facet; import java.util.Arrays; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader; import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter; @@ -26,6 +25,7 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/TestMultipleIndexFields.java b/lucene/facet/src/test/org/apache/lucene/facet/TestMultipleIndexFields.java index 759b53646de..422520c6db7 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/TestMultipleIndexFields.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/TestMultipleIndexFields.java @@ -19,8 +19,6 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.TextField; @@ -36,6 +34,8 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.util.IOUtils; import org.junit.Test; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestSearcherTaxonomyManager.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestSearcherTaxonomyManager.java index ca79ce0829b..3f4c7adeec3 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestSearcherTaxonomyManager.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestSearcherTaxonomyManager.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.facet.FacetField; import org.apache.lucene.facet.FacetResult; @@ -40,6 +39,7 @@ import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.ReferenceManager; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts.java index 08b956c9acc..a503fbfcf16 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts.java @@ -26,7 +26,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.StringField; @@ -54,6 +53,7 @@ import org.apache.lucene.search.similarities.PerFieldSimilarityWrapper; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts2.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts2.java index 8642a347bcb..0b94272c46a 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts2.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts2.java @@ -24,7 +24,6 @@ import java.util.List; import java.util.Map; import java.util.Random; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field.Store; import org.apache.lucene.document.StringField; @@ -46,6 +45,7 @@ import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.util.IOUtils; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetSumValueSource.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetSumValueSource.java index 8f0e1fd88ab..7699fa7c962 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetSumValueSource.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetSumValueSource.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FloatDocValuesField; @@ -51,6 +50,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyReader.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyReader.java index cff8dc24a30..b5d16362534 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyReader.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyReader.java @@ -23,7 +23,6 @@ import java.util.HashSet; import java.util.Random; import java.util.Set; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.facet.FacetTestCase; import org.apache.lucene.facet.taxonomy.FacetLabel; import org.apache.lucene.facet.taxonomy.TaxonomyReader; @@ -37,6 +36,7 @@ import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.util.IOUtils; import org.junit.Test; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyWriter.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyWriter.java index 0893e1c3c8d..13115864eb9 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyWriter.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyWriter.java @@ -23,7 +23,6 @@ import java.util.Random; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.facet.DrillDownQuery; import org.apache.lucene.facet.FacetField; @@ -44,6 +43,7 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; import org.junit.Test; diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/AbstractGroupingTestCase.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/AbstractGroupingTestCase.java index 8537d1d2642..e51df3d788c 100644 --- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/AbstractGroupingTestCase.java +++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/AbstractGroupingTestCase.java @@ -18,11 +18,11 @@ import java.io.Closeable; import java.io.IOException; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestAllGroupHeadsCollector.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestAllGroupHeadsCollector.java index 841a9ff1132..15e98cfe776 100644 --- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestAllGroupHeadsCollector.java +++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestAllGroupHeadsCollector.java @@ -27,7 +27,6 @@ import java.util.Locale; import java.util.Map; import java.util.Set; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.BinaryDocValuesField; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -49,6 +48,7 @@ import org.apache.lucene.search.SortField; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestAllGroupsCollector.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestAllGroupsCollector.java index 300a11055da..beecbbfd836 100644 --- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestAllGroupsCollector.java +++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestAllGroupsCollector.java @@ -17,7 +17,6 @@ package org.apache.lucene.search.grouping; import java.util.HashMap; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; @@ -30,6 +29,7 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestDistinctValuesCollector.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestDistinctValuesCollector.java index d8fe9e60bad..f677bdd96d6 100644 --- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestDistinctValuesCollector.java +++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestDistinctValuesCollector.java @@ -29,7 +29,6 @@ import java.util.Map; import java.util.Random; import java.util.Set; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.SortedDocValuesField; @@ -44,6 +43,7 @@ import org.apache.lucene.search.SortField; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.mutable.MutableValue; import org.apache.lucene.util.mutable.MutableValueStr; diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGroupFacetCollector.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGroupFacetCollector.java index 688868d1ef4..3bfb5adf801 100644 --- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGroupFacetCollector.java +++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGroupFacetCollector.java @@ -29,7 +29,6 @@ import java.util.Random; import java.util.Set; import java.util.TreeSet; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; @@ -44,6 +43,7 @@ import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java index 47f6b06321b..504e413ac51 100644 --- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java +++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java @@ -27,7 +27,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; @@ -61,6 +60,7 @@ import org.apache.lucene.search.Weight; import org.apache.lucene.search.similarities.BM25Similarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGroupingSearch.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGroupingSearch.java index ea404c757d7..0f6755517f7 100644 --- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGroupingSearch.java +++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGroupingSearch.java @@ -19,7 +19,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; @@ -36,6 +35,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.similarities.BM25Similarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.mutable.MutableValueStr; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestHighlighter.java b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestHighlighter.java index 9839d38834e..895a7044cb6 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestHighlighter.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestHighlighter.java @@ -30,14 +30,7 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CachingTokenFilter; -import org.apache.lucene.analysis.CannedTokenStream; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockPayloadAnalyzer; -import org.apache.lucene.analysis.MockTokenFilter; -import org.apache.lucene.analysis.MockTokenizer; -import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.ngram.NGramTokenizer; @@ -88,6 +81,13 @@ import org.apache.lucene.search.WildcardQuery; import org.apache.lucene.search.highlight.SynonymTokenizer.TestHighlightRunner; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockPayloadAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenFilter; +import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.analysis.Token; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.automaton.Automata; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestHighlighterPhrase.java b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestHighlighterPhrase.java index 4b0e012442a..1734296ac7b 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestHighlighterPhrase.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestHighlighterPhrase.java @@ -17,10 +17,6 @@ package org.apache.lucene.search.highlight; import java.io.IOException; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenFilter; -import org.apache.lucene.analysis.MockTokenizer; -import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; @@ -46,6 +42,10 @@ import org.apache.lucene.search.SimpleCollector; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenFilter; +import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.analysis.Token; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.FixedBitSet; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestMisses.java b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestMisses.java index da7ff555990..f61c4140c67 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestMisses.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestMisses.java @@ -18,8 +18,6 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.index.Term; import org.apache.lucene.queries.spans.SpanNearQuery; import org.apache.lucene.queries.spans.SpanQuery; @@ -29,6 +27,8 @@ import org.apache.lucene.search.PhraseQuery; import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; public class TestMisses extends LuceneTestCase { diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestOffsetLimitTokenFilter.java b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestOffsetLimitTokenFilter.java index aee0ccd78f8..ab0471cc63e 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestOffsetLimitTokenFilter.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestOffsetLimitTokenFilter.java @@ -18,6 +18,8 @@ import java.io.StringReader; import org.apache.lucene.analysis.*; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; public class TestOffsetLimitTokenFilter extends BaseTokenStreamTestCase { diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestTokenSources.java b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestTokenSources.java index 8a4ecfcc785..c0c7bdc7e10 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestTokenSources.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestTokenSources.java @@ -19,10 +19,6 @@ import com.carrotsearch.randomizedtesting.annotations.Repeat; import java.io.IOException; import java.util.Arrays; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.CannedTokenStream; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; @@ -47,6 +43,10 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.Token; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/custom/TestHighlightCustomQuery.java b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/custom/TestHighlightCustomQuery.java index 5fc4bc77bec..97e0baf6e91 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/custom/TestHighlightCustomQuery.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/custom/TestHighlightCustomQuery.java @@ -20,10 +20,6 @@ import java.util.Collections; import java.util.Map; import java.util.Objects; -import org.apache.lucene.analysis.CannedTokenStream; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenFilter; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.Term; @@ -38,6 +34,10 @@ import org.apache.lucene.search.highlight.SimpleHTMLFormatter; import org.apache.lucene.search.highlight.WeightedSpanTerm; import org.apache.lucene.search.highlight.WeightedSpanTermExtractor; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenFilter; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; /** diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestLengthGoalBreakIterator.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestLengthGoalBreakIterator.java index aba37b2e56f..e369b96ad5e 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestLengthGoalBreakIterator.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestLengthGoalBreakIterator.java @@ -20,9 +20,9 @@ import java.io.IOException; import java.text.BreakIterator; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.search.Query; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.QueryBuilder; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighter.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighter.java index 3991236648d..381a1c545a9 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighter.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighter.java @@ -30,8 +30,6 @@ import java.util.Set; import java.util.function.Predicate; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; @@ -56,6 +54,8 @@ import org.apache.lucene.search.Weight; import org.apache.lucene.search.uhighlight.UnifiedHighlighter.HighlightFlag; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.After; import org.junit.Before; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterMTQ.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterMTQ.java index 9b70a435b31..b1003f17638 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterMTQ.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterMTQ.java @@ -24,8 +24,6 @@ import java.util.EnumSet; import java.util.Objects; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordAnalyzer; @@ -64,6 +62,8 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.WildcardQuery; import org.apache.lucene.search.uhighlight.UnifiedHighlighter.HighlightFlag; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterRanking.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterRanking.java index 4b4d6a16ad7..e0bbc4b16ba 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterRanking.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterRanking.java @@ -22,8 +22,6 @@ import java.util.Random; import java.util.Set; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; @@ -40,6 +38,8 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterReanalysis.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterReanalysis.java index 2ede77d70a9..4895f855200 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterReanalysis.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterReanalysis.java @@ -17,8 +17,6 @@ package org.apache.lucene.search.uhighlight; import java.io.IOException; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; @@ -28,6 +26,8 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterStrictPhrases.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterStrictPhrases.java index b4fadf6d97c..5463ded8153 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterStrictPhrases.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterStrictPhrases.java @@ -24,8 +24,6 @@ import java.util.Locale; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; @@ -57,6 +55,8 @@ import org.apache.lucene.search.WildcardQuery; import org.apache.lucene.search.uhighlight.UnifiedHighlighter.HighlightFlag; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.QueryBuilder; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermIntervals.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermIntervals.java index 5bdef44b501..6448f4e59b0 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermIntervals.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermIntervals.java @@ -30,8 +30,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; @@ -50,6 +48,8 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.uhighlight.UnifiedHighlighter.HighlightFlag; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.After; import org.junit.Before; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermVec.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermVec.java index 1f93da57d1c..07abeec64f8 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermVec.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermVec.java @@ -25,8 +25,6 @@ import java.util.Map; import java.util.Set; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; @@ -47,6 +45,8 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.After; import org.junit.Before; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/visibility/TestUnifiedHighlighterExtensibility.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/visibility/TestUnifiedHighlighterExtensibility.java index 74462ad4a96..4bb9426ccf6 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/visibility/TestUnifiedHighlighterExtensibility.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/visibility/TestUnifiedHighlighterExtensibility.java @@ -25,7 +25,6 @@ import java.util.Set; import java.util.function.Predicate; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.Term; import org.apache.lucene.queries.spans.SpanQuery; @@ -44,6 +43,7 @@ import org.apache.lucene.search.uhighlight.SplittingBreakIterator; import org.apache.lucene.search.uhighlight.UHComponents; import org.apache.lucene.search.uhighlight.UnifiedHighlighter; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.junit.Test; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java index d5b0d0f57b0..8542a45aab7 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java @@ -41,6 +41,8 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestFastVectorHighlighter.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestFastVectorHighlighter.java index 91c0ba1d4d9..81e8cef9208 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestFastVectorHighlighter.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestFastVectorHighlighter.java @@ -22,12 +22,7 @@ import java.util.Set; import java.util.TreeMap; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CannedTokenStream; import org.apache.lucene.analysis.DelegatingAnalyzerWrapper; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenFilter; -import org.apache.lucene.analysis.MockTokenizer; -import org.apache.lucene.analysis.Token; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; @@ -53,6 +48,11 @@ import org.apache.lucene.search.highlight.DefaultEncoder; import org.apache.lucene.search.highlight.Encoder; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenFilter; +import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.analysis.Token; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.automaton.CharacterRunAutomaton; import org.apache.lucene.util.automaton.RegExp; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestIndexTimeSynonym.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestIndexTimeSynonym.java index a3a2c964fb2..cc91f77453e 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestIndexTimeSynonym.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestIndexTimeSynonym.java @@ -22,6 +22,7 @@ import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.vectorhighlight.FieldTermStack.TermInfo; +import org.apache.lucene.tests.analysis.Token; import org.apache.lucene.util.AttributeImpl; public class TestIndexTimeSynonym extends AbstractTestCase { diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestSimpleFragmentsBuilder.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestSimpleFragmentsBuilder.java index e24e03021ae..c5943ca9396 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestSimpleFragmentsBuilder.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestSimpleFragmentsBuilder.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; @@ -40,6 +39,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.highlight.SimpleHTMLEncoder; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.TestUtil; public class TestSimpleFragmentsBuilder extends AbstractTestCase { diff --git a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java index 5698d7d0f69..16fc91bf33d 100644 --- a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java +++ b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java @@ -27,7 +27,6 @@ import java.util.TreeMap; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.Field.Store; @@ -55,6 +54,7 @@ import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.search.similarities.SimilarityBase; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.search.RandomApproximationQuery; diff --git a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinSorting.java b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinSorting.java index 3b9480da86c..2880138753b 100644 --- a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinSorting.java +++ b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinSorting.java @@ -19,7 +19,6 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Supplier; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.SortedDocValuesField; @@ -35,6 +34,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopFieldDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.junit.Test; diff --git a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinValidation.java b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinValidation.java index 72b35b3031c..f943ff544de 100644 --- a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinValidation.java +++ b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinValidation.java @@ -18,7 +18,6 @@ import java.util.ArrayList; import java.util.List; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.DirectoryReader; @@ -37,6 +36,7 @@ import org.apache.lucene.search.Weight; import org.apache.lucene.search.WildcardQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; diff --git a/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java b/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java index 5cd6c63d1e3..d6df796fc13 100644 --- a/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java +++ b/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java @@ -33,8 +33,6 @@ import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.DoubleDocValuesField; import org.apache.lucene.document.DoublePoint; @@ -68,6 +66,8 @@ import org.apache.lucene.index.TermsEnum; import org.apache.lucene.search.*; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BitSet; diff --git a/lucene/luke/src/test/org/apache/lucene/luke/models/commits/TestCommitsImpl.java b/lucene/luke/src/test/org/apache/lucene/luke/models/commits/TestCommitsImpl.java index 6e662f7d3d7..9f8c51d5b76 100644 --- a/lucene/luke/src/test/org/apache/lucene/luke/models/commits/TestCommitsImpl.java +++ b/lucene/luke/src/test/org/apache/lucene/luke/models/commits/TestCommitsImpl.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import java.util.Optional; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.Codec; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -31,6 +30,7 @@ import org.apache.lucene.index.NoDeletionPolicy; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.junit.After; diff --git a/lucene/luke/src/test/org/apache/lucene/luke/models/documents/TestDocValuesAdapter.java b/lucene/luke/src/test/org/apache/lucene/luke/models/documents/TestDocValuesAdapter.java index 75ce9945ea2..2d20e8fee6a 100644 --- a/lucene/luke/src/test/org/apache/lucene/luke/models/documents/TestDocValuesAdapter.java +++ b/lucene/luke/src/test/org/apache/lucene/luke/models/documents/TestDocValuesAdapter.java @@ -19,7 +19,6 @@ import java.io.IOException; import java.util.Collections; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.BinaryDocValuesField; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -30,6 +29,7 @@ import org.apache.lucene.index.DocValuesType; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.util.BytesRef; import org.junit.Test; diff --git a/lucene/luke/src/test/org/apache/lucene/luke/models/overview/OverviewTestBase.java b/lucene/luke/src/test/org/apache/lucene/luke/models/overview/OverviewTestBase.java index f51669a6a7e..079cf33b5a1 100644 --- a/lucene/luke/src/test/org/apache/lucene/luke/models/overview/OverviewTestBase.java +++ b/lucene/luke/src/test/org/apache/lucene/luke/models/overview/OverviewTestBase.java @@ -21,7 +21,6 @@ import java.nio.file.Path; import java.util.HashMap; import java.util.Map; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.TextField; @@ -31,6 +30,7 @@ import org.apache.lucene.index.NoMergePolicy; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.After; import org.junit.Before; diff --git a/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndex.java b/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndex.java index 90cc8ecd3fd..f241693c6bf 100644 --- a/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndex.java +++ b/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndex.java @@ -28,8 +28,6 @@ import java.util.function.Function; import java.util.stream.LongStream; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockPayloadAnalyzer; import org.apache.lucene.document.BinaryDocValuesField; import org.apache.lucene.document.BinaryPoint; import org.apache.lucene.document.Document; @@ -71,6 +69,8 @@ import org.apache.lucene.search.similarities.BM25Similarity; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.search.similarities.Similarity; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockPayloadAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndexAgainstDirectory.java b/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndexAgainstDirectory.java index 2ab8cc6f7ed..21635d2f155 100644 --- a/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndexAgainstDirectory.java +++ b/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndexAgainstDirectory.java @@ -29,12 +29,6 @@ import java.util.Set; import java.util.function.Supplier; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.CannedTokenStream; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenFilter; -import org.apache.lucene.analysis.MockTokenizer; -import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; @@ -67,6 +61,12 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenFilter; +import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.analysis.Token; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java b/lucene/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java index 7a617be4306..0bfbfa52149 100644 --- a/lucene/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java +++ b/lucene/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java @@ -17,14 +17,14 @@ package org.apache.lucene.misc; import java.util.Random; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.junit.AfterClass; diff --git a/lucene/misc/src/test/org/apache/lucene/misc/document/TestLazyDocument.java b/lucene/misc/src/test/org/apache/lucene/misc/document/TestLazyDocument.java index c4ca01afed3..9159ad17e09 100644 --- a/lucene/misc/src/test/org/apache/lucene/misc/document/TestLazyDocument.java +++ b/lucene/misc/src/test/org/apache/lucene/misc/document/TestLazyDocument.java @@ -31,6 +31,7 @@ import org.apache.lucene.index.*; import org.apache.lucene.search.*; import org.apache.lucene.store.*; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.After; import org.junit.Before; diff --git a/lucene/misc/src/test/org/apache/lucene/misc/index/TestIndexSplitter.java b/lucene/misc/src/test/org/apache/lucene/misc/index/TestIndexSplitter.java index d35d4b45f0c..4c963c93563 100644 --- a/lucene/misc/src/test/org/apache/lucene/misc/index/TestIndexSplitter.java +++ b/lucene/misc/src/test/org/apache/lucene/misc/index/TestIndexSplitter.java @@ -17,7 +17,6 @@ package org.apache.lucene.misc.index; import java.nio.file.Path; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.DocHelper; @@ -28,6 +27,7 @@ import org.apache.lucene.index.MergePolicy; import org.apache.lucene.index.SegmentInfos; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/misc/src/test/org/apache/lucene/misc/index/TestMultiPassIndexSplitter.java b/lucene/misc/src/test/org/apache/lucene/misc/index/TestMultiPassIndexSplitter.java index 156cbf51156..4615ad65a35 100644 --- a/lucene/misc/src/test/org/apache/lucene/misc/index/TestMultiPassIndexSplitter.java +++ b/lucene/misc/src/test/org/apache/lucene/misc/index/TestMultiPassIndexSplitter.java @@ -16,7 +16,6 @@ */ package org.apache.lucene.misc.index; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.DirectoryReader; @@ -27,6 +26,7 @@ import org.apache.lucene.index.Term; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/misc/src/test/org/apache/lucene/misc/index/TestPKIndexSplitter.java b/lucene/misc/src/test/org/apache/lucene/misc/index/TestPKIndexSplitter.java index 8b2b92d44fb..27cf25898af 100644 --- a/lucene/misc/src/test/org/apache/lucene/misc/index/TestPKIndexSplitter.java +++ b/lucene/misc/src/test/org/apache/lucene/misc/index/TestPKIndexSplitter.java @@ -20,8 +20,6 @@ import java.text.DecimalFormatSymbols; import java.text.NumberFormat; import java.util.Locale; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.DirectoryReader; @@ -32,6 +30,8 @@ import org.apache.lucene.index.NoMergePolicy; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.Bits; diff --git a/lucene/monitor/src/test/org/apache/lucene/monitor/TestRegexpQueryHandler.java b/lucene/monitor/src/test/org/apache/lucene/monitor/TestRegexpQueryHandler.java index a30cde1b66a..dd4dab174ce 100644 --- a/lucene/monitor/src/test/org/apache/lucene/monitor/TestRegexpQueryHandler.java +++ b/lucene/monitor/src/test/org/apache/lucene/monitor/TestRegexpQueryHandler.java @@ -23,11 +23,11 @@ import java.util.HashSet; import java.util.Set; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.core.WhitespaceAnalyzer; import org.apache.lucene.index.Term; import org.apache.lucene.search.Query; import org.apache.lucene.search.RegexpQuery; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestRegexpQueryHandler extends BaseTokenStreamTestCase { diff --git a/lucene/monitor/src/test/org/apache/lucene/monitor/TestSuffixingNGramTokenizer.java b/lucene/monitor/src/test/org/apache/lucene/monitor/TestSuffixingNGramTokenizer.java index 0a19bedcea4..42d862d9950 100644 --- a/lucene/monitor/src/test/org/apache/lucene/monitor/TestSuffixingNGramTokenizer.java +++ b/lucene/monitor/src/test/org/apache/lucene/monitor/TestSuffixingNGramTokenizer.java @@ -19,10 +19,10 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.WhitespaceTokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; public class TestSuffixingNGramTokenizer extends BaseTokenStreamTestCase { diff --git a/lucene/queries/src/test/org/apache/lucene/queries/TestCommonTermsQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/TestCommonTermsQuery.java index 0ccee64c3f8..f2ef43f74ec 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/TestCommonTermsQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/TestCommonTermsQuery.java @@ -23,7 +23,6 @@ import java.util.List; import java.util.Random; import java.util.Set; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.DirectoryReader; @@ -46,6 +45,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.similarities.BM25Similarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java b/lucene/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java index 0b1db83f35e..74e17aa08a0 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java @@ -17,7 +17,6 @@ package org.apache.lucene.queries.function; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; @@ -34,6 +33,7 @@ import org.apache.lucene.queries.function.valuesource.MultiValuedIntFieldSource; import org.apache.lucene.search.SortedNumericSelector; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestDocValuesFieldSources.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestDocValuesFieldSources.java index 03fb7ea810e..38084ea7650 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestDocValuesFieldSources.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestDocValuesFieldSources.java @@ -18,7 +18,6 @@ import com.carrotsearch.randomizedtesting.generators.RandomNumbers; import java.io.IOException; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.BinaryDocValuesField; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -35,6 +34,7 @@ import org.apache.lucene.queries.function.valuesource.MultiValuedLongFieldSource; import org.apache.lucene.search.SortedNumericSelector.Type; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestIndexReaderFunctions.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestIndexReaderFunctions.java index 08b697a2359..5e43287bc98 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestIndexReaderFunctions.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestIndexReaderFunctions.java @@ -19,7 +19,6 @@ import java.util.Arrays; import java.util.List; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.SortedDocValuesField; @@ -42,6 +41,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.Weight; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestLongNormValueSource.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestLongNormValueSource.java index 8435e88b154..1e7606d3c0b 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestLongNormValueSource.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestLongNormValueSource.java @@ -17,7 +17,6 @@ package org.apache.lucene.queries.function; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.TextField; @@ -34,6 +33,7 @@ import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.AfterClass; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java index 79c93b7865d..8015b801d56 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.NumericDocValuesField; @@ -51,6 +50,7 @@ import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervalBuilder.java b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervalBuilder.java index cbe1004d301..3b6f63d98f5 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervalBuilder.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervalBuilder.java @@ -41,8 +41,8 @@ import java.io.IOException; import org.apache.lucene.analysis.CachingTokenFilter; -import org.apache.lucene.analysis.CannedTokenStream; -import org.apache.lucene.analysis.Token; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.Token; import org.apache.lucene.tests.util.LuceneTestCase; public class TestIntervalBuilder extends LuceneTestCase { diff --git a/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervalQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervalQuery.java index ba598859c77..6ed9a0d13f1 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervalQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervalQuery.java @@ -18,7 +18,6 @@ package org.apache.lucene.queries.intervals; import java.io.IOException; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; @@ -29,6 +28,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestPayloadFilteredInterval.java b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestPayloadFilteredInterval.java index 127aa333ead..1aad76f52f0 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestPayloadFilteredInterval.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestPayloadFilteredInterval.java @@ -18,8 +18,6 @@ package org.apache.lucene.queries.intervals; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockTokenizer; -import org.apache.lucene.analysis.SimplePayloadFilter; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -27,6 +25,8 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.MatchesIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.analysis.SimplePayloadFilter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java b/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java index 5d415d783d7..ae934acf7d7 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java @@ -29,9 +29,6 @@ import java.util.Locale; import java.util.Map; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenFilter; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; @@ -48,6 +45,9 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenFilter; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.ArrayUtil; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/payloads/PayloadHelper.java b/lucene/queries/src/test/org/apache/lucene/queries/payloads/PayloadHelper.java index 0cf05e69bf2..d861f808cb2 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/payloads/PayloadHelper.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/payloads/PayloadHelper.java @@ -31,6 +31,7 @@ import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.English; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadCheckQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadCheckQuery.java index ecbdc82a248..6ed9ef6d765 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadCheckQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadCheckQuery.java @@ -24,8 +24,6 @@ import java.util.Collections; import java.util.List; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockTokenizer; -import org.apache.lucene.analysis.SimplePayloadFilter; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -43,6 +41,8 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.WildcardQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.analysis.SimplePayloadFilter; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.English; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadScoreQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadScoreQuery.java index 332fdcd855b..b78b260cde2 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadScoreQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadScoreQuery.java @@ -18,7 +18,6 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; @@ -43,6 +42,7 @@ import org.apache.lucene.search.WildcardQuery; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.English; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpanPositions.java b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpanPositions.java index 1920b78f155..acd9846a960 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpanPositions.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpanPositions.java @@ -21,7 +21,6 @@ import java.io.StringReader; import java.util.ArrayList; import java.util.List; -import org.apache.lucene.analysis.MockPayloadAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexReader; @@ -39,6 +38,7 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.ScoreMode; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockPayloadAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpans.java b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpans.java index 1883addd142..48766f1b312 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpans.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpans.java @@ -23,7 +23,6 @@ import java.util.List; import java.util.Set; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; @@ -51,6 +50,7 @@ import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadTermQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadTermQuery.java index d171985745e..a16c8beae4b 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadTermQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadTermQuery.java @@ -18,7 +18,6 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; @@ -41,6 +40,7 @@ import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.English; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestBasics.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestBasics.java index ec6a149b730..3ba81f10c77 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestBasics.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestBasics.java @@ -40,6 +40,8 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopScoreDocCollector; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.English; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestFieldMaskingSpanQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestFieldMaskingSpanQuery.java index f1dd7b688bc..bd1f7e8f8a2 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestFieldMaskingSpanQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestFieldMaskingSpanQuery.java @@ -21,7 +21,6 @@ import java.util.HashSet; import java.util.Set; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; @@ -33,6 +32,7 @@ import org.apache.lucene.search.ScoreMode; import org.apache.lucene.search.similarities.TFIDFSimilarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestNearSpansOrdered.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestNearSpansOrdered.java index 9d767152c42..6f769bb7e4d 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestNearSpansOrdered.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestNearSpansOrdered.java @@ -19,7 +19,6 @@ import static org.apache.lucene.queries.spans.SpanTestUtil.assertFinished; import static org.apache.lucene.queries.spans.SpanTestUtil.assertNext; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; @@ -34,6 +33,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.Weight; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanCollection.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanCollection.java index a5c8784ba80..a1caadc312b 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanCollection.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanCollection.java @@ -19,7 +19,6 @@ import java.io.IOException; import java.util.HashSet; import java.util.Set; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.FieldType; import org.apache.lucene.document.TextField; @@ -31,6 +30,7 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.ScoreMode; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanContainQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanContainQuery.java index 5f2d8272c19..0043455bf13 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanContainQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanContainQuery.java @@ -18,7 +18,6 @@ import static org.apache.lucene.queries.spans.SpanTestUtil.*; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; @@ -27,6 +26,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.ScoreMode; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanFirstQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanFirstQuery.java index 5517187d148..fae0e6693f2 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanFirstQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanFirstQuery.java @@ -19,14 +19,14 @@ import static org.apache.lucene.queries.spans.SpanTestUtil.*; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.automaton.CharacterRunAutomaton; import org.apache.lucene.util.automaton.RegExp; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpans.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpans.java index 955d18a541a..aba23dddb93 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpans.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpans.java @@ -25,7 +25,6 @@ import static org.apache.lucene.queries.spans.SpanTestUtil.spanTermQuery; import java.io.IOException; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.DirectoryReader; @@ -41,6 +40,7 @@ import org.apache.lucene.search.ScoreMode; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpansEnum.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpansEnum.java index f9df0401ff1..b90221ce6ce 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpansEnum.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpansEnum.java @@ -19,7 +19,6 @@ import static org.apache.lucene.queries.spans.SpanTestUtil.*; import java.io.IOException; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; @@ -27,6 +26,7 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.English; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiAnalyzer.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiAnalyzer.java index 0f9d9fd4e73..5b3f7f8f1f8 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiAnalyzer.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiAnalyzer.java @@ -19,8 +19,6 @@ import java.io.IOException; import java.util.Objects; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; @@ -30,6 +28,8 @@ import org.apache.lucene.analysis.tokenattributes.TypeAttribute; import org.apache.lucene.search.Query; import org.apache.lucene.search.QueryVisitor; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; /** * Test QueryParser's ability to deal with Analyzers that return more than one token per position or diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java index be481c690c2..57ed0e70972 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java @@ -21,9 +21,6 @@ import java.util.HashMap; import java.util.Map; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockSynonymFilter; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -39,6 +36,9 @@ import org.apache.lucene.search.RegexpQuery; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockSynonymFilter; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestQueryParser.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestQueryParser.java index 0a07cdca9d9..52c2fce6420 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestQueryParser.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestQueryParser.java @@ -18,11 +18,6 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockBytesAnalyzer; -import org.apache.lucene.analysis.MockLowerCaseFilter; -import org.apache.lucene.analysis.MockSynonymAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; @@ -51,6 +46,11 @@ import org.apache.lucene.search.SynonymQuery; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockBytesAnalyzer; +import org.apache.lucene.tests.analysis.MockLowerCaseFilter; +import org.apache.lucene.tests.analysis.MockSynonymAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.util.automaton.TooComplexToDeterminizeException; /** Tests QueryParser. */ diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java index a8f0291216d..5a670b27eb4 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java @@ -18,8 +18,6 @@ import java.util.HashSet; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockSynonymAnalyzer; import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -36,6 +34,8 @@ import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockSynonymAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; public class TestComplexPhraseQuery extends LuceneTestCase { diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/ext/TestExtendableQueryParser.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/ext/TestExtendableQueryParser.java index bb131bc9a30..1d8b9e869f3 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/ext/TestExtendableQueryParser.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/ext/TestExtendableQueryParser.java @@ -18,8 +18,6 @@ import java.util.Locale; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.queryparser.classic.ParseException; import org.apache.lucene.queryparser.classic.QueryParser; import org.apache.lucene.queryparser.classic.QueryParserBase; @@ -28,6 +26,8 @@ import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Testcase for the class {@link ExtendableQueryParser} */ public class TestExtendableQueryParser extends TestQueryParser { diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/precedence/TestPrecedenceQueryParser.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/precedence/TestPrecedenceQueryParser.java index 305bae1c831..a1049368139 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/precedence/TestPrecedenceQueryParser.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/precedence/TestPrecedenceQueryParser.java @@ -45,6 +45,9 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TermRangeQuery; import org.apache.lucene.search.WildcardQuery; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenFilter; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.automaton.Automata; import org.apache.lucene.util.automaton.CharacterRunAutomaton; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiAnalyzerQPHelper.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiAnalyzerQPHelper.java index bdebdff6ceb..6c790ae42fb 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiAnalyzerQPHelper.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiAnalyzerQPHelper.java @@ -24,6 +24,7 @@ import org.apache.lucene.analysis.tokenattributes.TypeAttribute; import org.apache.lucene.queryparser.flexible.core.QueryNodeException; import org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; /** diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiFieldQPHelper.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiFieldQPHelper.java index 440b8a6b8d2..7c9bb9a54cc 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiFieldQPHelper.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiFieldQPHelper.java @@ -35,6 +35,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java index 219f5808e8d..66a8ccd0c78 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java @@ -28,9 +28,6 @@ import java.util.Map; import java.util.TimeZone; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenFilter; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; @@ -74,6 +71,9 @@ import org.apache.lucene.search.TermRangeQuery; import org.apache.lucene.search.WildcardQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenFilter; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.automaton.Automata; import org.apache.lucene.util.automaton.CharacterRunAutomaton; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestStandardQP.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestStandardQP.java index ed1eed169b9..74612d6d9f9 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestStandardQP.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestStandardQP.java @@ -17,8 +17,6 @@ package org.apache.lucene.queryparser.flexible.standard; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.DateTools.Resolution; import org.apache.lucene.index.Term; import org.apache.lucene.queryparser.flexible.core.QueryNodeException; @@ -30,6 +28,8 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.WildcardQuery; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Tests QueryParser. */ public class TestStandardQP extends QueryParserTestBase { diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestStandardQPEnhancements.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestStandardQPEnhancements.java index f69bf96f2a9..f22433371fb 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestStandardQPEnhancements.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestStandardQPEnhancements.java @@ -20,7 +20,6 @@ import java.io.StringReader; import java.util.Locale; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.queryparser.charstream.FastCharStream; import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; import org.apache.lucene.queryparser.flexible.standard.config.StandardQueryConfigHandler; @@ -28,6 +27,7 @@ import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser; import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.Query; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/simple/TestSimpleQueryParser.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/simple/TestSimpleQueryParser.java index 496317b5894..da9c5fc7508 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/simple/TestSimpleQueryParser.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/simple/TestSimpleQueryParser.java @@ -31,8 +31,6 @@ import java.util.LinkedHashMap; import java.util.Map; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.BooleanQuery; @@ -44,6 +42,8 @@ import org.apache.lucene.search.PrefixQuery; import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.automaton.LevenshteinAutomata; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/SingleFieldTestDb.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/SingleFieldTestDb.java index 55e8021e4a4..3ad5a2ba104 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/SingleFieldTestDb.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/SingleFieldTestDb.java @@ -17,7 +17,6 @@ package org.apache.lucene.queryparser.surround.query; import java.util.Random; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.TextField; @@ -25,6 +24,7 @@ import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.MockDirectoryWrapper; public class SingleFieldTestDb { diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java index 39a2ba5ecb5..f7f59d6930f 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java @@ -25,10 +25,6 @@ import java.util.TimeZone; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.LowerCaseFilter; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockSynonymFilter; -import org.apache.lucene.analysis.MockTokenFilter; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; @@ -63,6 +59,10 @@ import org.apache.lucene.search.TermRangeQuery; import org.apache.lucene.search.WildcardQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockSynonymFilter; +import org.apache.lucene.tests.analysis.MockTokenFilter; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.automaton.Automata; import org.apache.lucene.util.automaton.CharacterRunAutomaton; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestCoreParser.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestCoreParser.java index 7e03da8b952..debf6e404bc 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestCoreParser.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestCoreParser.java @@ -22,9 +22,6 @@ import java.nio.charset.StandardCharsets; import java.util.Arrays; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenFilter; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.Term; @@ -38,6 +35,9 @@ import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenFilter; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.AfterClass; import org.xml.sax.SAXException; diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimplePrimaryNode.java b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimplePrimaryNode.java index fc39c1ace82..d0068018371 100644 --- a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimplePrimaryNode.java +++ b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimplePrimaryNode.java @@ -35,7 +35,6 @@ import java.util.Random; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; @@ -61,6 +60,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; diff --git a/lucene/sandbox/src/test/org/apache/lucene/payloads/TestPayloadSpanUtil.java b/lucene/sandbox/src/test/org/apache/lucene/payloads/TestPayloadSpanUtil.java index a2b4822fb09..fed55e57c1d 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/payloads/TestPayloadSpanUtil.java +++ b/lucene/sandbox/src/test/org/apache/lucene/payloads/TestPayloadSpanUtil.java @@ -22,7 +22,6 @@ import java.util.HashSet; import java.util.Set; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; @@ -38,6 +37,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/codecs/idversion/TestIDVersionPostingsFormat.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/codecs/idversion/TestIDVersionPostingsFormat.java index 2c2944f533c..a105c411de9 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/codecs/idversion/TestIDVersionPostingsFormat.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/codecs/idversion/TestIDVersionPostingsFormat.java @@ -28,9 +28,6 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicLong; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenFilter; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; @@ -51,6 +48,9 @@ import org.apache.lucene.search.SearcherManager; import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenFilter; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestFuzzyLikeThisQuery.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestFuzzyLikeThisQuery.java index bd7fe2825a6..df2e2ae4dc5 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestFuzzyLikeThisQuery.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestFuzzyLikeThisQuery.java @@ -19,7 +19,6 @@ import java.io.IOException; import java.util.HashSet; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; @@ -31,6 +30,7 @@ import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestIndexSortSortedNumericDocValuesRangeQuery.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestIndexSortSortedNumericDocValuesRangeQuery.java index 0b5fc71626d..f720e267501 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestIndexSortSortedNumericDocValuesRangeQuery.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestIndexSortSortedNumericDocValuesRangeQuery.java @@ -19,7 +19,6 @@ import static org.hamcrest.CoreMatchers.instanceOf; import java.io.IOException; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.LongPoint; import org.apache.lucene.document.SortedNumericDocValuesField; @@ -42,6 +41,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.Weight; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestTermAutomatonQuery.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestTermAutomatonQuery.java index 3cc63bd8279..13402de39f8 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestTermAutomatonQuery.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestTermAutomatonQuery.java @@ -26,10 +26,6 @@ import java.util.Random; import java.util.Set; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CannedTokenStream; -import org.apache.lucene.analysis.MockTokenFilter; -import org.apache.lucene.analysis.MockTokenizer; -import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; @@ -60,6 +56,10 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.Weight; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.MockTokenFilter; +import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.analysis.Token; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.AttributeSource; diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/SpatialTestCase.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/SpatialTestCase.java index a92ddaf1923..e970b65b6b4 100644 --- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/SpatialTestCase.java +++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/SpatialTestCase.java @@ -23,7 +23,6 @@ import java.util.List; import java.util.logging.Logger; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.RandomIndexWriter; @@ -32,6 +31,7 @@ import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressSysoutChecks; import org.apache.lucene.util.IOUtils; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestDirectSpellChecker.java b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestDirectSpellChecker.java index 3cac89e206c..ccf3f1dede6 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestDirectSpellChecker.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestDirectSpellChecker.java @@ -17,14 +17,14 @@ package org.apache.lucene.search.spell; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.English; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java index 9917fb5a692..b4a47b2063a 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java @@ -18,14 +18,14 @@ import java.io.IOException; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefIterator; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestSpellChecker.java b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestSpellChecker.java index a394322b774..8e07539107c 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestSpellChecker.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestSpellChecker.java @@ -26,7 +26,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.DirectoryReader; @@ -36,6 +35,7 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.English; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.NamedThreadFactory; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestWordBreakSpellChecker.java b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestWordBreakSpellChecker.java index da36788d048..8f6c6ea998d 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestWordBreakSpellChecker.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestWordBreakSpellChecker.java @@ -20,8 +20,6 @@ import java.util.List; import java.util.regex.Pattern; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.DirectoryReader; @@ -30,6 +28,8 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.spell.WordBreakSpellChecker.BreakSuggestionSortMethod; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.English; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestDocumentDictionary.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestDocumentDictionary.java index dc65fb5b7b7..7e0914bec4e 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestDocumentDictionary.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestDocumentDictionary.java @@ -27,7 +27,6 @@ import java.util.Random; import java.util.Set; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.NumericDocValuesField; @@ -41,6 +40,7 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.spell.Dictionary; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestDocumentValueSourceDictionary.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestDocumentValueSourceDictionary.java index ddc1735b386..17225373b1a 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestDocumentValueSourceDictionary.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestDocumentValueSourceDictionary.java @@ -25,7 +25,6 @@ import java.util.Random; import java.util.Set; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.NumericDocValuesField; @@ -44,6 +43,7 @@ import org.apache.lucene.search.LongValuesSource; import org.apache.lucene.search.spell.Dictionary; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestHighFrequencyDictionary.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestHighFrequencyDictionary.java index 669d1e737bc..d5ea4fdd3f0 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestHighFrequencyDictionary.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestHighFrequencyDictionary.java @@ -16,13 +16,13 @@ */ package org.apache.lucene.search.suggest; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.search.spell.Dictionary; import org.apache.lucene.search.spell.HighFrequencyDictionary; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRefIterator; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestLookupBenchmark.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestLookupBenchmark.java index afe9fe7192c..fe9da12cf34 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestLookupBenchmark.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestLookupBenchmark.java @@ -30,8 +30,6 @@ import java.util.Random; import java.util.concurrent.Callable; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.search.suggest.analyzing.AnalyzingInfixSuggester; import org.apache.lucene.search.suggest.analyzing.AnalyzingSuggester; import org.apache.lucene.search.suggest.analyzing.BlendedInfixSuggester; @@ -42,6 +40,8 @@ import org.apache.lucene.search.suggest.tst.TSTLookup; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.BeforeClass; import org.junit.Ignore; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestAnalyzingInfixSuggester.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestAnalyzingInfixSuggester.java index bdbc64873ea..a9cf00e9dcd 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestAnalyzingInfixSuggester.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestAnalyzingInfixSuggester.java @@ -29,8 +29,6 @@ import java.util.Set; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.StopFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; @@ -44,6 +42,8 @@ import org.apache.lucene.search.suggest.Lookup.LookupResult; import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestAnalyzingSuggester.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestAnalyzingSuggester.java index 36063c56e43..7435c996407 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestAnalyzingSuggester.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestAnalyzingSuggester.java @@ -32,14 +32,6 @@ import java.util.Set; import java.util.TreeSet; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CannedBinaryTokenStream; -import org.apache.lucene.analysis.CannedBinaryTokenStream.BinaryToken; -import org.apache.lucene.analysis.CannedTokenStream; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenFilter; -import org.apache.lucene.analysis.MockTokenizer; -import org.apache.lucene.analysis.MockUTF16TermAttributeImpl; -import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; @@ -51,6 +43,14 @@ import org.apache.lucene.search.suggest.InputArrayIterator; import org.apache.lucene.search.suggest.Lookup.LookupResult; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.CannedBinaryTokenStream; +import org.apache.lucene.tests.analysis.CannedBinaryTokenStream.BinaryToken; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenFilter; +import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.analysis.MockUTF16TermAttributeImpl; +import org.apache.lucene.tests.analysis.Token; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestBlendedInfixSuggester.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestBlendedInfixSuggester.java index d44d10a5a92..93d47bc78bc 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestBlendedInfixSuggester.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestBlendedInfixSuggester.java @@ -23,14 +23,14 @@ import java.util.Set; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.suggest.Input; import org.apache.lucene.search.suggest.InputArrayIterator; import org.apache.lucene.search.suggest.Lookup; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; 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.java index 393fa8094ec..9ba471400a8 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 @@ -32,8 +32,6 @@ import java.util.Set; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.StopFilter; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.document.Document; @@ -41,6 +39,8 @@ import org.apache.lucene.search.suggest.InputArrayIterator; import org.apache.lucene.search.suggest.InputIterator; import org.apache.lucene.search.suggest.Lookup.LookupResult; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestFuzzySuggester.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestFuzzySuggester.java index 9de0b0daab0..5dc13ad1a99 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestFuzzySuggester.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestFuzzySuggester.java @@ -26,11 +26,6 @@ import java.util.Set; import java.util.TreeSet; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CannedTokenStream; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenFilter; -import org.apache.lucene.analysis.MockTokenizer; -import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.TokenStreamToAutomaton; @@ -40,6 +35,11 @@ import org.apache.lucene.search.suggest.InputArrayIterator; import org.apache.lucene.search.suggest.Lookup.LookupResult; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenFilter; +import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.analysis.Token; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestSuggestStopFilter.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestSuggestStopFilter.java index be4c906f023..a16ff6a0afa 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestSuggestStopFilter.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestSuggestStopFilter.java @@ -17,12 +17,12 @@ package org.apache.lucene.search.suggest.analyzing; import java.io.StringReader; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.StopFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.MockTokenizer; public class TestSuggestStopFilter extends BaseTokenStreamTestCase { diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestSuggestStopFilterFactory.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestSuggestStopFilterFactory.java index 12a3aea9d28..5acbcfee415 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestSuggestStopFilterFactory.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestSuggestStopFilterFactory.java @@ -19,9 +19,9 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.en.EnglishAnalyzer; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.apache.lucene.util.ClasspathResourceLoader; import org.apache.lucene.util.ResourceLoader; import org.apache.lucene.util.Version; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestContextQuery.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestContextQuery.java index 99167017d3d..d33d273a534 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestContextQuery.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestContextQuery.java @@ -26,12 +26,12 @@ import java.util.List; import java.util.Set; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.ArrayUtil; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestContextSuggestField.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestContextSuggestField.java index 695f8e9d63a..f1a76ec414e 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestContextSuggestField.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestContextSuggestField.java @@ -16,14 +16,13 @@ */ package org.apache.lucene.search.suggest.document; -import static org.apache.lucene.analysis.BaseTokenStreamTestCase.assertTokenStreamContents; import static org.apache.lucene.search.suggest.document.TestSuggestField.Entry; import static org.apache.lucene.search.suggest.document.TestSuggestField.assertSuggestions; import static org.apache.lucene.search.suggest.document.TestSuggestField.iwcWithSuggestField; +import static org.apache.lucene.tests.analysis.BaseTokenStreamTestCase.assertTokenStreamContents; import java.io.ByteArrayOutputStream; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.miscellaneous.ConcatenateGraphFilter; import org.apache.lucene.analysis.standard.StandardAnalyzer; @@ -33,6 +32,7 @@ import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; import org.apache.lucene.store.OutputStreamDataOutput; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.CharsRefBuilder; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestFuzzyCompletionQuery.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestFuzzyCompletionQuery.java index de05e4071ea..8dbc67482c1 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestFuzzyCompletionQuery.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestFuzzyCompletionQuery.java @@ -21,12 +21,12 @@ import static org.apache.lucene.search.suggest.document.TestSuggestField.iwcWithSuggestField; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.After; import org.junit.Before; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestPrefixCompletionQuery.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestPrefixCompletionQuery.java index e896a27140b..3fcf119ab0a 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestPrefixCompletionQuery.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestPrefixCompletionQuery.java @@ -25,9 +25,6 @@ import java.io.IOException; import java.util.Objects; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenFilter; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.NumericDocValuesField; @@ -42,6 +39,9 @@ import org.apache.lucene.search.ScoreMode; import org.apache.lucene.search.suggest.BitsProducer; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenFilter; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.Bits; import org.apache.lucene.util.FixedBitSet; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestRegexCompletionQuery.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestRegexCompletionQuery.java index a88fe1ba82b..499384e8d76 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestRegexCompletionQuery.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestRegexCompletionQuery.java @@ -21,13 +21,13 @@ import static org.apache.lucene.search.suggest.document.TestSuggestField.iwcWithSuggestField; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.ScoreMode; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.After; import org.junit.Before; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestSuggestField.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestSuggestField.java index 37d91939945..b7017e3f289 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestSuggestField.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestSuggestField.java @@ -16,7 +16,7 @@ */ package org.apache.lucene.search.suggest.document; -import static org.apache.lucene.analysis.BaseTokenStreamTestCase.assertTokenStreamContents; +import static org.apache.lucene.tests.analysis.BaseTokenStreamTestCase.assertTokenStreamContents; import static org.hamcrest.core.IsEqual.equalTo; import com.carrotsearch.randomizedtesting.generators.RandomPicks; @@ -33,7 +33,6 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CyclicBarrier; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.miscellaneous.ConcatenateGraphFilter; @@ -59,6 +58,7 @@ import org.apache.lucene.search.suggest.document.TopSuggestDocs.SuggestScoreDoc; import org.apache.lucene.store.Directory; import org.apache.lucene.store.OutputStreamDataOutput; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/package.html b/lucene/test-framework/src/java/org/apache/lucene/analysis/package.html deleted file mode 100644 index 0f787b28181..00000000000 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/package.html +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - -Support for testing analysis components. -

-The main classes of interest are: -

    -
  • {@link org.apache.lucene.analysis.BaseTokenStreamTestCase}: Highly recommended - to use its helper methods, (especially in conjunction with - {@link org.apache.lucene.analysis.MockAnalyzer} or {@link org.apache.lucene.analysis.MockTokenizer}), - as it contains many assertions and checks to catch bugs.
    • -
  • {@link org.apache.lucene.analysis.MockTokenizer}: Tokenizer for testing. - Tokenizer that serves as a replacement for WHITESPACE, SIMPLE, and KEYWORD - tokenizers. If you are writing a component such as a TokenFilter, it's a great idea to test - it wrapping this tokenizer instead for extra checks.
    • -
  • {@link org.apache.lucene.analysis.MockAnalyzer}: Analyzer for testing. - Analyzer that uses MockTokenizer for additional verification. If you are testing a custom - component such as a queryparser or analyzer-wrapper that consumes analysis streams, it's a great - idea to test it with this analyzer instead.
    • -
- - diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/standard/package.html b/lucene/test-framework/src/java/org/apache/lucene/analysis/standard/package.html deleted file mode 100644 index f7535b2ecfa..00000000000 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/standard/package.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - -Classes to support StandardAnalyzer component testing - - diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseCompressingDocValuesFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BaseCompressingDocValuesFormatTestCase.java index 9d73abd037b..133d2a733ec 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseCompressingDocValuesFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BaseCompressingDocValuesFormatTestCase.java @@ -20,11 +20,11 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.NumericDocValuesField; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.packed.PackedInts; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseDocValuesFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BaseDocValuesFormatTestCase.java index 09e0dcb0bf7..7943f4b99c6 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseDocValuesFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BaseDocValuesFormatTestCase.java @@ -37,7 +37,6 @@ import java.util.function.LongSupplier; import java.util.function.Supplier; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.simpletext.SimpleTextCodec; import org.apache.lucene.document.BinaryDocValuesField; @@ -62,6 +61,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BitSet; import org.apache.lucene.util.BytesRef; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java index dcf33dac60d..2a83eb58f98 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java @@ -34,7 +34,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.function.IntConsumer; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.DocValuesConsumer; import org.apache.lucene.codecs.DocValuesProducer; @@ -60,6 +59,7 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.RamUsageTester; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseMergePolicyTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BaseMergePolicyTestCase.java index 28042c68e25..88993cdce39 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseMergePolicyTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BaseMergePolicyTestCase.java @@ -27,7 +27,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; import java.util.function.ToIntFunction; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.index.MergePolicy.MergeContext; import org.apache.lucene.index.MergePolicy.MergeSpecification; @@ -37,6 +36,7 @@ import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; import org.apache.lucene.store.Lock; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.NullInfoStream; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseNormsFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BaseNormsFormatTestCase.java index 7e249f33597..95e1cdcbc4e 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseNormsFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BaseNormsFormatTestCase.java @@ -25,8 +25,6 @@ import java.util.concurrent.CountDownLatch; import java.util.function.LongSupplier; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.NumericDocValuesField; @@ -37,6 +35,8 @@ import org.apache.lucene.search.TermStatistics; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.FixedBitSet; import org.apache.lucene.util.IOUtils; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BasePointsFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BasePointsFormatTestCase.java index 557dc5430cc..297d01d0974 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BasePointsFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BasePointsFormatTestCase.java @@ -24,7 +24,6 @@ import java.util.Arrays; import java.util.BitSet; import java.util.List; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.Codec; import org.apache.lucene.document.BinaryPoint; import org.apache.lucene.document.Document; @@ -37,6 +36,7 @@ import org.apache.lucene.index.PointValues.Relation; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.Rethrow; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java index cc9dae5f7e5..4fdaf19f3b7 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java @@ -31,10 +31,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicLong; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CannedTokenStream; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; -import org.apache.lucene.analysis.Token; import org.apache.lucene.codecs.FieldsConsumer; import org.apache.lucene.codecs.FieldsProducer; import org.apache.lucene.codecs.FilterCodec; @@ -51,6 +47,10 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.analysis.Token; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.RamUsageTester; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java index 67aa3301981..296d3ca93f6 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java @@ -33,7 +33,6 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.Function; import java.util.stream.Collectors; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.StoredFieldsFormat; import org.apache.lucene.codecs.simpletext.SimpleTextCodec; @@ -54,6 +53,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; import org.apache.lucene.store.MMapDirectory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.store.MockDirectoryWrapper.Throttling; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseTermVectorsFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BaseTermVectorsFormatTestCase.java index e0aaf90ddec..c0353142e38 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseTermVectorsFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BaseTermVectorsFormatTestCase.java @@ -37,9 +37,6 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicReference; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CannedTokenStream; -import org.apache.lucene.analysis.MockTokenizer; -import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; @@ -61,6 +58,9 @@ import org.apache.lucene.search.SortField; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.CannedTokenStream; +import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.analysis.Token; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.AttributeImpl; import org.apache.lucene.util.AttributeReflector; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseTestCheckIndex.java b/lucene/test-framework/src/java/org/apache/lucene/index/BaseTestCheckIndex.java index 73142e7a2d7..114e5c11136 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseTestCheckIndex.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BaseTestCheckIndex.java @@ -21,12 +21,12 @@ import java.io.PrintStream; import java.util.ArrayList; import java.util.List; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.FieldType; import org.apache.lucene.document.TextField; import org.apache.lucene.store.Directory; import org.apache.lucene.store.LockObtainFailedException; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/DocHelper.java b/lucene/test-framework/src/java/org/apache/lucene/index/DocHelper.java index 84c6213ef7d..8985742baea 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/DocHelper.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/DocHelper.java @@ -22,8 +22,6 @@ import java.util.Map; import java.util.Random; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; @@ -33,6 +31,8 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; /** Helper functions for tests that handles documents */ public class DocHelper { diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java b/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java index 1e60eb488b7..9a13ab386d1 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java @@ -24,11 +24,11 @@ import java.util.Random; import java.util.concurrent.CopyOnWriteArrayList; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Field; import org.apache.lucene.document.NumericDocValuesField; import org.apache.lucene.search.Query; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.NullInfoStream; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java index 2ee4d32626d..23413366913 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java @@ -31,7 +31,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.search.IndexSearcher; @@ -43,6 +42,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.util.FailOnNonBulkMergesInfoStream; import org.apache.lucene.tests.util.LineFileDocs; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamFactoryTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/BaseTokenStreamFactoryTestCase.java similarity index 96% rename from lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamFactoryTestCase.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/analysis/BaseTokenStreamFactoryTestCase.java index 5aea57b9bdb..5013b1ac895 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamFactoryTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/BaseTokenStreamFactoryTestCase.java @@ -14,11 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis; +package org.apache.lucene.tests.analysis; import java.lang.reflect.InvocationTargetException; import java.util.HashMap; import java.util.Map; +import org.apache.lucene.analysis.AbstractAnalysisFactory; +import org.apache.lucene.analysis.CharFilterFactory; +import org.apache.lucene.analysis.TokenFilterFactory; +import org.apache.lucene.analysis.TokenizerFactory; import org.apache.lucene.util.ClasspathResourceLoader; import org.apache.lucene.util.ResourceLoader; import org.apache.lucene.util.ResourceLoaderAware; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/BaseTokenStreamTestCase.java similarity index 99% rename from lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/analysis/BaseTokenStreamTestCase.java index 04d54c7b5db..058e7b30877 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/BaseTokenStreamTestCase.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis; +package org.apache.lucene.tests.analysis; import java.io.IOException; import java.io.PrintWriter; @@ -27,6 +27,9 @@ import java.nio.file.Paths; import java.util.*; import java.util.concurrent.CountDownLatch; +import org.apache.lucene.analysis.Analyzer; +import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.TokenStreamToAutomaton; import org.apache.lucene.analysis.tokenattributes.*; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/CannedBinaryTokenStream.java b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/CannedBinaryTokenStream.java similarity index 97% rename from lucene/test-framework/src/java/org/apache/lucene/analysis/CannedBinaryTokenStream.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/analysis/CannedBinaryTokenStream.java index 9ec9eee1611..4ee51a54e29 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/CannedBinaryTokenStream.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/CannedBinaryTokenStream.java @@ -14,8 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis; +package org.apache.lucene.tests.analysis; +import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.BytesTermAttribute; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/CannedTokenStream.java b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/CannedTokenStream.java similarity index 96% rename from lucene/test-framework/src/java/org/apache/lucene/analysis/CannedTokenStream.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/analysis/CannedTokenStream.java index 3a208078d43..7188e22e026 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/CannedTokenStream.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/CannedTokenStream.java @@ -14,9 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis; +package org.apache.lucene.tests.analysis; import java.io.IOException; +import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/CollationTestBase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/CollationTestBase.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/analysis/CollationTestBase.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/analysis/CollationTestBase.java index 93f89561869..9c0c3815f5f 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/CollationTestBase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/CollationTestBase.java @@ -14,11 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis; +package org.apache.lucene.tests.analysis; import java.io.IOException; import java.util.HashMap; import java.util.Map; +import org.apache.lucene.analysis.Analyzer; +import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/CrankyTokenFilter.java b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/CrankyTokenFilter.java similarity index 94% rename from lucene/test-framework/src/java/org/apache/lucene/analysis/CrankyTokenFilter.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/analysis/CrankyTokenFilter.java index d0a82761b53..ff701d6beb2 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/CrankyTokenFilter.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/CrankyTokenFilter.java @@ -14,10 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis; +package org.apache.lucene.tests.analysis; import java.io.IOException; import java.util.Random; +import org.apache.lucene.analysis.TokenFilter; +import org.apache.lucene.analysis.TokenStream; /** * Throws IOException from random Tokenstream methods. diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/LookaheadTokenFilter.java b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/LookaheadTokenFilter.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/analysis/LookaheadTokenFilter.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/analysis/LookaheadTokenFilter.java index 99e774149f4..ddd053ecd27 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/LookaheadTokenFilter.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/LookaheadTokenFilter.java @@ -14,11 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis; +package org.apache.lucene.tests.analysis; import java.io.IOException; import java.util.ArrayList; import java.util.List; +import org.apache.lucene.analysis.TokenFilter; +import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; import org.apache.lucene.analysis.tokenattributes.PositionLengthAttribute; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockAnalyzer.java b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockAnalyzer.java similarity index 97% rename from lucene/test-framework/src/java/org/apache/lucene/analysis/MockAnalyzer.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockAnalyzer.java index b818278ea53..cb3e7f855e1 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockAnalyzer.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockAnalyzer.java @@ -14,11 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis; +package org.apache.lucene.tests.analysis; import java.util.HashMap; import java.util.Map; import java.util.Random; +import org.apache.lucene.analysis.Analyzer; +import org.apache.lucene.analysis.TokenFilter; +import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.automaton.CharacterRunAutomaton; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockBytesAnalyzer.java b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockBytesAnalyzer.java similarity index 91% rename from lucene/test-framework/src/java/org/apache/lucene/analysis/MockBytesAnalyzer.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockBytesAnalyzer.java index 80ca7c65c28..69c1b3b4558 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockBytesAnalyzer.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockBytesAnalyzer.java @@ -14,8 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis; +package org.apache.lucene.tests.analysis; +import org.apache.lucene.analysis.Analyzer; +import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.util.AttributeFactory; /** Analyzer for testing that encodes terms as UTF-16 bytes. */ diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockCharFilter.java b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockCharFilter.java similarity index 97% rename from lucene/test-framework/src/java/org/apache/lucene/analysis/MockCharFilter.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockCharFilter.java index 58b724dddec..676e1dbcbde 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockCharFilter.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockCharFilter.java @@ -14,12 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis; +package org.apache.lucene.tests.analysis; import java.io.IOException; import java.io.Reader; import java.util.Map; import java.util.TreeMap; +import org.apache.lucene.analysis.CharFilter; /** * the purpose of this charfilter is to send offsets out of bounds if the analyzer doesn't use diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockFixedLengthPayloadFilter.java b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockFixedLengthPayloadFilter.java similarity index 92% rename from lucene/test-framework/src/java/org/apache/lucene/analysis/MockFixedLengthPayloadFilter.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockFixedLengthPayloadFilter.java index d248034a549..1383e0e4637 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockFixedLengthPayloadFilter.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockFixedLengthPayloadFilter.java @@ -14,10 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis; +package org.apache.lucene.tests.analysis; import java.io.IOException; import java.util.Random; +import org.apache.lucene.analysis.TokenFilter; +import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.PayloadAttribute; import org.apache.lucene.util.BytesRef; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockGraphTokenFilter.java b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockGraphTokenFilter.java similarity index 97% rename from lucene/test-framework/src/java/org/apache/lucene/analysis/MockGraphTokenFilter.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockGraphTokenFilter.java index 6715ca88f83..29abd9f300a 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockGraphTokenFilter.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockGraphTokenFilter.java @@ -14,10 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis; +package org.apache.lucene.tests.analysis; import java.io.IOException; import java.util.Random; +import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockHoleInjectingTokenFilter.java b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockHoleInjectingTokenFilter.java similarity index 95% rename from lucene/test-framework/src/java/org/apache/lucene/analysis/MockHoleInjectingTokenFilter.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockHoleInjectingTokenFilter.java index 3ad3f717fa2..6be1ef0442a 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockHoleInjectingTokenFilter.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockHoleInjectingTokenFilter.java @@ -14,10 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis; +package org.apache.lucene.tests.analysis; import java.io.IOException; import java.util.Random; +import org.apache.lucene.analysis.TokenFilter; +import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; import org.apache.lucene.analysis.tokenattributes.PositionLengthAttribute; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockLowerCaseFilter.java b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockLowerCaseFilter.java similarity index 88% rename from lucene/test-framework/src/java/org/apache/lucene/analysis/MockLowerCaseFilter.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockLowerCaseFilter.java index 8f821fc506d..5f9fe59bb63 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockLowerCaseFilter.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockLowerCaseFilter.java @@ -14,9 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis; +package org.apache.lucene.tests.analysis; import java.io.IOException; +import org.apache.lucene.analysis.CharacterUtils; +import org.apache.lucene.analysis.TokenFilter; +import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; /** A lowercasing {@link TokenFilter}. */ diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockPayloadAnalyzer.java b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockPayloadAnalyzer.java similarity index 92% rename from lucene/test-framework/src/java/org/apache/lucene/analysis/MockPayloadAnalyzer.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockPayloadAnalyzer.java index 2c186422da7..d10b0bccbbe 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockPayloadAnalyzer.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockPayloadAnalyzer.java @@ -14,10 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis; +package org.apache.lucene.tests.analysis; import java.io.IOException; import java.nio.charset.StandardCharsets; +import org.apache.lucene.analysis.Analyzer; +import org.apache.lucene.analysis.TokenFilter; +import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.PayloadAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockRandomLookaheadTokenFilter.java b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockRandomLookaheadTokenFilter.java similarity index 96% rename from lucene/test-framework/src/java/org/apache/lucene/analysis/MockRandomLookaheadTokenFilter.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockRandomLookaheadTokenFilter.java index 011a19b44eb..56fb06528a2 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockRandomLookaheadTokenFilter.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockRandomLookaheadTokenFilter.java @@ -14,10 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis; +package org.apache.lucene.tests.analysis; import java.io.IOException; import java.util.Random; +import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; /** Uses {@link LookaheadTokenFilter} to randomly peek at future tokens. */ diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockReaderWrapper.java b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockReaderWrapper.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/analysis/MockReaderWrapper.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockReaderWrapper.java index ae5d7a56b3c..690f334da95 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockReaderWrapper.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockReaderWrapper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis; +package org.apache.lucene.tests.analysis; import java.io.IOException; import java.io.Reader; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockSynonymAnalyzer.java b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockSynonymAnalyzer.java similarity index 93% rename from lucene/test-framework/src/java/org/apache/lucene/analysis/MockSynonymAnalyzer.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockSynonymAnalyzer.java index 5ad5d76e8d8..18ddeae3735 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockSynonymAnalyzer.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockSynonymAnalyzer.java @@ -15,7 +15,9 @@ * limitations under the License. */ -package org.apache.lucene.analysis; +package org.apache.lucene.tests.analysis; + +import org.apache.lucene.analysis.Analyzer; /** adds synonym of "dog" for "dogs", and synonym of "cavy" for "guinea pig". */ public class MockSynonymAnalyzer extends Analyzer { diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockSynonymFilter.java b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockSynonymFilter.java similarity index 96% rename from lucene/test-framework/src/java/org/apache/lucene/analysis/MockSynonymFilter.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockSynonymFilter.java index bf8a4e5034f..25f1c49c963 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockSynonymFilter.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockSynonymFilter.java @@ -15,11 +15,13 @@ * limitations under the License. */ -package org.apache.lucene.analysis; +package org.apache.lucene.tests.analysis; import java.io.IOException; import java.util.ArrayList; import java.util.List; +import org.apache.lucene.analysis.TokenFilter; +import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockTokenFilter.java b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockTokenFilter.java similarity index 97% rename from lucene/test-framework/src/java/org/apache/lucene/analysis/MockTokenFilter.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockTokenFilter.java index e1c72070b29..991e4f45b7b 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockTokenFilter.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockTokenFilter.java @@ -14,13 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis; +package org.apache.lucene.tests.analysis; import static org.apache.lucene.util.automaton.Automata.makeEmpty; import static org.apache.lucene.util.automaton.Automata.makeString; import java.io.IOException; import java.util.Arrays; +import org.apache.lucene.analysis.TokenFilter; +import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; import org.apache.lucene.util.automaton.CharacterRunAutomaton; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockTokenizer.java b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockTokenizer.java similarity index 99% rename from lucene/test-framework/src/java/org/apache/lucene/analysis/MockTokenizer.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockTokenizer.java index 01976bbb44b..a3e0343b896 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockTokenizer.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockTokenizer.java @@ -14,12 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis; +package org.apache.lucene.tests.analysis; import com.carrotsearch.randomizedtesting.RandomizedContext; import java.io.IOException; import java.nio.CharBuffer; import java.util.Random; +import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.util.AttributeFactory; @@ -339,7 +340,7 @@ public void close() throws IOException { } @Override - void setReaderTestPoint() { + protected void setReaderTestPoint() { try { if (streamState != State.CLOSE) { fail("setReader() called in wrong state: " + streamState); diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockUTF16TermAttributeImpl.java b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockUTF16TermAttributeImpl.java similarity index 97% rename from lucene/test-framework/src/java/org/apache/lucene/analysis/MockUTF16TermAttributeImpl.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockUTF16TermAttributeImpl.java index fe8d652b20e..fb28e6fb1a5 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockUTF16TermAttributeImpl.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockUTF16TermAttributeImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis; +package org.apache.lucene.tests.analysis; import java.nio.charset.StandardCharsets; import org.apache.lucene.analysis.tokenattributes.CharTermAttributeImpl; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockVariableLengthPayloadFilter.java b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockVariableLengthPayloadFilter.java similarity index 92% rename from lucene/test-framework/src/java/org/apache/lucene/analysis/MockVariableLengthPayloadFilter.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockVariableLengthPayloadFilter.java index 11c1c0fa4d1..a696188e3c5 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockVariableLengthPayloadFilter.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/MockVariableLengthPayloadFilter.java @@ -14,10 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis; +package org.apache.lucene.tests.analysis; import java.io.IOException; import java.util.Random; +import org.apache.lucene.analysis.TokenFilter; +import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.PayloadAttribute; import org.apache.lucene.util.BytesRef; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/SimplePayloadFilter.java b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/SimplePayloadFilter.java similarity index 93% rename from lucene/test-framework/src/java/org/apache/lucene/analysis/SimplePayloadFilter.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/analysis/SimplePayloadFilter.java index 7324d52809e..dde3e8d8aa0 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/SimplePayloadFilter.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/SimplePayloadFilter.java @@ -14,10 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis; +package org.apache.lucene.tests.analysis; import java.io.IOException; import java.nio.charset.StandardCharsets; +import org.apache.lucene.analysis.TokenFilter; +import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.PayloadAttribute; import org.apache.lucene.util.BytesRef; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/Token.java b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/Token.java similarity index 99% rename from lucene/test-framework/src/java/org/apache/lucene/analysis/Token.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/analysis/Token.java index 4940e0b0637..193d57e82b2 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/Token.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/Token.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis; +package org.apache.lucene.tests.analysis; import org.apache.lucene.analysis.tokenattributes.FlagsAttribute; import org.apache.lucene.analysis.tokenattributes.PackedTokenAttributeImpl; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/TokenStreamToDot.java b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/TokenStreamToDot.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/analysis/TokenStreamToDot.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/analysis/TokenStreamToDot.java index cef3b88de8a..999334858f2 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/TokenStreamToDot.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/TokenStreamToDot.java @@ -14,10 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis; +package org.apache.lucene.tests.analysis; import java.io.IOException; import java.io.PrintWriter; +import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/ValidatingTokenFilter.java b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/ValidatingTokenFilter.java similarity index 97% rename from lucene/test-framework/src/java/org/apache/lucene/analysis/ValidatingTokenFilter.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/analysis/ValidatingTokenFilter.java index 0f37ac66470..3523b69c2d6 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/ValidatingTokenFilter.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/ValidatingTokenFilter.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis; +package org.apache.lucene.tests.analysis; import java.io.IOException; import java.io.PrintStream; @@ -23,6 +23,8 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import org.apache.lucene.analysis.TokenFilter; +import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; @@ -211,7 +213,7 @@ private void addToken(int startOffset, int endOffset, int posInc) { */ public static void dumpValidatingTokenFilters(TokenStream in, PrintStream out) { if (in instanceof TokenFilter) { - dumpValidatingTokenFilters(((TokenFilter) in).input, out); + dumpValidatingTokenFilters(((TokenFilter) in).unwrap(), out); if (in instanceof ValidatingTokenFilter) { out.println(((ValidatingTokenFilter) in).dump()); } diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/VocabularyAssert.java b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/VocabularyAssert.java similarity index 97% rename from lucene/test-framework/src/java/org/apache/lucene/analysis/VocabularyAssert.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/analysis/VocabularyAssert.java index 1a8eb934e44..5da8ce80fd9 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/VocabularyAssert.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/VocabularyAssert.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis; +package org.apache.lucene.tests.analysis; import java.io.BufferedReader; import java.io.IOException; @@ -23,6 +23,7 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; +import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.junit.Assert; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/package-info.java b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/package-info.java new file mode 100644 index 00000000000..cc7cb816969 --- /dev/null +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/package-info.java @@ -0,0 +1,39 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * Support for testing analysis components. + * + *

The main classes of interest are: + * + *

    + *
  • {@link org.apache.lucene.tests.analysis.BaseTokenStreamTestCase}: Highly recommended to use + * its helper methods, (especially in conjunction with {@link + * org.apache.lucene.tests.analysis.MockAnalyzer} or {@link + * org.apache.lucene.tests.analysis.MockTokenizer}), as it contains many assertions and checks + * to catch bugs. + *
  • {@link org.apache.lucene.tests.analysis.MockTokenizer}: Tokenizer for testing. Tokenizer + * that serves as a replacement for WHITESPACE, SIMPLE, and KEYWORD tokenizers. If you are + * writing a component such as a {@link org.apache.lucene.analysis.TokenFilter}, it's a great + * idea to test it wrapping this tokenizer instead for extra checks. + *
  • {@link org.apache.lucene.tests.analysis.MockAnalyzer}: Analyzer for testing. Analyzer that + * uses MockTokenizer for additional verification. If you are testing a custom component such + * as a queryparser or analyzer-wrapper that consumes analysis streams, it's a great idea to + * test it with this analyzer instead. + *
+ */ +package org.apache.lucene.tests.analysis; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/standard/EmojiTokenizationTestUnicode_12_1.java b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/standard/EmojiTokenizationTestUnicode_12_1.java similarity index 99% rename from lucene/test-framework/src/java/org/apache/lucene/analysis/standard/EmojiTokenizationTestUnicode_12_1.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/analysis/standard/EmojiTokenizationTestUnicode_12_1.java index 8defc01f004..3e291100914 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/standard/EmojiTokenizationTestUnicode_12_1.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/standard/EmojiTokenizationTestUnicode_12_1.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.lucene.analysis.standard; +package org.apache.lucene.tests.analysis.standard; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.junit.Ignore; /** diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/standard/WordBreakTestUnicode_12_1_0.java b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/standard/WordBreakTestUnicode_12_1_0.java similarity index 99% rename from lucene/test-framework/src/java/org/apache/lucene/analysis/standard/WordBreakTestUnicode_12_1_0.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/analysis/standard/WordBreakTestUnicode_12_1_0.java index 66474a9e26c..238301c7f3c 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/standard/WordBreakTestUnicode_12_1_0.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/standard/WordBreakTestUnicode_12_1_0.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.lucene.analysis.standard; +package org.apache.lucene.tests.analysis.standard; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.junit.Ignore; /** diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/standard/generateEmojiTokenizationTest.pl b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/standard/generateEmojiTokenizationTest.pl similarity index 99% rename from lucene/test-framework/src/java/org/apache/lucene/analysis/standard/generateEmojiTokenizationTest.pl rename to lucene/test-framework/src/java/org/apache/lucene/tests/analysis/standard/generateEmojiTokenizationTest.pl index 446253d8f3e..95c504f2fcc 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/standard/generateEmojiTokenizationTest.pl +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/standard/generateEmojiTokenizationTest.pl @@ -53,7 +53,7 @@ * limitations under the License. */ -package org.apache.lucene.analysis.standard; +package org.apache.lucene.tests.analysis.standard; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.BaseTokenStreamTestCase; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/standard/generateJavaUnicodeWordBreakTest.pl b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/standard/generateJavaUnicodeWordBreakTest.pl similarity index 99% rename from lucene/test-framework/src/java/org/apache/lucene/analysis/standard/generateJavaUnicodeWordBreakTest.pl rename to lucene/test-framework/src/java/org/apache/lucene/tests/analysis/standard/generateJavaUnicodeWordBreakTest.pl index fd86b83037e..07f7afe86ff 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/standard/generateJavaUnicodeWordBreakTest.pl +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/standard/generateJavaUnicodeWordBreakTest.pl @@ -59,7 +59,7 @@ * limitations under the License. */ -package org.apache.lucene.analysis.standard; +package org.apache.lucene.tests.analysis.standard; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.BaseTokenStreamTestCase; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/standard/package-info.java b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/standard/package-info.java new file mode 100644 index 00000000000..f2d4e6c0b13 --- /dev/null +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/standard/package-info.java @@ -0,0 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * Classes to support {@link org.apache.lucene.analysis.standard.StandardAnalyzer} component + * testing. + */ +package org.apache.lucene.tests.analysis.standard; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/geo/BaseGeoPointTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/geo/BaseGeoPointTestCase.java index 5213c12607e..057104f443b 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/geo/BaseGeoPointTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/geo/BaseGeoPointTestCase.java @@ -25,7 +25,6 @@ import java.util.Locale; import java.util.Set; import java.util.function.Consumer; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.FilterCodec; import org.apache.lucene.codecs.PointsFormat; @@ -66,6 +65,7 @@ import org.apache.lucene.search.Sort; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/geo/BaseXYPointTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/geo/BaseXYPointTestCase.java index 84698530082..ebeffcf1a83 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/geo/BaseXYPointTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/geo/BaseXYPointTestCase.java @@ -25,7 +25,6 @@ import java.util.Locale; import java.util.Set; import java.util.function.Consumer; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.FilterCodec; import org.apache.lucene.codecs.PointsFormat; @@ -65,6 +64,7 @@ import org.apache.lucene.search.Sort; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/search/BaseExplanationTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/search/BaseExplanationTestCase.java index be87c18b0d6..00a8fcd7edd 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/search/BaseExplanationTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/search/BaseExplanationTestCase.java @@ -17,7 +17,6 @@ package org.apache.lucene.tests.search; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.SortedDocValuesField; @@ -30,6 +29,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.junit.AfterClass; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/search/MatchesTestBase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/search/MatchesTestBase.java index c4a9b719f28..80326dbfb06 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/search/MatchesTestBase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/search/MatchesTestBase.java @@ -25,7 +25,6 @@ import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.FieldType; import org.apache.lucene.document.IntPoint; @@ -44,6 +43,7 @@ import org.apache.lucene.search.ScoreMode; import org.apache.lucene.search.Weight; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; /** diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/search/SearchEquivalenceTestBase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/search/SearchEquivalenceTestBase.java index 7e469247251..9c969611603 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/search/SearchEquivalenceTestBase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/search/SearchEquivalenceTestBase.java @@ -19,8 +19,6 @@ import java.util.BitSet; import java.util.Random; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.StringField; @@ -38,6 +36,8 @@ import org.apache.lucene.search.TermRangeQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/search/ShardSearchingTestBase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/search/ShardSearchingTestBase.java index a198ebae0f8..0084e16631a 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/search/ShardSearchingTestBase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/search/ShardSearchingTestBase.java @@ -24,7 +24,6 @@ import java.util.Random; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; @@ -42,6 +41,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.TopFieldDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/store/BaseChunkedDirectoryTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/store/BaseChunkedDirectoryTestCase.java index d2ddcca6e36..375a2c30c62 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/store/BaseChunkedDirectoryTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/store/BaseChunkedDirectoryTestCase.java @@ -19,7 +19,6 @@ import java.io.IOException; import java.nio.file.Path; import java.util.Random; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; @@ -30,6 +29,7 @@ import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; import org.apache.lucene.store.MMapDirectory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/store/BaseLockFactoryTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/store/BaseLockFactoryTestCase.java index 19bd7d92cc0..e614695ac3f 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/store/BaseLockFactoryTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/store/BaseLockFactoryTestCase.java @@ -26,7 +26,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.ReentrantLock; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.DirectoryReader; @@ -42,6 +41,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.Lock; import org.apache.lucene.store.LockObtainFailedException; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Constants; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java index 5ae0dba4ad9..ec7c9add8c0 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java @@ -102,7 +102,6 @@ import java.util.stream.Collectors; import junit.framework.AssertionFailedError; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.Field.Store; @@ -128,6 +127,7 @@ import org.apache.lucene.store.MMapDirectory; import org.apache.lucene.store.MergeInfo; import org.apache.lucene.store.NRTCachingDirectory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.mockfile.FilterPath; import org.apache.lucene.tests.mockfile.VirusCheckingFS; import org.apache.lucene.tests.search.AssertingIndexSearcher; diff --git a/lucene/test-framework/src/test/org/apache/lucene/codecs/lucene90/compressing/TestCompressingStoredFieldsFormat.java b/lucene/test-framework/src/test/org/apache/lucene/codecs/lucene90/compressing/TestCompressingStoredFieldsFormat.java index ad1f7866539..bbc0820acdc 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/codecs/lucene90/compressing/TestCompressingStoredFieldsFormat.java +++ b/lucene/test-framework/src/test/org/apache/lucene/codecs/lucene90/compressing/TestCompressingStoredFieldsFormat.java @@ -19,7 +19,6 @@ import com.carrotsearch.randomizedtesting.generators.RandomNumbers; import java.io.IOException; import java.util.Random; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.compressing.CompressingCodec; import org.apache.lucene.document.Document; @@ -37,6 +36,7 @@ import org.apache.lucene.store.ByteArrayDataInput; import org.apache.lucene.store.ByteArrayDataOutput; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; public class TestCompressingStoredFieldsFormat extends BaseStoredFieldsFormatTestCase { diff --git a/lucene/test-framework/src/test/org/apache/lucene/codecs/lucene90/compressing/TestCompressingTermVectorsFormat.java b/lucene/test-framework/src/test/org/apache/lucene/codecs/lucene90/compressing/TestCompressingTermVectorsFormat.java index 42f030a1dd8..8c71feca392 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/codecs/lucene90/compressing/TestCompressingTermVectorsFormat.java +++ b/lucene/test-framework/src/test/org/apache/lucene/codecs/lucene90/compressing/TestCompressingTermVectorsFormat.java @@ -17,7 +17,6 @@ package org.apache.lucene.codecs.lucene90.compressing; import java.io.IOException; -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.compressing.CompressingCodec; import org.apache.lucene.document.Document; @@ -37,6 +36,7 @@ import org.apache.lucene.index.TermsEnum; import org.apache.lucene.index.TermsEnum.SeekStatus; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.util.BytesRef; public class TestCompressingTermVectorsFormat extends BaseTermVectorsFormatTestCase { diff --git a/lucene/test-framework/src/test/org/apache/lucene/analysis/TestLookaheadTokenFilter.java b/lucene/test-framework/src/test/org/apache/lucene/tests/analysis/TestLookaheadTokenFilter.java similarity index 95% rename from lucene/test-framework/src/test/org/apache/lucene/analysis/TestLookaheadTokenFilter.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/analysis/TestLookaheadTokenFilter.java index aa3d735e7e9..5003ac8a0bb 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/analysis/TestLookaheadTokenFilter.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/analysis/TestLookaheadTokenFilter.java @@ -14,10 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis; +package org.apache.lucene.tests.analysis; import java.io.IOException; import java.util.Random; +import org.apache.lucene.analysis.Analyzer; +import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.Tokenizer; public class TestLookaheadTokenFilter extends BaseTokenStreamTestCase { diff --git a/lucene/test-framework/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java b/lucene/test-framework/src/test/org/apache/lucene/tests/analysis/TestMockAnalyzer.java similarity index 97% rename from lucene/test-framework/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/analysis/TestMockAnalyzer.java index fd8914f824e..83296cc08c6 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/analysis/TestMockAnalyzer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis; +package org.apache.lucene.tests.analysis; import static org.apache.lucene.util.automaton.Operations.DEFAULT_DETERMINIZE_WORK_LIMIT; @@ -22,6 +22,11 @@ import java.io.StringReader; import java.util.Arrays; import java.util.Random; +import org.apache.lucene.analysis.Analyzer; +import org.apache.lucene.analysis.AnalyzerWrapper; +import org.apache.lucene.analysis.DelegatingAnalyzerWrapper; +import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; diff --git a/lucene/test-framework/src/test/org/apache/lucene/analysis/TestMockCharFilter.java b/lucene/test-framework/src/test/org/apache/lucene/tests/analysis/TestMockCharFilter.java similarity index 93% rename from lucene/test-framework/src/test/org/apache/lucene/analysis/TestMockCharFilter.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/analysis/TestMockCharFilter.java index 2b321e4ef89..f26eb5bdbf8 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/analysis/TestMockCharFilter.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/analysis/TestMockCharFilter.java @@ -14,10 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis; +package org.apache.lucene.tests.analysis; import java.io.IOException; import java.io.Reader; +import org.apache.lucene.analysis.Analyzer; +import org.apache.lucene.analysis.Tokenizer; public class TestMockCharFilter extends BaseTokenStreamTestCase { diff --git a/lucene/test-framework/src/test/org/apache/lucene/analysis/TestMockSynonymFilter.java b/lucene/test-framework/src/test/org/apache/lucene/tests/analysis/TestMockSynonymFilter.java similarity index 98% rename from lucene/test-framework/src/test/org/apache/lucene/analysis/TestMockSynonymFilter.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/analysis/TestMockSynonymFilter.java index e0d4282883e..8b62e613551 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/analysis/TestMockSynonymFilter.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/analysis/TestMockSynonymFilter.java @@ -14,9 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis; +package org.apache.lucene.tests.analysis; import java.io.IOException; +import org.apache.lucene.analysis.Analyzer; /** test the mock synonym filter */ public class TestMockSynonymFilter extends BaseTokenStreamTestCase { diff --git a/lucene/test-framework/src/test/org/apache/lucene/analysis/TestPosition.java b/lucene/test-framework/src/test/org/apache/lucene/tests/analysis/TestPosition.java similarity index 96% rename from lucene/test-framework/src/test/org/apache/lucene/analysis/TestPosition.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/analysis/TestPosition.java index 7726044040b..a0bbd124094 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/analysis/TestPosition.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/analysis/TestPosition.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis; +package org.apache.lucene.tests.analysis; import org.junit.Ignore; diff --git a/lucene/test-framework/src/test/org/apache/lucene/analysis/TestToken.java b/lucene/test-framework/src/test/org/apache/lucene/tests/analysis/TestToken.java similarity index 98% rename from lucene/test-framework/src/test/org/apache/lucene/analysis/TestToken.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/analysis/TestToken.java index dedd0ceff30..782f7545024 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/analysis/TestToken.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/analysis/TestToken.java @@ -14,10 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis; +package org.apache.lucene.tests.analysis; import java.io.StringReader; import java.util.HashMap; +import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.FlagsAttribute; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; diff --git a/lucene/test-framework/src/test/org/apache/lucene/analysis/TrivialLookaheadFilter.java b/lucene/test-framework/src/test/org/apache/lucene/tests/analysis/TrivialLookaheadFilter.java similarity index 97% rename from lucene/test-framework/src/test/org/apache/lucene/analysis/TrivialLookaheadFilter.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/analysis/TrivialLookaheadFilter.java index d4f57107886..4bb031c303d 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/analysis/TrivialLookaheadFilter.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/analysis/TrivialLookaheadFilter.java @@ -14,11 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis; +package org.apache.lucene.tests.analysis; import java.io.IOException; import java.util.ArrayList; import java.util.List; +import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; From 3aa3379547ba6d038ddddae399b2430a2006e4f7 Mon Sep 17 00:00:00 2001 From: Dawid Weiss Date: Sun, 19 Dec 2021 21:22:01 +0100 Subject: [PATCH 09/32] Moved asserting codec. --- .../BaseLucene80DocValuesFormatTestCase.java | 2 +- .../org/apache/lucene/TestExternalCodecs.java | 2 +- .../lucene90/TestLucene90DocValuesFormat.java | 2 +- .../perfield/TestPerFieldDocValuesFormat.java | 2 +- .../TestPerFieldKnnVectorsFormat.java | 2 +- .../perfield/TestPerFieldPostingsFormat2.java | 2 +- .../apache/lucene/index/TestAddIndexes.java | 2 +- .../index/TestBinaryDocValuesUpdates.java | 4 +- .../index/TestIndexWriterExceptions2.java | 2 +- .../index/TestNumericDocValuesUpdates.java | 4 +- .../lucene/codecs/MissingOrdRemapper.java | 120 ------------------ .../org/apache/lucene/codecs/package.html | 26 ---- .../org/apache/lucene/index/RandomCodec.java | 8 +- .../codecs/asserting/AssertingCodec.java | 2 +- .../asserting/AssertingDocValuesFormat.java | 2 +- .../asserting/AssertingKnnVectorsFormat.java | 2 +- .../asserting/AssertingLiveDocsFormat.java | 2 +- .../asserting/AssertingNormsFormat.java | 2 +- .../asserting/AssertingPointsFormat.java | 2 +- .../asserting/AssertingPostingsFormat.java | 2 +- .../AssertingStoredFieldsFormat.java | 2 +- .../asserting/AssertingTermVectorsFormat.java | 2 +- .../codecs/asserting/package-info.java | 2 +- .../lucene/tests/codecs/package-info.java | 19 +++ .../util/TestRuleSetupAndRestoreClassEnv.java | 6 +- .../apache/lucene/tests/util/TestUtil.java | 2 +- .../services/org.apache.lucene.codecs.Codec | 2 +- .../org.apache.lucene.codecs.DocValuesFormat | 2 +- .../org.apache.lucene.codecs.KnnVectorsFormat | 2 +- .../org.apache.lucene.codecs.PostingsFormat | 2 +- .../TestAssertingDocValuesFormat.java | 2 +- .../asserting/TestAssertingNormsFormat.java | 2 +- .../asserting/TestAssertingPointsFormat.java | 2 +- .../TestAssertingPostingsFormat.java | 2 +- .../TestAssertingStoredFieldsFormat.java | 2 +- .../TestAssertingTermVectorsFormat.java | 2 +- 36 files changed, 59 insertions(+), 186 deletions(-) delete mode 100644 lucene/test-framework/src/java/org/apache/lucene/codecs/MissingOrdRemapper.java delete mode 100644 lucene/test-framework/src/java/org/apache/lucene/codecs/package.html rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/asserting/AssertingCodec.java (99%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/asserting/AssertingDocValuesFormat.java (99%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/asserting/AssertingKnnVectorsFormat.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/asserting/AssertingLiveDocsFormat.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/asserting/AssertingNormsFormat.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/asserting/AssertingPointsFormat.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/asserting/AssertingPostingsFormat.java (99%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/asserting/AssertingStoredFieldsFormat.java (99%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/asserting/AssertingTermVectorsFormat.java (99%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/asserting/package-info.java (94%) create mode 100644 lucene/test-framework/src/java/org/apache/lucene/tests/codecs/package-info.java rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/codecs/asserting/TestAssertingDocValuesFormat.java (95%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/codecs/asserting/TestAssertingNormsFormat.java (95%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/codecs/asserting/TestAssertingPointsFormat.java (95%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/codecs/asserting/TestAssertingPostingsFormat.java (96%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/codecs/asserting/TestAssertingStoredFieldsFormat.java (95%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/codecs/asserting/TestAssertingTermVectorsFormat.java (96%) diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/BaseLucene80DocValuesFormatTestCase.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/BaseLucene80DocValuesFormatTestCase.java index 33e1b9813da..3f941a403af 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/BaseLucene80DocValuesFormatTestCase.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/BaseLucene80DocValuesFormatTestCase.java @@ -28,7 +28,6 @@ import java.util.function.Supplier; import org.apache.lucene.codecs.DocValuesFormat; import org.apache.lucene.codecs.PostingsFormat; -import org.apache.lucene.codecs.asserting.AssertingCodec; import org.apache.lucene.codecs.perfield.PerFieldDocValuesFormat; import org.apache.lucene.document.BinaryDocValuesField; import org.apache.lucene.document.Document; @@ -63,6 +62,7 @@ import org.apache.lucene.store.ByteBuffersDataOutput; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.codecs.asserting.AssertingCodec; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; diff --git a/lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java b/lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java index a12f4cbc984..56067b27f9b 100644 --- a/lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java +++ b/lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java @@ -17,7 +17,6 @@ package org.apache.lucene; import org.apache.lucene.codecs.PostingsFormat; -import org.apache.lucene.codecs.asserting.AssertingCodec; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.DirectoryReader; @@ -27,6 +26,7 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.TermQuery; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.codecs.asserting.AssertingCodec; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90DocValuesFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90DocValuesFormat.java index 81d012f0a41..32ef5b0348d 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90DocValuesFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90DocValuesFormat.java @@ -31,7 +31,6 @@ import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.DocValuesFormat; import org.apache.lucene.codecs.PostingsFormat; -import org.apache.lucene.codecs.asserting.AssertingCodec; import org.apache.lucene.codecs.perfield.PerFieldDocValuesFormat; import org.apache.lucene.document.BinaryDocValuesField; import org.apache.lucene.document.Document; @@ -66,6 +65,7 @@ import org.apache.lucene.store.ByteBuffersDataOutput; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.codecs.asserting.AssertingCodec; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; diff --git a/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java index afa28f758bd..d7b2a4ff3a6 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java @@ -28,7 +28,6 @@ import org.apache.lucene.codecs.DocValuesConsumer; import org.apache.lucene.codecs.DocValuesFormat; import org.apache.lucene.codecs.DocValuesProducer; -import org.apache.lucene.codecs.asserting.AssertingCodec; import org.apache.lucene.document.BinaryDocValuesField; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -53,6 +52,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.codecs.asserting.AssertingCodec; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldKnnVectorsFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldKnnVectorsFormat.java index 769669e8100..72254e891b6 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldKnnVectorsFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldKnnVectorsFormat.java @@ -27,7 +27,6 @@ import org.apache.lucene.codecs.KnnVectorsFormat; import org.apache.lucene.codecs.KnnVectorsReader; import org.apache.lucene.codecs.KnnVectorsWriter; -import org.apache.lucene.codecs.asserting.AssertingCodec; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.KnnVectorField; @@ -46,6 +45,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.codecs.asserting.AssertingCodec; import org.apache.lucene.tests.util.TestUtil; import org.hamcrest.MatcherAssert; diff --git a/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat2.java b/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat2.java index 9e0e50cccbf..6748331f25c 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat2.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat2.java @@ -27,7 +27,6 @@ import org.apache.lucene.codecs.FieldsProducer; import org.apache.lucene.codecs.NormsProducer; import org.apache.lucene.codecs.PostingsFormat; -import org.apache.lucene.codecs.asserting.AssertingCodec; import org.apache.lucene.codecs.blockterms.LuceneVarGapFixedInterval; import org.apache.lucene.codecs.memory.DirectPostingsFormat; import org.apache.lucene.document.Document; @@ -54,6 +53,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.codecs.asserting.AssertingCodec; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.junit.Test; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java b/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java index 5f91a074715..e79514aca78 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java @@ -24,7 +24,6 @@ import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.FilterCodec; import org.apache.lucene.codecs.PostingsFormat; -import org.apache.lucene.codecs.asserting.AssertingCodec; import org.apache.lucene.codecs.memory.DirectPostingsFormat; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -43,6 +42,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.LockObtainFailedException; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.codecs.asserting.AssertingCodec; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestBinaryDocValuesUpdates.java b/lucene/core/src/test/org/apache/lucene/index/TestBinaryDocValuesUpdates.java index 74ca3cbd153..1743bf249e6 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestBinaryDocValuesUpdates.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestBinaryDocValuesUpdates.java @@ -28,8 +28,6 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; import org.apache.lucene.codecs.DocValuesFormat; -import org.apache.lucene.codecs.asserting.AssertingCodec; -import org.apache.lucene.codecs.asserting.AssertingDocValuesFormat; import org.apache.lucene.document.BinaryDocValuesField; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -44,6 +42,8 @@ import org.apache.lucene.store.NRTCachingDirectory; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.codecs.asserting.AssertingCodec; +import org.apache.lucene.tests.codecs.asserting.AssertingDocValuesFormat; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions2.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions2.java index 45f16e10527..f340432dc6e 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions2.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions2.java @@ -23,7 +23,6 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.codecs.asserting.AssertingCodec; import org.apache.lucene.codecs.cranky.CrankyCodec; import org.apache.lucene.document.BinaryDocValuesField; import org.apache.lucene.document.Document; @@ -41,6 +40,7 @@ import org.apache.lucene.tests.analysis.CrankyTokenFilter; import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.analysis.MockVariableLengthPayloadFilter; +import org.apache.lucene.tests.codecs.asserting.AssertingCodec; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java b/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java index 2f277718330..8a5c936c452 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java @@ -28,8 +28,6 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; import org.apache.lucene.codecs.DocValuesFormat; -import org.apache.lucene.codecs.asserting.AssertingCodec; -import org.apache.lucene.codecs.asserting.AssertingDocValuesFormat; import org.apache.lucene.document.BinaryDocValuesField; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -49,6 +47,8 @@ import org.apache.lucene.store.NRTCachingDirectory; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.codecs.asserting.AssertingCodec; +import org.apache.lucene.tests.codecs.asserting.AssertingDocValuesFormat; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/MissingOrdRemapper.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/MissingOrdRemapper.java deleted file mode 100644 index b3a0805c392..00000000000 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/MissingOrdRemapper.java +++ /dev/null @@ -1,120 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.lucene.codecs; - -import java.util.Iterator; -import org.apache.lucene.util.BytesRef; - -/** - * a utility class to write missing values for SORTED as if they were the empty string (to simulate - * pre-Lucene4.5 dv behavior for testing old codecs) - */ -public class MissingOrdRemapper { - - /** insert an empty byte[] to the front of this iterable */ - public static Iterable insertEmptyValue(final Iterable iterable) { - return new Iterable() { - @Override - public Iterator iterator() { - return new Iterator() { - boolean seenEmpty = false; - Iterator in = iterable.iterator(); - - @Override - public boolean hasNext() { - return !seenEmpty || in.hasNext(); - } - - @Override - public BytesRef next() { - if (!seenEmpty) { - seenEmpty = true; - return new BytesRef(); - } else { - return in.next(); - } - } - - @Override - public void remove() { - throw new UnsupportedOperationException(); - } - }; - } - }; - } - - /** remaps ord -1 to ord 0 on this iterable. */ - public static Iterable mapMissingToOrd0(final Iterable iterable) { - return new Iterable() { - @Override - public Iterator iterator() { - return new Iterator() { - Iterator in = iterable.iterator(); - - @Override - public boolean hasNext() { - return in.hasNext(); - } - - @Override - public Number next() { - Number n = in.next(); - if (n.longValue() == -1) { - return 0; - } else { - return n; - } - } - - @Override - public void remove() { - throw new UnsupportedOperationException(); - } - }; - } - }; - } - - /** remaps every ord+1 on this iterable */ - public static Iterable mapAllOrds(final Iterable iterable) { - return new Iterable() { - @Override - public Iterator iterator() { - return new Iterator() { - Iterator in = iterable.iterator(); - - @Override - public boolean hasNext() { - return in.hasNext(); - } - - @Override - public Number next() { - Number n = in.next(); - return n.longValue() + 1; - } - - @Override - public void remove() { - throw new UnsupportedOperationException(); - } - }; - } - }; - } -} diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/package.html b/lucene/test-framework/src/java/org/apache/lucene/codecs/package.html deleted file mode 100644 index 3185dec7d2e..00000000000 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/package.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - -Codecs for testing (simulate old disk formats, wacky theoretical use cases, etc) - - diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java b/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java index 7d800a9bf1a..5c788a8e20a 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java @@ -30,10 +30,6 @@ import org.apache.lucene.codecs.PointsReader; import org.apache.lucene.codecs.PointsWriter; import org.apache.lucene.codecs.PostingsFormat; -import org.apache.lucene.codecs.asserting.AssertingCodec; -import org.apache.lucene.codecs.asserting.AssertingDocValuesFormat; -import org.apache.lucene.codecs.asserting.AssertingPointsFormat; -import org.apache.lucene.codecs.asserting.AssertingPostingsFormat; import org.apache.lucene.codecs.blockterms.LuceneFixedGap; import org.apache.lucene.codecs.blockterms.LuceneVarGapDocFreqInterval; import org.apache.lucene.codecs.blockterms.LuceneVarGapFixedInterval; @@ -47,6 +43,10 @@ import org.apache.lucene.codecs.mockrandom.MockRandomPostingsFormat; import org.apache.lucene.index.PointValues.IntersectVisitor; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.codecs.asserting.AssertingCodec; +import org.apache.lucene.tests.codecs.asserting.AssertingDocValuesFormat; +import org.apache.lucene.tests.codecs.asserting.AssertingPointsFormat; +import org.apache.lucene.tests.codecs.asserting.AssertingPostingsFormat; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.bkd.BKDConfig; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingCodec.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingCodec.java similarity index 99% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingCodec.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingCodec.java index ac56dd9dbd9..0aded31855e 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingCodec.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingCodec.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.codecs.asserting; +package org.apache.lucene.tests.codecs.asserting; import org.apache.lucene.codecs.DocValuesFormat; import org.apache.lucene.codecs.FilterCodec; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingDocValuesFormat.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingDocValuesFormat.java similarity index 99% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingDocValuesFormat.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingDocValuesFormat.java index 83abab14214..9b35210a896 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingDocValuesFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingDocValuesFormat.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.codecs.asserting; +package org.apache.lucene.tests.codecs.asserting; import static org.apache.lucene.search.DocIdSetIterator.NO_MORE_DOCS; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingKnnVectorsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingKnnVectorsFormat.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingKnnVectorsFormat.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingKnnVectorsFormat.java index bc8fd84a3a5..6b17d3655ac 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingKnnVectorsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingKnnVectorsFormat.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.codecs.asserting; +package org.apache.lucene.tests.codecs.asserting; import java.io.IOException; import org.apache.lucene.codecs.KnnVectorsFormat; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingLiveDocsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingLiveDocsFormat.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingLiveDocsFormat.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingLiveDocsFormat.java index 95a82a3bec9..f45ea821a55 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingLiveDocsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingLiveDocsFormat.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.codecs.asserting; +package org.apache.lucene.tests.codecs.asserting; import java.io.IOException; import java.util.Collection; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingNormsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingNormsFormat.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingNormsFormat.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingNormsFormat.java index b034ac3d16e..f987cc7dcf4 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingNormsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingNormsFormat.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.codecs.asserting; +package org.apache.lucene.tests.codecs.asserting; import static org.apache.lucene.search.DocIdSetIterator.NO_MORE_DOCS; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPointsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingPointsFormat.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPointsFormat.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingPointsFormat.java index c10c0d84b38..41c2ff2505c 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPointsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingPointsFormat.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.codecs.asserting; +package org.apache.lucene.tests.codecs.asserting; import java.io.IOException; import org.apache.lucene.codecs.PointsFormat; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingPostingsFormat.java similarity index 99% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingPostingsFormat.java index fd136f3d6ac..9d628bdcc33 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingPostingsFormat.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.codecs.asserting; +package org.apache.lucene.tests.codecs.asserting; import java.io.IOException; import java.util.Iterator; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingStoredFieldsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingStoredFieldsFormat.java similarity index 99% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingStoredFieldsFormat.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingStoredFieldsFormat.java index af22cf85356..ed750557c71 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingStoredFieldsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingStoredFieldsFormat.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.codecs.asserting; +package org.apache.lucene.tests.codecs.asserting; import java.io.IOException; import java.util.Collection; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingTermVectorsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingTermVectorsFormat.java similarity index 99% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingTermVectorsFormat.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingTermVectorsFormat.java index 1bdb9b6b6c5..89f5ebb6087 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingTermVectorsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingTermVectorsFormat.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.codecs.asserting; +package org.apache.lucene.tests.codecs.asserting; import java.io.IOException; import java.util.Collection; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/package-info.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/package-info.java similarity index 94% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/package-info.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/package-info.java index 164584ed4a6..6b45094d9cc 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/package-info.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/package-info.java @@ -16,4 +16,4 @@ */ /** Codec for testing that asserts various contracts of the codec apis. */ -package org.apache.lucene.codecs.asserting; +package org.apache.lucene.tests.codecs.asserting; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/package-info.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/package-info.java new file mode 100644 index 00000000000..d7a8e90036c --- /dev/null +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/package-info.java @@ -0,0 +1,19 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** Codecs for testing (simulate old disk formats, wacky theoretical use cases, etc). */ +package org.apache.lucene.tests.codecs; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleSetupAndRestoreClassEnv.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleSetupAndRestoreClassEnv.java index e3eb25ffd47..cf2fae508c7 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleSetupAndRestoreClassEnv.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleSetupAndRestoreClassEnv.java @@ -38,9 +38,6 @@ import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.DocValuesFormat; import org.apache.lucene.codecs.PostingsFormat; -import org.apache.lucene.codecs.asserting.AssertingCodec; -import org.apache.lucene.codecs.asserting.AssertingDocValuesFormat; -import org.apache.lucene.codecs.asserting.AssertingPostingsFormat; import org.apache.lucene.codecs.cheapbastard.CheapBastardCodec; import org.apache.lucene.codecs.compressing.CompressingCodec; import org.apache.lucene.codecs.lucene90.Lucene90Codec; @@ -48,6 +45,9 @@ import org.apache.lucene.codecs.simpletext.SimpleTextCodec; import org.apache.lucene.index.RandomCodec; import org.apache.lucene.search.similarities.Similarity; +import org.apache.lucene.tests.codecs.asserting.AssertingCodec; +import org.apache.lucene.tests.codecs.asserting.AssertingDocValuesFormat; +import org.apache.lucene.tests.codecs.asserting.AssertingPostingsFormat; import org.apache.lucene.tests.search.similarities.AssertingSimilarity; import org.apache.lucene.tests.search.similarities.RandomSimilarity; import org.apache.lucene.tests.util.LuceneTestCase.LiveIWCFlushMode; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestUtil.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestUtil.java index c289658c387..3ada253241d 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestUtil.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestUtil.java @@ -52,7 +52,6 @@ import org.apache.lucene.codecs.DocValuesFormat; import org.apache.lucene.codecs.KnnVectorsFormat; import org.apache.lucene.codecs.PostingsFormat; -import org.apache.lucene.codecs.asserting.AssertingCodec; import org.apache.lucene.codecs.blockterms.LuceneFixedGap; import org.apache.lucene.codecs.blocktreeords.BlockTreeOrdsPostingsFormat; import org.apache.lucene.codecs.lucene90.Lucene90Codec; @@ -98,6 +97,7 @@ import org.apache.lucene.store.FilterDirectory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.NoLockFactory; +import org.apache.lucene.tests.codecs.asserting.AssertingCodec; import org.apache.lucene.tests.mockfile.FilterFileSystem; import org.apache.lucene.tests.mockfile.VirusCheckingFS; import org.apache.lucene.tests.mockfile.WindowsFS; diff --git a/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.Codec b/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.Codec index 618b6070c53..fc6319b0a37 100644 --- a/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.Codec +++ b/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.Codec @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -org.apache.lucene.codecs.asserting.AssertingCodec +org.apache.lucene.tests.codecs.asserting.AssertingCodec org.apache.lucene.codecs.cheapbastard.CheapBastardCodec org.apache.lucene.codecs.compressing.DeflateWithPresetCompressingCodec org.apache.lucene.codecs.compressing.FastCompressingCodec diff --git a/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat b/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat index d1798334486..de093fb221d 100644 --- a/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat +++ b/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -org.apache.lucene.codecs.asserting.AssertingDocValuesFormat +org.apache.lucene.tests.codecs.asserting.AssertingDocValuesFormat diff --git a/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.KnnVectorsFormat b/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.KnnVectorsFormat index 9526adff071..11aa4fb46c1 100644 --- a/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.KnnVectorsFormat +++ b/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.KnnVectorsFormat @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -org.apache.lucene.codecs.asserting.AssertingKnnVectorsFormat \ No newline at end of file +org.apache.lucene.tests.codecs.asserting.AssertingKnnVectorsFormat \ No newline at end of file diff --git a/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat b/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat index 1d6a3fc16d3..1e977949e6c 100644 --- a/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat +++ b/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat @@ -19,6 +19,6 @@ org.apache.lucene.codecs.blockterms.LuceneFixedGap org.apache.lucene.codecs.blockterms.LuceneVarGapFixedInterval org.apache.lucene.codecs.blockterms.LuceneVarGapDocFreqInterval org.apache.lucene.codecs.bloom.TestBloomFilteredLucenePostings -org.apache.lucene.codecs.asserting.AssertingPostingsFormat +org.apache.lucene.tests.codecs.asserting.AssertingPostingsFormat org.apache.lucene.codecs.uniformsplit.UniformSplitRot13PostingsFormat org.apache.lucene.codecs.uniformsplit.sharedterms.STUniformSplitRot13PostingsFormat \ No newline at end of file diff --git a/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingDocValuesFormat.java b/lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingDocValuesFormat.java similarity index 95% rename from lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingDocValuesFormat.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingDocValuesFormat.java index d63aeba1c46..55f7b7aa912 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingDocValuesFormat.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingDocValuesFormat.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.codecs.asserting; +package org.apache.lucene.tests.codecs.asserting; import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BaseDocValuesFormatTestCase; diff --git a/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingNormsFormat.java b/lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingNormsFormat.java similarity index 95% rename from lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingNormsFormat.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingNormsFormat.java index 943f1f59411..2a464f0517c 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingNormsFormat.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingNormsFormat.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.codecs.asserting; +package org.apache.lucene.tests.codecs.asserting; import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BaseNormsFormatTestCase; diff --git a/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingPointsFormat.java b/lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingPointsFormat.java similarity index 95% rename from lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingPointsFormat.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingPointsFormat.java index cc05e3d38b6..bfe717f7189 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingPointsFormat.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingPointsFormat.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.codecs.asserting; +package org.apache.lucene.tests.codecs.asserting; import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BasePointsFormatTestCase; diff --git a/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingPostingsFormat.java b/lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingPostingsFormat.java similarity index 96% rename from lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingPostingsFormat.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingPostingsFormat.java index 6b1798d13af..8661c52405e 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingPostingsFormat.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingPostingsFormat.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.codecs.asserting; +package org.apache.lucene.tests.codecs.asserting; import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BasePostingsFormatTestCase; diff --git a/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingStoredFieldsFormat.java b/lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingStoredFieldsFormat.java similarity index 95% rename from lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingStoredFieldsFormat.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingStoredFieldsFormat.java index c41e7fca5f9..687eb5ba846 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingStoredFieldsFormat.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingStoredFieldsFormat.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.codecs.asserting; +package org.apache.lucene.tests.codecs.asserting; import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BaseStoredFieldsFormatTestCase; diff --git a/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingTermVectorsFormat.java b/lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingTermVectorsFormat.java similarity index 96% rename from lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingTermVectorsFormat.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingTermVectorsFormat.java index 0b5debab9e0..0f8f0b7e9b3 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingTermVectorsFormat.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingTermVectorsFormat.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.codecs.asserting; +package org.apache.lucene.tests.codecs.asserting; import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BaseTermVectorsFormatTestCase; From 624c54c2f7bb10c49e4737d7c1a548d714cb2c7c Mon Sep 17 00:00:00 2001 From: Dawid Weiss Date: Sun, 19 Dec 2021 21:40:45 +0100 Subject: [PATCH 10/32] More codecs. --- .../TestFixedGapPostingsFormat.java | 1 + ...stVarGapDocFreqIntervalPostingsFormat.java | 1 + ...TestVarGapFixedIntervalPostingsFormat.java | 1 + .../apache/lucene/analysis/package-info.java | 2 +- .../perfield/TestPerFieldPostingsFormat2.java | 2 +- .../lucene/codecs/blockterms/package.html | 26 ------------------- .../org/apache/lucene/index/RandomCodec.java | 6 ++--- .../codecs/blockterms/LuceneFixedGap.java | 8 +++++- .../LuceneVarGapDocFreqInterval.java | 9 ++++++- .../blockterms/LuceneVarGapFixedInterval.java | 9 ++++++- .../tests/codecs/blockterms/package-info.java | 19 ++++++++++++++ .../apache/lucene/tests/util/TestUtil.java | 2 +- .../org.apache.lucene.codecs.PostingsFormat | 6 ++--- 13 files changed, 54 insertions(+), 38 deletions(-) delete mode 100644 lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/package.html rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/blockterms/LuceneFixedGap.java (89%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/blockterms/LuceneVarGapDocFreqInterval.java (89%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/blockterms/LuceneVarGapFixedInterval.java (88%) create mode 100644 lucene/test-framework/src/java/org/apache/lucene/tests/codecs/blockterms/package-info.java diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestFixedGapPostingsFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestFixedGapPostingsFormat.java index e441fe933e3..9bdbff53940 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestFixedGapPostingsFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestFixedGapPostingsFormat.java @@ -18,6 +18,7 @@ import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BasePostingsFormatTestCase; +import org.apache.lucene.tests.codecs.blockterms.LuceneFixedGap; import org.apache.lucene.tests.util.TestUtil; /** Basic tests of a PF using FixedGap terms dictionary */ diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestVarGapDocFreqIntervalPostingsFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestVarGapDocFreqIntervalPostingsFormat.java index e66a337ae39..e59c5590e71 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestVarGapDocFreqIntervalPostingsFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestVarGapDocFreqIntervalPostingsFormat.java @@ -18,6 +18,7 @@ import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BasePostingsFormatTestCase; +import org.apache.lucene.tests.codecs.blockterms.LuceneVarGapFixedInterval; import org.apache.lucene.tests.util.TestUtil; /** Basic tests of a PF using VariableGap terms dictionary (fixed interval) */ diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestVarGapFixedIntervalPostingsFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestVarGapFixedIntervalPostingsFormat.java index 29aeac9ff50..7874d717a12 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestVarGapFixedIntervalPostingsFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestVarGapFixedIntervalPostingsFormat.java @@ -18,6 +18,7 @@ import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BasePostingsFormatTestCase; +import org.apache.lucene.tests.codecs.blockterms.LuceneVarGapDocFreqInterval; import org.apache.lucene.tests.util.TestUtil; /** Basic tests of a PF using VariableGap terms dictionary (fixed interval, docFreq threshold) */ diff --git a/lucene/core/src/java/org/apache/lucene/analysis/package-info.java b/lucene/core/src/java/org/apache/lucene/analysis/package-info.java index 52f18765188..451227a6399 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/package-info.java @@ -553,7 +553,7 @@ *

Testing Your Analysis Component

* *

The lucene-test-framework component defines BaseTokenStreamTestCase. + * href="{@docRoot}/../test-framework/org/apache/lucene/tests/analysis/BaseTokenStreamTestCase.html">BaseTokenStreamTestCase. * By extending this class, you can create JUnit tests that validate that your Analyzer and/or * analysis components correctly implement the protocol. The checkRandomData methods of that class * are particularly effective in flushing out errors. diff --git a/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat2.java b/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat2.java index 6748331f25c..f77415fe4d3 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat2.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat2.java @@ -27,7 +27,6 @@ import org.apache.lucene.codecs.FieldsProducer; import org.apache.lucene.codecs.NormsProducer; import org.apache.lucene.codecs.PostingsFormat; -import org.apache.lucene.codecs.blockterms.LuceneVarGapFixedInterval; import org.apache.lucene.codecs.memory.DirectPostingsFormat; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -54,6 +53,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.codecs.asserting.AssertingCodec; +import org.apache.lucene.tests.codecs.blockterms.LuceneVarGapFixedInterval; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.junit.Test; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/package.html b/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/package.html deleted file mode 100644 index 5fc71d94f67..00000000000 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/package.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - -Codecs for testing that support {@link org.apache.lucene.codecs.blockterms} - - diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java b/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java index 5c788a8e20a..1aa36fac8b3 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java @@ -30,9 +30,6 @@ import org.apache.lucene.codecs.PointsReader; import org.apache.lucene.codecs.PointsWriter; import org.apache.lucene.codecs.PostingsFormat; -import org.apache.lucene.codecs.blockterms.LuceneFixedGap; -import org.apache.lucene.codecs.blockterms.LuceneVarGapDocFreqInterval; -import org.apache.lucene.codecs.blockterms.LuceneVarGapFixedInterval; import org.apache.lucene.codecs.blocktreeords.BlockTreeOrdsPostingsFormat; import org.apache.lucene.codecs.bloom.TestBloomFilteredLucenePostings; import org.apache.lucene.codecs.lucene90.Lucene90DocValuesFormat; @@ -47,6 +44,9 @@ import org.apache.lucene.tests.codecs.asserting.AssertingDocValuesFormat; import org.apache.lucene.tests.codecs.asserting.AssertingPointsFormat; import org.apache.lucene.tests.codecs.asserting.AssertingPostingsFormat; +import org.apache.lucene.tests.codecs.blockterms.LuceneFixedGap; +import org.apache.lucene.tests.codecs.blockterms.LuceneVarGapDocFreqInterval; +import org.apache.lucene.tests.codecs.blockterms.LuceneVarGapFixedInterval; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.bkd.BKDConfig; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneFixedGap.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/blockterms/LuceneFixedGap.java similarity index 89% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneFixedGap.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/blockterms/LuceneFixedGap.java index 0d9f1e05832..3c21de0f128 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneFixedGap.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/blockterms/LuceneFixedGap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.codecs.blockterms; +package org.apache.lucene.tests.codecs.blockterms; import java.io.IOException; import org.apache.lucene.codecs.FieldsConsumer; @@ -22,6 +22,12 @@ import org.apache.lucene.codecs.PostingsFormat; import org.apache.lucene.codecs.PostingsReaderBase; import org.apache.lucene.codecs.PostingsWriterBase; +import org.apache.lucene.codecs.blockterms.BlockTermsReader; +import org.apache.lucene.codecs.blockterms.BlockTermsWriter; +import org.apache.lucene.codecs.blockterms.FixedGapTermsIndexReader; +import org.apache.lucene.codecs.blockterms.FixedGapTermsIndexWriter; +import org.apache.lucene.codecs.blockterms.TermsIndexReaderBase; +import org.apache.lucene.codecs.blockterms.TermsIndexWriterBase; import org.apache.lucene.codecs.lucene90.Lucene90PostingsFormat; // javadocs import org.apache.lucene.codecs.lucene90.Lucene90PostingsReader; import org.apache.lucene.codecs.lucene90.Lucene90PostingsWriter; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneVarGapDocFreqInterval.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/blockterms/LuceneVarGapDocFreqInterval.java similarity index 89% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneVarGapDocFreqInterval.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/blockterms/LuceneVarGapDocFreqInterval.java index 765885a46b7..6a38882c153 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneVarGapDocFreqInterval.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/blockterms/LuceneVarGapDocFreqInterval.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.codecs.blockterms; +package org.apache.lucene.tests.codecs.blockterms; import java.io.IOException; import org.apache.lucene.codecs.FieldsConsumer; @@ -22,6 +22,13 @@ import org.apache.lucene.codecs.PostingsFormat; import org.apache.lucene.codecs.PostingsReaderBase; import org.apache.lucene.codecs.PostingsWriterBase; +import org.apache.lucene.codecs.blockterms.BlockTermsReader; +import org.apache.lucene.codecs.blockterms.BlockTermsWriter; +import org.apache.lucene.codecs.blockterms.FixedGapTermsIndexWriter; +import org.apache.lucene.codecs.blockterms.TermsIndexReaderBase; +import org.apache.lucene.codecs.blockterms.TermsIndexWriterBase; +import org.apache.lucene.codecs.blockterms.VariableGapTermsIndexReader; +import org.apache.lucene.codecs.blockterms.VariableGapTermsIndexWriter; import org.apache.lucene.codecs.lucene90.Lucene90PostingsFormat; // javadocs import org.apache.lucene.codecs.lucene90.Lucene90PostingsReader; import org.apache.lucene.codecs.lucene90.Lucene90PostingsWriter; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneVarGapFixedInterval.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/blockterms/LuceneVarGapFixedInterval.java similarity index 88% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneVarGapFixedInterval.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/blockterms/LuceneVarGapFixedInterval.java index 7fc9201b0d3..838d2968c7f 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneVarGapFixedInterval.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/blockterms/LuceneVarGapFixedInterval.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.codecs.blockterms; +package org.apache.lucene.tests.codecs.blockterms; import java.io.IOException; import org.apache.lucene.codecs.FieldsConsumer; @@ -22,6 +22,13 @@ import org.apache.lucene.codecs.PostingsFormat; import org.apache.lucene.codecs.PostingsReaderBase; import org.apache.lucene.codecs.PostingsWriterBase; +import org.apache.lucene.codecs.blockterms.BlockTermsReader; +import org.apache.lucene.codecs.blockterms.BlockTermsWriter; +import org.apache.lucene.codecs.blockterms.FixedGapTermsIndexWriter; +import org.apache.lucene.codecs.blockterms.TermsIndexReaderBase; +import org.apache.lucene.codecs.blockterms.TermsIndexWriterBase; +import org.apache.lucene.codecs.blockterms.VariableGapTermsIndexReader; +import org.apache.lucene.codecs.blockterms.VariableGapTermsIndexWriter; import org.apache.lucene.codecs.lucene90.Lucene90PostingsFormat; // javadocs import org.apache.lucene.codecs.lucene90.Lucene90PostingsReader; import org.apache.lucene.codecs.lucene90.Lucene90PostingsWriter; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/blockterms/package-info.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/blockterms/package-info.java new file mode 100644 index 00000000000..81abf9cdee9 --- /dev/null +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/blockterms/package-info.java @@ -0,0 +1,19 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** Codecs for testing that support {@link org.apache.lucene.codecs.blockterms}. */ +package org.apache.lucene.tests.codecs.blockterms; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestUtil.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestUtil.java index 3ada253241d..68741d0b5ee 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestUtil.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestUtil.java @@ -52,7 +52,6 @@ import org.apache.lucene.codecs.DocValuesFormat; import org.apache.lucene.codecs.KnnVectorsFormat; import org.apache.lucene.codecs.PostingsFormat; -import org.apache.lucene.codecs.blockterms.LuceneFixedGap; import org.apache.lucene.codecs.blocktreeords.BlockTreeOrdsPostingsFormat; import org.apache.lucene.codecs.lucene90.Lucene90Codec; import org.apache.lucene.codecs.lucene90.Lucene90DocValuesFormat; @@ -98,6 +97,7 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.NoLockFactory; import org.apache.lucene.tests.codecs.asserting.AssertingCodec; +import org.apache.lucene.tests.codecs.blockterms.LuceneFixedGap; import org.apache.lucene.tests.mockfile.FilterFileSystem; import org.apache.lucene.tests.mockfile.VirusCheckingFS; import org.apache.lucene.tests.mockfile.WindowsFS; diff --git a/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat b/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat index 1e977949e6c..17f5619ffa8 100644 --- a/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat +++ b/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat @@ -15,9 +15,9 @@ org.apache.lucene.codecs.mockrandom.MockRandomPostingsFormat org.apache.lucene.codecs.ramonly.RAMOnlyPostingsFormat -org.apache.lucene.codecs.blockterms.LuceneFixedGap -org.apache.lucene.codecs.blockterms.LuceneVarGapFixedInterval -org.apache.lucene.codecs.blockterms.LuceneVarGapDocFreqInterval +org.apache.lucene.tests.codecs.blockterms.LuceneFixedGap +org.apache.lucene.tests.codecs.blockterms.LuceneVarGapFixedInterval +org.apache.lucene.tests.codecs.blockterms.LuceneVarGapDocFreqInterval org.apache.lucene.codecs.bloom.TestBloomFilteredLucenePostings org.apache.lucene.tests.codecs.asserting.AssertingPostingsFormat org.apache.lucene.codecs.uniformsplit.UniformSplitRot13PostingsFormat From 58b37a4c1a21caacffc3ab5cc282f11035875df8 Mon Sep 17 00:00:00 2001 From: Dawid Weiss Date: Sun, 19 Dec 2021 21:46:33 +0100 Subject: [PATCH 11/32] Moved more codecs. --- .../codecs/bloom/TestBloomPostingsFormat.java | 1 + .../index/TestIndexWriterExceptions2.java | 2 +- .../apache/lucene/codecs/bloom/package.html | 26 ------------------- .../org/apache/lucene/index/RandomCodec.java | 4 +-- .../TestBloomFilteredLucenePostings.java | 5 +++- .../tests/codecs/bloom/package-info.java | 22 ++++++++++++++++ .../cheapbastard/CheapBastardCodec.java | 2 +- .../codecs/cheapbastard/package-info.java | 2 +- .../codecs/cranky/CrankyCodec.java | 2 +- .../codecs/cranky/CrankyCompoundFormat.java | 2 +- .../codecs/cranky/CrankyDocValuesFormat.java | 2 +- .../codecs/cranky/CrankyFieldInfosFormat.java | 2 +- .../codecs/cranky/CrankyLiveDocsFormat.java | 2 +- .../codecs/cranky/CrankyNormsFormat.java | 2 +- .../codecs/cranky/CrankyPointsFormat.java | 2 +- .../codecs/cranky/CrankyPostingsFormat.java | 2 +- .../cranky/CrankySegmentInfoFormat.java | 2 +- .../cranky/CrankyStoredFieldsFormat.java | 2 +- .../cranky/CrankyTermVectorsFormat.java | 2 +- .../codecs/cranky/package-info.java | 2 +- .../mockrandom/MockRandomPostingsFormat.java | 2 +- .../codecs/mockrandom/package-info.java | 2 +- .../codecs/ramonly/RAMOnlyPostingsFormat.java | 2 +- .../codecs/ramonly/package-info.java | 2 +- .../util/TestRuleSetupAndRestoreClassEnv.java | 4 +-- .../services/org.apache.lucene.codecs.Codec | 2 +- .../org.apache.lucene.codecs.PostingsFormat | 6 ++--- 27 files changed, 54 insertions(+), 54 deletions(-) delete mode 100644 lucene/test-framework/src/java/org/apache/lucene/codecs/bloom/package.html rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/bloom/TestBloomFilteredLucenePostings.java (92%) create mode 100644 lucene/test-framework/src/java/org/apache/lucene/tests/codecs/bloom/package-info.java rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/cheapbastard/CheapBastardCodec.java (96%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/cheapbastard/package-info.java (94%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/cranky/CrankyCodec.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/cranky/CrankyCompoundFormat.java (97%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/cranky/CrankyDocValuesFormat.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/cranky/CrankyFieldInfosFormat.java (97%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/cranky/CrankyLiveDocsFormat.java (97%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/cranky/CrankyNormsFormat.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/cranky/CrankyPointsFormat.java (99%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/cranky/CrankyPostingsFormat.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/cranky/CrankySegmentInfoFormat.java (97%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/cranky/CrankyStoredFieldsFormat.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/cranky/CrankyTermVectorsFormat.java (99%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/cranky/package-info.java (94%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/mockrandom/MockRandomPostingsFormat.java (99%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/mockrandom/package-info.java (94%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/ramonly/RAMOnlyPostingsFormat.java (99%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/ramonly/package-info.java (94%) diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/bloom/TestBloomPostingsFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/bloom/TestBloomPostingsFormat.java index 34d33f3cc39..7ae62225014 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/bloom/TestBloomPostingsFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/bloom/TestBloomPostingsFormat.java @@ -18,6 +18,7 @@ import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BasePostingsFormatTestCase; +import org.apache.lucene.tests.codecs.bloom.TestBloomFilteredLucenePostings; import org.apache.lucene.tests.util.TestUtil; /** Basic tests for BloomPostingsFormat */ diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions2.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions2.java index f340432dc6e..217d524d5db 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions2.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions2.java @@ -23,7 +23,6 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.codecs.cranky.CrankyCodec; import org.apache.lucene.document.BinaryDocValuesField; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -41,6 +40,7 @@ import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.analysis.MockVariableLengthPayloadFilter; import org.apache.lucene.tests.codecs.asserting.AssertingCodec; +import org.apache.lucene.tests.codecs.cranky.CrankyCodec; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/bloom/package.html b/lucene/test-framework/src/java/org/apache/lucene/codecs/bloom/package.html deleted file mode 100644 index 5142a33d1ec..00000000000 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/bloom/package.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - -Support for generating test indexes using the BloomFilteringPostingsFormat - - diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java b/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java index 1aa36fac8b3..6b7240a2d31 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java @@ -31,13 +31,11 @@ import org.apache.lucene.codecs.PointsWriter; import org.apache.lucene.codecs.PostingsFormat; import org.apache.lucene.codecs.blocktreeords.BlockTreeOrdsPostingsFormat; -import org.apache.lucene.codecs.bloom.TestBloomFilteredLucenePostings; import org.apache.lucene.codecs.lucene90.Lucene90DocValuesFormat; import org.apache.lucene.codecs.lucene90.Lucene90PointsReader; import org.apache.lucene.codecs.lucene90.Lucene90PointsWriter; import org.apache.lucene.codecs.memory.DirectPostingsFormat; import org.apache.lucene.codecs.memory.FSTPostingsFormat; -import org.apache.lucene.codecs.mockrandom.MockRandomPostingsFormat; import org.apache.lucene.index.PointValues.IntersectVisitor; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.codecs.asserting.AssertingCodec; @@ -47,6 +45,8 @@ import org.apache.lucene.tests.codecs.blockterms.LuceneFixedGap; import org.apache.lucene.tests.codecs.blockterms.LuceneVarGapDocFreqInterval; import org.apache.lucene.tests.codecs.blockterms.LuceneVarGapFixedInterval; +import org.apache.lucene.tests.codecs.bloom.TestBloomFilteredLucenePostings; +import org.apache.lucene.tests.codecs.mockrandom.MockRandomPostingsFormat; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.bkd.BKDConfig; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/bloom/TestBloomFilteredLucenePostings.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/bloom/TestBloomFilteredLucenePostings.java similarity index 92% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/bloom/TestBloomFilteredLucenePostings.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/bloom/TestBloomFilteredLucenePostings.java index fd48f0f0a47..abcc6eae5e7 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/bloom/TestBloomFilteredLucenePostings.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/bloom/TestBloomFilteredLucenePostings.java @@ -14,12 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.codecs.bloom; +package org.apache.lucene.tests.codecs.bloom; import java.io.IOException; import org.apache.lucene.codecs.FieldsConsumer; import org.apache.lucene.codecs.FieldsProducer; import org.apache.lucene.codecs.PostingsFormat; +import org.apache.lucene.codecs.bloom.BloomFilterFactory; +import org.apache.lucene.codecs.bloom.BloomFilteringPostingsFormat; +import org.apache.lucene.codecs.bloom.FuzzySet; import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.SegmentReadState; import org.apache.lucene.index.SegmentWriteState; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/bloom/package-info.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/bloom/package-info.java new file mode 100644 index 00000000000..eecc3ffbefc --- /dev/null +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/bloom/package-info.java @@ -0,0 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * Support for generating test indexes using the {@link + * org.apache.lucene.codecs.bloom.BloomFilteringPostingsFormat}. + */ +package org.apache.lucene.tests.codecs.bloom; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/cheapbastard/CheapBastardCodec.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cheapbastard/CheapBastardCodec.java similarity index 96% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/cheapbastard/CheapBastardCodec.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cheapbastard/CheapBastardCodec.java index 5dd7281cefe..5355e553a97 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/cheapbastard/CheapBastardCodec.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cheapbastard/CheapBastardCodec.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.codecs.cheapbastard; +package org.apache.lucene.tests.codecs.cheapbastard; import org.apache.lucene.codecs.FilterCodec; import org.apache.lucene.codecs.PostingsFormat; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/cheapbastard/package-info.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cheapbastard/package-info.java similarity index 94% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/cheapbastard/package-info.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cheapbastard/package-info.java index 4896800d61b..d764295f639 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/cheapbastard/package-info.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cheapbastard/package-info.java @@ -19,4 +19,4 @@ * Codec that unreasonably tries to use as little RAM as possible. For testing, benchmarking, API * purposes only! */ -package org.apache.lucene.codecs.cheapbastard; +package org.apache.lucene.tests.codecs.cheapbastard; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyCodec.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cranky/CrankyCodec.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyCodec.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cranky/CrankyCodec.java index 2b49306f7f2..dce369df31d 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyCodec.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cranky/CrankyCodec.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.codecs.cranky; +package org.apache.lucene.tests.codecs.cranky; import java.util.Random; import org.apache.lucene.codecs.Codec; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyCompoundFormat.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cranky/CrankyCompoundFormat.java similarity index 97% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyCompoundFormat.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cranky/CrankyCompoundFormat.java index 3ff3941371e..bced58d2a6f 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyCompoundFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cranky/CrankyCompoundFormat.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.codecs.cranky; +package org.apache.lucene.tests.codecs.cranky; import java.io.IOException; import java.util.Random; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyDocValuesFormat.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cranky/CrankyDocValuesFormat.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyDocValuesFormat.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cranky/CrankyDocValuesFormat.java index 6e74b0d725f..c42f9a90384 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyDocValuesFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cranky/CrankyDocValuesFormat.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.codecs.cranky; +package org.apache.lucene.tests.codecs.cranky; import java.io.IOException; import java.util.Random; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyFieldInfosFormat.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cranky/CrankyFieldInfosFormat.java similarity index 97% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyFieldInfosFormat.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cranky/CrankyFieldInfosFormat.java index d442fb0cb44..f4008740301 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyFieldInfosFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cranky/CrankyFieldInfosFormat.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.codecs.cranky; +package org.apache.lucene.tests.codecs.cranky; import java.io.IOException; import java.util.Random; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyLiveDocsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cranky/CrankyLiveDocsFormat.java similarity index 97% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyLiveDocsFormat.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cranky/CrankyLiveDocsFormat.java index 44b8b578263..7d508feed02 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyLiveDocsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cranky/CrankyLiveDocsFormat.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.codecs.cranky; +package org.apache.lucene.tests.codecs.cranky; import java.io.IOException; import java.util.Collection; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyNormsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cranky/CrankyNormsFormat.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyNormsFormat.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cranky/CrankyNormsFormat.java index 44998b10119..3e8a242a1f5 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyNormsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cranky/CrankyNormsFormat.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.codecs.cranky; +package org.apache.lucene.tests.codecs.cranky; import java.io.IOException; import java.util.Random; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyPointsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cranky/CrankyPointsFormat.java similarity index 99% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyPointsFormat.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cranky/CrankyPointsFormat.java index f368250f321..8c1f8dc79c7 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyPointsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cranky/CrankyPointsFormat.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.codecs.cranky; +package org.apache.lucene.tests.codecs.cranky; import java.io.IOException; import java.util.Random; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyPostingsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cranky/CrankyPostingsFormat.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyPostingsFormat.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cranky/CrankyPostingsFormat.java index 715bd2163a5..7d87ed1c8e1 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyPostingsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cranky/CrankyPostingsFormat.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.codecs.cranky; +package org.apache.lucene.tests.codecs.cranky; import java.io.IOException; import java.util.Random; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankySegmentInfoFormat.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cranky/CrankySegmentInfoFormat.java similarity index 97% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankySegmentInfoFormat.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cranky/CrankySegmentInfoFormat.java index 664a69a3691..a95202031cb 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankySegmentInfoFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cranky/CrankySegmentInfoFormat.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.codecs.cranky; +package org.apache.lucene.tests.codecs.cranky; import java.io.IOException; import java.util.Random; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyStoredFieldsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cranky/CrankyStoredFieldsFormat.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyStoredFieldsFormat.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cranky/CrankyStoredFieldsFormat.java index d12e68882a6..3637ba2f8d1 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyStoredFieldsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cranky/CrankyStoredFieldsFormat.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.codecs.cranky; +package org.apache.lucene.tests.codecs.cranky; import java.io.IOException; import java.util.Collection; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyTermVectorsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cranky/CrankyTermVectorsFormat.java similarity index 99% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyTermVectorsFormat.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cranky/CrankyTermVectorsFormat.java index d908231037e..b0078637895 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyTermVectorsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cranky/CrankyTermVectorsFormat.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.codecs.cranky; +package org.apache.lucene.tests.codecs.cranky; import java.io.IOException; import java.util.Collection; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/package-info.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cranky/package-info.java similarity index 94% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/package-info.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cranky/package-info.java index a599238ef58..2bc61a826d0 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/package-info.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/cranky/package-info.java @@ -16,4 +16,4 @@ */ /** Codec for testing that throws random IOExceptions */ -package org.apache.lucene.codecs.cranky; +package org.apache.lucene.tests.codecs.cranky; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/mockrandom/MockRandomPostingsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/mockrandom/MockRandomPostingsFormat.java similarity index 99% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/mockrandom/MockRandomPostingsFormat.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/mockrandom/MockRandomPostingsFormat.java index a7d1416c250..814075d0efc 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/mockrandom/MockRandomPostingsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/mockrandom/MockRandomPostingsFormat.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.codecs.mockrandom; +package org.apache.lucene.tests.codecs.mockrandom; import java.io.IOException; import java.util.Random; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/mockrandom/package-info.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/mockrandom/package-info.java similarity index 94% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/mockrandom/package-info.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/mockrandom/package-info.java index 5dcfc89fbd4..11033ea5cc8 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/mockrandom/package-info.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/mockrandom/package-info.java @@ -16,4 +16,4 @@ */ /** Frankenstein codec for testing that pieces together random components. */ -package org.apache.lucene.codecs.mockrandom; +package org.apache.lucene.tests.codecs.mockrandom; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/ramonly/RAMOnlyPostingsFormat.java similarity index 99% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/ramonly/RAMOnlyPostingsFormat.java index 7aff83c36d3..abc0299db2d 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/ramonly/RAMOnlyPostingsFormat.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.codecs.ramonly; +package org.apache.lucene.tests.codecs.ramonly; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/package-info.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/ramonly/package-info.java similarity index 94% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/package-info.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/ramonly/package-info.java index 828c04e008d..cb7dfbde26f 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/package-info.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/ramonly/package-info.java @@ -16,4 +16,4 @@ */ /** Codec for testing that never writes to disk. */ -package org.apache.lucene.codecs.ramonly; +package org.apache.lucene.tests.codecs.ramonly; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleSetupAndRestoreClassEnv.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleSetupAndRestoreClassEnv.java index cf2fae508c7..74b3d1469e3 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleSetupAndRestoreClassEnv.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleSetupAndRestoreClassEnv.java @@ -38,16 +38,16 @@ import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.DocValuesFormat; import org.apache.lucene.codecs.PostingsFormat; -import org.apache.lucene.codecs.cheapbastard.CheapBastardCodec; import org.apache.lucene.codecs.compressing.CompressingCodec; import org.apache.lucene.codecs.lucene90.Lucene90Codec; -import org.apache.lucene.codecs.mockrandom.MockRandomPostingsFormat; import org.apache.lucene.codecs.simpletext.SimpleTextCodec; import org.apache.lucene.index.RandomCodec; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.tests.codecs.asserting.AssertingCodec; import org.apache.lucene.tests.codecs.asserting.AssertingDocValuesFormat; import org.apache.lucene.tests.codecs.asserting.AssertingPostingsFormat; +import org.apache.lucene.tests.codecs.cheapbastard.CheapBastardCodec; +import org.apache.lucene.tests.codecs.mockrandom.MockRandomPostingsFormat; import org.apache.lucene.tests.search.similarities.AssertingSimilarity; import org.apache.lucene.tests.search.similarities.RandomSimilarity; import org.apache.lucene.tests.util.LuceneTestCase.LiveIWCFlushMode; diff --git a/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.Codec b/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.Codec index fc6319b0a37..0bf9ea1b032 100644 --- a/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.Codec +++ b/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.Codec @@ -14,7 +14,7 @@ # limitations under the License. org.apache.lucene.tests.codecs.asserting.AssertingCodec -org.apache.lucene.codecs.cheapbastard.CheapBastardCodec +org.apache.lucene.tests.codecs.cheapbastard.CheapBastardCodec org.apache.lucene.codecs.compressing.DeflateWithPresetCompressingCodec org.apache.lucene.codecs.compressing.FastCompressingCodec org.apache.lucene.codecs.compressing.FastDecompressionCompressingCodec diff --git a/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat b/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat index 17f5619ffa8..16d0affbba1 100644 --- a/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat +++ b/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -org.apache.lucene.codecs.mockrandom.MockRandomPostingsFormat -org.apache.lucene.codecs.ramonly.RAMOnlyPostingsFormat +org.apache.lucene.tests.codecs.mockrandom.MockRandomPostingsFormat +org.apache.lucene.tests.codecs.ramonly.RAMOnlyPostingsFormat org.apache.lucene.tests.codecs.blockterms.LuceneFixedGap org.apache.lucene.tests.codecs.blockterms.LuceneVarGapFixedInterval org.apache.lucene.tests.codecs.blockterms.LuceneVarGapDocFreqInterval -org.apache.lucene.codecs.bloom.TestBloomFilteredLucenePostings +org.apache.lucene.tests.codecs.bloom.TestBloomFilteredLucenePostings org.apache.lucene.tests.codecs.asserting.AssertingPostingsFormat org.apache.lucene.codecs.uniformsplit.UniformSplitRot13PostingsFormat org.apache.lucene.codecs.uniformsplit.sharedterms.STUniformSplitRot13PostingsFormat \ No newline at end of file From 6dede7a004499c42360af689ebd902156c73d3ab Mon Sep 17 00:00:00 2001 From: Dawid Weiss Date: Sun, 19 Dec 2021 21:53:21 +0100 Subject: [PATCH 12/32] Moved remaining test codecs. --- .../uniformsplit/TestFSTDictionary.java | 1 + .../TestUniformSplitPostingFormat.java | 1 + .../TestSTUniformSplitPostingFormat.java | 1 + .../TestCompressingStoredFieldsFormat.java | 2 +- .../TestCompressingTermVectorsFormat.java | 2 +- .../lucene/index/Test2BPostingsBytes.java | 2 +- .../lucene/index/Test4GBStoredFields.java | 2 +- .../lucene/codecs/compressing/package.html | 26 ----------- .../lucene/codecs/uniformsplit/package.html | 43 ------------------- .../uniformsplit/sharedterms/package.html | 43 ------------------- .../codecs/compressing/CompressingCodec.java | 5 ++- .../DeflateWithPresetCompressingCodec.java | 2 +- .../compressing/FastCompressingCodec.java | 4 +- .../FastDecompressionCompressingCodec.java | 4 +- .../HighCompressionCompressingCodec.java | 4 +- .../LZ4WithPresetCompressingCodec.java | 2 +- .../dummy/DummyCompressingCodec.java | 4 +- .../compressing/dummy/package-info.java | 2 +- .../codecs/compressing/package-info.java | 22 ++++++++++ .../uniformsplit/Rot13CypherTestUtil.java | 4 +- .../UniformSplitRot13PostingsFormat.java | 8 +++- .../codecs/uniformsplit/package-info.java | 22 ++++++++++ .../STUniformSplitRot13PostingsFormat.java | 7 ++- .../sharedterms/package-info.java | 22 ++++++++++ .../util/TestRuleSetupAndRestoreClassEnv.java | 2 +- .../services/org.apache.lucene.codecs.Codec | 12 +++--- .../org.apache.lucene.codecs.PostingsFormat | 4 +- 27 files changed, 114 insertions(+), 139 deletions(-) rename lucene/{test-framework => core}/src/test/org/apache/lucene/codecs/lucene90/compressing/TestCompressingStoredFieldsFormat.java (99%) rename lucene/{test-framework => core}/src/test/org/apache/lucene/codecs/lucene90/compressing/TestCompressingTermVectorsFormat.java (98%) delete mode 100644 lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/package.html delete mode 100644 lucene/test-framework/src/java/org/apache/lucene/codecs/uniformsplit/package.html delete mode 100644 lucene/test-framework/src/java/org/apache/lucene/codecs/uniformsplit/sharedterms/package.html rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/compressing/CompressingCodec.java (96%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/compressing/DeflateWithPresetCompressingCodec.java (96%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/compressing/FastCompressingCodec.java (92%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/compressing/FastDecompressionCompressingCodec.java (93%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/compressing/HighCompressionCompressingCodec.java (93%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/compressing/LZ4WithPresetCompressingCodec.java (96%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/compressing/dummy/DummyCompressingCodec.java (96%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/compressing/dummy/package-info.java (93%) create mode 100644 lucene/test-framework/src/java/org/apache/lucene/tests/codecs/compressing/package-info.java rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/uniformsplit/Rot13CypherTestUtil.java (93%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/uniformsplit/UniformSplitRot13PostingsFormat.java (92%) create mode 100644 lucene/test-framework/src/java/org/apache/lucene/tests/codecs/uniformsplit/package-info.java rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/codecs/uniformsplit/sharedterms/STUniformSplitRot13PostingsFormat.java (87%) create mode 100644 lucene/test-framework/src/java/org/apache/lucene/tests/codecs/uniformsplit/sharedterms/package-info.java diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/TestFSTDictionary.java b/lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/TestFSTDictionary.java index 7e12cc2ae64..d9ae90a9d24 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/TestFSTDictionary.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/TestFSTDictionary.java @@ -24,6 +24,7 @@ import java.util.List; import java.util.stream.Collectors; import org.apache.lucene.store.ByteBuffersDataOutput; +import org.apache.lucene.tests.codecs.uniformsplit.Rot13CypherTestUtil; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/TestUniformSplitPostingFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/TestUniformSplitPostingFormat.java index 3bb8774a974..8092796d903 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/TestUniformSplitPostingFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/TestUniformSplitPostingFormat.java @@ -20,6 +20,7 @@ import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.PostingsFormat; import org.apache.lucene.index.BasePostingsFormatTestCase; +import org.apache.lucene.tests.codecs.uniformsplit.UniformSplitRot13PostingsFormat; import org.apache.lucene.tests.util.TestUtil; import org.junit.After; import org.junit.Before; diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/sharedterms/TestSTUniformSplitPostingFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/sharedterms/TestSTUniformSplitPostingFormat.java index d68660a5432..c3cab041f4e 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/sharedterms/TestSTUniformSplitPostingFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/sharedterms/TestSTUniformSplitPostingFormat.java @@ -20,6 +20,7 @@ import org.apache.lucene.codecs.PostingsFormat; import org.apache.lucene.codecs.uniformsplit.TestUniformSplitPostingFormat; import org.apache.lucene.codecs.uniformsplit.UniformSplitTermsWriter; +import org.apache.lucene.tests.codecs.uniformsplit.sharedterms.STUniformSplitRot13PostingsFormat; /** Tests {@link STUniformSplitPostingsFormat} with block encoding using ROT13 cypher. */ public class TestSTUniformSplitPostingFormat extends TestUniformSplitPostingFormat { diff --git a/lucene/test-framework/src/test/org/apache/lucene/codecs/lucene90/compressing/TestCompressingStoredFieldsFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/compressing/TestCompressingStoredFieldsFormat.java similarity index 99% rename from lucene/test-framework/src/test/org/apache/lucene/codecs/lucene90/compressing/TestCompressingStoredFieldsFormat.java rename to lucene/core/src/test/org/apache/lucene/codecs/lucene90/compressing/TestCompressingStoredFieldsFormat.java index bbc0820acdc..6b050687d06 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/codecs/lucene90/compressing/TestCompressingStoredFieldsFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/compressing/TestCompressingStoredFieldsFormat.java @@ -20,7 +20,6 @@ import java.io.IOException; import java.util.Random; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.codecs.compressing.CompressingCodec; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; @@ -37,6 +36,7 @@ import org.apache.lucene.store.ByteArrayDataOutput; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.codecs.compressing.CompressingCodec; public class TestCompressingStoredFieldsFormat extends BaseStoredFieldsFormatTestCase { diff --git a/lucene/test-framework/src/test/org/apache/lucene/codecs/lucene90/compressing/TestCompressingTermVectorsFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/compressing/TestCompressingTermVectorsFormat.java similarity index 98% rename from lucene/test-framework/src/test/org/apache/lucene/codecs/lucene90/compressing/TestCompressingTermVectorsFormat.java rename to lucene/core/src/test/org/apache/lucene/codecs/lucene90/compressing/TestCompressingTermVectorsFormat.java index 8c71feca392..3dfdb7df962 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/codecs/lucene90/compressing/TestCompressingTermVectorsFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/compressing/TestCompressingTermVectorsFormat.java @@ -18,7 +18,6 @@ import java.io.IOException; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.codecs.compressing.CompressingCodec; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; @@ -37,6 +36,7 @@ import org.apache.lucene.index.TermsEnum.SeekStatus; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.codecs.compressing.CompressingCodec; import org.apache.lucene.util.BytesRef; public class TestCompressingTermVectorsFormat extends BaseTermVectorsFormatTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/Test2BPostingsBytes.java b/lucene/core/src/test/org/apache/lucene/index/Test2BPostingsBytes.java index 5c9398bf757..8b90b1d610b 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test2BPostingsBytes.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test2BPostingsBytes.java @@ -22,12 +22,12 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.codecs.compressing.CompressingCodec; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; import org.apache.lucene.document.TextField; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.codecs.compressing.CompressingCodec; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/Test4GBStoredFields.java b/lucene/core/src/test/org/apache/lucene/index/Test4GBStoredFields.java index 832ab0a6d9a..b631445e78c 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test4GBStoredFields.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test4GBStoredFields.java @@ -18,12 +18,12 @@ import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite; import com.carrotsearch.randomizedtesting.generators.RandomNumbers; -import org.apache.lucene.codecs.compressing.CompressingCodec; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; import org.apache.lucene.store.MMapDirectory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.codecs.compressing.CompressingCodec; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/package.html b/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/package.html deleted file mode 100644 index 19a617e22c9..00000000000 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/package.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - -Support for testing {@link org.apache.lucene.codecs.lucene90.compressing.Lucene90CompressingStoredFieldsFormat}. - - diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/uniformsplit/package.html b/lucene/test-framework/src/java/org/apache/lucene/codecs/uniformsplit/package.html deleted file mode 100644 index 53dd15addab..00000000000 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/uniformsplit/package.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - -Test PostingsFormat for testing {@link org.apache.lucene.codecs.uniformsplit} with block encryption using basic ROT13. - - diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/uniformsplit/sharedterms/package.html b/lucene/test-framework/src/java/org/apache/lucene/codecs/uniformsplit/sharedterms/package.html deleted file mode 100644 index 5b4510cac11..00000000000 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/uniformsplit/sharedterms/package.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - -Test PostingsFormat for testing {@link org.apache.lucene.codecs.uniformsplit.sharedterms} with block encryption using basic ROT13. - - diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/CompressingCodec.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/compressing/CompressingCodec.java similarity index 96% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/CompressingCodec.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/compressing/CompressingCodec.java index 488d8274c3e..006951217be 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/CompressingCodec.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/compressing/CompressingCodec.java @@ -14,16 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.codecs.compressing; +package org.apache.lucene.tests.codecs.compressing; import com.carrotsearch.randomizedtesting.generators.RandomNumbers; import java.util.Random; import org.apache.lucene.codecs.FilterCodec; import org.apache.lucene.codecs.StoredFieldsFormat; import org.apache.lucene.codecs.TermVectorsFormat; -import org.apache.lucene.codecs.compressing.dummy.DummyCompressingCodec; +import org.apache.lucene.codecs.compressing.CompressionMode; import org.apache.lucene.codecs.lucene90.compressing.Lucene90CompressingStoredFieldsFormat; import org.apache.lucene.codecs.lucene90.compressing.Lucene90CompressingTermVectorsFormat; +import org.apache.lucene.tests.codecs.compressing.dummy.DummyCompressingCodec; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.packed.DirectMonotonicWriter; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/DeflateWithPresetCompressingCodec.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/compressing/DeflateWithPresetCompressingCodec.java similarity index 96% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/DeflateWithPresetCompressingCodec.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/compressing/DeflateWithPresetCompressingCodec.java index eb99488c888..a9201b6e862 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/DeflateWithPresetCompressingCodec.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/compressing/DeflateWithPresetCompressingCodec.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.codecs.compressing; +package org.apache.lucene.tests.codecs.compressing; import org.apache.lucene.codecs.lucene90.DeflateWithPresetDictCompressionMode; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/FastCompressingCodec.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/compressing/FastCompressingCodec.java similarity index 92% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/FastCompressingCodec.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/compressing/FastCompressingCodec.java index 073f9aaa0eb..d5e04ac1b49 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/FastCompressingCodec.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/compressing/FastCompressingCodec.java @@ -14,7 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.codecs.compressing; +package org.apache.lucene.tests.codecs.compressing; + +import org.apache.lucene.codecs.compressing.CompressionMode; /** CompressionCodec that uses {@link CompressionMode#FAST} */ public class FastCompressingCodec extends CompressingCodec { diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/FastDecompressionCompressingCodec.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/compressing/FastDecompressionCompressingCodec.java similarity index 93% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/FastDecompressionCompressingCodec.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/compressing/FastDecompressionCompressingCodec.java index 6c5f6a78351..5e3fa035def 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/FastDecompressionCompressingCodec.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/compressing/FastDecompressionCompressingCodec.java @@ -14,7 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.codecs.compressing; +package org.apache.lucene.tests.codecs.compressing; + +import org.apache.lucene.codecs.compressing.CompressionMode; /** CompressionCodec that uses {@link CompressionMode#FAST_DECOMPRESSION} */ public class FastDecompressionCompressingCodec extends CompressingCodec { diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/HighCompressionCompressingCodec.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/compressing/HighCompressionCompressingCodec.java similarity index 93% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/HighCompressionCompressingCodec.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/compressing/HighCompressionCompressingCodec.java index 25fdaad3ba9..2039b6908f0 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/HighCompressionCompressingCodec.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/compressing/HighCompressionCompressingCodec.java @@ -14,7 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.codecs.compressing; +package org.apache.lucene.tests.codecs.compressing; + +import org.apache.lucene.codecs.compressing.CompressionMode; /** CompressionCodec that uses {@link CompressionMode#HIGH_COMPRESSION} */ public class HighCompressionCompressingCodec extends CompressingCodec { diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/LZ4WithPresetCompressingCodec.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/compressing/LZ4WithPresetCompressingCodec.java similarity index 96% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/LZ4WithPresetCompressingCodec.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/compressing/LZ4WithPresetCompressingCodec.java index e1e12b7dd2c..d0fd774fabc 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/LZ4WithPresetCompressingCodec.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/compressing/LZ4WithPresetCompressingCodec.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.codecs.compressing; +package org.apache.lucene.tests.codecs.compressing; import org.apache.lucene.codecs.lucene90.LZ4WithPresetDictCompressionMode; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/dummy/DummyCompressingCodec.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/compressing/dummy/DummyCompressingCodec.java similarity index 96% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/dummy/DummyCompressingCodec.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/compressing/dummy/DummyCompressingCodec.java index 1d838ee2d01..c8f486d5f40 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/dummy/DummyCompressingCodec.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/compressing/dummy/DummyCompressingCodec.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.codecs.compressing.dummy; +package org.apache.lucene.tests.codecs.compressing.dummy; import java.io.IOException; -import org.apache.lucene.codecs.compressing.CompressingCodec; import org.apache.lucene.codecs.compressing.CompressionMode; import org.apache.lucene.codecs.compressing.Compressor; import org.apache.lucene.codecs.compressing.Decompressor; import org.apache.lucene.store.DataInput; import org.apache.lucene.store.DataOutput; +import org.apache.lucene.tests.codecs.compressing.CompressingCodec; import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/dummy/package-info.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/compressing/dummy/package-info.java similarity index 93% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/dummy/package-info.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/compressing/dummy/package-info.java index 087536d545f..ce2c13d8603 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/dummy/package-info.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/compressing/dummy/package-info.java @@ -16,4 +16,4 @@ */ /** Dummy CompressingCodec implementation used for testing. */ -package org.apache.lucene.codecs.compressing.dummy; +package org.apache.lucene.tests.codecs.compressing.dummy; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/compressing/package-info.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/compressing/package-info.java new file mode 100644 index 00000000000..7b264439eda --- /dev/null +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/compressing/package-info.java @@ -0,0 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * Support for testing {@link + * org.apache.lucene.codecs.lucene90.compressing.Lucene90CompressingStoredFieldsFormat}. + */ +package org.apache.lucene.tests.codecs.compressing; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/uniformsplit/Rot13CypherTestUtil.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/uniformsplit/Rot13CypherTestUtil.java similarity index 93% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/uniformsplit/Rot13CypherTestUtil.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/uniformsplit/Rot13CypherTestUtil.java index d57185cf894..1fbf0e616b6 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/uniformsplit/Rot13CypherTestUtil.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/uniformsplit/Rot13CypherTestUtil.java @@ -15,9 +15,11 @@ * limitations under the License. */ -package org.apache.lucene.codecs.uniformsplit; +package org.apache.lucene.tests.codecs.uniformsplit; import java.io.IOException; +import org.apache.lucene.codecs.uniformsplit.BlockDecoder; +import org.apache.lucene.codecs.uniformsplit.BlockEncoder; import org.apache.lucene.store.DataInput; import org.apache.lucene.store.DataOutput; import org.apache.lucene.util.BytesRef; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/uniformsplit/UniformSplitRot13PostingsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/uniformsplit/UniformSplitRot13PostingsFormat.java similarity index 92% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/uniformsplit/UniformSplitRot13PostingsFormat.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/uniformsplit/UniformSplitRot13PostingsFormat.java index ef082f22277..7291c7e54da 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/uniformsplit/UniformSplitRot13PostingsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/uniformsplit/UniformSplitRot13PostingsFormat.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.codecs.uniformsplit; +package org.apache.lucene.tests.codecs.uniformsplit; import java.io.IOException; import org.apache.lucene.codecs.FieldsConsumer; @@ -25,6 +25,12 @@ import org.apache.lucene.codecs.PostingsWriterBase; import org.apache.lucene.codecs.lucene90.Lucene90PostingsReader; import org.apache.lucene.codecs.lucene90.Lucene90PostingsWriter; +import org.apache.lucene.codecs.uniformsplit.BlockDecoder; +import org.apache.lucene.codecs.uniformsplit.BlockEncoder; +import org.apache.lucene.codecs.uniformsplit.IndexDictionary; +import org.apache.lucene.codecs.uniformsplit.UniformSplitPostingsFormat; +import org.apache.lucene.codecs.uniformsplit.UniformSplitTermsReader; +import org.apache.lucene.codecs.uniformsplit.UniformSplitTermsWriter; import org.apache.lucene.index.SegmentReadState; import org.apache.lucene.index.SegmentWriteState; import org.apache.lucene.store.ByteBuffersDataOutput; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/uniformsplit/package-info.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/uniformsplit/package-info.java new file mode 100644 index 00000000000..fc8bae9f5d0 --- /dev/null +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/uniformsplit/package-info.java @@ -0,0 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * Test {@link org.apache.lucene.codecs.PostingsFormat} for testing {@link + * org.apache.lucene.codecs.uniformsplit} with block encryption using basic ROT13. + */ +package org.apache.lucene.tests.codecs.uniformsplit; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/uniformsplit/sharedterms/STUniformSplitRot13PostingsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/uniformsplit/sharedterms/STUniformSplitRot13PostingsFormat.java similarity index 87% rename from lucene/test-framework/src/java/org/apache/lucene/codecs/uniformsplit/sharedterms/STUniformSplitRot13PostingsFormat.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/codecs/uniformsplit/sharedterms/STUniformSplitRot13PostingsFormat.java index a6b11e1d6ea..1541a19b702 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/uniformsplit/sharedterms/STUniformSplitRot13PostingsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/uniformsplit/sharedterms/STUniformSplitRot13PostingsFormat.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.codecs.uniformsplit.sharedterms; +package org.apache.lucene.tests.codecs.uniformsplit.sharedterms; import java.io.IOException; import org.apache.lucene.codecs.FieldsConsumer; @@ -23,11 +23,14 @@ import org.apache.lucene.codecs.PostingsReaderBase; import org.apache.lucene.codecs.PostingsWriterBase; import org.apache.lucene.codecs.uniformsplit.IndexDictionary; -import org.apache.lucene.codecs.uniformsplit.UniformSplitRot13PostingsFormat; import org.apache.lucene.codecs.uniformsplit.UniformSplitTermsWriter; +import org.apache.lucene.codecs.uniformsplit.sharedterms.STUniformSplitPostingsFormat; +import org.apache.lucene.codecs.uniformsplit.sharedterms.STUniformSplitTermsReader; +import org.apache.lucene.codecs.uniformsplit.sharedterms.STUniformSplitTermsWriter; import org.apache.lucene.index.SegmentReadState; import org.apache.lucene.index.SegmentWriteState; import org.apache.lucene.store.ByteBuffersDataOutput; +import org.apache.lucene.tests.codecs.uniformsplit.UniformSplitRot13PostingsFormat; /** {@link STUniformSplitPostingsFormat} with block encoding using ROT13 cypher. */ public class STUniformSplitRot13PostingsFormat extends UniformSplitRot13PostingsFormat { diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/uniformsplit/sharedterms/package-info.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/uniformsplit/sharedterms/package-info.java new file mode 100644 index 00000000000..7de33c15a4b --- /dev/null +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/uniformsplit/sharedterms/package-info.java @@ -0,0 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * Test {@link org.apache.lucene.codecs.PostingsFormat} for testing {@link + * org.apache.lucene.codecs.uniformsplit.sharedterms} with block encryption using basic ROT13. + */ +package org.apache.lucene.tests.codecs.uniformsplit.sharedterms; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleSetupAndRestoreClassEnv.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleSetupAndRestoreClassEnv.java index 74b3d1469e3..9a8f8c637c6 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleSetupAndRestoreClassEnv.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleSetupAndRestoreClassEnv.java @@ -38,7 +38,6 @@ import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.DocValuesFormat; import org.apache.lucene.codecs.PostingsFormat; -import org.apache.lucene.codecs.compressing.CompressingCodec; import org.apache.lucene.codecs.lucene90.Lucene90Codec; import org.apache.lucene.codecs.simpletext.SimpleTextCodec; import org.apache.lucene.index.RandomCodec; @@ -47,6 +46,7 @@ import org.apache.lucene.tests.codecs.asserting.AssertingDocValuesFormat; import org.apache.lucene.tests.codecs.asserting.AssertingPostingsFormat; import org.apache.lucene.tests.codecs.cheapbastard.CheapBastardCodec; +import org.apache.lucene.tests.codecs.compressing.CompressingCodec; import org.apache.lucene.tests.codecs.mockrandom.MockRandomPostingsFormat; import org.apache.lucene.tests.search.similarities.AssertingSimilarity; import org.apache.lucene.tests.search.similarities.RandomSimilarity; diff --git a/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.Codec b/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.Codec index 0bf9ea1b032..cdc3aeca2a9 100644 --- a/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.Codec +++ b/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.Codec @@ -15,9 +15,9 @@ org.apache.lucene.tests.codecs.asserting.AssertingCodec org.apache.lucene.tests.codecs.cheapbastard.CheapBastardCodec -org.apache.lucene.codecs.compressing.DeflateWithPresetCompressingCodec -org.apache.lucene.codecs.compressing.FastCompressingCodec -org.apache.lucene.codecs.compressing.FastDecompressionCompressingCodec -org.apache.lucene.codecs.compressing.HighCompressionCompressingCodec -org.apache.lucene.codecs.compressing.LZ4WithPresetCompressingCodec -org.apache.lucene.codecs.compressing.dummy.DummyCompressingCodec +org.apache.lucene.tests.codecs.compressing.DeflateWithPresetCompressingCodec +org.apache.lucene.tests.codecs.compressing.FastCompressingCodec +org.apache.lucene.tests.codecs.compressing.FastDecompressionCompressingCodec +org.apache.lucene.tests.codecs.compressing.HighCompressionCompressingCodec +org.apache.lucene.tests.codecs.compressing.LZ4WithPresetCompressingCodec +org.apache.lucene.tests.codecs.compressing.dummy.DummyCompressingCodec diff --git a/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat b/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat index 16d0affbba1..463f77ae72f 100644 --- a/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat +++ b/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat @@ -20,5 +20,5 @@ org.apache.lucene.tests.codecs.blockterms.LuceneVarGapFixedInterval org.apache.lucene.tests.codecs.blockterms.LuceneVarGapDocFreqInterval org.apache.lucene.tests.codecs.bloom.TestBloomFilteredLucenePostings org.apache.lucene.tests.codecs.asserting.AssertingPostingsFormat -org.apache.lucene.codecs.uniformsplit.UniformSplitRot13PostingsFormat -org.apache.lucene.codecs.uniformsplit.sharedterms.STUniformSplitRot13PostingsFormat \ No newline at end of file +org.apache.lucene.tests.codecs.uniformsplit.UniformSplitRot13PostingsFormat +org.apache.lucene.tests.codecs.uniformsplit.sharedterms.STUniformSplitRot13PostingsFormat \ No newline at end of file From f91a864e38a04108cef665d949295fb778a0bbe3 Mon Sep 17 00:00:00 2001 From: Dawid Weiss Date: Sun, 19 Dec 2021 22:07:21 +0100 Subject: [PATCH 13/32] Partial conversion of .index package. This one has lots of package-private hacks. Some can be worked around, others can't be, easily. --- .../synonym/TestSynonymGraphFilter.java | 2 +- .../TestCollationDocValuesField.java | 2 +- .../icu/TestICUCollationDocValuesField.java | 2 +- .../lucene50/TestBlockPostingsFormat.java | 2 +- .../lucene50/TestBlockPostingsFormat2.java | 2 +- .../lucene50/TestBlockPostingsFormat3.java | 2 +- .../lucene50/TestLucene50CompoundFormat.java | 2 +- .../lucene50/TestLucene50LiveDocsFormat.java | 2 +- .../TestLucene50StoredFieldsFormat.java | 2 +- ...ne50StoredFieldsFormatHighCompression.java | 2 +- .../TestLucene50TermVectorsFormat.java | 2 +- .../TestLucene60FieldInfosFormat.java | 2 +- .../lucene60/TestLucene60PointsFormat.java | 4 +-- .../TestLucene70SegmentInfoFormat.java | 2 +- .../BaseLucene80DocValuesFormatTestCase.java | 4 +-- .../lucene80/TestLucene80NormsFormat.java | 2 +- .../lucene84/TestLucene84PostingsFormat.java | 2 +- .../lucene86/TestLucene86PointsFormat.java | 4 +-- .../TestLucene86SegmentInfoFormat.java | 2 +- .../TestLucene87StoredFieldsFormat.java | 2 +- ...ne87StoredFieldsFormatHighCompression.java | 2 +- .../TestBackwardsCompatibility.java | 2 +- .../ClassificationTestBase.java | 2 +- .../DocumentClassificationTestBase.java | 2 +- .../utils/TestDataSplitter.java | 2 +- .../utils/TestDocToDoubleVectorUtils.java | 2 +- .../TestFixedGapPostingsFormat.java | 2 +- ...stVarGapDocFreqIntervalPostingsFormat.java | 2 +- ...TestVarGapFixedIntervalPostingsFormat.java | 2 +- .../blocktreeords/TestOrdsBlockTree.java | 4 +-- .../codecs/bloom/TestBloomPostingsFormat.java | 2 +- .../memory/TestDirectPostingsFormat.java | 2 +- .../codecs/memory/TestFSTPostingsFormat.java | 2 +- .../TestSimpleTextCompoundFormat.java | 2 +- .../TestSimpleTextDocValuesFormat.java | 2 +- .../TestSimpleTextFieldInfoFormat.java | 2 +- .../TestSimpleTextKnnVectorsFormat.java | 2 +- .../TestSimpleTextLiveDocsFormat.java | 2 +- .../simpletext/TestSimpleTextNormsFormat.java | 2 +- .../TestSimpleTextPointsFormat.java | 2 +- .../TestSimpleTextPostingsFormat.java | 2 +- .../TestSimpleTextSegmentInfoFormat.java | 2 +- .../TestSimpleTextStoredFieldsFormat.java | 2 +- .../TestSimpleTextTermVectorsFormat.java | 2 +- .../TestUniformSplitPostingFormat.java | 2 +- .../org/apache/lucene/index/CheckIndex.java | 3 +- .../apache/lucene/index/FilterLeafReader.java | 9 +++++- .../analysis/TestCachingTokenFilter.java | 2 +- .../lucene90/TestLucene90CompoundFormat.java | 2 +- .../lucene90/TestLucene90DocValuesFormat.java | 4 +-- .../TestLucene90FieldInfosFormat.java | 2 +- .../TestLucene90HnswVectorsFormat.java | 2 +- .../lucene90/TestLucene90LiveDocsFormat.java | 2 +- .../lucene90/TestLucene90NormsFormat.java | 2 +- .../lucene90/TestLucene90PointsFormat.java | 4 +-- .../lucene90/TestLucene90PostingsFormat.java | 2 +- .../TestLucene90SegmentInfoFormat.java | 2 +- .../TestLucene90StoredFieldsFormat.java | 2 +- ...ne90StoredFieldsFormatHighCompression.java | 2 +- .../TestLucene90TermVectorsFormat.java | 2 +- .../TestCompressingStoredFieldsFormat.java | 2 +- .../TestCompressingTermVectorsFormat.java | 4 +-- .../perfield/TestPerFieldDocValuesFormat.java | 4 +-- .../TestPerFieldKnnVectorsFormat.java | 4 +-- .../perfield/TestPerFieldPostingsFormat.java | 4 +-- .../perfield/TestPerFieldPostingsFormat2.java | 2 +- .../document/BaseLatLonPointTestCase.java | 2 +- .../document/BaseLatLonShapeTestCase.java | 2 +- .../lucene/document/TestBinaryDocument.java | 2 +- .../apache/lucene/document/TestDocument.java | 2 +- .../document/TestFeatureDoubleValues.java | 2 +- .../lucene/document/TestFeatureField.java | 2 +- .../lucene/document/TestFeatureSort.java | 2 +- .../org/apache/lucene/document/TestField.java | 2 +- .../lucene/document/TestInetAddressPoint.java | 2 +- .../TestLatLonPointDistanceFeatureQuery.java | 2 +- .../document/TestLatLonPointDistanceSort.java | 2 +- .../lucene/document/TestLatLonShape.java | 2 +- .../TestLongDistanceFeatureQuery.java | 2 +- .../apache/lucene/document/TestXYShape.java | 2 +- .../apache/lucene/index/TestAddIndexes.java | 2 ++ .../index/TestAllFilesCheckIndexHeader.java | 1 + .../index/TestAllFilesDetectBitFlips.java | 1 + .../index/TestAllFilesDetectTruncation.java | 1 + .../index/TestAllFilesHaveChecksumFooter.java | 1 + .../index/TestAllFilesHaveCodecHeader.java | 1 + .../apache/lucene/index/TestAtomicUpdate.java | 1 + .../lucene/index/TestBagOfPositions.java | 2 ++ .../lucene/index/TestBagOfPostings.java | 2 ++ .../index/TestBinaryDocValuesUpdates.java | 1 + .../apache/lucene/index/TestBinaryTerms.java | 1 + .../apache/lucene/index/TestCheckIndex.java | 1 + .../lucene/index/TestCodecHoldsOpenFiles.java | 1 + .../index/TestConcurrentMergeScheduler.java | 1 + .../org/apache/lucene/index/TestCrash.java | 1 + .../apache/lucene/index/TestCustomNorms.java | 1 + .../lucene/index/TestDirectoryReader.java | 2 ++ .../org/apache/lucene/index/TestDocCount.java | 1 + .../lucene/index/TestDocValuesIndexing.java | 1 + .../lucene/index/TestDocsAndPositions.java | 1 + .../lucene/index/TestDocumentWriter.java | 1 + .../lucene/index/TestDuelingCodecs.java | 2 ++ .../apache/lucene/index/TestFieldsReader.java | 1 + .../lucene/index/TestFilterLeafReader.java | 1 + .../lucene/index/TestForTooMuchCloning.java | 1 + .../lucene/index/TestIndexFileDeleter.java | 1 + .../lucene/index/TestIndexReaderClose.java | 2 ++ .../apache/lucene/index/TestIndexSorting.java | 1 + .../apache/lucene/index/TestIndexWriter.java | 4 ++- .../lucene/index/TestIndexWriterCommit.java | 1 + .../lucene/index/TestIndexWriterConfig.java | 1 + .../lucene/index/TestIndexWriterDelete.java | 2 ++ .../index/TestIndexWriterExceptions.java | 1 + .../index/TestIndexWriterMergePolicy.java | 2 ++ .../lucene/index/TestIndexWriterReader.java | 2 ++ .../TestIndexWriterThreadsToSegments.java | 1 + .../lucene/index/TestIndexWriterUnicode.java | 1 + .../index/TestIndexWriterWithThreads.java | 2 ++ .../lucene/index/TestIndexableField.java | 1 + .../index/TestIndexingSequenceNumbers.java | 1 + .../apache/lucene/index/TestIsCurrent.java | 1 + .../lucene/index/TestLogMergePolicy.java | 1 + .../apache/lucene/index/TestLongPostings.java | 1 + .../lucene/index/TestMaxTermFrequency.java | 1 + .../lucene/index/TestMergeRateLimiter.java | 1 + .../apache/lucene/index/TestMixedCodecs.java | 1 + .../lucene/index/TestMultiDocValues.java | 1 + .../lucene/index/TestNRTReaderCleanup.java | 1 + .../index/TestNRTReaderWithThreads.java | 1 + .../apache/lucene/index/TestNRTThreads.java | 1 + .../apache/lucene/index/TestNeverDelete.java | 1 + .../lucene/index/TestNoMergePolicy.java | 1 + .../org/apache/lucene/index/TestNorms.java | 1 + .../index/TestNumericDocValuesUpdates.java | 1 + .../lucene/index/TestOmitPositions.java | 1 + .../org/apache/lucene/index/TestOmitTf.java | 1 + .../apache/lucene/index/TestOrdinalMap.java | 1 + .../org/apache/lucene/index/TestPayloads.java | 1 + .../lucene/index/TestPayloadsOnVectors.java | 1 + .../lucene/index/TestPerSegmentDeletes.java | 1 + .../apache/lucene/index/TestPointValues.java | 1 + .../lucene/index/TestPostingsOffsets.java | 1 + .../lucene/index/TestReadOnlyIndex.java | 1 + .../apache/lucene/index/TestReaderClosed.java | 2 ++ .../index/TestReaderWrapperDVTypeCheck.java | 1 + .../org/apache/lucene/index/TestRollback.java | 1 + .../index/TestSameTokenSamePosition.java | 1 + .../lucene/index/TestSegmentMerger.java | 1 + .../lucene/index/TestSegmentReader.java | 1 + .../lucene/index/TestSegmentTermDocs.java | 1 + .../index/TestSegmentToThreadMapping.java | 1 + .../lucene/index/TestSortingCodecReader.java | 1 + .../lucene/index/TestStressAdvance.java | 1 + .../lucene/index/TestStressIndexing2.java | 1 + .../apache/lucene/index/TestStressNRT.java | 1 + .../apache/lucene/index/TestSumDocFreq.java | 1 + .../lucene/index/TestSwappedIndexFiles.java | 1 + .../apache/lucene/index/TestTermStates.java | 1 + .../apache/lucene/index/TestTermVectors.java | 1 + .../lucene/index/TestTermVectorsReader.java | 1 + .../lucene/index/TestTermVectorsWriter.java | 1 + .../org/apache/lucene/index/TestTerms.java | 1 + .../apache/lucene/index/TestTermsEnum.java | 2 ++ .../apache/lucene/index/TestTermsEnum2.java | 1 + .../lucene/index/TestTieredMergePolicy.java | 1 + .../index/TestTragicIndexWriterDeadlock.java | 1 + .../lucene/index/TestUniqueTermCount.java | 1 + .../index/TestUpgradeIndexMergePolicy.java | 1 + .../lucene/search/TestAutomatonQuery.java | 2 +- .../search/TestAutomatonQueryUnicode.java | 2 +- .../lucene/search/TestBaseRangeFilter.java | 2 +- .../lucene/search/TestBlendedTermQuery.java | 2 +- .../apache/lucene/search/TestBoolean2.java | 2 +- .../search/TestBooleanMinShouldMatch.java | 2 +- .../apache/lucene/search/TestBooleanOr.java | 2 +- .../lucene/search/TestBooleanQuery.java | 2 +- .../TestBooleanQueryVisitSubscorers.java | 2 +- .../lucene/search/TestBooleanRewrites.java | 2 +- .../lucene/search/TestBooleanScorer.java | 2 +- .../lucene/search/TestCollectorManager.java | 2 +- .../lucene/search/TestConjunctions.java | 2 +- .../lucene/search/TestConstantScoreQuery.java | 2 +- .../search/TestConstantScoreScorer.java | 2 +- .../TestControlledRealTimeReopenThread.java | 4 +-- .../lucene/search/TestCustomSearcherSort.java | 2 +- .../apache/lucene/search/TestDateSort.java | 2 +- .../search/TestDisjunctionMaxQuery.java | 2 +- .../search/TestDocValuesFieldExistsQuery.java | 2 +- .../lucene/search/TestDocValuesQueries.java | 2 +- .../search/TestDocValuesRewriteMethod.java | 2 +- .../search/TestDoubleRangeFieldQueries.java | 2 +- .../lucene/search/TestDoubleValuesSource.java | 2 +- .../lucene/search/TestEarlyTermination.java | 2 +- .../search/TestFloatRangeFieldQueries.java | 2 +- .../apache/lucene/search/TestFuzzyQuery.java | 2 +- .../search/TestFuzzyTermOnShortTerms.java | 2 +- .../lucene/search/TestIndexSearcher.java | 2 +- .../lucene/search/TestIndriAndQuery.java | 2 +- .../search/TestIntRangeFieldQueries.java | 2 +- .../lucene/search/TestKnnVectorQuery.java | 2 +- .../lucene/search/TestLRUQueryCache.java | 2 +- .../search/TestLongRangeFieldQueries.java | 2 +- .../lucene/search/TestLongValuesSource.java | 2 +- .../lucene/search/TestMinShouldMatch2.java | 2 +- .../lucene/search/TestMultiCollector.java | 2 +- .../search/TestMultiCollectorManager.java | 2 +- .../lucene/search/TestMultiPhraseQuery.java | 2 +- .../lucene/search/TestMultiSliceMerge.java | 2 +- .../search/TestMultiTermConstantScore.java | 2 +- .../search/TestMultiTermQueryRewrites.java | 2 +- .../lucene/search/TestNGramPhraseQuery.java | 2 +- .../apache/lucene/search/TestNeedsScores.java | 2 +- .../search/TestNormsFieldExistsQuery.java | 2 +- .../org/apache/lucene/search/TestNot.java | 2 +- .../lucene/search/TestPhrasePrefixQuery.java | 2 +- .../apache/lucene/search/TestPhraseQuery.java | 2 +- .../lucene/search/TestPointQueries.java | 2 +- .../lucene/search/TestPositionIncrement.java | 2 +- .../TestPositiveScoresOnlyCollector.java | 2 +- .../search/TestPrefixInBooleanQuery.java | 2 +- .../apache/lucene/search/TestPrefixQuery.java | 2 +- .../lucene/search/TestPrefixRandom.java | 2 +- .../lucene/search/TestQueryRescorer.java | 2 +- .../search/TestRangeFieldsDocValuesQuery.java | 2 +- .../apache/lucene/search/TestRegexpQuery.java | 2 +- .../lucene/search/TestRegexpRandom.java | 2 +- .../lucene/search/TestRegexpRandom2.java | 2 +- .../lucene/search/TestReqOptSumScorer.java | 2 +- .../search/TestSameScoresWithThreads.java | 2 +- .../TestScoreCachingWrappingScorer.java | 2 +- .../apache/lucene/search/TestSearchAfter.java | 2 +- .../lucene/search/TestSearchWithThreads.java | 2 +- .../lucene/search/TestSearcherManager.java | 4 +-- .../apache/lucene/search/TestSimilarity.java | 2 +- .../lucene/search/TestSimilarityProvider.java | 2 +- .../TestSimpleExplanationsWithFillerDocs.java | 2 +- .../lucene/search/TestSloppyPhraseQuery.java | 2 +- .../org/apache/lucene/search/TestSort.java | 2 +- .../lucene/search/TestSortOptimization.java | 2 +- .../apache/lucene/search/TestSortRandom.java | 2 +- .../lucene/search/TestSortRescorer.java | 2 +- .../search/TestSortedNumericSortField.java | 2 +- .../lucene/search/TestSortedSetSelector.java | 2 +- .../lucene/search/TestSortedSetSortField.java | 2 +- .../lucene/search/TestSubScorerFreqs.java | 2 +- .../lucene/search/TestSynonymQuery.java | 2 +- .../lucene/search/TestTermInSetQuery.java | 2 +- .../apache/lucene/search/TestTermQuery.java | 2 +- .../apache/lucene/search/TestTermScorer.java | 2 +- .../search/TestTimeLimitingCollector.java | 2 +- .../lucene/search/TestTopDocsCollector.java | 2 +- .../lucene/search/TestTopDocsMerge.java | 2 +- .../lucene/search/TestTopFieldCollector.java | 2 +- ...TestTopFieldCollectorEarlyTermination.java | 4 +-- .../search/TestTotalHitCountCollector.java | 2 +- .../TestUsageTrackingFilterCachingPolicy.java | 2 +- .../apache/lucene/search/TestWildcard.java | 2 +- .../lucene/search/TestWildcardRandom.java | 2 +- .../search/TestXYPointDistanceSort.java | 2 +- .../similarities/TestBooleanSimilarity.java | 2 +- .../search/similarities/TestSimilarity2.java | 2 +- .../similarities/TestSimilarityBase.java | 2 +- .../lucene/store/TestNRTCachingDirectory.java | 2 +- .../org/apache/lucene/util/fst/TestFSTs.java | 2 +- .../expressions/TestDemoExpressions.java | 2 +- .../expressions/TestExpressionRescorer.java | 2 +- .../expressions/TestExpressionSorts.java | 2 +- .../TestExpressionValueSource.java | 2 +- .../lucene/facet/TestDrillDownQuery.java | 2 +- .../lucene/facet/TestDrillSideways.java | 2 +- .../apache/lucene/facet/TestFacetQuery.java | 2 +- .../apache/lucene/facet/TestFacetUtils.java | 2 +- .../facet/TestLongValueFacetCounts.java | 2 +- .../lucene/facet/TestMultipleIndexFields.java | 2 +- .../TestRandomSamplingFacetsCollector.java | 2 +- .../facet/TestStringValueFacetCounts.java | 2 +- .../facet/range/TestRangeFacetCounts.java | 2 +- .../TestSortedSetDocValuesFacets.java | 2 +- .../TestOrdinalMappingLeafReader.java | 2 +- .../TestTaxonomyFacetAssociations.java | 2 +- .../taxonomy/TestTaxonomyFacetCounts.java | 2 +- .../taxonomy/TestTaxonomyFacetLabels.java | 2 +- .../TestTaxonomyFacetSumValueSource.java | 2 +- .../grouping/AbstractGroupingTestCase.java | 2 +- .../grouping/BaseGroupSelectorTestCase.java | 2 +- .../grouping/TestAllGroupHeadsCollector.java | 2 +- .../grouping/TestAllGroupsCollector.java | 2 +- .../search/grouping/TestBlockGrouping.java | 2 +- .../grouping/TestDistinctValuesCollector.java | 2 +- .../grouping/TestGroupFacetCollector.java | 2 +- .../lucene/search/grouping/TestGrouping.java | 2 +- .../search/grouping/TestGroupingSearch.java | 2 +- .../search/highlight/TestTokenSources.java | 4 +-- .../uhighlight/TestUnifiedHighlighter.java | 2 +- .../uhighlight/TestUnifiedHighlighterMTQ.java | 2 +- .../TestUnifiedHighlighterRanking.java | 2 +- .../TestUnifiedHighlighterReanalysis.java | 2 +- .../TestUnifiedHighlighterStrictPhrases.java | 2 +- .../TestUnifiedHighlighterTermIntervals.java | 2 +- .../TestUnifiedHighlighterTermVec.java | 2 +- .../TestSimpleFragmentsBuilder.java | 2 +- .../lucene/search/join/TestBlockJoin.java | 2 +- .../search/join/TestBlockJoinScorer.java | 2 +- .../search/join/TestBlockJoinSorting.java | 2 +- .../search/join/TestCheckJoinIndex.java | 2 +- .../lucene/search/join/TestJoinUtil.java | 2 +- .../TestParentChildrenBlockJoinQuery.java | 2 +- .../search/join/TestQueryBitSetProducer.java | 2 +- .../luke/models/commits/TestCommitsImpl.java | 2 +- .../models/documents/DocumentsTestBase.java | 2 +- .../documents/TestDocValuesAdapter.java | 2 +- .../documents/TestTermVectorsAdapter.java | 2 +- .../models/overview/OverviewTestBase.java | 2 +- .../luke/models/search/TestSearchImpl.java | 2 +- .../lucene/misc/index/TestIndexSplitter.java | 2 +- .../TestDiversifiedTopDocsCollector.java | 2 +- .../TestMemoryAccountingBitsetCollector.java | 2 +- .../misc/store/TestDirectIODirectory.java | 2 +- .../lucene/queries/TestCommonTermsQuery.java | 2 +- .../queries/function/FunctionTestSetup.java | 2 +- .../function/TestDocValuesFieldSources.java | 2 +- .../function/TestFunctionQuerySort.java | 2 +- .../function/TestIndexReaderFunctions.java | 2 +- .../function/TestLongNormValueSource.java | 2 +- .../queries/function/TestValueSources.java | 2 +- .../queries/intervals/TestIntervalQuery.java | 2 +- .../queries/intervals/TestIntervals.java | 2 +- .../TestPayloadFilteredInterval.java | 2 +- .../lucene/queries/mlt/TestMoreLikeThis.java | 2 +- .../payloads/TestPayloadCheckQuery.java | 2 +- .../payloads/TestPayloadScoreQuery.java | 2 +- .../payloads/TestPayloadSpanPositions.java | 2 +- .../queries/payloads/TestPayloadSpans.java | 2 +- .../payloads/TestPayloadTermQuery.java | 2 +- .../lucene/queries/spans/TestBasics.java | 2 +- .../spans/TestFieldMaskingSpanQuery.java | 2 +- .../queries/spans/TestNearSpansOrdered.java | 2 +- .../spans/TestQueryRescorerWithSpans.java | 2 +- .../queries/spans/TestSpanCollection.java | 2 +- .../queries/spans/TestSpanContainQuery.java | 2 +- .../queries/spans/TestSpanFirstQuery.java | 2 +- .../spans/TestSpanMultiTermQueryWrapper.java | 2 +- .../queries/spans/TestSpanNearQuery.java | 2 +- .../queries/spans/TestSpanNotQuery.java | 2 +- .../queries/spans/TestSpanSimilarity.java | 2 +- .../queries/spans/TestSpanTermQuery.java | 2 +- .../lucene/queries/spans/TestSpans.java | 2 +- .../lucene/queries/spans/TestSpansEnum.java | 2 +- .../queryparser/classic/TestQueryParser.java | 2 +- .../lucene/payloads/TestPayloadSpanUtil.java | 2 +- .../TestIDVersionPostingsFormat.java | 4 +-- .../sandbox/document/TestBigIntegerPoint.java | 2 +- .../TestFloatPointNearestNeighbor.java | 2 +- .../sandbox/document/TestHalfFloatPoint.java | 2 +- .../queries/TestFuzzyLikeThisQuery.java | 2 +- .../search/TestCombinedFieldQuery.java | 2 +- .../search/TestDocValuesNumbersQuery.java | 2 +- .../search/TestDocValuesTermsQuery.java | 2 +- .../search/TestFieldCacheTermsFilter.java | 2 +- ...xSortSortedNumericDocValuesRangeQuery.java | 2 +- .../TestLargeNumHitsTopDocsCollector.java | 2 +- .../search/TestLatLonBoundingBoxQueries.java | 2 +- .../sandbox/search/TestMultiRangeQueries.java | 2 +- .../lucene/sandbox/search/TestNearest.java | 2 +- .../search/TestPhraseWildcardQuery.java | 2 +- .../sandbox/search/TestProfilerCollector.java | 2 +- .../TestQueryProfilerIndexSearcher.java | 2 +- .../search/TestTermAutomatonQuery.java | 2 +- .../lucene/spatial/SpatialTestCase.java | 2 +- .../lucene/spatial3d/TestGeo3DPoint.java | 2 +- .../search/spell/TestDirectSpellChecker.java | 2 +- .../spell/TestWordBreakSpellChecker.java | 2 +- .../suggest/TestDocumentDictionary.java | 2 +- .../TestDocumentValueSourceDictionary.java | 2 +- .../suggest/document/TestContextQuery.java | 2 +- .../document/TestContextSuggestField.java | 2 +- .../document/TestFuzzyCompletionQuery.java | 2 +- .../document/TestPrefixCompletionQuery.java | 2 +- .../document/TestRegexCompletionQuery.java | 2 +- .../suggest/document/TestSuggestField.java | 2 +- .../java/org/apache/lucene/index/package.html | 32 ------------------- .../analysis/BaseTokenStreamTestCase.java | 2 +- .../asserting/AssertingDocValuesFormat.java | 2 +- .../asserting/AssertingNormsFormat.java | 2 +- .../asserting/AssertingPointsFormat.java | 2 +- .../asserting/AssertingPostingsFormat.java | 2 +- .../asserting/AssertingTermVectorsFormat.java | 2 +- .../tests/geo/BaseGeoPointTestCase.java | 2 +- .../lucene/tests/geo/BaseXYPointTestCase.java | 2 +- .../index/AlcoholicMergePolicy.java | 4 ++- .../index/AllDeletedFilterReader.java | 4 ++- .../index/AssertingDirectoryReader.java | 5 ++- .../index/AssertingLeafReader.java | 24 ++++++++++++-- .../index/BaseCompoundFormatTestCase.java | 6 +++- ...aseCompressingDocValuesFormatTestCase.java | 4 ++- .../index/BaseDocValuesFormatTestCase.java | 20 +++++++++++- .../index/BaseFieldInfoFormatTestCase.java | 11 ++++++- .../index/BaseIndexFileFormatTestCase.java | 23 ++++++++++++- .../index/BaseKnnVectorsFormatTestCase.java | 15 ++++++++- .../index/BaseLiveDocsFormatTestCase.java | 5 ++- .../index/BaseMergePolicyTestCase.java | 12 ++++++- .../index/BaseNormsFormatTestCase.java | 14 ++++++-- .../index/BasePointsFormatTestCase.java | 15 ++++++++- .../index/BasePostingsFormatTestCase.java | 16 +++++++++- .../index/BaseSegmentInfoFormatTestCase.java | 5 ++- .../index/BaseStoredFieldsFormatTestCase.java | 17 +++++++++- .../index/BaseTermVectorsFormatTestCase.java | 11 ++++++- .../{ => tests}/index/BaseTestCheckIndex.java | 5 ++- .../lucene/{ => tests}/index/DocHelper.java | 7 +++- .../index/FieldFilterLeafReader.java | 14 +++++++- .../{ => tests}/index/ForceMergePolicy.java | 6 +++- .../index/IndexWriterMaxDocsChanger.java | 3 +- .../tests}/index/MergeReaderWrapper.java | 18 ++++++++++- .../{ => tests}/index/MergingCodecReader.java | 4 ++- .../index/MergingDirectoryReaderWrapper.java | 6 +++- .../index/MismatchedDirectoryReader.java | 5 ++- .../index/MismatchedLeafReader.java | 7 +++- .../index/MockIndexWriterEventListener.java | 5 ++- .../index/MockRandomMergePolicy.java | 9 +++++- .../index/OwnCacheKeyMultiReader.java | 4 ++- .../{ => tests}/index/PerThreadPKLookup.java | 7 +++- .../{ => tests}/index/PointsStackTracker.java | 2 +- .../lucene/{ => tests}/index/RandomCodec.java | 6 +++- .../{ => tests}/index/RandomIndexWriter.java | 12 ++++++- .../index/RandomPostingsTester.java | 21 +++++++++++- .../SuppressingConcurrentMergeScheduler.java | 4 ++- .../ThreadedIndexingAndSearchingTestCase.java | 12 ++++++- .../lucene/tests/index/package-info.java | 30 +++++++++++++++++ .../tests/search/BaseExplanationTestCase.java | 2 +- .../lucene/tests/search/MatchesTestBase.java | 2 +- .../search/SearchEquivalenceTestBase.java | 2 +- .../similarities/BaseSimilarityTestCase.java | 2 +- .../store/BaseChunkedDirectoryTestCase.java | 2 +- .../lucene/tests/util/LuceneTestCase.java | 11 +++++++ .../util/TestRuleSetupAndRestoreClassEnv.java | 2 +- .../tests/analysis/TestMockAnalyzer.java | 2 +- .../TestAssertingDocValuesFormat.java | 2 +- .../asserting/TestAssertingNormsFormat.java | 2 +- .../asserting/TestAssertingPointsFormat.java | 2 +- .../TestAssertingPostingsFormat.java | 2 +- .../TestAssertingStoredFieldsFormat.java | 2 +- .../TestAssertingTermVectorsFormat.java | 2 +- .../index/TestAssertingLeafReader.java | 8 ++++- .../index/TestForceMergePolicy.java | 4 ++- .../tests/store/TestMockDirectoryWrapper.java | 2 +- 445 files changed, 818 insertions(+), 404 deletions(-) delete mode 100644 lucene/test-framework/src/java/org/apache/lucene/index/package.html rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/index/AlcoholicMergePolicy.java (94%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/index/AllDeletedFilterReader.java (91%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/index/AssertingDirectoryReader.java (89%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/index/AssertingLeafReader.java (97%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/index/BaseCompoundFormatTestCase.java (99%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/index/BaseCompressingDocValuesFormatTestCase.java (97%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/index/BaseDocValuesFormatTestCase.java (99%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/index/BaseFieldInfoFormatTestCase.java (97%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/index/BaseIndexFileFormatTestCase.java (97%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/index/BaseKnnVectorsFormatTestCase.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/index/BaseLiveDocsFormatTestCase.java (96%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/index/BaseMergePolicyTestCase.java (97%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/index/BaseNormsFormatTestCase.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/index/BasePointsFormatTestCase.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/index/BasePostingsFormatTestCase.java (99%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/index/BaseSegmentInfoFormatTestCase.java (99%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/index/BaseStoredFieldsFormatTestCase.java (97%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/index/BaseTermVectorsFormatTestCase.java (99%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/index/BaseTestCheckIndex.java (97%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/index/DocHelper.java (97%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/index/FieldFilterLeafReader.java (90%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/index/ForceMergePolicy.java (86%) mode change 100755 => 100644 rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/index/IndexWriterMaxDocsChanger.java (95%) rename lucene/{core/src/java/org/apache/lucene => test-framework/src/java/org/apache/lucene/tests}/index/MergeReaderWrapper.java (90%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/index/MergingCodecReader.java (95%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/index/MergingDirectoryReaderWrapper.java (88%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/index/MismatchedDirectoryReader.java (90%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/index/MismatchedLeafReader.java (95%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/index/MockIndexWriterEventListener.java (90%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/index/MockRandomMergePolicy.java (95%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/index/OwnCacheKeyMultiReader.java (94%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/index/PerThreadPKLookup.java (93%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/index/PointsStackTracker.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/index/RandomCodec.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/index/RandomIndexWriter.java (97%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/index/RandomPostingsTester.java (98%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/index/SuppressingConcurrentMergeScheduler.java (92%) rename lucene/test-framework/src/java/org/apache/lucene/{ => tests}/index/ThreadedIndexingAndSearchingTestCase.java (98%) create mode 100644 lucene/test-framework/src/java/org/apache/lucene/tests/index/package-info.java rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/index/TestAssertingLeafReader.java (87%) rename lucene/test-framework/src/test/org/apache/lucene/{ => tests}/index/TestForceMergePolicy.java (89%) mode change 100755 => 100644 diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymGraphFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymGraphFilter.java index 3837bdee663..fca26b50910 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymGraphFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymGraphFilter.java @@ -33,7 +33,6 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.PhraseQuery; import org.apache.lucene.store.ByteArrayDataInput; @@ -42,6 +41,7 @@ import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.MockGraphTokenFilter; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.tests.util.automaton.AutomatonTestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/collation/TestCollationDocValuesField.java b/lucene/analysis/common/src/test/org/apache/lucene/collation/TestCollationDocValuesField.java index a810db20419..3536224c50f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/collation/TestCollationDocValuesField.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/collation/TestCollationDocValuesField.java @@ -23,7 +23,6 @@ import org.apache.lucene.document.StringField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.MultiDocValues; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.SortedDocValues; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchAllDocsQuery; @@ -31,6 +30,7 @@ import org.apache.lucene.search.SortField; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUCollationDocValuesField.java b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUCollationDocValuesField.java index 8de52e1cda2..e441c9662e1 100644 --- a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUCollationDocValuesField.java +++ b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUCollationDocValuesField.java @@ -23,7 +23,6 @@ import org.apache.lucene.document.StringField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.MultiDocValues; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.SortedDocValues; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchAllDocsQuery; @@ -31,6 +30,7 @@ import org.apache.lucene.search.SortField; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestBlockPostingsFormat.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestBlockPostingsFormat.java index fc00ccd1261..0a9de02ef8a 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestBlockPostingsFormat.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestBlockPostingsFormat.java @@ -28,7 +28,6 @@ import org.apache.lucene.codecs.CompetitiveImpactAccumulator; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import org.apache.lucene.index.BasePostingsFormatTestCase; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.Impact; import org.apache.lucene.index.IndexWriter; @@ -39,6 +38,7 @@ import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.BasePostingsFormatTestCase; import org.apache.lucene.tests.util.LuceneTestCase.Nightly; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestBlockPostingsFormat2.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestBlockPostingsFormat2.java index 6d8b9171410..337ec450c43 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestBlockPostingsFormat2.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestBlockPostingsFormat2.java @@ -25,9 +25,9 @@ import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.index.IndexableField; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.Nightly; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestBlockPostingsFormat3.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestBlockPostingsFormat3.java index a7ee452aa01..84f6ac950e1 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestBlockPostingsFormat3.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestBlockPostingsFormat3.java @@ -35,7 +35,6 @@ import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.PostingsEnum; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.index.TermsEnum.SeekStatus; @@ -44,6 +43,7 @@ import org.apache.lucene.tests.analysis.MockFixedLengthPayloadFilter; import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.analysis.MockVariableLengthPayloadFilter; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.English; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.Nightly; diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50CompoundFormat.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50CompoundFormat.java index 0f18e266492..69c38210c7c 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50CompoundFormat.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50CompoundFormat.java @@ -18,7 +18,7 @@ import org.apache.lucene.backward_codecs.lucene87.Lucene87RWCodec; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.index.BaseCompoundFormatTestCase; +import org.apache.lucene.tests.index.BaseCompoundFormatTestCase; import org.apache.lucene.tests.util.LuceneTestCase.Nightly; @Nightly // N-2 formats are only tested on nightly runs diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50LiveDocsFormat.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50LiveDocsFormat.java index 0295e3fc2ab..fca261f2a8a 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50LiveDocsFormat.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50LiveDocsFormat.java @@ -18,7 +18,7 @@ import org.apache.lucene.backward_codecs.lucene86.Lucene86RWCodec; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.index.BaseLiveDocsFormatTestCase; +import org.apache.lucene.tests.index.BaseLiveDocsFormatTestCase; import org.apache.lucene.tests.util.LuceneTestCase.Nightly; @Nightly // N-2 formats are only tested on nightly runs diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50StoredFieldsFormat.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50StoredFieldsFormat.java index f3620d2046a..51fd2a6c50d 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50StoredFieldsFormat.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50StoredFieldsFormat.java @@ -18,7 +18,7 @@ import org.apache.lucene.backward_codecs.lucene86.Lucene86RWCodec; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.index.BaseStoredFieldsFormatTestCase; +import org.apache.lucene.tests.index.BaseStoredFieldsFormatTestCase; import org.apache.lucene.tests.util.LuceneTestCase.Nightly; @Nightly // N-2 formats are only tested on nightly runs diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50StoredFieldsFormatHighCompression.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50StoredFieldsFormatHighCompression.java index 9a78a029a18..fc10c6de2ef 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50StoredFieldsFormatHighCompression.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50StoredFieldsFormatHighCompression.java @@ -22,11 +22,11 @@ import org.apache.lucene.codecs.Codec; import org.apache.lucene.document.Document; import org.apache.lucene.document.StoredField; -import org.apache.lucene.index.BaseStoredFieldsFormatTestCase; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.BaseStoredFieldsFormatTestCase; import org.apache.lucene.tests.util.LuceneTestCase.Nightly; @Nightly // N-2 formats are only tested on nightly runs diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50TermVectorsFormat.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50TermVectorsFormat.java index 29f544391b8..388707407c8 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50TermVectorsFormat.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestLucene50TermVectorsFormat.java @@ -18,7 +18,7 @@ import org.apache.lucene.backward_codecs.lucene87.Lucene87RWCodec; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.index.BaseTermVectorsFormatTestCase; +import org.apache.lucene.tests.index.BaseTermVectorsFormatTestCase; import org.apache.lucene.tests.util.LuceneTestCase.Nightly; @Nightly // N-2 formats are only tested on nightly runs diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene60/TestLucene60FieldInfosFormat.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene60/TestLucene60FieldInfosFormat.java index 51b6ce8d880..10b7fe9a92e 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene60/TestLucene60FieldInfosFormat.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene60/TestLucene60FieldInfosFormat.java @@ -18,7 +18,7 @@ import org.apache.lucene.backward_codecs.lucene84.Lucene84RWCodec; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.index.BaseFieldInfoFormatTestCase; +import org.apache.lucene.tests.index.BaseFieldInfoFormatTestCase; import org.apache.lucene.tests.util.LuceneTestCase.Nightly; @Nightly // N-2 formats are only tested on nightly runs diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene60/TestLucene60PointsFormat.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene60/TestLucene60PointsFormat.java index af130044e8e..5e52c3dace6 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene60/TestLucene60PointsFormat.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene60/TestLucene60PointsFormat.java @@ -23,17 +23,17 @@ import org.apache.lucene.codecs.Codec; import org.apache.lucene.document.BinaryPoint; import org.apache.lucene.document.Document; -import org.apache.lucene.index.BasePointsFormatTestCase; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.LeafReader; -import org.apache.lucene.index.MockRandomMergePolicy; import org.apache.lucene.index.PointValues; import org.apache.lucene.index.PointValues.IntersectVisitor; import org.apache.lucene.index.PointValues.Relation; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.BasePointsFormatTestCase; +import org.apache.lucene.tests.index.MockRandomMergePolicy; import org.apache.lucene.tests.util.LuceneTestCase.Nightly; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene70/TestLucene70SegmentInfoFormat.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene70/TestLucene70SegmentInfoFormat.java index 69b6ca26106..f3d777de28b 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene70/TestLucene70SegmentInfoFormat.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene70/TestLucene70SegmentInfoFormat.java @@ -19,7 +19,7 @@ import org.apache.lucene.backward_codecs.lucene84.Lucene84RWCodec; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.index.BaseSegmentInfoFormatTestCase; +import org.apache.lucene.tests.index.BaseSegmentInfoFormatTestCase; import org.apache.lucene.tests.util.LuceneTestCase.Nightly; import org.apache.lucene.util.Version; diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/BaseLucene80DocValuesFormatTestCase.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/BaseLucene80DocValuesFormatTestCase.java index 3f941a403af..390ddc37a2d 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/BaseLucene80DocValuesFormatTestCase.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/BaseLucene80DocValuesFormatTestCase.java @@ -38,7 +38,6 @@ import org.apache.lucene.document.SortedSetDocValuesField; import org.apache.lucene.document.StoredField; import org.apache.lucene.document.StringField; -import org.apache.lucene.index.BaseCompressingDocValuesFormatTestCase; import org.apache.lucene.index.BinaryDocValues; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.DocValues; @@ -49,7 +48,6 @@ import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.NumericDocValues; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.SerialMergeScheduler; import org.apache.lucene.index.SortedDocValues; import org.apache.lucene.index.SortedNumericDocValues; @@ -63,6 +61,8 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.codecs.asserting.AssertingCodec; +import org.apache.lucene.tests.index.BaseCompressingDocValuesFormatTestCase; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/TestLucene80NormsFormat.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/TestLucene80NormsFormat.java index fb1efea3acf..c61fb2beae4 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/TestLucene80NormsFormat.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene80/TestLucene80NormsFormat.java @@ -18,7 +18,7 @@ import org.apache.lucene.backward_codecs.lucene87.Lucene87RWCodec; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.index.BaseNormsFormatTestCase; +import org.apache.lucene.tests.index.BaseNormsFormatTestCase; import org.apache.lucene.tests.util.LuceneTestCase.Nightly; /** Tests Lucene80NormsFormat */ diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene84/TestLucene84PostingsFormat.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene84/TestLucene84PostingsFormat.java index 3d037e75a73..abb1c83247f 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene84/TestLucene84PostingsFormat.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene84/TestLucene84PostingsFormat.java @@ -28,7 +28,6 @@ import org.apache.lucene.codecs.CompetitiveImpactAccumulator; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import org.apache.lucene.index.BasePostingsFormatTestCase; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.Impact; import org.apache.lucene.index.IndexWriter; @@ -39,6 +38,7 @@ import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.BasePostingsFormatTestCase; import org.apache.lucene.tests.util.LuceneTestCase.Nightly; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene86/TestLucene86PointsFormat.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene86/TestLucene86PointsFormat.java index 7d1f0ac7848..c713ea58569 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene86/TestLucene86PointsFormat.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene86/TestLucene86PointsFormat.java @@ -26,19 +26,19 @@ import org.apache.lucene.codecs.PointsWriter; import org.apache.lucene.document.BinaryPoint; import org.apache.lucene.document.Document; -import org.apache.lucene.index.BasePointsFormatTestCase; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.LeafReader; -import org.apache.lucene.index.MockRandomMergePolicy; import org.apache.lucene.index.PointValues; import org.apache.lucene.index.PointValues.IntersectVisitor; import org.apache.lucene.index.PointValues.Relation; import org.apache.lucene.index.SegmentReadState; import org.apache.lucene.index.SegmentWriteState; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.BasePointsFormatTestCase; +import org.apache.lucene.tests.index.MockRandomMergePolicy; import org.apache.lucene.tests.util.LuceneTestCase.Nightly; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.bkd.BKDConfig; diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene86/TestLucene86SegmentInfoFormat.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene86/TestLucene86SegmentInfoFormat.java index ffc83407ab8..c8901616763 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene86/TestLucene86SegmentInfoFormat.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene86/TestLucene86SegmentInfoFormat.java @@ -19,7 +19,7 @@ import org.apache.lucene.backward_codecs.lucene87.Lucene87RWCodec; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.index.BaseSegmentInfoFormatTestCase; +import org.apache.lucene.tests.index.BaseSegmentInfoFormatTestCase; import org.apache.lucene.tests.util.LuceneTestCase.Nightly; import org.apache.lucene.util.Version; diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene87/TestLucene87StoredFieldsFormat.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene87/TestLucene87StoredFieldsFormat.java index 0aa9063ca25..c58727903f9 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene87/TestLucene87StoredFieldsFormat.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene87/TestLucene87StoredFieldsFormat.java @@ -17,7 +17,7 @@ package org.apache.lucene.backward_codecs.lucene87; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.index.BaseStoredFieldsFormatTestCase; +import org.apache.lucene.tests.index.BaseStoredFieldsFormatTestCase; import org.apache.lucene.tests.util.LuceneTestCase.Nightly; @Nightly // N-2 formats are only tested on nightly runs diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene87/TestLucene87StoredFieldsFormatHighCompression.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene87/TestLucene87StoredFieldsFormatHighCompression.java index 62db916e81c..baaedbaed8c 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene87/TestLucene87StoredFieldsFormatHighCompression.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene87/TestLucene87StoredFieldsFormatHighCompression.java @@ -20,11 +20,11 @@ import org.apache.lucene.codecs.Codec; import org.apache.lucene.document.Document; import org.apache.lucene.document.StoredField; -import org.apache.lucene.index.BaseStoredFieldsFormatTestCase; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.BaseStoredFieldsFormatTestCase; import org.apache.lucene.tests.util.LuceneTestCase.Nightly; @Nightly // N-2 formats are only tested on nightly runs diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestBackwardsCompatibility.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestBackwardsCompatibility.java index b9d09c60c94..362326180be 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestBackwardsCompatibility.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestBackwardsCompatibility.java @@ -80,7 +80,6 @@ import org.apache.lucene.index.NoMergePolicy; import org.apache.lucene.index.NumericDocValues; import org.apache.lucene.index.PostingsEnum; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.SegmentCommitInfo; import org.apache.lucene.index.SegmentInfos; import org.apache.lucene.index.SegmentReader; @@ -108,6 +107,7 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.NIOFSDirectory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/classification/src/test/org/apache/lucene/classification/ClassificationTestBase.java b/lucene/classification/src/test/org/apache/lucene/classification/ClassificationTestBase.java index 06bc4740a41..edc880fbee4 100644 --- a/lucene/classification/src/test/org/apache/lucene/classification/ClassificationTestBase.java +++ b/lucene/classification/src/test/org/apache/lucene/classification/ClassificationTestBase.java @@ -25,9 +25,9 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.LeafReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.Query; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/classification/src/test/org/apache/lucene/classification/document/DocumentClassificationTestBase.java b/lucene/classification/src/test/org/apache/lucene/classification/document/DocumentClassificationTestBase.java index 890e3638ee1..7e9fa45282d 100644 --- a/lucene/classification/src/test/org/apache/lucene/classification/document/DocumentClassificationTestBase.java +++ b/lucene/classification/src/test/org/apache/lucene/classification/document/DocumentClassificationTestBase.java @@ -27,7 +27,7 @@ import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriterConfig; -import org.apache.lucene.index.RandomIndexWriter; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.util.BytesRef; import org.junit.Before; diff --git a/lucene/classification/src/test/org/apache/lucene/classification/utils/TestDataSplitter.java b/lucene/classification/src/test/org/apache/lucene/classification/utils/TestDataSplitter.java index a15ba02cd30..c7cd6cb2c7e 100644 --- a/lucene/classification/src/test/org/apache/lucene/classification/utils/TestDataSplitter.java +++ b/lucene/classification/src/test/org/apache/lucene/classification/utils/TestDataSplitter.java @@ -26,9 +26,9 @@ import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.LeafReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/classification/src/test/org/apache/lucene/classification/utils/TestDocToDoubleVectorUtils.java b/lucene/classification/src/test/org/apache/lucene/classification/utils/TestDocToDoubleVectorUtils.java index f36b7880fe6..c150d011a2e 100644 --- a/lucene/classification/src/test/org/apache/lucene/classification/utils/TestDocToDoubleVectorUtils.java +++ b/lucene/classification/src/test/org/apache/lucene/classification/utils/TestDocToDoubleVectorUtils.java @@ -22,12 +22,12 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.MultiTerms; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Terms; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.After; import org.junit.Before; diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestFixedGapPostingsFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestFixedGapPostingsFormat.java index 9bdbff53940..6157244d0fa 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestFixedGapPostingsFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestFixedGapPostingsFormat.java @@ -17,8 +17,8 @@ package org.apache.lucene.codecs.blockterms; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.index.BasePostingsFormatTestCase; import org.apache.lucene.tests.codecs.blockterms.LuceneFixedGap; +import org.apache.lucene.tests.index.BasePostingsFormatTestCase; import org.apache.lucene.tests.util.TestUtil; /** Basic tests of a PF using FixedGap terms dictionary */ diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestVarGapDocFreqIntervalPostingsFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestVarGapDocFreqIntervalPostingsFormat.java index e59c5590e71..cbdbdc7fa9f 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestVarGapDocFreqIntervalPostingsFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestVarGapDocFreqIntervalPostingsFormat.java @@ -17,8 +17,8 @@ package org.apache.lucene.codecs.blockterms; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.index.BasePostingsFormatTestCase; import org.apache.lucene.tests.codecs.blockterms.LuceneVarGapFixedInterval; +import org.apache.lucene.tests.index.BasePostingsFormatTestCase; import org.apache.lucene.tests.util.TestUtil; /** Basic tests of a PF using VariableGap terms dictionary (fixed interval) */ diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestVarGapFixedIntervalPostingsFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestVarGapFixedIntervalPostingsFormat.java index 7874d717a12..c6564614a93 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestVarGapFixedIntervalPostingsFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestVarGapFixedIntervalPostingsFormat.java @@ -17,8 +17,8 @@ package org.apache.lucene.codecs.blockterms; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.index.BasePostingsFormatTestCase; import org.apache.lucene.tests.codecs.blockterms.LuceneVarGapDocFreqInterval; +import org.apache.lucene.tests.index.BasePostingsFormatTestCase; import org.apache.lucene.tests.util.TestUtil; /** Basic tests of a PF using VariableGap terms dictionary (fixed interval, docFreq threshold) */ diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/blocktreeords/TestOrdsBlockTree.java b/lucene/codecs/src/test/org/apache/lucene/codecs/blocktreeords/TestOrdsBlockTree.java index bb154e154ab..b4a7faa9a44 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/blocktreeords/TestOrdsBlockTree.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/blocktreeords/TestOrdsBlockTree.java @@ -23,16 +23,16 @@ import org.apache.lucene.codecs.Codec; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import org.apache.lucene.index.BasePostingsFormatTestCase; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.MultiTerms; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.BasePostingsFormatTestCase; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/bloom/TestBloomPostingsFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/bloom/TestBloomPostingsFormat.java index 7ae62225014..38b90d7e576 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/bloom/TestBloomPostingsFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/bloom/TestBloomPostingsFormat.java @@ -17,8 +17,8 @@ package org.apache.lucene.codecs.bloom; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.index.BasePostingsFormatTestCase; import org.apache.lucene.tests.codecs.bloom.TestBloomFilteredLucenePostings; +import org.apache.lucene.tests.index.BasePostingsFormatTestCase; import org.apache.lucene.tests.util.TestUtil; /** Basic tests for BloomPostingsFormat */ diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestDirectPostingsFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestDirectPostingsFormat.java index 08b1459d859..493ad6bbd4f 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestDirectPostingsFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestDirectPostingsFormat.java @@ -17,7 +17,7 @@ package org.apache.lucene.codecs.memory; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.index.BasePostingsFormatTestCase; +import org.apache.lucene.tests.index.BasePostingsFormatTestCase; import org.apache.lucene.tests.util.TestUtil; /** Tests DirectPostingsFormat */ diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestFSTPostingsFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestFSTPostingsFormat.java index 32c79cee587..b94ca70ef8b 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestFSTPostingsFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestFSTPostingsFormat.java @@ -17,7 +17,7 @@ package org.apache.lucene.codecs.memory; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.index.BasePostingsFormatTestCase; +import org.apache.lucene.tests.index.BasePostingsFormatTestCase; import org.apache.lucene.tests.util.TestUtil; /** Tests FSTPostingsFormat */ diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextCompoundFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextCompoundFormat.java index 8bdd18bc6d1..fbb0ce1ebf6 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextCompoundFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextCompoundFormat.java @@ -17,7 +17,7 @@ package org.apache.lucene.codecs.simpletext; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.index.BaseCompoundFormatTestCase; +import org.apache.lucene.tests.index.BaseCompoundFormatTestCase; public class TestSimpleTextCompoundFormat extends BaseCompoundFormatTestCase { private final Codec codec = new SimpleTextCodec(); diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextDocValuesFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextDocValuesFormat.java index a33697b6c8f..ed13e2bbad8 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextDocValuesFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextDocValuesFormat.java @@ -17,7 +17,7 @@ package org.apache.lucene.codecs.simpletext; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.index.BaseDocValuesFormatTestCase; +import org.apache.lucene.tests.index.BaseDocValuesFormatTestCase; /** Tests SimpleTextDocValuesFormat */ public class TestSimpleTextDocValuesFormat extends BaseDocValuesFormatTestCase { diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextFieldInfoFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextFieldInfoFormat.java index e507403a065..842f59dfac6 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextFieldInfoFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextFieldInfoFormat.java @@ -17,7 +17,7 @@ package org.apache.lucene.codecs.simpletext; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.index.BaseFieldInfoFormatTestCase; +import org.apache.lucene.tests.index.BaseFieldInfoFormatTestCase; /** Tests SimpleTextFieldInfoFormat */ public class TestSimpleTextFieldInfoFormat extends BaseFieldInfoFormatTestCase { diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextKnnVectorsFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextKnnVectorsFormat.java index 296ecd1912e..527112b0db2 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextKnnVectorsFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextKnnVectorsFormat.java @@ -17,7 +17,7 @@ package org.apache.lucene.codecs.simpletext; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.index.BaseKnnVectorsFormatTestCase; +import org.apache.lucene.tests.index.BaseKnnVectorsFormatTestCase; public class TestSimpleTextKnnVectorsFormat extends BaseKnnVectorsFormatTestCase { @Override diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextLiveDocsFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextLiveDocsFormat.java index bb2ff691461..2c78db8341d 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextLiveDocsFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextLiveDocsFormat.java @@ -17,7 +17,7 @@ package org.apache.lucene.codecs.simpletext; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.index.BaseLiveDocsFormatTestCase; +import org.apache.lucene.tests.index.BaseLiveDocsFormatTestCase; public class TestSimpleTextLiveDocsFormat extends BaseLiveDocsFormatTestCase { private final Codec codec = new SimpleTextCodec(); diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextNormsFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextNormsFormat.java index 672a2666760..96b85dc52f4 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextNormsFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextNormsFormat.java @@ -17,7 +17,7 @@ package org.apache.lucene.codecs.simpletext; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.index.BaseNormsFormatTestCase; +import org.apache.lucene.tests.index.BaseNormsFormatTestCase; /** Tests SimpleTextNormsFormat */ public class TestSimpleTextNormsFormat extends BaseNormsFormatTestCase { diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextPointsFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextPointsFormat.java index 8f80f9fdd58..cca19b6260d 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextPointsFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextPointsFormat.java @@ -17,7 +17,7 @@ package org.apache.lucene.codecs.simpletext; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.index.BasePointsFormatTestCase; +import org.apache.lucene.tests.index.BasePointsFormatTestCase; /** Tests SimpleText's point format */ public class TestSimpleTextPointsFormat extends BasePointsFormatTestCase { diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextPostingsFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextPostingsFormat.java index 68228134fbf..8a07b2d88a2 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextPostingsFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextPostingsFormat.java @@ -17,7 +17,7 @@ package org.apache.lucene.codecs.simpletext; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.index.BasePostingsFormatTestCase; +import org.apache.lucene.tests.index.BasePostingsFormatTestCase; import org.apache.lucene.tests.util.LuceneTestCase.Nightly; /** Tests SimpleText's postings */ diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextSegmentInfoFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextSegmentInfoFormat.java index 156c063d03f..610f5a2d756 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextSegmentInfoFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextSegmentInfoFormat.java @@ -17,7 +17,7 @@ package org.apache.lucene.codecs.simpletext; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.index.BaseSegmentInfoFormatTestCase; +import org.apache.lucene.tests.index.BaseSegmentInfoFormatTestCase; import org.apache.lucene.util.Version; /** Tests SimpleTextSegmentInfoFormat */ diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextStoredFieldsFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextStoredFieldsFormat.java index 3726eb62439..6e30d64fd49 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextStoredFieldsFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextStoredFieldsFormat.java @@ -17,7 +17,7 @@ package org.apache.lucene.codecs.simpletext; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.index.BaseStoredFieldsFormatTestCase; +import org.apache.lucene.tests.index.BaseStoredFieldsFormatTestCase; public class TestSimpleTextStoredFieldsFormat extends BaseStoredFieldsFormatTestCase { diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextTermVectorsFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextTermVectorsFormat.java index b2ebc21c174..1c9e3047b77 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextTermVectorsFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextTermVectorsFormat.java @@ -17,7 +17,7 @@ package org.apache.lucene.codecs.simpletext; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.index.BaseTermVectorsFormatTestCase; +import org.apache.lucene.tests.index.BaseTermVectorsFormatTestCase; public class TestSimpleTextTermVectorsFormat extends BaseTermVectorsFormatTestCase { @Override diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/TestUniformSplitPostingFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/TestUniformSplitPostingFormat.java index 8092796d903..0b5a573df3e 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/TestUniformSplitPostingFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/uniformsplit/TestUniformSplitPostingFormat.java @@ -19,8 +19,8 @@ import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.PostingsFormat; -import org.apache.lucene.index.BasePostingsFormatTestCase; import org.apache.lucene.tests.codecs.uniformsplit.UniformSplitRot13PostingsFormat; +import org.apache.lucene.tests.index.BasePostingsFormatTestCase; import org.apache.lucene.tests.util.TestUtil; import org.junit.After; import org.junit.Before; diff --git a/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java b/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java index 64bc28c7928..ca1a13fb65c 100644 --- a/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java +++ b/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java @@ -2285,7 +2285,8 @@ private static Status.TermIndexStatus checkFields( return status; } - static void checkImpacts(Impacts impacts, int lastTarget) { + /** @lucene.internal */ + public static void checkImpacts(Impacts impacts, int lastTarget) { final int numLevels = impacts.numLevels(); if (numLevels < 1) { throw new CheckIndexException("The number of levels must be >= 1, got " + numLevels); diff --git a/lucene/core/src/java/org/apache/lucene/index/FilterLeafReader.java b/lucene/core/src/java/org/apache/lucene/index/FilterLeafReader.java index 8da4fbef18f..b00951c7299 100644 --- a/lucene/core/src/java/org/apache/lucene/index/FilterLeafReader.java +++ b/lucene/core/src/java/org/apache/lucene/index/FilterLeafReader.java @@ -22,6 +22,7 @@ import org.apache.lucene.util.AttributeSource; import org.apache.lucene.util.Bits; import org.apache.lucene.util.BytesRef; +import org.apache.lucene.util.Unwrappable; /** * A FilterLeafReader contains another LeafReader, which it uses as its basic source of @@ -242,7 +243,8 @@ public TermState termState() throws IOException { } /** Base class for filtering {@link PostingsEnum} implementations. */ - public abstract static class FilterPostingsEnum extends PostingsEnum { + public abstract static class FilterPostingsEnum extends PostingsEnum + implements Unwrappable { /** The underlying PostingsEnum instance. */ protected final PostingsEnum in; @@ -302,6 +304,11 @@ public BytesRef getPayload() throws IOException { public long cost() { return in.cost(); } + + @Override + public PostingsEnum unwrap() { + return in; + } } /** The underlying LeafReader. */ diff --git a/lucene/core/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java b/lucene/core/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java index 8d298904a3d..df7574308d3 100644 --- a/lucene/core/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java @@ -25,11 +25,11 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.MultiTerms; import org.apache.lucene.index.PostingsEnum; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.util.BytesRef; public class TestCachingTokenFilter extends BaseTokenStreamTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90CompoundFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90CompoundFormat.java index 48ee783e623..506462f6d6b 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90CompoundFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90CompoundFormat.java @@ -17,7 +17,7 @@ package org.apache.lucene.codecs.lucene90; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.index.BaseCompoundFormatTestCase; +import org.apache.lucene.tests.index.BaseCompoundFormatTestCase; import org.apache.lucene.tests.util.TestUtil; public class TestLucene90CompoundFormat extends BaseCompoundFormatTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90DocValuesFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90DocValuesFormat.java index 32ef5b0348d..4e79ee9dfd7 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90DocValuesFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90DocValuesFormat.java @@ -41,7 +41,6 @@ import org.apache.lucene.document.SortedSetDocValuesField; import org.apache.lucene.document.StoredField; import org.apache.lucene.document.StringField; -import org.apache.lucene.index.BaseCompressingDocValuesFormatTestCase; import org.apache.lucene.index.BinaryDocValues; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.DocValues; @@ -52,7 +51,6 @@ import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.NumericDocValues; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.SerialMergeScheduler; import org.apache.lucene.index.SortedDocValues; import org.apache.lucene.index.SortedNumericDocValues; @@ -66,6 +64,8 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.codecs.asserting.AssertingCodec; +import org.apache.lucene.tests.index.BaseCompressingDocValuesFormatTestCase; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90FieldInfosFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90FieldInfosFormat.java index 000e6d3e8fc..e723b5146c2 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90FieldInfosFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90FieldInfosFormat.java @@ -17,7 +17,7 @@ package org.apache.lucene.codecs.lucene90; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.index.BaseFieldInfoFormatTestCase; +import org.apache.lucene.tests.index.BaseFieldInfoFormatTestCase; import org.apache.lucene.tests.util.TestUtil; public class TestLucene90FieldInfosFormat extends BaseFieldInfoFormatTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90HnswVectorsFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90HnswVectorsFormat.java index c03a9164dcc..7baca8ca540 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90HnswVectorsFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90HnswVectorsFormat.java @@ -22,7 +22,7 @@ import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.KnnVectorsFormat; -import org.apache.lucene.index.BaseKnnVectorsFormatTestCase; +import org.apache.lucene.tests.index.BaseKnnVectorsFormatTestCase; import org.apache.lucene.tests.util.TestUtil; public class TestLucene90HnswVectorsFormat extends BaseKnnVectorsFormatTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90LiveDocsFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90LiveDocsFormat.java index 1c46d4dbf92..5beda0269b0 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90LiveDocsFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90LiveDocsFormat.java @@ -17,7 +17,7 @@ package org.apache.lucene.codecs.lucene90; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.index.BaseLiveDocsFormatTestCase; +import org.apache.lucene.tests.index.BaseLiveDocsFormatTestCase; import org.apache.lucene.tests.util.TestUtil; public class TestLucene90LiveDocsFormat extends BaseLiveDocsFormatTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90NormsFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90NormsFormat.java index 5b090bb0a7e..8c9a1a28a00 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90NormsFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90NormsFormat.java @@ -17,7 +17,7 @@ package org.apache.lucene.codecs.lucene90; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.index.BaseNormsFormatTestCase; +import org.apache.lucene.tests.index.BaseNormsFormatTestCase; import org.apache.lucene.tests.util.TestUtil; /** Tests Lucene90NormsFormat */ diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90PointsFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90PointsFormat.java index 36938f2d0e9..632c396fe03 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90PointsFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90PointsFormat.java @@ -25,19 +25,19 @@ import org.apache.lucene.codecs.PointsWriter; import org.apache.lucene.document.BinaryPoint; import org.apache.lucene.document.Document; -import org.apache.lucene.index.BasePointsFormatTestCase; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.LeafReader; -import org.apache.lucene.index.MockRandomMergePolicy; import org.apache.lucene.index.PointValues; import org.apache.lucene.index.PointValues.IntersectVisitor; import org.apache.lucene.index.PointValues.Relation; import org.apache.lucene.index.SegmentReadState; import org.apache.lucene.index.SegmentWriteState; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.BasePointsFormatTestCase; +import org.apache.lucene.tests.index.MockRandomMergePolicy; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.bkd.BKDConfig; diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90PostingsFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90PostingsFormat.java index 6e60e42391e..90a9ebe5369 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90PostingsFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90PostingsFormat.java @@ -27,7 +27,6 @@ import org.apache.lucene.codecs.lucene90.blocktree.Stats; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import org.apache.lucene.index.BasePostingsFormatTestCase; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.Impact; import org.apache.lucene.index.IndexWriter; @@ -38,6 +37,7 @@ import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.BasePostingsFormatTestCase; import org.apache.lucene.tests.util.TestUtil; public class TestLucene90PostingsFormat extends BasePostingsFormatTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90SegmentInfoFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90SegmentInfoFormat.java index 24749f02321..baf266dc6ac 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90SegmentInfoFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90SegmentInfoFormat.java @@ -18,7 +18,7 @@ package org.apache.lucene.codecs.lucene90; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.index.BaseSegmentInfoFormatTestCase; +import org.apache.lucene.tests.index.BaseSegmentInfoFormatTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Version; diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90StoredFieldsFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90StoredFieldsFormat.java index 1faca6ca372..ad6c60ca435 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90StoredFieldsFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90StoredFieldsFormat.java @@ -17,7 +17,7 @@ package org.apache.lucene.codecs.lucene90; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.index.BaseStoredFieldsFormatTestCase; +import org.apache.lucene.tests.index.BaseStoredFieldsFormatTestCase; import org.apache.lucene.tests.util.TestUtil; public class TestLucene90StoredFieldsFormat extends BaseStoredFieldsFormatTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90StoredFieldsFormatHighCompression.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90StoredFieldsFormatHighCompression.java index 14eed8eb537..a1cb543bc05 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90StoredFieldsFormatHighCompression.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90StoredFieldsFormatHighCompression.java @@ -21,11 +21,11 @@ import org.apache.lucene.codecs.lucene90.Lucene90Codec.Mode; import org.apache.lucene.document.Document; import org.apache.lucene.document.StoredField; -import org.apache.lucene.index.BaseStoredFieldsFormatTestCase; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.BaseStoredFieldsFormatTestCase; public class TestLucene90StoredFieldsFormatHighCompression extends BaseStoredFieldsFormatTestCase { @Override diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90TermVectorsFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90TermVectorsFormat.java index a64fd5d5ee0..6660b9b6429 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90TermVectorsFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/TestLucene90TermVectorsFormat.java @@ -17,7 +17,7 @@ package org.apache.lucene.codecs.lucene90; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.index.BaseTermVectorsFormatTestCase; +import org.apache.lucene.tests.index.BaseTermVectorsFormatTestCase; import org.apache.lucene.tests.util.TestUtil; public class TestLucene90TermVectorsFormat extends BaseTermVectorsFormatTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/compressing/TestCompressingStoredFieldsFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/compressing/TestCompressingStoredFieldsFormat.java index 6b050687d06..c1096b71409 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/compressing/TestCompressingStoredFieldsFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/compressing/TestCompressingStoredFieldsFormat.java @@ -25,7 +25,6 @@ import org.apache.lucene.document.FieldType; import org.apache.lucene.document.IntPoint; import org.apache.lucene.document.StoredField; -import org.apache.lucene.index.BaseStoredFieldsFormatTestCase; import org.apache.lucene.index.CodecReader; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexWriter; @@ -37,6 +36,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.codecs.compressing.CompressingCodec; +import org.apache.lucene.tests.index.BaseStoredFieldsFormatTestCase; public class TestCompressingStoredFieldsFormat extends BaseStoredFieldsFormatTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/compressing/TestCompressingTermVectorsFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/compressing/TestCompressingTermVectorsFormat.java index 3dfdb7df962..7cc6943185b 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene90/compressing/TestCompressingTermVectorsFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene90/compressing/TestCompressingTermVectorsFormat.java @@ -22,7 +22,6 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; import org.apache.lucene.document.TextField; -import org.apache.lucene.index.BaseTermVectorsFormatTestCase; import org.apache.lucene.index.CodecReader; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexWriter; @@ -30,13 +29,14 @@ import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.NoMergePolicy; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.index.TermsEnum.SeekStatus; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.codecs.compressing.CompressingCodec; +import org.apache.lucene.tests.index.BaseTermVectorsFormatTestCase; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.util.BytesRef; public class TestCompressingTermVectorsFormat extends BaseTermVectorsFormatTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java index d7b2a4ff3a6..d33eab12546 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java @@ -33,7 +33,6 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.NumericDocValuesField; import org.apache.lucene.document.TextField; -import org.apache.lucene.index.BaseDocValuesFormatTestCase; import org.apache.lucene.index.BinaryDocValues; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.FieldInfo; @@ -42,7 +41,6 @@ import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.MergeState; import org.apache.lucene.index.NumericDocValues; -import org.apache.lucene.index.RandomCodec; import org.apache.lucene.index.SegmentReadState; import org.apache.lucene.index.SegmentWriteState; import org.apache.lucene.index.Term; @@ -53,6 +51,8 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.codecs.asserting.AssertingCodec; +import org.apache.lucene.tests.index.BaseDocValuesFormatTestCase; +import org.apache.lucene.tests.index.RandomCodec; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldKnnVectorsFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldKnnVectorsFormat.java index 72254e891b6..1181247ae1a 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldKnnVectorsFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldKnnVectorsFormat.java @@ -30,7 +30,6 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.KnnVectorField; -import org.apache.lucene.index.BaseKnnVectorsFormatTestCase; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.IndexReader; @@ -38,7 +37,6 @@ import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.NoMergePolicy; -import org.apache.lucene.index.RandomCodec; import org.apache.lucene.index.SegmentReadState; import org.apache.lucene.index.SegmentWriteState; import org.apache.lucene.index.VectorValues; @@ -46,6 +44,8 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.codecs.asserting.AssertingCodec; +import org.apache.lucene.tests.index.BaseKnnVectorsFormatTestCase; +import org.apache.lucene.tests.index.RandomCodec; import org.apache.lucene.tests.util.TestUtil; import org.hamcrest.MatcherAssert; diff --git a/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat.java index 60ae76b0533..52f86a92410 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat.java @@ -19,8 +19,8 @@ import java.util.Collections; import java.util.Random; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.index.BasePostingsFormatTestCase; -import org.apache.lucene.index.RandomCodec; +import org.apache.lucene.tests.index.BasePostingsFormatTestCase; +import org.apache.lucene.tests.index.RandomCodec; /** Basic tests of PerFieldPostingsFormat */ public class TestPerFieldPostingsFormat extends BasePostingsFormatTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat2.java b/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat2.java index f77415fe4d3..b9ccab0935a 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat2.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat2.java @@ -43,7 +43,6 @@ import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.index.LogDocMergePolicy; import org.apache.lucene.index.MergeState; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.SegmentReadState; import org.apache.lucene.index.SegmentWriteState; import org.apache.lucene.index.Term; @@ -54,6 +53,7 @@ import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.codecs.asserting.AssertingCodec; import org.apache.lucene.tests.codecs.blockterms.LuceneVarGapFixedInterval; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.junit.Test; diff --git a/lucene/core/src/test/org/apache/lucene/document/BaseLatLonPointTestCase.java b/lucene/core/src/test/org/apache/lucene/document/BaseLatLonPointTestCase.java index 0a78ad9eb48..938168acf1d 100644 --- a/lucene/core/src/test/org/apache/lucene/document/BaseLatLonPointTestCase.java +++ b/lucene/core/src/test/org/apache/lucene/document/BaseLatLonPointTestCase.java @@ -25,11 +25,11 @@ import org.apache.lucene.geo.Polygon; import org.apache.lucene.geo.Rectangle; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.geo.GeoTestUtil; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.util.IOUtils; diff --git a/lucene/core/src/test/org/apache/lucene/document/BaseLatLonShapeTestCase.java b/lucene/core/src/test/org/apache/lucene/document/BaseLatLonShapeTestCase.java index 0ddbe0e44d9..7caf03ae978 100644 --- a/lucene/core/src/test/org/apache/lucene/document/BaseLatLonShapeTestCase.java +++ b/lucene/core/src/test/org/apache/lucene/document/BaseLatLonShapeTestCase.java @@ -24,11 +24,11 @@ import org.apache.lucene.geo.Polygon; import org.apache.lucene.geo.Rectangle; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.geo.GeoTestUtil; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.util.IOUtils; diff --git a/lucene/core/src/test/org/apache/lucene/document/TestBinaryDocument.java b/lucene/core/src/test/org/apache/lucene/document/TestBinaryDocument.java index 773ebc29178..352626a93b3 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestBinaryDocument.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestBinaryDocument.java @@ -18,8 +18,8 @@ import java.nio.charset.StandardCharsets; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/document/TestDocument.java b/lucene/core/src/test/org/apache/lucene/document/TestDocument.java index 3efee8c90ba..e30a48161e7 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestDocument.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestDocument.java @@ -24,7 +24,6 @@ import org.apache.lucene.index.IndexOptions; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexableField; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.PhraseQuery; @@ -33,6 +32,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/document/TestFeatureDoubleValues.java b/lucene/core/src/test/org/apache/lucene/document/TestFeatureDoubleValues.java index 2e0832d7759..1f60acc7833 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestFeatureDoubleValues.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestFeatureDoubleValues.java @@ -20,11 +20,11 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.DoubleValues; import org.apache.lucene.search.DoubleValuesSource; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; public class TestFeatureDoubleValues extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/document/TestFeatureField.java b/lucene/core/src/test/org/apache/lucene/document/TestFeatureField.java index 1247a9fedbe..1f12944a981 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestFeatureField.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestFeatureField.java @@ -20,7 +20,6 @@ import org.apache.lucene.document.Field.Store; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.BooleanQuery; @@ -35,6 +34,7 @@ import org.apache.lucene.search.similarities.BM25Similarity; import org.apache.lucene.search.similarities.Similarity.SimScorer; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/document/TestFeatureSort.java b/lucene/core/src/test/org/apache/lucene/document/TestFeatureSort.java index eae1cd9ce76..ee42de7b7d5 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestFeatureSort.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestFeatureSort.java @@ -19,13 +19,13 @@ import java.io.IOException; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriterConfig; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.Sort; import org.apache.lucene.search.SortField; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/document/TestField.java b/lucene/core/src/test/org/apache/lucene/document/TestField.java index 964900ea7e6..de57596912d 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestField.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestField.java @@ -19,7 +19,6 @@ import java.io.StringReader; import java.nio.charset.StandardCharsets; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.TermQuery; @@ -27,6 +26,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.CannedTokenStream; import org.apache.lucene.tests.analysis.Token; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/document/TestInetAddressPoint.java b/lucene/core/src/test/org/apache/lucene/document/TestInetAddressPoint.java index fbcd7b9582f..834171a5473 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestInetAddressPoint.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestInetAddressPoint.java @@ -18,10 +18,10 @@ import java.net.InetAddress; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; /** Simple tests for {@link InetAddressPoint} */ diff --git a/lucene/core/src/test/org/apache/lucene/document/TestLatLonPointDistanceFeatureQuery.java b/lucene/core/src/test/org/apache/lucene/document/TestLatLonPointDistanceFeatureQuery.java index d73d1c90438..32dfe7252c9 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestLatLonPointDistanceFeatureQuery.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestLatLonPointDistanceFeatureQuery.java @@ -23,7 +23,6 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.MultiReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.Query; @@ -33,6 +32,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.TopScoreDocCollector; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/document/TestLatLonPointDistanceSort.java b/lucene/core/src/test/org/apache/lucene/document/TestLatLonPointDistanceSort.java index 9bb43c3d3c5..25e51891a60 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestLatLonPointDistanceSort.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestLatLonPointDistanceSort.java @@ -25,7 +25,6 @@ import java.util.Arrays; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriterConfig; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.SerialMergeScheduler; import org.apache.lucene.search.FieldDoc; import org.apache.lucene.search.IndexSearcher; @@ -35,6 +34,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.geo.GeoTestUtil; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.SloppyMath; diff --git a/lucene/core/src/test/org/apache/lucene/document/TestLatLonShape.java b/lucene/core/src/test/org/apache/lucene/document/TestLatLonShape.java index 98207971f95..355b6818231 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestLatLonShape.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestLatLonShape.java @@ -37,13 +37,13 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.SerialMergeScheduler; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.geo.GeoTestUtil; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; diff --git a/lucene/core/src/test/org/apache/lucene/document/TestLongDistanceFeatureQuery.java b/lucene/core/src/test/org/apache/lucene/document/TestLongDistanceFeatureQuery.java index 47afd93d2ec..19a2da8b529 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestLongDistanceFeatureQuery.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestLongDistanceFeatureQuery.java @@ -21,13 +21,13 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.MultiReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.TopScoreDocCollector; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/document/TestXYShape.java b/lucene/core/src/test/org/apache/lucene/document/TestXYShape.java index 7607c75ee8a..5d3e32ceda5 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestXYShape.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestXYShape.java @@ -27,12 +27,12 @@ import org.apache.lucene.geo.XYPolygon; import org.apache.lucene.geo.XYRectangle; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.geo.ShapeTestUtil; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java b/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java index e79514aca78..45d42b86d6c 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java @@ -43,6 +43,8 @@ import org.apache.lucene.store.LockObtainFailedException; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.codecs.asserting.AssertingCodec; +import org.apache.lucene.tests.index.AllDeletedFilterReader; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesCheckIndexHeader.java b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesCheckIndexHeader.java index 74587586bfb..18ca3e856da 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesCheckIndexHeader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesCheckIndexHeader.java @@ -26,6 +26,7 @@ import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LineFileDocs; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesDetectBitFlips.java b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesDetectBitFlips.java index 1c9d0d68796..156a30b13fd 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesDetectBitFlips.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesDetectBitFlips.java @@ -25,6 +25,7 @@ import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesDetectTruncation.java b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesDetectTruncation.java index 5debc0e636a..24d1f809d3c 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesDetectTruncation.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesDetectTruncation.java @@ -25,6 +25,7 @@ import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveChecksumFooter.java b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveChecksumFooter.java index aefa12a2c05..e937b8d7704 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveChecksumFooter.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveChecksumFooter.java @@ -21,6 +21,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.IndexInput; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveCodecHeader.java b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveCodecHeader.java index 30ec4493420..9c107599965 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveCodecHeader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveCodecHeader.java @@ -23,6 +23,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.IndexInput; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestAtomicUpdate.java b/lucene/core/src/test/org/apache/lucene/index/TestAtomicUpdate.java index 55387da6820..b951a565d62 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestAtomicUpdate.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestAtomicUpdate.java @@ -26,6 +26,7 @@ import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.English; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestBagOfPositions.java b/lucene/core/src/test/org/apache/lucene/index/TestBagOfPositions.java index afbfeaca7dc..25c9e57fbc5 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestBagOfPositions.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestBagOfPositions.java @@ -28,6 +28,8 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.MockRandomMergePolicy; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestBagOfPostings.java b/lucene/core/src/test/org/apache/lucene/index/TestBagOfPostings.java index 93161f68c7a..3cb0105e35f 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestBagOfPostings.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestBagOfPostings.java @@ -27,6 +27,8 @@ import org.apache.lucene.document.Field; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.MockRandomMergePolicy; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestBinaryDocValuesUpdates.java b/lucene/core/src/test/org/apache/lucene/index/TestBinaryDocValuesUpdates.java index 1743bf249e6..d6d7135bd23 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestBinaryDocValuesUpdates.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestBinaryDocValuesUpdates.java @@ -44,6 +44,7 @@ import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.codecs.asserting.AssertingCodec; import org.apache.lucene.tests.codecs.asserting.AssertingDocValuesFormat; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestBinaryTerms.java b/lucene/core/src/test/org/apache/lucene/index/TestBinaryTerms.java index b4c3a7d7543..93064bd7062 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestBinaryTerms.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestBinaryTerms.java @@ -24,6 +24,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestCheckIndex.java b/lucene/core/src/test/org/apache/lucene/index/TestCheckIndex.java index 7a655a34226..420abe06ad0 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestCheckIndex.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestCheckIndex.java @@ -25,6 +25,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.CannedTokenStream; import org.apache.lucene.tests.analysis.Token; +import org.apache.lucene.tests.index.BaseTestCheckIndex; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestCodecHoldsOpenFiles.java b/lucene/core/src/test/org/apache/lucene/index/TestCodecHoldsOpenFiles.java index 42c715da9aa..5f1a4cc5e36 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestCodecHoldsOpenFiles.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestCodecHoldsOpenFiles.java @@ -20,6 +20,7 @@ import org.apache.lucene.document.IntPoint; import org.apache.lucene.document.NumericDocValuesField; import org.apache.lucene.document.TextField; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java b/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java index fb736a3ee9a..95964ff814a 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java @@ -38,6 +38,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.CannedTokenStream; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.SuppressingConcurrentMergeScheduler; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestCrash.java b/lucene/core/src/test/org/apache/lucene/index/TestCrash.java index e50517eb5fa..d598c530c63 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestCrash.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestCrash.java @@ -23,6 +23,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.NoLockFactory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestCustomNorms.java b/lucene/core/src/test/org/apache/lucene/index/TestCustomNorms.java index 12da52fd846..d85442986e9 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestCustomNorms.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestCustomNorms.java @@ -29,6 +29,7 @@ import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java b/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java index 0fbf3d1f85d..143cd144051 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java @@ -40,6 +40,8 @@ import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.DocHelper; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDocCount.java b/lucene/core/src/test/org/apache/lucene/index/TestDocCount.java index 968d7d49c0e..6bdcd128e8d 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDocCount.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDocCount.java @@ -21,6 +21,7 @@ import org.apache.lucene.document.Field; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.FixedBitSet; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java b/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java index 731f9bf33de..26f28bf32e7 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java @@ -33,6 +33,7 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java b/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java index 60fd25c945e..888b50654b3 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java @@ -26,6 +26,7 @@ import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java b/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java index 65b53bd6bbd..caf830101e6 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java @@ -43,6 +43,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.DocHelper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.AttributeSource; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java b/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java index f206358bb82..e9ccb4deb95 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java @@ -25,6 +25,8 @@ import org.apache.lucene.document.SortedSetDocValuesField; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomCodec; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.Slow; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestFieldsReader.java b/lucene/core/src/test/org/apache/lucene/index/TestFieldsReader.java index e929a284ceb..c9744ec7581 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestFieldsReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestFieldsReader.java @@ -31,6 +31,7 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.DocHelper; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestFilterLeafReader.java b/lucene/core/src/test/org/apache/lucene/index/TestFilterLeafReader.java index b5552eadcc2..be1715279fd 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestFilterLeafReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestFilterLeafReader.java @@ -24,6 +24,7 @@ import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestForTooMuchCloning.java b/lucene/core/src/test/org/apache/lucene/index/TestForTooMuchCloning.java index 5b2d5ebb212..7c72b3d2e76 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestForTooMuchCloning.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestForTooMuchCloning.java @@ -23,6 +23,7 @@ import org.apache.lucene.search.TermRangeQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java index 8834df3b8bd..01cdbbe0c17 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java @@ -30,6 +30,7 @@ import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexReaderClose.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexReaderClose.java index dd81a2b6f0a..186d4a3df92 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexReaderClose.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexReaderClose.java @@ -24,6 +24,8 @@ import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.AssertingLeafReader; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java index eb67c4e5537..6197c9a7ddc 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java @@ -79,6 +79,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java index 81c79748b53..d0bd164feed 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java @@ -16,7 +16,7 @@ */ package org.apache.lucene.index; -import static org.apache.lucene.index.DocHelper.TEXT_TYPE_STORED_WITH_TVS; +import static org.apache.lucene.tests.index.DocHelper.TEXT_TYPE_STORED_WITH_TVS; import com.carrotsearch.randomizedtesting.generators.RandomPicks; import java.io.ByteArrayOutputStream; @@ -97,6 +97,8 @@ import org.apache.lucene.tests.analysis.MockTokenFilter; import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.analysis.Token; +import org.apache.lucene.tests.index.RandomIndexWriter; +import org.apache.lucene.tests.index.SuppressingConcurrentMergeScheduler; import org.apache.lucene.tests.mockfile.ExtrasFS; import org.apache.lucene.tests.mockfile.FilterPath; import org.apache.lucene.tests.mockfile.WindowsFS; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java index a2088f7cf5c..1cba793c8c8 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java @@ -32,6 +32,7 @@ import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.MockFixedLengthPayloadFilter; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java index f30ca7a0031..7f4258d18fa 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java @@ -29,6 +29,7 @@ import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.InfoStream; import org.junit.Test; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java index 635430d73fe..6efe8d27833 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java @@ -42,6 +42,8 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.MockRandomMergePolicy; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java index 25d473348fb..659c403b753 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java @@ -57,6 +57,7 @@ import org.apache.lucene.store.IndexOutput; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.store.MockDirectoryWrapper.FakeIOException; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java index e212ce326bb..39bce4c0880 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java @@ -32,6 +32,8 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.MockIndexWriterEventListener; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.mockfile.HandleLimitFS; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java index 247de39f4ff..902d36d963c 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java @@ -40,6 +40,8 @@ import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.AssertingDirectoryReader; +import org.apache.lucene.tests.index.DocHelper; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.store.MockDirectoryWrapper.FakeIOException; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterThreadsToSegments.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterThreadsToSegments.java index 12e0b668ba4..893c72c41e8 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterThreadsToSegments.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterThreadsToSegments.java @@ -33,6 +33,7 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java index cce2a2bebc6..85fbbb93234 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java @@ -27,6 +27,7 @@ import org.apache.lucene.document.Field; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java index c99bd8488b7..120cc6a37d2 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java @@ -35,6 +35,8 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.LockObtainFailedException; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; +import org.apache.lucene.tests.index.SuppressingConcurrentMergeScheduler; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LineFileDocs; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java index 0a86992e37b..1eec50555bd 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java @@ -34,6 +34,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexingSequenceNumbers.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexingSequenceNumbers.java index 6b3fdd1bb92..b8feffbb407 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexingSequenceNumbers.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexingSequenceNumbers.java @@ -33,6 +33,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIsCurrent.java b/lucene/core/src/test/org/apache/lucene/index/TestIsCurrent.java index 739259849f3..6414492d525 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIsCurrent.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIsCurrent.java @@ -20,6 +20,7 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.store.*; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestLogMergePolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestLogMergePolicy.java index 7dbf49db15f..53b88f778b8 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestLogMergePolicy.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestLogMergePolicy.java @@ -19,6 +19,7 @@ import java.io.IOException; import org.apache.lucene.index.MergePolicy.MergeSpecification; import org.apache.lucene.index.MergePolicy.OneMerge; +import org.apache.lucene.tests.index.BaseMergePolicyTestCase; public class TestLogMergePolicy extends BaseMergePolicyTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestLongPostings.java b/lucene/core/src/test/org/apache/lucene/index/TestLongPostings.java index b0433b7042b..5a737e6036e 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestLongPostings.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestLongPostings.java @@ -27,6 +27,7 @@ import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java b/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java index f0ec157fc97..a0c05f19bef 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java @@ -28,6 +28,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestMergeRateLimiter.java b/lucene/core/src/test/org/apache/lucene/index/TestMergeRateLimiter.java index 6ab3b61539f..983b51b609a 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestMergeRateLimiter.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestMergeRateLimiter.java @@ -18,6 +18,7 @@ import org.apache.lucene.document.Document; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; public class TestMergeRateLimiter extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestMixedCodecs.java b/lucene/core/src/test/org/apache/lucene/index/TestMixedCodecs.java index 4578102eec8..382cfb6bd6e 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestMixedCodecs.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestMixedCodecs.java @@ -23,6 +23,7 @@ import org.apache.lucene.document.Field; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestMultiDocValues.java b/lucene/core/src/test/org/apache/lucene/index/TestMultiDocValues.java index 0404c958d45..018d7592bf1 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestMultiDocValues.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestMultiDocValues.java @@ -29,6 +29,7 @@ import org.apache.lucene.document.SortedSetDocValuesField; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderCleanup.java b/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderCleanup.java index faae8b01342..eea2864e66b 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderCleanup.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderCleanup.java @@ -21,6 +21,7 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.TextField; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressFileSystems; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java b/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java index e1c3a3cd8e3..39f22e006a3 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java @@ -21,6 +21,7 @@ import org.apache.lucene.document.Document; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.DocHelper; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNRTThreads.java b/lucene/core/src/test/org/apache/lucene/index/TestNRTThreads.java index 667bcb56067..4b768e5cd39 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestNRTThreads.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNRTThreads.java @@ -20,6 +20,7 @@ import java.util.concurrent.ExecutorService; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.ThreadedIndexingAndSearchingTestCase; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; import org.junit.Before; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNeverDelete.java b/lucene/core/src/test/org/apache/lucene/index/TestNeverDelete.java index 31f8cd0eeee..5461b78061b 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestNeverDelete.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNeverDelete.java @@ -22,6 +22,7 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNoMergePolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestNoMergePolicy.java index 81b1a61c87d..360426e2941 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestNoMergePolicy.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNoMergePolicy.java @@ -22,6 +22,7 @@ import java.lang.reflect.Modifier; import java.util.Arrays; import org.apache.lucene.index.MergePolicy.MergeSpecification; +import org.apache.lucene.tests.index.BaseMergePolicyTestCase; import org.junit.Test; public class TestNoMergePolicy extends BaseMergePolicyTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNorms.java b/lucene/core/src/test/org/apache/lucene/index/TestNorms.java index 6fd29e7bccb..6fdb906979e 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestNorms.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNorms.java @@ -31,6 +31,7 @@ import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java b/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java index 8a5c936c452..cbd0338c8e1 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java @@ -49,6 +49,7 @@ import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.codecs.asserting.AssertingCodec; import org.apache.lucene.tests.codecs.asserting.AssertingDocValuesFormat; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestOmitPositions.java b/lucene/core/src/test/org/apache/lucene/index/TestOmitPositions.java index 63efeffc69f..46bf5adc8dc 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestOmitPositions.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestOmitPositions.java @@ -24,6 +24,7 @@ import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java b/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java index 35c1c984aa2..272a6ee46f9 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java @@ -36,6 +36,7 @@ import org.apache.lucene.search.similarities.TFIDFSimilarity; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestOrdinalMap.java b/lucene/core/src/test/org/apache/lucene/index/TestOrdinalMap.java index 78afe478a30..d8e6417d4b5 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestOrdinalMap.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestOrdinalMap.java @@ -24,6 +24,7 @@ import org.apache.lucene.document.SortedSetDocValuesField; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.RamUsageTester; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java b/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java index 7e64e5a81b5..4174b77827b 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java @@ -40,6 +40,7 @@ import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.analysis.Token; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestPayloadsOnVectors.java b/lucene/core/src/test/org/apache/lucene/index/TestPayloadsOnVectors.java index d4db1f8c40b..53716f73296 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestPayloadsOnVectors.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestPayloadsOnVectors.java @@ -29,6 +29,7 @@ import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.analysis.Token; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java b/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java index 4e22d310d99..3f12fc898c9 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java @@ -23,6 +23,7 @@ import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.DocHelper; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestPointValues.java b/lucene/core/src/test/org/apache/lucene/index/TestPointValues.java index 07cfe2f850b..db46eb7a407 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestPointValues.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestPointValues.java @@ -34,6 +34,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java b/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java index 095a22d3105..8bb77fcb698 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java @@ -36,6 +36,7 @@ import org.apache.lucene.tests.analysis.MockPayloadAnalyzer; import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.analysis.Token; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.English; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestReadOnlyIndex.java b/lucene/core/src/test/org/apache/lucene/index/TestReadOnlyIndex.java index 08bcea33e8c..d2be8c176c5 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestReadOnlyIndex.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestReadOnlyIndex.java @@ -31,6 +31,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java b/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java index f7ee9760bdb..ac23b9b5287 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java @@ -25,6 +25,8 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.OwnCacheKeyMultiReader; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestReaderWrapperDVTypeCheck.java b/lucene/core/src/test/org/apache/lucene/index/TestReaderWrapperDVTypeCheck.java index 6b1e638746c..7ec0083b9e1 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestReaderWrapperDVTypeCheck.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestReaderWrapperDVTypeCheck.java @@ -24,6 +24,7 @@ import org.apache.lucene.document.SortedSetDocValuesField; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestRollback.java b/lucene/core/src/test/org/apache/lucene/index/TestRollback.java index b20b22c95aa..b7a04c24740 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestRollback.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestRollback.java @@ -20,6 +20,7 @@ import org.apache.lucene.document.Field; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; public class TestRollback extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSameTokenSamePosition.java b/lucene/core/src/test/org/apache/lucene/index/TestSameTokenSamePosition.java index 0669ee5f43e..893a282051a 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSameTokenSamePosition.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSameTokenSamePosition.java @@ -24,6 +24,7 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.TextField; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; public class TestSameTokenSamePosition extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java b/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java index 7a3097b132e..63b697da2c9 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java @@ -26,6 +26,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.MergeInfo; +import org.apache.lucene.tests.index.DocHelper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java b/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java index fd3b495469b..da8abbaf5c0 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java @@ -24,6 +24,7 @@ import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; +import org.apache.lucene.tests.index.DocHelper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java b/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java index f59169ccaa5..5d5ddf6bec2 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java @@ -22,6 +22,7 @@ import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.DocHelper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSegmentToThreadMapping.java b/lucene/core/src/test/org/apache/lucene/index/TestSegmentToThreadMapping.java index 900d3511bb9..564c70bdb41 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSegmentToThreadMapping.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSegmentToThreadMapping.java @@ -30,6 +30,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.Bits; import org.apache.lucene.util.IOUtils; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSortingCodecReader.java b/lucene/core/src/test/org/apache/lucene/index/TestSortingCodecReader.java index 0db2b7bd953..09a8e9ee36e 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSortingCodecReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSortingCodecReader.java @@ -48,6 +48,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java b/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java index 57353d6d273..54d62c97baf 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java @@ -24,6 +24,7 @@ import org.apache.lucene.document.Field; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java b/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java index 16da210f712..fe865822498 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java @@ -36,6 +36,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java b/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java index 9ba7dfb2987..c3ed3025ff6 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java @@ -34,6 +34,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSumDocFreq.java b/lucene/core/src/test/org/apache/lucene/index/TestSumDocFreq.java index 342be3538e0..2dfe1006a75 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSumDocFreq.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSumDocFreq.java @@ -20,6 +20,7 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSwappedIndexFiles.java b/lucene/core/src/test/org/apache/lucene/index/TestSwappedIndexFiles.java index 68ded659528..8884295151a 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSwappedIndexFiles.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSwappedIndexFiles.java @@ -25,6 +25,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTermStates.java b/lucene/core/src/test/org/apache/lucene/index/TestTermStates.java index 7ec5a1c1c37..85142c2caa3 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTermStates.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTermStates.java @@ -19,6 +19,7 @@ import org.apache.lucene.document.Document; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTermVectors.java b/lucene/core/src/test/org/apache/lucene/index/TestTermVectors.java index 0e92f7c0e0e..196504f56ec 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTermVectors.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTermVectors.java @@ -26,6 +26,7 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.BaseTermVectorsFormatTestCase; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java b/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java index c029633403d..64bf38faf38 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java @@ -33,6 +33,7 @@ import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java b/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java index eb78e838f1d..632b94bb810 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java @@ -34,6 +34,7 @@ import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.MockTokenFilter; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTerms.java b/lucene/core/src/test/org/apache/lucene/index/TestTerms.java index 634d963097f..84067ced62c 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTerms.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTerms.java @@ -21,6 +21,7 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.CannedBinaryTokenStream; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java b/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java index 09035a806f7..841e5558687 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java @@ -34,6 +34,8 @@ import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.PerThreadPKLookup; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java b/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java index 1d1d692a2fa..4cac33011f3 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java @@ -32,6 +32,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java index e1c8e3f6017..a7b67768cd8 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java @@ -31,6 +31,7 @@ import org.apache.lucene.index.MergePolicy.OneMerge; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.BaseMergePolicyTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.Version; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTragicIndexWriterDeadlock.java b/lucene/core/src/test/org/apache/lucene/index/TestTragicIndexWriterDeadlock.java index 57df7d326ba..8abbfca8d21 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTragicIndexWriterDeadlock.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTragicIndexWriterDeadlock.java @@ -22,6 +22,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.apache.lucene.document.Document; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.SuppressingConcurrentMergeScheduler; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java b/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java index 68eaf795c8d..234ea194779 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java @@ -26,6 +26,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestUpgradeIndexMergePolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestUpgradeIndexMergePolicy.java index 0ce2cfbeaee..e9dad198a18 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestUpgradeIndexMergePolicy.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestUpgradeIndexMergePolicy.java @@ -18,6 +18,7 @@ import java.io.IOException; import org.apache.lucene.index.MergePolicy.MergeSpecification; +import org.apache.lucene.tests.index.BaseMergePolicyTestCase; import org.apache.lucene.tests.util.TestUtil; public class TestUpgradeIndexMergePolicy extends BaseMergePolicyTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java index 4f7197fa169..734ba670d6f 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java @@ -27,12 +27,12 @@ import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.MultiTerms; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.SingleTermsEnum; import org.apache.lucene.index.Term; import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.Rethrow; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java b/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java index 01ae823fb52..951dbd872d9 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java @@ -20,9 +20,9 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.automaton.Automaton; import org.apache.lucene.util.automaton.RegExp; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBaseRangeFilter.java b/lucene/core/src/test/org/apache/lucene/search/TestBaseRangeFilter.java index c01e4404943..ad1d81b00c9 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBaseRangeFilter.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBaseRangeFilter.java @@ -28,9 +28,9 @@ import org.apache.lucene.document.SortedDocValuesField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriterConfig.OpenMode; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBlendedTermQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestBlendedTermQuery.java index ba6e1ab6715..9f584b879b7 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBlendedTermQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBlendedTermQuery.java @@ -21,9 +21,9 @@ import org.apache.lucene.document.Field.Store; import org.apache.lucene.document.StringField; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java b/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java index d572f1b5564..67ba9449486 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java @@ -27,12 +27,12 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java b/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java index 561fdf76f66..e3e609e3bc9 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java @@ -23,9 +23,9 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java b/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java index 2ebcc1c38be..b464a5d225b 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java @@ -26,10 +26,10 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java index 8cfdb0adc98..77d952cc699 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java @@ -35,12 +35,12 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.MultiReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java b/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java index 5e8691c8cdd..3e58ce2cae3 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java @@ -31,13 +31,13 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.ScorerIndexSearcher; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBooleanRewrites.java b/lucene/core/src/test/org/apache/lucene/search/TestBooleanRewrites.java index 59a419d5a5f..c282f511dcb 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanRewrites.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanRewrites.java @@ -28,10 +28,10 @@ import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.MultiReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java b/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java index 2257f4cc752..907bb397bf3 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java @@ -24,11 +24,11 @@ import org.apache.lucene.document.StringField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.Weight.DefaultBulkScorer; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.Bits; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestCollectorManager.java b/lucene/core/src/test/org/apache/lucene/search/TestCollectorManager.java index 0d9fc9a5255..7c1adf543b9 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestCollectorManager.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestCollectorManager.java @@ -34,8 +34,8 @@ import org.apache.lucene.document.Document; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; public class TestCollectorManager extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestConjunctions.java b/lucene/core/src/test/org/apache/lucene/search/TestConjunctions.java index 14cf2d1a580..4fd4129a153 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestConjunctions.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestConjunctions.java @@ -31,11 +31,11 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreQuery.java index 9ea1e5b98e8..058c5614977 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreQuery.java @@ -22,10 +22,10 @@ import org.apache.lucene.document.Field; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreScorer.java b/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreScorer.java index bb95906f9a8..d4623106323 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreScorer.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreScorer.java @@ -29,10 +29,10 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; public class TestConstantScoreScorer extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestControlledRealTimeReopenThread.java b/lucene/core/src/test/org/apache/lucene/search/TestControlledRealTimeReopenThread.java index 1df4a5a85f4..2488c1a5429 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestControlledRealTimeReopenThread.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestControlledRealTimeReopenThread.java @@ -33,13 +33,13 @@ import org.apache.lucene.index.IndexableField; import org.apache.lucene.index.KeepOnlyLastCommitDeletionPolicy; import org.apache.lucene.index.NoMergePolicy; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.SnapshotDeletionPolicy; import org.apache.lucene.index.Term; -import org.apache.lucene.index.ThreadedIndexingAndSearchingTestCase; import org.apache.lucene.store.Directory; import org.apache.lucene.store.NRTCachingDirectory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; +import org.apache.lucene.tests.index.ThreadedIndexingAndSearchingTestCase; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; import org.apache.lucene.util.IOUtils; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java b/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java index 6f2e52124ee..e9dc8555694 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java @@ -29,9 +29,9 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.SortedDocValuesField; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestDateSort.java b/lucene/core/src/test/org/apache/lucene/search/TestDateSort.java index ed962073957..d33fddf5786 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestDateSort.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestDateSort.java @@ -22,9 +22,9 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.SortedDocValuesField; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; /** diff --git a/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java index ecd28421fc1..d9d7f909b8b 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java @@ -36,12 +36,12 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestDocValuesFieldExistsQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestDocValuesFieldExistsQuery.java index 215db89a0d6..c03be974684 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestDocValuesFieldExistsQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestDocValuesFieldExistsQuery.java @@ -27,10 +27,10 @@ import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.NoMergePolicy; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestDocValuesQueries.java b/lucene/core/src/test/org/apache/lucene/search/TestDocValuesQueries.java index 64849e00fe3..2f4b74b7f46 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestDocValuesQueries.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestDocValuesQueries.java @@ -25,8 +25,8 @@ import org.apache.lucene.document.SortedNumericDocValuesField; import org.apache.lucene.document.SortedSetDocValuesField; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestDocValuesRewriteMethod.java b/lucene/core/src/test/org/apache/lucene/search/TestDocValuesRewriteMethod.java index 40d93f9f9cc..a694ed6a1a7 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestDocValuesRewriteMethod.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestDocValuesRewriteMethod.java @@ -24,11 +24,11 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.SortedSetDocValuesField; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestDoubleRangeFieldQueries.java b/lucene/core/src/test/org/apache/lucene/search/TestDoubleRangeFieldQueries.java index 4b0a9a6413d..5d1e2912069 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestDoubleRangeFieldQueries.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestDoubleRangeFieldQueries.java @@ -20,8 +20,8 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.DoubleRange; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.BaseRangeFieldQueryTestCase; /** Random testing for RangeFieldQueries. */ diff --git a/lucene/core/src/test/org/apache/lucene/search/TestDoubleValuesSource.java b/lucene/core/src/test/org/apache/lucene/search/TestDoubleValuesSource.java index a855025111b..4861c6d670e 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestDoubleValuesSource.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestDoubleValuesSource.java @@ -27,9 +27,9 @@ import org.apache.lucene.document.NumericDocValuesField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.English; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestEarlyTermination.java b/lucene/core/src/test/org/apache/lucene/search/TestEarlyTermination.java index ff89a5c0122..c8daf443aba 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestEarlyTermination.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestEarlyTermination.java @@ -20,8 +20,8 @@ import org.apache.lucene.document.Document; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; public class TestEarlyTermination extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestFloatRangeFieldQueries.java b/lucene/core/src/test/org/apache/lucene/search/TestFloatRangeFieldQueries.java index 7467bfbb981..9dce6fbb006 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestFloatRangeFieldQueries.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestFloatRangeFieldQueries.java @@ -20,8 +20,8 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.FloatRange; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.BaseRangeFieldQueryTestCase; /** Random testing for FloatRange Queries. */ diff --git a/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java index a67c0635b44..5fe69b9d1ca 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java @@ -31,13 +31,13 @@ import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.MultiReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestFuzzyTermOnShortTerms.java b/lucene/core/src/test/org/apache/lucene/search/TestFuzzyTermOnShortTerms.java index 44315fe2b7d..73b755bf66a 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestFuzzyTermOnShortTerms.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestFuzzyTermOnShortTerms.java @@ -23,10 +23,10 @@ import org.apache.lucene.document.Field; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.junit.Test; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestIndexSearcher.java b/lucene/core/src/test/org/apache/lucene/search/TestIndexSearcher.java index 2b4993e52a0..c3bcda9d47a 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestIndexSearcher.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestIndexSearcher.java @@ -41,10 +41,10 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.MultiReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestIndriAndQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestIndriAndQuery.java index e09530af30d..dae1b3d6b05 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestIndriAndQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestIndriAndQuery.java @@ -21,7 +21,6 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.similarities.IndriDirichletSimilarity; @@ -30,6 +29,7 @@ import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.MockTokenFilter; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; public class TestIndriAndQuery extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestIntRangeFieldQueries.java b/lucene/core/src/test/org/apache/lucene/search/TestIntRangeFieldQueries.java index af10f88cdc7..bb3e71fad9a 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestIntRangeFieldQueries.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestIntRangeFieldQueries.java @@ -20,8 +20,8 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.IntRange; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.BaseRangeFieldQueryTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestKnnVectorQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestKnnVectorQuery.java index e0861a0f537..cde24ee545a 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestKnnVectorQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestKnnVectorQuery.java @@ -36,10 +36,10 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.LeafReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.index.VectorSimilarityFunction; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.Bits; import org.apache.lucene.util.VectorUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestLRUQueryCache.java b/lucene/core/src/test/org/apache/lucene/search/TestLRUQueryCache.java index db70da7b5d8..c6ee7338f75 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestLRUQueryCache.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestLRUQueryCache.java @@ -56,11 +56,11 @@ import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.NoMergePolicy; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.SerialMergeScheduler; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.AssertingIndexSearcher; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestLongRangeFieldQueries.java b/lucene/core/src/test/org/apache/lucene/search/TestLongRangeFieldQueries.java index 99b61c57585..7258e539066 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestLongRangeFieldQueries.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestLongRangeFieldQueries.java @@ -20,8 +20,8 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.LongRange; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.BaseRangeFieldQueryTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestLongValuesSource.java b/lucene/core/src/test/org/apache/lucene/search/TestLongValuesSource.java index 3684979f60d..ac3b6e7bd7e 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestLongValuesSource.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestLongValuesSource.java @@ -24,9 +24,9 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.NumericDocValuesField; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.English; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMinShouldMatch2.java b/lucene/core/src/test/org/apache/lucene/search/TestMinShouldMatch2.java index d78cb755c56..e293854fecb 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestMinShouldMatch2.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestMinShouldMatch2.java @@ -29,13 +29,13 @@ import org.apache.lucene.document.StringField; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.LeafReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.SortedSetDocValues; import org.apache.lucene.index.Term; import org.apache.lucene.index.TermStates; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.search.similarities.Similarity.SimScorer; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.BulkScorerWrapperScorer; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMultiCollector.java b/lucene/core/src/test/org/apache/lucene/search/TestMultiCollector.java index 8d992eb1d1c..2c276d59efc 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestMultiCollector.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestMultiCollector.java @@ -29,8 +29,8 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.junit.Test; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMultiCollectorManager.java b/lucene/core/src/test/org/apache/lucene/search/TestMultiCollectorManager.java index 8f033ca18ff..22017a863cc 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestMultiCollectorManager.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestMultiCollectorManager.java @@ -29,8 +29,8 @@ import org.apache.lucene.document.Document; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; public class TestMultiCollectorManager extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java index 157de2ca796..296a4648922 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java @@ -26,13 +26,13 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.MultiTerms; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.CannedTokenStream; import org.apache.lucene.tests.analysis.Token; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.junit.Ignore; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMultiSliceMerge.java b/lucene/core/src/test/org/apache/lucene/search/TestMultiSliceMerge.java index ecacceff55a..9f6a0dffb21 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestMultiSliceMerge.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestMultiSliceMerge.java @@ -23,8 +23,8 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.SortedDocValuesField; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java b/lucene/core/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java index 4ff014e82ed..fa61910ad42 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java @@ -22,11 +22,11 @@ import org.apache.lucene.document.FieldType; import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.QueryUtils; import org.junit.AfterClass; import org.junit.Assert; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java b/lucene/core/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java index 5e1a684a9e7..fb36de732e1 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java @@ -23,12 +23,12 @@ import org.apache.lucene.index.FilteredTermsEnum; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.MultiReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.AttributeSource; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestNGramPhraseQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestNGramPhraseQuery.java index 0179ac034bb..f42a576ce54 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestNGramPhraseQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestNGramPhraseQuery.java @@ -18,9 +18,9 @@ import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestNeedsScores.java b/lucene/core/src/test/org/apache/lucene/search/TestNeedsScores.java index 9847964d031..57ecad5bde3 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestNeedsScores.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestNeedsScores.java @@ -23,9 +23,9 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestNormsFieldExistsQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestNormsFieldExistsQuery.java index 6305d2c6df3..cb5da03134c 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestNormsFieldExistsQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestNormsFieldExistsQuery.java @@ -27,10 +27,10 @@ import org.apache.lucene.index.IndexOptions; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.NoMergePolicy; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestNot.java b/lucene/core/src/test/org/apache/lucene/search/TestNot.java index 7c1de93558b..daaa77a592c 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestNot.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestNot.java @@ -19,9 +19,9 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; /** Similarity unit test. */ diff --git a/lucene/core/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java index 9b81bf8babb..85d859ff942 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java @@ -22,10 +22,10 @@ import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.MultiTerms; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java index c723ec0a734..8361b868c2c 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java @@ -39,7 +39,6 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig.OpenMode; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.similarities.BM25Similarity; @@ -50,6 +49,7 @@ import org.apache.lucene.tests.analysis.MockTokenFilter; import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.analysis.Token; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestPointQueries.java b/lucene/core/src/test/org/apache/lucene/search/TestPointQueries.java index 7b311dbb0e4..073985aa22d 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestPointQueries.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestPointQueries.java @@ -55,12 +55,12 @@ import org.apache.lucene.index.MultiDocValues; import org.apache.lucene.index.NumericDocValues; import org.apache.lucene.index.PointValues; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.SegmentReadState; import org.apache.lucene.index.SegmentWriteState; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java b/lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java index ba44ee64142..c6343ae5533 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java @@ -27,9 +27,9 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.MultiTerms; import org.apache.lucene.index.PostingsEnum; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java b/lucene/core/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java index acc789e33c2..dcf644ad1a0 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java @@ -19,9 +19,9 @@ import java.io.IOException; import org.apache.lucene.document.Document; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; public class TestPositiveScoresOnlyCollector extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java index d6ff15ea646..e0e3928778b 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java @@ -19,9 +19,9 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestPrefixQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestPrefixQuery.java index eb78c037ffd..9e8761a8b2b 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestPrefixQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestPrefixQuery.java @@ -24,9 +24,9 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java b/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java index a5f956631d1..2d0cdec8f1c 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java @@ -21,13 +21,13 @@ import org.apache.lucene.document.Field; import org.apache.lucene.index.FilteredTermsEnum; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestQueryRescorer.java b/lucene/core/src/test/org/apache/lucene/search/TestQueryRescorer.java index f2c253c64f5..6867d6501d2 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestQueryRescorer.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestQueryRescorer.java @@ -27,12 +27,12 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.similarities.BM25Similarity; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestRangeFieldsDocValuesQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestRangeFieldsDocValuesQuery.java index 1456c8d3523..4c2ff0be01e 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestRangeFieldsDocValuesQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestRangeFieldsDocValuesQuery.java @@ -24,8 +24,8 @@ import org.apache.lucene.document.IntRangeDocValuesField; import org.apache.lucene.document.LongRangeDocValuesField; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; public class TestRangeFieldsDocValuesQuery extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestRegexpQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestRegexpQuery.java index 8c1d193ee50..00803103655 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestRegexpQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestRegexpQuery.java @@ -23,9 +23,9 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.automaton.Automata; import org.apache.lucene.util.automaton.Automaton; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java b/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java index 51dc53f57a1..f39ac709d7f 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java @@ -25,10 +25,10 @@ import org.apache.lucene.document.FieldType; import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java b/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java index 03e847312fa..d856d245bf2 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java @@ -25,13 +25,13 @@ import org.apache.lucene.document.SortedDocValuesField; import org.apache.lucene.index.FilteredTermsEnum; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestReqOptSumScorer.java b/lucene/core/src/test/org/apache/lucene/search/TestReqOptSumScorer.java index 77d9bc6d52e..13c687d1926 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestReqOptSumScorer.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestReqOptSumScorer.java @@ -31,10 +31,10 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.search.RandomApproximationQuery; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSameScoresWithThreads.java b/lucene/core/src/test/org/apache/lucene/search/TestSameScoresWithThreads.java index 15cb1201b2c..02f86826f69 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSameScoresWithThreads.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSameScoresWithThreads.java @@ -26,12 +26,12 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.MultiTerms; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java b/lucene/core/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java index 8361fde6eb0..28e84eae4f5 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java @@ -18,9 +18,9 @@ import java.io.IOException; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; public class TestScoreCachingWrappingScorer extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java b/lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java index 125ab9c81d9..bf2287d0415 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java @@ -30,9 +30,9 @@ import org.apache.lucene.document.SortedDocValuesField; import org.apache.lucene.document.StoredField; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.English; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSearchWithThreads.java b/lucene/core/src/test/org/apache/lucene/search/TestSearchWithThreads.java index 3d15e1b465a..9bb14ca448c 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSearchWithThreads.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSearchWithThreads.java @@ -21,9 +21,9 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; public class TestSearchWithThreads extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java b/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java index 472cb82aa7d..52a0cc7519d 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java @@ -37,12 +37,12 @@ import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; -import org.apache.lucene.index.ThreadedIndexingAndSearchingTestCase; import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; +import org.apache.lucene.tests.index.ThreadedIndexingAndSearchingTestCase; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSimilarity.java b/lucene/core/src/test/org/apache/lucene/search/TestSimilarity.java index 46a7a88afa1..51a286cc88e 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSimilarity.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSimilarity.java @@ -21,11 +21,11 @@ import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; /** Similarity unit test. */ diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java b/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java index 581bef1087f..faf4c251fe3 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java @@ -23,12 +23,12 @@ import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.MultiDocValues; import org.apache.lucene.index.NumericDocValues; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.similarities.PerFieldSimilarityWrapper; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; public class TestSimilarityProvider extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanationsWithFillerDocs.java b/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanationsWithFillerDocs.java index d671bdc7cd0..32bdd5bd846 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanationsWithFillerDocs.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanationsWithFillerDocs.java @@ -18,8 +18,8 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.ArrayUtil; import org.junit.Assume; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java index 401b1686265..c3ed22bfaa3 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java @@ -22,12 +22,12 @@ import org.apache.lucene.document.FieldType; import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.AssertingScorable; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.store.MockDirectoryWrapper; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSort.java b/lucene/core/src/test/org/apache/lucene/search/TestSort.java index 6dc57d3d6c8..1ef4883b318 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSort.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSort.java @@ -25,8 +25,8 @@ import org.apache.lucene.document.NumericDocValuesField; import org.apache.lucene.document.SortedDocValuesField; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; /* diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSortOptimization.java b/lucene/core/src/test/org/apache/lucene/search/TestSortOptimization.java index 114d051ccfd..5dcf15c6200 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSortOptimization.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSortOptimization.java @@ -39,9 +39,9 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java b/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java index ffe87f72583..6e7e976e45b 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java @@ -33,8 +33,8 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.NumericDocValues; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BitSetIterator; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSortRescorer.java b/lucene/core/src/test/org/apache/lucene/search/TestSortRescorer.java index eb446b5c3bc..b6807f5c364 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSortRescorer.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSortRescorer.java @@ -24,10 +24,10 @@ import org.apache.lucene.document.NumericDocValuesField; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSortedNumericSortField.java b/lucene/core/src/test/org/apache/lucene/search/TestSortedNumericSortField.java index 5d059203609..e44b7df40d4 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSortedNumericSortField.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSortedNumericSortField.java @@ -21,9 +21,9 @@ import org.apache.lucene.document.SortedNumericDocValuesField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.MultiReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.NumericUtils; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSelector.java b/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSelector.java index 8264912ef61..1bf887e3653 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSelector.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSelector.java @@ -20,8 +20,8 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.SortedSetDocValuesField; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSortField.java b/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSortField.java index 1fe1a099221..9b1ff79e6d0 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSortField.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSortField.java @@ -21,9 +21,9 @@ import org.apache.lucene.document.SortedSetDocValuesField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.MultiReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; /** Simple tests for SortedSetSortField, indexing the sortedset up front */ diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java b/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java index 9c3ae26b059..86675ffb477 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java @@ -27,13 +27,13 @@ import org.apache.lucene.document.Field; import org.apache.lucene.index.FieldInvertState; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.AssertingScorable; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.AfterClass; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSynonymQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestSynonymQuery.java index ee5d5a0ee31..4c185b9e043 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSynonymQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSynonymQuery.java @@ -33,10 +33,10 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.MultiReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTermInSetQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestTermInSetQuery.java index 80129f10c28..13a3faf31c9 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestTermInSetQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestTermInSetQuery.java @@ -33,12 +33,12 @@ import org.apache.lucene.index.FilterLeafReader; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.LeafReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.RamUsageTester; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTermQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestTermQuery.java index 8d10763acee..d73675ec1b8 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestTermQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestTermQuery.java @@ -27,13 +27,13 @@ import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.MultiReader; import org.apache.lucene.index.NoMergePolicy; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.index.TermState; import org.apache.lucene.index.TermStates; import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java b/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java index 741ccf00e00..a591c53a4cd 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java @@ -30,12 +30,12 @@ import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.NumericDocValues; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java b/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java index 3d4b5b99760..ad8a90c0872 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java @@ -22,12 +22,12 @@ import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.TimeLimitingCollector.TimeExceededException; import org.apache.lucene.search.TimeLimitingCollector.TimerThread; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressSysoutChecks; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTopDocsCollector.java b/lucene/core/src/test/org/apache/lucene/search/TestTopDocsCollector.java index 15cdde11f2d..5caec9c3ef8 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestTopDocsCollector.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestTopDocsCollector.java @@ -29,11 +29,11 @@ import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.MultiTerms; import org.apache.lucene.index.NoMergePolicy; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTopDocsMerge.java b/lucene/core/src/test/org/apache/lucene/search/TestTopDocsMerge.java index 855e8e0fb97..38af05fcc0c 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestTopDocsMerge.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestTopDocsMerge.java @@ -31,10 +31,10 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReaderContext; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.ReaderUtil; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.ArrayUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java b/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java index 16ebcdeeb0f..afba5e6252d 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java @@ -32,11 +32,11 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.NoMergePolicy; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.FieldValueHitQueue.Entry; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollectorEarlyTermination.java b/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollectorEarlyTermination.java index 237d2286129..d20db957545 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollectorEarlyTermination.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollectorEarlyTermination.java @@ -30,12 +30,12 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.MockRandomMergePolicy; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.SerialMergeScheduler; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.MockRandomMergePolicy; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTotalHitCountCollector.java b/lucene/core/src/test/org/apache/lucene/search/TestTotalHitCountCollector.java index fe3f142893d..688664dc256 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestTotalHitCountCollector.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestTotalHitCountCollector.java @@ -20,8 +20,8 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.StringField; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; public class TestTotalHitCountCollector extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestUsageTrackingFilterCachingPolicy.java b/lucene/core/src/test/org/apache/lucene/search/TestUsageTrackingFilterCachingPolicy.java index 70205fa8a1e..14c7490da01 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestUsageTrackingFilterCachingPolicy.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestUsageTrackingFilterCachingPolicy.java @@ -21,10 +21,10 @@ import org.apache.lucene.document.IntPoint; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; public class TestUsageTrackingFilterCachingPolicy extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestWildcard.java b/lucene/core/src/test/org/apache/lucene/search/TestWildcard.java index 711c12e5381..83cf933aa81 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestWildcard.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestWildcard.java @@ -22,11 +22,11 @@ import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.MultiTerms; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.index.Terms; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; /** TestWildcard tests the '*' and '?' wildcard characters. */ diff --git a/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java b/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java index 191811171ff..f41185c57fe 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java @@ -23,10 +23,10 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestXYPointDistanceSort.java b/lucene/core/src/test/org/apache/lucene/search/TestXYPointDistanceSort.java index 37d359b9f2e..0ca58723286 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestXYPointDistanceSort.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestXYPointDistanceSort.java @@ -24,10 +24,10 @@ import org.apache.lucene.document.XYDocValuesField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriterConfig; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.SerialMergeScheduler; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.geo.ShapeTestUtil; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/similarities/TestBooleanSimilarity.java b/lucene/core/src/test/org/apache/lucene/search/similarities/TestBooleanSimilarity.java index 441506f2e37..037df625a67 100644 --- a/lucene/core/src/test/org/apache/lucene/search/similarities/TestBooleanSimilarity.java +++ b/lucene/core/src/test/org/apache/lucene/search/similarities/TestBooleanSimilarity.java @@ -25,7 +25,6 @@ import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.FieldInvertState; import org.apache.lucene.index.IndexOptions; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BoostQuery; import org.apache.lucene.search.IndexSearcher; @@ -33,6 +32,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.similarities.BaseSimilarityTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Version; diff --git a/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java b/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java index eb7c02bc1ba..e75b82ca9a4 100644 --- a/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java +++ b/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java @@ -25,7 +25,6 @@ import org.apache.lucene.index.IndexOptions; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriterConfig; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; @@ -34,6 +33,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java b/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java index 543bf0f6713..b16a87c3432 100644 --- a/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java +++ b/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java @@ -26,7 +26,6 @@ import org.apache.lucene.index.FieldInvertState; import org.apache.lucene.index.IndexOptions; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.CollectionStatistics; import org.apache.lucene.search.Explanation; @@ -37,6 +36,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.similarities.SimilarityBase.BasicSimScorer; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java b/lucene/core/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java index 2bd82bf9e78..b81c3aeed6b 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java @@ -25,11 +25,11 @@ import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.TermQuery; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.store.BaseDirectoryTestCase; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java b/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java index 854a4639227..cbe7d7ca184 100644 --- a/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java +++ b/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java @@ -48,7 +48,6 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.MultiTerms; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; @@ -60,6 +59,7 @@ import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/expressions/src/test/org/apache/lucene/expressions/TestDemoExpressions.java b/lucene/expressions/src/test/org/apache/lucene/expressions/TestDemoExpressions.java index 4f109933abf..7190a46b5b8 100644 --- a/lucene/expressions/src/test/org/apache/lucene/expressions/TestDemoExpressions.java +++ b/lucene/expressions/src/test/org/apache/lucene/expressions/TestDemoExpressions.java @@ -26,7 +26,6 @@ import org.apache.lucene.expressions.js.JavascriptCompiler; import org.apache.lucene.expressions.js.VariableContext; import org.apache.lucene.index.DirectoryReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.DoubleValuesSource; import org.apache.lucene.search.FieldDoc; @@ -37,6 +36,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopFieldDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; /** simple demo of using expressions */ diff --git a/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionRescorer.java b/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionRescorer.java index 2d55f2511fc..57a7b6054dd 100644 --- a/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionRescorer.java +++ b/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionRescorer.java @@ -22,7 +22,6 @@ import org.apache.lucene.expressions.js.JavascriptCompiler; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.DoubleValuesSource; import org.apache.lucene.search.IndexSearcher; @@ -32,6 +31,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; public class TestExpressionRescorer extends LuceneTestCase { diff --git a/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java b/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java index aadc2c4b0bc..66d1d534c91 100644 --- a/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java +++ b/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java @@ -25,7 +25,6 @@ import org.apache.lucene.document.NumericDocValuesField; import org.apache.lucene.expressions.js.JavascriptCompiler; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; @@ -38,6 +37,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.English; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionValueSource.java b/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionValueSource.java index 2eb454d510b..c1ad8c31ab6 100644 --- a/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionValueSource.java +++ b/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionValueSource.java @@ -24,12 +24,12 @@ import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.DoubleValues; import org.apache.lucene.search.DoubleValuesSource; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; public class TestExpressionValueSource extends LuceneTestCase { diff --git a/lucene/facet/src/test/org/apache/lucene/facet/TestDrillDownQuery.java b/lucene/facet/src/test/org/apache/lucene/facet/TestDrillDownQuery.java index 83f83f5c877..fdac9935eee 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/TestDrillDownQuery.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/TestDrillDownQuery.java @@ -27,7 +27,6 @@ import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader; import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchAllDocsQuery; @@ -38,6 +37,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.util.IOUtils; import org.junit.AfterClass; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/TestDrillSideways.java b/lucene/facet/src/test/org/apache/lucene/facet/TestDrillSideways.java index bfbb71babe1..b721f9ca214 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/TestDrillSideways.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/TestDrillSideways.java @@ -45,7 +45,6 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.SortedDocValues; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause; @@ -75,6 +74,7 @@ import org.apache.lucene.search.Weight; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/TestFacetQuery.java b/lucene/facet/src/test/org/apache/lucene/facet/TestFacetQuery.java index d1906cd7757..da012e3f0a8 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/TestFacetQuery.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/TestFacetQuery.java @@ -23,12 +23,12 @@ import org.apache.lucene.facet.sortedset.SortedSetDocValuesFacetField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexableField; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.util.IOUtils; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/TestFacetUtils.java b/lucene/facet/src/test/org/apache/lucene/facet/TestFacetUtils.java index 67d58db09ce..adbd6ffaad9 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/TestFacetUtils.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/TestFacetUtils.java @@ -24,12 +24,12 @@ import org.apache.lucene.document.StringField; import org.apache.lucene.index.DocValues; import org.apache.lucene.index.NumericDocValues; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.Bits; import org.apache.lucene.util.FixedBitSet; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/TestLongValueFacetCounts.java b/lucene/facet/src/test/org/apache/lucene/facet/TestLongValueFacetCounts.java index d0ce164d933..af1b74f42fd 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/TestLongValueFacetCounts.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/TestLongValueFacetCounts.java @@ -30,12 +30,12 @@ import org.apache.lucene.document.SortedNumericDocValuesField; import org.apache.lucene.document.StringField; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.LongValuesSource; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/TestMultipleIndexFields.java b/lucene/facet/src/test/org/apache/lucene/facet/TestMultipleIndexFields.java index 422520c6db7..89cdc6fad32 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/TestMultipleIndexFields.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/TestMultipleIndexFields.java @@ -30,12 +30,12 @@ import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.util.IOUtils; import org.junit.Test; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/TestRandomSamplingFacetsCollector.java b/lucene/facet/src/test/org/apache/lucene/facet/TestRandomSamplingFacetsCollector.java index 45a0a1cbb4f..26d80fc784f 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/TestRandomSamplingFacetsCollector.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/TestRandomSamplingFacetsCollector.java @@ -26,13 +26,13 @@ import org.apache.lucene.facet.taxonomy.TaxonomyReader; import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader; import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MultiCollector; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.util.IOUtils; public class TestRandomSamplingFacetsCollector extends FacetTestCase { diff --git a/lucene/facet/src/test/org/apache/lucene/facet/TestStringValueFacetCounts.java b/lucene/facet/src/test/org/apache/lucene/facet/TestStringValueFacetCounts.java index 867a1cfe7e7..765c6759260 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/TestStringValueFacetCounts.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/TestStringValueFacetCounts.java @@ -30,11 +30,11 @@ import org.apache.lucene.document.SortedSetDocValuesField; import org.apache.lucene.document.StringField; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/range/TestRangeFacetCounts.java b/lucene/facet/src/test/org/apache/lucene/facet/range/TestRangeFacetCounts.java index af6a4d1c5dd..1ca5007e93f 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/range/TestRangeFacetCounts.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/range/TestRangeFacetCounts.java @@ -45,7 +45,6 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.DoubleValues; import org.apache.lucene.search.DoubleValuesSource; import org.apache.lucene.search.Explanation; @@ -59,6 +58,7 @@ import org.apache.lucene.search.Scorer; import org.apache.lucene.search.Weight; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.NumericUtils; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/sortedset/TestSortedSetDocValuesFacets.java b/lucene/facet/src/test/org/apache/lucene/facet/sortedset/TestSortedSetDocValuesFacets.java index 1c29ed18d61..d6e9b0b3bf2 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/sortedset/TestSortedSetDocValuesFacets.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/sortedset/TestSortedSetDocValuesFacets.java @@ -37,13 +37,13 @@ import org.apache.lucene.facet.FacetsConfig; import org.apache.lucene.facet.LabelAndValue; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Accountable; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestOrdinalMappingLeafReader.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestOrdinalMappingLeafReader.java index d3d15aa92fa..27badb7b0e3 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestOrdinalMappingLeafReader.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestOrdinalMappingLeafReader.java @@ -34,10 +34,10 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.MultiDocValues; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; import org.junit.Before; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetAssociations.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetAssociations.java index a07b4e11eae..41445dbb696 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetAssociations.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetAssociations.java @@ -25,10 +25,10 @@ import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader; import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.util.IOUtils; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts.java index a503fbfcf16..82a1be52c74 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts.java @@ -43,7 +43,6 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.NoMergePolicy; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchAllDocsQuery; @@ -54,6 +53,7 @@ import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetLabels.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetLabels.java index bdca7d82660..3b510b9157e 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetLabels.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetLabels.java @@ -31,11 +31,11 @@ import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader; import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter; import org.apache.lucene.index.IndexWriterConfig; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.util.IOUtils; public class TestTaxonomyFacetLabels extends FacetTestCase { diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetSumValueSource.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetSumValueSource.java index 7699fa7c962..654a95bc2b2 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetSumValueSource.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetSumValueSource.java @@ -37,7 +37,6 @@ import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.queries.function.FunctionQuery; import org.apache.lucene.queries.function.valuesource.LongFieldSource; @@ -51,6 +50,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/AbstractGroupingTestCase.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/AbstractGroupingTestCase.java index e51df3d788c..a847034bf7e 100644 --- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/AbstractGroupingTestCase.java +++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/AbstractGroupingTestCase.java @@ -18,11 +18,11 @@ import java.io.Closeable; import java.io.IOException; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/BaseGroupSelectorTestCase.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/BaseGroupSelectorTestCase.java index d3e84aff69f..5aa0c4b0bfe 100644 --- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/BaseGroupSelectorTestCase.java +++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/BaseGroupSelectorTestCase.java @@ -26,7 +26,6 @@ import org.apache.lucene.document.NumericDocValuesField; import org.apache.lucene.document.SortedDocValuesField; import org.apache.lucene.document.TextField; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; @@ -37,6 +36,7 @@ import org.apache.lucene.search.SortField; import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.util.Bits; import org.apache.lucene.util.BytesRef; diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestAllGroupHeadsCollector.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestAllGroupHeadsCollector.java index 15e98cfe776..0ab8204eece 100644 --- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestAllGroupHeadsCollector.java +++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestAllGroupHeadsCollector.java @@ -37,7 +37,6 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.MultiDocValues; import org.apache.lucene.index.NumericDocValues; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.valuesource.BytesRefFieldSource; @@ -49,6 +48,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestAllGroupsCollector.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestAllGroupsCollector.java index beecbbfd836..220c4ed761a 100644 --- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestAllGroupsCollector.java +++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestAllGroupsCollector.java @@ -22,7 +22,6 @@ import org.apache.lucene.document.FieldType; import org.apache.lucene.document.SortedDocValuesField; import org.apache.lucene.document.TextField; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.valuesource.BytesRefFieldSource; @@ -30,6 +29,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestBlockGrouping.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestBlockGrouping.java index e70ed27a8c7..b60f0a4becb 100644 --- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestBlockGrouping.java +++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestBlockGrouping.java @@ -25,7 +25,6 @@ import org.apache.lucene.document.NumericDocValuesField; import org.apache.lucene.document.SortedDocValuesField; import org.apache.lucene.document.TextField; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; @@ -37,6 +36,7 @@ import org.apache.lucene.search.SortField; import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.util.BytesRef; public class TestBlockGrouping extends AbstractGroupingTestCase { diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestDistinctValuesCollector.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestDistinctValuesCollector.java index f677bdd96d6..295add673b8 100644 --- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestDistinctValuesCollector.java +++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestDistinctValuesCollector.java @@ -35,7 +35,6 @@ import org.apache.lucene.document.StringField; import org.apache.lucene.document.TextField; import org.apache.lucene.index.DirectoryReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.queries.function.valuesource.BytesRefFieldSource; import org.apache.lucene.search.IndexSearcher; @@ -44,6 +43,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.mutable.MutableValue; import org.apache.lucene.util.mutable.MutableValueStr; diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGroupFacetCollector.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGroupFacetCollector.java index 3bfb5adf801..24b13856fe4 100644 --- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGroupFacetCollector.java +++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGroupFacetCollector.java @@ -37,13 +37,13 @@ import org.apache.lucene.document.StringField; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.NoMergePolicy; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java index 504e413ac51..88877d0700b 100644 --- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java +++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java @@ -40,7 +40,6 @@ import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.MultiDocValues; import org.apache.lucene.index.NumericDocValues; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.ReaderUtil; import org.apache.lucene.index.Term; import org.apache.lucene.queries.function.ValueSource; @@ -61,6 +60,7 @@ import org.apache.lucene.search.similarities.BM25Similarity; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGroupingSearch.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGroupingSearch.java index 0f6755517f7..95132d735a5 100644 --- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGroupingSearch.java +++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGroupingSearch.java @@ -25,7 +25,6 @@ import org.apache.lucene.document.SortedDocValuesField; import org.apache.lucene.document.StringField; import org.apache.lucene.document.TextField; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.valuesource.BytesRefFieldSource; @@ -36,6 +35,7 @@ import org.apache.lucene.search.similarities.BM25Similarity; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.mutable.MutableValueStr; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestTokenSources.java b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestTokenSources.java index c0c7bdc7e10..8b622831ac1 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestTokenSources.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TestTokenSources.java @@ -28,12 +28,10 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; import org.apache.lucene.document.TextField; -import org.apache.lucene.index.BaseTermVectorsFormatTestCase; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.Fields; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.queries.spans.SpanNearQuery; import org.apache.lucene.queries.spans.SpanQuery; @@ -47,6 +45,8 @@ import org.apache.lucene.tests.analysis.CannedTokenStream; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.Token; +import org.apache.lucene.tests.index.BaseTermVectorsFormatTestCase; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighter.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighter.java index 381a1c545a9..6915163f789 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighter.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighter.java @@ -35,7 +35,6 @@ import org.apache.lucene.document.FieldType; import org.apache.lucene.index.IndexOptions; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; @@ -56,6 +55,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.After; import org.junit.Before; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterMTQ.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterMTQ.java index b1003f17638..ffdb1a1ef9e 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterMTQ.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterMTQ.java @@ -32,7 +32,6 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.queries.spans.SpanFirstQuery; import org.apache.lucene.queries.spans.SpanMultiTermQueryWrapper; @@ -64,6 +63,7 @@ import org.apache.lucene.search.uhighlight.UnifiedHighlighter.HighlightFlag; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.store.BaseDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterRanking.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterRanking.java index e0bbc4b16ba..039c882af66 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterRanking.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterRanking.java @@ -28,7 +28,6 @@ import org.apache.lucene.document.StringField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriterConfig; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; @@ -40,6 +39,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterReanalysis.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterReanalysis.java index 4895f855200..aae0d960c06 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterReanalysis.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterReanalysis.java @@ -18,7 +18,6 @@ import java.io.IOException; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; @@ -28,6 +27,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterStrictPhrases.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterStrictPhrases.java index 5463ded8153..8cbf88d4827 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterStrictPhrases.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterStrictPhrases.java @@ -28,7 +28,6 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.queries.spans.SpanMultiTermQueryWrapper; import org.apache.lucene.queries.spans.SpanNearQuery; @@ -57,6 +56,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.QueryBuilder; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermIntervals.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermIntervals.java index 6448f4e59b0..4b06af879d9 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermIntervals.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermIntervals.java @@ -35,7 +35,6 @@ import org.apache.lucene.document.FieldType; import org.apache.lucene.index.IndexOptions; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.queries.intervals.IntervalQuery; import org.apache.lucene.queries.intervals.Intervals; @@ -50,6 +49,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.After; import org.junit.Before; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermVec.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermVec.java index 07abeec64f8..d471e6eba39 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermVec.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/TestUnifiedHighlighterTermVec.java @@ -36,7 +36,6 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.ParallelLeafReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; @@ -47,6 +46,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.After; import org.junit.Before; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestSimpleFragmentsBuilder.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestSimpleFragmentsBuilder.java index c5943ca9396..56f62800e90 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestSimpleFragmentsBuilder.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestSimpleFragmentsBuilder.java @@ -31,7 +31,6 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.IndexWriterConfig.OpenMode; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; @@ -40,6 +39,7 @@ import org.apache.lucene.search.highlight.SimpleHTMLEncoder; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.TestUtil; public class TestSimpleFragmentsBuilder extends AbstractTestCase { diff --git a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java index 16fc91bf33d..74b4558b403 100644 --- a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java +++ b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java @@ -45,7 +45,6 @@ import org.apache.lucene.index.MultiTerms; import org.apache.lucene.index.NoMergePolicy; import org.apache.lucene.index.PostingsEnum; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.ReaderUtil; import org.apache.lucene.index.Term; import org.apache.lucene.search.*; @@ -55,6 +54,7 @@ import org.apache.lucene.search.similarities.SimilarityBase; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.search.RandomApproximationQuery; diff --git a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinScorer.java b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinScorer.java index 76ba598b1c9..22f4ae6a5d7 100644 --- a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinScorer.java +++ b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinScorer.java @@ -23,7 +23,6 @@ import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.search.IndexSearcher; @@ -34,6 +33,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.Weight; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BitSet; diff --git a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinSorting.java b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinSorting.java index 2880138753b..dd5ba445a65 100644 --- a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinSorting.java +++ b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinSorting.java @@ -24,7 +24,6 @@ import org.apache.lucene.document.SortedDocValuesField; import org.apache.lucene.document.StringField; import org.apache.lucene.index.DirectoryReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.FieldDoc; import org.apache.lucene.search.IndexSearcher; @@ -35,6 +34,7 @@ import org.apache.lucene.search.TopFieldDocs; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.junit.Test; diff --git a/lucene/join/src/test/org/apache/lucene/search/join/TestCheckJoinIndex.java b/lucene/join/src/test/org/apache/lucene/search/join/TestCheckJoinIndex.java index 1a7c72e436e..2d7e0af8131 100644 --- a/lucene/join/src/test/org/apache/lucene/search/join/TestCheckJoinIndex.java +++ b/lucene/join/src/test/org/apache/lucene/search/join/TestCheckJoinIndex.java @@ -25,11 +25,11 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.NoMergePolicy; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.MatchNoDocsQuery; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java b/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java index d6df796fc13..cea1862552d 100644 --- a/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java +++ b/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java @@ -58,7 +58,6 @@ import org.apache.lucene.index.NumericDocValues; import org.apache.lucene.index.OrdinalMap; import org.apache.lucene.index.PostingsEnum; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.SortedDocValues; import org.apache.lucene.index.SortedSetDocValues; import org.apache.lucene.index.Term; @@ -68,6 +67,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BitSet; diff --git a/lucene/join/src/test/org/apache/lucene/search/join/TestParentChildrenBlockJoinQuery.java b/lucene/join/src/test/org/apache/lucene/search/join/TestParentChildrenBlockJoinQuery.java index b3baaf38b3a..fa0c2569d72 100644 --- a/lucene/join/src/test/org/apache/lucene/search/join/TestParentChildrenBlockJoinQuery.java +++ b/lucene/join/src/test/org/apache/lucene/search/join/TestParentChildrenBlockJoinQuery.java @@ -26,7 +26,6 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.NumericDocValues; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.ReaderUtil; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause; @@ -37,6 +36,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; public class TestParentChildrenBlockJoinQuery extends LuceneTestCase { diff --git a/lucene/join/src/test/org/apache/lucene/search/join/TestQueryBitSetProducer.java b/lucene/join/src/test/org/apache/lucene/search/join/TestQueryBitSetProducer.java index 2b9602013f7..d320e3e9f51 100644 --- a/lucene/join/src/test/org/apache/lucene/search/join/TestQueryBitSetProducer.java +++ b/lucene/join/src/test/org/apache/lucene/search/join/TestQueryBitSetProducer.java @@ -24,10 +24,10 @@ import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.NoMergePolicy; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.MatchNoDocsQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BitSet; import org.apache.lucene.util.IOUtils; diff --git a/lucene/luke/src/test/org/apache/lucene/luke/models/commits/TestCommitsImpl.java b/lucene/luke/src/test/org/apache/lucene/luke/models/commits/TestCommitsImpl.java index 9f8c51d5b76..695db48185f 100644 --- a/lucene/luke/src/test/org/apache/lucene/luke/models/commits/TestCommitsImpl.java +++ b/lucene/luke/src/test/org/apache/lucene/luke/models/commits/TestCommitsImpl.java @@ -28,9 +28,9 @@ import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.NoDeletionPolicy; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.junit.After; diff --git a/lucene/luke/src/test/org/apache/lucene/luke/models/documents/DocumentsTestBase.java b/lucene/luke/src/test/org/apache/lucene/luke/models/documents/DocumentsTestBase.java index 958fe5cf8ec..f933817e8ca 100644 --- a/lucene/luke/src/test/org/apache/lucene/luke/models/documents/DocumentsTestBase.java +++ b/lucene/luke/src/test/org/apache/lucene/luke/models/documents/DocumentsTestBase.java @@ -27,8 +27,8 @@ import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexOptions; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.NumericUtils; diff --git a/lucene/luke/src/test/org/apache/lucene/luke/models/documents/TestDocValuesAdapter.java b/lucene/luke/src/test/org/apache/lucene/luke/models/documents/TestDocValuesAdapter.java index 2d20e8fee6a..516180c51ae 100644 --- a/lucene/luke/src/test/org/apache/lucene/luke/models/documents/TestDocValuesAdapter.java +++ b/lucene/luke/src/test/org/apache/lucene/luke/models/documents/TestDocValuesAdapter.java @@ -27,9 +27,9 @@ import org.apache.lucene.document.SortedNumericDocValuesField; import org.apache.lucene.document.SortedSetDocValuesField; import org.apache.lucene.index.DocValuesType; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.util.BytesRef; import org.junit.Test; diff --git a/lucene/luke/src/test/org/apache/lucene/luke/models/documents/TestTermVectorsAdapter.java b/lucene/luke/src/test/org/apache/lucene/luke/models/documents/TestTermVectorsAdapter.java index 40266b21e39..bfc2456d90c 100644 --- a/lucene/luke/src/test/org/apache/lucene/luke/models/documents/TestTermVectorsAdapter.java +++ b/lucene/luke/src/test/org/apache/lucene/luke/models/documents/TestTermVectorsAdapter.java @@ -23,8 +23,8 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.FieldType; import org.apache.lucene.index.IndexOptions; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.junit.Test; public class TestTermVectorsAdapter extends DocumentsTestBase { diff --git a/lucene/luke/src/test/org/apache/lucene/luke/models/overview/OverviewTestBase.java b/lucene/luke/src/test/org/apache/lucene/luke/models/overview/OverviewTestBase.java index 079cf33b5a1..a2b4c5b62ab 100644 --- a/lucene/luke/src/test/org/apache/lucene/luke/models/overview/OverviewTestBase.java +++ b/lucene/luke/src/test/org/apache/lucene/luke/models/overview/OverviewTestBase.java @@ -28,9 +28,9 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.NoMergePolicy; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.After; import org.junit.Before; diff --git a/lucene/luke/src/test/org/apache/lucene/luke/models/search/TestSearchImpl.java b/lucene/luke/src/test/org/apache/lucene/luke/models/search/TestSearchImpl.java index 8efbc37d1a8..7d5a13d9cea 100644 --- a/lucene/luke/src/test/org/apache/lucene/luke/models/search/TestSearchImpl.java +++ b/lucene/luke/src/test/org/apache/lucene/luke/models/search/TestSearchImpl.java @@ -37,7 +37,6 @@ import org.apache.lucene.document.SortedSetDocValuesField; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.luke.models.LukeException; import org.apache.lucene.queryparser.classic.QueryParser; import org.apache.lucene.search.PointRangeQuery; @@ -47,6 +46,7 @@ import org.apache.lucene.search.SortedNumericSortField; import org.apache.lucene.search.SortedSetSortField; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.junit.Test; diff --git a/lucene/misc/src/test/org/apache/lucene/misc/index/TestIndexSplitter.java b/lucene/misc/src/test/org/apache/lucene/misc/index/TestIndexSplitter.java index 4c963c93563..4f4674a0797 100644 --- a/lucene/misc/src/test/org/apache/lucene/misc/index/TestIndexSplitter.java +++ b/lucene/misc/src/test/org/apache/lucene/misc/index/TestIndexSplitter.java @@ -19,7 +19,6 @@ import java.nio.file.Path; import org.apache.lucene.document.Document; import org.apache.lucene.index.DirectoryReader; -import org.apache.lucene.index.DocHelper; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.IndexWriterConfig.OpenMode; @@ -28,6 +27,7 @@ import org.apache.lucene.index.SegmentInfos; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.DocHelper; import org.apache.lucene.tests.store.MockDirectoryWrapper; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/misc/src/test/org/apache/lucene/misc/search/TestDiversifiedTopDocsCollector.java b/lucene/misc/src/test/org/apache/lucene/misc/search/TestDiversifiedTopDocsCollector.java index 39f2a4a75c9..6e8d9671a51 100644 --- a/lucene/misc/src/test/org/apache/lucene/misc/search/TestDiversifiedTopDocsCollector.java +++ b/lucene/misc/src/test/org/apache/lucene/misc/search/TestDiversifiedTopDocsCollector.java @@ -29,7 +29,6 @@ import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.MultiDocValues; import org.apache.lucene.index.NumericDocValues; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.SortedDocValues; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause; @@ -48,6 +47,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.Weight; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/misc/src/test/org/apache/lucene/misc/search/TestMemoryAccountingBitsetCollector.java b/lucene/misc/src/test/org/apache/lucene/misc/search/TestMemoryAccountingBitsetCollector.java index a2c2d5570a4..970e9bca3fa 100644 --- a/lucene/misc/src/test/org/apache/lucene/misc/search/TestMemoryAccountingBitsetCollector.java +++ b/lucene/misc/src/test/org/apache/lucene/misc/search/TestMemoryAccountingBitsetCollector.java @@ -21,13 +21,13 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.SortedDocValuesField; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.misc.CollectorMemoryTracker; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.MultiCollector; import org.apache.lucene.search.TotalHitCountCollector; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/misc/src/test/org/apache/lucene/misc/store/TestDirectIODirectory.java b/lucene/misc/src/test/org/apache/lucene/misc/store/TestDirectIODirectory.java index 52fe4c31828..c603502ec15 100644 --- a/lucene/misc/src/test/org/apache/lucene/misc/store/TestDirectIODirectory.java +++ b/lucene/misc/src/test/org/apache/lucene/misc/store/TestDirectIODirectory.java @@ -25,10 +25,10 @@ import org.apache.lucene.document.*; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.PhraseQuery; import org.apache.lucene.store.*; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.store.BaseDirectoryTestCase; import org.junit.BeforeClass; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/TestCommonTermsQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/TestCommonTermsQuery.java index f2ef43f74ec..56c498e70ff 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/TestCommonTermsQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/TestCommonTermsQuery.java @@ -29,7 +29,6 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.LeafReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.index.TermStates; import org.apache.lucene.index.Terms; @@ -46,6 +45,7 @@ import org.apache.lucene.search.similarities.BM25Similarity; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java b/lucene/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java index 74e17aa08a0..e5f3ce04fcc 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java @@ -26,7 +26,6 @@ import org.apache.lucene.document.StoredField; import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexWriterConfig; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.queries.function.valuesource.FloatFieldSource; import org.apache.lucene.queries.function.valuesource.IntFieldSource; import org.apache.lucene.queries.function.valuesource.MultiValuedFloatFieldSource; @@ -34,6 +33,7 @@ import org.apache.lucene.search.SortedNumericSelector; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestDocValuesFieldSources.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestDocValuesFieldSources.java index 38084ea7650..cb82deeb5eb 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestDocValuesFieldSources.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestDocValuesFieldSources.java @@ -28,13 +28,13 @@ import org.apache.lucene.index.DocValuesType; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.queries.function.valuesource.BytesRefFieldSource; import org.apache.lucene.queries.function.valuesource.LongFieldSource; import org.apache.lucene.queries.function.valuesource.MultiValuedLongFieldSource; import org.apache.lucene.search.SortedNumericSelector.Type; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQuerySort.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQuerySort.java index 4b852946a3c..499f6926b3e 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQuerySort.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQuerySort.java @@ -23,7 +23,6 @@ import org.apache.lucene.document.StoredField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriterConfig; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.queries.function.valuesource.DoubleConstValueSource; import org.apache.lucene.queries.function.valuesource.DoubleFieldSource; import org.apache.lucene.queries.function.valuesource.FloatFieldSource; @@ -40,6 +39,7 @@ import org.apache.lucene.search.SortField.Type; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; /** Test that functionquery's getSortField() actually works */ diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestIndexReaderFunctions.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestIndexReaderFunctions.java index 5e43287bc98..a4354c0fa0b 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestIndexReaderFunctions.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestIndexReaderFunctions.java @@ -27,7 +27,6 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.DoubleValuesSource; import org.apache.lucene.search.IndexSearcher; @@ -42,6 +41,7 @@ import org.apache.lucene.search.Weight; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestLongNormValueSource.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestLongNormValueSource.java index 1e7606d3c0b..f7221e7a7de 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestLongNormValueSource.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestLongNormValueSource.java @@ -22,7 +22,6 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriterConfig; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.queries.function.valuesource.NormValueSource; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; @@ -34,6 +33,7 @@ import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.AfterClass; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java index 8015b801d56..8575990566a 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java @@ -32,7 +32,6 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.queries.function.docvalues.FloatDocValues; import org.apache.lucene.queries.function.valuesource.*; @@ -51,6 +50,7 @@ import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervalQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervalQuery.java index 6ed9a0d13f1..ddd29887ebf 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervalQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervalQuery.java @@ -21,7 +21,6 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.BoostQuery; import org.apache.lucene.search.Explanation; import org.apache.lucene.search.IndexSearcher; @@ -29,6 +28,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervals.java b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervals.java index cc12d1d2b9a..78403150389 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervals.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestIntervals.java @@ -37,7 +37,6 @@ import org.apache.lucene.index.IndexOptions; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.NumericDocValues; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.ReaderUtil; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause; @@ -47,6 +46,7 @@ import org.apache.lucene.search.QueryVisitor; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestPayloadFilteredInterval.java b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestPayloadFilteredInterval.java index 1aad76f52f0..cc2ba9bc008 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestPayloadFilteredInterval.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/intervals/TestPayloadFilteredInterval.java @@ -22,11 +22,11 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.MatchesIterator; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.analysis.SimplePayloadFilter; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java b/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java index ae934acf7d7..a6e56f9188b 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java @@ -36,7 +36,6 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; @@ -48,6 +47,7 @@ import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.MockTokenFilter; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.ArrayUtil; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadCheckQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadCheckQuery.java index 6ed9ef6d765..92efe145308 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadCheckQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadCheckQuery.java @@ -28,7 +28,6 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.queries.payloads.SpanPayloadCheckQuery.MatchOperation; import org.apache.lucene.queries.payloads.SpanPayloadCheckQuery.PayloadType; @@ -43,6 +42,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.analysis.SimplePayloadFilter; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.English; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadScoreQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadScoreQuery.java index b78b260cde2..e869c194c30 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadScoreQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadScoreQuery.java @@ -26,7 +26,6 @@ import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.NoMergePolicy; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.queries.spans.SpanContainingQuery; import org.apache.lucene.queries.spans.SpanMultiTermQueryWrapper; @@ -43,6 +42,7 @@ import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.English; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpanPositions.java b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpanPositions.java index acd9846a960..ed9fec72637 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpanPositions.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpanPositions.java @@ -26,7 +26,6 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.PostingsEnum; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.queries.spans.SpanCollector; import org.apache.lucene.queries.spans.SpanNearQuery; @@ -39,6 +38,7 @@ import org.apache.lucene.search.ScoreMode; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockPayloadAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpans.java b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpans.java index 48766f1b312..bd3547faa64 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpans.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpans.java @@ -34,7 +34,6 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.PostingsEnum; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.queries.spans.SpanCollector; import org.apache.lucene.queries.spans.SpanFirstQuery; @@ -51,6 +50,7 @@ import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadTermQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadTermQuery.java index a16c8beae4b..de2d6b5d9f9 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadTermQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadTermQuery.java @@ -25,7 +25,6 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.queries.spans.SpanQuery; import org.apache.lucene.queries.spans.SpanTermQuery; @@ -41,6 +40,7 @@ import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.English; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestBasics.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestBasics.java index 3ba81f10c77..30b43ad6b7a 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestBasics.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestBasics.java @@ -28,7 +28,6 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; @@ -42,6 +41,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.English; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestFieldMaskingSpanQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestFieldMaskingSpanQuery.java index bd1f7e8f8a2..567bfdf711e 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestFieldMaskingSpanQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestFieldMaskingSpanQuery.java @@ -24,7 +24,6 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; @@ -33,6 +32,7 @@ import org.apache.lucene.search.similarities.TFIDFSimilarity; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestNearSpansOrdered.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestNearSpansOrdered.java index 6f769bb7e4d..11002bc7df5 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestNearSpansOrdered.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestNearSpansOrdered.java @@ -24,7 +24,6 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReaderContext; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.Explanation; import org.apache.lucene.search.IndexSearcher; @@ -34,6 +33,7 @@ import org.apache.lucene.search.Weight; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestQueryRescorerWithSpans.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestQueryRescorerWithSpans.java index ef36a880e6c..29d33748425 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestQueryRescorerWithSpans.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestQueryRescorerWithSpans.java @@ -20,7 +20,6 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; @@ -30,6 +29,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; public class TestQueryRescorerWithSpans extends LuceneTestCase { diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanCollection.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanCollection.java index a1caadc312b..276beda69a7 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanCollection.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanCollection.java @@ -25,12 +25,12 @@ import org.apache.lucene.index.IndexOptions; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.PostingsEnum; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.ScoreMode; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanContainQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanContainQuery.java index 0043455bf13..8ee815781a4 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanContainQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanContainQuery.java @@ -21,12 +21,12 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; import org.apache.lucene.search.ScoreMode; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanFirstQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanFirstQuery.java index fae0e6693f2..5a38c07f233 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanFirstQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanFirstQuery.java @@ -22,11 +22,11 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.automaton.CharacterRunAutomaton; import org.apache.lucene.util.automaton.RegExp; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanMultiTermQueryWrapper.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanMultiTermQueryWrapper.java index e3a353dbe65..252818079c7 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanMultiTermQueryWrapper.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanMultiTermQueryWrapper.java @@ -20,7 +20,6 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.FuzzyQuery; import org.apache.lucene.search.IndexSearcher; @@ -29,6 +28,7 @@ import org.apache.lucene.search.RegexpQuery; import org.apache.lucene.search.WildcardQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.Test; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanNearQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanNearQuery.java index 82bc04ac4c2..ba59cb3da5a 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanNearQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanNearQuery.java @@ -21,10 +21,10 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.StringField; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanNotQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanNotQuery.java index caac2421d18..e151883af45 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanNotQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanNotQuery.java @@ -21,10 +21,10 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.StringField; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanSimilarity.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanSimilarity.java index 93a899da542..3d49b30a960 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanSimilarity.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanSimilarity.java @@ -23,7 +23,6 @@ import org.apache.lucene.document.FieldType; import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; @@ -67,6 +66,7 @@ import org.apache.lucene.search.similarities.NormalizationZ; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; public class TestSpanSimilarity extends LuceneTestCase { diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanTermQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanTermQuery.java index cfdb7b3a9c5..d082360b73b 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanTermQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanTermQuery.java @@ -21,10 +21,10 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.StringField; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpans.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpans.java index aba23dddb93..359c31709db 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpans.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpans.java @@ -31,7 +31,6 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.FuzzyQuery; import org.apache.lucene.search.IndexSearcher; @@ -41,6 +40,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpansEnum.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpansEnum.java index b90221ce6ce..4a0791b50bd 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpansEnum.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpansEnum.java @@ -22,11 +22,11 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.English; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestQueryParser.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestQueryParser.java index 52c2fce6420..3c8f5a39b09 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestQueryParser.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestQueryParser.java @@ -29,7 +29,6 @@ import org.apache.lucene.document.FieldType; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexOptions; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.queryparser.charstream.CharStream; import org.apache.lucene.queryparser.classic.QueryParser.Operator; @@ -51,6 +50,7 @@ import org.apache.lucene.tests.analysis.MockLowerCaseFilter; import org.apache.lucene.tests.analysis.MockSynonymAnalyzer; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.util.automaton.TooComplexToDeterminizeException; /** Tests QueryParser. */ diff --git a/lucene/sandbox/src/test/org/apache/lucene/payloads/TestPayloadSpanUtil.java b/lucene/sandbox/src/test/org/apache/lucene/payloads/TestPayloadSpanUtil.java index fed55e57c1d..7d8480972d4 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/payloads/TestPayloadSpanUtil.java +++ b/lucene/sandbox/src/test/org/apache/lucene/payloads/TestPayloadSpanUtil.java @@ -31,13 +31,13 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/codecs/idversion/TestIDVersionPostingsFormat.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/codecs/idversion/TestIDVersionPostingsFormat.java index a105c411de9..68c76b74684 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/codecs/idversion/TestIDVersionPostingsFormat.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/codecs/idversion/TestIDVersionPostingsFormat.java @@ -36,9 +36,7 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.MergeScheduler; -import org.apache.lucene.index.PerThreadPKLookup; import org.apache.lucene.index.PostingsEnum; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.index.TieredMergePolicy; import org.apache.lucene.sandbox.codecs.idversion.StringAndPayloadField.SingleTokenWithPayloadTokenStream; @@ -51,6 +49,8 @@ import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.MockTokenFilter; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.PerThreadPKLookup; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/document/TestBigIntegerPoint.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/document/TestBigIntegerPoint.java index ba7acb89457..04cbea9a4fd 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/document/TestBigIntegerPoint.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/document/TestBigIntegerPoint.java @@ -19,10 +19,10 @@ import java.math.BigInteger; import org.apache.lucene.document.Document; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; /** Simple tests for {@link BigIntegerPoint} */ diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/document/TestFloatPointNearestNeighbor.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/document/TestFloatPointNearestNeighbor.java index 4e1cfea9a41..ae829dcf02c 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/document/TestFloatPointNearestNeighbor.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/document/TestFloatPointNearestNeighbor.java @@ -26,7 +26,6 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.PointValues; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.SerialMergeScheduler; import org.apache.lucene.index.Term; import org.apache.lucene.sandbox.search.LatLonPointPrototypeQueries; @@ -34,6 +33,7 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/document/TestHalfFloatPoint.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/document/TestHalfFloatPoint.java index 582053dc3e4..4182af1692f 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/document/TestHalfFloatPoint.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/document/TestHalfFloatPoint.java @@ -19,9 +19,9 @@ import java.util.Arrays; import org.apache.lucene.document.Document; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.ArrayUtil; diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestFuzzyLikeThisQuery.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestFuzzyLikeThisQuery.java index df2e2ae4dc5..740241188d1 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestFuzzyLikeThisQuery.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestFuzzyLikeThisQuery.java @@ -22,7 +22,6 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; @@ -31,6 +30,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestCombinedFieldQuery.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestCombinedFieldQuery.java index 1530ce76684..a2fcfd24af1 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestCombinedFieldQuery.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestCombinedFieldQuery.java @@ -30,7 +30,6 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.MultiReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.CollectionStatistics; import org.apache.lucene.search.IndexSearcher; @@ -49,6 +48,7 @@ import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; import org.apache.lucene.store.MMapDirectory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestDocValuesNumbersQuery.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestDocValuesNumbersQuery.java index f88c925d44d..0318ccb8ad9 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestDocValuesNumbersQuery.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestDocValuesNumbersQuery.java @@ -27,7 +27,6 @@ import org.apache.lucene.document.SortedNumericDocValuesField; import org.apache.lucene.document.StringField; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.BooleanQuery; @@ -39,6 +38,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.IOUtils; diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestDocValuesTermsQuery.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestDocValuesTermsQuery.java index 6411cb79c06..064900bb0b6 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestDocValuesTermsQuery.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestDocValuesTermsQuery.java @@ -24,7 +24,6 @@ import org.apache.lucene.document.SortedDocValuesField; import org.apache.lucene.document.StringField; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.BooleanQuery; @@ -36,6 +35,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestFieldCacheTermsFilter.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestFieldCacheTermsFilter.java index 940405a0055..113e2d63e66 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestFieldCacheTermsFilter.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestFieldCacheTermsFilter.java @@ -22,10 +22,10 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.SortedDocValuesField; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestIndexSortSortedNumericDocValuesRangeQuery.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestIndexSortSortedNumericDocValuesRangeQuery.java index f720e267501..fb8ecf26007 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestIndexSortSortedNumericDocValuesRangeQuery.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestIndexSortSortedNumericDocValuesRangeQuery.java @@ -27,7 +27,6 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.DocValuesFieldExistsQuery; import org.apache.lucene.search.IndexSearcher; @@ -42,6 +41,7 @@ import org.apache.lucene.search.Weight; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestLargeNumHitsTopDocsCollector.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestLargeNumHitsTopDocsCollector.java index 7ebbd5e8165..42da3187c62 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestLargeNumHitsTopDocsCollector.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestLargeNumHitsTopDocsCollector.java @@ -21,7 +21,6 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; @@ -33,6 +32,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.TopScoreDocCollector; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestLatLonBoundingBoxQueries.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestLatLonBoundingBoxQueries.java index b33462d70bc..22732427cf9 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestLatLonBoundingBoxQueries.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestLatLonBoundingBoxQueries.java @@ -24,12 +24,12 @@ import org.apache.lucene.document.Document; import org.apache.lucene.geo.Rectangle; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.sandbox.document.LatLonBoundingBox; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.geo.GeoTestUtil; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.BaseRangeFieldQueryTestCase; /** Random testing for GeoBoundingBoxField type. */ diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestMultiRangeQueries.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestMultiRangeQueries.java index df3d4df9ca7..df307897d81 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestMultiRangeQueries.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestMultiRangeQueries.java @@ -25,7 +25,6 @@ import org.apache.lucene.document.IntPoint; import org.apache.lucene.document.LongPoint; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.sandbox.document.DoublePointMultiRangeBuilder; import org.apache.lucene.sandbox.document.FloatPointMultiRangeBuilder; import org.apache.lucene.sandbox.document.IntPointMultiRangeBuilder; @@ -37,6 +36,7 @@ import org.apache.lucene.search.Sort; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.QueryUtils; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestNearest.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestNearest.java index ea746364e54..4f7df8a587b 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestNearest.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestNearest.java @@ -28,7 +28,6 @@ import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.SerialMergeScheduler; import org.apache.lucene.index.Term; import org.apache.lucene.search.FieldDoc; @@ -39,6 +38,7 @@ import org.apache.lucene.search.TopFieldDocs; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.geo.GeoTestUtil; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.SloppyMath; diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestPhraseWildcardQuery.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestPhraseWildcardQuery.java index a351b971882..65bbbed9ecf 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestPhraseWildcardQuery.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestPhraseWildcardQuery.java @@ -29,7 +29,6 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.NoMergePolicy; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; @@ -51,6 +50,7 @@ import org.apache.lucene.search.Weight; import org.apache.lucene.search.WildcardQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestProfilerCollector.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestProfilerCollector.java index 073c2788dd8..a9f5aa4fb50 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestProfilerCollector.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestProfilerCollector.java @@ -26,13 +26,13 @@ import org.apache.lucene.document.Field.Store; import org.apache.lucene.document.StringField; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TotalHitCountCollector; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.hamcrest.MatcherAssert; diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestQueryProfilerIndexSearcher.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestQueryProfilerIndexSearcher.java index 50aad278517..36e9a839fcf 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestQueryProfilerIndexSearcher.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestQueryProfilerIndexSearcher.java @@ -27,7 +27,6 @@ import org.apache.lucene.document.Field.Store; import org.apache.lucene.document.StringField; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.LRUQueryCache; @@ -35,6 +34,7 @@ import org.apache.lucene.search.Sort; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.RandomApproximationQuery; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestTermAutomatonQuery.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestTermAutomatonQuery.java index 13402de39f8..431fb3eb3e3 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestTermAutomatonQuery.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestTermAutomatonQuery.java @@ -36,7 +36,6 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanClause.Occur; @@ -60,6 +59,7 @@ import org.apache.lucene.tests.analysis.MockTokenFilter; import org.apache.lucene.tests.analysis.MockTokenizer; import org.apache.lucene.tests.analysis.Token; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.AttributeSource; diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/SpatialTestCase.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/SpatialTestCase.java index e970b65b6b4..00d413f009c 100644 --- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/SpatialTestCase.java +++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/SpatialTestCase.java @@ -25,13 +25,13 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.document.Document; import org.apache.lucene.index.DirectoryReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressSysoutChecks; import org.apache.lucene.util.IOUtils; diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/TestGeo3DPoint.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/TestGeo3DPoint.java index 80d0ed82149..923181ef3b2 100644 --- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/TestGeo3DPoint.java +++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/TestGeo3DPoint.java @@ -49,7 +49,6 @@ import org.apache.lucene.index.NumericDocValues; import org.apache.lucene.index.PointValues.IntersectVisitor; import org.apache.lucene.index.PointValues.Relation; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.ReaderUtil; import org.apache.lucene.index.SegmentReadState; import org.apache.lucene.index.SegmentWriteState; @@ -75,6 +74,7 @@ import org.apache.lucene.spatial3d.geom.XYZSolidFactory; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.geo.GeoTestUtil; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.DocIdSetBuilder; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestDirectSpellChecker.java b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestDirectSpellChecker.java index ccf3f1dede6..a367242f23c 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestDirectSpellChecker.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestDirectSpellChecker.java @@ -20,11 +20,11 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.English; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestWordBreakSpellChecker.java b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestWordBreakSpellChecker.java index 8f6c6ea998d..513f2bb5e28 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestWordBreakSpellChecker.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestWordBreakSpellChecker.java @@ -24,12 +24,12 @@ import org.apache.lucene.document.Field; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.spell.WordBreakSpellChecker.BreakSuggestionSortMethod; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.English; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestDocumentDictionary.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestDocumentDictionary.java index 7e0914bec4e..f2cfcd564b8 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestDocumentDictionary.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestDocumentDictionary.java @@ -36,11 +36,11 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.IndexableField; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.spell.Dictionary; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestDocumentValueSourceDictionary.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestDocumentValueSourceDictionary.java index 17225373b1a..8a3690ffa74 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestDocumentValueSourceDictionary.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestDocumentValueSourceDictionary.java @@ -35,7 +35,6 @@ import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.IndexableField; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.DoubleValues; import org.apache.lucene.search.IndexSearcher; @@ -44,6 +43,7 @@ import org.apache.lucene.search.spell.Dictionary; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestContextQuery.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestContextQuery.java index d33d273a534..01eb834a6b0 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestContextQuery.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestContextQuery.java @@ -28,10 +28,10 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.document.Document; import org.apache.lucene.index.DirectoryReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.ArrayUtil; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestContextSuggestField.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestContextSuggestField.java index f1a76ec414e..dc6eda184d1 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestContextSuggestField.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestContextSuggestField.java @@ -28,11 +28,11 @@ import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.index.DirectoryReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; import org.apache.lucene.store.OutputStreamDataOutput; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.CharsRefBuilder; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestFuzzyCompletionQuery.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestFuzzyCompletionQuery.java index 8dbc67482c1..d0480a0380c 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestFuzzyCompletionQuery.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestFuzzyCompletionQuery.java @@ -23,10 +23,10 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.document.Document; import org.apache.lucene.index.DirectoryReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.After; import org.junit.Before; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestPrefixCompletionQuery.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestPrefixCompletionQuery.java index 3fcf119ab0a..44cde82dfa2 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestPrefixCompletionQuery.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestPrefixCompletionQuery.java @@ -33,7 +33,6 @@ import org.apache.lucene.index.DocValues; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.SortedNumericDocValues; import org.apache.lucene.index.Term; import org.apache.lucene.search.ScoreMode; @@ -42,6 +41,7 @@ import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.MockTokenFilter; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.Bits; import org.apache.lucene.util.FixedBitSet; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestRegexCompletionQuery.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestRegexCompletionQuery.java index 499384e8d76..57a858bd300 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestRegexCompletionQuery.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestRegexCompletionQuery.java @@ -23,11 +23,11 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.document.Document; import org.apache.lucene.index.DirectoryReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.ScoreMode; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.junit.After; import org.junit.Before; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestSuggestField.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestSuggestField.java index b7017e3f289..3220647289c 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestSuggestField.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestSuggestField.java @@ -49,7 +49,6 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TopDocs; @@ -59,6 +58,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.OutputStreamDataOutput; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LineFileDocs; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/package.html b/lucene/test-framework/src/java/org/apache/lucene/index/package.html deleted file mode 100644 index 383c56c69c7..00000000000 --- a/lucene/test-framework/src/java/org/apache/lucene/index/package.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - -Support for testing of indexes. -

-The primary classes are: -

    -
  • {@link org.apache.lucene.index.RandomIndexWriter}: Randomizes the indexing experience. -
  • {@link org.apache.lucene.index.MockRandomMergePolicy}: MergePolicy that makes random decisions. -
- - diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/BaseTokenStreamTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/BaseTokenStreamTestCase.java index 058e7b30877..7009247b086 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/BaseTokenStreamTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/BaseTokenStreamTestCase.java @@ -37,8 +37,8 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexOptions; import org.apache.lucene.index.IndexableFieldType; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.Rethrow; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingDocValuesFormat.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingDocValuesFormat.java index 9b35210a896..a32f2ac57e8 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingDocValuesFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingDocValuesFormat.java @@ -22,7 +22,6 @@ import org.apache.lucene.codecs.DocValuesConsumer; import org.apache.lucene.codecs.DocValuesFormat; import org.apache.lucene.codecs.DocValuesProducer; -import org.apache.lucene.index.AssertingLeafReader; import org.apache.lucene.index.BinaryDocValues; import org.apache.lucene.index.DocValuesType; import org.apache.lucene.index.FieldInfo; @@ -32,6 +31,7 @@ import org.apache.lucene.index.SortedDocValues; import org.apache.lucene.index.SortedNumericDocValues; import org.apache.lucene.index.SortedSetDocValues; +import org.apache.lucene.tests.index.AssertingLeafReader; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.FixedBitSet; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingNormsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingNormsFormat.java index f987cc7dcf4..2dea74846c8 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingNormsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingNormsFormat.java @@ -22,11 +22,11 @@ import org.apache.lucene.codecs.NormsConsumer; import org.apache.lucene.codecs.NormsFormat; import org.apache.lucene.codecs.NormsProducer; -import org.apache.lucene.index.AssertingLeafReader; import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.NumericDocValues; import org.apache.lucene.index.SegmentReadState; import org.apache.lucene.index.SegmentWriteState; +import org.apache.lucene.tests.index.AssertingLeafReader; import org.apache.lucene.tests.util.TestUtil; /** Just like the default but with additional asserts. */ diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingPointsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingPointsFormat.java index 41c2ff2505c..2b68a59e135 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingPointsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingPointsFormat.java @@ -20,12 +20,12 @@ import org.apache.lucene.codecs.PointsFormat; import org.apache.lucene.codecs.PointsReader; import org.apache.lucene.codecs.PointsWriter; -import org.apache.lucene.index.AssertingLeafReader; import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.MergeState; import org.apache.lucene.index.PointValues; import org.apache.lucene.index.SegmentReadState; import org.apache.lucene.index.SegmentWriteState; +import org.apache.lucene.tests.index.AssertingLeafReader; import org.apache.lucene.tests.util.TestUtil; /** Just like the default point format but with additional asserts. */ diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingPostingsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingPostingsFormat.java index 9d628bdcc33..72074227491 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingPostingsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingPostingsFormat.java @@ -22,7 +22,6 @@ import org.apache.lucene.codecs.FieldsProducer; import org.apache.lucene.codecs.NormsProducer; import org.apache.lucene.codecs.PostingsFormat; -import org.apache.lucene.index.AssertingLeafReader; import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.Fields; import org.apache.lucene.index.IndexOptions; @@ -32,6 +31,7 @@ import org.apache.lucene.index.SegmentWriteState; import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; +import org.apache.lucene.tests.index.AssertingLeafReader; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingTermVectorsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingTermVectorsFormat.java index 89f5ebb6087..209ef5150b6 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingTermVectorsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/codecs/asserting/AssertingTermVectorsFormat.java @@ -22,13 +22,13 @@ import org.apache.lucene.codecs.TermVectorsFormat; import org.apache.lucene.codecs.TermVectorsReader; import org.apache.lucene.codecs.TermVectorsWriter; -import org.apache.lucene.index.AssertingLeafReader; import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.FieldInfos; import org.apache.lucene.index.Fields; import org.apache.lucene.index.SegmentInfo; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; +import org.apache.lucene.tests.index.AssertingLeafReader; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Accountable; import org.apache.lucene.util.BytesRef; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/geo/BaseGeoPointTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/geo/BaseGeoPointTestCase.java index 057104f443b..bb68f97183e 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/geo/BaseGeoPointTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/geo/BaseGeoPointTestCase.java @@ -51,7 +51,6 @@ import org.apache.lucene.index.MultiBits; import org.apache.lucene.index.MultiDocValues; import org.apache.lucene.index.NumericDocValues; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.SegmentReadState; import org.apache.lucene.index.SegmentWriteState; import org.apache.lucene.index.SerialMergeScheduler; @@ -66,6 +65,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/geo/BaseXYPointTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/geo/BaseXYPointTestCase.java index ebeffcf1a83..772432a0d96 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/geo/BaseXYPointTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/geo/BaseXYPointTestCase.java @@ -51,7 +51,6 @@ import org.apache.lucene.index.MultiBits; import org.apache.lucene.index.MultiDocValues; import org.apache.lucene.index.NumericDocValues; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.SegmentReadState; import org.apache.lucene.index.SegmentWriteState; import org.apache.lucene.index.SerialMergeScheduler; @@ -65,6 +64,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.Bits; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/AlcoholicMergePolicy.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/AlcoholicMergePolicy.java similarity index 94% rename from lucene/test-framework/src/java/org/apache/lucene/index/AlcoholicMergePolicy.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/index/AlcoholicMergePolicy.java index ef77439cecc..00f28673e7a 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/AlcoholicMergePolicy.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/AlcoholicMergePolicy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.index; +package org.apache.lucene.tests.index; import java.io.IOException; import java.util.Calendar; @@ -22,6 +22,8 @@ import java.util.Locale; import java.util.Random; import java.util.TimeZone; +import org.apache.lucene.index.LogMergePolicy; +import org.apache.lucene.index.SegmentCommitInfo; import org.apache.lucene.tests.util.TestUtil; /** diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/AllDeletedFilterReader.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/AllDeletedFilterReader.java similarity index 91% rename from lucene/test-framework/src/java/org/apache/lucene/index/AllDeletedFilterReader.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/index/AllDeletedFilterReader.java index 26e23d94ca3..12c64290622 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/AllDeletedFilterReader.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/AllDeletedFilterReader.java @@ -14,8 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.index; +package org.apache.lucene.tests.index; +import org.apache.lucene.index.FilterLeafReader; +import org.apache.lucene.index.LeafReader; import org.apache.lucene.util.Bits; /** Filters the incoming reader and makes all documents appear deleted. */ diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/AssertingDirectoryReader.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/AssertingDirectoryReader.java similarity index 89% rename from lucene/test-framework/src/java/org/apache/lucene/index/AssertingDirectoryReader.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/index/AssertingDirectoryReader.java index 8274cf09795..a1a34184739 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/AssertingDirectoryReader.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/AssertingDirectoryReader.java @@ -14,9 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.index; +package org.apache.lucene.tests.index; import java.io.IOException; +import org.apache.lucene.index.DirectoryReader; +import org.apache.lucene.index.FilterDirectoryReader; +import org.apache.lucene.index.LeafReader; /** A {@link DirectoryReader} that wraps all its subreaders with {@link AssertingLeafReader} */ public class AssertingDirectoryReader extends FilterDirectoryReader { diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/AssertingLeafReader.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/AssertingLeafReader.java similarity index 97% rename from lucene/test-framework/src/java/org/apache/lucene/index/AssertingLeafReader.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/index/AssertingLeafReader.java index ffb4f1739dd..9df7858a895 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/AssertingLeafReader.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/AssertingLeafReader.java @@ -14,15 +14,35 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.index; +package org.apache.lucene.tests.index; import java.io.IOException; import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.Objects; +import org.apache.lucene.index.BinaryDocValues; +import org.apache.lucene.index.CheckIndex; +import org.apache.lucene.index.DocValues; +import org.apache.lucene.index.DocValuesType; +import org.apache.lucene.index.FieldInfo; +import org.apache.lucene.index.Fields; +import org.apache.lucene.index.FilterLeafReader; +import org.apache.lucene.index.Impact; +import org.apache.lucene.index.Impacts; +import org.apache.lucene.index.ImpactsEnum; +import org.apache.lucene.index.LeafReader; +import org.apache.lucene.index.NumericDocValues; +import org.apache.lucene.index.PointValues; import org.apache.lucene.index.PointValues.IntersectVisitor; import org.apache.lucene.index.PointValues.Relation; +import org.apache.lucene.index.PostingsEnum; +import org.apache.lucene.index.SortedDocValues; +import org.apache.lucene.index.SortedNumericDocValues; +import org.apache.lucene.index.SortedSetDocValues; +import org.apache.lucene.index.TermState; +import org.apache.lucene.index.Terms; +import org.apache.lucene.index.TermsEnum; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.util.Bits; import org.apache.lucene.util.BytesRef; @@ -207,7 +227,7 @@ public PostingsEnum postings(PostingsEnum reuse, int flags) throws IOException { // reuse if the codec reused final PostingsEnum actualReuse; if (reuse instanceof AssertingPostingsEnum) { - actualReuse = ((AssertingPostingsEnum) reuse).in; + actualReuse = ((AssertingPostingsEnum) reuse).unwrap(); } else { actualReuse = null; } diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseCompoundFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseCompoundFormatTestCase.java similarity index 99% rename from lucene/test-framework/src/java/org/apache/lucene/index/BaseCompoundFormatTestCase.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseCompoundFormatTestCase.java index c6bb20dfedb..2fc84e0b120 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseCompoundFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseCompoundFormatTestCase.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.index; +package org.apache.lucene.tests.index; import java.io.IOException; import java.util.ArrayList; @@ -30,6 +30,10 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.StoredField; +import org.apache.lucene.index.CorruptIndexException; +import org.apache.lucene.index.SegmentCommitInfo; +import org.apache.lucene.index.SegmentInfo; +import org.apache.lucene.index.SegmentInfos; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FilterDirectory; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseCompressingDocValuesFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseCompressingDocValuesFormatTestCase.java similarity index 97% rename from lucene/test-framework/src/java/org/apache/lucene/index/BaseCompressingDocValuesFormatTestCase.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseCompressingDocValuesFormatTestCase.java index 133d2a733ec..e00954243ae 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseCompressingDocValuesFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseCompressingDocValuesFormatTestCase.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.index; +package org.apache.lucene.tests.index; import com.carrotsearch.randomizedtesting.generators.RandomPicks; import java.io.IOException; @@ -22,6 +22,8 @@ import java.util.List; import org.apache.lucene.document.Document; import org.apache.lucene.document.NumericDocValuesField; +import org.apache.lucene.index.IndexWriter; +import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseDocValuesFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseDocValuesFormatTestCase.java similarity index 99% rename from lucene/test-framework/src/java/org/apache/lucene/index/BaseDocValuesFormatTestCase.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseDocValuesFormatTestCase.java index 7943f4b99c6..2bbfbf4d075 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseDocValuesFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseDocValuesFormatTestCase.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.index; +package org.apache.lucene.tests.index; import static org.apache.lucene.index.SortedSetDocValues.NO_MORE_ORDS; import static org.apache.lucene.search.DocIdSetIterator.NO_MORE_DOCS; @@ -50,7 +50,25 @@ import org.apache.lucene.document.StoredField; import org.apache.lucene.document.StringField; import org.apache.lucene.document.TextField; +import org.apache.lucene.index.BinaryDocValues; +import org.apache.lucene.index.CheckIndex; import org.apache.lucene.index.CheckIndex.Status.DocValuesStatus; +import org.apache.lucene.index.CodecReader; +import org.apache.lucene.index.DirectoryReader; +import org.apache.lucene.index.DocValues; +import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexWriter; +import org.apache.lucene.index.IndexWriterConfig; +import org.apache.lucene.index.LeafReader; +import org.apache.lucene.index.LeafReaderContext; +import org.apache.lucene.index.MultiDocValues; +import org.apache.lucene.index.NumericDocValues; +import org.apache.lucene.index.PostingsEnum; +import org.apache.lucene.index.SortedDocValues; +import org.apache.lucene.index.SortedNumericDocValues; +import org.apache.lucene.index.SortedSetDocValues; +import org.apache.lucene.index.Term; +import org.apache.lucene.index.TermsEnum; import org.apache.lucene.index.TermsEnum.SeekStatus; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseFieldInfoFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseFieldInfoFormatTestCase.java similarity index 97% rename from lucene/test-framework/src/java/org/apache/lucene/index/BaseFieldInfoFormatTestCase.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseFieldInfoFormatTestCase.java index c9c02031c1f..c39736cc74e 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseFieldInfoFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseFieldInfoFormatTestCase.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.index; +package org.apache.lucene.tests.index; import com.carrotsearch.randomizedtesting.generators.RandomPicks; import java.io.IOException; @@ -29,6 +29,15 @@ import org.apache.lucene.document.FieldType; import org.apache.lucene.document.StoredField; import org.apache.lucene.document.TextField; +import org.apache.lucene.index.DocValuesType; +import org.apache.lucene.index.FieldInfo; +import org.apache.lucene.index.FieldInfos; +import org.apache.lucene.index.IndexOptions; +import org.apache.lucene.index.IndexableFieldType; +import org.apache.lucene.index.PointValues; +import org.apache.lucene.index.SegmentInfo; +import org.apache.lucene.index.VectorSimilarityFunction; +import org.apache.lucene.index.VectorValues; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.tests.store.MockDirectoryWrapper; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseIndexFileFormatTestCase.java similarity index 97% rename from lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseIndexFileFormatTestCase.java index 2a83eb58f98..aca8da4f96a 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseIndexFileFormatTestCase.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.index; +package org.apache.lucene.tests.index; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -51,6 +51,27 @@ import org.apache.lucene.document.FieldType; import org.apache.lucene.document.NumericDocValuesField; import org.apache.lucene.document.TextField; +import org.apache.lucene.index.DirectoryReader; +import org.apache.lucene.index.EmptyDocValuesProducer; +import org.apache.lucene.index.FieldInfo; +import org.apache.lucene.index.FieldInfos; +import org.apache.lucene.index.Fields; +import org.apache.lucene.index.IndexFileNames; +import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexReaderContext; +import org.apache.lucene.index.IndexWriter; +import org.apache.lucene.index.IndexWriterConfig; +import org.apache.lucene.index.LeafReader; +import org.apache.lucene.index.MergePolicy; +import org.apache.lucene.index.NumericDocValues; +import org.apache.lucene.index.SegmentCommitInfo; +import org.apache.lucene.index.SegmentInfo; +import org.apache.lucene.index.SegmentInfos; +import org.apache.lucene.index.SegmentReadState; +import org.apache.lucene.index.SegmentWriteState; +import org.apache.lucene.index.SerialMergeScheduler; +import org.apache.lucene.index.Term; +import org.apache.lucene.index.Terms; import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.ChecksumIndexInput; import org.apache.lucene.store.Directory; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseKnnVectorsFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseKnnVectorsFormatTestCase.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/index/BaseKnnVectorsFormatTestCase.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseKnnVectorsFormatTestCase.java index be638abdcbb..6518de53632 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseKnnVectorsFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseKnnVectorsFormatTestCase.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.index; +package org.apache.lucene.tests.index; import static org.apache.lucene.search.DocIdSetIterator.NO_MORE_DOCS; @@ -29,6 +29,19 @@ import org.apache.lucene.document.KnnVectorField; import org.apache.lucene.document.NumericDocValuesField; import org.apache.lucene.document.StringField; +import org.apache.lucene.index.CheckIndex; +import org.apache.lucene.index.CodecReader; +import org.apache.lucene.index.DirectoryReader; +import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexWriter; +import org.apache.lucene.index.IndexWriterConfig; +import org.apache.lucene.index.LeafReader; +import org.apache.lucene.index.LeafReaderContext; +import org.apache.lucene.index.RandomAccessVectorValues; +import org.apache.lucene.index.RandomAccessVectorValuesProducer; +import org.apache.lucene.index.Term; +import org.apache.lucene.index.VectorSimilarityFunction; +import org.apache.lucene.index.VectorValues; import org.apache.lucene.search.Sort; import org.apache.lucene.search.SortField; import org.apache.lucene.search.TopDocs; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseLiveDocsFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseLiveDocsFormatTestCase.java similarity index 96% rename from lucene/test-framework/src/java/org/apache/lucene/index/BaseLiveDocsFormatTestCase.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseLiveDocsFormatTestCase.java index 1ca18846214..ec114f4f57f 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseLiveDocsFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseLiveDocsFormatTestCase.java @@ -14,12 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.index; +package org.apache.lucene.tests.index; import java.io.IOException; import java.util.Collections; import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.LiveDocsFormat; +import org.apache.lucene.index.IndexWriter; +import org.apache.lucene.index.SegmentCommitInfo; +import org.apache.lucene.index.SegmentInfo; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.tests.util.LuceneTestCase; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseMergePolicyTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseMergePolicyTestCase.java similarity index 97% rename from lucene/test-framework/src/java/org/apache/lucene/index/BaseMergePolicyTestCase.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseMergePolicyTestCase.java index 88993cdce39..7427e6b8273 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseMergePolicyTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseMergePolicyTestCase.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.index; +package org.apache.lucene.tests.index; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -28,9 +28,19 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.function.ToIntFunction; import org.apache.lucene.document.Document; +import org.apache.lucene.index.FilterMergePolicy; +import org.apache.lucene.index.IndexWriter; +import org.apache.lucene.index.IndexWriterConfig; +import org.apache.lucene.index.MergePolicy; import org.apache.lucene.index.MergePolicy.MergeContext; import org.apache.lucene.index.MergePolicy.MergeSpecification; import org.apache.lucene.index.MergePolicy.OneMerge; +import org.apache.lucene.index.MergeScheduler; +import org.apache.lucene.index.MergeTrigger; +import org.apache.lucene.index.SegmentCommitInfo; +import org.apache.lucene.index.SegmentInfo; +import org.apache.lucene.index.SegmentInfos; +import org.apache.lucene.index.SerialMergeScheduler; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseNormsFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseNormsFormatTestCase.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/index/BaseNormsFormatTestCase.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseNormsFormatTestCase.java index 95e1cdcbc4e..96face910c5 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseNormsFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseNormsFormatTestCase.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.index; +package org.apache.lucene.tests.index; import static org.apache.lucene.search.DocIdSetIterator.NO_MORE_DOCS; @@ -30,6 +30,16 @@ import org.apache.lucene.document.NumericDocValuesField; import org.apache.lucene.document.StringField; import org.apache.lucene.document.TextField; +import org.apache.lucene.index.DirectoryReader; +import org.apache.lucene.index.FieldInvertState; +import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexWriterConfig; +import org.apache.lucene.index.LeafReader; +import org.apache.lucene.index.LeafReaderContext; +import org.apache.lucene.index.MultiDocValues; +import org.apache.lucene.index.NoMergePolicy; +import org.apache.lucene.index.NumericDocValues; +import org.apache.lucene.index.Term; import org.apache.lucene.search.CollectionStatistics; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.search.TermStatistics; @@ -592,7 +602,7 @@ static class CannedNormSimilarity extends Similarity { @Override public long computeNorm(FieldInvertState state) { - assert state.length > 0; + assert state.getLength() > 0; while (true) { long norm = norms[index++]; if (norm != 0) { diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BasePointsFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BasePointsFormatTestCase.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/index/BasePointsFormatTestCase.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/index/BasePointsFormatTestCase.java index 297d01d0974..77452319f86 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BasePointsFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BasePointsFormatTestCase.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.index; +package org.apache.lucene.tests.index; import static org.apache.lucene.search.DocIdSetIterator.NO_MORE_DOCS; @@ -32,8 +32,21 @@ import org.apache.lucene.document.IntPoint; import org.apache.lucene.document.NumericDocValuesField; import org.apache.lucene.document.StringField; +import org.apache.lucene.index.CodecReader; +import org.apache.lucene.index.ConcurrentMergeScheduler; +import org.apache.lucene.index.DirectoryReader; +import org.apache.lucene.index.IndexWriter; +import org.apache.lucene.index.IndexWriterConfig; +import org.apache.lucene.index.LeafReader; +import org.apache.lucene.index.LeafReaderContext; +import org.apache.lucene.index.MergeScheduler; +import org.apache.lucene.index.MultiBits; +import org.apache.lucene.index.MultiDocValues; +import org.apache.lucene.index.NumericDocValues; +import org.apache.lucene.index.PointValues; import org.apache.lucene.index.PointValues.IntersectVisitor; import org.apache.lucene.index.PointValues.Relation; +import org.apache.lucene.index.Term; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BasePostingsFormatTestCase.java similarity index 99% rename from lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/index/BasePostingsFormatTestCase.java index 4fdaf19f3b7..d98fa17b974 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BasePostingsFormatTestCase.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.index; +package org.apache.lucene.tests.index; import static org.apache.lucene.index.PostingsEnum.ALL; import static org.apache.lucene.index.PostingsEnum.FREQS; @@ -41,6 +41,20 @@ import org.apache.lucene.document.FieldType; import org.apache.lucene.document.StringField; import org.apache.lucene.document.TextField; +import org.apache.lucene.index.DirectoryReader; +import org.apache.lucene.index.Fields; +import org.apache.lucene.index.IndexOptions; +import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexWriter; +import org.apache.lucene.index.IndexWriterConfig; +import org.apache.lucene.index.LeafReader; +import org.apache.lucene.index.MultiTerms; +import org.apache.lucene.index.PostingsEnum; +import org.apache.lucene.index.SegmentReadState; +import org.apache.lucene.index.SegmentWriteState; +import org.apache.lucene.index.Term; +import org.apache.lucene.index.Terms; +import org.apache.lucene.index.TermsEnum; import org.apache.lucene.index.TermsEnum.SeekStatus; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.search.IndexSearcher; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseSegmentInfoFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseSegmentInfoFormatTestCase.java similarity index 99% rename from lucene/test-framework/src/java/org/apache/lucene/index/BaseSegmentInfoFormatTestCase.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseSegmentInfoFormatTestCase.java index fee1a3ec983..665353d40e5 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseSegmentInfoFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseSegmentInfoFormatTestCase.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.index; +package org.apache.lucene.tests.index; import java.io.IOException; import java.util.Collections; @@ -25,6 +25,9 @@ import org.apache.lucene.codecs.Codec; import org.apache.lucene.document.Document; import org.apache.lucene.document.StoredField; +import org.apache.lucene.index.IndexFileNames; +import org.apache.lucene.index.IndexWriter; +import org.apache.lucene.index.SegmentInfo; import org.apache.lucene.search.Sort; import org.apache.lucene.search.SortField; import org.apache.lucene.search.SortedNumericSortField; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseStoredFieldsFormatTestCase.java similarity index 97% rename from lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseStoredFieldsFormatTestCase.java index 296d3ca93f6..d69ad447217 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseStoredFieldsFormatTestCase.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.index; +package org.apache.lucene.tests.index; import com.carrotsearch.randomizedtesting.generators.RandomNumbers; import com.carrotsearch.randomizedtesting.generators.RandomPicks; @@ -45,6 +45,21 @@ import org.apache.lucene.document.StoredField; import org.apache.lucene.document.StringField; import org.apache.lucene.document.TextField; +import org.apache.lucene.index.DirectoryReader; +import org.apache.lucene.index.DocValues; +import org.apache.lucene.index.FilterDirectoryReader; +import org.apache.lucene.index.FilterLeafReader; +import org.apache.lucene.index.IndexOptions; +import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexWriter; +import org.apache.lucene.index.IndexWriterConfig; +import org.apache.lucene.index.IndexableField; +import org.apache.lucene.index.LeafReader; +import org.apache.lucene.index.LeafReaderContext; +import org.apache.lucene.index.NoMergePolicy; +import org.apache.lucene.index.NumericDocValues; +import org.apache.lucene.index.StoredFieldVisitor; +import org.apache.lucene.index.Term; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; import org.apache.lucene.search.Sort; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseTermVectorsFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseTermVectorsFormatTestCase.java similarity index 99% rename from lucene/test-framework/src/java/org/apache/lucene/index/BaseTermVectorsFormatTestCase.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseTermVectorsFormatTestCase.java index c0353142e38..6ab47d830b6 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseTermVectorsFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseTermVectorsFormatTestCase.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.index; +package org.apache.lucene.tests.index; import static org.apache.lucene.index.PostingsEnum.ALL; import static org.apache.lucene.index.PostingsEnum.FREQS; @@ -51,6 +51,15 @@ import org.apache.lucene.document.NumericDocValuesField; import org.apache.lucene.document.StringField; import org.apache.lucene.document.TextField; +import org.apache.lucene.index.DirectoryReader; +import org.apache.lucene.index.Fields; +import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexWriter; +import org.apache.lucene.index.IndexWriterConfig; +import org.apache.lucene.index.PostingsEnum; +import org.apache.lucene.index.Term; +import org.apache.lucene.index.Terms; +import org.apache.lucene.index.TermsEnum; import org.apache.lucene.index.TermsEnum.SeekStatus; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.search.IndexSearcher; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseTestCheckIndex.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseTestCheckIndex.java similarity index 97% rename from lucene/test-framework/src/java/org/apache/lucene/index/BaseTestCheckIndex.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseTestCheckIndex.java index 114e5c11136..98fd4003cd8 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseTestCheckIndex.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseTestCheckIndex.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.index; +package org.apache.lucene.tests.index; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -24,6 +24,9 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.FieldType; import org.apache.lucene.document.TextField; +import org.apache.lucene.index.CheckIndex; +import org.apache.lucene.index.IndexWriter; +import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; import org.apache.lucene.store.LockObtainFailedException; import org.apache.lucene.tests.analysis.MockAnalyzer; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/DocHelper.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/DocHelper.java similarity index 97% rename from lucene/test-framework/src/java/org/apache/lucene/index/DocHelper.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/index/DocHelper.java index 8985742baea..e6092bed0ce 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/DocHelper.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/DocHelper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.index; +package org.apache.lucene.tests.index; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -28,6 +28,11 @@ import org.apache.lucene.document.StoredField; import org.apache.lucene.document.StringField; import org.apache.lucene.document.TextField; +import org.apache.lucene.index.IndexOptions; +import org.apache.lucene.index.IndexWriter; +import org.apache.lucene.index.IndexWriterConfig; +import org.apache.lucene.index.IndexableField; +import org.apache.lucene.index.SegmentCommitInfo; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterLeafReader.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/FieldFilterLeafReader.java similarity index 90% rename from lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterLeafReader.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/index/FieldFilterLeafReader.java index 57c92e89594..6d6156fb787 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterLeafReader.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/FieldFilterLeafReader.java @@ -14,13 +14,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.index; +package org.apache.lucene.tests.index; import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; import java.util.Objects; import java.util.Set; +import org.apache.lucene.index.BinaryDocValues; +import org.apache.lucene.index.FieldInfo; +import org.apache.lucene.index.FieldInfos; +import org.apache.lucene.index.Fields; +import org.apache.lucene.index.FilterLeafReader; +import org.apache.lucene.index.LeafReader; +import org.apache.lucene.index.NumericDocValues; +import org.apache.lucene.index.SortedDocValues; +import org.apache.lucene.index.SortedNumericDocValues; +import org.apache.lucene.index.SortedSetDocValues; +import org.apache.lucene.index.StoredFieldVisitor; +import org.apache.lucene.index.Terms; import org.apache.lucene.util.FilterIterator; /** diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/ForceMergePolicy.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/ForceMergePolicy.java old mode 100755 new mode 100644 similarity index 86% rename from lucene/test-framework/src/java/org/apache/lucene/index/ForceMergePolicy.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/index/ForceMergePolicy.java index d0460c0c0f5..075ab921c87 --- a/lucene/test-framework/src/java/org/apache/lucene/index/ForceMergePolicy.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/ForceMergePolicy.java @@ -14,9 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.index; +package org.apache.lucene.tests.index; import java.io.IOException; +import org.apache.lucene.index.FilterMergePolicy; +import org.apache.lucene.index.MergePolicy; +import org.apache.lucene.index.MergeTrigger; +import org.apache.lucene.index.SegmentInfos; /** * A {@link MergePolicy} that only returns forced merges. diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/IndexWriterMaxDocsChanger.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/IndexWriterMaxDocsChanger.java similarity index 95% rename from lucene/test-framework/src/java/org/apache/lucene/index/IndexWriterMaxDocsChanger.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/index/IndexWriterMaxDocsChanger.java index 4f30dd9b147..2d0ca03d23d 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/IndexWriterMaxDocsChanger.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/IndexWriterMaxDocsChanger.java @@ -14,8 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.index; +package org.apache.lucene.tests.index; +import org.apache.lucene.index.IndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; /** diff --git a/lucene/core/src/java/org/apache/lucene/index/MergeReaderWrapper.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/MergeReaderWrapper.java similarity index 90% rename from lucene/core/src/java/org/apache/lucene/index/MergeReaderWrapper.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/index/MergeReaderWrapper.java index e386e039bf4..ba7e97fcc55 100644 --- a/lucene/core/src/java/org/apache/lucene/index/MergeReaderWrapper.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/MergeReaderWrapper.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.index; +package org.apache.lucene.tests.index; import java.io.IOException; import java.util.Objects; @@ -24,6 +24,22 @@ import org.apache.lucene.codecs.NormsProducer; import org.apache.lucene.codecs.StoredFieldsReader; import org.apache.lucene.codecs.TermVectorsReader; +import org.apache.lucene.index.BinaryDocValues; +import org.apache.lucene.index.CodecReader; +import org.apache.lucene.index.DocValuesType; +import org.apache.lucene.index.FieldInfo; +import org.apache.lucene.index.FieldInfos; +import org.apache.lucene.index.Fields; +import org.apache.lucene.index.LeafMetaData; +import org.apache.lucene.index.LeafReader; +import org.apache.lucene.index.NumericDocValues; +import org.apache.lucene.index.PointValues; +import org.apache.lucene.index.SortedDocValues; +import org.apache.lucene.index.SortedNumericDocValues; +import org.apache.lucene.index.SortedSetDocValues; +import org.apache.lucene.index.StoredFieldVisitor; +import org.apache.lucene.index.Terms; +import org.apache.lucene.index.VectorValues; import org.apache.lucene.search.TopDocs; import org.apache.lucene.util.Bits; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/MergingCodecReader.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/MergingCodecReader.java similarity index 95% rename from lucene/test-framework/src/java/org/apache/lucene/index/MergingCodecReader.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/index/MergingCodecReader.java index cd2c49807ad..76058d117af 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/MergingCodecReader.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/MergingCodecReader.java @@ -14,11 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.index; +package org.apache.lucene.tests.index; import org.apache.lucene.codecs.DocValuesProducer; import org.apache.lucene.codecs.NormsProducer; import org.apache.lucene.codecs.StoredFieldsReader; +import org.apache.lucene.index.CodecReader; +import org.apache.lucene.index.FilterCodecReader; import org.apache.lucene.util.CloseableThreadLocal; /** diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/MergingDirectoryReaderWrapper.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/MergingDirectoryReaderWrapper.java similarity index 88% rename from lucene/test-framework/src/java/org/apache/lucene/index/MergingDirectoryReaderWrapper.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/index/MergingDirectoryReaderWrapper.java index 3950c3dff69..b7aa18dba53 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/MergingDirectoryReaderWrapper.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/MergingDirectoryReaderWrapper.java @@ -14,9 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.index; +package org.apache.lucene.tests.index; import java.io.IOException; +import org.apache.lucene.index.CodecReader; +import org.apache.lucene.index.DirectoryReader; +import org.apache.lucene.index.FilterDirectoryReader; +import org.apache.lucene.index.LeafReader; /** * {@link DirectoryReader} wrapper that uses the merge instances of the wrapped {@link diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/MismatchedDirectoryReader.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/MismatchedDirectoryReader.java similarity index 90% rename from lucene/test-framework/src/java/org/apache/lucene/index/MismatchedDirectoryReader.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/index/MismatchedDirectoryReader.java index d401f004e8f..6f65ddbe0b6 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/MismatchedDirectoryReader.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/MismatchedDirectoryReader.java @@ -14,10 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.index; +package org.apache.lucene.tests.index; import java.io.IOException; import java.util.Random; +import org.apache.lucene.index.DirectoryReader; +import org.apache.lucene.index.FilterDirectoryReader; +import org.apache.lucene.index.LeafReader; /** A {@link DirectoryReader} that wraps all its subreaders with {@link MismatchedLeafReader} */ public class MismatchedDirectoryReader extends FilterDirectoryReader { diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/MismatchedLeafReader.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/MismatchedLeafReader.java similarity index 95% rename from lucene/test-framework/src/java/org/apache/lucene/index/MismatchedLeafReader.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/index/MismatchedLeafReader.java index a14b8f1002b..21c83175daa 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/MismatchedLeafReader.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/MismatchedLeafReader.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.index; +package org.apache.lucene.tests.index; import java.io.IOException; import java.util.ArrayList; @@ -22,6 +22,11 @@ import java.util.List; import java.util.Objects; import java.util.Random; +import org.apache.lucene.index.FieldInfo; +import org.apache.lucene.index.FieldInfos; +import org.apache.lucene.index.FilterLeafReader; +import org.apache.lucene.index.LeafReader; +import org.apache.lucene.index.StoredFieldVisitor; /** * Shuffles field numbers around to try to trip bugs where field numbers are assumed to always be diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/MockIndexWriterEventListener.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/MockIndexWriterEventListener.java similarity index 90% rename from lucene/test-framework/src/java/org/apache/lucene/index/MockIndexWriterEventListener.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/index/MockIndexWriterEventListener.java index 33ffa5dd9cc..686f3340031 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/MockIndexWriterEventListener.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/MockIndexWriterEventListener.java @@ -14,7 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.index; +package org.apache.lucene.tests.index; + +import org.apache.lucene.index.IndexWriterEventListener; +import org.apache.lucene.index.MergePolicy; /** Mock IndexWriterEventListener to verify invocation of event methods */ public class MockIndexWriterEventListener implements IndexWriterEventListener { diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/MockRandomMergePolicy.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/MockRandomMergePolicy.java similarity index 95% rename from lucene/test-framework/src/java/org/apache/lucene/index/MockRandomMergePolicy.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/index/MockRandomMergePolicy.java index a9e8fecebdd..3a9657e16b9 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/MockRandomMergePolicy.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/MockRandomMergePolicy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.index; +package org.apache.lucene.tests.index; import java.io.IOException; import java.util.ArrayList; @@ -23,6 +23,13 @@ import java.util.Map; import java.util.Random; import java.util.Set; +import org.apache.lucene.index.CodecReader; +import org.apache.lucene.index.FilterLeafReader; +import org.apache.lucene.index.MergePolicy; +import org.apache.lucene.index.MergeTrigger; +import org.apache.lucene.index.SegmentCommitInfo; +import org.apache.lucene.index.SegmentInfos; +import org.apache.lucene.index.SlowCodecReaderWrapper; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/OwnCacheKeyMultiReader.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/OwnCacheKeyMultiReader.java similarity index 94% rename from lucene/test-framework/src/java/org/apache/lucene/index/OwnCacheKeyMultiReader.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/index/OwnCacheKeyMultiReader.java index 9f97228bbb6..41aab190564 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/OwnCacheKeyMultiReader.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/OwnCacheKeyMultiReader.java @@ -14,11 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.index; +package org.apache.lucene.tests.index; import java.io.IOException; import java.util.Set; import java.util.concurrent.CopyOnWriteArraySet; +import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.MultiReader; import org.apache.lucene.util.IOUtils; /** A {@link MultiReader} that has its own cache key, occasionally useful for testing purposes. */ diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/PerThreadPKLookup.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/PerThreadPKLookup.java similarity index 93% rename from lucene/test-framework/src/java/org/apache/lucene/index/PerThreadPKLookup.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/index/PerThreadPKLookup.java index 51ba6ca753c..b5327515abd 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/PerThreadPKLookup.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/PerThreadPKLookup.java @@ -14,13 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.index; +package org.apache.lucene.tests.index; import java.io.IOException; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; +import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.LeafReaderContext; +import org.apache.lucene.index.PostingsEnum; +import org.apache.lucene.index.Terms; +import org.apache.lucene.index.TermsEnum; import org.apache.lucene.util.Bits; import org.apache.lucene.util.BytesRef; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/PointsStackTracker.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/PointsStackTracker.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/index/PointsStackTracker.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/index/PointsStackTracker.java index 05bff86e2c9..2c1bae658ec 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/PointsStackTracker.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/PointsStackTracker.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.lucene.index; +package org.apache.lucene.tests.index; import java.util.ArrayList; import java.util.Arrays; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/RandomCodec.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/index/RandomCodec.java index 6b7240a2d31..03866a3d177 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/RandomCodec.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.index; +package org.apache.lucene.tests.index; import java.io.IOException; import java.util.ArrayList; @@ -36,7 +36,11 @@ import org.apache.lucene.codecs.lucene90.Lucene90PointsWriter; import org.apache.lucene.codecs.memory.DirectPostingsFormat; import org.apache.lucene.codecs.memory.FSTPostingsFormat; +import org.apache.lucene.index.FieldInfo; +import org.apache.lucene.index.PointValues; import org.apache.lucene.index.PointValues.IntersectVisitor; +import org.apache.lucene.index.SegmentReadState; +import org.apache.lucene.index.SegmentWriteState; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.codecs.asserting.AssertingCodec; import org.apache.lucene.tests.codecs.asserting.AssertingDocValuesFormat; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/RandomIndexWriter.java similarity index 97% rename from lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/index/RandomIndexWriter.java index 9a13ab386d1..9dcc61ea37d 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/RandomIndexWriter.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.index; +package org.apache.lucene.tests.index; import java.io.Closeable; import java.io.IOException; @@ -26,6 +26,16 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.document.Field; import org.apache.lucene.document.NumericDocValuesField; +import org.apache.lucene.index.CodecReader; +import org.apache.lucene.index.DirectoryReader; +import org.apache.lucene.index.IndexWriter; +import org.apache.lucene.index.IndexWriterConfig; +import org.apache.lucene.index.IndexableField; +import org.apache.lucene.index.LiveIndexWriterConfig; +import org.apache.lucene.index.NoMergePolicy; +import org.apache.lucene.index.SoftDeletesDirectoryReaderWrapper; +import org.apache.lucene.index.Term; +import org.apache.lucene.index.TieredMergePolicy; import org.apache.lucene.search.Query; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/RandomPostingsTester.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/RandomPostingsTester.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/index/RandomPostingsTester.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/index/RandomPostingsTester.java index 6a0895a3aff..5ac6f7e4c0a 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/RandomPostingsTester.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/RandomPostingsTester.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.index; +package org.apache.lucene.tests.index; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -45,6 +45,25 @@ import org.apache.lucene.codecs.FieldsConsumer; import org.apache.lucene.codecs.FieldsProducer; import org.apache.lucene.codecs.NormsProducer; +import org.apache.lucene.index.BaseTermsEnum; +import org.apache.lucene.index.CheckIndex; +import org.apache.lucene.index.DocValuesType; +import org.apache.lucene.index.FieldInfo; +import org.apache.lucene.index.FieldInfos; +import org.apache.lucene.index.Fields; +import org.apache.lucene.index.Impact; +import org.apache.lucene.index.Impacts; +import org.apache.lucene.index.ImpactsEnum; +import org.apache.lucene.index.IndexOptions; +import org.apache.lucene.index.NumericDocValues; +import org.apache.lucene.index.PostingsEnum; +import org.apache.lucene.index.SegmentInfo; +import org.apache.lucene.index.SegmentReadState; +import org.apache.lucene.index.SegmentWriteState; +import org.apache.lucene.index.TermState; +import org.apache.lucene.index.Terms; +import org.apache.lucene.index.TermsEnum; +import org.apache.lucene.index.VectorSimilarityFunction; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FlushInfo; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/SuppressingConcurrentMergeScheduler.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/SuppressingConcurrentMergeScheduler.java similarity index 92% rename from lucene/test-framework/src/java/org/apache/lucene/index/SuppressingConcurrentMergeScheduler.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/index/SuppressingConcurrentMergeScheduler.java index 99d3a205fac..820ed381521 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/SuppressingConcurrentMergeScheduler.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/SuppressingConcurrentMergeScheduler.java @@ -14,7 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.index; +package org.apache.lucene.tests.index; + +import org.apache.lucene.index.ConcurrentMergeScheduler; /** A {@link ConcurrentMergeScheduler} that ignores AlreadyClosedException. */ public abstract class SuppressingConcurrentMergeScheduler extends ConcurrentMergeScheduler { diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/ThreadedIndexingAndSearchingTestCase.java similarity index 98% rename from lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java rename to lucene/test-framework/src/java/org/apache/lucene/tests/index/ThreadedIndexingAndSearchingTestCase.java index 23413366913..af8d11220f2 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/ThreadedIndexingAndSearchingTestCase.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.index; +package org.apache.lucene.tests.index; import java.nio.file.Path; import java.util.ArrayList; @@ -33,6 +33,16 @@ import java.util.concurrent.atomic.AtomicLong; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; +import org.apache.lucene.index.IndexWriter; +import org.apache.lucene.index.IndexWriterConfig; +import org.apache.lucene.index.IndexableField; +import org.apache.lucene.index.LeafReaderContext; +import org.apache.lucene.index.MultiTerms; +import org.apache.lucene.index.SegmentCoreReaders; +import org.apache.lucene.index.SegmentReader; +import org.apache.lucene.index.Term; +import org.apache.lucene.index.Terms; +import org.apache.lucene.index.TermsEnum; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.PhraseQuery; import org.apache.lucene.search.Query; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/package-info.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/package-info.java new file mode 100644 index 00000000000..e69d1126ed1 --- /dev/null +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/package-info.java @@ -0,0 +1,30 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * Support for testing of indexes. + * + *

The primary classes are: + * + *

    + *
  • {@link org.apache.lucene.tests.index.RandomIndexWriter}: Randomizes the indexing + * experience. + *
  • {@link org.apache.lucene.tests.index.MockRandomMergePolicy}: MergePolicy that makes random + * decisions. + *
+ */ +package org.apache.lucene.tests.index; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/search/BaseExplanationTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/search/BaseExplanationTestCase.java index 00a8fcd7edd..f76a089091b 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/search/BaseExplanationTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/search/BaseExplanationTestCase.java @@ -21,7 +21,6 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.SortedDocValuesField; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; @@ -30,6 +29,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; import org.junit.AfterClass; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/search/MatchesTestBase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/search/MatchesTestBase.java index 80326dbfb06..ad42ec73a39 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/search/MatchesTestBase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/search/MatchesTestBase.java @@ -33,7 +33,6 @@ import org.apache.lucene.index.IndexOptions; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.ReaderUtil; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Matches; @@ -44,6 +43,7 @@ import org.apache.lucene.search.Weight; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; /** diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/search/SearchEquivalenceTestBase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/search/SearchEquivalenceTestBase.java index 9c969611603..a65d1823726 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/search/SearchEquivalenceTestBase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/search/SearchEquivalenceTestBase.java @@ -24,7 +24,6 @@ import org.apache.lucene.document.StringField; import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.BooleanQuery; @@ -38,6 +37,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; import org.apache.lucene.tests.analysis.MockTokenizer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/search/similarities/BaseSimilarityTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/search/similarities/BaseSimilarityTestCase.java index f7898031903..84c340d516e 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/search/similarities/BaseSimilarityTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/search/similarities/BaseSimilarityTestCase.java @@ -22,7 +22,6 @@ import org.apache.lucene.document.FieldType; import org.apache.lucene.document.TextField; import org.apache.lucene.index.LeafReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.CollectionStatistics; import org.apache.lucene.search.Explanation; import org.apache.lucene.search.TermStatistics; @@ -30,6 +29,7 @@ import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.search.similarities.Similarity.SimScorer; import org.apache.lucene.store.Directory; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.search.CheckHits; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/store/BaseChunkedDirectoryTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/store/BaseChunkedDirectoryTestCase.java index 375a2c30c62..30e685f5eda 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/store/BaseChunkedDirectoryTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/store/BaseChunkedDirectoryTestCase.java @@ -22,7 +22,6 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; @@ -30,6 +29,7 @@ import org.apache.lucene.store.IndexOutput; import org.apache.lucene.store.MMapDirectory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java index ec7c9add8c0..832e2fc5fe0 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java @@ -128,6 +128,17 @@ import org.apache.lucene.store.MergeInfo; import org.apache.lucene.store.NRTCachingDirectory; import org.apache.lucene.tests.analysis.MockAnalyzer; +import org.apache.lucene.tests.index.AlcoholicMergePolicy; +import org.apache.lucene.tests.index.AssertingDirectoryReader; +import org.apache.lucene.tests.index.AssertingLeafReader; +import org.apache.lucene.tests.index.FieldFilterLeafReader; +import org.apache.lucene.tests.index.IndexWriterMaxDocsChanger; +import org.apache.lucene.tests.index.MergingCodecReader; +import org.apache.lucene.tests.index.MergingDirectoryReaderWrapper; +import org.apache.lucene.tests.index.MismatchedDirectoryReader; +import org.apache.lucene.tests.index.MismatchedLeafReader; +import org.apache.lucene.tests.index.MockIndexWriterEventListener; +import org.apache.lucene.tests.index.MockRandomMergePolicy; import org.apache.lucene.tests.mockfile.FilterPath; import org.apache.lucene.tests.mockfile.VirusCheckingFS; import org.apache.lucene.tests.search.AssertingIndexSearcher; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleSetupAndRestoreClassEnv.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleSetupAndRestoreClassEnv.java index 9a8f8c637c6..8d9767586f6 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleSetupAndRestoreClassEnv.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleSetupAndRestoreClassEnv.java @@ -40,7 +40,6 @@ import org.apache.lucene.codecs.PostingsFormat; import org.apache.lucene.codecs.lucene90.Lucene90Codec; import org.apache.lucene.codecs.simpletext.SimpleTextCodec; -import org.apache.lucene.index.RandomCodec; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.tests.codecs.asserting.AssertingCodec; import org.apache.lucene.tests.codecs.asserting.AssertingDocValuesFormat; @@ -48,6 +47,7 @@ import org.apache.lucene.tests.codecs.cheapbastard.CheapBastardCodec; import org.apache.lucene.tests.codecs.compressing.CompressingCodec; import org.apache.lucene.tests.codecs.mockrandom.MockRandomPostingsFormat; +import org.apache.lucene.tests.index.RandomCodec; import org.apache.lucene.tests.search.similarities.AssertingSimilarity; import org.apache.lucene.tests.search.similarities.RandomSimilarity; import org.apache.lucene.tests.util.LuceneTestCase.LiveIWCFlushMode; diff --git a/lucene/test-framework/src/test/org/apache/lucene/tests/analysis/TestMockAnalyzer.java b/lucene/test-framework/src/test/org/apache/lucene/tests/analysis/TestMockAnalyzer.java index 83296cc08c6..792d58766a7 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/tests/analysis/TestMockAnalyzer.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/analysis/TestMockAnalyzer.java @@ -34,9 +34,9 @@ import org.apache.lucene.index.IndexOptions; import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.PostingsEnum; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.tests.util.automaton.AutomatonTestUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingDocValuesFormat.java b/lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingDocValuesFormat.java index 55f7b7aa912..423ead245c1 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingDocValuesFormat.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingDocValuesFormat.java @@ -17,7 +17,7 @@ package org.apache.lucene.tests.codecs.asserting; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.index.BaseDocValuesFormatTestCase; +import org.apache.lucene.tests.index.BaseDocValuesFormatTestCase; /** Test AssertingDocValuesFormat directly */ public class TestAssertingDocValuesFormat extends BaseDocValuesFormatTestCase { diff --git a/lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingNormsFormat.java b/lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingNormsFormat.java index 2a464f0517c..85039b001a1 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingNormsFormat.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingNormsFormat.java @@ -17,7 +17,7 @@ package org.apache.lucene.tests.codecs.asserting; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.index.BaseNormsFormatTestCase; +import org.apache.lucene.tests.index.BaseNormsFormatTestCase; /** Test AssertingNormsFormat directly */ public class TestAssertingNormsFormat extends BaseNormsFormatTestCase { diff --git a/lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingPointsFormat.java b/lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingPointsFormat.java index bfe717f7189..e25747c986c 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingPointsFormat.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingPointsFormat.java @@ -17,7 +17,7 @@ package org.apache.lucene.tests.codecs.asserting; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.index.BasePointsFormatTestCase; +import org.apache.lucene.tests.index.BasePointsFormatTestCase; /** Test AssertingPointsFormat directly */ public class TestAssertingPointsFormat extends BasePointsFormatTestCase { diff --git a/lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingPostingsFormat.java b/lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingPostingsFormat.java index 8661c52405e..2509cc2379b 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingPostingsFormat.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingPostingsFormat.java @@ -17,7 +17,7 @@ package org.apache.lucene.tests.codecs.asserting; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.index.BasePostingsFormatTestCase; +import org.apache.lucene.tests.index.BasePostingsFormatTestCase; /** Test AssertingPostingsFormat directly */ public class TestAssertingPostingsFormat extends BasePostingsFormatTestCase { diff --git a/lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingStoredFieldsFormat.java b/lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingStoredFieldsFormat.java index 687eb5ba846..7f2a8c53a7e 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingStoredFieldsFormat.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingStoredFieldsFormat.java @@ -17,7 +17,7 @@ package org.apache.lucene.tests.codecs.asserting; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.index.BaseStoredFieldsFormatTestCase; +import org.apache.lucene.tests.index.BaseStoredFieldsFormatTestCase; /** Test AssertingStoredFieldsFormat directly */ public class TestAssertingStoredFieldsFormat extends BaseStoredFieldsFormatTestCase { diff --git a/lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingTermVectorsFormat.java b/lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingTermVectorsFormat.java index 0f8f0b7e9b3..7a1c187cc97 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingTermVectorsFormat.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/codecs/asserting/TestAssertingTermVectorsFormat.java @@ -17,7 +17,7 @@ package org.apache.lucene.tests.codecs.asserting; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.index.BaseTermVectorsFormatTestCase; +import org.apache.lucene.tests.index.BaseTermVectorsFormatTestCase; /** Test AssertingTermVectorsFormat directly */ public class TestAssertingTermVectorsFormat extends BaseTermVectorsFormatTestCase { diff --git a/lucene/test-framework/src/test/org/apache/lucene/index/TestAssertingLeafReader.java b/lucene/test-framework/src/test/org/apache/lucene/tests/index/TestAssertingLeafReader.java similarity index 87% rename from lucene/test-framework/src/test/org/apache/lucene/index/TestAssertingLeafReader.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/index/TestAssertingLeafReader.java index 3227d8364c8..676030ed47d 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/index/TestAssertingLeafReader.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/index/TestAssertingLeafReader.java @@ -14,10 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.index; +package org.apache.lucene.tests.index; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; +import org.apache.lucene.index.DirectoryReader; +import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexWriter; +import org.apache.lucene.index.LeafReaderContext; +import org.apache.lucene.index.NoMergePolicy; +import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.util.IOUtils; diff --git a/lucene/test-framework/src/test/org/apache/lucene/index/TestForceMergePolicy.java b/lucene/test-framework/src/test/org/apache/lucene/tests/index/TestForceMergePolicy.java old mode 100755 new mode 100644 similarity index 89% rename from lucene/test-framework/src/test/org/apache/lucene/index/TestForceMergePolicy.java rename to lucene/test-framework/src/test/org/apache/lucene/tests/index/TestForceMergePolicy.java index 4236ecf5512..611c03c68b9 --- a/lucene/test-framework/src/test/org/apache/lucene/index/TestForceMergePolicy.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/index/TestForceMergePolicy.java @@ -14,8 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.index; +package org.apache.lucene.tests.index; +import org.apache.lucene.index.MergePolicy; +import org.apache.lucene.index.SegmentInfos; import org.apache.lucene.tests.util.LuceneTestCase; public class TestForceMergePolicy extends LuceneTestCase { diff --git a/lucene/test-framework/src/test/org/apache/lucene/tests/store/TestMockDirectoryWrapper.java b/lucene/test-framework/src/test/org/apache/lucene/tests/store/TestMockDirectoryWrapper.java index c2687458add..f4a7d9d0ee8 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/tests/store/TestMockDirectoryWrapper.java +++ b/lucene/test-framework/src/test/org/apache/lucene/tests/store/TestMockDirectoryWrapper.java @@ -22,7 +22,6 @@ import java.nio.file.NoSuchFileException; import java.nio.file.Path; import org.apache.lucene.document.Document; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.ByteArrayDataInput; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; @@ -30,6 +29,7 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; +import org.apache.lucene.tests.index.RandomIndexWriter; // See: https://issues.apache.org/jira/browse/SOLR-12028 Tests cannot remove files on Windows // machines occasionally From 4a28ddabe617c6a1ee2c5bfa14a7d930342f8044 Mon Sep 17 00:00:00 2001 From: Dawid Weiss Date: Sun, 19 Dec 2021 22:13:47 +0100 Subject: [PATCH 14/32] Use public api instead of pkg-private method --- .../org/apache/lucene/index/IndexWriter.java | 4 -- .../lucene/index/TestDirectoryReader.java | 12 ++-- .../lucene/index/TestDocValuesIndexing.java | 20 +++--- .../apache/lucene/index/TestFieldInfos.java | 8 +-- .../lucene/index/TestFilterCodecReader.java | 2 +- .../org/apache/lucene/index/TestFlex.java | 4 +- .../lucene/index/TestForceMergeForever.java | 2 +- .../apache/lucene/index/TestIndexSorting.java | 12 ++-- .../apache/lucene/index/TestIndexWriter.java | 26 +++---- .../lucene/index/TestIndexWriterDelete.java | 4 +- .../lucene/index/TestIndexWriterMaxDocs.java | 2 +- .../index/TestIndexWriterMergePolicy.java | 10 +-- .../index/TestIndexWriterNRTIsCurrent.java | 2 +- .../lucene/index/TestIndexWriterReader.java | 70 +++++++++---------- .../lucene/index/TestIndexWriterUnicode.java | 2 +- .../index/TestMixedDocValuesUpdates.java | 14 ++-- .../apache/lucene/index/TestMultiFields.java | 6 +- .../index/TestNRTReaderWithThreads.java | 4 +- .../apache/lucene/index/TestNRTThreads.java | 6 +- .../apache/lucene/index/TestOrdinalMap.java | 2 +- .../lucene/index/TestPendingSoftDeletes.java | 2 +- .../lucene/index/TestPerSegmentDeletes.java | 4 +- .../apache/lucene/index/TestPointValues.java | 2 +- .../TestSoftDeletesRetentionMergePolicy.java | 32 ++++----- .../lucene/index/TestStressDeletes.java | 2 +- .../lucene/index/TestStressIndexing2.java | 2 +- .../apache/lucene/index/TestTermVectors.java | 4 +- .../lucene/index/TestTieredMergePolicy.java | 6 +- .../index/BaseKnnVectorsFormatTestCase.java | 22 +++--- .../tests/index/BaseMergePolicyTestCase.java | 3 +- .../index/BaseStoredFieldsFormatTestCase.java | 2 +- 31 files changed, 145 insertions(+), 148 deletions(-) diff --git a/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java b/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java index 580ea73a0a5..83347a7fc6b 100644 --- a/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java +++ b/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java @@ -448,10 +448,6 @@ public void onTicketBacklog() { } }; - DirectoryReader getReader() throws IOException { - return getReader(true, false); - } - /** * Expert: returns a readonly reader, covering all committed as well as un-committed changes to * the index. This provides "near real-time" searching, in that changes made during an IndexWriter diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java b/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java index 143cd144051..89b3b42677a 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java @@ -876,7 +876,7 @@ public void testTotalTermFreqCached() throws Exception { Document d = new Document(); d.add(newTextField("f", "a a b", Field.Store.NO)); writer.addDocument(d); - DirectoryReader r = writer.getReader(); + DirectoryReader r = DirectoryReader.open(writer); writer.close(); try { // Make sure codec impls totalTermFreq (eg PreFlex doesn't) @@ -899,7 +899,7 @@ public void testGetSumDocFreq() throws Exception { d = new Document(); d.add(newTextField("f", "b", Field.Store.NO)); writer.addDocument(d); - DirectoryReader r = writer.getReader(); + DirectoryReader r = DirectoryReader.open(writer); writer.close(); try { // Make sure codec impls getSumDocFreq (eg PreFlex doesn't) @@ -920,7 +920,7 @@ public void testGetDocCount() throws Exception { d = new Document(); d.add(newTextField("f", "a", Field.Store.NO)); writer.addDocument(d); - DirectoryReader r = writer.getReader(); + DirectoryReader r = DirectoryReader.open(writer); writer.close(); try { // Make sure codec impls getSumDocFreq (eg PreFlex doesn't) @@ -941,7 +941,7 @@ public void testGetSumTotalTermFreq() throws Exception { d = new Document(); d.add(newTextField("f", "a a b", Field.Store.NO)); writer.addDocument(d); - DirectoryReader r = writer.getReader(); + DirectoryReader r = DirectoryReader.open(writer); writer.close(); try { // Make sure codec impls getSumDocFreq (eg PreFlex doesn't) @@ -965,7 +965,7 @@ public void testReaderFinishedListener() throws Exception { writer.commit(); writer.addDocument(new Document()); writer.commit(); - final DirectoryReader reader = writer.getReader(); + final DirectoryReader reader = DirectoryReader.open(writer); final int[] closeCount = new int[1]; final IndexReader.ClosedListener listener = new IndexReader.ClosedListener() { @@ -996,7 +996,7 @@ public void testOOBDocID() throws Exception { Directory dir = newDirectory(); IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random()))); writer.addDocument(new Document()); - DirectoryReader r = writer.getReader(); + DirectoryReader r = DirectoryReader.open(writer); writer.close(); r.document(0); expectThrows( diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java b/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java index 26f28bf32e7..9f8def1a864 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java @@ -178,7 +178,7 @@ public void testLengthPrefixAcrossTwoPages() throws Exception { bytes[0] = 1; w.addDocument(doc); w.forceMerge(1); - DirectoryReader r = w.getReader(); + DirectoryReader r = DirectoryReader.open(w); SortedDocValues s = DocValues.getSorted(getOnlyLeafReader(r), "field"); assertEquals(0, s.nextDoc()); BytesRef bytes1 = s.lookupOrd(s.ordValue()); @@ -207,7 +207,7 @@ public void testDocValuesUnstored() throws IOException { doc.add(new TextField("docId", "" + i, Field.Store.YES)); writer.addDocument(doc); } - DirectoryReader r = writer.getReader(); + DirectoryReader r = DirectoryReader.open(writer); FieldInfos fi = FieldInfos.getMergedFieldInfos(r); FieldInfo dvInfo = fi.fieldInfo("dv"); assertTrue(dvInfo.getDocValuesType() != DocValuesType.NONE); @@ -240,7 +240,7 @@ public void testMixedTypesSameDocument() throws Exception { w.addDocument(doc); }); - IndexReader ir = w.getReader(); + IndexReader ir = DirectoryReader.open(w); assertEquals(1, ir.numDocs()); ir.close(); w.close(); @@ -263,7 +263,7 @@ public void testMixedTypesDifferentDocuments() throws Exception { w.addDocument(doc2); }); - IndexReader ir = w.getReader(); + IndexReader ir = DirectoryReader.open(w); assertEquals(1, ir.numDocs()); ir.close(); w.close(); @@ -289,7 +289,7 @@ public void testAddSortedTwice() throws IOException { iwriter.addDocument(doc); }); - IndexReader ir = iwriter.getReader(); + IndexReader ir = DirectoryReader.open(iwriter); assertEquals(1, ir.numDocs()); ir.close(); iwriter.close(); @@ -315,7 +315,7 @@ public void testAddBinaryTwice() throws IOException { iwriter.addDocument(doc); }); - IndexReader ir = iwriter.getReader(); + IndexReader ir = DirectoryReader.open(iwriter); assertEquals(1, ir.numDocs()); ir.close(); @@ -342,7 +342,7 @@ public void testAddNumericTwice() throws IOException { iwriter.addDocument(doc); }); - IndexReader ir = iwriter.getReader(); + IndexReader ir = DirectoryReader.open(iwriter); assertEquals(1, ir.numDocs()); ir.close(); iwriter.close(); @@ -372,7 +372,7 @@ public void testTooLargeSortedBytes() throws IOException { iwriter.addDocument(hugeDoc); }); - IndexReader ir = iwriter.getReader(); + IndexReader ir = DirectoryReader.open(iwriter); assertEquals(1, ir.numDocs()); ir.close(); iwriter.close(); @@ -402,7 +402,7 @@ public void testTooLargeTermSortedSetBytes() throws IOException { iwriter.addDocument(hugeDoc); }); - IndexReader ir = iwriter.getReader(); + IndexReader ir = DirectoryReader.open(iwriter); assertEquals(1, ir.numDocs()); ir.close(); iwriter.close(); @@ -640,7 +640,7 @@ public void testIllegalTypeChange() throws Exception { writer.addDocument(doc2); }); - IndexReader ir = writer.getReader(); + IndexReader ir = DirectoryReader.open(writer); assertEquals(1, ir.numDocs()); ir.close(); writer.close(); diff --git a/lucene/core/src/test/org/apache/lucene/index/TestFieldInfos.java b/lucene/core/src/test/org/apache/lucene/index/TestFieldInfos.java index dcf1272e6d4..f446613c04e 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestFieldInfos.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestFieldInfos.java @@ -125,7 +125,7 @@ public void testFieldAttributes() throws Exception { writer.commit(); writer.forceMerge(1); - IndexReader reader = writer.getReader(); + IndexReader reader = DirectoryReader.open(writer); FieldInfos fis = FieldInfos.getMergedFieldInfos(reader); assertEquals(fis.size(), 2); Iterator it = fis.iterator(); @@ -180,7 +180,7 @@ public void testFieldAttributesSingleSegment() throws Exception { writer.addDocument(d2); writer.commit(); - IndexReader reader = writer.getReader(); + IndexReader reader = DirectoryReader.open(writer); FieldInfos fis = FieldInfos.getMergedFieldInfos(reader); // test that attributes for f1 are introduced by d1, @@ -203,7 +203,7 @@ public void testMergedFieldInfos_empty() throws IOException { Directory dir = newDirectory(); IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random()))); - IndexReader reader = writer.getReader(); + IndexReader reader = DirectoryReader.open(writer); FieldInfos actual = FieldInfos.getMergedFieldInfos(reader); FieldInfos expected = FieldInfos.EMPTY; @@ -230,7 +230,7 @@ public void testMergedFieldInfos_singleLeaf() throws IOException { writer.forceMerge(1); - IndexReader reader = writer.getReader(); + IndexReader reader = DirectoryReader.open(writer); FieldInfos actual = FieldInfos.getMergedFieldInfos(reader); FieldInfos expected = reader.leaves().get(0).reader().getFieldInfos(); diff --git a/lucene/core/src/test/org/apache/lucene/index/TestFilterCodecReader.java b/lucene/core/src/test/org/apache/lucene/index/TestFilterCodecReader.java index 1c61139257a..e1416b022c6 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestFilterCodecReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestFilterCodecReader.java @@ -34,7 +34,7 @@ public void testGetDelegate() throws IOException { try (Directory dir = newDirectory(); IndexWriter w = new IndexWriter(dir, newIndexWriterConfig())) { w.addDocument(new Document()); - try (DirectoryReader reader = w.getReader()) { + try (DirectoryReader reader = DirectoryReader.open(w)) { FilterCodecReader r = FilterCodecReader.wrapLiveDocs( (CodecReader) reader.getSequentialSubReaders().get(0), null, 1); diff --git a/lucene/core/src/test/org/apache/lucene/index/TestFlex.java b/lucene/core/src/test/org/apache/lucene/index/TestFlex.java index bb6dec94b07..aa4f700eb3c 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestFlex.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestFlex.java @@ -53,7 +53,7 @@ public void testNonFlex() throws Exception { w.forceMerge(1); } - IndexReader r = w.getReader(); + IndexReader r = DirectoryReader.open(w); TermsEnum terms = MultiTerms.getTerms(r, "field3").iterator(); assertEquals(TermsEnum.SeekStatus.END, terms.seekCeil(new BytesRef("abc"))); @@ -75,7 +75,7 @@ public void testTermOrd() throws Exception { doc.add(newTextField("f", "a b c", Field.Store.NO)); w.addDocument(doc); w.forceMerge(1); - DirectoryReader r = w.getReader(); + DirectoryReader r = DirectoryReader.open(w); TermsEnum terms = getOnlyLeafReader(r).terms("f").iterator(); assertTrue(terms.next() != null); try { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestForceMergeForever.java b/lucene/core/src/test/org/apache/lucene/index/TestForceMergeForever.java index 96cac192560..78514b2c3ed 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestForceMergeForever.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestForceMergeForever.java @@ -91,7 +91,7 @@ public void run() { w.updateDocument( new Term("docid", "" + random().nextInt(numStartDocs)), docs.nextDoc()); // Force deletes to apply - w.getReader().close(); + DirectoryReader.open(w).close(); } } catch (Throwable t) { throw new RuntimeException(t); diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java index 6197c9a7ddc..7f7f5117cb5 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java @@ -1734,7 +1734,7 @@ public void testRandom1() throws IOException { doc.add(new NumericDocValuesField("id", i)); w.addDocument(doc); if (random().nextInt(5) == 0) { - w.getReader().close(); + DirectoryReader.open(w).close(); } else if (random().nextInt(30) == 0) { w.forceMerge(2); } else if (random().nextInt(4) == 0) { @@ -1745,7 +1745,7 @@ public void testRandom1() throws IOException { } // Check that segments are sorted - DirectoryReader reader = w.getReader(); + DirectoryReader reader = DirectoryReader.open(w); for (LeafReaderContext ctx : reader.leaves()) { final SegmentReader leaf = (SegmentReader) ctx.reader(); SegmentInfo info = leaf.getSegmentInfo().info; @@ -1807,7 +1807,7 @@ public void testMultiValuedRandom1() throws IOException { doc.add(new NumericDocValuesField("id", i)); w.addDocument(doc); if (random().nextInt(5) == 0) { - w.getReader().close(); + DirectoryReader.open(w).close(); } else if (random().nextInt(30) == 0) { w.forceMerge(2); } else if (random().nextInt(4) == 0) { @@ -1817,7 +1817,7 @@ public void testMultiValuedRandom1() throws IOException { } } - DirectoryReader reader = w.getReader(); + DirectoryReader reader = DirectoryReader.open(w); // Now check that the index is consistent IndexSearcher searcher = newSearcher(reader); for (int i = 0; i < numDocs; ++i) { @@ -2094,7 +2094,7 @@ public void testBadAddIndexes() throws Exception { } IndexWriter w2 = new IndexWriter(dir2, iwc2); w2.addDocument(new Document()); - final IndexReader reader = w2.getReader(); + final IndexReader reader = DirectoryReader.open(w2); w2.close(); IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> w.addIndexes(dir2)); @@ -2159,7 +2159,7 @@ public void testAddIndexes(boolean withDeletes, boolean useReaders) throws Excep } else { w2.addIndexes(dir); } - final IndexReader reader2 = w2.getReader(); + final IndexReader reader2 = DirectoryReader.open(w2); final IndexSearcher searcher = newSearcher(reader); final IndexSearcher searcher2 = newSearcher(reader2); for (int i = 0; i < numDocs; ++i) { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java index d0bd164feed..e1ae2b25899 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java @@ -1304,7 +1304,7 @@ public void testDeleteUnusedFiles() throws Exception { DirectoryReader r; if (iter == 0) { // use NRT - r = w.getReader(); + r = DirectoryReader.open(w); } else { // don't use NRT w.commit(); @@ -1693,18 +1693,18 @@ public void testNRTReaderVersion() throws Exception { Document doc = new Document(); doc.add(newStringField("id", "0", Field.Store.YES)); w.addDocument(doc); - DirectoryReader r = w.getReader(); + DirectoryReader r = DirectoryReader.open(w); long version = r.getVersion(); r.close(); w.addDocument(doc); - r = w.getReader(); + r = DirectoryReader.open(w); long version2 = r.getVersion(); r.close(); assert (version2 > version); w.deleteDocuments(new Term("id", "0")); - r = w.getReader(); + r = DirectoryReader.open(w); w.close(); long version3 = r.getVersion(); r.close(); @@ -2108,7 +2108,7 @@ public void testIterableFieldThrowsException() throws IOException { } } } - DirectoryReader reader = w.getReader(); + DirectoryReader reader = DirectoryReader.open(w); assertEquals(docCount, reader.numDocs()); List leaves = reader.leaves(); for (LeafReaderContext leafReaderContext : leaves) { @@ -2156,7 +2156,7 @@ public void testIterableThrowsException() throws IOException { } } } - DirectoryReader reader = w.getReader(); + DirectoryReader reader = DirectoryReader.open(w); assertEquals(docCount, reader.numDocs()); List leaves = reader.leaves(); for (LeafReaderContext leafReaderContext : leaves) { @@ -2406,7 +2406,7 @@ public void testDeleteSameTermAcrossFields() throws Exception { // match field a's "foo": w.deleteDocuments(new Term("a", "xxx")); w.deleteDocuments(new Term("b", "foo")); - IndexReader r = w.getReader(); + IndexReader r = DirectoryReader.open(w); w.close(); // Make sure document was not (incorrectly) deleted: @@ -2929,7 +2929,7 @@ public void testWithPendingDeletions() throws Exception { .setIndexDeletionPolicy(NoDeletionPolicy.INSTANCE); IndexWriter w = new IndexWriter(dir, iwc); w.commit(); - reader = w.getReader(); + reader = DirectoryReader.open(w); // we pull this commit to open it again later to check that we fail if a future file delete is // pending indexCommit = reader.getIndexCommit(); @@ -3599,7 +3599,7 @@ public IndexOutput createOutput(String name, IOContext context) throws IOExcepti } }); t.start(); - try (IndexReader reader = writer.getReader()) { + try (IndexReader reader = DirectoryReader.open(writer)) { assertEquals(1, reader.numDocs()); } ; @@ -3657,7 +3657,7 @@ public void testSegmentInfoIsSnapshot() throws IOException { d = new Document(); d.add(new StringField("id", "doc-1", Field.Store.YES)); writer.addDocument(d); - DirectoryReader reader = writer.getReader(); + DirectoryReader reader = DirectoryReader.open(writer); SegmentCommitInfo segmentInfo = ((SegmentReader) reader.leaves().get(0).reader()).getSegmentInfo(); SegmentCommitInfo originalInfo = @@ -4273,7 +4273,7 @@ public void testMaxCompletedSequenceNumber() throws IOException, InterruptedExce assertEquals(6, writer.commit()); assertEquals(6, writer.getMaxCompletedSequenceNumber()); assertEquals(7, writer.addDocument(new Document())); - writer.getReader().close(); + DirectoryReader.open(writer).close(); // getReader moves seqNo by 2 since there is one DWPT that could still be in-flight assertEquals(9, writer.getMaxCompletedSequenceNumber()); } @@ -4383,7 +4383,7 @@ protected boolean isEnableTestPoints() { new Thread( () -> { try { - writer.getReader().close(); + DirectoryReader.open(writer).close(); } catch (IOException e) { throw new AssertionError(e); } @@ -4579,7 +4579,7 @@ public MergeSpecification findFullFlushMerges( w.commit(); w.updateDocument(new Term("id", "1"), d); w.commit(); - try (DirectoryReader reader = w.getReader()) { + try (DirectoryReader reader = DirectoryReader.open(w)) { assertEquals(1, reader.numDocs()); } IOUtils.close(w, dir); diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java index 6efe8d27833..2115dc0cb72 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java @@ -451,7 +451,7 @@ public void testDeleteAllNRT() throws IOException { } modifier.commit(); - IndexReader reader = modifier.getReader(); + IndexReader reader = DirectoryReader.open(modifier); assertEquals(7, reader.numDocs()); reader.close(); @@ -461,7 +461,7 @@ public void testDeleteAllNRT() throws IOException { // Delete all modifier.deleteAll(); - reader = modifier.getReader(); + reader = DirectoryReader.open(modifier); assertEquals(0, reader.numDocs()); reader.close(); diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMaxDocs.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMaxDocs.java index 9abe2763354..23e5a2613c2 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMaxDocs.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMaxDocs.java @@ -528,7 +528,7 @@ public void testDeleteAllAfterFlush() throws Exception { Directory dir = newDirectory(); IndexWriter w = new IndexWriter(dir, new IndexWriterConfig(null)); w.addDocument(new Document()); - w.getReader().close(); + DirectoryReader.open(w).close(); w.addDocument(new Document()); expectThrows( IllegalArgumentException.class, diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java index 39bce4c0880..1176a993f2f 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java @@ -384,7 +384,7 @@ public void testMergeOnCommit() throws IOException { assertEquals(1, mergedReader.leaves().size()); mergedReader.close(); - try (IndexReader reader = writerWithMergePolicy.getReader()) { + try (IndexReader reader = DirectoryReader.open(writerWithMergePolicy)) { IndexSearcher searcher = new IndexSearcher(reader); assertEquals(6, reader.numDocs()); assertEquals(6, searcher.count(new MatchAllDocsQuery())); @@ -593,7 +593,7 @@ public synchronized void merge( boolean success = false; try { if (useGetReader) { - writer.getReader().close(); + DirectoryReader.open(writer).close(); } else { writer.commit(); } @@ -650,7 +650,7 @@ public void merge(MergeSource mergeSource, MergeTrigger trigger) Thread t = new Thread( () -> { - try (DirectoryReader reader = writer.getReader()) { + try (DirectoryReader reader = DirectoryReader.open(writer)) { assertEquals(2, reader.maxDoc()); } catch (IOException e) { throw new AssertionError(e); @@ -696,7 +696,7 @@ protected void doAfterFlush() throws IOException { writer.addDocument(d2); writer.flush(); mergeAndFail.set(true); - try (DirectoryReader reader = writer.getReader()) { + try (DirectoryReader reader = DirectoryReader.open(writer)) { assertNotNull(reader); // make compiler happy and use the reader fail(); } catch (RuntimeException e) { @@ -832,7 +832,7 @@ public void testMergeOnGetReader() throws IOException { } TestIndexWriter.addDoc(writerWithMergePolicy); - try (DirectoryReader mergedReader = writerWithMergePolicy.getReader()) { + try (DirectoryReader mergedReader = DirectoryReader.open(writerWithMergePolicy)) { // Doc added, do merge on getReader. assertEquals(1, mergedReader.leaves().size()); } diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterNRTIsCurrent.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterNRTIsCurrent.java index 08a215b1c4d..156a87c8eeb 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterNRTIsCurrent.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterNRTIsCurrent.java @@ -90,7 +90,7 @@ public void run() { Document doc = new Document(); doc.add(new TextField("id", "1", Field.Store.NO)); writer.addDocument(doc); - holder.reader = currentReader = writer.getReader(); + holder.reader = currentReader = DirectoryReader.open(writer); Term term = new Term("id"); for (int i = 0; i < numOps && !holder.stop; i++) { float nextOp = random.nextFloat(); diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java index 902d36d963c..248890dffd5 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java @@ -83,7 +83,7 @@ public void testAddCloseOpen() throws IOException { IndexWriter writer = new IndexWriter(dir1, iwc); for (int i = 0; i < 97; i++) { - DirectoryReader reader = writer.getReader(); + DirectoryReader reader = DirectoryReader.open(writer); if (i == 0) { writer.addDocument(DocHelper.createDocument(i, "x", 1 + random().nextInt(5))); } else { @@ -109,13 +109,13 @@ public void testAddCloseOpen() throws IOException { reader.close(); } writer.forceMerge(1); // make sure all merging is done etc. - DirectoryReader reader = writer.getReader(); + DirectoryReader reader = DirectoryReader.open(writer); writer.commit(); // no changes that are not visible to the reader // A commit is now seen as a change to an NRT reader: assertFalse(reader.isCurrent()); reader.close(); - reader = writer.getReader(); + reader = DirectoryReader.open(writer); assertTrue(reader.isCurrent()); writer.close(); @@ -152,7 +152,7 @@ public void testUpdateDocument() throws Exception { // writer.flush(false, true, true); // get a reader - DirectoryReader r1 = writer.getReader(); + DirectoryReader r1 = DirectoryReader.open(writer); assertTrue(r1.isCurrent()); String id10 = r1.document(10).getField("id").stringValue(); @@ -164,7 +164,7 @@ public void testUpdateDocument() throws Exception { assertFalse(r1.isCurrent()); System.out.println("TEST: now get reader"); - DirectoryReader r2 = writer.getReader(); + DirectoryReader r2 = DirectoryReader.open(writer); assertTrue(r2.isCurrent()); assertEquals(0, count(new Term("id", id10), r2)); if (VERBOSE) { @@ -216,7 +216,7 @@ public void testIsCurrent() throws IOException { writer = new IndexWriter(dir, iwc); doc = new Document(); doc.add(newTextField("field", "a b c", Field.Store.NO)); - DirectoryReader nrtReader = writer.getReader(); + DirectoryReader nrtReader = DirectoryReader.open(writer); assertTrue(nrtReader.isCurrent()); writer.addDocument(doc); assertFalse(nrtReader.isCurrent()); // should see the changes @@ -225,7 +225,7 @@ public void testIsCurrent() throws IOException { nrtReader.close(); DirectoryReader dirReader = DirectoryReader.open(dir); - nrtReader = writer.getReader(); + nrtReader = DirectoryReader.open(writer); assertTrue(dirReader.isCurrent()); assertTrue(nrtReader.isCurrent()); // nothing was committed yet so we are still current @@ -266,13 +266,13 @@ public void testAddIndexes() throws Exception { createIndexNoClose(!doFullMerge, "index2", writer2); writer2.close(); - DirectoryReader r0 = writer.getReader(); + DirectoryReader r0 = DirectoryReader.open(writer); assertTrue(r0.isCurrent()); writer.addIndexes(dir2); assertFalse(r0.isCurrent()); r0.close(); - DirectoryReader r1 = writer.getReader(); + DirectoryReader r1 = DirectoryReader.open(writer); assertTrue(r1.isCurrent()); writer.commit(); @@ -321,7 +321,7 @@ public void testAddIndexes2() throws Exception { writer.addIndexes(dir2); writer.addIndexes(dir2); - IndexReader r1 = writer.getReader(); + IndexReader r1 = DirectoryReader.open(writer); assertEquals(500, r1.maxDoc()); r1.close(); @@ -343,13 +343,13 @@ public void testDeleteFromIndexWriter() throws Exception { createIndexNoClose(!doFullMerge, "index1", writer); writer.flush(false, true); // get a reader - IndexReader r1 = writer.getReader(); + IndexReader r1 = DirectoryReader.open(writer); String id10 = r1.document(10).getField("id").stringValue(); // deleted IW docs should not show up in the next getReader writer.deleteDocuments(new Term("id", id10)); - IndexReader r2 = writer.getReader(); + IndexReader r2 = DirectoryReader.open(writer); assertEquals(1, count(new Term("id", id10), r1)); assertEquals(0, count(new Term("id", id10), r2)); @@ -358,13 +358,13 @@ public void testDeleteFromIndexWriter() throws Exception { writer.deleteDocuments(new Term("id", id50)); - IndexReader r3 = writer.getReader(); + IndexReader r3 = DirectoryReader.open(writer); assertEquals(0, count(new Term("id", id10), r3)); assertEquals(0, count(new Term("id", id50), r3)); String id75 = r1.document(75).getField("id").stringValue(); writer.deleteDocuments(new TermQuery(new Term("id", id75))); - IndexReader r4 = writer.getReader(); + IndexReader r4 = DirectoryReader.open(writer); assertEquals(1, count(new Term("id", id75), r3)); assertEquals(0, count(new Term("id", id75), r4)); @@ -379,7 +379,7 @@ public void testDeleteFromIndexWriter() throws Exception { new IndexWriter( dir1, newIndexWriterConfig(new MockAnalyzer(random())).setMaxFullFlushMergeWaitMillis(0)); - IndexReader w2r1 = writer.getReader(); + IndexReader w2r1 = DirectoryReader.open(writer); assertEquals(0, count(new Term("id", id10), w2r1)); w2r1.close(); writer.close(); @@ -556,15 +556,15 @@ public void doTestIndexWriterReopenSegment(boolean doFullMerge) throws Exception new IndexWriter( dir1, newIndexWriterConfig(new MockAnalyzer(random())).setMaxFullFlushMergeWaitMillis(0)); - IndexReader r1 = writer.getReader(); + IndexReader r1 = DirectoryReader.open(writer); assertEquals(0, r1.maxDoc()); createIndexNoClose(false, "index1", writer); writer.flush(!doFullMerge, true); - IndexReader iwr1 = writer.getReader(); + IndexReader iwr1 = DirectoryReader.open(writer); assertEquals(100, iwr1.maxDoc()); - IndexReader r2 = writer.getReader(); + IndexReader r2 = DirectoryReader.open(writer); assertEquals(r2.maxDoc(), 100); // add 100 documents for (int x = 10000; x < 10000 + 100; x++) { @@ -573,11 +573,11 @@ public void doTestIndexWriterReopenSegment(boolean doFullMerge) throws Exception } writer.flush(false, true); // verify the reader was reopened internally - IndexReader iwr2 = writer.getReader(); + IndexReader iwr2 = DirectoryReader.open(writer); assertTrue(iwr2 != r1); assertEquals(200, iwr2.maxDoc()); // should have flushed out a segment - IndexReader r3 = writer.getReader(); + IndexReader r3 = DirectoryReader.open(writer); assertTrue(r2 != r3); assertEquals(200, r3.maxDoc()); @@ -595,7 +595,7 @@ public void doTestIndexWriterReopenSegment(boolean doFullMerge) throws Exception new IndexWriter( dir1, newIndexWriterConfig(new MockAnalyzer(random())).setMaxFullFlushMergeWaitMillis(0)); - IndexReader w2r1 = writer.getReader(); + IndexReader w2r1 = DirectoryReader.open(writer); // insure the deletes were actually flushed to the directory assertEquals(200, w2r1.maxDoc()); w2r1.close(); @@ -657,7 +657,7 @@ public void testMergeWarmer() throws Exception { createIndexNoClose(false, "test", writer); // get a reader to put writer into near real-time mode - IndexReader r1 = writer.getReader(); + IndexReader r1 = DirectoryReader.open(writer); ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(2); @@ -693,7 +693,7 @@ public void testAfterCommit() throws Exception { createIndexNoClose(false, "test", writer); // get a reader to put writer into near real-time mode - DirectoryReader r1 = writer.getReader(); + DirectoryReader r1 = DirectoryReader.open(writer); TestUtil.checkIndex(dir1); writer.commit(); TestUtil.checkIndex(dir1); @@ -726,7 +726,7 @@ public void testAfterClose() throws Exception { // create the index createIndexNoClose(false, "test", writer); - DirectoryReader r = writer.getReader(); + DirectoryReader r = DirectoryReader.open(writer); writer.close(); TestUtil.checkIndex(dir1); @@ -767,7 +767,7 @@ public void testDuringAddIndexes() throws Exception { dirs[i] = new MockDirectoryWrapper(random(), TestUtil.ramCopyOf(dir1)); } - DirectoryReader r = writer.getReader(); + DirectoryReader r = DirectoryReader.open(writer); final int numIterations = 10; final List excs = Collections.synchronizedList(new ArrayList()); @@ -864,7 +864,7 @@ public void testDuringAddDelete() throws Exception { createIndexNoClose(false, "test", writer); writer.commit(); - DirectoryReader r = writer.getReader(); + DirectoryReader r = DirectoryReader.open(writer); final int iters = TEST_NIGHTLY ? 1000 : 10; final List excs = Collections.synchronizedList(new ArrayList<>()); @@ -951,7 +951,7 @@ public void testForceMergeDeletes() throws Throwable { w.addDocument(doc); w.deleteDocuments(new Term("id", "0")); - IndexReader r = w.getReader(); + IndexReader r = DirectoryReader.open(w); w.forceMergeDeletes(); w.close(); r.close(); @@ -973,17 +973,17 @@ public void testDeletesNumDocs() throws Throwable { w.addDocument(doc); id.setStringValue("1"); w.addDocument(doc); - IndexReader r = w.getReader(); + IndexReader r = DirectoryReader.open(w); assertEquals(2, r.numDocs()); r.close(); w.deleteDocuments(new Term("id", "0")); - r = w.getReader(); + r = DirectoryReader.open(w); assertEquals(1, r.numDocs()); r.close(); w.deleteDocuments(new Term("id", "1")); - r = w.getReader(); + r = DirectoryReader.open(w); assertEquals(0, r.numDocs()); r.close(); @@ -995,7 +995,7 @@ public void testEmptyIndex() throws Exception { // Ensures that getReader works on an empty index, which hasn't been committed yet. Directory dir = newDirectory(); IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random()))); - IndexReader r = w.getReader(); + IndexReader r = DirectoryReader.open(w); assertEquals(0, r.numDocs()); r.close(); w.close(); @@ -1078,7 +1078,7 @@ public void testReopenAfterNoRealChange() throws Exception { new IndexWriter( d, newIndexWriterConfig(new MockAnalyzer(random())).setMaxFullFlushMergeWaitMillis(0)); - DirectoryReader r = w.getReader(); // start pooling readers + DirectoryReader r = DirectoryReader.open(w); // start pooling readers DirectoryReader r2 = DirectoryReader.openIfChanged(r); assertNull(r2); @@ -1139,7 +1139,7 @@ public void eval(MockDirectoryWrapper dir) throws IOException { // create a segment and open an NRT reader writer.addDocument(new Document()); - writer.getReader().close(); + DirectoryReader.open(writer).close(); // add a new document so a new NRT reader is required writer.addDocument(new Document()); @@ -1152,7 +1152,7 @@ public void eval(MockDirectoryWrapper dir) throws IOException { expectThrows( FakeIOException.class, () -> { - writer.getReader().close(); + DirectoryReader.open(writer).close(); }); } @@ -1251,7 +1251,7 @@ public void testIndexReaderWriterWithLeafSorter() throws IOException { // Test1: test that leafReaders are sorted according to leafSorter provided in IndexWriterConfig { - try (DirectoryReader reader = writer.getReader()) { + try (DirectoryReader reader = DirectoryReader.open(writer)) { assertLeavesSorted(reader, leafSorter); // add more documents that should be sorted first diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java index 85fbbb93234..23c02715c17 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java @@ -234,7 +234,7 @@ public void testEmbeddedFFFF() throws Throwable { doc = new Document(); doc.add(newTextField("field", "a", Field.Store.NO)); w.addDocument(doc); - IndexReader r = w.getReader(); + IndexReader r = DirectoryReader.open(w); assertEquals(1, r.docFreq(new Term("field", "a\uffffb"))); r.close(); w.close(); diff --git a/lucene/core/src/test/org/apache/lucene/index/TestMixedDocValuesUpdates.java b/lucene/core/src/test/org/apache/lucene/index/TestMixedDocValuesUpdates.java index edc82f6197e..6e284e734a9 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestMixedDocValuesUpdates.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestMixedDocValuesUpdates.java @@ -469,7 +469,7 @@ public void testTryUpdateDocValues() throws IOException { writer, new NumericDocValuesField("numericId", doc + 1), new BinaryDocValuesField("binaryId", new BytesRef(new byte[] {(byte) (doc + 1)}))); - IndexReader reader = writer.getReader(); + IndexReader reader = DirectoryReader.open(writer); NumericDocValues numericIdValues = null; BinaryDocValues binaryIdValues = null; for (LeafReaderContext c : reader.leaves()) { @@ -556,7 +556,7 @@ public void testTryUpdateMultiThreaded() for (Thread t : threads) { t.join(); } - try (DirectoryReader reader = writer.getReader()) { + try (DirectoryReader reader = DirectoryReader.open(writer)) { for (int i = 0; i < locks.length; i++) { locks[i].lock(); try { @@ -588,7 +588,7 @@ public void testTryUpdateMultiThreaded() static void doUpdate(Term doc, IndexWriter writer, Field... fields) throws IOException { long seqId = -1; do { // retry if we just committing a merge - try (DirectoryReader reader = writer.getReader()) { + try (DirectoryReader reader = DirectoryReader.open(writer)) { TopDocs topDocs = new IndexSearcher(reader).search(new TermQuery(doc), 10); assertEquals(1, topDocs.totalHits.value); int theDoc = topDocs.scoreDocs[0].doc; @@ -610,7 +610,7 @@ public void testResetValue() throws Exception { if (random().nextBoolean()) { writer.commit(); } - try (DirectoryReader reader = writer.getReader()) { + try (DirectoryReader reader = DirectoryReader.open(writer)) { assertEquals(1, reader.leaves().size()); LeafReader r = reader.leaves().get(0).reader(); NumericDocValues ndv = r.getNumericDocValues("val"); @@ -625,7 +625,7 @@ public void testResetValue() throws Exception { } writer.updateDocValues(new Term("id", "0"), new BinaryDocValuesField("val-bin", null)); - try (DirectoryReader reader = writer.getReader()) { + try (DirectoryReader reader = DirectoryReader.open(writer)) { assertEquals(1, reader.leaves().size()); LeafReader r = reader.leaves().get(0).reader(); NumericDocValues ndv = r.getNumericDocValues("val"); @@ -671,7 +671,7 @@ public void testResetValueMultipleDocs() throws Exception { numHits++; } } - try (DirectoryReader reader = writer.getReader()) { + try (DirectoryReader reader = DirectoryReader.open(writer)) { IndexSearcher searcher = new IndexSearcher(reader); TopDocs is_live = searcher.search(new DocValuesFieldExistsQuery("is_live"), 5); @@ -733,7 +733,7 @@ public void testUpdateFieldWithNoPreviousDocValuesThrowsError() throws IOExcepti doc.add(new StringField("id", "1", Store.YES)); writer.addDocument(doc); if (random().nextBoolean()) { - try (DirectoryReader reader = writer.getReader()) { + try (DirectoryReader reader = DirectoryReader.open(writer)) { NumericDocValues id = reader.leaves().get(0).reader().getNumericDocValues("id"); assertNull(id); } diff --git a/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java b/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java index bbe0d57558e..3a4a901dc4f 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java @@ -126,7 +126,7 @@ public boolean keepFullyDeletedSegment( } } - IndexReader reader = w.getReader(); + IndexReader reader = DirectoryReader.open(w); w.close(); if (VERBOSE) { System.out.println("TEST: reader=" + reader); @@ -182,7 +182,7 @@ public void testSeparateEnums() throws Exception { w.addDocument(d); w.commit(); w.addDocument(d); - IndexReader r = w.getReader(); + IndexReader r = DirectoryReader.open(w); w.close(); PostingsEnum d1 = TestUtil.docs(random(), r, "f", new BytesRef("j"), null, PostingsEnum.NONE); PostingsEnum d2 = TestUtil.docs(random(), r, "f", new BytesRef("j"), null, PostingsEnum.NONE); @@ -200,7 +200,7 @@ public void testTermDocsEnum() throws Exception { w.addDocument(d); w.commit(); w.addDocument(d); - IndexReader r = w.getReader(); + IndexReader r = DirectoryReader.open(w); w.close(); PostingsEnum de = MultiTerms.getTermPostingsEnum(r, "f", new BytesRef("j"), (int) PostingsEnum.FREQS); diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java b/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java index 39f22e006a3..20720363055 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java @@ -40,7 +40,7 @@ public void testIndexing() throws Exception { newIndexWriterConfig(new MockAnalyzer(random())) .setMaxBufferedDocs(10) .setMergePolicy(newLogMergePolicy(false, 2)))); - IndexReader reader = writer.getReader(); // start pooling readers + IndexReader reader = DirectoryReader.open(writer); // start pooling readers reader.close(); int numThreads = TEST_NIGHTLY ? 4 : 2; int numIterations = TEST_NIGHTLY ? 2000 : 50; @@ -94,7 +94,7 @@ public void run() { } else if (type == 1) { // we may or may not delete because the term may not exist, // however we're opening and closing the reader rapidly - IndexReader reader = writer.getReader(); + IndexReader reader = DirectoryReader.open(writer); int id = r.nextInt(seq.intValue()); Term term = new Term("id", Integer.toString(id)); int count = TestIndexWriterReader.count(term, reader); diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNRTThreads.java b/lucene/core/src/test/org/apache/lucene/index/TestNRTThreads.java index 4b768e5cd39..86278809283 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestNRTThreads.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNRTThreads.java @@ -112,7 +112,7 @@ protected void doAfterWriter(ExecutorService es) throws Exception { // Force writer to do reader pooling, always, so that // all merged segments, even for merges before // doSearching is called, are warmed: - writer.getReader().close(); + DirectoryReader.open(writer).close(); } private IndexSearcher fixedSearcher; @@ -135,13 +135,13 @@ protected IndexSearcher getFinalSearcher() throws Exception { final IndexReader r2; if (useNonNrtReaders) { if (random().nextBoolean()) { - r2 = writer.getReader(); + r2 = DirectoryReader.open(writer); } else { writer.commit(); r2 = DirectoryReader.open(dir); } } else { - r2 = writer.getReader(); + r2 = DirectoryReader.open(writer); } return newSearcher(r2); } diff --git a/lucene/core/src/test/org/apache/lucene/index/TestOrdinalMap.java b/lucene/core/src/test/org/apache/lucene/index/TestOrdinalMap.java index d8e6417d4b5..faa2aae329f 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestOrdinalMap.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestOrdinalMap.java @@ -135,7 +135,7 @@ public void testOneSegmentWithAllValues() throws IOException { } iw.commit(); - DirectoryReader r = iw.getReader(); + DirectoryReader r = DirectoryReader.open(iw); SortedDocValues sdv = MultiDocValues.getSortedValues(r, "sdv"); assertNotNull(sdv); assertTrue(sdv instanceof MultiDocValues.MultiSortedDocValues); diff --git a/lucene/core/src/test/org/apache/lucene/index/TestPendingSoftDeletes.java b/lucene/core/src/test/org/apache/lucene/index/TestPendingSoftDeletes.java index ecd3795dcef..14b6d4cdfa7 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestPendingSoftDeletes.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestPendingSoftDeletes.java @@ -174,7 +174,7 @@ public void testApplyUpdates() throws IOException { } writer.forceMerge(1); writer.commit(); - DirectoryReader reader = writer.getReader(); + DirectoryReader reader = DirectoryReader.open(writer); assertEquals(1, reader.leaves().size()); SegmentReader segmentReader = (SegmentReader) reader.leaves().get(0).reader(); PendingSoftDeletes deletes = newPendingDeletes(commitInfo); diff --git a/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java b/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java index 3f12fc898c9..c6f79f5ecaa 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java @@ -75,7 +75,7 @@ public void testDeletes1() throws Exception { // get reader flushes pending deletes // so there should not be anymore - IndexReader r1 = writer.getReader(); + IndexReader r1 = DirectoryReader.open(writer); assertFalse(writer.hasChangesInRam()); r1.close(); @@ -94,7 +94,7 @@ public void testDeletes1() throws Exception { // id:2 shouldn't exist anymore because // it's been applied in the merge and now it's gone - IndexReader r2 = writer.getReader(); + IndexReader r2 = DirectoryReader.open(writer); int[] id2docs = toDocsArray(new Term("id", "2"), null, r2); assertTrue(id2docs == null); r2.close(); diff --git a/lucene/core/src/test/org/apache/lucene/index/TestPointValues.java b/lucene/core/src/test/org/apache/lucene/index/TestPointValues.java index db46eb7a407..334db5dccc2 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestPointValues.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestPointValues.java @@ -645,7 +645,7 @@ public void testDeleteAllPointDocs() throws Exception { w.deleteDocuments(new Term("id", "0")); w.forceMerge(1); - DirectoryReader r = w.getReader(); + DirectoryReader r = DirectoryReader.open(w); assertNull(r.leaves().get(0).reader().getPointValues("int")); w.close(); r.close(); diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSoftDeletesRetentionMergePolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestSoftDeletesRetentionMergePolicy.java index 332c9320276..2418a42a9a8 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSoftDeletesRetentionMergePolicy.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSoftDeletesRetentionMergePolicy.java @@ -73,7 +73,7 @@ public void testForceMergeFullyDeleted() throws IOException { doc.add(new StringField("id", "2", Field.Store.YES)); doc.add(new NumericDocValuesField("soft_delete", 1)); writer.addDocument(doc); - DirectoryReader reader = writer.getReader(); + DirectoryReader reader = DirectoryReader.open(writer); { assertEquals(2, reader.leaves().size()); final SegmentReader segmentReader = (SegmentReader) reader.leaves().get(0).reader(); @@ -89,7 +89,7 @@ public void testForceMergeFullyDeleted() throws IOException { writer.forceMerge(1); reader.close(); } - reader = writer.getReader(); + reader = DirectoryReader.open(writer); { assertEquals(1, reader.leaves().size()); SegmentReader segmentReader = (SegmentReader) reader.leaves().get(0).reader(); @@ -122,7 +122,7 @@ public void testKeepFullyDeletedSegments() throws IOException { doc.add(new StringField("id", "1", Field.Store.YES)); doc.add(new NumericDocValuesField("soft_delete", 1)); writer.addDocument(doc); - DirectoryReader reader = writer.getReader(); + DirectoryReader reader = DirectoryReader.open(writer); assertEquals(1, reader.leaves().size()); MergePolicy policy = new SoftDeletesRetentionMergePolicy( @@ -139,7 +139,7 @@ public void testKeepFullyDeletedSegments() throws IOException { doc.add(new NumericDocValuesField("soft_delete", 1)); writer.addDocument(doc); - DirectoryReader reader1 = writer.getReader(); + DirectoryReader reader1 = DirectoryReader.open(writer); assertEquals(2, reader1.leaves().size()); assertFalse( policy.keepFullyDeletedSegment(() -> (SegmentReader) reader1.leaves().get(0).reader())); @@ -218,7 +218,7 @@ public void testFieldBasedRetention() throws IOException { writer.flush(); } writer.forceMerge(1); - DirectoryReader reader = writer.getReader(); + DirectoryReader reader = DirectoryReader.open(writer); assertEquals(1, reader.numDocs()); assertEquals(3, reader.maxDoc()); Set versions = new HashSet<>(); @@ -258,7 +258,7 @@ public void testKeepAllDocsAcrossMerges() throws IOException { writer.softUpdateDocument( new Term("id", "1"), doc, new NumericDocValuesField("soft_delete", 1)); writer.commit(); - DirectoryReader reader = writer.getReader(); + DirectoryReader reader = DirectoryReader.open(writer); assertEquals(0, reader.numDocs()); assertEquals(3, reader.maxDoc()); assertEquals(0, writer.getDocStats().numDocs); @@ -266,7 +266,7 @@ public void testKeepAllDocsAcrossMerges() throws IOException { assertEquals(3, reader.leaves().size()); reader.close(); writer.forceMerge(1); - reader = writer.getReader(); + reader = DirectoryReader.open(writer); assertEquals(0, reader.numDocs()); assertEquals(3, reader.maxDoc()); assertEquals(0, writer.getDocStats().numDocs); @@ -479,7 +479,7 @@ public void testDropFullySoftDeletedSegment() throws Exception { writer.deleteDocuments(new Term("id", "1")); } writer.commit(); - IndexReader reader = writer.getReader(); + IndexReader reader = DirectoryReader.open(writer); assertEquals(reader.numDocs(), 1); reader.close(); assertEquals(1, writer.cloneSegmentInfos().size()); @@ -567,7 +567,7 @@ public void testDeleteDocWhileMergeThatIsSoftDeleted() throws IOException { } writer.flush(); - DirectoryReader reader = writer.getReader(); + DirectoryReader reader = DirectoryReader.open(writer); writer.softUpdateDocument( new Term("id", "0"), new Document(), new NumericDocValuesField(softDelete, 1)); writer.flush(); @@ -611,12 +611,12 @@ public void testUndeleteDocument() throws IOException { d.add(new StringField("id", "1", Field.Store.YES)); writer.addDocument(d); writer.updateDocValues(new Term("id", "0"), new NumericDocValuesField("soft_delete", 1)); - try (IndexReader reader = writer.getReader()) { + try (IndexReader reader = DirectoryReader.open(writer)) { assertEquals(2, reader.maxDoc()); assertEquals(1, reader.numDocs()); } doUpdate(new Term("id", "0"), writer, new NumericDocValuesField("soft_delete", null)); - try (IndexReader reader = writer.getReader()) { + try (IndexReader reader = DirectoryReader.open(writer)) { assertEquals(2, reader.maxDoc()); assertEquals(2, reader.numDocs()); } @@ -641,12 +641,12 @@ public void testMergeSoftDeleteAndHardDelete() throws Exception { d.add(new StringField("id", "1", Field.Store.YES)); d.add(new NumericDocValuesField("soft_delete", 1)); writer.addDocument(d); - try (DirectoryReader reader = writer.getReader()) { + try (DirectoryReader reader = DirectoryReader.open(writer)) { assertEquals(2, reader.maxDoc()); assertEquals(1, reader.numDocs()); } while (true) { - try (DirectoryReader reader = writer.getReader()) { + try (DirectoryReader reader = DirectoryReader.open(writer)) { TopDocs topDocs = new IndexSearcher(new IncludeSoftDeletesWrapper(reader)) .search(new TermQuery(new Term("id", "1")), 1); @@ -736,7 +736,7 @@ public void testMixedSoftDeletesAndHardDeletes() throws Exception { liveDocs.remove(delId); } } - try (DirectoryReader unwrapped = writer.getReader()) { + try (DirectoryReader unwrapped = DirectoryReader.open(writer)) { DirectoryReader reader = new IncludeSoftDeletesWrapper(unwrapped); assertEquals(liveDocs.size(), reader.numDocs()); } @@ -780,7 +780,7 @@ public void testRewriteRetentionQuery() throws Exception { static void doUpdate(Term doc, IndexWriter writer, Field... fields) throws IOException { long seqId = -1; do { // retry if we just committing a merge - try (DirectoryReader reader = writer.getReader()) { + try (DirectoryReader reader = DirectoryReader.open(writer)) { TopDocs topDocs = new IndexSearcher(new IncludeSoftDeletesWrapper(reader)).search(new TermQuery(doc), 10); assertEquals(1, topDocs.totalHits.value); @@ -793,7 +793,7 @@ static void doUpdate(Term doc, IndexWriter writer, Field... fields) throws IOExc static void doDelete(Term doc, IndexWriter writer) throws IOException { long seqId; do { // retry if we just committing a merge - try (DirectoryReader reader = writer.getReader()) { + try (DirectoryReader reader = DirectoryReader.open(writer)) { TopDocs topDocs = new IndexSearcher(new IncludeSoftDeletesWrapper(reader)).search(new TermQuery(doc), 10); assertEquals(1, topDocs.totalHits.value); diff --git a/lucene/core/src/test/org/apache/lucene/index/TestStressDeletes.java b/lucene/core/src/test/org/apache/lucene/index/TestStressDeletes.java index 9faa85550e3..ceecf32928d 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestStressDeletes.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestStressDeletes.java @@ -104,7 +104,7 @@ public void run() { thread.join(); } - IndexReader r = w.getReader(); + IndexReader r = DirectoryReader.open(w); IndexSearcher s = newSearcher(r); for (Map.Entry ent : exists.entrySet()) { int id = ent.getKey(); diff --git a/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java b/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java index fe865822498..e219944f71a 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java @@ -64,7 +64,7 @@ public void testRandomIWReader() throws Throwable { // TODO: verify equals using IW.getReader DocsAndWriter dw = indexRandomIWReader(5, 3, 100, dir); - DirectoryReader reader = dw.writer.getReader(); + DirectoryReader reader = DirectoryReader.open(dw.writer); dw.writer.commit(); verifyEquals(random(), reader, dir, "id"); reader.close(); diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTermVectors.java b/lucene/core/src/test/org/apache/lucene/index/TestTermVectors.java index 196504f56ec..7f4bae3d663 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTermVectors.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTermVectors.java @@ -153,7 +153,7 @@ public void testMergeWithPayloads() throws Exception { writer.addDocument(doc); } - IndexReader reader1 = writer.getReader(); + IndexReader reader1 = DirectoryReader.open(writer); assertEquals(2, reader1.leaves().size()); assertEquals( hasPayloads, @@ -163,7 +163,7 @@ public void testMergeWithPayloads() throws Exception { reader1.leaves().get(1).reader().getFieldInfos().fieldInfo("c").hasPayloads()); writer.forceMerge(1); - IndexReader reader2 = writer.getReader(); + IndexReader reader2 = DirectoryReader.open(writer); assertEquals(1, reader2.leaves().size()); // assert that in the merged segments payloads set up for the field assertTrue(reader2.leaves().get(0).reader().getFieldInfos().fieldInfo("c").hasPayloads()); diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java index a7b67768cd8..dfec4c566cc 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java @@ -242,7 +242,7 @@ public void testForceMergeDeletesMaxSegSize() throws Exception { } w.forceMerge(1); - IndexReader r = w.getReader(); + IndexReader r = DirectoryReader.open(w); assertEquals(numDocs, r.maxDoc()); assertEquals(numDocs, r.numDocs()); r.close(); @@ -253,14 +253,14 @@ public void testForceMergeDeletesMaxSegSize() throws Exception { w.deleteDocuments(new Term("id", "" + (42 + 17))); - r = w.getReader(); + r = DirectoryReader.open(w); assertEquals(numDocs, r.maxDoc()); assertEquals(numDocs - 1, r.numDocs()); r.close(); w.forceMergeDeletes(); - r = w.getReader(); + r = DirectoryReader.open(w); assertEquals(numDocs - 1, r.maxDoc()); assertEquals(numDocs - 1, r.numDocs()); r.close(); diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseKnnVectorsFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseKnnVectorsFormatTestCase.java index 6518de53632..8d90fdc87f9 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseKnnVectorsFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseKnnVectorsFormatTestCase.java @@ -228,7 +228,7 @@ public void testAddIndexesDirectory0() throws Exception { try (IndexWriter w2 = new IndexWriter(dir2, newIndexWriterConfig())) { w2.addIndexes(dir); w2.forceMerge(1); - try (IndexReader reader = w2.getReader()) { + try (IndexReader reader = DirectoryReader.open(w2)) { LeafReader r = getOnlyLeafReader(reader); VectorValues vectorValues = r.getVectorValues(fieldName); assertEquals(0, vectorValues.nextDoc()); @@ -252,7 +252,7 @@ public void testAddIndexesDirectory1() throws Exception { w2.addDocument(doc); w2.addIndexes(dir); w2.forceMerge(1); - try (IndexReader reader = w2.getReader()) { + try (IndexReader reader = DirectoryReader.open(w2)) { LeafReader r = getOnlyLeafReader(reader); VectorValues vectorValues = r.getVectorValues(fieldName); assertNotEquals(NO_MORE_DOCS, vectorValues.nextDoc()); @@ -278,7 +278,7 @@ public void testAddIndexesDirectory01() throws Exception { w2.addDocument(doc); w2.addIndexes(dir); w2.forceMerge(1); - try (IndexReader reader = w2.getReader()) { + try (IndexReader reader = DirectoryReader.open(w2)) { LeafReader r = getOnlyLeafReader(reader); VectorValues vectorValues = r.getVectorValues(fieldName); assertEquals(0, vectorValues.nextDoc()); @@ -548,14 +548,14 @@ public void testDeleteAllVectorDocs() throws Exception { w.addDocument(new Document()); w.commit(); - try (DirectoryReader r = w.getReader()) { + try (DirectoryReader r = DirectoryReader.open(w)) { VectorValues values = getOnlyLeafReader(r).getVectorValues("v"); assertNotNull(values); assertEquals(1, values.size()); } w.deleteDocuments(new Term("id", "0")); w.forceMerge(1); - try (DirectoryReader r = w.getReader()) { + try (DirectoryReader r = DirectoryReader.open(w)) { VectorValues values = getOnlyLeafReader(r).getVectorValues("v"); assertNotNull(values); assertEquals(0, values.size()); @@ -650,7 +650,7 @@ public void testIndexedValueNotAliased() throws Exception { doc3.add(new KnnVectorField(fieldName, v, VectorSimilarityFunction.EUCLIDEAN)); iw.addDocument(doc3); iw.forceMerge(1); - try (IndexReader reader = iw.getReader()) { + try (IndexReader reader = DirectoryReader.open(iw)) { LeafReader r = getOnlyLeafReader(reader); VectorValues vectorValues = r.getVectorValues(fieldName); vectorValues.nextDoc(); @@ -674,7 +674,7 @@ public void testSortedIndex() throws Exception { add(iw, fieldName, 3, 3, null); add(iw, fieldName, 2, 2, new float[] {1, 0}); iw.forceMerge(1); - try (IndexReader reader = iw.getReader()) { + try (IndexReader reader = DirectoryReader.open(iw)) { LeafReader leaf = getOnlyLeafReader(reader); VectorValues vectorValues = leaf.getVectorValues(fieldName); @@ -714,7 +714,7 @@ public void testIndexMultipleKnnVectorFields() throws Exception { "field3", new float[] {1, 2, 3}, VectorSimilarityFunction.DOT_PRODUCT)); iw.addDocument(doc); iw.forceMerge(1); - try (IndexReader reader = iw.getReader()) { + try (IndexReader reader = DirectoryReader.open(iw)) { LeafReader leaf = reader.leaves().get(0).reader(); VectorValues vectorValues = leaf.getVectorValues("field1"); @@ -791,7 +791,7 @@ public void testRandom() throws Exception { } } int numDeletes = 0; - try (IndexReader reader = iw.getReader()) { + try (IndexReader reader = DirectoryReader.open(iw)) { int valueCount = 0, totalSize = 0; for (LeafReaderContext ctx : reader.leaves()) { VectorValues vectorValues = ctx.reader().getVectorValues(fieldName); @@ -847,7 +847,7 @@ public void testRandomWithUpdatesAndGraph() throws Exception { id2ord[id] = i; add(iw, fieldName, id, value, VectorSimilarityFunction.EUCLIDEAN); } - try (IndexReader reader = iw.getReader()) { + try (IndexReader reader = DirectoryReader.open(iw)) { for (LeafReaderContext ctx : reader.leaves()) { Bits liveDocs = ctx.reader().getLiveDocs(); VectorValues vectorValues = ctx.reader().getVectorValues(fieldName); @@ -989,7 +989,7 @@ public void testAdvance() throws Exception { w.addDocument(doc); } w.forceMerge(1); - try (IndexReader reader = w.getReader()) { + try (IndexReader reader = DirectoryReader.open(w)) { LeafReader r = getOnlyLeafReader(reader); VectorValues vectorValues = r.getVectorValues(fieldName); int[] vectorDocs = new int[vectorValues.size() + 1]; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseMergePolicyTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseMergePolicyTestCase.java index 7427e6b8273..f58b2cbe69f 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseMergePolicyTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseMergePolicyTestCase.java @@ -28,6 +28,7 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.function.ToIntFunction; import org.apache.lucene.document.Document; +import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.FilterMergePolicy; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; @@ -110,7 +111,7 @@ public synchronized void merge(MergeSource mergeSource, MergeTrigger trigger) for (int j = 0; j < numDocs; ++j) { writer.addDocument(new Document()); } - writer.getReader().close(); + DirectoryReader.open(writer).close(); } for (int i = 5; i >= 0; --i) { final int segmentCount = writer.getSegmentCount(); diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseStoredFieldsFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseStoredFieldsFormatTestCase.java index d69ad447217..2149a310d1e 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseStoredFieldsFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseStoredFieldsFormatTestCase.java @@ -208,7 +208,7 @@ public void testStoredFieldsOrder() throws Throwable { doc.add(newField("aaa", "a b c", customType)); doc.add(newField("zzz", "1 2 3", customType)); w.addDocument(doc); - IndexReader r = maybeWrapWithMergingReader(w.getReader()); + IndexReader r = maybeWrapWithMergingReader(DirectoryReader.open(w)); Document doc2 = r.document(0); Iterator it = doc2.getFields().iterator(); assertTrue(it.hasNext()); From d304660fbfa924867c74042a981882442ab56abd Mon Sep 17 00:00:00 2001 From: Dawid Weiss Date: Sun, 19 Dec 2021 22:19:06 +0100 Subject: [PATCH 15/32] Make filter merge policy unwrappable. --- .../core/src/java/org/apache/lucene/index/CheckIndex.java | 6 +++++- .../java/org/apache/lucene/index/FilterMergePolicy.java | 8 +++++++- .../lucene/tests/index/BaseMergePolicyTestCase.java | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java b/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java index ca1a13fb65c..ceae4c41912 100644 --- a/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java +++ b/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java @@ -2285,7 +2285,11 @@ private static Status.TermIndexStatus checkFields( return status; } - /** @lucene.internal */ + /** + * For use in tests only. + * + * @lucene.internal + */ public static void checkImpacts(Impacts impacts, int lastTarget) { final int numLevels = impacts.numLevels(); if (numLevels < 1) { diff --git a/lucene/core/src/java/org/apache/lucene/index/FilterMergePolicy.java b/lucene/core/src/java/org/apache/lucene/index/FilterMergePolicy.java index d37f6f4dc2b..8a5e3901c40 100644 --- a/lucene/core/src/java/org/apache/lucene/index/FilterMergePolicy.java +++ b/lucene/core/src/java/org/apache/lucene/index/FilterMergePolicy.java @@ -19,13 +19,14 @@ import java.io.IOException; import java.util.Map; import org.apache.lucene.util.IOSupplier; +import org.apache.lucene.util.Unwrappable; /** * A wrapper for {@link MergePolicy} instances. * * @lucene.experimental */ -public class FilterMergePolicy extends MergePolicy { +public class FilterMergePolicy extends MergePolicy implements Unwrappable { /** The wrapped {@link MergePolicy}. */ protected final MergePolicy in; @@ -118,4 +119,9 @@ public int numDeletesToMerge( throws IOException { return in.numDeletesToMerge(info, delCount, readerSupplier); } + + @Override + public MergePolicy unwrap() { + return in; + } } diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseMergePolicyTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseMergePolicyTestCase.java index f58b2cbe69f..8fd131714cd 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseMergePolicyTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseMergePolicyTestCase.java @@ -135,7 +135,7 @@ public void testFindForcedDeletesMerges() throws IOException { if (mp instanceof FilterMergePolicy) { assumeFalse( "test doesn't work with MockRandomMP", - ((FilterMergePolicy) mp).in instanceof MockRandomMergePolicy); + ((FilterMergePolicy) mp).unwrap() instanceof MockRandomMergePolicy); } SegmentInfos infos = new SegmentInfos(Version.LATEST.major); try (Directory directory = newDirectory()) { From 1cc0442b89f57c87091740b576b2b57b7904f114 Mon Sep 17 00:00:00 2001 From: Dawid Weiss Date: Mon, 20 Dec 2021 10:12:05 +0100 Subject: [PATCH 16/32] Exposed package-private internals via test secrets sub-package. --- .../index/ConcurrentMergeScheduler.java | 22 +++++++ .../org/apache/lucene/index/IndexReader.java | 10 +++- .../org/apache/lucene/index/IndexWriter.java | 54 +++++++++++++++++ .../apache/lucene/index/PackageSecrets.java | 58 +++++++++++++++++++ .../apache/lucene/index/SegmentReader.java | 24 +++++++- .../lucene/index/StandardDirectoryReader.java | 2 +- .../ConcurrentMergeSchedulerSecrets.java | 35 +++++++++++ .../internal/tests/IndexPackageSecrets.java | 49 ++++++++++++++++ .../internal/tests/IndexWriterSecrets.java | 51 ++++++++++++++++ .../internal/tests/SegmentReaderSecrets.java | 38 ++++++++++++ .../lucene/internal/tests/TestSecrets.java | 51 ++++++++++++++++ .../lucene/internal/tests/package-info.java | 23 ++++++++ .../index/BaseFieldInfoFormatTestCase.java | 47 ++++++++------- .../index/BaseIndexFileFormatTestCase.java | 5 +- .../tests/index/BaseMergePolicyTestCase.java | 3 +- .../tests/index/BasePointsFormatTestCase.java | 5 +- .../apache/lucene/tests/index/DocHelper.java | 3 +- .../index/IndexWriterMaxDocsChanger.java | 49 ---------------- .../tests/index/OwnCacheKeyMultiReader.java | 5 +- .../lucene/tests/index/RandomIndexWriter.java | 19 +++--- .../ThreadedIndexingAndSearchingTestCase.java | 18 +++--- .../lucene/tests/util/LuceneTestCase.java | 6 +- 22 files changed, 475 insertions(+), 102 deletions(-) create mode 100644 lucene/core/src/java/org/apache/lucene/index/PackageSecrets.java create mode 100644 lucene/core/src/java/org/apache/lucene/internal/tests/ConcurrentMergeSchedulerSecrets.java create mode 100644 lucene/core/src/java/org/apache/lucene/internal/tests/IndexPackageSecrets.java create mode 100644 lucene/core/src/java/org/apache/lucene/internal/tests/IndexWriterSecrets.java create mode 100644 lucene/core/src/java/org/apache/lucene/internal/tests/SegmentReaderSecrets.java create mode 100644 lucene/core/src/java/org/apache/lucene/internal/tests/TestSecrets.java create mode 100644 lucene/core/src/java/org/apache/lucene/internal/tests/package-info.java delete mode 100644 lucene/test-framework/src/java/org/apache/lucene/tests/index/IndexWriterMaxDocsChanger.java diff --git a/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java b/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java index d4acf03cf73..d3cdcba1d2c 100644 --- a/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java +++ b/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java @@ -22,6 +22,7 @@ import java.util.List; import java.util.Locale; import org.apache.lucene.index.MergePolicy.OneMerge; +import org.apache.lucene.internal.tests.ConcurrentMergeSchedulerSecrets; import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FilterDirectory; @@ -897,4 +898,25 @@ private static double bytesToMB(long bytes) { private static String getSegmentName(MergePolicy.OneMerge merge) { return merge.info != null ? merge.info.info.name : "_na_"; } + + /** + * This method returns a test accessor that exposes some internals to test infrastructure. + * Everything here is internal, subject to change without notice and not publicly accessible. + * + *

Within the test infrastructure, do not call this method directly, instead use the static + * factory methods on the corresponding {@code TestSecrets} class. + * + * @param accessToken A secret token to only permit instantiation via the corresponding secrets + * class. + * @return An instance of the secrets class; the return type is hidden from the public API. + * @lucene.internal + */ + public final Object getTestSecrets(Object accessToken) { + return new ConcurrentMergeSchedulerSecrets(accessToken) { + @Override + public void setSuppressExceptions() { + ConcurrentMergeScheduler.this.setSuppressExceptions(); + } + }; + } } diff --git a/lucene/core/src/java/org/apache/lucene/index/IndexReader.java b/lucene/core/src/java/org/apache/lucene/index/IndexReader.java index 4f60f905a1f..6a0fb033b76 100644 --- a/lucene/core/src/java/org/apache/lucene/index/IndexReader.java +++ b/lucene/core/src/java/org/apache/lucene/index/IndexReader.java @@ -26,7 +26,7 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.DocumentStoredFieldVisitor; import org.apache.lucene.store.AlreadyClosedException; -import org.apache.lucene.util.Bits; // javadocs +import org.apache.lucene.util.Bits; /** * IndexReader is an abstract class, providing an interface for accessing a point-in-time view of an @@ -171,8 +171,12 @@ public final void registerParentReader(IndexReader reader) { parentReaders.add(reader); } - // overridden by StandardDirectoryReader and SegmentReader - void notifyReaderClosedListeners() throws IOException { + /** + * For test framework use only. + * + * @lucene.internal + */ + protected void notifyReaderClosedListeners() throws IOException { // nothing to notify in the base impl } diff --git a/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java b/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java index 83347a7fc6b..94ba483ff23 100644 --- a/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java +++ b/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java @@ -55,6 +55,7 @@ import org.apache.lucene.index.DocValuesUpdate.NumericDocValuesUpdate; import org.apache.lucene.index.FieldInfos.FieldNumbers; import org.apache.lucene.index.IndexWriterConfig.OpenMode; +import org.apache.lucene.internal.tests.IndexWriterSecrets; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.search.DocValuesFieldExistsQuery; import org.apache.lucene.search.MatchAllDocsQuery; @@ -6273,4 +6274,57 @@ void enable() { mergesEnabled = true; } } + + /** + * This method returns a test accessor that exposes some of index writer internals to test + * infrastructure. Everything here is internal, subject to change without notice and not publicly + * accessible. + * + *

Within the test infrastructure, do not call this method directly, instead use the static + * factory methods on the corresponding {@code TestSecrets} class. + * + * @param accessToken A secret token to only permit instantiation via the corresponding secrets + * class. + * @return An instance of the secrets class; the return type is hidden from the public API. + * @lucene.internal + */ + public final Object getTestSecrets(Object accessToken) { + return new IndexWriterSecrets(accessToken) { + @Override + public String segString() { + return IndexWriter.this.segString(); + } + + @Override + public int getSegmentCount() { + return IndexWriter.this.getSegmentCount(); + } + + @Override + public boolean isClosed() { + return IndexWriter.this.isClosed(); + } + + @Override + public DirectoryReader getReader(boolean applyDeletions, boolean writeAllDeletes) + throws IOException { + return IndexWriter.this.getReader(applyDeletions, writeAllDeletes); + } + + @Override + public int getDocWriterThreadPoolSize() { + return IndexWriter.this.docWriter.perThreadPool.size(); + } + + @Override + public boolean isDeleterClosed() { + return IndexWriter.this.isDeleterClosed(); + } + + @Override + public SegmentCommitInfo newestSegment() { + return IndexWriter.this.newestSegment(); + } + }; + } } diff --git a/lucene/core/src/java/org/apache/lucene/index/PackageSecrets.java b/lucene/core/src/java/org/apache/lucene/index/PackageSecrets.java new file mode 100644 index 00000000000..7519ee0f314 --- /dev/null +++ b/lucene/core/src/java/org/apache/lucene/index/PackageSecrets.java @@ -0,0 +1,58 @@ +package org.apache.lucene.index; + +import org.apache.lucene.internal.tests.IndexPackageSecrets; + +/** + * Exposes certain package-private secrets to the test framework. + * + * @lucene.internal + */ +public final class PackageSecrets { + private PackageSecrets() {} + + /** + * This method returns a test accessor that exposes some internals to test infrastructure. + * Everything here is internal, subject to change without notice and not publicly accessible. + * + *

Within the test infrastructure, do not call this method directly, instead use the static + * factory methods on the corresponding {@code TestSecrets} class. + * + * @param accessToken A secret token to only permit instantiation via the corresponding secrets + * class. + * @return An instance of the secrets class; the return type is hidden from the public API. + * @lucene.internal + */ + public static final Object getTestSecrets(Object accessToken) { + return new IndexPackageSecrets(accessToken) { + + @Override + public IndexReader.CacheKey newCacheKey() { + return new IndexReader.CacheKey(); + } + + @Override + public void setIndexWriterMaxDocs(int limit) { + IndexWriter.setMaxDocs(limit); + } + + @Override + public FieldInfosBuilder newFieldInfosBuilder(String softDeletesFieldName) { + return new FieldInfosBuilder() { + private FieldInfos.Builder builder = + new FieldInfos.Builder(new FieldInfos.FieldNumbers(softDeletesFieldName)); + + @Override + public FieldInfosBuilder add(FieldInfo fi) { + builder.add(fi); + return this; + } + + @Override + public FieldInfos finish() { + return builder.finish(); + } + }; + } + }; + } +} diff --git a/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java b/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java index a66b29a8f5d..2bb0b8d7df4 100644 --- a/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java +++ b/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java @@ -29,6 +29,7 @@ import org.apache.lucene.codecs.PointsReader; import org.apache.lucene.codecs.StoredFieldsReader; import org.apache.lucene.codecs.TermVectorsReader; +import org.apache.lucene.internal.tests.SegmentReaderSecrets; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.util.Bits; @@ -311,7 +312,7 @@ public Directory directory() { private final Set readerClosedListeners = new CopyOnWriteArraySet<>(); @Override - void notifyReaderClosedListeners() throws IOException { + protected void notifyReaderClosedListeners() throws IOException { synchronized (readerClosedListeners) { IOUtils.applyToAll(readerClosedListeners, l -> l.onClose(readerCacheHelper.getKey())); } @@ -393,4 +394,25 @@ public void checkIntegrity() throws IOException { core.cfsReader.checkIntegrity(); } } + + /** + * This method returns a test accessor that exposes class internals to test infrastructure. + * Everything here is internal, subject to change without notice and not publicly accessible. + * + *

Within the test infrastructure, do not call this method directly, instead use the static + * factory methods on the corresponding {@code TestSecrets} class. + * + * @param accessToken A secret token to only permit instantiation via the corresponding secrets + * class. + * @return An instance of the secrets class; the return type is hidden from the public API. + * @lucene.internal + */ + public Object getTestSecrets(Object accessToken) { + return new SegmentReaderSecrets(accessToken) { + @Override + public Object getCore() { + return SegmentReader.this.core; + } + }; + } } diff --git a/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java b/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java index e5051af29fd..fd929457cf2 100644 --- a/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java +++ b/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java @@ -579,7 +579,7 @@ public void addClosedListener(ClosedListener listener) { }; @Override - void notifyReaderClosedListeners() throws IOException { + protected void notifyReaderClosedListeners() throws IOException { synchronized (readerClosedListeners) { IOUtils.applyToAll(readerClosedListeners, l -> l.onClose(cacheHelper.getKey())); } diff --git a/lucene/core/src/java/org/apache/lucene/internal/tests/ConcurrentMergeSchedulerSecrets.java b/lucene/core/src/java/org/apache/lucene/internal/tests/ConcurrentMergeSchedulerSecrets.java new file mode 100644 index 00000000000..322b38a6498 --- /dev/null +++ b/lucene/core/src/java/org/apache/lucene/internal/tests/ConcurrentMergeSchedulerSecrets.java @@ -0,0 +1,35 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.lucene.internal.tests; + +/** + * Access to {@link org.apache.lucene.index.ConcurrentMergeScheduler} internals exposed to the test + * framework. + * + * @lucene.internal + */ +public abstract class ConcurrentMergeSchedulerSecrets { + static final Object PRIVATE_ACCESS_TOKEN = new Object(); + + protected ConcurrentMergeSchedulerSecrets(Object accessToken) { + if (accessToken != PRIVATE_ACCESS_TOKEN) { + throw new RuntimeException("Use static factory methods to instantiate the secrets accessor."); + } + } + + public abstract void setSuppressExceptions(); +} diff --git a/lucene/core/src/java/org/apache/lucene/internal/tests/IndexPackageSecrets.java b/lucene/core/src/java/org/apache/lucene/internal/tests/IndexPackageSecrets.java new file mode 100644 index 00000000000..b0efac81389 --- /dev/null +++ b/lucene/core/src/java/org/apache/lucene/internal/tests/IndexPackageSecrets.java @@ -0,0 +1,49 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.lucene.internal.tests; + +import org.apache.lucene.index.FieldInfo; +import org.apache.lucene.index.FieldInfos; +import org.apache.lucene.index.IndexReader; + +/** + * Access to {@link org.apache.lucene.index} package internals exposed to the test framework. + * + * @lucene.internal + */ +public abstract class IndexPackageSecrets { + static final Object PRIVATE_ACCESS_TOKEN = new Object(); + + protected IndexPackageSecrets(Object accessToken) { + if (accessToken != PRIVATE_ACCESS_TOKEN) { + throw new RuntimeException("Use static factory methods to instantiate the secrets accessor."); + } + } + + public abstract IndexReader.CacheKey newCacheKey(); + + public abstract void setIndexWriterMaxDocs(int limit); + + public abstract FieldInfosBuilder newFieldInfosBuilder(String softDeletesFieldName); + + /** Public type exposing {@link FieldInfo} internal builders. */ + public interface FieldInfosBuilder { + FieldInfosBuilder add(FieldInfo fi); + + FieldInfos finish(); + } +} diff --git a/lucene/core/src/java/org/apache/lucene/internal/tests/IndexWriterSecrets.java b/lucene/core/src/java/org/apache/lucene/internal/tests/IndexWriterSecrets.java new file mode 100644 index 00000000000..2c27084ffb6 --- /dev/null +++ b/lucene/core/src/java/org/apache/lucene/internal/tests/IndexWriterSecrets.java @@ -0,0 +1,51 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.lucene.internal.tests; + +import java.io.IOException; +import org.apache.lucene.index.DirectoryReader; +import org.apache.lucene.index.SegmentCommitInfo; + +/** + * Access to {@link org.apache.lucene.index.IndexWriter} internals exposed to the test framework. + * + * @lucene.internal + */ +public abstract class IndexWriterSecrets { + static final Object PRIVATE_ACCESS_TOKEN = new Object(); + + protected IndexWriterSecrets(Object accessToken) { + if (accessToken != PRIVATE_ACCESS_TOKEN) { + throw new RuntimeException("Use static factory methods to instantiate the secrets accessor."); + } + } + + public abstract String segString(); + + public abstract int getSegmentCount(); + + public abstract boolean isClosed(); + + public abstract DirectoryReader getReader(boolean applyDeletions, boolean writeAllDeletes) + throws IOException; + + public abstract int getDocWriterThreadPoolSize(); + + public abstract boolean isDeleterClosed(); + + public abstract SegmentCommitInfo newestSegment(); +} diff --git a/lucene/core/src/java/org/apache/lucene/internal/tests/SegmentReaderSecrets.java b/lucene/core/src/java/org/apache/lucene/internal/tests/SegmentReaderSecrets.java new file mode 100644 index 00000000000..1ee0f70cd5d --- /dev/null +++ b/lucene/core/src/java/org/apache/lucene/internal/tests/SegmentReaderSecrets.java @@ -0,0 +1,38 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.lucene.internal.tests; + +/** + * Access to {@link org.apache.lucene.index.SegmentReader} internals exposed to the test framework. + * + * @lucene.internal + */ +public abstract class SegmentReaderSecrets { + static final Object PRIVATE_ACCESS_TOKEN = new Object(); + + protected SegmentReaderSecrets(Object accessToken) { + if (accessToken != PRIVATE_ACCESS_TOKEN) { + throw new RuntimeException("Use static factory methods to instantiate the secrets accessor."); + } + } + + /** + * @return Returns the package-private {@code SegmentCoreReaders} associated with the segment + * reader. + */ + public abstract Object getCore(); +} diff --git a/lucene/core/src/java/org/apache/lucene/internal/tests/TestSecrets.java b/lucene/core/src/java/org/apache/lucene/internal/tests/TestSecrets.java new file mode 100644 index 00000000000..ea3cd8f7f1d --- /dev/null +++ b/lucene/core/src/java/org/apache/lucene/internal/tests/TestSecrets.java @@ -0,0 +1,51 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.lucene.internal.tests; + +import org.apache.lucene.index.ConcurrentMergeScheduler; +import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexWriter; +import org.apache.lucene.index.SegmentReader; + +/** A set of static methods returning test secret accessors. */ +public final class TestSecrets { + private TestSecrets() {} + + /** Return the accessor to internal secrets for an {@link IndexWriter}. */ + public static IndexWriterSecrets getSecrets(IndexWriter writer) { + return (IndexWriterSecrets) writer.getTestSecrets(IndexWriterSecrets.PRIVATE_ACCESS_TOKEN); + } + + /** Return the accessor to internal secrets for an {@link IndexReader}. */ + public static IndexPackageSecrets getIndexPackageSecrets() { + return (IndexPackageSecrets) + org.apache.lucene.index.PackageSecrets.getTestSecrets( + IndexPackageSecrets.PRIVATE_ACCESS_TOKEN); + } + + /** Return the accessor to internal secrets for an {@link SegmentReader}. */ + public static SegmentReaderSecrets getSecrets(SegmentReader segmentReader) { + return (SegmentReaderSecrets) + segmentReader.getTestSecrets(SegmentReaderSecrets.PRIVATE_ACCESS_TOKEN); + } + + /** Return the accessor to internal secrets for an {@link IndexWriter}. */ + public static ConcurrentMergeSchedulerSecrets getSecrets(ConcurrentMergeScheduler scheduler) { + return (ConcurrentMergeSchedulerSecrets) + scheduler.getTestSecrets(ConcurrentMergeSchedulerSecrets.PRIVATE_ACCESS_TOKEN); + } +} diff --git a/lucene/core/src/java/org/apache/lucene/internal/tests/package-info.java b/lucene/core/src/java/org/apache/lucene/internal/tests/package-info.java new file mode 100644 index 00000000000..7a7a591f81b --- /dev/null +++ b/lucene/core/src/java/org/apache/lucene/internal/tests/package-info.java @@ -0,0 +1,23 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * Internal bridges to package-private internals, for use by the lucene test framework only. + * + * @see org.apache.lucene.internal.tests.TestSecrets + */ +package org.apache.lucene.internal.tests; diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseFieldInfoFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseFieldInfoFormatTestCase.java index c39736cc74e..ae4354ae9d3 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseFieldInfoFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseFieldInfoFormatTestCase.java @@ -38,6 +38,7 @@ import org.apache.lucene.index.SegmentInfo; import org.apache.lucene.index.VectorSimilarityFunction; import org.apache.lucene.index.VectorValues; +import org.apache.lucene.internal.tests.TestSecrets; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.tests.store.MockDirectoryWrapper; @@ -62,9 +63,10 @@ public void testOneField() throws Exception { SegmentInfo segmentInfo = newSegmentInfo(dir, "_123"); FieldInfo fi = createFieldInfo(); addAttributes(fi); - FieldInfos.Builder builder = new FieldInfos.Builder(new FieldInfos.FieldNumbers(null)); - builder.add(fi); - FieldInfos infos = builder.finish(); + + FieldInfos infos = + TestSecrets.getIndexPackageSecrets().newFieldInfosBuilder(null).add(fi).finish(); + codec.fieldInfosFormat().write(dir, segmentInfo, "", infos, IOContext.DEFAULT); FieldInfos infos2 = codec.fieldInfosFormat().read(dir, segmentInfo, "", IOContext.DEFAULT); @@ -90,9 +92,10 @@ public void testImmutableAttributes() throws Exception { addAttributes(fi); fi.putAttribute("foo", "bar"); fi.putAttribute("bar", "baz"); - FieldInfos.Builder builder = new FieldInfos.Builder(new FieldInfos.FieldNumbers(null)); - builder.add(fi); - FieldInfos infos = builder.finish(); + + FieldInfos infos = + TestSecrets.getIndexPackageSecrets().newFieldInfosBuilder(null).add(fi).finish(); + codec.fieldInfosFormat().write(dir, segmentInfo, "", infos, IOContext.DEFAULT); FieldInfos infos2 = codec.fieldInfosFormat().read(dir, segmentInfo, "", IOContext.DEFAULT); @@ -130,9 +133,9 @@ public void eval(MockDirectoryWrapper dir) throws IOException { SegmentInfo segmentInfo = newSegmentInfo(dir, "_123"); FieldInfo fi = createFieldInfo(); addAttributes(fi); - FieldInfos.Builder builder = new FieldInfos.Builder(new FieldInfos.FieldNumbers(null)); - builder.add(fi); - FieldInfos infos = builder.finish(); + + FieldInfos infos = + TestSecrets.getIndexPackageSecrets().newFieldInfosBuilder(null).add(fi).finish(); fail.setDoFail(); expectThrows( @@ -165,11 +168,10 @@ public void eval(MockDirectoryWrapper dir) throws IOException { Codec codec = getCodec(); SegmentInfo segmentInfo = newSegmentInfo(dir, "_123"); FieldInfo fi = createFieldInfo(); - - FieldInfos.Builder builder = new FieldInfos.Builder(new FieldInfos.FieldNumbers(null)); - builder.add(fi); addAttributes(fi); - FieldInfos infos = builder.finish(); + + FieldInfos infos = + TestSecrets.getIndexPackageSecrets().newFieldInfosBuilder(null).add(fi).finish(); fail.setDoFail(); expectThrows( @@ -202,11 +204,11 @@ public void eval(MockDirectoryWrapper dir) throws IOException { Codec codec = getCodec(); SegmentInfo segmentInfo = newSegmentInfo(dir, "_123"); FieldInfo fi = createFieldInfo(); - - FieldInfos.Builder builder = new FieldInfos.Builder(new FieldInfos.FieldNumbers(null)); - builder.add(fi); addAttributes(fi); - FieldInfos infos = builder.finish(); + + FieldInfos infos = + TestSecrets.getIndexPackageSecrets().newFieldInfosBuilder(null).add(fi).finish(); + codec.fieldInfosFormat().write(dir, segmentInfo, "", infos, IOContext.DEFAULT); fail.setDoFail(); @@ -240,10 +242,11 @@ public void eval(MockDirectoryWrapper dir) throws IOException { Codec codec = getCodec(); SegmentInfo segmentInfo = newSegmentInfo(dir, "_123"); FieldInfo fi = createFieldInfo(); - FieldInfos.Builder builder = new FieldInfos.Builder(new FieldInfos.FieldNumbers(null)); - builder.add(fi); addAttributes(fi); - FieldInfos infos = builder.finish(); + + FieldInfos infos = + TestSecrets.getIndexPackageSecrets().newFieldInfosBuilder(null).add(fi).finish(); + codec.fieldInfosFormat().write(dir, segmentInfo, "", infos, IOContext.DEFAULT); fail.setDoFail(); @@ -274,8 +277,8 @@ public void testRandom() throws Exception { String softDeletesField = random().nextBoolean() ? TestUtil.randomUnicodeString(random()) : null; - FieldInfos.Builder builder = - new FieldInfos.Builder(new FieldInfos.FieldNumbers(softDeletesField)); + + var builder = TestSecrets.getIndexPackageSecrets().newFieldInfosBuilder(softDeletesField); for (String field : fieldNames) { IndexableFieldType fieldType = randomFieldType(random()); diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseIndexFileFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseIndexFileFormatTestCase.java index aca8da4f96a..0c6dad7385a 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseIndexFileFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseIndexFileFormatTestCase.java @@ -72,6 +72,7 @@ import org.apache.lucene.index.SerialMergeScheduler; import org.apache.lucene.index.Term; import org.apache.lucene.index.Terms; +import org.apache.lucene.internal.tests.TestSecrets; import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.ChecksumIndexInput; import org.apache.lucene.store.Directory; @@ -625,7 +626,7 @@ public void testRandomExceptions() throws Exception { // OK: writer was closed by abort; we just reopen now: dir.setRandomIOExceptionRateOnOpen( 0.0); // disable exceptions on openInput until next iteration - assertTrue(iw.isDeleterClosed()); + assertTrue(TestSecrets.getSecrets(iw).isDeleterClosed()); assertTrue(allowAlreadyClosed); allowAlreadyClosed = false; conf = newIndexWriterConfig(analyzer); @@ -666,7 +667,7 @@ public void testRandomExceptions() throws Exception { // OK: writer was closed by abort; we just reopen now: dir.setRandomIOExceptionRateOnOpen( 0.0); // disable exceptions on openInput until next iteration - assertTrue(iw.isDeleterClosed()); + assertTrue(TestSecrets.getSecrets(iw).isDeleterClosed()); assertTrue(allowAlreadyClosed); allowAlreadyClosed = false; conf = newIndexWriterConfig(analyzer); diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseMergePolicyTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseMergePolicyTestCase.java index 8fd131714cd..8bfa2a83e25 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseMergePolicyTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseMergePolicyTestCase.java @@ -42,6 +42,7 @@ import org.apache.lucene.index.SegmentInfo; import org.apache.lucene.index.SegmentInfos; import org.apache.lucene.index.SerialMergeScheduler; +import org.apache.lucene.internal.tests.TestSecrets; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; @@ -114,7 +115,7 @@ public synchronized void merge(MergeSource mergeSource, MergeTrigger trigger) DirectoryReader.open(writer).close(); } for (int i = 5; i >= 0; --i) { - final int segmentCount = writer.getSegmentCount(); + final int segmentCount = TestSecrets.getSecrets(writer).getSegmentCount(); final int maxNumSegments = i == 0 ? 1 : TestUtil.nextInt(random(), 1, 10); mayMerge.set(segmentCount > maxNumSegments); if (VERBOSE) { diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BasePointsFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BasePointsFormatTestCase.java index 77452319f86..67f36d35e5c 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BasePointsFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BasePointsFormatTestCase.java @@ -47,6 +47,7 @@ import org.apache.lucene.index.PointValues.IntersectVisitor; import org.apache.lucene.index.PointValues.Relation; import org.apache.lucene.index.Term; +import org.apache.lucene.internal.tests.TestSecrets; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; @@ -653,7 +654,7 @@ private void verify( if (expectExceptions) { MergeScheduler ms = iwc.getMergeScheduler(); if (ms instanceof ConcurrentMergeScheduler) { - ((ConcurrentMergeScheduler) ms).setSuppressExceptions(); + TestSecrets.getSecrets(((ConcurrentMergeScheduler) ms)).setSuppressExceptions(); } } RandomIndexWriter w = new RandomIndexWriter(random(), dir, iwc); @@ -702,7 +703,7 @@ private void verify( if (expectExceptions) { MergeScheduler ms = iwc.getMergeScheduler(); if (ms instanceof ConcurrentMergeScheduler) { - ((ConcurrentMergeScheduler) ms).setSuppressExceptions(); + TestSecrets.getSecrets(((ConcurrentMergeScheduler) ms)).setSuppressExceptions(); } } w = new RandomIndexWriter(random(), dir, iwc); diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/DocHelper.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/DocHelper.java index e6092bed0ce..22e34e56e4c 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/DocHelper.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/DocHelper.java @@ -33,6 +33,7 @@ import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.IndexableField; import org.apache.lucene.index.SegmentCommitInfo; +import org.apache.lucene.internal.tests.TestSecrets; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; @@ -297,7 +298,7 @@ public static SegmentCommitInfo writeDoc( // writer.setNoCFSRatio(0.0); writer.addDocument(doc); writer.commit(); - SegmentCommitInfo info = writer.newestSegment(); + SegmentCommitInfo info = TestSecrets.getSecrets(writer).newestSegment(); writer.close(); return info; } diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/IndexWriterMaxDocsChanger.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/IndexWriterMaxDocsChanger.java deleted file mode 100644 index 2d0ca03d23d..00000000000 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/IndexWriterMaxDocsChanger.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.lucene.tests.index; - -import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.tests.util.LuceneTestCase; - -/** - * Accessor to make some package protected methods in {@link IndexWriter} available for testing. - * - * @lucene.internal - */ -public final class IndexWriterMaxDocsChanger { - - private IndexWriterMaxDocsChanger() {} - - /** - * Tells {@link IndexWriter} to enforce the specified limit as the maximum number of documents in - * one index; call {@link #restoreMaxDocs} once your test is done. - * - * @see LuceneTestCase#setIndexWriterMaxDocs(int) - */ - public static void setMaxDocs(int limit) { - IndexWriter.setMaxDocs(limit); - } - - /** - * Returns to the default {@link IndexWriter#MAX_DOCS} limit. - * - * @see LuceneTestCase#restoreIndexWriterMaxDocs() - */ - public static void restoreMaxDocs() { - IndexWriter.setMaxDocs(IndexWriter.MAX_DOCS); - } -} diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/OwnCacheKeyMultiReader.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/OwnCacheKeyMultiReader.java index 41aab190564..17af9fb9781 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/OwnCacheKeyMultiReader.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/OwnCacheKeyMultiReader.java @@ -21,6 +21,7 @@ import java.util.concurrent.CopyOnWriteArraySet; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.MultiReader; +import org.apache.lucene.internal.tests.TestSecrets; import org.apache.lucene.util.IOUtils; /** A {@link MultiReader} that has its own cache key, occasionally useful for testing purposes. */ @@ -30,7 +31,7 @@ public final class OwnCacheKeyMultiReader extends MultiReader { private final CacheHelper cacheHelper = new CacheHelper() { - private final CacheKey cacheKey = new CacheKey(); + private final CacheKey cacheKey = TestSecrets.getIndexPackageSecrets().newCacheKey(); @Override public CacheKey getKey() { @@ -55,7 +56,7 @@ public CacheHelper getReaderCacheHelper() { } @Override - void notifyReaderClosedListeners() throws IOException { + protected void notifyReaderClosedListeners() throws IOException { synchronized (readerClosedListeners) { IOUtils.applyToAll(readerClosedListeners, l -> l.onClose(cacheHelper.getKey())); } diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/RandomIndexWriter.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/RandomIndexWriter.java index 9dcc61ea37d..2bd5ba64c05 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/RandomIndexWriter.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/RandomIndexWriter.java @@ -36,6 +36,7 @@ import org.apache.lucene.index.SoftDeletesDirectoryReaderWrapper; import org.apache.lucene.index.Term; import org.apache.lucene.index.TieredMergePolicy; +import org.apache.lucene.internal.tests.TestSecrets; import org.apache.lucene.search.Query; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.analysis.MockAnalyzer; @@ -252,7 +253,7 @@ private void flushAllBuffersSequentially() throws IOException { System.out.println( "RIW.add/updateDocument: now flushing the largest writer at docCount=" + docCount); } - int threadPoolSize = w.docWriter.perThreadPool.size(); + int threadPoolSize = TestSecrets.getSecrets(w).getDocWriterThreadPoolSize(); int numFlushes = Math.min(1, r.nextInt(threadPoolSize + 1)); for (int i = 0; i < numFlushes; i++) { if (w.flushNextBuffer() == false) { @@ -439,7 +440,8 @@ public void setDoRandomForceMergeAssert(boolean v) { private void doRandomForceMerge() throws IOException { if (doRandomForceMerge) { - final int segCount = w.getSegmentCount(); + var indexWriterSecrets = TestSecrets.getSecrets(w); + final int segCount = indexWriterSecrets.getSegmentCount(); if (r.nextBoolean() || segCount == 0) { // full forceMerge if (LuceneTestCase.VERBOSE) { @@ -454,8 +456,8 @@ private void doRandomForceMerge() throws IOException { } w.forceMerge(limit); if (limit == 1 || (config.getMergePolicy() instanceof TieredMergePolicy) == false) { - assert !doRandomForceMergeAssert || w.getSegmentCount() <= limit - : "limit=" + limit + " actual=" + w.getSegmentCount(); + assert !doRandomForceMergeAssert || indexWriterSecrets.getSegmentCount() <= limit + : "limit=" + limit + " actual=" + indexWriterSecrets.getSegmentCount(); } } else { if (LuceneTestCase.VERBOSE) { @@ -481,7 +483,7 @@ public DirectoryReader getReader(boolean applyDeletions, boolean writeAllDeletes if (r.nextInt(5) == 1) { w.commit(); } - return w.getReader(applyDeletions, writeAllDeletes); + return TestSecrets.getSecrets(w).getReader(applyDeletions, writeAllDeletes); } else { if (LuceneTestCase.VERBOSE) { System.out.println("RIW.getReader: open new reader"); @@ -495,7 +497,7 @@ public DirectoryReader getReader(boolean applyDeletions, boolean writeAllDeletes return reader; } } else { - return w.getReader(applyDeletions, writeAllDeletes); + return TestSecrets.getSecrets(w).getReader(applyDeletions, writeAllDeletes); } } } @@ -509,12 +511,13 @@ public DirectoryReader getReader(boolean applyDeletions, boolean writeAllDeletes public void close() throws IOException { boolean success = false; try { - if (w.isClosed() == false) { + var indexWriterSecrets = TestSecrets.getSecrets(w); + if (indexWriterSecrets.isClosed() == false) { LuceneTestCase.maybeChangeLiveIndexWriterConfig(r, config); } // if someone isn't using getReader() API, we want to be sure to // forceMerge since presumably they might open a reader on the dir. - if (getReaderCalled == false && r.nextInt(8) == 2 && w.isClosed() == false) { + if (getReaderCalled == false && r.nextInt(8) == 2 && indexWriterSecrets.isClosed() == false) { doRandomForceMerge(); if (config.getCommitOnClose() == false) { // index may have changed, must commit the changes, or otherwise they are discarded by the diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/ThreadedIndexingAndSearchingTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/ThreadedIndexingAndSearchingTestCase.java index af8d11220f2..1122f463b49 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/ThreadedIndexingAndSearchingTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/ThreadedIndexingAndSearchingTestCase.java @@ -38,11 +38,12 @@ import org.apache.lucene.index.IndexableField; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.MultiTerms; -import org.apache.lucene.index.SegmentCoreReaders; import org.apache.lucene.index.SegmentReader; import org.apache.lucene.index.Term; import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; +import org.apache.lucene.internal.tests.IndexWriterSecrets; +import org.apache.lucene.internal.tests.TestSecrets; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.PhraseQuery; import org.apache.lucene.search.Query; @@ -77,6 +78,7 @@ public abstract class ThreadedIndexingAndSearchingTestCase extends LuceneTestCas protected Directory dir; protected IndexWriter writer; + protected IndexWriterSecrets writerSecrets; private static class SubDocs { public final String packID; @@ -407,7 +409,8 @@ public void run() { + diagnostics + " si=" + segReader.getSegmentInfo(), - !assertMergedSegmentsWarmed || warmed.containsKey(segReader.core)); + !assertMergedSegmentsWarmed + || warmed.containsKey(TestSecrets.getSecrets(segReader).getCore())); } } if (s.getIndexReader().numDocs() > 0) { @@ -479,8 +482,7 @@ protected void doClose() throws Exception {} protected boolean assertMergedSegmentsWarmed = true; - private final Map warmed = - Collections.synchronizedMap(new WeakHashMap()); + private final Map warmed = Collections.synchronizedMap(new WeakHashMap<>()); public void runTest(String testName) throws Exception { @@ -514,7 +516,8 @@ public void runTest(String testName) throws Exception { if (VERBOSE) { System.out.println("TEST: now warm merged reader=" + reader); } - warmed.put(((SegmentReader) reader).core, Boolean.TRUE); + var core = TestSecrets.getSecrets((SegmentReader) reader).getCore(); + warmed.put(core, Boolean.TRUE); final int maxDoc = reader.maxDoc(); final Bits liveDocs = reader.getLiveDocs(); int sum = 0; @@ -547,6 +550,7 @@ public void message(String component, String message) { }); } writer = new IndexWriter(dir, conf); + writerSecrets = TestSecrets.getSecrets(writer); TestUtil.reduceOpenFiles(writer); final ExecutorService es = @@ -713,7 +717,7 @@ public void message(String component, String message) { assertFalse(doFail); assertEquals( - "index=" + writer.segString() + " addCount=" + addCount + " delCount=" + delCount, + "index=" + writerSecrets.segString() + " addCount=" + addCount + " delCount=" + delCount, addCount.get() - delCount.get(), s.getIndexReader().numDocs()); releaseSearcher(s); @@ -721,7 +725,7 @@ public void message(String component, String message) { writer.commit(); assertEquals( - "index=" + writer.segString() + " addCount=" + addCount + " delCount=" + delCount, + "index=" + writerSecrets.segString() + " addCount=" + addCount + " delCount=" + delCount, addCount.get() - delCount.get(), writer.getDocStats().numDocs); diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java index 832e2fc5fe0..ab75441eef1 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java @@ -110,6 +110,7 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.index.*; import org.apache.lucene.index.TermsEnum.SeekStatus; +import org.apache.lucene.internal.tests.TestSecrets; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.LRUQueryCache; @@ -132,7 +133,6 @@ import org.apache.lucene.tests.index.AssertingDirectoryReader; import org.apache.lucene.tests.index.AssertingLeafReader; import org.apache.lucene.tests.index.FieldFilterLeafReader; -import org.apache.lucene.tests.index.IndexWriterMaxDocsChanger; import org.apache.lucene.tests.index.MergingCodecReader; import org.apache.lucene.tests.index.MergingDirectoryReaderWrapper; import org.apache.lucene.tests.index.MismatchedDirectoryReader; @@ -736,12 +736,12 @@ public void tearDown() throws Exception { * one index; call {@link #restoreIndexWriterMaxDocs} once your test is done. */ public void setIndexWriterMaxDocs(int limit) { - IndexWriterMaxDocsChanger.setMaxDocs(limit); + TestSecrets.getIndexPackageSecrets().setIndexWriterMaxDocs(limit); } /** Returns to the default {@link IndexWriter#MAX_DOCS} limit. */ public void restoreIndexWriterMaxDocs() { - IndexWriterMaxDocsChanger.restoreMaxDocs(); + TestSecrets.getIndexPackageSecrets().setIndexWriterMaxDocs(IndexWriter.MAX_DOCS); } // ----------------------------------------------------------------- From 838dacedb52efcf192fc5ece9041f049d127dcd7 Mon Sep 17 00:00:00 2001 From: Dawid Weiss Date: Mon, 20 Dec 2021 10:14:10 +0100 Subject: [PATCH 17/32] Add license. --- .../apache/lucene/index/PackageSecrets.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/lucene/core/src/java/org/apache/lucene/index/PackageSecrets.java b/lucene/core/src/java/org/apache/lucene/index/PackageSecrets.java index 7519ee0f314..07fdd549278 100644 --- a/lucene/core/src/java/org/apache/lucene/index/PackageSecrets.java +++ b/lucene/core/src/java/org/apache/lucene/index/PackageSecrets.java @@ -1,3 +1,19 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.lucene.index; import org.apache.lucene.internal.tests.IndexPackageSecrets; @@ -22,7 +38,7 @@ private PackageSecrets() {} * @return An instance of the secrets class; the return type is hidden from the public API. * @lucene.internal */ - public static final Object getTestSecrets(Object accessToken) { + public static Object getTestSecrets(Object accessToken) { return new IndexPackageSecrets(accessToken) { @Override From 8643180a07362dddd3d383e6ecdb94ce9f197f85 Mon Sep 17 00:00:00 2001 From: Dawid Weiss Date: Mon, 20 Dec 2021 10:59:34 +0100 Subject: [PATCH 18/32] Only export internal packages to the test framework. --- lucene/core/src/java/module-info.java | 5 +++++ .../lucene/distribution/TestModularLayer.java | 22 ++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/lucene/core/src/java/module-info.java b/lucene/core/src/java/module-info.java index 931d4cbac2d..79ca14519e8 100644 --- a/lucene/core/src/java/module-info.java +++ b/lucene/core/src/java/module-info.java @@ -16,6 +16,7 @@ */ /** Lucene Core. */ +@SuppressWarnings("module") // the test framework is compiled after the core... module org.apache.lucene.core { requires jdk.unsupported; // this is needed for MMapDirectory to unmap @@ -46,6 +47,10 @@ exports org.apache.lucene.util.mutable; exports org.apache.lucene.util.packed; + // Only export internal packages to the test framework. + exports org.apache.lucene.internal.tests to + org.apache.lucene.test_framework; + provides org.apache.lucene.analysis.TokenizerFactory with org.apache.lucene.analysis.standard.StandardTokenizerFactory; provides org.apache.lucene.codecs.Codec with diff --git a/lucene/distribution.tests/src/test/org/apache/lucene/distribution/TestModularLayer.java b/lucene/distribution.tests/src/test/org/apache/lucene/distribution/TestModularLayer.java index 56270899060..0b3373048d0 100644 --- a/lucene/distribution.tests/src/test/org/apache/lucene/distribution/TestModularLayer.java +++ b/lucene/distribution.tests/src/test/org/apache/lucene/distribution/TestModularLayer.java @@ -27,6 +27,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.Arrays; +import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.TreeMap; @@ -255,6 +256,7 @@ private static TreeMap> getModularServiceProviders( public void testAllOpenPackagesInSync() throws IOException { for (var module : allCoreModules) { Set jarPackages = getJarPackages(module); + Set moduleExports = new HashSet<>(module.descriptor().exports()); if (module.descriptor().name().equals("org.apache.lucene.luke")) { jarPackages.removeIf( @@ -264,7 +266,25 @@ public void testAllOpenPackagesInSync() throws IOException { }); } - Set moduleExports = module.descriptor().exports(); + if (module.descriptor().name().equals("org.apache.lucene.core")) { + // Internal packages should not be exported to unqualified targets. + jarPackages.removeIf( + entry -> { + return entry.startsWith("org.apache.lucene.internal"); + }); + + // Internal packages should use qualified exports. + moduleExports.removeIf( + export -> { + boolean isInternal = export.source().startsWith("org.apache.lucene.internal"); + if (isInternal) { + Assertions.assertThat(export.targets()) + .containsExactlyInAnyOrder("org.apache.lucene.test_framework"); + } + return isInternal; + }); + } + Assertions.assertThat(moduleExports) .as("Exported packages in module: " + module.descriptor().name()) .allSatisfy( From 7dffc9f6ce3724e2ac5e8629b378385ea8003da2 Mon Sep 17 00:00:00 2001 From: Dawid Weiss Date: Mon, 20 Dec 2021 11:11:29 +0100 Subject: [PATCH 19/32] No more split packages. --- gradle/documentation/render-javadoc.gradle | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/gradle/documentation/render-javadoc.gradle b/gradle/documentation/render-javadoc.gradle index e4a4f28e293..7bedb0ca112 100644 --- a/gradle/documentation/render-javadoc.gradle +++ b/gradle/documentation/render-javadoc.gradle @@ -226,22 +226,6 @@ configure(project(":lucene:core")) { } } -// Fix for Java 11 Javadoc tool that cannot handle split packages between modules correctly. -// (by removing all the packages which are part of lucene-core) -// See: https://issues.apache.org/jira/browse/LUCENE-8738?focusedCommentId=16818106&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-16818106 -// LUCENE-9499: This workaround should be applied only to test-framework (we have no split package in other modules). -configure(project(":lucene:test-framework")) { - project.tasks.withType(RenderJavadocTask) { - doLast { - Set luceneCorePackages = file("${project(':lucene:core').tasks[name].outputDir}/element-list").readLines('UTF-8').toSet(); - File elementFile = file("${outputDir}/element-list"); - List elements = elementFile.readLines('UTF-8'); - elements.removeAll(luceneCorePackages) - elementFile.write(elements.join('\n').concat('\n'), 'UTF-8'); - } - } -} - configure(project(':lucene:demo')) { project.tasks.withType(RenderJavadocTask) { // For the demo, we link the example source in the javadocs, as it's ref'ed elsewhere @@ -415,9 +399,6 @@ class RenderJavadocTask extends DefaultTask { // - find all (enabled) tasks this tasks depends on (with same name), calling findRenderTasksInDependencies() // - sort the tasks preferring those whose project name equals 'core', then lexigraphical by path // - for each task get output dir to create relative or absolute link - // NOTE: explicitly exclude solr/test-framework, or attempting to link to lucene-test-framework because if we did javadoc would - // attempt to link class refs in in org.apache.lucene, causing broken links. (either broken links to things like "Directory" if - // lucene-test-framework was first, or broken links to things like LuceneTestCase if lucene-core was first) findRenderTasksInDependencies() .sort(false, Comparator.comparing { (it.project.name != 'core') as Boolean }.thenComparing(Comparator.comparing { it.path })) .each { otherTask -> From 66c108b31844d427e6546fc2adb3040eb541acd3 Mon Sep 17 00:00:00 2001 From: Dawid Weiss Date: Mon, 20 Dec 2021 11:27:58 +0100 Subject: [PATCH 20/32] Add module descriptor to the test framework. --- lucene/test-framework/build.gradle | 10 ++-- .../test-framework/src/java/module-info.java | 49 +++++++++++++++++++ 2 files changed, 54 insertions(+), 5 deletions(-) create mode 100644 lucene/test-framework/src/java/module-info.java diff --git a/lucene/test-framework/build.gradle b/lucene/test-framework/build.gradle index ce9355b8913..7eff02317b2 100644 --- a/lucene/test-framework/build.gradle +++ b/lucene/test-framework/build.gradle @@ -20,15 +20,15 @@ apply plugin: 'java-library' description = 'Framework for testing Lucene-based applications' dependencies { - api project(':lucene:core') + moduleApi project(':lucene:core') - api ("com.carrotsearch.randomizedtesting:randomizedtesting-runner", { + moduleApi ("com.carrotsearch.randomizedtesting:randomizedtesting-runner", { exclude group: "junit" }) - api ("junit:junit", { + moduleApi ("junit:junit", { exclude group: "org.hamcrest" }) - api ('org.hamcrest:hamcrest') + moduleApi ('org.hamcrest:hamcrest') - implementation project(':lucene:codecs') + moduleImplementation project(':lucene:codecs') } diff --git a/lucene/test-framework/src/java/module-info.java b/lucene/test-framework/src/java/module-info.java new file mode 100644 index 00000000000..b86ee3c1cf4 --- /dev/null +++ b/lucene/test-framework/src/java/module-info.java @@ -0,0 +1,49 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** Lucene test framework. */ +@SuppressWarnings({"module", "requires-automatic"}) +module org.apache.lucene.test_framework { + requires org.apache.lucene.core; + requires org.apache.lucene.codecs; + requires java.logging; + requires junit; + requires randomizedtesting.runner; + + exports org.apache.lucene.tests.analysis.standard; + exports org.apache.lucene.tests.analysis; + exports org.apache.lucene.tests.codecs.asserting; + exports org.apache.lucene.tests.codecs.blockterms; + exports org.apache.lucene.tests.codecs.bloom; + exports org.apache.lucene.tests.codecs.cheapbastard; + exports org.apache.lucene.tests.codecs.compressing.dummy; + exports org.apache.lucene.tests.codecs.compressing; + exports org.apache.lucene.tests.codecs.cranky; + exports org.apache.lucene.tests.codecs.mockrandom; + exports org.apache.lucene.tests.codecs.ramonly; + exports org.apache.lucene.tests.codecs.uniformsplit.sharedterms; + exports org.apache.lucene.tests.codecs.uniformsplit; + exports org.apache.lucene.tests.geo; + exports org.apache.lucene.tests.index; + exports org.apache.lucene.tests.mockfile; + exports org.apache.lucene.tests.search.similarities; + exports org.apache.lucene.tests.search; + exports org.apache.lucene.tests.store; + exports org.apache.lucene.tests.util.automaton; + exports org.apache.lucene.tests.util.fst; + exports org.apache.lucene.tests.util; +} From 69ac965734d5d88d848bff9db81f8db2374de6aa Mon Sep 17 00:00:00 2001 From: Dawid Weiss Date: Mon, 20 Dec 2021 13:49:34 +0100 Subject: [PATCH 21/32] Add service providers to the test framework and include it in modules/ in the distribution. --- dev-tools/scripts/smokeTestRelease.py | 2 +- gradle/java/modules.gradle | 3 +++ .../lucene/distribution/TestModularLayer.java | 3 ++- lucene/distribution/binary-release.gradle | 17 ++----------- .../test-framework/src/java/module-info.java | 24 +++++++++++++++++++ 5 files changed, 32 insertions(+), 17 deletions(-) diff --git a/dev-tools/scripts/smokeTestRelease.py b/dev-tools/scripts/smokeTestRelease.py index ad350990de7..a1acc879318 100755 --- a/dev-tools/scripts/smokeTestRelease.py +++ b/dev-tools/scripts/smokeTestRelease.py @@ -588,7 +588,7 @@ def verifyUnpacked(java, artifact, unpackPath, gitRevision, version, testArgs): if len(in_lucene_folder) > 0: raise RuntimeError('lucene: unexpected files/dirs in artifact %s lucene/ folder: %s' % (artifact, in_lucene_folder)) else: - is_in_list(in_root_folder, ['bin', 'docs', 'licenses', 'modules', 'modules-test-framework', 'modules-thirdparty']) + is_in_list(in_root_folder, ['bin', 'docs', 'licenses', 'modules', 'modules-thirdparty']) if len(in_root_folder) > 0: raise RuntimeError('lucene: unexpected files/dirs in artifact %s: %s' % (artifact, in_root_folder)) diff --git a/gradle/java/modules.gradle b/gradle/java/modules.gradle index 94604b99009..0855423c983 100644 --- a/gradle/java/modules.gradle +++ b/gradle/java/modules.gradle @@ -17,6 +17,9 @@ // Configure miscellaneous aspects required for supporting the java module system layer. +// Debugging utilities. +apply from: buildscript.sourceFile.toPath().resolveSibling("modules-debugging.gradle") + allprojects { plugins.withType(JavaPlugin) { // We won't be using gradle's built-in automatic module finder. diff --git a/lucene/distribution.tests/src/test/org/apache/lucene/distribution/TestModularLayer.java b/lucene/distribution.tests/src/test/org/apache/lucene/distribution/TestModularLayer.java index 0b3373048d0..182960fedd6 100644 --- a/lucene/distribution.tests/src/test/org/apache/lucene/distribution/TestModularLayer.java +++ b/lucene/distribution.tests/src/test/org/apache/lucene/distribution/TestModularLayer.java @@ -147,7 +147,8 @@ public void testExpectedDistributionModuleNames() { "org.apache.lucene.sandbox", "org.apache.lucene.spatial3d", "org.apache.lucene.spatial_extras", - "org.apache.lucene.suggest"); + "org.apache.lucene.suggest", + "org.apache.lucene.test_framework"); } /** Make sure we don't publish automatic modules. */ diff --git a/lucene/distribution/binary-release.gradle b/lucene/distribution/binary-release.gradle index be2ae6005ea..1a18838a44e 100644 --- a/lucene/distribution/binary-release.gradle +++ b/lucene/distribution/binary-release.gradle @@ -26,7 +26,6 @@ configure(project(":lucene:distribution")) { docs jars - jarsTestFramework jarsThirdParty binaryDirForTests @@ -35,24 +34,15 @@ configure(project(":lucene:distribution")) { dependencies { DependencyHandler handler -> docs project(path: ':lucene:documentation', configuration: 'site') - // Maven-published submodule JARs are part of the binary distribution - // (with a few exceptions explicitly filtered below). + // Maven-published submodule JARs are part of the binary distribution. // We don't copy their transitive dependencies. - def binaryModules = rootProject.ext.mavenProjects.findAll { p -> !(p in [ - // Placed in a separate folder (module layer conflicts). - project(":lucene:test-framework"), - ]) } + def binaryModules = rootProject.ext.mavenProjects for (Project module : binaryModules) { jars(module, { transitive = false }) } - // The test framework has split packages and breaks the module system layer so - // it's in a separate folder. - jarsTestFramework(project(":lucene:test-framework"), { - transitive = false - }) // The third-party JARs consist of all the transitive dependencies from these modules. // Not sure whether we have to include all the thirdparty JARs from across all the modules. @@ -108,9 +98,6 @@ configure(project(":lucene:distribution")) { from(configurations.jars, { into 'modules' }) - from(configurations.jarsTestFramework, { - into 'modules-test-framework' - }) // Binary modules (with dependencies). Don't duplicate project artifacts. from((configurations.jarsThirdParty - configurations.jars), { diff --git a/lucene/test-framework/src/java/module-info.java b/lucene/test-framework/src/java/module-info.java index b86ee3c1cf4..3abd9ca4df5 100644 --- a/lucene/test-framework/src/java/module-info.java +++ b/lucene/test-framework/src/java/module-info.java @@ -46,4 +46,28 @@ exports org.apache.lucene.tests.util.automaton; exports org.apache.lucene.tests.util.fst; exports org.apache.lucene.tests.util; + + provides org.apache.lucene.codecs.Codec with + org.apache.lucene.tests.codecs.asserting.AssertingCodec, + org.apache.lucene.tests.codecs.cheapbastard.CheapBastardCodec, + org.apache.lucene.tests.codecs.compressing.DeflateWithPresetCompressingCodec, + org.apache.lucene.tests.codecs.compressing.FastCompressingCodec, + org.apache.lucene.tests.codecs.compressing.FastDecompressionCompressingCodec, + org.apache.lucene.tests.codecs.compressing.HighCompressionCompressingCodec, + org.apache.lucene.tests.codecs.compressing.LZ4WithPresetCompressingCodec, + org.apache.lucene.tests.codecs.compressing.dummy.DummyCompressingCodec; + provides org.apache.lucene.codecs.DocValuesFormat with + org.apache.lucene.tests.codecs.asserting.AssertingDocValuesFormat; + provides org.apache.lucene.codecs.KnnVectorsFormat with + org.apache.lucene.tests.codecs.asserting.AssertingKnnVectorsFormat; + provides org.apache.lucene.codecs.PostingsFormat with + org.apache.lucene.tests.codecs.mockrandom.MockRandomPostingsFormat, + org.apache.lucene.tests.codecs.ramonly.RAMOnlyPostingsFormat, + org.apache.lucene.tests.codecs.blockterms.LuceneFixedGap, + org.apache.lucene.tests.codecs.blockterms.LuceneVarGapFixedInterval, + org.apache.lucene.tests.codecs.blockterms.LuceneVarGapDocFreqInterval, + org.apache.lucene.tests.codecs.bloom.TestBloomFilteredLucenePostings, + org.apache.lucene.tests.codecs.asserting.AssertingPostingsFormat, + org.apache.lucene.tests.codecs.uniformsplit.UniformSplitRot13PostingsFormat, + org.apache.lucene.tests.codecs.uniformsplit.sharedterms.STUniformSplitRot13PostingsFormat; } From 745c26a2b8bd9f8c04cff03a8b10e31e2aad9e9e Mon Sep 17 00:00:00 2001 From: Dawid Weiss Date: Mon, 20 Dec 2021 15:32:26 +0100 Subject: [PATCH 22/32] Use static secret accessors. This doesn't expose any public API and is perhaps better isolated. --- .../org/apache/lucene/index/CheckIndex.java | 2 +- .../index/ConcurrentMergeScheduler.java | 30 ++--- .../org/apache/lucene/index/IndexWriter.java | 121 +++++++++++------- .../apache/lucene/index/PackageSecrets.java | 74 ----------- .../apache/lucene/index/SegmentReader.java | 30 ++--- ...va => ConcurrentMergeSchedulerAccess.java} | 14 +- ...geSecrets.java => IndexPackageAccess.java} | 19 +-- ...terSecrets.java => IndexWriterAccess.java} | 25 ++-- ...rSecrets.java => SegmentReaderAccess.java} | 17 +-- .../lucene/internal/tests/TestSecrets.java | 84 +++++++++--- .../tests/index/AssertingLeafReader.java | 5 +- .../index/BaseFieldInfoFormatTestCase.java | 14 +- .../index/BaseIndexFileFormatTestCase.java | 4 +- .../tests/index/BaseMergePolicyTestCase.java | 2 +- .../tests/index/BasePointsFormatTestCase.java | 6 +- .../apache/lucene/tests/index/DocHelper.java | 2 +- .../tests/index/OwnCacheKeyMultiReader.java | 2 +- .../lucene/tests/index/RandomIndexWriter.java | 22 ++-- .../tests/index/RandomPostingsTester.java | 8 +- .../ThreadedIndexingAndSearchingTestCase.java | 22 +++- .../lucene/tests/util/LuceneTestCase.java | 4 +- 21 files changed, 243 insertions(+), 264 deletions(-) delete mode 100644 lucene/core/src/java/org/apache/lucene/index/PackageSecrets.java rename lucene/core/src/java/org/apache/lucene/internal/tests/{ConcurrentMergeSchedulerSecrets.java => ConcurrentMergeSchedulerAccess.java} (71%) rename lucene/core/src/java/org/apache/lucene/internal/tests/{IndexPackageSecrets.java => IndexPackageAccess.java} (69%) rename lucene/core/src/java/org/apache/lucene/internal/tests/{IndexWriterSecrets.java => IndexWriterAccess.java} (64%) rename lucene/core/src/java/org/apache/lucene/internal/tests/{SegmentReaderSecrets.java => SegmentReaderAccess.java} (74%) diff --git a/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java b/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java index ceae4c41912..de5141acb2c 100644 --- a/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java +++ b/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java @@ -2290,7 +2290,7 @@ private static Status.TermIndexStatus checkFields( * * @lucene.internal */ - public static void checkImpacts(Impacts impacts, int lastTarget) { + static void checkImpacts(Impacts impacts, int lastTarget) { final int numLevels = impacts.numLevels(); if (numLevels < 1) { throw new CheckIndexException("The number of levels must be >= 1, got " + numLevels); diff --git a/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java b/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java index d3cdcba1d2c..08cc014b3e1 100644 --- a/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java +++ b/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java @@ -22,7 +22,8 @@ import java.util.List; import java.util.Locale; import org.apache.lucene.index.MergePolicy.OneMerge; -import org.apache.lucene.internal.tests.ConcurrentMergeSchedulerSecrets; +import org.apache.lucene.internal.tests.ConcurrentMergeSchedulerAccess; +import org.apache.lucene.internal.tests.TestSecrets; import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FilterDirectory; @@ -899,24 +900,13 @@ private static String getSegmentName(MergePolicy.OneMerge merge) { return merge.info != null ? merge.info.info.name : "_na_"; } - /** - * This method returns a test accessor that exposes some internals to test infrastructure. - * Everything here is internal, subject to change without notice and not publicly accessible. - * - *

Within the test infrastructure, do not call this method directly, instead use the static - * factory methods on the corresponding {@code TestSecrets} class. - * - * @param accessToken A secret token to only permit instantiation via the corresponding secrets - * class. - * @return An instance of the secrets class; the return type is hidden from the public API. - * @lucene.internal - */ - public final Object getTestSecrets(Object accessToken) { - return new ConcurrentMergeSchedulerSecrets(accessToken) { - @Override - public void setSuppressExceptions() { - ConcurrentMergeScheduler.this.setSuppressExceptions(); - } - }; + static { + TestSecrets.setConcurrentMergeSchedulerAccess( + new ConcurrentMergeSchedulerAccess() { + @Override + public void setSuppressExceptions(ConcurrentMergeScheduler cms) { + cms.setSuppressExceptions(); + } + }); } } diff --git a/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java b/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java index 94ba483ff23..e48e7afd37e 100644 --- a/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java +++ b/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java @@ -55,7 +55,9 @@ import org.apache.lucene.index.DocValuesUpdate.NumericDocValuesUpdate; import org.apache.lucene.index.FieldInfos.FieldNumbers; import org.apache.lucene.index.IndexWriterConfig.OpenMode; -import org.apache.lucene.internal.tests.IndexWriterSecrets; +import org.apache.lucene.internal.tests.IndexPackageAccess; +import org.apache.lucene.internal.tests.IndexWriterAccess; +import org.apache.lucene.internal.tests.TestSecrets; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.search.DocValuesFieldExistsQuery; import org.apache.lucene.search.MatchAllDocsQuery; @@ -6275,56 +6277,83 @@ void enable() { } } - /** - * This method returns a test accessor that exposes some of index writer internals to test - * infrastructure. Everything here is internal, subject to change without notice and not publicly - * accessible. - * - *

Within the test infrastructure, do not call this method directly, instead use the static - * factory methods on the corresponding {@code TestSecrets} class. - * - * @param accessToken A secret token to only permit instantiation via the corresponding secrets - * class. - * @return An instance of the secrets class; the return type is hidden from the public API. - * @lucene.internal - */ - public final Object getTestSecrets(Object accessToken) { - return new IndexWriterSecrets(accessToken) { - @Override - public String segString() { - return IndexWriter.this.segString(); - } + static { + TestSecrets.setIndexWriterAccess( + new IndexWriterAccess() { + @Override + public String segString(IndexWriter iw) { + return iw.segString(); + } - @Override - public int getSegmentCount() { - return IndexWriter.this.getSegmentCount(); - } + @Override + public int getSegmentCount(IndexWriter iw) { + return iw.getSegmentCount(); + } - @Override - public boolean isClosed() { - return IndexWriter.this.isClosed(); - } + @Override + public boolean isClosed(IndexWriter iw) { + return iw.isClosed(); + } - @Override - public DirectoryReader getReader(boolean applyDeletions, boolean writeAllDeletes) - throws IOException { - return IndexWriter.this.getReader(applyDeletions, writeAllDeletes); - } + @Override + public DirectoryReader getReader( + IndexWriter iw, boolean applyDeletions, boolean writeAllDeletes) throws IOException { + return iw.getReader(applyDeletions, writeAllDeletes); + } - @Override - public int getDocWriterThreadPoolSize() { - return IndexWriter.this.docWriter.perThreadPool.size(); - } + @Override + public int getDocWriterThreadPoolSize(IndexWriter iw) { + return iw.docWriter.perThreadPool.size(); + } - @Override - public boolean isDeleterClosed() { - return IndexWriter.this.isDeleterClosed(); - } + @Override + public boolean isDeleterClosed(IndexWriter iw) { + return iw.isDeleterClosed(); + } - @Override - public SegmentCommitInfo newestSegment() { - return IndexWriter.this.newestSegment(); - } - }; + @Override + public SegmentCommitInfo newestSegment(IndexWriter iw) { + return iw.newestSegment(); + } + }); + + // Piggyback general package-scope accessors. + TestSecrets.setIndexPackageAccess( + new IndexPackageAccess() { + + @Override + public IndexReader.CacheKey newCacheKey() { + return new IndexReader.CacheKey(); + } + + @Override + public void setIndexWriterMaxDocs(int limit) { + IndexWriter.setMaxDocs(limit); + } + + @Override + public FieldInfosBuilder newFieldInfosBuilder(String softDeletesFieldName) { + return new FieldInfosBuilder() { + private FieldInfos.Builder builder = + new FieldInfos.Builder(new FieldInfos.FieldNumbers(softDeletesFieldName)); + + @Override + public FieldInfosBuilder add(FieldInfo fi) { + builder.add(fi); + return this; + } + + @Override + public FieldInfos finish() { + return builder.finish(); + } + }; + } + + @Override + public void checkImpacts(Impacts impacts, int max) { + CheckIndex.checkImpacts(impacts, max); + } + }); } } diff --git a/lucene/core/src/java/org/apache/lucene/index/PackageSecrets.java b/lucene/core/src/java/org/apache/lucene/index/PackageSecrets.java deleted file mode 100644 index 07fdd549278..00000000000 --- a/lucene/core/src/java/org/apache/lucene/index/PackageSecrets.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.lucene.index; - -import org.apache.lucene.internal.tests.IndexPackageSecrets; - -/** - * Exposes certain package-private secrets to the test framework. - * - * @lucene.internal - */ -public final class PackageSecrets { - private PackageSecrets() {} - - /** - * This method returns a test accessor that exposes some internals to test infrastructure. - * Everything here is internal, subject to change without notice and not publicly accessible. - * - *

Within the test infrastructure, do not call this method directly, instead use the static - * factory methods on the corresponding {@code TestSecrets} class. - * - * @param accessToken A secret token to only permit instantiation via the corresponding secrets - * class. - * @return An instance of the secrets class; the return type is hidden from the public API. - * @lucene.internal - */ - public static Object getTestSecrets(Object accessToken) { - return new IndexPackageSecrets(accessToken) { - - @Override - public IndexReader.CacheKey newCacheKey() { - return new IndexReader.CacheKey(); - } - - @Override - public void setIndexWriterMaxDocs(int limit) { - IndexWriter.setMaxDocs(limit); - } - - @Override - public FieldInfosBuilder newFieldInfosBuilder(String softDeletesFieldName) { - return new FieldInfosBuilder() { - private FieldInfos.Builder builder = - new FieldInfos.Builder(new FieldInfos.FieldNumbers(softDeletesFieldName)); - - @Override - public FieldInfosBuilder add(FieldInfo fi) { - builder.add(fi); - return this; - } - - @Override - public FieldInfos finish() { - return builder.finish(); - } - }; - } - }; - } -} diff --git a/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java b/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java index 2bb0b8d7df4..c13858c14ff 100644 --- a/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java +++ b/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java @@ -29,7 +29,8 @@ import org.apache.lucene.codecs.PointsReader; import org.apache.lucene.codecs.StoredFieldsReader; import org.apache.lucene.codecs.TermVectorsReader; -import org.apache.lucene.internal.tests.SegmentReaderSecrets; +import org.apache.lucene.internal.tests.SegmentReaderAccess; +import org.apache.lucene.internal.tests.TestSecrets; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.util.Bits; @@ -395,24 +396,13 @@ public void checkIntegrity() throws IOException { } } - /** - * This method returns a test accessor that exposes class internals to test infrastructure. - * Everything here is internal, subject to change without notice and not publicly accessible. - * - *

Within the test infrastructure, do not call this method directly, instead use the static - * factory methods on the corresponding {@code TestSecrets} class. - * - * @param accessToken A secret token to only permit instantiation via the corresponding secrets - * class. - * @return An instance of the secrets class; the return type is hidden from the public API. - * @lucene.internal - */ - public Object getTestSecrets(Object accessToken) { - return new SegmentReaderSecrets(accessToken) { - @Override - public Object getCore() { - return SegmentReader.this.core; - } - }; + static { + TestSecrets.setSegmentReaderAccess( + new SegmentReaderAccess() { + @Override + public Object getCore(SegmentReader segmentReader) { + return segmentReader.core; + } + }); } } diff --git a/lucene/core/src/java/org/apache/lucene/internal/tests/ConcurrentMergeSchedulerSecrets.java b/lucene/core/src/java/org/apache/lucene/internal/tests/ConcurrentMergeSchedulerAccess.java similarity index 71% rename from lucene/core/src/java/org/apache/lucene/internal/tests/ConcurrentMergeSchedulerSecrets.java rename to lucene/core/src/java/org/apache/lucene/internal/tests/ConcurrentMergeSchedulerAccess.java index 322b38a6498..d9505082112 100644 --- a/lucene/core/src/java/org/apache/lucene/internal/tests/ConcurrentMergeSchedulerSecrets.java +++ b/lucene/core/src/java/org/apache/lucene/internal/tests/ConcurrentMergeSchedulerAccess.java @@ -16,20 +16,14 @@ */ package org.apache.lucene.internal.tests; +import org.apache.lucene.index.ConcurrentMergeScheduler; + /** * Access to {@link org.apache.lucene.index.ConcurrentMergeScheduler} internals exposed to the test * framework. * * @lucene.internal */ -public abstract class ConcurrentMergeSchedulerSecrets { - static final Object PRIVATE_ACCESS_TOKEN = new Object(); - - protected ConcurrentMergeSchedulerSecrets(Object accessToken) { - if (accessToken != PRIVATE_ACCESS_TOKEN) { - throw new RuntimeException("Use static factory methods to instantiate the secrets accessor."); - } - } - - public abstract void setSuppressExceptions(); +public interface ConcurrentMergeSchedulerAccess { + void setSuppressExceptions(ConcurrentMergeScheduler cms); } diff --git a/lucene/core/src/java/org/apache/lucene/internal/tests/IndexPackageSecrets.java b/lucene/core/src/java/org/apache/lucene/internal/tests/IndexPackageAccess.java similarity index 69% rename from lucene/core/src/java/org/apache/lucene/internal/tests/IndexPackageSecrets.java rename to lucene/core/src/java/org/apache/lucene/internal/tests/IndexPackageAccess.java index b0efac81389..545b5659933 100644 --- a/lucene/core/src/java/org/apache/lucene/internal/tests/IndexPackageSecrets.java +++ b/lucene/core/src/java/org/apache/lucene/internal/tests/IndexPackageAccess.java @@ -18,6 +18,7 @@ import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.FieldInfos; +import org.apache.lucene.index.Impacts; import org.apache.lucene.index.IndexReader; /** @@ -25,23 +26,17 @@ * * @lucene.internal */ -public abstract class IndexPackageSecrets { - static final Object PRIVATE_ACCESS_TOKEN = new Object(); +public interface IndexPackageAccess { + IndexReader.CacheKey newCacheKey(); - protected IndexPackageSecrets(Object accessToken) { - if (accessToken != PRIVATE_ACCESS_TOKEN) { - throw new RuntimeException("Use static factory methods to instantiate the secrets accessor."); - } - } - - public abstract IndexReader.CacheKey newCacheKey(); + void setIndexWriterMaxDocs(int limit); - public abstract void setIndexWriterMaxDocs(int limit); + FieldInfosBuilder newFieldInfosBuilder(String softDeletesFieldName); - public abstract FieldInfosBuilder newFieldInfosBuilder(String softDeletesFieldName); + void checkImpacts(Impacts impacts, int max); /** Public type exposing {@link FieldInfo} internal builders. */ - public interface FieldInfosBuilder { + interface FieldInfosBuilder { FieldInfosBuilder add(FieldInfo fi); FieldInfos finish(); diff --git a/lucene/core/src/java/org/apache/lucene/internal/tests/IndexWriterSecrets.java b/lucene/core/src/java/org/apache/lucene/internal/tests/IndexWriterAccess.java similarity index 64% rename from lucene/core/src/java/org/apache/lucene/internal/tests/IndexWriterSecrets.java rename to lucene/core/src/java/org/apache/lucene/internal/tests/IndexWriterAccess.java index 2c27084ffb6..82ee409b976 100644 --- a/lucene/core/src/java/org/apache/lucene/internal/tests/IndexWriterSecrets.java +++ b/lucene/core/src/java/org/apache/lucene/internal/tests/IndexWriterAccess.java @@ -18,6 +18,7 @@ import java.io.IOException; import org.apache.lucene.index.DirectoryReader; +import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.SegmentCommitInfo; /** @@ -25,27 +26,19 @@ * * @lucene.internal */ -public abstract class IndexWriterSecrets { - static final Object PRIVATE_ACCESS_TOKEN = new Object(); +public interface IndexWriterAccess { + String segString(IndexWriter iw); - protected IndexWriterSecrets(Object accessToken) { - if (accessToken != PRIVATE_ACCESS_TOKEN) { - throw new RuntimeException("Use static factory methods to instantiate the secrets accessor."); - } - } + int getSegmentCount(IndexWriter iw); - public abstract String segString(); + boolean isClosed(IndexWriter iw); - public abstract int getSegmentCount(); - - public abstract boolean isClosed(); - - public abstract DirectoryReader getReader(boolean applyDeletions, boolean writeAllDeletes) + DirectoryReader getReader(IndexWriter iw, boolean applyDeletions, boolean writeAllDeletes) throws IOException; - public abstract int getDocWriterThreadPoolSize(); + int getDocWriterThreadPoolSize(IndexWriter iw); - public abstract boolean isDeleterClosed(); + boolean isDeleterClosed(IndexWriter iw); - public abstract SegmentCommitInfo newestSegment(); + SegmentCommitInfo newestSegment(IndexWriter iw); } diff --git a/lucene/core/src/java/org/apache/lucene/internal/tests/SegmentReaderSecrets.java b/lucene/core/src/java/org/apache/lucene/internal/tests/SegmentReaderAccess.java similarity index 74% rename from lucene/core/src/java/org/apache/lucene/internal/tests/SegmentReaderSecrets.java rename to lucene/core/src/java/org/apache/lucene/internal/tests/SegmentReaderAccess.java index 1ee0f70cd5d..724830e0641 100644 --- a/lucene/core/src/java/org/apache/lucene/internal/tests/SegmentReaderSecrets.java +++ b/lucene/core/src/java/org/apache/lucene/internal/tests/SegmentReaderAccess.java @@ -16,23 +16,18 @@ */ package org.apache.lucene.internal.tests; +import org.apache.lucene.index.SegmentReader; + /** * Access to {@link org.apache.lucene.index.SegmentReader} internals exposed to the test framework. * * @lucene.internal */ -public abstract class SegmentReaderSecrets { - static final Object PRIVATE_ACCESS_TOKEN = new Object(); - - protected SegmentReaderSecrets(Object accessToken) { - if (accessToken != PRIVATE_ACCESS_TOKEN) { - throw new RuntimeException("Use static factory methods to instantiate the secrets accessor."); - } - } - +public interface SegmentReaderAccess { /** * @return Returns the package-private {@code SegmentCoreReaders} associated with the segment - * reader. + * reader. We don't use the actual type anywhere, so just return it as an object, without + * type. */ - public abstract Object getCore(); + Object getCore(SegmentReader segmentReader); } diff --git a/lucene/core/src/java/org/apache/lucene/internal/tests/TestSecrets.java b/lucene/core/src/java/org/apache/lucene/internal/tests/TestSecrets.java index ea3cd8f7f1d..36422a17720 100644 --- a/lucene/core/src/java/org/apache/lucene/internal/tests/TestSecrets.java +++ b/lucene/core/src/java/org/apache/lucene/internal/tests/TestSecrets.java @@ -16,36 +16,90 @@ */ package org.apache.lucene.internal.tests; +import java.util.Objects; +import java.util.function.Consumer; import org.apache.lucene.index.ConcurrentMergeScheduler; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.SegmentReader; -/** A set of static methods returning test secret accessors. */ +/** + * A set of static methods returning accessors for internal, package-private functionality in + * Lucene. + */ public final class TestSecrets { - private TestSecrets() {} + /* + * The JDK uses unsafe to ensure the secrets-initializing classes have their static blocks + * invoked. We could just leverage the JLS and invoke a static method (or a constructor) on the + * class but the method below seems simpler and has no side-effects. + */ + static { + Consumer> ensureInitialized = + clazz -> { + try { + // A no-op forName call has a side-effect of initializing the class. This only happens + // once and has no side-effects. + Class.forName(clazz.getName()); + } catch (ClassNotFoundException e) { + throw new RuntimeException(e); + } + }; - /** Return the accessor to internal secrets for an {@link IndexWriter}. */ - public static IndexWriterSecrets getSecrets(IndexWriter writer) { - return (IndexWriterSecrets) writer.getTestSecrets(IndexWriterSecrets.PRIVATE_ACCESS_TOKEN); + ensureInitialized.accept(ConcurrentMergeScheduler.class); + ensureInitialized.accept(SegmentReaderAccess.class); + ensureInitialized.accept(IndexWriter.class); } + private static IndexPackageAccess indexPackageAccess; + private static ConcurrentMergeSchedulerAccess cmsAccess; + private static SegmentReaderAccess segmentReaderAccess; + private static IndexWriterAccess indexWriterAccess; + + private TestSecrets() {} + /** Return the accessor to internal secrets for an {@link IndexReader}. */ - public static IndexPackageSecrets getIndexPackageSecrets() { - return (IndexPackageSecrets) - org.apache.lucene.index.PackageSecrets.getTestSecrets( - IndexPackageSecrets.PRIVATE_ACCESS_TOKEN); + public static IndexPackageAccess getIndexPackageAccess() { + return Objects.requireNonNull(indexPackageAccess); + } + + /** Return the accessor to internal secrets for an {@link ConcurrentMergeScheduler}. */ + public static ConcurrentMergeSchedulerAccess getConcurrentMergeSchedulerAccess() { + return Objects.requireNonNull(cmsAccess); } /** Return the accessor to internal secrets for an {@link SegmentReader}. */ - public static SegmentReaderSecrets getSecrets(SegmentReader segmentReader) { - return (SegmentReaderSecrets) - segmentReader.getTestSecrets(SegmentReaderSecrets.PRIVATE_ACCESS_TOKEN); + public static SegmentReaderAccess getSegmentReaderAccess() { + return Objects.requireNonNull(segmentReaderAccess); } /** Return the accessor to internal secrets for an {@link IndexWriter}. */ - public static ConcurrentMergeSchedulerSecrets getSecrets(ConcurrentMergeScheduler scheduler) { - return (ConcurrentMergeSchedulerSecrets) - scheduler.getTestSecrets(ConcurrentMergeSchedulerSecrets.PRIVATE_ACCESS_TOKEN); + public static IndexWriterAccess getIndexWriterAccess() { + return Objects.requireNonNull(indexWriterAccess); + } + + public static void setIndexWriterAccess(IndexWriterAccess indexWriterAccess) { + ensureNull(TestSecrets.indexWriterAccess); + TestSecrets.indexWriterAccess = indexWriterAccess; + } + + public static void setIndexPackageAccess(IndexPackageAccess indexPackageAccess) { + ensureNull(TestSecrets.indexPackageAccess); + TestSecrets.indexPackageAccess = indexPackageAccess; + } + + public static void setConcurrentMergeSchedulerAccess(ConcurrentMergeSchedulerAccess cmsAccess) { + ensureNull(TestSecrets.cmsAccess); + TestSecrets.cmsAccess = cmsAccess; + } + + public static void setSegmentReaderAccess(SegmentReaderAccess segmentReaderAccess) { + ensureNull(TestSecrets.segmentReaderAccess); + TestSecrets.segmentReaderAccess = segmentReaderAccess; + } + + private static void ensureNull(Object ob) { + if (ob != null) { + throw new AssertionError("The accessor is already set."); + } } } diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/AssertingLeafReader.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/AssertingLeafReader.java index 9df7858a895..15fcd143e4e 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/AssertingLeafReader.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/AssertingLeafReader.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Objects; import org.apache.lucene.index.BinaryDocValues; -import org.apache.lucene.index.CheckIndex; import org.apache.lucene.index.DocValues; import org.apache.lucene.index.DocValuesType; import org.apache.lucene.index.FieldInfo; @@ -43,6 +42,7 @@ import org.apache.lucene.index.TermState; import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; +import org.apache.lucene.internal.tests.TestSecrets; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.util.Bits; import org.apache.lucene.util.BytesRef; @@ -518,7 +518,8 @@ public Impacts getImpacts() throws IOException { assert docID() >= 0 || lastShallowTarget >= 0 : "Cannot get impacts until the iterator is positioned or advanceShallow has been called"; Impacts impacts = in.getImpacts(); - CheckIndex.checkImpacts(impacts, Math.max(docID(), lastShallowTarget)); + TestSecrets.getIndexPackageAccess() + .checkImpacts(impacts, Math.max(docID(), lastShallowTarget)); return new AssertingImpacts(impacts, this); } diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseFieldInfoFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseFieldInfoFormatTestCase.java index ae4354ae9d3..51ed1c472bc 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseFieldInfoFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseFieldInfoFormatTestCase.java @@ -65,7 +65,7 @@ public void testOneField() throws Exception { addAttributes(fi); FieldInfos infos = - TestSecrets.getIndexPackageSecrets().newFieldInfosBuilder(null).add(fi).finish(); + TestSecrets.getIndexPackageAccess().newFieldInfosBuilder(null).add(fi).finish(); codec.fieldInfosFormat().write(dir, segmentInfo, "", infos, IOContext.DEFAULT); @@ -94,7 +94,7 @@ public void testImmutableAttributes() throws Exception { fi.putAttribute("bar", "baz"); FieldInfos infos = - TestSecrets.getIndexPackageSecrets().newFieldInfosBuilder(null).add(fi).finish(); + TestSecrets.getIndexPackageAccess().newFieldInfosBuilder(null).add(fi).finish(); codec.fieldInfosFormat().write(dir, segmentInfo, "", infos, IOContext.DEFAULT); @@ -135,7 +135,7 @@ public void eval(MockDirectoryWrapper dir) throws IOException { addAttributes(fi); FieldInfos infos = - TestSecrets.getIndexPackageSecrets().newFieldInfosBuilder(null).add(fi).finish(); + TestSecrets.getIndexPackageAccess().newFieldInfosBuilder(null).add(fi).finish(); fail.setDoFail(); expectThrows( @@ -171,7 +171,7 @@ public void eval(MockDirectoryWrapper dir) throws IOException { addAttributes(fi); FieldInfos infos = - TestSecrets.getIndexPackageSecrets().newFieldInfosBuilder(null).add(fi).finish(); + TestSecrets.getIndexPackageAccess().newFieldInfosBuilder(null).add(fi).finish(); fail.setDoFail(); expectThrows( @@ -207,7 +207,7 @@ public void eval(MockDirectoryWrapper dir) throws IOException { addAttributes(fi); FieldInfos infos = - TestSecrets.getIndexPackageSecrets().newFieldInfosBuilder(null).add(fi).finish(); + TestSecrets.getIndexPackageAccess().newFieldInfosBuilder(null).add(fi).finish(); codec.fieldInfosFormat().write(dir, segmentInfo, "", infos, IOContext.DEFAULT); @@ -245,7 +245,7 @@ public void eval(MockDirectoryWrapper dir) throws IOException { addAttributes(fi); FieldInfos infos = - TestSecrets.getIndexPackageSecrets().newFieldInfosBuilder(null).add(fi).finish(); + TestSecrets.getIndexPackageAccess().newFieldInfosBuilder(null).add(fi).finish(); codec.fieldInfosFormat().write(dir, segmentInfo, "", infos, IOContext.DEFAULT); @@ -278,7 +278,7 @@ public void testRandom() throws Exception { String softDeletesField = random().nextBoolean() ? TestUtil.randomUnicodeString(random()) : null; - var builder = TestSecrets.getIndexPackageSecrets().newFieldInfosBuilder(softDeletesField); + var builder = TestSecrets.getIndexPackageAccess().newFieldInfosBuilder(softDeletesField); for (String field : fieldNames) { IndexableFieldType fieldType = randomFieldType(random()); diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseIndexFileFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseIndexFileFormatTestCase.java index 0c6dad7385a..3653fc6960f 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseIndexFileFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseIndexFileFormatTestCase.java @@ -626,7 +626,7 @@ public void testRandomExceptions() throws Exception { // OK: writer was closed by abort; we just reopen now: dir.setRandomIOExceptionRateOnOpen( 0.0); // disable exceptions on openInput until next iteration - assertTrue(TestSecrets.getSecrets(iw).isDeleterClosed()); + assertTrue(TestSecrets.getIndexWriterAccess().isDeleterClosed(iw)); assertTrue(allowAlreadyClosed); allowAlreadyClosed = false; conf = newIndexWriterConfig(analyzer); @@ -667,7 +667,7 @@ public void testRandomExceptions() throws Exception { // OK: writer was closed by abort; we just reopen now: dir.setRandomIOExceptionRateOnOpen( 0.0); // disable exceptions on openInput until next iteration - assertTrue(TestSecrets.getSecrets(iw).isDeleterClosed()); + assertTrue(TestSecrets.getIndexWriterAccess().isDeleterClosed(iw)); assertTrue(allowAlreadyClosed); allowAlreadyClosed = false; conf = newIndexWriterConfig(analyzer); diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseMergePolicyTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseMergePolicyTestCase.java index 8bfa2a83e25..0c6c950c58e 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseMergePolicyTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseMergePolicyTestCase.java @@ -115,7 +115,7 @@ public synchronized void merge(MergeSource mergeSource, MergeTrigger trigger) DirectoryReader.open(writer).close(); } for (int i = 5; i >= 0; --i) { - final int segmentCount = TestSecrets.getSecrets(writer).getSegmentCount(); + final int segmentCount = TestSecrets.getIndexWriterAccess().getSegmentCount(writer); final int maxNumSegments = i == 0 ? 1 : TestUtil.nextInt(random(), 1, 10); mayMerge.set(segmentCount > maxNumSegments); if (VERBOSE) { diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BasePointsFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BasePointsFormatTestCase.java index 67f36d35e5c..460b4ad6efb 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BasePointsFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BasePointsFormatTestCase.java @@ -654,7 +654,8 @@ private void verify( if (expectExceptions) { MergeScheduler ms = iwc.getMergeScheduler(); if (ms instanceof ConcurrentMergeScheduler) { - TestSecrets.getSecrets(((ConcurrentMergeScheduler) ms)).setSuppressExceptions(); + TestSecrets.getConcurrentMergeSchedulerAccess() + .setSuppressExceptions((ConcurrentMergeScheduler) ms); } } RandomIndexWriter w = new RandomIndexWriter(random(), dir, iwc); @@ -703,7 +704,8 @@ private void verify( if (expectExceptions) { MergeScheduler ms = iwc.getMergeScheduler(); if (ms instanceof ConcurrentMergeScheduler) { - TestSecrets.getSecrets(((ConcurrentMergeScheduler) ms)).setSuppressExceptions(); + TestSecrets.getConcurrentMergeSchedulerAccess() + .setSuppressExceptions((ConcurrentMergeScheduler) ms); } } w = new RandomIndexWriter(random(), dir, iwc); diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/DocHelper.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/DocHelper.java index 22e34e56e4c..b6cc21cfaa0 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/DocHelper.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/DocHelper.java @@ -298,7 +298,7 @@ public static SegmentCommitInfo writeDoc( // writer.setNoCFSRatio(0.0); writer.addDocument(doc); writer.commit(); - SegmentCommitInfo info = TestSecrets.getSecrets(writer).newestSegment(); + SegmentCommitInfo info = TestSecrets.getIndexWriterAccess().newestSegment(writer); writer.close(); return info; } diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/OwnCacheKeyMultiReader.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/OwnCacheKeyMultiReader.java index 17af9fb9781..2e8cbc8f719 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/OwnCacheKeyMultiReader.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/OwnCacheKeyMultiReader.java @@ -31,7 +31,7 @@ public final class OwnCacheKeyMultiReader extends MultiReader { private final CacheHelper cacheHelper = new CacheHelper() { - private final CacheKey cacheKey = TestSecrets.getIndexPackageSecrets().newCacheKey(); + private final CacheKey cacheKey = TestSecrets.getIndexPackageAccess().newCacheKey(); @Override public CacheKey getKey() { diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/RandomIndexWriter.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/RandomIndexWriter.java index 2bd5ba64c05..4ad7ea16654 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/RandomIndexWriter.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/RandomIndexWriter.java @@ -253,7 +253,7 @@ private void flushAllBuffersSequentially() throws IOException { System.out.println( "RIW.add/updateDocument: now flushing the largest writer at docCount=" + docCount); } - int threadPoolSize = TestSecrets.getSecrets(w).getDocWriterThreadPoolSize(); + int threadPoolSize = TestSecrets.getIndexWriterAccess().getDocWriterThreadPoolSize(w); int numFlushes = Math.min(1, r.nextInt(threadPoolSize + 1)); for (int i = 0; i < numFlushes; i++) { if (w.flushNextBuffer() == false) { @@ -440,8 +440,8 @@ public void setDoRandomForceMergeAssert(boolean v) { private void doRandomForceMerge() throws IOException { if (doRandomForceMerge) { - var indexWriterSecrets = TestSecrets.getSecrets(w); - final int segCount = indexWriterSecrets.getSegmentCount(); + var indexWriterSecrets = TestSecrets.getIndexWriterAccess(); + final int segCount = indexWriterSecrets.getSegmentCount(w); if (r.nextBoolean() || segCount == 0) { // full forceMerge if (LuceneTestCase.VERBOSE) { @@ -456,8 +456,8 @@ private void doRandomForceMerge() throws IOException { } w.forceMerge(limit); if (limit == 1 || (config.getMergePolicy() instanceof TieredMergePolicy) == false) { - assert !doRandomForceMergeAssert || indexWriterSecrets.getSegmentCount() <= limit - : "limit=" + limit + " actual=" + indexWriterSecrets.getSegmentCount(); + assert !doRandomForceMergeAssert || indexWriterSecrets.getSegmentCount(w) <= limit + : "limit=" + limit + " actual=" + indexWriterSecrets.getSegmentCount(w); } } else { if (LuceneTestCase.VERBOSE) { @@ -483,7 +483,7 @@ public DirectoryReader getReader(boolean applyDeletions, boolean writeAllDeletes if (r.nextInt(5) == 1) { w.commit(); } - return TestSecrets.getSecrets(w).getReader(applyDeletions, writeAllDeletes); + return TestSecrets.getIndexWriterAccess().getReader(w, applyDeletions, writeAllDeletes); } else { if (LuceneTestCase.VERBOSE) { System.out.println("RIW.getReader: open new reader"); @@ -497,7 +497,7 @@ public DirectoryReader getReader(boolean applyDeletions, boolean writeAllDeletes return reader; } } else { - return TestSecrets.getSecrets(w).getReader(applyDeletions, writeAllDeletes); + return TestSecrets.getIndexWriterAccess().getReader(w, applyDeletions, writeAllDeletes); } } } @@ -511,13 +511,15 @@ public DirectoryReader getReader(boolean applyDeletions, boolean writeAllDeletes public void close() throws IOException { boolean success = false; try { - var indexWriterSecrets = TestSecrets.getSecrets(w); - if (indexWriterSecrets.isClosed() == false) { + var indexWriterSecrets = TestSecrets.getIndexWriterAccess(); + if (indexWriterSecrets.isClosed(w) == false) { LuceneTestCase.maybeChangeLiveIndexWriterConfig(r, config); } // if someone isn't using getReader() API, we want to be sure to // forceMerge since presumably they might open a reader on the dir. - if (getReaderCalled == false && r.nextInt(8) == 2 && indexWriterSecrets.isClosed() == false) { + if (getReaderCalled == false + && r.nextInt(8) == 2 + && indexWriterSecrets.isClosed(w) == false) { doRandomForceMerge(); if (config.getCommitOnClose() == false) { // index may have changed, must commit the changes, or otherwise they are discarded by the diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/RandomPostingsTester.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/RandomPostingsTester.java index 5ac6f7e4c0a..b277cf46245 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/RandomPostingsTester.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/RandomPostingsTester.java @@ -46,7 +46,6 @@ import org.apache.lucene.codecs.FieldsProducer; import org.apache.lucene.codecs.NormsProducer; import org.apache.lucene.index.BaseTermsEnum; -import org.apache.lucene.index.CheckIndex; import org.apache.lucene.index.DocValuesType; import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.FieldInfos; @@ -64,6 +63,7 @@ import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.index.VectorSimilarityFunction; +import org.apache.lucene.internal.tests.TestSecrets; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FlushInfo; @@ -1243,7 +1243,7 @@ private void verifyEnum( if (doc > max) { impactsEnum.advanceShallow(doc); Impacts impacts = impactsEnum.getImpacts(); - CheckIndex.checkImpacts(impacts, doc); + TestSecrets.getIndexPackageAccess().checkImpacts(impacts, doc); impactsCopy = impacts.getImpacts(0).stream() .map(i -> new Impact(i.freq, i.norm)) @@ -1289,7 +1289,7 @@ private void verifyEnum( impactsEnum.advanceShallow(target); Impacts impacts = impactsEnum.getImpacts(); - CheckIndex.checkImpacts(impacts, target); + TestSecrets.getIndexPackageAccess().checkImpacts(impacts, target); impactsCopy = Collections.singletonList(new Impact(Integer.MAX_VALUE, 1L)); for (int level = 0; level < impacts.numLevels(); ++level) { if (impacts.getDocIdUpTo(level) >= max) { @@ -1330,7 +1330,7 @@ private void verifyEnum( int delta = Math.min(1 + random.nextInt(512), DocIdSetIterator.NO_MORE_DOCS - doc); max = doc + delta; Impacts impacts = impactsEnum.getImpacts(); - CheckIndex.checkImpacts(impacts, doc); + TestSecrets.getIndexPackageAccess().checkImpacts(impacts, doc); impactsCopy = Collections.singletonList(new Impact(Integer.MAX_VALUE, 1L)); for (int level = 0; level < impacts.numLevels(); ++level) { if (impacts.getDocIdUpTo(level) >= max) { diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/ThreadedIndexingAndSearchingTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/ThreadedIndexingAndSearchingTestCase.java index 1122f463b49..486111c88b8 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/ThreadedIndexingAndSearchingTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/ThreadedIndexingAndSearchingTestCase.java @@ -42,7 +42,6 @@ import org.apache.lucene.index.Term; import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; -import org.apache.lucene.internal.tests.IndexWriterSecrets; import org.apache.lucene.internal.tests.TestSecrets; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.PhraseQuery; @@ -78,7 +77,6 @@ public abstract class ThreadedIndexingAndSearchingTestCase extends LuceneTestCas protected Directory dir; protected IndexWriter writer; - protected IndexWriterSecrets writerSecrets; private static class SubDocs { public final String packID; @@ -410,7 +408,8 @@ public void run() { + " si=" + segReader.getSegmentInfo(), !assertMergedSegmentsWarmed - || warmed.containsKey(TestSecrets.getSecrets(segReader).getCore())); + || warmed.containsKey( + TestSecrets.getSegmentReaderAccess().getCore(segReader))); } } if (s.getIndexReader().numDocs() > 0) { @@ -516,7 +515,7 @@ public void runTest(String testName) throws Exception { if (VERBOSE) { System.out.println("TEST: now warm merged reader=" + reader); } - var core = TestSecrets.getSecrets((SegmentReader) reader).getCore(); + var core = TestSecrets.getSegmentReaderAccess().getCore((SegmentReader) reader); warmed.put(core, Boolean.TRUE); final int maxDoc = reader.maxDoc(); final Bits liveDocs = reader.getLiveDocs(); @@ -550,7 +549,6 @@ public void message(String component, String message) { }); } writer = new IndexWriter(dir, conf); - writerSecrets = TestSecrets.getSecrets(writer); TestUtil.reduceOpenFiles(writer); final ExecutorService es = @@ -717,7 +715,12 @@ public void message(String component, String message) { assertFalse(doFail); assertEquals( - "index=" + writerSecrets.segString() + " addCount=" + addCount + " delCount=" + delCount, + "index=" + + TestSecrets.getIndexWriterAccess().segString(writer) + + " addCount=" + + addCount + + " delCount=" + + delCount, addCount.get() - delCount.get(), s.getIndexReader().numDocs()); releaseSearcher(s); @@ -725,7 +728,12 @@ public void message(String component, String message) { writer.commit(); assertEquals( - "index=" + writerSecrets.segString() + " addCount=" + addCount + " delCount=" + delCount, + "index=" + + TestSecrets.getIndexWriterAccess().segString(writer) + + " addCount=" + + addCount + + " delCount=" + + delCount, addCount.get() - delCount.get(), writer.getDocStats().numDocs); diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java index ab75441eef1..ca7ff895c90 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java @@ -736,12 +736,12 @@ public void tearDown() throws Exception { * one index; call {@link #restoreIndexWriterMaxDocs} once your test is done. */ public void setIndexWriterMaxDocs(int limit) { - TestSecrets.getIndexPackageSecrets().setIndexWriterMaxDocs(limit); + TestSecrets.getIndexPackageAccess().setIndexWriterMaxDocs(limit); } /** Returns to the default {@link IndexWriter#MAX_DOCS} limit. */ public void restoreIndexWriterMaxDocs() { - TestSecrets.getIndexPackageSecrets().setIndexWriterMaxDocs(IndexWriter.MAX_DOCS); + TestSecrets.getIndexPackageAccess().setIndexWriterMaxDocs(IndexWriter.MAX_DOCS); } // ----------------------------------------------------------------- From 40c515e142bf6a873944b359500a8e28a4105c03 Mon Sep 17 00:00:00 2001 From: Dawid Weiss Date: Mon, 20 Dec 2021 15:43:22 +0100 Subject: [PATCH 23/32] Rephrase comment. --- .../org/apache/lucene/internal/tests/TestSecrets.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/lucene/core/src/java/org/apache/lucene/internal/tests/TestSecrets.java b/lucene/core/src/java/org/apache/lucene/internal/tests/TestSecrets.java index 36422a17720..f6c33086171 100644 --- a/lucene/core/src/java/org/apache/lucene/internal/tests/TestSecrets.java +++ b/lucene/core/src/java/org/apache/lucene/internal/tests/TestSecrets.java @@ -28,17 +28,14 @@ * Lucene. */ public final class TestSecrets { - /* - * The JDK uses unsafe to ensure the secrets-initializing classes have their static blocks - * invoked. We could just leverage the JLS and invoke a static method (or a constructor) on the - * class but the method below seems simpler and has no side-effects. - */ static { Consumer> ensureInitialized = clazz -> { try { - // A no-op forName call has a side-effect of initializing the class. This only happens - // once and has no side-effects. + // A no-op forName here has a side-effect of ensuring the class is loaded and + // initialized. + // This only happens once. We could just leverage the JLS and invoke a static + // method (or a constructor) on the target class but the method below seems simpler. Class.forName(clazz.getName()); } catch (ClassNotFoundException e) { throw new RuntimeException(e); From 7366b81197a7ff7e040d744bfc2d8f8218db2ef0 Mon Sep 17 00:00:00 2001 From: Dawid Weiss Date: Mon, 20 Dec 2021 15:48:26 +0100 Subject: [PATCH 24/32] Added changes and migration entry. --- lucene/CHANGES.txt | 4 ++++ lucene/MIGRATE.md | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt index 568c280172c..9eff9b02be4 100644 --- a/lucene/CHANGES.txt +++ b/lucene/CHANGES.txt @@ -42,6 +42,10 @@ API Changes * LUCENE-10244: MultiCollector::getCollectors is now public, allowing users to access the wrapped collectors. (Andriy Redko) +* LUCENE-10301: the test framework is now a module. All the classes have been moved from + org.apache.lucene.* to org.apache.lucene.tests.* to avoid package name conflicts with the + core module. (Dawid Weiss) + New Features --------------------- diff --git a/lucene/MIGRATE.md b/lucene/MIGRATE.md index d61b9fb5ccf..7862c887ab0 100644 --- a/lucene/MIGRATE.md +++ b/lucene/MIGRATE.md @@ -27,6 +27,13 @@ behind the scenes. It is the responsibility of the caller to to call ## Migration from Lucene 9.0 to Lucene 9.1 +### Test framework package migration and module (LUCENE-10301) + +The test framework is now a module. All the classes have been moved from +`org.apache.lucene.*` to `org.apache.lucene.tests.*` to avoid package name conflicts +with the core module. If you were using the Lucene test framework, the migration should be +fairly automatic (package prefix). + ### Minor syntactical changes in StandardQueryParser (LUCENE-10223) Added interval functions and min-should-match support to `StandardQueryParser`. This From d8689c0907a2fecf4b9305ab675d4408d751680b Mon Sep 17 00:00:00 2001 From: Uwe Schindler Date: Tue, 21 Dec 2021 17:29:36 +0100 Subject: [PATCH 25/32] Fix compile error after merge --- .../apache/lucene/util/automaton/TestNFARunAutomaton.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lucene/core/src/test/org/apache/lucene/util/automaton/TestNFARunAutomaton.java b/lucene/core/src/test/org/apache/lucene/util/automaton/TestNFARunAutomaton.java index 6b4c4806001..87ab2871ac1 100644 --- a/lucene/core/src/test/org/apache/lucene/util/automaton/TestNFARunAutomaton.java +++ b/lucene/core/src/test/org/apache/lucene/util/automaton/TestNFARunAutomaton.java @@ -26,14 +26,15 @@ import org.apache.lucene.document.Field; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.RandomIndexWriter; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.AutomatonQuery; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.store.Directory; import org.apache.lucene.util.IntsRef; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; +import org.apache.lucene.tests.util.LuceneTestCase; +import org.apache.lucene.tests.util.TestUtil; +import org.apache.lucene.tests.util.automaton.AutomatonTestUtil; public class TestNFARunAutomaton extends LuceneTestCase { From a8b562cabfde6c99bd0692e11a7d1bdbe11deeaa Mon Sep 17 00:00:00 2001 From: Uwe Schindler Date: Tue, 21 Dec 2021 17:35:57 +0100 Subject: [PATCH 26/32] Spotless apply --- .../org/apache/lucene/util/automaton/TestNFARunAutomaton.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lucene/core/src/test/org/apache/lucene/util/automaton/TestNFARunAutomaton.java b/lucene/core/src/test/org/apache/lucene/util/automaton/TestNFARunAutomaton.java index 87ab2871ac1..6f9b73fcbed 100644 --- a/lucene/core/src/test/org/apache/lucene/util/automaton/TestNFARunAutomaton.java +++ b/lucene/core/src/test/org/apache/lucene/util/automaton/TestNFARunAutomaton.java @@ -26,15 +26,15 @@ import org.apache.lucene.document.Field; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.AutomatonQuery; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.store.Directory; -import org.apache.lucene.util.IntsRef; +import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.lucene.tests.util.TestUtil; import org.apache.lucene.tests.util.automaton.AutomatonTestUtil; +import org.apache.lucene.util.IntsRef; public class TestNFARunAutomaton extends LuceneTestCase { From b1c2fa93935ab5d7cb6ab4075c29335fc60661be Mon Sep 17 00:00:00 2001 From: Uwe Schindler Date: Tue, 21 Dec 2021 18:17:44 +0100 Subject: [PATCH 27/32] Add a check that we can only call TestSecrets from the test framework --- .../randomization/policies/tests.policy | 2 -- .../lucene/internal/tests/TestSecrets.java | 27 ++++++++++++++++++- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/gradle/testing/randomization/policies/tests.policy b/gradle/testing/randomization/policies/tests.policy index 71dc7991fdb..ff413cda743 100644 --- a/gradle/testing/randomization/policies/tests.policy +++ b/gradle/testing/randomization/policies/tests.policy @@ -57,8 +57,6 @@ grant { permission java.lang.reflect.ReflectPermission "suppressAccessChecks"; // needed by cyberneko usage by benchmarks on J9 permission java.lang.RuntimePermission "accessClassInPackage.org.apache.xerces.util"; - // needed by org.apache.logging.log4j - permission java.lang.RuntimePermission "getenv.*"; permission java.lang.RuntimePermission "getClassLoader"; permission java.lang.RuntimePermission "setContextClassLoader"; diff --git a/lucene/core/src/java/org/apache/lucene/internal/tests/TestSecrets.java b/lucene/core/src/java/org/apache/lucene/internal/tests/TestSecrets.java index f6c33086171..bdc83bafd23 100644 --- a/lucene/core/src/java/org/apache/lucene/internal/tests/TestSecrets.java +++ b/lucene/core/src/java/org/apache/lucene/internal/tests/TestSecrets.java @@ -16,6 +16,7 @@ */ package org.apache.lucene.internal.tests; +import java.lang.StackWalker.StackFrame; import java.util.Objects; import java.util.function.Consumer; import org.apache.lucene.index.ConcurrentMergeScheduler; @@ -56,39 +57,47 @@ private TestSecrets() {} /** Return the accessor to internal secrets for an {@link IndexReader}. */ public static IndexPackageAccess getIndexPackageAccess() { + ensureCaller(); return Objects.requireNonNull(indexPackageAccess); } /** Return the accessor to internal secrets for an {@link ConcurrentMergeScheduler}. */ public static ConcurrentMergeSchedulerAccess getConcurrentMergeSchedulerAccess() { + ensureCaller(); return Objects.requireNonNull(cmsAccess); } /** Return the accessor to internal secrets for an {@link SegmentReader}. */ public static SegmentReaderAccess getSegmentReaderAccess() { + ensureCaller(); return Objects.requireNonNull(segmentReaderAccess); } /** Return the accessor to internal secrets for an {@link IndexWriter}. */ public static IndexWriterAccess getIndexWriterAccess() { + ensureCaller(); return Objects.requireNonNull(indexWriterAccess); } + /** For internal initialization only. */ public static void setIndexWriterAccess(IndexWriterAccess indexWriterAccess) { ensureNull(TestSecrets.indexWriterAccess); TestSecrets.indexWriterAccess = indexWriterAccess; } + /** For internal initialization only. */ public static void setIndexPackageAccess(IndexPackageAccess indexPackageAccess) { ensureNull(TestSecrets.indexPackageAccess); TestSecrets.indexPackageAccess = indexPackageAccess; } + /** For internal initialization only. */ public static void setConcurrentMergeSchedulerAccess(ConcurrentMergeSchedulerAccess cmsAccess) { ensureNull(TestSecrets.cmsAccess); TestSecrets.cmsAccess = cmsAccess; } + /** For internal initialization only. */ public static void setSegmentReaderAccess(SegmentReaderAccess segmentReaderAccess) { ensureNull(TestSecrets.segmentReaderAccess); TestSecrets.segmentReaderAccess = segmentReaderAccess; @@ -96,7 +105,23 @@ public static void setSegmentReaderAccess(SegmentReaderAccess segmentReaderAcces private static void ensureNull(Object ob) { if (ob != null) { - throw new AssertionError("The accessor is already set."); + throw new AssertionError( + "The accessor is already set. It can only be called from inside Lucene Core."); + } + } + + private static void ensureCaller() { + final boolean validCaller = + StackWalker.getInstance() + .walk( + s -> + s.skip(2) + .limit(1) + .map(StackFrame::getClassName) + .allMatch(c -> c.startsWith("org.apache.lucene.tests."))); + if (!validCaller) { + throw new UnsupportedOperationException( + "Lucene TestSecrets can only be used by the test-framework."); } } } From 66bf9dbaac86a1ae003d79c8c1ef09085afbc49e Mon Sep 17 00:00:00 2001 From: Uwe Schindler Date: Tue, 21 Dec 2021 18:35:55 +0100 Subject: [PATCH 28/32] Add a test --- .../internal/tests/TestTestSecrets.java | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 lucene/core/src/test/org/apache/lucene/internal/tests/TestTestSecrets.java diff --git a/lucene/core/src/test/org/apache/lucene/internal/tests/TestTestSecrets.java b/lucene/core/src/test/org/apache/lucene/internal/tests/TestTestSecrets.java new file mode 100644 index 00000000000..5e3c4538215 --- /dev/null +++ b/lucene/core/src/test/org/apache/lucene/internal/tests/TestTestSecrets.java @@ -0,0 +1,33 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.lucene.internal.tests; + +import org.apache.lucene.tests.util.LuceneTestCase; + +public class TestTestSecrets extends LuceneTestCase { + + public void testCallerOfGetter() { + final UnsupportedOperationException expected = + expectThrows(UnsupportedOperationException.class, () -> TestSecrets.getIndexWriterAccess()); + assertEquals( + "Lucene TestSecrets can only be used by the test-framework.", expected.getMessage()); + } + + public void testCannotSet() { + expectThrows(AssertionError.class, () -> TestSecrets.setIndexWriterAccess(null)); + } +} From 8ad28345e38c18b5233e1eb021c9ad2331104dc5 Mon Sep 17 00:00:00 2001 From: Uwe Schindler Date: Tue, 21 Dec 2021 18:39:59 +0100 Subject: [PATCH 29/32] Use a separate method to better emulate the bad behaviour --- .../org/apache/lucene/internal/tests/TestTestSecrets.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lucene/core/src/test/org/apache/lucene/internal/tests/TestTestSecrets.java b/lucene/core/src/test/org/apache/lucene/internal/tests/TestTestSecrets.java index 5e3c4538215..7a98e30927c 100644 --- a/lucene/core/src/test/org/apache/lucene/internal/tests/TestTestSecrets.java +++ b/lucene/core/src/test/org/apache/lucene/internal/tests/TestTestSecrets.java @@ -22,11 +22,15 @@ public class TestTestSecrets extends LuceneTestCase { public void testCallerOfGetter() { final UnsupportedOperationException expected = - expectThrows(UnsupportedOperationException.class, () -> TestSecrets.getIndexWriterAccess()); + expectThrows(UnsupportedOperationException.class, TestTestSecrets::illegalCaller); assertEquals( "Lucene TestSecrets can only be used by the test-framework.", expected.getMessage()); } + private static void illegalCaller() { + TestSecrets.getIndexWriterAccess(); + } + public void testCannotSet() { expectThrows(AssertionError.class, () -> TestSecrets.setIndexWriterAccess(null)); } From 6d3a43a2386b6a40841e1cf907d26fdf19eee6be Mon Sep 17 00:00:00 2001 From: Uwe Schindler Date: Tue, 21 Dec 2021 18:49:34 +0100 Subject: [PATCH 30/32] Add javadocs --- .../src/java/org/apache/lucene/internal/tests/TestSecrets.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lucene/core/src/java/org/apache/lucene/internal/tests/TestSecrets.java b/lucene/core/src/java/org/apache/lucene/internal/tests/TestSecrets.java index bdc83bafd23..9001b79bd82 100644 --- a/lucene/core/src/java/org/apache/lucene/internal/tests/TestSecrets.java +++ b/lucene/core/src/java/org/apache/lucene/internal/tests/TestSecrets.java @@ -26,7 +26,8 @@ /** * A set of static methods returning accessors for internal, package-private functionality in - * Lucene. + * Lucene. All getters may only be called by the Lucene Test Framework module. Setters are + * initialized once on startup. */ public final class TestSecrets { static { From f95486420d8041786f69fa532db325e092981c48 Mon Sep 17 00:00:00 2001 From: Uwe Schindler Date: Tue, 21 Dec 2021 19:04:08 +0100 Subject: [PATCH 31/32] Improve test and fix bug in the class initialization check --- .../src/java/org/apache/lucene/internal/tests/TestSecrets.java | 2 +- .../test/org/apache/lucene/internal/tests/TestTestSecrets.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lucene/core/src/java/org/apache/lucene/internal/tests/TestSecrets.java b/lucene/core/src/java/org/apache/lucene/internal/tests/TestSecrets.java index 9001b79bd82..fca41e0e604 100644 --- a/lucene/core/src/java/org/apache/lucene/internal/tests/TestSecrets.java +++ b/lucene/core/src/java/org/apache/lucene/internal/tests/TestSecrets.java @@ -45,7 +45,7 @@ public final class TestSecrets { }; ensureInitialized.accept(ConcurrentMergeScheduler.class); - ensureInitialized.accept(SegmentReaderAccess.class); + ensureInitialized.accept(SegmentReader.class); ensureInitialized.accept(IndexWriter.class); } diff --git a/lucene/core/src/test/org/apache/lucene/internal/tests/TestTestSecrets.java b/lucene/core/src/test/org/apache/lucene/internal/tests/TestTestSecrets.java index 7a98e30927c..6da41fb3c8b 100644 --- a/lucene/core/src/test/org/apache/lucene/internal/tests/TestTestSecrets.java +++ b/lucene/core/src/test/org/apache/lucene/internal/tests/TestTestSecrets.java @@ -33,5 +33,8 @@ private static void illegalCaller() { public void testCannotSet() { expectThrows(AssertionError.class, () -> TestSecrets.setIndexWriterAccess(null)); + expectThrows(AssertionError.class, () -> TestSecrets.setConcurrentMergeSchedulerAccess(null)); + expectThrows(AssertionError.class, () -> TestSecrets.setIndexPackageAccess(null)); + expectThrows(AssertionError.class, () -> TestSecrets.setSegmentReaderAccess(null)); } } From 4559c73c03cb4a187dafd745eafeff7828be1fef Mon Sep 17 00:00:00 2001 From: Uwe Schindler Date: Tue, 21 Dec 2021 19:04:31 +0100 Subject: [PATCH 32/32] Remove one more permission in test policy --- gradle/testing/randomization/policies/tests.policy | 1 - 1 file changed, 1 deletion(-) diff --git a/gradle/testing/randomization/policies/tests.policy b/gradle/testing/randomization/policies/tests.policy index ff413cda743..c32ae6cedd2 100644 --- a/gradle/testing/randomization/policies/tests.policy +++ b/gradle/testing/randomization/policies/tests.policy @@ -58,7 +58,6 @@ grant { // needed by cyberneko usage by benchmarks on J9 permission java.lang.RuntimePermission "accessClassInPackage.org.apache.xerces.util"; permission java.lang.RuntimePermission "getClassLoader"; - permission java.lang.RuntimePermission "setContextClassLoader"; // Needed for loading native library (lucene:misc:native) in lucene:misc permission java.lang.RuntimePermission "getFileStoreAttributes";