You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2010/08/12 22:56:29 UTC
svn commit: r984968 [1/6] - in /lucene/dev/trunk:
lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/
lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/
lucene/contrib/instantiated/src/test/org/apache/luce...
Author: rmuir
Date: Thu Aug 12 20:56:23 2010
New Revision: 984968
URL: http://svn.apache.org/viewvc?rev=984968&view=rev
Log:
LUCENE-2598: add newDirectory and track that resources are closed correctly by tests
Modified:
lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java
lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java
lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilderTest.java
lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java
lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestEmptyIndex.java
lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java
lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestSerialization.java
lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestUnoptimizedReaderOnConstructor.java
lucene/dev/trunk/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java
lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java
lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java
lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/index/TestTermVectorAccessor.java
lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java
lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java
lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java
lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/ChainedFilterTest.java
lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/DuplicateFilterTest.java
lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/FuzzyLikeThisQueryTest.java
lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java
lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestRegexQuery.java
lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java
lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/similar/TestMoreLikeThis.java
lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/complexPhrase/TestComplexPhraseQuery.java
lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQPHelper.java
lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQueryParserWrapper.java
lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQPHelper.java
lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQueryParserWrapper.java
lucene/dev/trunk/lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteCachingWrapperFilter.java
lucene/dev/trunk/lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteSearchable.java
lucene/dev/trunk/lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteSort.java
lucene/dev/trunk/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestCartesian.java
lucene/dev/trunk/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestDistance.java
lucene/dev/trunk/lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java
lucene/dev/trunk/lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestPlainTextDictionary.java
lucene/dev/trunk/lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestSpellChecker.java
lucene/dev/trunk/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestParser.java
lucene/dev/trunk/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestQueryTemplateManager.java
lucene/dev/trunk/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/builders/TestNumericRangeFilterBuilder.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/PersistentSnapshotDeletionPolicy.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/TestExternalCodecs.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/TestMergeSchedulerExternal.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/TestSearch.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/TestSearchForDuplicates.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestBinaryDocument.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestDocument.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestAddIndexes.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestCheckIndex.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestCodecs.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestCrash.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDeletionPolicy.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDirectoryReader.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDocumentWriter.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFieldInfos.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFieldsReader.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFilterIndexReader.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFlex.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexCommit.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexFileDeleter.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReader.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReaderClone.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReaderCloneNorms.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReaderReopen.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterConfig.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterMerging.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestLazyBug.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestLazyProxSkipping.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestMultiFields.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNewestSegment.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNorms.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestOmitTf.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelReader.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelTermEnum.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestPayloadProcessorProvider.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestPayloads.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestPersistentSnapshotDeletionPolicy.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestRollback.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentReader.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentTermDocs.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentTermEnum.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressIndexing.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermVectorsReader.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermdocPerf.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestThreadedOptimize.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTransactionRollback.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTransactions.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/intblock/TestIntBlockCodec.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/preflex/TestSurrogates.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/queryParser/TestMultiFieldQueryParser.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/queryParser/TestQueryParser.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestAutomatonQuery.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBoolean2.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanOr.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanPrefixQuery.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanQuery.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCachingSpanFilter.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCustomSearcherSort.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDateFilter.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDateSort.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDocBoost.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDocIdSet.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestElevationComparator.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestExplanations.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFieldCache.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFilteredQuery.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFuzzyQuery.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFuzzyQuery2.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiSearcher.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiSearcherRanking.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNot.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPhraseQuery.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPositionIncrement.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPrefixFilter.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPrefixQuery.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPrefixRandom.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestRegexpQuery.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestRegexpRandom.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestRegexpRandom2.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestScorerPerf.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSetNorm.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSimilarity.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSimpleExplanations.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSort.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSpanQueryFilter.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermRangeFilter.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermRangeQuery.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermScorer.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermVectors.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestThreadSafe.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTopDocsCollector.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTopScoreDocCollector.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestWildcard.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestWildcardRandom.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/function/FunctionTestSetup.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/function/TestCustomScoreQuery.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/function/TestFieldScoreQuery.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/function/TestOrdValues.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/function/TestValueSource.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/payloads/PayloadHelper.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/store/MockRAMDirectory.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/LuceneTestCase.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/LuceneTestCaseJ4.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/packed/TestPackedInts.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java
lucene/dev/trunk/solr/src/test/org/apache/solr/search/TestSort.java
Modified: lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java (original)
+++ lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java Thu Aug 12 20:56:23 2010
@@ -18,6 +18,7 @@ package org.apache.lucene.search.highlig
*/
import java.io.IOException;
+import java.util.Random;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenizer;
@@ -54,13 +55,13 @@ import org.apache.lucene.util.OpenBitSet
public class HighlighterPhraseTest extends LuceneTestCase {
private static final String FIELD = "text";
-
+ private Random random = newRandom();
public void testConcurrentPhrase() throws CorruptIndexException,
LockObtainFailedException, IOException, InvalidTokenOffsetsException {
final String TEXT = "the fox jumped";
- final Directory directory = new MockRAMDirectory();
+ final Directory directory = newDirectory(random);
final IndexWriter indexWriter = new IndexWriter(directory,
- new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(MockTokenizer.WHITESPACE, false)));
+ newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer(MockTokenizer.WHITESPACE, false)));
try {
final Document document = new Document();
document.add(new Field(FIELD, new TokenStreamConcurrent(),
@@ -95,15 +96,16 @@ public class HighlighterPhraseTest exten
}
} finally {
indexReader.close();
+ directory.close();
}
}
public void testConcurrentSpan() throws CorruptIndexException,
LockObtainFailedException, IOException, InvalidTokenOffsetsException {
final String TEXT = "the fox jumped";
- final Directory directory = new MockRAMDirectory();
+ final Directory directory = newDirectory(random);
final IndexWriter indexWriter = new IndexWriter(directory,
- new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(MockTokenizer.WHITESPACE, false)));
+ newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer(MockTokenizer.WHITESPACE, false)));
try {
final Document document = new Document();
document.add(new Field(FIELD, new TokenStreamConcurrent(),
@@ -164,15 +166,16 @@ public class HighlighterPhraseTest exten
}
} finally {
indexReader.close();
+ directory.close();
}
}
public void testSparsePhrase() throws CorruptIndexException,
LockObtainFailedException, IOException, InvalidTokenOffsetsException {
final String TEXT = "the fox did not jump";
- final Directory directory = new MockRAMDirectory();
+ final Directory directory = newDirectory(random);
final IndexWriter indexWriter = new IndexWriter(directory,
- new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(MockTokenizer.WHITESPACE, false)));
+ newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer(MockTokenizer.WHITESPACE, false)));
try {
final Document document = new Document();
document.add(new Field(FIELD, new TokenStreamSparse(),
@@ -206,15 +209,16 @@ public class HighlighterPhraseTest exten
}
} finally {
indexReader.close();
+ directory.close();
}
}
public void testSparsePhraseWithNoPositions() throws CorruptIndexException,
LockObtainFailedException, IOException, InvalidTokenOffsetsException {
final String TEXT = "the fox did not jump";
- final Directory directory = new MockRAMDirectory();
+ final Directory directory = newDirectory(random);
final IndexWriter indexWriter = new IndexWriter(directory,
- new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(MockTokenizer.WHITESPACE, false)));
+ newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer(MockTokenizer.WHITESPACE, false)));
try {
final Document document = new Document();
document.add(new Field(FIELD, TEXT, Store.YES, Index.ANALYZED,
@@ -246,15 +250,16 @@ public class HighlighterPhraseTest exten
}
} finally {
indexReader.close();
+ directory.close();
}
}
public void testSparseSpan() throws CorruptIndexException,
LockObtainFailedException, IOException, InvalidTokenOffsetsException {
final String TEXT = "the fox did not jump";
- final Directory directory = new MockRAMDirectory();
+ final Directory directory = newDirectory(random);
final IndexWriter indexWriter = new IndexWriter(directory,
- new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(MockTokenizer.WHITESPACE, false)));
+ newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer(MockTokenizer.WHITESPACE, false)));
try {
final Document document = new Document();
document.add(new Field(FIELD, new TokenStreamSparse(),
@@ -288,6 +293,7 @@ public class HighlighterPhraseTest exten
}
} finally {
indexReader.close();
+ directory.close();
}
}
Modified: lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java (original)
+++ lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java Thu Aug 12 20:56:23 2010
@@ -26,6 +26,7 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Random;
import java.util.StringTokenizer;
import javax.xml.parsers.DocumentBuilder;
@@ -99,6 +100,7 @@ public class HighlighterTest extends Bas
int numHighlights = 0;
final Analyzer analyzer = new MockAnalyzer(MockTokenizer.SIMPLE, true, MockTokenFilter.ENGLISH_STOPSET, true);
TopDocs hits;
+ private Random random;
String[] texts = {
"Hello this is a piece of text that is very long and contains too much preamble and the meat is really here which says kennedy has been shot",
@@ -142,6 +144,7 @@ public class HighlighterTest extends Bas
if (VERBOSE) System.out.println(fragment);
}
+ searcher.close();
}
public void testHighlightingWithDefaultField() throws Exception {
@@ -432,7 +435,7 @@ public class HighlighterTest extends Bas
QueryScorer scorer = new QueryScorer(query, FIELD_NAME);
Highlighter highlighter = new Highlighter(this, scorer);
-
+
for (int i = 0; i < hits.totalHits; i++) {
String text = searcher.doc(hits.scoreDocs[i].doc).get(FIELD_NAME);
TokenStream tokenStream = analyzer.tokenStream(FIELD_NAME, new StringReader(text));
@@ -1206,6 +1209,7 @@ public class HighlighterTest extends Bas
public void run() throws Exception {
numHighlights = 0;
// test to show how rewritten query can still be used
+ if (searcher != null) searcher.close();
searcher = new IndexSearcher(ramDir, true);
Analyzer analyzer = new MockAnalyzer(MockTokenizer.SIMPLE, true, MockTokenFilter.ENGLISH_STOPSET, true);
@@ -1319,8 +1323,8 @@ public class HighlighterTest extends Bas
public void testMultiSearcher() throws Exception {
// setup index 1
- MockRAMDirectory ramDir1 = new MockRAMDirectory();
- IndexWriter writer1 = new IndexWriter(ramDir1, new IndexWriterConfig(
+ MockRAMDirectory ramDir1 = newDirectory(random);
+ IndexWriter writer1 = new IndexWriter(ramDir1, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer(MockTokenizer.SIMPLE, true, MockTokenFilter.ENGLISH_STOPSET, true)));
Document d = new Document();
Field f = new Field(FIELD_NAME, "multiOne", Field.Store.YES, Field.Index.ANALYZED);
@@ -1331,8 +1335,8 @@ public class HighlighterTest extends Bas
IndexReader reader1 = IndexReader.open(ramDir1, true);
// setup index 2
- MockRAMDirectory ramDir2 = new MockRAMDirectory();
- IndexWriter writer2 = new IndexWriter(ramDir2, new IndexWriterConfig(
+ MockRAMDirectory ramDir2 = newDirectory(random);
+ IndexWriter writer2 = new IndexWriter(ramDir2, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer(MockTokenizer.SIMPLE, true, MockTokenFilter.ENGLISH_STOPSET, true)));
d = new Document();
f = new Field(FIELD_NAME, "multiTwo", Field.Store.YES, Field.Index.ANALYZED);
@@ -1371,7 +1375,12 @@ public class HighlighterTest extends Bas
}
assertTrue("Failed to find correct number of highlights " + numHighlights + " found",
numHighlights == 2);
-
+ reader1.close();
+ reader2.close();
+ searchers[0].close();
+ searchers[1].close();
+ ramDir1.close();
+ ramDir2.close();
}
public void testFieldSpecificHighlighting() throws Exception {
@@ -1587,7 +1596,7 @@ public class HighlighterTest extends Bas
helper.start();
}
- private Directory dir = new MockRAMDirectory();
+ private Directory dir;
private Analyzer a = new MockAnalyzer(MockTokenizer.WHITESPACE, false);
public void testWeightedTermsWithDeletes() throws IOException, ParseException, InvalidTokenOffsetsException {
@@ -1684,6 +1693,7 @@ public class HighlighterTest extends Bas
}
public void doSearching(Query unReWrittenQuery) throws Exception {
+ if (searcher != null) searcher.close();
searcher = new IndexSearcher(ramDir, true);
// for any multi-term queries to work (prefix, wildcard, range,fuzzy etc)
// you must use a rewritten query!
@@ -1714,8 +1724,10 @@ public class HighlighterTest extends Bas
@Override
protected void setUp() throws Exception {
super.setUp();
- ramDir = new MockRAMDirectory();
- IndexWriter writer = new IndexWriter(ramDir, new IndexWriterConfig(
+ random = newRandom();
+ dir = newDirectory(random);
+ ramDir = newDirectory(random);
+ IndexWriter writer = new IndexWriter(ramDir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer(MockTokenizer.SIMPLE, true, MockTokenFilter.ENGLISH_STOPSET, true)));
for (int i = 0; i < texts.length; i++) {
addDoc(writer, texts[i]);
@@ -1746,6 +1758,14 @@ public class HighlighterTest extends Bas
numHighlights = 0;
}
+ @Override
+ protected void tearDown() throws Exception {
+ if (searcher != null) searcher.close();
+ reader.close();
+ dir.close();
+ ramDir.close();
+ super.tearDown();
+ }
private void addDoc(IndexWriter writer, String text) throws IOException {
Document d = new Document();
Field f = new Field(FIELD_NAME, text, Field.Store.YES, Field.Index.ANALYZED);
Modified: lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java (original)
+++ lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java Thu Aug 12 20:56:23 2010
@@ -91,7 +91,7 @@ public abstract class AbstractTestCase e
analyzerK = new MockAnalyzer(MockTokenizer.KEYWORD, false);
paW = new QueryParser(TEST_VERSION_CURRENT, F, analyzerW );
paB = new QueryParser(TEST_VERSION_CURRENT, F, analyzerB );
- dir = new MockRAMDirectory();
+ dir = newDirectory(newRandom());
}
@Override
@@ -100,6 +100,7 @@ public abstract class AbstractTestCase e
reader.close();
reader = null;
}
+ dir.close();
super.tearDown();
}
@@ -334,7 +335,7 @@ public abstract class AbstractTestCase e
doc.add( new Field( F, value, Store.YES, Index.ANALYZED, TermVector.WITH_POSITIONS_OFFSETS ) );
writer.addDocument( doc );
writer.close();
-
+ if (reader != null) reader.close();
reader = IndexReader.open( dir, true );
}
@@ -347,7 +348,7 @@ public abstract class AbstractTestCase e
doc.add( new Field( F, value, Store.YES, Index.NOT_ANALYZED, TermVector.WITH_POSITIONS_OFFSETS ) );
writer.addDocument( doc );
writer.close();
-
+ if (reader != null) reader.close();
reader = IndexReader.open( dir, true );
}
Modified: lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilderTest.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilderTest.java (original)
+++ lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilderTest.java Thu Aug 12 20:56:23 2010
@@ -64,11 +64,11 @@ public class SimpleFragListBuilderTest e
FieldFragList ffl = sflb.createFieldFragList( fpl( "a", "a a" ), 100 );
assertEquals( 1, ffl.fragInfos.size() );
assertEquals( "subInfos=(a((0,1))a((2,3)))/2.0(0,100)", ffl.fragInfos.get( 0 ).toString() );
-
+
ffl = sflb.createFieldFragList( fpl( "a", "a b b b b b b b b a" ), 20 );
assertEquals( 1, ffl.fragInfos.size() );
assertEquals( "subInfos=(a((0,1))a((18,19)))/2.0(0,20)", ffl.fragInfos.get( 0 ).toString() );
-
+
ffl = sflb.createFieldFragList( fpl( "a", "b b b b a b b b b a" ), 20 );
assertEquals( 1, ffl.fragInfos.size() );
assertEquals( "subInfos=(a((8,9))a((18,19)))/2.0(2,22)", ffl.fragInfos.get( 0 ).toString() );
Modified: lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java (original)
+++ lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java Thu Aug 12 20:56:23 2010
@@ -135,7 +135,7 @@ public class SimpleFragmentsBuilderTest
doc.add( new Field( F, "aaa", Store.NO, Index.ANALYZED, TermVector.WITH_POSITIONS_OFFSETS ) );
writer.addDocument( doc );
writer.close();
-
+ if (reader != null) reader.close();
reader = IndexReader.open( dir, true );
}
Modified: lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestEmptyIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestEmptyIndex.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestEmptyIndex.java (original)
+++ lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestEmptyIndex.java Thu Aug 12 20:56:23 2010
@@ -18,6 +18,7 @@ package org.apache.lucene.store.instanti
import java.io.IOException;
import java.util.Arrays;
+import java.util.Random;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.index.IndexReader;
@@ -60,9 +61,9 @@ public class TestEmptyIndex extends Luce
ii.close();
// make sure a Directory acts the same
-
- Directory d = new MockRAMDirectory();
- new IndexWriter(d, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer())).close();
+ Random random = newRandom();
+ Directory d = newDirectory(random);
+ new IndexWriter(d, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer())).close();
r = IndexReader.open(d, false);
testNorms(r);
r.close();
@@ -93,9 +94,9 @@ public class TestEmptyIndex extends Luce
ii.close();
// make sure a Directory acts the same
-
- Directory d = new MockRAMDirectory();
- new IndexWriter(d, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer())).close();
+ Random random = newRandom();
+ Directory d = newDirectory(random);
+ new IndexWriter(d, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer())).close();
r = IndexReader.open(d, false);
termsEnumTest(r);
r.close();
Modified: lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java (original)
+++ lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java Thu Aug 12 20:56:23 2010
@@ -21,6 +21,7 @@ import java.util.Arrays;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
+import java.util.Random;
import org.apache.lucene.analysis.Token;
import org.apache.lucene.analysis.TokenStream;
@@ -61,10 +62,11 @@ public class TestIndicesEquals extends L
public void testLoadIndexReader() throws Exception {
- MockRAMDirectory dir = new MockRAMDirectory();
+ Random random = newRandom();
+ MockRAMDirectory dir = newDirectory(random);
// create dir data
- IndexWriter indexWriter = new IndexWriter(dir, new IndexWriterConfig(
+ IndexWriter indexWriter = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer()));
for (int i = 0; i < 20; i++) {
Document document = new Document();
@@ -79,17 +81,18 @@ public class TestIndicesEquals extends L
ir.close();
testEqualBehaviour(dir, ii);
+ dir.close();
}
public void testInstantiatedIndexWriter() throws Exception {
-
- MockRAMDirectory dir = new MockRAMDirectory();
+ Random random = newRandom();
+ MockRAMDirectory dir = newDirectory(random);
InstantiatedIndex ii = new InstantiatedIndex();
// create dir data
- IndexWriter indexWriter = new IndexWriter(dir, new IndexWriterConfig(
+ IndexWriter indexWriter = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer()));
for (int i = 0; i < 500; i++) {
Document document = new Document();
@@ -110,7 +113,7 @@ public class TestIndicesEquals extends L
testEqualBehaviour(dir, ii);
-
+ dir.close();
}
Modified: lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestSerialization.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestSerialization.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestSerialization.java (original)
+++ lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestSerialization.java Thu Aug 12 20:56:23 2010
@@ -17,26 +17,25 @@ package org.apache.lucene.store.instanti
*/
-import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import java.io.ByteArrayOutputStream;
import java.io.ObjectOutputStream;
+import java.util.Random;
public class TestSerialization extends LuceneTestCase {
public void test() throws Exception {
+ Random random = newRandom();
+ Directory dir = newDirectory(random);
- Directory dir = new MockRAMDirectory();
-
- IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer()));
+ IndexWriter iw = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
Document doc = new Document();
doc.add(new Field("foo", "bar rab abr bra rba", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
doc.add(new Field("moo", "bar rab abr bra rba", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
@@ -52,7 +51,7 @@ public class TestSerialization extends L
oos.writeObject(ii);
oos.close();
baos.close();
-
+ dir.close();
}
Modified: lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestUnoptimizedReaderOnConstructor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestUnoptimizedReaderOnConstructor.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestUnoptimizedReaderOnConstructor.java (original)
+++ lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestUnoptimizedReaderOnConstructor.java Thu Aug 12 20:56:23 2010
@@ -16,6 +16,8 @@ package org.apache.lucene.store.instanti
*/
import java.io.IOException;
+import java.util.Random;
+
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -33,7 +35,8 @@ import org.apache.lucene.document.Field;
public class TestUnoptimizedReaderOnConstructor extends LuceneTestCase {
public void test() throws Exception {
- Directory dir = new MockRAMDirectory();
+ Random random = newRandom();
+ Directory dir = newDirectory(random);
IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer()));
addDocument(iw, "Hello, world!");
addDocument(iw, "All work and no play makes jack a dull boy");
@@ -59,7 +62,8 @@ public class TestUnoptimizedReaderOnCons
}
// todo some assertations.
-
+ unoptimizedReader.close();
+ dir.close();
}
private void addDocument(IndexWriter iw, String text) throws IOException {
Modified: lucene/dev/trunk/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java (original)
+++ lucene/dev/trunk/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java Thu Aug 12 20:56:23 2010
@@ -106,7 +106,7 @@ public class MemoryIndexTest extends Bas
termField.append(randomTerm());
}
- MockRAMDirectory ramdir = new MockRAMDirectory();
+ MockRAMDirectory ramdir = newDirectory(random);
Analyzer analyzer = randomAnalyzer();
IndexWriter writer = new IndexWriter(ramdir,
new IndexWriterConfig(TEST_VERSION_CURRENT, analyzer).setCodecProvider(_TestUtil.alwaysCodec("Standard")));
@@ -122,6 +122,7 @@ public class MemoryIndexTest extends Bas
memory.addField("foo", fooField.toString(), analyzer);
memory.addField("term", termField.toString(), analyzer);
assertAllQueries(memory, ramdir, analyzer);
+ ramdir.close();
}
/**
@@ -136,6 +137,8 @@ public class MemoryIndexTest extends Bas
TopDocs memDocs = mem.search(qp.parse(query), 1);
assertEquals(ramDocs.totalHits, memDocs.totalHits);
}
+ ram.close();
+ mem.close();
}
/**
Modified: lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java (original)
+++ lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java Thu Aug 12 20:56:23 2010
@@ -19,6 +19,7 @@ package org.apache.lucene.index;
import java.io.IOException;
import java.util.Arrays;
+import java.util.Random;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
@@ -44,7 +45,7 @@ public class TestFieldNormModifier exten
public static int NUM_DOCS = 5;
- public Directory store = new MockRAMDirectory();
+ public Directory store;
/** inverts the normal notion of lengthNorm */
public static Similarity s = new DefaultSimilarity() {
@@ -57,7 +58,9 @@ public class TestFieldNormModifier exten
@Override
protected void setUp() throws Exception {
super.setUp();
- IndexWriter writer = new IndexWriter(store, new IndexWriterConfig(
+ Random random = newRandom();
+ store = newDirectory(random);
+ IndexWriter writer = new IndexWriter(store, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer()));
for (int i = 0; i < NUM_DOCS; i++) {
@@ -75,6 +78,12 @@ public class TestFieldNormModifier exten
writer.close();
}
+ @Override
+ protected void tearDown() throws Exception {
+ store.close();
+ super.tearDown();
+ }
+
public void testMissingField() throws Exception {
FieldNormModifier fnm = new FieldNormModifier(store, s);
fnm.reSetNorms("nobodyherebutuschickens");
Modified: lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java (original)
+++ lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java Thu Aug 12 20:56:23 2010
@@ -16,6 +16,8 @@ package org.apache.lucene.index;
* limitations under the License.
*/
+import java.util.Random;
+
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
@@ -27,12 +29,15 @@ import org.apache.lucene.util.BytesRef;
public class TestMultiPassIndexSplitter extends LuceneTestCase {
IndexReader input;
int NUM_DOCS = 11;
-
+ private Random random;
+ MockRAMDirectory dir;
+
@Override
protected void setUp() throws Exception {
super.setUp();
- MockRAMDirectory dir = new MockRAMDirectory();
- IndexWriter w = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer()));
+ random = newRandom();
+ dir = newDirectory(random);
+ IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
Document doc;
for (int i = 0; i < NUM_DOCS; i++) {
doc = new Document();
@@ -44,7 +49,16 @@ public class TestMultiPassIndexSplitter
input = IndexReader.open(dir, false);
// delete the last doc
input.deleteDocument(input.maxDoc() - 1);
+ IndexReader inputOld = input;
input = input.reopen(true);
+ inputOld.close();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ input.close();
+ dir.close();
+ super.tearDown();
}
/**
@@ -53,9 +67,9 @@ public class TestMultiPassIndexSplitter
public void testSplitRR() throws Exception {
MultiPassIndexSplitter splitter = new MultiPassIndexSplitter();
Directory[] dirs = new Directory[]{
- new MockRAMDirectory(),
- new MockRAMDirectory(),
- new MockRAMDirectory()
+ newDirectory(random),
+ newDirectory(random),
+ newDirectory(random)
};
splitter.split(input, dirs, false);
IndexReader ir;
@@ -86,7 +100,10 @@ public class TestMultiPassIndexSplitter
assertNotSame("1", te.term());
assertEquals(TermsEnum.SeekStatus.NOT_FOUND, te.seek(new BytesRef("0")));
- assertNotSame("0", te.term().utf8ToString());
+ assertNotSame("0", te.term().utf8ToString());
+ ir.close();
+ for (Directory d : dirs)
+ d.close();
}
/**
@@ -95,9 +112,9 @@ public class TestMultiPassIndexSplitter
public void testSplitSeq() throws Exception {
MultiPassIndexSplitter splitter = new MultiPassIndexSplitter();
Directory[] dirs = new Directory[]{
- new MockRAMDirectory(),
- new MockRAMDirectory(),
- new MockRAMDirectory()
+ newDirectory(random),
+ newDirectory(random),
+ newDirectory(random)
};
splitter.split(input, dirs, true);
IndexReader ir;
@@ -122,5 +139,8 @@ public class TestMultiPassIndexSplitter
Term t = new Term("id", (NUM_DOCS - 1) + "");
assertEquals(TermsEnum.SeekStatus.NOT_FOUND, te.seek(new BytesRef(t.text())));
assertNotSame(t.text(), te.term().utf8ToString());
+ ir.close();
+ for (Directory d : dirs)
+ d.close();
}
}
Modified: lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/index/TestTermVectorAccessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/index/TestTermVectorAccessor.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/index/TestTermVectorAccessor.java (original)
+++ lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/index/TestTermVectorAccessor.java Thu Aug 12 20:56:23 2010
@@ -8,6 +8,7 @@ import org.apache.lucene.store.MockRAMDi
import org.apache.lucene.util.LuceneTestCase;
import java.util.Collections;
+import java.util.Random;
/*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -26,9 +27,9 @@ import java.util.Collections;
public class TestTermVectorAccessor extends LuceneTestCase {
public void test() throws Exception {
-
- Directory dir = new MockRAMDirectory();
- IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer()));
+ Random random = newRandom();
+ Directory dir = newDirectory(random);
+ IndexWriter iw = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
Document doc;
Modified: lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java (original)
+++ lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java Thu Aug 12 20:56:23 2010
@@ -17,6 +17,8 @@ package org.apache.lucene.misc;
* limitations under the License.
*/
+import java.util.Random;
+
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -36,17 +38,19 @@ public class TestHighFreqTerms extends L
public void setUp() throws Exception {
super.setUp();
- dir= new MockRAMDirectory();
- writer = new IndexWriter(dir, new IndexWriterConfig(
+ Random random = newRandom();
+ dir= newDirectory(random);
+ writer = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer(MockTokenizer.WHITESPACE, false))
.setMaxBufferedDocs(2));
indexDocs(writer);
reader = IndexReader.open(dir, true);
}
- public void tearDown()throws Exception{
- super.tearDown();
+ public void tearDown() throws Exception{
reader.close();
+ dir.close();
+ super.tearDown();
}
/******************** Tests for getHighFreqTerms **********************************/
Modified: lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java (original)
+++ lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java Thu Aug 12 20:56:23 2010
@@ -18,6 +18,7 @@ package org.apache.lucene.misc;
*/
import java.io.IOException;
+import java.util.Random;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
@@ -48,7 +49,7 @@ public class TestLengthNormModifier exte
public static int NUM_DOCS = 5;
- public Directory store = new MockRAMDirectory();
+ public Directory store;
/** inverts the normal notion of lengthNorm */
public static Similarity s = new DefaultSimilarity() {
@@ -61,7 +62,9 @@ public class TestLengthNormModifier exte
@Override
protected void setUp() throws Exception {
super.setUp();
- IndexWriter writer = new IndexWriter(store, new IndexWriterConfig(
+ Random random = newRandom();
+ store = newDirectory(random);
+ IndexWriter writer = new IndexWriter(store, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer()));
for (int i = 0; i < NUM_DOCS; i++) {
@@ -82,6 +85,12 @@ public class TestLengthNormModifier exte
writer.close();
}
+ @Override
+ protected void tearDown() throws Exception {
+ store.close();
+ super.tearDown();
+ }
+
public void testMissingField() {
FieldNormModifier fnm = new FieldNormModifier(store, s);
try {
Modified: lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java (original)
+++ lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java Thu Aug 12 20:56:23 2010
@@ -18,6 +18,7 @@ package org.apache.lucene.search;
*/
import java.io.IOException;
+import java.util.Random;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenizer;
@@ -38,8 +39,9 @@ public class BooleanFilterTest extends L
@Override
protected void setUp() throws Exception {
super.setUp();
- directory = new MockRAMDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(newRandom(), directory, new MockAnalyzer(MockTokenizer.WHITESPACE, false));
+ Random random = newRandom();
+ directory = newDirectory(random);
+ RandomIndexWriter writer = new RandomIndexWriter(random, directory, new MockAnalyzer(MockTokenizer.WHITESPACE, false));
//Add series of docs with filterable fields : acces rights, prices, dates and "in-stock" flags
addDoc(writer, "admin guest", "010", "20040101","Y");
Modified: lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/ChainedFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/ChainedFilterTest.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/ChainedFilterTest.java (original)
+++ lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/ChainedFilterTest.java Thu Aug 12 20:56:23 2010
@@ -60,7 +60,7 @@ public class ChainedFilterTest extends L
protected void setUp() throws Exception {
super.setUp();
random = newRandom();
- directory = new MockRAMDirectory();
+ directory = newDirectory(random);
RandomIndexWriter writer = new RandomIndexWriter(random, directory);
Calendar cal = new GregorianCalendar();
cal.clear();
@@ -195,7 +195,7 @@ public class ChainedFilterTest extends L
*/
public void testWithCachingFilter() throws Exception {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
RandomIndexWriter writer = new RandomIndexWriter(random, dir);
IndexReader reader = writer.getReader();
writer.close();
Modified: lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/DuplicateFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/DuplicateFilterTest.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/DuplicateFilterTest.java (original)
+++ lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/DuplicateFilterTest.java Thu Aug 12 20:56:23 2010
@@ -19,6 +19,7 @@ package org.apache.lucene.search;
import java.io.IOException;
import java.util.HashSet;
+import java.util.Random;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
@@ -41,8 +42,9 @@ public class DuplicateFilterTest extends
@Override
protected void setUp() throws Exception {
super.setUp();
- directory = new MockRAMDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(newRandom(), directory);
+ Random random = newRandom();
+ directory = newDirectory(random);
+ RandomIndexWriter writer = new RandomIndexWriter(random, directory);
//Add series of docs with filterable fields : url, text and dates flags
addDoc(writer, "http://lucene.apache.org", "lucene 1.4.3 available", "20040101");
Modified: lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/FuzzyLikeThisQueryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/FuzzyLikeThisQueryTest.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/FuzzyLikeThisQueryTest.java (original)
+++ lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/FuzzyLikeThisQueryTest.java Thu Aug 12 20:56:23 2010
@@ -19,6 +19,7 @@ package org.apache.lucene.search;
import java.io.IOException;
import java.util.HashSet;
+import java.util.Random;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.MockAnalyzer;
@@ -39,8 +40,9 @@ public class FuzzyLikeThisQueryTest exte
@Override
protected void setUp() throws Exception {
super.setUp();
- directory = new MockRAMDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(newRandom(), directory);
+ Random random = newRandom();
+ directory = newDirectory(random);
+ RandomIndexWriter writer = new RandomIndexWriter(random, directory);
//Add series of docs with misspelt names
addDoc(writer, "jonathon smythe","1");
Modified: lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java (original)
+++ lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java Thu Aug 12 20:56:23 2010
@@ -18,6 +18,7 @@ package org.apache.lucene.search;
*/
import java.util.HashSet;
+import java.util.Random;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
@@ -51,8 +52,9 @@ public class TermsFilterTest extends Luc
public void testMissingTerms() throws Exception {
String fieldName="field1";
- MockRAMDirectory rd=new MockRAMDirectory();
- RandomIndexWriter w = new RandomIndexWriter(newRandom(), rd);
+ Random random = newRandom();
+ MockRAMDirectory rd=newDirectory(random);
+ RandomIndexWriter w = new RandomIndexWriter(random, rd);
for (int i = 0; i < 100; i++) {
Document doc=new Document();
int term=i*10; //terms are units of 10;
Modified: lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestRegexQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestRegexQuery.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestRegexQuery.java (original)
+++ lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestRegexQuery.java Thu Aug 12 20:56:23 2010
@@ -17,6 +17,8 @@ package org.apache.lucene.search.regex;
* limitations under the License.
*/
+import java.util.Random;
+
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.index.IndexReader;
@@ -41,8 +43,9 @@ public class TestRegexQuery extends Luce
@Override
protected void setUp() throws Exception {
super.setUp();
- directory = new MockRAMDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(newRandom(), directory);
+ Random random = newRandom();
+ directory = newDirectory(random);
+ RandomIndexWriter writer = new RandomIndexWriter(random, directory);
Document doc = new Document();
doc.add(new Field(FN, "the quick brown fox jumps over the lazy dog", Field.Store.NO, Field.Index.ANALYZED));
writer.addDocument(doc);
Modified: lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java (original)
+++ lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java Thu Aug 12 20:56:23 2010
@@ -18,6 +18,7 @@ package org.apache.lucene.search.regex;
*/
import java.io.IOException;
+import java.util.Random;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
@@ -39,13 +40,28 @@ import org.apache.lucene.util.LuceneTest
public class TestSpanRegexQuery extends LuceneTestCase {
- Directory indexStoreA = new MockRAMDirectory();
-
- Directory indexStoreB = new MockRAMDirectory();
-
+ Directory indexStoreA;
+ Directory indexStoreB;
+ Random random;
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ random = newRandom();
+ indexStoreA = newDirectory(random);
+ indexStoreB = newDirectory(random);
+ }
+
+ @Override
+ public void tearDown() throws Exception {
+ indexStoreA.close();
+ indexStoreB.close();
+ super.tearDown();
+ }
+
public void testSpanRegex() throws Exception {
- MockRAMDirectory directory = new MockRAMDirectory();
- IndexWriter writer = new IndexWriter(directory, new IndexWriterConfig(
+ MockRAMDirectory directory = newDirectory(random);
+ IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer()));
Document doc = new Document();
// doc.add(new Field("field", "the quick brown fox jumps over the lazy dog",
@@ -69,6 +85,8 @@ public class TestSpanRegexQuery extends
// true);
int numHits = searcher.search(sfq, null, 1000).totalHits;
assertEquals(1, numHits);
+ searcher.close();
+ directory.close();
}
public void testSpanRegexBug() throws CorruptIndexException, IOException {
@@ -111,14 +129,14 @@ public class TestSpanRegexQuery extends
Field.Index.ANALYZED_NO_NORMS));
// creating first index writer
- IndexWriter writerA = new IndexWriter(indexStoreA, new IndexWriterConfig(
+ IndexWriter writerA = new IndexWriter(indexStoreA, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer()).setOpenMode(OpenMode.CREATE));
writerA.addDocument(lDoc);
writerA.optimize();
writerA.close();
// creating second index writer
- IndexWriter writerB = new IndexWriter(indexStoreB, new IndexWriterConfig(
+ IndexWriter writerB = new IndexWriter(indexStoreB, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer()).setOpenMode(OpenMode.CREATE));
writerB.addDocument(lDoc2);
writerB.optimize();
Modified: lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/similar/TestMoreLikeThis.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/similar/TestMoreLikeThis.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/similar/TestMoreLikeThis.java (original)
+++ lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/similar/TestMoreLikeThis.java Thu Aug 12 20:56:23 2010
@@ -22,6 +22,7 @@ import java.io.StringReader;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Random;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenizer;
@@ -44,8 +45,9 @@ public class TestMoreLikeThis extends Lu
@Override
protected void setUp() throws Exception {
super.setUp();
- directory = new MockRAMDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(newRandom(), directory);
+ Random random = newRandom();
+ directory = newDirectory(random);
+ RandomIndexWriter writer = new RandomIndexWriter(random, directory);
// Add series of docs with specific information for MoreLikeThis
addDoc(writer, "lucene");
Modified: lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/complexPhrase/TestComplexPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/complexPhrase/TestComplexPhraseQuery.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/complexPhrase/TestComplexPhraseQuery.java (original)
+++ lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/complexPhrase/TestComplexPhraseQuery.java Thu Aug 12 20:56:23 2010
@@ -18,6 +18,7 @@ package org.apache.lucene.queryParser.co
*/
import java.util.HashSet;
+import java.util.Random;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.MockAnalyzer;
@@ -34,7 +35,7 @@ import org.apache.lucene.store.MockRAMDi
import org.apache.lucene.util.LuceneTestCase;
public class TestComplexPhraseQuery extends LuceneTestCase {
-
+ MockRAMDirectory rd;
Analyzer analyzer = new MockAnalyzer();
DocData docsContent[] = { new DocData("john smith", "1"),
@@ -112,8 +113,9 @@ public class TestComplexPhraseQuery exte
@Override
protected void setUp() throws Exception {
super.setUp();
- MockRAMDirectory rd = new MockRAMDirectory();
- IndexWriter w = new IndexWriter(rd, new IndexWriterConfig(TEST_VERSION_CURRENT, analyzer));
+ Random random = newRandom();
+ rd = newDirectory(random);
+ IndexWriter w = new IndexWriter(rd, newIndexWriterConfig(random, TEST_VERSION_CURRENT, analyzer));
for (int i = 0; i < docsContent.length; i++) {
Document doc = new Document();
doc.add(new Field("name", docsContent[i].name, Field.Store.YES,
@@ -129,6 +131,7 @@ public class TestComplexPhraseQuery exte
@Override
protected void tearDown() throws Exception {
searcher.close();
+ rd.close();
super.tearDown();
}
Modified: lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQPHelper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQPHelper.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQPHelper.java (original)
+++ lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQPHelper.java Thu Aug 12 20:56:23 2010
@@ -20,6 +20,7 @@ package org.apache.lucene.queryParser.st
import java.io.Reader;
import java.util.HashMap;
import java.util.Map;
+import java.util.Random;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
@@ -319,8 +320,9 @@ public class TestMultiFieldQPHelper exte
public void testStopWordSearching() throws Exception {
Analyzer analyzer = new MockAnalyzer();
- Directory ramDir = new MockRAMDirectory();
- IndexWriter iw = new IndexWriter(ramDir, new IndexWriterConfig(TEST_VERSION_CURRENT, analyzer));
+ Random random = newRandom();
+ Directory ramDir = newDirectory(random);
+ IndexWriter iw = new IndexWriter(ramDir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, analyzer));
Document doc = new Document();
doc.add(new Field("body", "blah the footest blah", Field.Store.NO,
Field.Index.ANALYZED));
@@ -337,6 +339,7 @@ public class TestMultiFieldQPHelper exte
ScoreDoc[] hits = is.search(q, null, 1000).scoreDocs;
assertEquals(1, hits.length);
is.close();
+ ramDir.close();
}
/**
Modified: lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQueryParserWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQueryParserWrapper.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQueryParserWrapper.java (original)
+++ lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQueryParserWrapper.java Thu Aug 12 20:56:23 2010
@@ -321,7 +321,7 @@ public class TestMultiFieldQueryParserWr
public void testStopWordSearching() throws Exception {
Analyzer analyzer = new MockAnalyzer();
- Directory ramDir = new MockRAMDirectory();
+ Directory ramDir = newDirectory(newRandom());
IndexWriter iw = new IndexWriter(ramDir, analyzer, true,
IndexWriter.MaxFieldLength.LIMITED);
Document doc = new Document();
@@ -338,6 +338,7 @@ public class TestMultiFieldQueryParserWr
ScoreDoc[] hits = is.search(q, null, 1000).scoreDocs;
assertEquals(1, hits.length);
is.close();
+ ramDir.close();
}
/**
Modified: lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQPHelper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQPHelper.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQPHelper.java (original)
+++ lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQPHelper.java Thu Aug 12 20:56:23 2010
@@ -30,6 +30,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.Locale;
import java.util.Map;
+import java.util.Random;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.MockAnalyzer;
@@ -653,9 +654,9 @@ public class TestQPHelper extends Locali
}
public void testFarsiRangeCollating() throws Exception {
-
- MockRAMDirectory ramDir = new MockRAMDirectory();
- IndexWriter iw = new IndexWriter(ramDir, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(MockTokenizer.WHITESPACE, false)));
+ Random random = newRandom();
+ MockRAMDirectory ramDir = newDirectory(random);
+ IndexWriter iw = new IndexWriter(ramDir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer(MockTokenizer.WHITESPACE, false)));
Document doc = new Document();
doc.add(new Field("content", "\u0633\u0627\u0628", Field.Store.YES,
Field.Index.NOT_ANALYZED));
@@ -699,6 +700,7 @@ public class TestQPHelper extends Locali
assertEquals("The index Term should be included.", 1, result.length);
is.close();
+ ramDir.close();
}
/** for testing legacy DateField support */
@@ -1076,9 +1078,9 @@ public class TestQPHelper extends Locali
}
public void testLocalDateFormat() throws IOException, QueryNodeException {
-
- MockRAMDirectory ramDir = new MockRAMDirectory();
- IndexWriter iw = new IndexWriter(ramDir, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(MockTokenizer.WHITESPACE, false)));
+ Random random = newRandom();
+ MockRAMDirectory ramDir = newDirectory(random);
+ IndexWriter iw = new IndexWriter(ramDir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer(MockTokenizer.WHITESPACE, false)));
addDateDoc("a", 2005, 12, 2, 10, 15, 33, iw);
addDateDoc("b", 2005, 12, 4, 22, 15, 00, iw);
iw.close();
@@ -1090,6 +1092,7 @@ public class TestQPHelper extends Locali
assertHits(1, "{12/1/2005 TO 12/4/2005}", is);
assertHits(0, "{12/3/2005 TO 12/4/2005}", is);
is.close();
+ ramDir.close();
}
public void testStarParsing() throws Exception {
@@ -1275,8 +1278,9 @@ public class TestQPHelper extends Locali
}
public void testMultiPhraseQuery() throws Exception {
- MockRAMDirectory dir = new MockRAMDirectory();
- IndexWriter w = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new CannedAnalyzer()));
+ Random random = newRandom();
+ MockRAMDirectory dir = newDirectory(random);
+ IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new CannedAnalyzer()));
Document doc = new Document();
doc.add(new Field("field", "", Field.Store.NO, Field.Index.ANALYZED));
w.addDocument(doc);
@@ -1288,6 +1292,7 @@ public class TestQPHelper extends Locali
assertEquals(1, s.search(q, 10).totalHits);
r.close();
w.close();
+ dir.close();
}
}
Modified: lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQueryParserWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQueryParserWrapper.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQueryParserWrapper.java (original)
+++ lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQueryParserWrapper.java Thu Aug 12 20:56:23 2010
@@ -654,7 +654,7 @@ public class TestQueryParserWrapper exte
public void testFarsiRangeCollating() throws Exception {
- MockRAMDirectory ramDir = new MockRAMDirectory();
+ MockRAMDirectory ramDir = newDirectory(newRandom());
IndexWriter iw = new IndexWriter(ramDir, new MockAnalyzer(MockTokenizer.WHITESPACE, false), true,
IndexWriter.MaxFieldLength.LIMITED);
Document doc = new Document();
@@ -696,6 +696,7 @@ public class TestQueryParserWrapper exte
assertEquals("The index Term should be included.", 1, result.length);
is.close();
+ ramDir.close();
}
private String escapeDateString(String s) {
@@ -1062,7 +1063,7 @@ public class TestQueryParserWrapper exte
public void testLocalDateFormat() throws IOException, ParseException {
- MockRAMDirectory ramDir = new MockRAMDirectory();
+ MockRAMDirectory ramDir = newDirectory(newRandom());
IndexWriter iw = new IndexWriter(ramDir, new MockAnalyzer(MockTokenizer.WHITESPACE, false), true,
IndexWriter.MaxFieldLength.LIMITED);
addDateDoc("a", 2005, 12, 2, 10, 15, 33, iw);
@@ -1076,6 +1077,7 @@ public class TestQueryParserWrapper exte
assertHits(1, "{12/1/2005 TO 12/4/2005}", is);
assertHits(0, "{12/3/2005 TO 12/4/2005}", is);
is.close();
+ ramDir.close();
}
public void testStarParsing() throws Exception {
Modified: lucene/dev/trunk/lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteCachingWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteCachingWrapperFilter.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteCachingWrapperFilter.java (original)
+++ lucene/dev/trunk/lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteCachingWrapperFilter.java Thu Aug 12 20:56:23 2010
@@ -17,13 +17,15 @@ package org.apache.lucene.search;
* limitations under the License.
*/
+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.IndexWriter;
-import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.Term;
import org.apache.lucene.store.MockRAMDirectory;
+import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -33,11 +35,15 @@ import static org.junit.Assert.*;
* Tests that the index is cached on the searcher side of things.
*/
public class TestRemoteCachingWrapperFilter extends RemoteTestCaseJ4 {
+ private static MockRAMDirectory indexStore;
+ private static Searchable local;
+
@BeforeClass
public static void beforeClass() throws Exception {
// construct an index
- MockRAMDirectory indexStore = new MockRAMDirectory();
- IndexWriter writer = new IndexWriter(indexStore, new IndexWriterConfig(
+ Random random = newStaticRandom(TestRemoteCachingWrapperFilter.class);
+ indexStore = newDirectory(random);
+ IndexWriter writer = new IndexWriter(indexStore, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer()));
Document doc = new Document();
doc.add(new Field("test", "test text", Field.Store.YES, Field.Index.ANALYZED));
@@ -52,10 +58,17 @@ public class TestRemoteCachingWrapperFil
writer.addDocument(doc);
writer.optimize();
writer.close();
- Searchable local = new IndexSearcher(indexStore, true);
+ local = new IndexSearcher(indexStore, true);
startServer(local);
}
+ @AfterClass
+ public static void afterClass() throws Exception {
+ local.close();
+ indexStore.close();
+ indexStore = null;
+ }
+
private static void search(Query query, Filter filter, int hitNumber, String typeValue) throws Exception {
Searchable[] searchables = { lookupRemote() };
Searcher searcher = new MultiSearcher(searchables);
Modified: lucene/dev/trunk/lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteSearchable.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteSearchable.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteSearchable.java (original)
+++ lucene/dev/trunk/lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteSearchable.java Thu Aug 12 20:56:23 2010
@@ -20,25 +20,29 @@ package org.apache.lucene.search;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.*;
import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.Term;
import org.apache.lucene.store.MockRAMDirectory;
+import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import static org.junit.Assert.*;
import java.util.Collections;
+import java.util.Random;
import java.util.Set;
import java.util.HashSet;
public class TestRemoteSearchable extends RemoteTestCaseJ4 {
-
+ private static MockRAMDirectory indexStore;
+ private static Searchable local;
+
@BeforeClass
public static void beforeClass() throws Exception {
// construct an index
- MockRAMDirectory indexStore = new MockRAMDirectory();
- IndexWriter writer = new IndexWriter(indexStore, new IndexWriterConfig(
+ Random random = newStaticRandom(TestRemoteSearchable.class);
+ indexStore = newDirectory(random);
+ IndexWriter writer = new IndexWriter(indexStore, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer()));
Document doc = new Document();
doc.add(new Field("test", "test text", Field.Store.YES, Field.Index.ANALYZED));
@@ -46,10 +50,17 @@ public class TestRemoteSearchable extend
writer.addDocument(doc);
writer.optimize();
writer.close();
- Searchable local = new IndexSearcher(indexStore, true);
+ local = new IndexSearcher(indexStore, true);
startServer(local);
}
-
+
+ @AfterClass
+ public static void afterClass() throws Exception {
+ local.close();
+ indexStore.close();
+ indexStore = null;
+ }
+
private static void search(Query query) throws Exception {
// try to search the published index
Searchable[] searchables = { lookupRemote() };
Modified: lucene/dev/trunk/lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteSort.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteSort.java (original)
+++ lucene/dev/trunk/lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteSort.java Thu Aug 12 20:56:23 2010
@@ -35,6 +35,7 @@ import org.apache.lucene.index.LogMergeP
import org.apache.lucene.index.Term;
import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.BytesRef;
+import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -48,6 +49,7 @@ import org.junit.Test;
public class TestRemoteSort extends RemoteTestCaseJ4 {
private static IndexSearcher full;
+ private static MockRAMDirectory indexStore;
private Query queryX;
private Query queryY;
private Query queryA;
@@ -82,8 +84,9 @@ public class TestRemoteSort extends Remo
// create an index of all the documents, or just the x, or just the y documents
@BeforeClass
public static void beforeClass() throws Exception {
- MockRAMDirectory indexStore = new MockRAMDirectory ();
- IndexWriter writer = new IndexWriter(indexStore, new IndexWriterConfig(
+ Random random = newStaticRandom(TestRemoteSort.class);
+ indexStore = newDirectory(random);
+ IndexWriter writer = new IndexWriter(indexStore, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer())
.setMaxBufferedDocs(2));
((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(1000);
@@ -111,6 +114,14 @@ public class TestRemoteSort extends Remo
startServer(full);
}
+ @AfterClass
+ public static void afterClass() throws Exception {
+ full.close();
+ full = null;
+ indexStore.close();
+ indexStore = null;
+ }
+
public String getRandomNumberString(int num, int low, int high) {
StringBuilder sb = new StringBuilder();
for (int i = 0; i < num; i++) {
Modified: lucene/dev/trunk/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestCartesian.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestCartesian.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestCartesian.java (original)
+++ lucene/dev/trunk/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestCartesian.java Thu Aug 12 20:56:23 2010
@@ -20,6 +20,7 @@ import java.io.IOException;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Random;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
@@ -27,7 +28,6 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.document.NumericField;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
@@ -49,7 +49,6 @@ import org.apache.lucene.spatial.tier.pr
import org.apache.lucene.spatial.tier.projections.IProjector;
import org.apache.lucene.spatial.tier.projections.SinusoidalProjector;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.LuceneTestCase;
public class TestCartesian extends LuceneTestCase {
@@ -71,9 +70,10 @@ public class TestCartesian extends Lucen
@Override
protected void setUp() throws Exception {
super.setUp();
- directory = new MockRAMDirectory();
+ Random random = newRandom();
+ directory = newDirectory(random);
- IndexWriter writer = new IndexWriter(directory, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer()));
+ IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
setUpPlotter( 2, 15);
@@ -81,6 +81,12 @@ public class TestCartesian extends Lucen
}
+ @Override
+ protected void tearDown() throws Exception {
+ directory.close();
+ super.tearDown();
+ }
+
private void setUpPlotter(int base, int top) {
@@ -287,6 +293,7 @@ public class TestCartesian extends Lucen
assertTrue(geo_distance >= lastDistance);
lastDistance = geo_distance;
}
+ searcher.close();
}
public void testPoleFlipping() throws IOException, InvalidGeoException {
@@ -383,6 +390,7 @@ public class TestCartesian extends Lucen
assertTrue(geo_distance >= lastDistance);
lastDistance = geo_distance;
}
+ searcher.close();
}
public void testRange() throws IOException, InvalidGeoException {
@@ -477,6 +485,7 @@ public class TestCartesian extends Lucen
lastDistance = geo_distance;
}
}
+ searcher.close();
}
@@ -570,5 +579,6 @@ public class TestCartesian extends Lucen
}
}
+ searcher.close();
}
}
Modified: lucene/dev/trunk/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestDistance.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestDistance.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestDistance.java (original)
+++ lucene/dev/trunk/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestDistance.java Thu Aug 12 20:56:23 2010
@@ -17,13 +17,13 @@
package org.apache.lucene.spatial.tier;
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.NumericField;
import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.QueryWrapperFilter;
@@ -44,8 +44,9 @@ public class TestDistance extends Lucene
@Override
protected void setUp() throws Exception {
super.setUp();
- directory = new MockRAMDirectory();
- writer = new IndexWriter(directory, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer()));
+ Random random = newRandom();
+ directory = newDirectory(random);
+ writer = new IndexWriter(directory, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
addData(writer);
}
@@ -53,6 +54,7 @@ public class TestDistance extends Lucene
@Override
protected void tearDown() throws Exception {
writer.close();
+ directory.close();
super.tearDown();
}
@@ -104,6 +106,7 @@ public class TestDistance extends Lucene
for(int i=0;i<readers.length;i++) {
f.getDocIdSet(readers[i]);
}
+ r.close();
}
/* these tests do not test anything, as no assertions: