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 [2/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...
Modified: lucene/dev/trunk/lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java (original)
+++ lucene/dev/trunk/lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java Thu Aug 12 20:56:23 2010
@@ -19,6 +19,7 @@ package org.apache.lucene.search.spell;
import java.io.IOException;
import java.util.Iterator;
+import java.util.Random;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenizer;
@@ -39,17 +40,19 @@ import org.apache.lucene.util.LuceneTest
*/
public class TestLuceneDictionary extends LuceneTestCase {
- private Directory store = new MockRAMDirectory();
+ private Directory store;
private IndexReader indexReader = null;
-
+ private Random random;
private LuceneDictionary ld;
private Iterator<String> it;
@Override
protected void setUp() throws Exception {
super.setUp();
- IndexWriter writer = new IndexWriter(store, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(MockTokenizer.WHITESPACE, false)));
+ random = newRandom();
+ store = newDirectory(random);
+ IndexWriter writer = new IndexWriter(store, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer(MockTokenizer.WHITESPACE, false)));
Document doc;
@@ -77,6 +80,14 @@ public class TestLuceneDictionary extend
writer.close();
}
+ @Override
+ protected void tearDown() throws Exception {
+ if (indexReader != null)
+ indexReader.close();
+ store.close();
+ super.tearDown();
+ }
+
public void testFieldNonExistent() throws IOException {
try {
indexReader = IndexReader.open(store, true);
@@ -187,7 +198,8 @@ public class TestLuceneDictionary extend
}
public void testSpellchecker() throws IOException {
- SpellChecker sc = new SpellChecker(new MockRAMDirectory());
+ Directory dir = newDirectory(random);
+ SpellChecker sc = new SpellChecker(dir);
indexReader = IndexReader.open(store, true);
sc.indexDictionary(new LuceneDictionary(indexReader, "contents"));
String[] suggestions = sc.suggestSimilar("Tam", 1);
@@ -197,6 +209,8 @@ public class TestLuceneDictionary extend
assertEquals(1, suggestions.length);
assertEquals("Jerry", suggestions[0]);
indexReader.close();
+ sc.close();
+ dir.close();
}
}
Modified: lucene/dev/trunk/lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestPlainTextDictionary.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestPlainTextDictionary.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestPlainTextDictionary.java (original)
+++ lucene/dev/trunk/lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestPlainTextDictionary.java Thu Aug 12 20:56:23 2010
@@ -33,13 +33,15 @@ public class TestPlainTextDictionary ext
final String LF = System.getProperty("line.separator");
String input = "oneword" + LF + "twoword" + LF + "threeword";
PlainTextDictionary ptd = new PlainTextDictionary(new StringReader(input));
- MockRAMDirectory ramDir = new MockRAMDirectory();
+ MockRAMDirectory ramDir = newDirectory(newRandom());
SpellChecker spellChecker = new SpellChecker(ramDir);
spellChecker.indexDictionary(ptd);
String[] similar = spellChecker.suggestSimilar("treeword", 2);
assertEquals(2, similar.length);
assertEquals(similar[0], "threeword");
assertEquals(similar[1], "twoword");
+ spellChecker.close();
+ ramDir.close();
}
}
Modified: lucene/dev/trunk/lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestSpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestSpellChecker.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestSpellChecker.java (original)
+++ lucene/dev/trunk/lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestSpellChecker.java Thu Aug 12 20:56:23 2010
@@ -36,7 +36,6 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.store.AlreadyClosedException;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.English;
import org.apache.lucene.util.LuceneTestCase;
@@ -54,7 +53,7 @@ public class TestSpellChecker extends Lu
super.setUp();
//create a user index
- userindex = new MockRAMDirectory();
+ userindex = newDirectory(random);
IndexWriter writer = new IndexWriter(userindex, new IndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer()));
@@ -67,9 +66,18 @@ public class TestSpellChecker extends Lu
writer.close();
searchers = Collections.synchronizedList(new ArrayList<IndexSearcher>());
// create the spellChecker
- spellindex = new MockRAMDirectory();
+ spellindex = newDirectory(random);
spellChecker = new SpellCheckerMock(spellindex);
}
+
+ @Override
+ protected void tearDown() throws Exception {
+ userindex.close();
+ if (!spellChecker.isClosed())
+ spellChecker.close();
+ spellindex.close();
+ super.tearDown();
+ }
public void testBuild() throws CorruptIndexException, IOException {
@@ -99,7 +107,7 @@ public class TestSpellChecker extends Lu
spellChecker.setAccuracy(0.5f);
checkCommonSuggestions(r);
checkNGramSuggestions();
-
+ r.close();
}
private void checkCommonSuggestions(IndexReader r) throws IOException {
@@ -260,6 +268,7 @@ public class TestSpellChecker extends Lu
}
assertEquals(4, searchers.size());
assertSearchersClosed();
+ r.close();
}
/*
@@ -311,7 +320,7 @@ public class TestSpellChecker extends Lu
// 2. and 3. during addwords
assertEquals(iterations + 4, searchers.size());
assertSearchersClosed();
-
+ r.close();
}
private void assertLastSearcherOpen(int numSearchers) {
Modified: lucene/dev/trunk/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestParser.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestParser.java (original)
+++ lucene/dev/trunk/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestParser.java Thu Aug 12 20:56:23 2010
@@ -4,6 +4,7 @@ import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.util.Random;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.MockAnalyzer;
@@ -58,12 +59,10 @@ public class TestParser extends LuceneTe
//initialize the parser
builder=new CorePlusExtensionsParser("contents",analyzer);
- //initialize the index (done once, then cached in static data for use with ALL tests)
- if(dir==null)
- {
+ Random random = newRandom();
BufferedReader d = new BufferedReader(new InputStreamReader(TestParser.class.getResourceAsStream("reuters21578.txt")));
- dir=new MockRAMDirectory();
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(Version.LUCENE_24, analyzer));
+ dir=newDirectory(random);
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, Version.LUCENE_24, analyzer));
String line = d.readLine();
while(line!=null)
{
@@ -81,7 +80,6 @@ public class TestParser extends LuceneTe
}
d.close();
writer.close();
- }
reader=IndexReader.open(dir, true);
searcher=new IndexSearcher(reader);
@@ -94,7 +92,7 @@ public class TestParser extends LuceneTe
protected void tearDown() throws Exception {
reader.close();
searcher.close();
-// dir.close();
+ dir.close();
super.tearDown();
}
public void testSimpleXML() throws ParserException, IOException
Modified: lucene/dev/trunk/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestQueryTemplateManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestQueryTemplateManager.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestQueryTemplateManager.java (original)
+++ lucene/dev/trunk/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestQueryTemplateManager.java Thu Aug 12 20:56:23 2010
@@ -2,6 +2,7 @@ package org.apache.lucene.xmlparser;
import java.io.IOException;
import java.util.Properties;
+import java.util.Random;
import java.util.StringTokenizer;
import javax.xml.parsers.ParserConfigurationException;
@@ -44,6 +45,7 @@ public class TestQueryTemplateManager ex
CoreParser builder;
Analyzer analyzer=new MockAnalyzer();
private IndexSearcher searcher;
+ private MockRAMDirectory dir;
//A collection of documents' field values for use in our tests
String docFieldValues []=
@@ -141,8 +143,9 @@ public class TestQueryTemplateManager ex
//Create an index
- MockRAMDirectory dir=new MockRAMDirectory();
- IndexWriter w=new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, analyzer));
+ Random random = newRandom();
+ dir=newDirectory(random);
+ IndexWriter w=new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, analyzer));
for (int i = 0; i < docFieldValues.length; i++)
{
w.addDocument(getDocumentFromString(docFieldValues[i]));
@@ -160,6 +163,7 @@ public class TestQueryTemplateManager ex
@Override
protected void tearDown() throws Exception {
searcher.close();
+ dir.close();
super.tearDown();
}
}
Modified: lucene/dev/trunk/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/builders/TestNumericRangeFilterBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/builders/TestNumericRangeFilterBuilder.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/builders/TestNumericRangeFilterBuilder.java (original)
+++ lucene/dev/trunk/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/builders/TestNumericRangeFilterBuilder.java Thu Aug 12 20:56:23 2010
@@ -20,6 +20,7 @@ package org.apache.lucene.xmlparser.buil
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.util.Random;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -61,9 +62,9 @@ public class TestNumericRangeFilterBuild
String xml = "<NumericRangeFilter fieldName='AGE' type='int' lowerTerm='-1' upperTerm='NaN'/>";
Document doc = getDocumentFromString(xml);
Filter filter = filterBuilder.getFilter(doc.getDocumentElement());
-
- MockRAMDirectory ramDir = new MockRAMDirectory();
- IndexWriter writer = new IndexWriter(ramDir, new IndexWriterConfig(TEST_VERSION_CURRENT, null));
+ Random random = newRandom();
+ MockRAMDirectory ramDir = newDirectory(random);
+ IndexWriter writer = new IndexWriter(ramDir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, null));
writer.commit();
try
{
@@ -81,6 +82,7 @@ public class TestNumericRangeFilterBuild
{
writer.commit();
writer.close();
+ ramDir.close();
}
}
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/PersistentSnapshotDeletionPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/PersistentSnapshotDeletionPolicy.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/PersistentSnapshotDeletionPolicy.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/PersistentSnapshotDeletionPolicy.java Thu Aug 12 20:56:23 2010
@@ -99,6 +99,7 @@ public class PersistentSnapshotDeletionP
Document doc = r.document(r.maxDoc() - 1);
Field sid = doc.getField(SNAPSHOTS_ID);
if (sid == null) {
+ writer.close();
throw new IllegalStateException("directory is not a valid snapshots store!");
}
doc.removeField(SNAPSHOTS_ID);
@@ -106,6 +107,7 @@ public class PersistentSnapshotDeletionP
registerSnapshotInfo(f.name(), f.stringValue(), null);
}
} else if (numDocs != 0) {
+ writer.close();
throw new IllegalStateException(
"should be at most 1 document in the snapshots directory: " + numDocs);
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/TestExternalCodecs.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/TestExternalCodecs.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/TestExternalCodecs.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/TestExternalCodecs.java Thu Aug 12 20:56:23 2010
@@ -600,10 +600,10 @@ public class TestExternalCodecs extends
public void testPerFieldCodec() throws Exception {
final int NUM_DOCS = 173;
-
- Directory dir = new MockRAMDirectory();
+ Random random = newRandom();
+ Directory dir = newDirectory(random);
IndexWriter w = new IndexWriter(dir,
- new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer()).setCodecProvider(new MyCodecs()));
+ newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()).setCodecProvider(new MyCodecs()));
w.setMergeFactor(3);
Document doc = new Document();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/TestMergeSchedulerExternal.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/TestMergeSchedulerExternal.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/TestMergeSchedulerExternal.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/TestMergeSchedulerExternal.java Thu Aug 12 20:56:23 2010
@@ -17,10 +17,13 @@ package org.apache.lucene;
* limitations under the License.
*/
import java.io.IOException;
+import java.util.Random;
+
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.index.LogMergePolicy;
import org.apache.lucene.index.MergePolicy;
import org.apache.lucene.index.ConcurrentMergeScheduler;
import org.apache.lucene.analysis.MockAnalyzer;
@@ -80,17 +83,20 @@ public class TestMergeSchedulerExternal
}
public void testSubclassConcurrentMergeScheduler() throws IOException {
- MockRAMDirectory dir = new MockRAMDirectory();
+ Random random = newRandom();
+ MockRAMDirectory dir = newDirectory(random);
dir.failOn(new FailOnlyOnMerge());
Document doc = new Document();
Field idField = new Field("id", "", Field.Store.YES, Field.Index.NOT_ANALYZED);
doc.add(idField);
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer()).setMergeScheduler(new MyMergeScheduler())
.setMaxBufferedDocs(2).setRAMBufferSizeMB(
IndexWriterConfig.DISABLE_AUTO_FLUSH));
+ LogMergePolicy logMP = (LogMergePolicy) writer.getConfig().getMergePolicy();
+ logMP.setMergeFactor(10);
for(int i=0;i<20;i++)
writer.addDocument(doc);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/TestSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/TestSearch.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/TestSearch.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/TestSearch.java Thu Aug 12 20:56:23 2010
@@ -18,6 +18,7 @@ package org.apache.lucene;
*/
import java.util.GregorianCalendar;
+import java.util.Random;
import java.io.PrintWriter;
import java.io.StringWriter;
@@ -50,9 +51,10 @@ public class TestSearch extends LuceneTe
* single-file formats, even if the results are wrong.
*/
public void testSearch() throws Exception {
+ Random random = newRandom();
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw, true);
- doTestSearch(pw, false);
+ doTestSearch(random, pw, false);
pw.close();
sw.close();
String multiFileOutput = sw.getBuffer().toString();
@@ -60,7 +62,7 @@ public class TestSearch extends LuceneTe
sw = new StringWriter();
pw = new PrintWriter(sw, true);
- doTestSearch(pw, true);
+ doTestSearch(random, pw, true);
pw.close();
sw.close();
String singleFileOutput = sw.getBuffer().toString();
@@ -69,11 +71,11 @@ public class TestSearch extends LuceneTe
}
- private void doTestSearch(PrintWriter out, boolean useCompoundFile)
+ private void doTestSearch(Random random, PrintWriter out, boolean useCompoundFile)
throws Exception {
- Directory directory = new MockRAMDirectory();
+ Directory directory = newDirectory(random);
Analyzer analyzer = new MockAnalyzer();
- IndexWriterConfig conf = new IndexWriterConfig(TEST_VERSION_CURRENT, analyzer);
+ IndexWriterConfig conf = newIndexWriterConfig(random, TEST_VERSION_CURRENT, analyzer);
LogMergePolicy lmp = (LogMergePolicy) conf.getMergePolicy();
lmp.setUseCompoundFile(useCompoundFile);
lmp.setUseCompoundDocStore(useCompoundFile);
@@ -129,6 +131,7 @@ public class TestSearch extends LuceneTe
}
}
searcher.close();
+ directory.close();
}
static long Time(int year, int month, int day) {
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/TestSearchForDuplicates.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/TestSearchForDuplicates.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/TestSearchForDuplicates.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/TestSearchForDuplicates.java Thu Aug 12 20:56:23 2010
@@ -20,6 +20,7 @@ package org.apache.lucene;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
+import java.util.Random;
import org.apache.lucene.store.*;
import org.apache.lucene.document.*;
@@ -58,7 +59,8 @@ public class TestSearchForDuplicates ext
public void testRun() throws Exception {
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw, true);
- doTest(pw, false);
+ Random random = newRandom();
+ doTest(random, pw, false);
pw.close();
sw.close();
String multiFileOutput = sw.getBuffer().toString();
@@ -66,7 +68,7 @@ public class TestSearchForDuplicates ext
sw = new StringWriter();
pw = new PrintWriter(sw, true);
- doTest(pw, true);
+ doTest(random, pw, true);
pw.close();
sw.close();
String singleFileOutput = sw.getBuffer().toString();
@@ -75,10 +77,10 @@ public class TestSearchForDuplicates ext
}
- private void doTest(PrintWriter out, boolean useCompoundFiles) throws Exception {
- Directory directory = new MockRAMDirectory();
+ private void doTest(Random random, PrintWriter out, boolean useCompoundFiles) throws Exception {
+ Directory directory = newDirectory(random);
Analyzer analyzer = new MockAnalyzer();
- IndexWriterConfig conf = new IndexWriterConfig(TEST_VERSION_CURRENT, analyzer);
+ IndexWriterConfig conf = newIndexWriterConfig(random, TEST_VERSION_CURRENT, analyzer);
LogMergePolicy lmp = (LogMergePolicy) conf.getMergePolicy();
lmp.setUseCompoundFile(useCompoundFiles);
lmp.setUseCompoundDocStore(useCompoundFiles);
@@ -125,6 +127,7 @@ public class TestSearchForDuplicates ext
checkHits(hits, MAX_DOCS, searcher);
searcher.close();
+ directory.close();
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java Thu Aug 12 20:56:23 2010
@@ -19,6 +19,7 @@ package org.apache.lucene.analysis;
import java.io.IOException;
+import java.util.Random;
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
@@ -26,20 +27,19 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.document.Field.TermVector;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.MultiFields;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.BytesRef;
public class TestCachingTokenFilter extends BaseTokenStreamTestCase {
private String[] tokens = new String[] {"term1", "term2", "term3", "term2"};
public void testCaching() throws IOException {
- Directory dir = new MockRAMDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(newRandom(), dir);
+ Random random = newRandom();
+ Directory dir = newDirectory(random);
+ RandomIndexWriter writer = new RandomIndexWriter(random, dir);
Document doc = new Document();
TokenStream stream = new TokenStream() {
private int index = 0;
@@ -103,6 +103,7 @@ public class TestCachingTokenFilter exte
// 3) reset stream and consume tokens again
stream.reset();
checkTokens(stream);
+ dir.close();
}
private void checkTokens(TokenStream stream) throws IOException {
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestBinaryDocument.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestBinaryDocument.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestBinaryDocument.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestBinaryDocument.java Thu Aug 12 20:56:23 2010
@@ -1,5 +1,7 @@
package org.apache.lucene.document;
+import java.util.Random;
+
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.index.IndexReader;
@@ -55,8 +57,9 @@ public class TestBinaryDocument extends
assertEquals(2, doc.fields.size());
/** add the doc to a ram index */
- MockRAMDirectory dir = new MockRAMDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(newRandom(), dir);
+ Random random = newRandom();
+ MockRAMDirectory dir = newDirectory(random);
+ RandomIndexWriter writer = new RandomIndexWriter(random, dir);
writer.addDocument(doc);
/** open a reader and fetch the document */
@@ -94,8 +97,9 @@ public class TestBinaryDocument extends
doc.add(stringFldCompressed);
/** add the doc to a ram index */
- MockRAMDirectory dir = new MockRAMDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(newRandom(), dir);
+ Random random = newRandom();
+ MockRAMDirectory dir = newDirectory(random);
+ RandomIndexWriter writer = new RandomIndexWriter(random, dir);
writer.addDocument(doc);
/** open a reader and fetch the document */
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestDocument.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestDocument.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestDocument.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestDocument.java Thu Aug 12 20:56:23 2010
@@ -1,5 +1,7 @@
package org.apache.lucene.document;
+import java.util.Random;
+
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -152,8 +154,9 @@ public class TestDocument extends Lucene
* @throws Exception on error
*/
public void testGetValuesForIndexedDocument() throws Exception {
- MockRAMDirectory dir = new MockRAMDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(newRandom(), dir);
+ Random random = newRandom();
+ MockRAMDirectory dir = newDirectory(random);
+ RandomIndexWriter writer = new RandomIndexWriter(random, dir);
writer.addDocument(makeDocumentWithFields());
IndexReader reader = writer.getReader();
@@ -230,8 +233,9 @@ public class TestDocument extends Lucene
doc.add(new Field("keyword", "test", Field.Store.YES,
Field.Index.NOT_ANALYZED));
- MockRAMDirectory dir = new MockRAMDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(newRandom(), dir);
+ Random random = newRandom();
+ MockRAMDirectory dir = newDirectory(random);
+ RandomIndexWriter writer = new RandomIndexWriter(random, dir);
writer.addDocument(doc);
field.setValue("id2");
writer.addDocument(doc);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestAddIndexes.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestAddIndexes.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestAddIndexes.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestAddIndexes.java Thu Aug 12 20:56:23 2010
@@ -44,10 +44,10 @@ public class TestAddIndexes extends Luce
public void testSimpleCase() throws IOException {
// main directory
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
// two auxiliary directories
- Directory aux = new MockRAMDirectory();
- Directory aux2 = new MockRAMDirectory();
+ Directory aux = newDirectory(random);
+ Directory aux2 = newDirectory(random);
IndexWriter writer = null;
@@ -89,7 +89,7 @@ public class TestAddIndexes extends Luce
verifyNumDocs(dir, 190);
// now add another set in.
- Directory aux3 = new MockRAMDirectory();
+ Directory aux3 = newDirectory(random);
writer = newWriter(aux3, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
// add 40 documents
addDocs(writer, 40);
@@ -123,7 +123,7 @@ public class TestAddIndexes extends Luce
verifyTermDocs(dir, new Term("content", "bbb"), 50);
// now add a single document
- Directory aux4 = new MockRAMDirectory();
+ Directory aux4 = newDirectory(random);
writer = newWriter(aux4, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
addDocs2(writer, 1);
writer.close();
@@ -137,13 +137,18 @@ public class TestAddIndexes extends Luce
verifyNumDocs(dir, 231);
verifyTermDocs(dir, new Term("content", "bbb"), 51);
+ dir.close();
+ aux.close();
+ aux2.close();
+ aux3.close();
+ aux4.close();
}
public void testWithPendingDeletes() throws IOException {
// main directory
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
// auxiliary directory
- Directory aux = new MockRAMDirectory();
+ Directory aux = newDirectory(random);
setUpDirs(dir, aux);
IndexWriter writer = newWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()).setOpenMode(OpenMode.APPEND));
@@ -178,9 +183,9 @@ public class TestAddIndexes extends Luce
public void testWithPendingDeletes2() throws IOException {
// main directory
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
// auxiliary directory
- Directory aux = new MockRAMDirectory();
+ Directory aux = newDirectory(random);
setUpDirs(dir, aux);
IndexWriter writer = newWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()).setOpenMode(OpenMode.APPEND));
@@ -216,9 +221,9 @@ public class TestAddIndexes extends Luce
public void testWithPendingDeletes3() throws IOException {
// main directory
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
// auxiliary directory
- Directory aux = new MockRAMDirectory();
+ Directory aux = newDirectory(random);
setUpDirs(dir, aux);
IndexWriter writer = newWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()).setOpenMode(OpenMode.APPEND));
@@ -256,9 +261,9 @@ public class TestAddIndexes extends Luce
// case 0: add self or exceed maxMergeDocs, expect exception
public void testAddSelf() throws IOException {
// main directory
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
// auxiliary directory
- Directory aux = new MockRAMDirectory();
+ Directory aux = newDirectory(random);
IndexWriter writer = null;
@@ -293,6 +298,8 @@ public class TestAddIndexes extends Luce
// make sure the index is correct
verifyNumDocs(dir, 100);
+ dir.close();
+ aux.close();
}
// in all the remaining tests, make the doc count of the oldest segment
@@ -300,9 +307,9 @@ public class TestAddIndexes extends Luce
// case 1: no tail segments
public void testNoTailSegments() throws IOException {
// main directory
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
// auxiliary directory
- Directory aux = new MockRAMDirectory();
+ Directory aux = newDirectory(random);
setUpDirs(dir, aux);
@@ -319,14 +326,16 @@ public class TestAddIndexes extends Luce
// make sure the index is correct
verifyNumDocs(dir, 1040);
+ dir.close();
+ aux.close();
}
// case 2: tail segments, invariants hold, no copy
public void testNoCopySegments() throws IOException {
// main directory
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
// auxiliary directory
- Directory aux = new MockRAMDirectory();
+ Directory aux = newDirectory(random);
setUpDirs(dir, aux);
@@ -341,14 +350,16 @@ public class TestAddIndexes extends Luce
// make sure the index is correct
verifyNumDocs(dir, 1032);
+ dir.close();
+ aux.close();
}
// case 3: tail segments, invariants hold, copy, invariants hold
public void testNoMergeAfterCopy() throws IOException {
// main directory
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
// auxiliary directory
- Directory aux = new MockRAMDirectory();
+ Directory aux = newDirectory(random);
setUpDirs(dir, aux);
@@ -364,14 +375,16 @@ public class TestAddIndexes extends Luce
// make sure the index is correct
verifyNumDocs(dir, 1060);
+ dir.close();
+ aux.close();
}
// case 4: tail segments, invariants hold, copy, invariants not hold
public void testMergeAfterCopy() throws IOException {
// main directory
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
// auxiliary directory
- Directory aux = new MockRAMDirectory();
+ Directory aux = newDirectory(random);
setUpDirs(dir, aux);
@@ -391,15 +404,17 @@ public class TestAddIndexes extends Luce
assertEquals(1060, writer.maxDoc());
assertEquals(1000, writer.getDocCount(0));
writer.close();
+ dir.close();
+ aux.close();
}
// case 5: tail segments, invariants not hold
public void testMoreMerges() throws IOException {
// main directory
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
// auxiliary directory
- Directory aux = new MockRAMDirectory();
- Directory aux2 = new MockRAMDirectory();
+ Directory aux = newDirectory(random);
+ Directory aux2 = newDirectory(random);
setUpDirs(dir, aux);
@@ -434,6 +449,9 @@ public class TestAddIndexes extends Luce
assertEquals(1060, writer.maxDoc());
assertEquals(1000, writer.getDocCount(0));
writer.close();
+ dir.close();
+ aux.close();
+ aux2.close();
}
private IndexWriter newWriter(Directory dir, IndexWriterConfig conf)
@@ -510,7 +528,7 @@ public class TestAddIndexes extends Luce
// LUCENE-1270
public void testHangOnClose() throws IOException {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
LogByteSizeMergePolicy lmp = new LogByteSizeMergePolicy();
lmp.setUseCompoundFile(false);
lmp.setUseCompoundDocStore(false);
@@ -538,7 +556,7 @@ public class TestAddIndexes extends Luce
writer.addDocument(doc2);
writer.close();
- Directory dir2 = new MockRAMDirectory();
+ Directory dir2 = newDirectory(random);
lmp = new LogByteSizeMergePolicy();
lmp.setMinMergeMB(0.0001);
lmp.setUseCompoundFile(false);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java Thu Aug 12 20:56:23 2010
@@ -226,7 +226,7 @@ public class TestBackwardsCompatibility
String fullPath = fullDir(name);
Directory dir = FSDirectory.open(new File(fullPath));
- Directory targetDir = new MockRAMDirectory();
+ Directory targetDir = newDirectory(random);
IndexWriter w = new IndexWriter(targetDir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer()));
w.addIndexes(new Directory[] { dir });
@@ -235,6 +235,7 @@ public class TestBackwardsCompatibility
_TestUtil.checkIndex(targetDir);
dir.close();
+ targetDir.close();
rmDir(name);
}
}
@@ -247,7 +248,7 @@ public class TestBackwardsCompatibility
Directory dir = FSDirectory.open(new File(fullPath));
IndexReader reader = IndexReader.open(dir);
- Directory targetDir = new MockRAMDirectory();
+ Directory targetDir = newDirectory(random);
IndexWriter w = new IndexWriter(targetDir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer()));
w.addIndexes(new IndexReader[] { reader });
@@ -257,6 +258,7 @@ public class TestBackwardsCompatibility
_TestUtil.checkIndex(targetDir);
dir.close();
+ targetDir.close();
rmDir(name);
}
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestCheckIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestCheckIndex.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestCheckIndex.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestCheckIndex.java Thu Aug 12 20:56:23 2010
@@ -22,6 +22,7 @@ import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import java.util.List;
import java.util.ArrayList;
+import java.util.Random;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.store.MockRAMDirectory;
@@ -33,8 +34,9 @@ import org.apache.lucene.util.Constants;
public class TestCheckIndex extends LuceneTestCase {
public void testDeletedDocs() throws IOException {
- MockRAMDirectory dir = new MockRAMDirectory();
- IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(newRandom(), TEST_VERSION_CURRENT, new MockAnalyzer()).setMaxBufferedDocs(2));
+ Random random = newRandom();
+ MockRAMDirectory dir = newDirectory(random);
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()).setMaxBufferedDocs(2));
Document doc = new Document();
doc.add(new Field("field", "aaa", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
for(int i=0;i<19;i++) {
@@ -87,6 +89,7 @@ public class TestCheckIndex extends Luce
onlySegments.add("_0");
assertTrue(checker.checkIndex(onlySegments).clean == true);
+ dir.close();
}
public void testLuceneConstantVersion() throws IOException {
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestCodecs.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestCodecs.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestCodecs.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestCodecs.java Thu Aug 12 20:56:23 2010
@@ -278,7 +278,7 @@ public class TestCodecs extends MultiCod
final FieldData field = new FieldData("field", fieldInfos, terms, true, false);
final FieldData[] fields = new FieldData[] {field};
- final Directory dir = new MockRAMDirectory();
+ final Directory dir = newDirectory(RANDOM);
this.write(fieldInfos, dir, fields);
final SegmentInfo si = new SegmentInfo(SEGMENT, 10000, dir, false, -1, SEGMENT, false, true, CodecProvider.getDefault().getWriter(null));
si.setHasProx(false);
@@ -311,6 +311,8 @@ public class TestCodecs extends MultiCod
}
assertNull(fieldsEnum.next());
+ reader.close();
+ dir.close();
}
public void testRandomPostings() throws Throwable {
@@ -326,7 +328,7 @@ public class TestCodecs extends MultiCod
fields[i] = new FieldData(fieldNames[i], fieldInfos, this.makeRandomTerms(omitTF, storePayloads), omitTF, storePayloads);
}
- final Directory dir = new MockRAMDirectory();
+ final Directory dir = newDirectory(RANDOM);
this.write(fieldInfos, dir, fields);
final SegmentInfo si = new SegmentInfo(SEGMENT, 10000, dir, false, -1, SEGMENT, false, true, CodecProvider.getDefault().getWriter(null));
@@ -352,8 +354,9 @@ public class TestCodecs extends MultiCod
}
public void testSepPositionAfterMerge() throws IOException {
- final Directory dir = new MockRAMDirectory();
- final IndexWriterConfig config = newIndexWriterConfig(newRandom(), Version.LUCENE_31,
+ Random random = newRandom();
+ final Directory dir = newDirectory(random);
+ final IndexWriterConfig config = newIndexWriterConfig(random, Version.LUCENE_31,
new MockAnalyzer());
config.setCodecProvider(new MockSepCodecs());
final IndexWriter writer = new IndexWriter(dir, config);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java Thu Aug 12 20:56:23 2010
@@ -61,12 +61,12 @@ public class TestConcurrentMergeSchedule
// Make sure running BG merges still work fine even when
// we are hitting exceptions during flushing.
public void testFlushExceptions() throws IOException {
-
- MockRAMDirectory directory = new MockRAMDirectory();
+ Random random = newRandom();
+ MockRAMDirectory directory = newDirectory(random);
FailOnlyOnFlush failure = new FailOnlyOnFlush();
directory.failOn(failure);
- IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig(newRandom(), TEST_VERSION_CURRENT, new MockAnalyzer()).setMaxBufferedDocs(2));
+ IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()).setMaxBufferedDocs(2));
Document doc = new Document();
Field idField = new Field("id", "", Field.Store.YES, Field.Index.NOT_ANALYZED);
doc.add(idField);
@@ -107,15 +107,15 @@ public class TestConcurrentMergeSchedule
// Test that deletes committed after a merge started and
// before it finishes, are correctly merged back:
public void testDeleteMerging() throws IOException {
-
- MockRAMDirectory directory = new MockRAMDirectory();
+ Random random = newRandom();
+ MockRAMDirectory directory = newDirectory(random);
LogDocMergePolicy mp = new LogDocMergePolicy();
// Force degenerate merging so we can get a mix of
// merging of segments with and without deletes at the
// start:
mp.setMinMergeDocs(1000);
- IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig(newRandom(),
+ IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer())
.setMergePolicy(mp));
@@ -146,9 +146,8 @@ public class TestConcurrentMergeSchedule
}
public void testNoExtraFiles() throws IOException {
-
- MockRAMDirectory directory = new MockRAMDirectory();
Random random = newRandom();
+ MockRAMDirectory directory = newDirectory(random);
IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer())
.setMaxBufferedDocs(2));
@@ -176,8 +175,8 @@ public class TestConcurrentMergeSchedule
}
public void testNoWaitClose() throws IOException {
- MockRAMDirectory directory = new MockRAMDirectory();
Random random = newRandom();
+ MockRAMDirectory directory = newDirectory(random);
Document doc = new Document();
Field idField = new Field("id", "", Field.Store.YES, Field.Index.NOT_ANALYZED);
doc.add(idField);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestCrash.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestCrash.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestCrash.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestCrash.java Thu Aug 12 20:56:23 2010
@@ -30,7 +30,7 @@ import org.apache.lucene.document.Field;
public class TestCrash extends LuceneTestCase {
private IndexWriter initIndex(Random random, boolean initialCommit) throws IOException {
- return initIndex(random, new MockRAMDirectory(), initialCommit);
+ return initIndex(random, newDirectory(random), initialCommit);
}
private IndexWriter initIndex(Random random, MockRAMDirectory dir, boolean initialCommit) throws IOException {
@@ -70,6 +70,8 @@ public class TestCrash extends LuceneTes
crash(writer);
IndexReader reader = IndexReader.open(dir, false);
assertTrue(reader.numDocs() < 157);
+ reader.close();
+ dir.close();
}
public void testWriterAfterCrash() throws IOException {
@@ -86,6 +88,8 @@ public class TestCrash extends LuceneTes
IndexReader reader = IndexReader.open(dir, false);
assertTrue(reader.numDocs() < 314);
+ reader.close();
+ dir.close();
}
public void testCrashAfterReopen() throws IOException {
@@ -108,6 +112,8 @@ public class TestCrash extends LuceneTes
IndexReader reader = IndexReader.open(dir, false);
assertTrue(reader.numDocs() >= 157);
+ reader.close();
+ dir.close();
}
public void testCrashAfterClose() throws IOException {
@@ -127,6 +133,8 @@ public class TestCrash extends LuceneTes
IndexReader reader = IndexReader.open(dir, false);
assertEquals(157, reader.numDocs());
+ reader.close();
+ dir.close();
}
public void testCrashAfterCloseNoWait() throws IOException {
@@ -146,6 +154,8 @@ public class TestCrash extends LuceneTes
*/
IndexReader reader = IndexReader.open(dir, false);
assertEquals(157, reader.numDocs());
+ reader.close();
+ dir.close();
}
public void testCrashReaderDeletes() throws IOException {
@@ -167,6 +177,8 @@ public class TestCrash extends LuceneTes
*/
reader = IndexReader.open(dir, false);
assertEquals(157, reader.numDocs());
+ reader.close();
+ dir.close();
}
public void testCrashReaderDeletesAfterClose() throws IOException {
@@ -189,5 +201,7 @@ public class TestCrash extends LuceneTes
*/
reader = IndexReader.open(dir, false);
assertEquals(156, reader.numDocs());
+ reader.close();
+ dir.close();
}
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDeletionPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDeletionPolicy.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDeletionPolicy.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDeletionPolicy.java Thu Aug 12 20:56:23 2010
@@ -202,7 +202,7 @@ public class TestDeletionPolicy extends
boolean useCompoundFile = true;
Random random = newRandom();
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
ExpirationTimeDeletionPolicy policy = new ExpirationTimeDeletionPolicy(dir, SECONDS);
IndexWriterConfig conf = newIndexWriterConfig(random, TEST_VERSION_CURRENT,
new MockAnalyzer())
@@ -282,7 +282,7 @@ public class TestDeletionPolicy extends
// Never deletes a commit
KeepAllDeletionPolicy policy = new KeepAllDeletionPolicy();
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
policy.dir = dir;
IndexWriterConfig conf = newIndexWriterConfig(random,
@@ -365,7 +365,7 @@ public class TestDeletionPolicy extends
// Never deletes a commit
KeepAllDeletionPolicy policy = new KeepAllDeletionPolicy();
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
policy.dir = dir;
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random,
@@ -474,7 +474,7 @@ public class TestDeletionPolicy extends
KeepNoneOnInitDeletionPolicy policy = new KeepNoneOnInitDeletionPolicy();
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
IndexWriterConfig conf = newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer())
@@ -523,7 +523,7 @@ public class TestDeletionPolicy extends
boolean useCompoundFile = (pass % 2) != 0;
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
KeepLastNDeletionPolicy policy = new KeepLastNDeletionPolicy(N);
@@ -588,7 +588,7 @@ public class TestDeletionPolicy extends
KeepLastNDeletionPolicy policy = new KeepLastNDeletionPolicy(N);
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
IndexWriterConfig conf = newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer())
.setOpenMode(OpenMode.CREATE).setIndexDeletionPolicy(policy);
@@ -697,7 +697,7 @@ public class TestDeletionPolicy extends
KeepLastNDeletionPolicy policy = new KeepLastNDeletionPolicy(N);
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
IndexWriterConfig conf = newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer())
.setOpenMode(OpenMode.CREATE).setIndexDeletionPolicy(policy)
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDirectoryReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDirectoryReader.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDirectoryReader.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDirectoryReader.java Thu Aug 12 20:56:23 2010
@@ -36,6 +36,7 @@ public class TestDirectoryReader extends
private Document doc2;
protected SegmentReader [] readers = new SegmentReader[2];
protected SegmentInfos sis;
+ private Random random;
public TestDirectoryReader(String s) {
@@ -45,7 +46,8 @@ public class TestDirectoryReader extends
@Override
protected void setUp() throws Exception {
super.setUp();
- dir = new MockRAMDirectory();
+ random = newRandom();
+ dir = newDirectory(random);
doc1 = new Document();
doc2 = new Document();
DocHelper.setupDoc(doc1);
@@ -55,6 +57,14 @@ public class TestDirectoryReader extends
sis = new SegmentInfos();
sis.read(dir);
}
+
+ @Override
+ protected void tearDown() throws Exception {
+ if (readers[0] != null) readers[0].close();
+ if (readers[1] != null) readers[1].close();
+ dir.close();
+ super.tearDown();
+ }
protected IndexReader openReader() throws IOException {
IndexReader reader;
@@ -86,6 +96,7 @@ public class TestDirectoryReader extends
TermFreqVector vector = reader.getTermFreqVector(0, DocHelper.TEXT_FIELD_2_KEY);
assertTrue(vector != null);
TestSegmentReader.checkNorms(reader);
+ reader.close();
}
public void doTestUndeleteAll() throws IOException {
@@ -122,13 +133,13 @@ public class TestDirectoryReader extends
sis.read(dir);
reader = openReader();
assertEquals( 1, reader.numDocs() );
+ reader.close();
}
public void testIsCurrent() throws IOException {
- Random random = newRandom();
- MockRAMDirectory ramDir1=new MockRAMDirectory();
+ MockRAMDirectory ramDir1=newDirectory(random);
addDoc(random, ramDir1, "test foo", true);
- MockRAMDirectory ramDir2=new MockRAMDirectory();
+ MockRAMDirectory ramDir2=newDirectory(random);
addDoc(random, ramDir2, "test blah", true);
IndexReader[] readers = new IndexReader[]{IndexReader.open(ramDir1, false), IndexReader.open(ramDir2, false)};
MultiReader mr = new MultiReader(readers);
@@ -144,15 +155,16 @@ public class TestDirectoryReader extends
// expected exception
}
mr.close();
+ ramDir1.close();
+ ramDir2.close();
}
public void testMultiTermDocs() throws IOException {
- Random random = newRandom();
- MockRAMDirectory ramDir1=new MockRAMDirectory();
+ MockRAMDirectory ramDir1=newDirectory(random);
addDoc(random, ramDir1, "test foo", true);
- MockRAMDirectory ramDir2=new MockRAMDirectory();
+ MockRAMDirectory ramDir2=newDirectory(random);
addDoc(random, ramDir2, "test blah", true);
- MockRAMDirectory ramDir3=new MockRAMDirectory();
+ MockRAMDirectory ramDir3=newDirectory(random);
addDoc(random, ramDir3, "test wow", true);
IndexReader[] readers1 = new IndexReader[]{IndexReader.open(ramDir1, false), IndexReader.open(ramDir3, false)};
@@ -182,6 +194,14 @@ public class TestDirectoryReader extends
// really a dummy assert to ensure that we got some docs and to ensure that
// nothing is optimized out.
assertTrue(ret > 0);
+ readers1[0].close();
+ readers1[1].close();
+ readers2[0].close();
+ readers2[1].close();
+ readers2[2].close();
+ ramDir1.close();
+ ramDir2.close();
+ ramDir3.close();
}
private void addDoc(Random random, MockRAMDirectory ramDir1, String s, boolean create) throws IOException {
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDocumentWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDocumentWriter.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDocumentWriter.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDocumentWriter.java Thu Aug 12 20:56:23 2010
@@ -19,6 +19,7 @@ package org.apache.lucene.index;
import java.io.IOException;
import java.io.Reader;
+import java.util.Random;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.MockAnalyzer;
@@ -42,7 +43,8 @@ import org.apache.lucene.util.BytesRef;
public class TestDocumentWriter extends LuceneTestCase {
private MockRAMDirectory dir;
-
+ private Random random;
+
public TestDocumentWriter(String s) {
super(s);
}
@@ -50,7 +52,14 @@ public class TestDocumentWriter extends
@Override
protected void setUp() throws Exception {
super.setUp();
- dir = new MockRAMDirectory();
+ random = newRandom();
+ dir = newDirectory(random);
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ dir.close();
+ super.tearDown();
}
public void test() {
@@ -60,7 +69,7 @@ public class TestDocumentWriter extends
public void testAddDocument() throws Exception {
Document testDoc = new Document();
DocHelper.setupDoc(testDoc);
- IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(newRandom(), TEST_VERSION_CURRENT, new MockAnalyzer()));
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
writer.addDocument(testDoc);
writer.commit();
SegmentInfo info = writer.newestSegment();
@@ -102,6 +111,7 @@ public class TestDocumentWriter extends
assertTrue(fi.omitNorms == !reader.hasNorms(fi.name));
}
}
+ reader.close();
}
public void testPositionIncrementGap() throws IOException {
@@ -117,7 +127,7 @@ public class TestDocumentWriter extends
}
};
- IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(newRandom(), TEST_VERSION_CURRENT, analyzer));
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, analyzer));
Document doc = new Document();
doc.add(new Field("repeated", "repeated one", Field.Store.YES, Field.Index.ANALYZED));
@@ -136,6 +146,7 @@ public class TestDocumentWriter extends
assertEquals(2, freq);
assertEquals(0, termPositions.nextPosition());
assertEquals(502, termPositions.nextPosition());
+ reader.close();
}
public void testTokenReuse() throws IOException {
@@ -181,7 +192,7 @@ public class TestDocumentWriter extends
}
};
- IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(newRandom(), TEST_VERSION_CURRENT, analyzer));
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, analyzer));
Document doc = new Document();
doc.add(new Field("f1", "a 5 a a", Field.Store.YES, Field.Index.ANALYZED));
@@ -202,11 +213,12 @@ public class TestDocumentWriter extends
assertEquals(false, termPositions.hasPayload());
assertEquals(7, termPositions.nextPosition());
assertEquals(false, termPositions.hasPayload());
+ reader.close();
}
public void testPreAnalyzedField() throws IOException {
- IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(newRandom(),
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer()));
Document doc = new Document();
@@ -250,7 +262,7 @@ public class TestDocumentWriter extends
assertTrue(termPositions.nextDoc() != termPositions.NO_MORE_DOCS);
assertEquals(1, termPositions.freq());
assertEquals(2, termPositions.nextPosition());
-
+ reader.close();
}
/**
@@ -266,7 +278,7 @@ public class TestDocumentWriter extends
doc.add(new Field("f2", "v1", Store.YES, Index.NOT_ANALYZED, TermVector.WITH_POSITIONS_OFFSETS));
doc.add(new Field("f2", "v2", Store.YES, Index.NOT_ANALYZED, TermVector.NO));
- IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(newRandom(),
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer()));
writer.addDocument(doc);
writer.close();
@@ -282,6 +294,7 @@ public class TestDocumentWriter extends
TermFreqVector tfv2 = reader.getTermFreqVector(0, "f2");
assertNotNull(tfv2);
assertEquals("the 'with_tv' setting should rule!",2,tfv2.getTerms().length);
+ reader.close();
}
/**
@@ -300,7 +313,7 @@ public class TestDocumentWriter extends
doc.add(f);
doc.add(new Field("f2", "v2", Store.YES, Index.NO));
- IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(newRandom(),
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer()));
writer.addDocument(doc);
writer.optimize(); // be sure to have a single segment
@@ -316,5 +329,6 @@ public class TestDocumentWriter extends
// f2
assertTrue("f2 should have norms", reader.hasNorms("f2"));
assertTrue("omitTermFreqAndPositions field bit should be set for f2", fi.fieldInfo("f2").omitTermFreqAndPositions);
+ reader.close();
}
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFieldInfos.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFieldInfos.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFieldInfos.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFieldInfos.java Thu Aug 12 20:56:23 2010
@@ -47,7 +47,7 @@ public class TestFieldInfos extends Luce
fieldInfos.add(testDoc);
//Since the complement is stored as well in the fields map
assertTrue(fieldInfos.size() == DocHelper.all.size()); //this is all b/c we are using the no-arg constructor
- MockRAMDirectory dir = new MockRAMDirectory();
+ MockRAMDirectory dir = newDirectory(newRandom());
String name = "testFile";
IndexOutput output = dir.createOutput(name);
assertTrue(output != null);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFieldsReader.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFieldsReader.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFieldsReader.java Thu Aug 12 20:56:23 2010
@@ -45,7 +45,7 @@ import org.apache.lucene.util.LuceneTest
import org.apache.lucene.util._TestUtil;
public class TestFieldsReader extends LuceneTestCase {
- private MockRAMDirectory dir = new MockRAMDirectory();
+ private MockRAMDirectory dir;
private Document testDoc = new Document();
private FieldInfos fieldInfos = null;
private Random random;
@@ -62,6 +62,7 @@ public class TestFieldsReader extends Lu
DocHelper.setupDoc(testDoc);
fieldInfos.add(testDoc);
random = newRandom();
+ dir = newDirectory(random);
IndexWriterConfig conf = newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer());
((LogMergePolicy) conf.getMergePolicy()).setUseCompoundFile(false);
((LogMergePolicy) conf.getMergePolicy()).setUseCompoundDocStore(false);
@@ -70,6 +71,11 @@ public class TestFieldsReader extends Lu
writer.close();
}
+ @Override
+ protected void tearDown() throws Exception {
+ dir.close();
+ super.tearDown();
+ }
public void test() throws IOException {
assertTrue(dir != null);
assertTrue(fieldInfos != null);
@@ -157,6 +163,7 @@ public class TestFieldsReader extends Lu
assertTrue("byte[" + i + "] is mismatched", bytes[i] == DocHelper.LAZY_FIELD_BINARY_BYTES[i]);
}
+ reader.close();
}
public void testLatentFields() throws Exception {
@@ -226,6 +233,7 @@ public class TestFieldsReader extends Lu
assertTrue("byte[" + i + "] is mismatched", bytes[i] == DocHelper.LAZY_FIELD_BINARY_BYTES[i]);
}
+ reader.close();
}
@@ -278,6 +286,7 @@ public class TestFieldsReader extends Lu
count++;
}
assertTrue(count + " does not equal: " + 1, count == 1);
+ reader.close();
}
/**
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFilterIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFilterIndexReader.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFilterIndexReader.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFilterIndexReader.java Thu Aug 12 20:56:23 2010
@@ -132,7 +132,7 @@ public class TestFilterIndexReader exten
*/
public void testFilterIndexReader() throws Exception {
Random random = newRandom();
- MockRAMDirectory directory = new MockRAMDirectory();
+ MockRAMDirectory directory = newDirectory(random);
IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
Document d1 = new Document();
@@ -150,7 +150,7 @@ public class TestFilterIndexReader exten
writer.close();
//IndexReader reader = new TestReader(IndexReader.open(directory, true));
- MockRAMDirectory target = new MockRAMDirectory();
+ MockRAMDirectory target = newDirectory(random);
writer = new IndexWriter(target, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
IndexReader reader = new TestReader(IndexReader.open(directory, true));
writer.addIndexes(reader);
@@ -176,5 +176,6 @@ public class TestFilterIndexReader exten
reader.close();
directory.close();
+ target.close();
}
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFlex.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFlex.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFlex.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFlex.java Thu Aug 12 20:56:23 2010
@@ -31,7 +31,7 @@ public class TestFlex extends LuceneTest
// Test non-flex API emulated on flex index
public void testNonFlex() throws Exception {
- Directory d = new MockRAMDirectory();
+ Directory d = newDirectory(newRandom());
final int DOC_COUNT = 177;
@@ -65,8 +65,9 @@ public class TestFlex extends LuceneTest
}
public void testTermOrd() throws Exception {
- Directory d = new MockRAMDirectory();
- IndexWriter w = new IndexWriter(d, newIndexWriterConfig(newRandom(), TEST_VERSION_CURRENT,
+ Random random = newRandom();
+ Directory d = newDirectory(random);
+ IndexWriter w = new IndexWriter(d, newIndexWriterConfig(random, TEST_VERSION_CURRENT,
new MockAnalyzer()).setCodecProvider(_TestUtil.alwaysCodec("Standard")));
Document doc = new Document();
doc.add(new Field("f", "a b c", Field.Store.NO, Field.Index.ANALYZED));
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexCommit.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexCommit.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexCommit.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexCommit.java Thu Aug 12 20:56:23 2010
@@ -24,7 +24,6 @@ import java.util.Collection;
import java.util.Map;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.LuceneTestCaseJ4;
import org.junit.Test;
@@ -33,7 +32,7 @@ public class TestIndexCommit extends Luc
@Test
public void testEqualsHashCode() throws Exception {
// LUCENE-2417: equals and hashCode() impl was inconsistent
- final Directory dir = new MockRAMDirectory();
+ final Directory dir = newDirectory(newRandom());
IndexCommit ic1 = new IndexCommit() {
@Override public String getSegmentsFileName() { return "a"; }
@@ -63,5 +62,6 @@ public class TestIndexCommit extends Luc
assertEquals(ic1, ic2);
assertEquals("hash codes are not equals", ic1.hashCode(), ic2.hashCode());
+ dir.close();
}
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexFileDeleter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexFileDeleter.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexFileDeleter.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexFileDeleter.java Thu Aug 12 20:56:23 2010
@@ -39,7 +39,7 @@ public class TestIndexFileDeleter extend
public void testDeleteLeftoverFiles() throws IOException {
Random random = newRandom();
- MockRAMDirectory dir = new MockRAMDirectory();
+ MockRAMDirectory dir = newDirectory(random);
dir.setPreventDoubleWrite(false);
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer())
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReader.java?rev=984968&r1=984967&r2=984968&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReader.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReader.java Thu Aug 12 20:56:23 2010
@@ -53,7 +53,6 @@ import org.apache.lucene.store.FSDirecto
import org.apache.lucene.store.LockObtainFailedException;
import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.store.NoSuchDirectoryException;
-import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util._TestUtil;
import org.apache.lucene.util.BytesRef;
@@ -83,7 +82,7 @@ public class TestIndexReader extends Luc
}
public void testCommitUserData() throws Exception {
- MockRAMDirectory d = new MockRAMDirectory();
+ MockRAMDirectory d = newDirectory(random);
Map<String,String> commitUserData = new HashMap<String,String>();
commitUserData.put("foo", "fighters");
@@ -138,7 +137,7 @@ public class TestIndexReader extends Luc
}
public void testIsCurrent() throws Exception {
- MockRAMDirectory d = new MockRAMDirectory();
+ MockRAMDirectory d = newDirectory(random);
IndexWriter writer = new IndexWriter(d, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer()));
addDocumentWithFields(writer);
@@ -167,7 +166,7 @@ public class TestIndexReader extends Luc
* @throws Exception on error
*/
public void testGetFieldNames() throws Exception {
- MockRAMDirectory d = new MockRAMDirectory();
+ MockRAMDirectory d = newDirectory(random);
// set up writer
IndexWriter writer = new IndexWriter(d, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer()));
@@ -259,7 +258,7 @@ public class TestIndexReader extends Luc
}
public void testTermVectors() throws Exception {
- MockRAMDirectory d = new MockRAMDirectory();
+ MockRAMDirectory d = newDirectory(random);
// set up writer
IndexWriter writer = new IndexWriter(d, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer()));
@@ -289,7 +288,8 @@ public class TestIndexReader extends Luc
assertTrue("entry is null and it shouldn't be", entry != null);
if (VERBOSE) System.out.println("Entry: " + entry);
}
-
+ reader.close();
+ d.close();
}
private void assertTermDocsCount(String msg,
@@ -312,7 +312,7 @@ public class TestIndexReader extends Luc
}
public void testBasicDelete() throws IOException {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
IndexWriter writer = null;
IndexReader reader = null;
@@ -356,7 +356,7 @@ public class TestIndexReader extends Luc
}
public void testBinaryFields() throws IOException {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
byte[] bin = new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
@@ -421,12 +421,13 @@ public class TestIndexReader extends Luc
assertEquals(bin[i], data1[i + b1.getBinaryOffset()]);
}
reader.close();
+ dir.close();
}
// Make sure attempts to make changes after reader is
// closed throws IOException:
public void testChangesAfterClose() throws IOException {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
IndexWriter writer = null;
IndexReader reader = null;
@@ -465,11 +466,12 @@ public class TestIndexReader extends Luc
} catch (AlreadyClosedException e) {
// expected
}
+ dir.close();
}
// Make sure we get lock obtain failed exception with 2 writers:
public void testLockObtainFailed() throws IOException {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
Term searchTerm = new Term("content", "aaa");
@@ -506,6 +508,7 @@ public class TestIndexReader extends Luc
}
writer.close();
reader.close();
+ dir.close();
}
// Make sure you can set norms & commit even if a reader
@@ -556,7 +559,7 @@ public class TestIndexReader extends Luc
// Make sure you can set norms & commit, and there are
// no extra norms files left:
public void testWritingNormsNoReader() throws IOException {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
IndexWriter writer = null;
IndexReader reader = null;
Term searchTerm = new Term("content", "aaa");
@@ -728,7 +731,7 @@ public class TestIndexReader extends Luc
try {
final Directory dir;
if (0 == i)
- dir = new MockRAMDirectory();
+ dir = newDirectory(random);
else
dir = getDirectory();
assertFalse(IndexReader.indexExists(dir));
@@ -764,7 +767,7 @@ public class TestIndexReader extends Luc
}
public void testVersion() throws IOException {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
assertFalse(IndexReader.indexExists(dir));
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
addDocumentWithFields(writer);
@@ -787,7 +790,7 @@ public class TestIndexReader extends Luc
}
public void testLock() throws IOException {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
addDocumentWithFields(writer);
writer.close();
@@ -807,7 +810,7 @@ public class TestIndexReader extends Luc
}
public void testUndeleteAll() throws IOException {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
addDocumentWithFields(writer);
addDocumentWithFields(writer);
@@ -824,7 +827,7 @@ public class TestIndexReader extends Luc
}
public void testUndeleteAllAfterClose() throws IOException {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
addDocumentWithFields(writer);
addDocumentWithFields(writer);
@@ -841,7 +844,7 @@ public class TestIndexReader extends Luc
}
public void testUndeleteAllAfterCloseThenReopen() throws IOException {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
addDocumentWithFields(writer);
addDocumentWithFields(writer);
@@ -878,7 +881,7 @@ public class TestIndexReader extends Luc
int END_COUNT = 144;
// First build up a starting index:
- MockRAMDirectory startDir = new MockRAMDirectory();
+ MockRAMDirectory startDir = newDirectory(random);
IndexWriter writer = new IndexWriter(startDir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
for(int i=0;i<157;i++) {
Document d = new Document();
@@ -1052,7 +1055,7 @@ public class TestIndexReader extends Luc
}
public void testDocsOutOfOrderJIRA140() throws IOException {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
for(int i=0;i<11;i++) {
addDoc(writer, "aaa");
@@ -1092,7 +1095,7 @@ public class TestIndexReader extends Luc
public void testExceptionReleaseWriteLockJIRA768() throws IOException {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
addDoc(writer, "aaa");
writer.close();
@@ -1381,7 +1384,7 @@ public class TestIndexReader extends Luc
public void testGetIndexCommit() throws IOException {
- MockRAMDirectory d = new MockRAMDirectory();
+ MockRAMDirectory d = newDirectory(random);
// set up writer
IndexWriter writer = new IndexWriter(d, newIndexWriterConfig(random,
@@ -1430,7 +1433,7 @@ public class TestIndexReader extends Luc
}
public void testReadOnly() throws Throwable {
- MockRAMDirectory d = new MockRAMDirectory();
+ MockRAMDirectory d = newDirectory(random);
IndexWriter writer = new IndexWriter(d, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer()));
addDocumentWithFields(writer);
@@ -1493,12 +1496,13 @@ public class TestIndexReader extends Luc
writer.close();
r3.close();
+ d.close();
}
// LUCENE-1474
public void testIndexReader() throws Exception {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer()));
writer.addDocument(createDocument("a"));
@@ -1511,11 +1515,12 @@ public class TestIndexReader extends Luc
reader.deleteDocuments(new Term("id", "b"));
reader.close();
IndexReader.open(dir,true).close();
+ dir.close();
}
// LUCENE-1647
public void testIndexReaderUnDeleteAll() throws Exception {
- MockRAMDirectory dir = new MockRAMDirectory();
+ MockRAMDirectory dir = newDirectory(random);
dir.setPreventDoubleWrite(false);
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer()));
@@ -1557,7 +1562,7 @@ public class TestIndexReader extends Luc
// LUCENE-1509
public void testNoDupCommitFileNames() throws Throwable {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer())
@@ -1583,7 +1588,7 @@ public class TestIndexReader extends Luc
// LUCENE-1579: Ensure that on a cloned reader, segments
// reuse the doc values arrays in FieldCache
public void testFieldCacheReuseAfterClone() throws Exception {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
Document doc = new Document();
doc.add(new Field("number", "17", Field.Store.NO, Field.Index.NOT_ANALYZED));
@@ -1614,7 +1619,7 @@ public class TestIndexReader extends Luc
// shared segments reuse the doc values arrays in
// FieldCache
public void testFieldCacheReuseAfterReopen() throws Exception {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
Document doc = new Document();
doc.add(new Field("number", "17", Field.Store.NO, Field.Index.NOT_ANALYZED));
@@ -1647,7 +1652,7 @@ public class TestIndexReader extends Luc
// LUCENE-1579: Make sure all SegmentReaders are new when
// reopen switches readOnly
public void testReopenChangeReadonly() throws Exception {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()).setMaxBufferedDocs(-1));
((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(10);
Document doc = new Document();
@@ -1689,7 +1694,7 @@ public class TestIndexReader extends Luc
// LUCENE-1586: getUniqueTermCount
public void testUniqueTermCount() throws Exception {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()).setCodecProvider(_TestUtil.alwaysCodec("Standard")));
Document doc = new Document();
doc.add(new Field("field", "a b c d e f g h i j k l m n o p q r s t u v w x y z", Field.Store.NO, Field.Index.ANALYZED));
@@ -1722,7 +1727,7 @@ public class TestIndexReader extends Luc
// LUCENE-1609: don't load terms index
public void testNoTermsIndex() throws Throwable {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()).setCodecProvider(_TestUtil.alwaysCodec("Standard")));
Document doc = new Document();
doc.add(new Field("field", "a b c d e f g h i j k l m n o p q r s t u v w x y z", Field.Store.NO, Field.Index.ANALYZED));
@@ -1758,11 +1763,13 @@ public class TestIndexReader extends Luc
// expected
}
}
+ r2.close();
+ dir.close();
}
// LUCENE-2046
public void testPrepareCommitIsCurrent() throws Throwable {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer()));
writer.commit();