mirror of https://github.com/apache/lucene.git
test fixes: add missing reader.close(); cutover to newDirectory() instead of new RAMDirectory()
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1304833 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael McCandless
parent
47a702b44d
commit
ee411e09e9
|
|
@ -18,36 +18,36 @@ package org.apache.lucene.analysis;
|
|||
*/
|
||||
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.StringReader;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute;
|
||||
import org.apache.lucene.store.RAMDirectory;
|
||||
import org.apache.lucene.index.IndexWriter;
|
||||
import org.apache.lucene.index.IndexWriterConfig;
|
||||
import org.apache.lucene.index.IndexableField;
|
||||
import org.apache.lucene.index.Term;
|
||||
import org.apache.lucene.index.IndexReader;
|
||||
import org.apache.lucene.search.ScoreDoc;
|
||||
import org.apache.lucene.search.Query;
|
||||
import org.apache.lucene.search.TermRangeFilter;
|
||||
import org.apache.lucene.search.TermQuery;
|
||||
import org.apache.lucene.search.TermRangeQuery;
|
||||
import org.apache.lucene.search.IndexSearcher;
|
||||
import org.apache.lucene.search.Sort;
|
||||
import org.apache.lucene.search.SortField;
|
||||
import org.apache.lucene.document.Document;
|
||||
import org.apache.lucene.document.Field;
|
||||
import org.apache.lucene.document.FieldType;
|
||||
import org.apache.lucene.document.StringField;
|
||||
import org.apache.lucene.document.TextField;
|
||||
import org.apache.lucene.index.IndexReader;
|
||||
import org.apache.lucene.index.IndexWriter;
|
||||
import org.apache.lucene.index.IndexWriterConfig;
|
||||
import org.apache.lucene.index.IndexableField;
|
||||
import org.apache.lucene.index.Term;
|
||||
import org.apache.lucene.search.IndexSearcher;
|
||||
import org.apache.lucene.search.Query;
|
||||
import org.apache.lucene.search.ScoreDoc;
|
||||
import org.apache.lucene.search.Sort;
|
||||
import org.apache.lucene.search.SortField;
|
||||
import org.apache.lucene.search.TermQuery;
|
||||
import org.apache.lucene.search.TermRangeFilter;
|
||||
import org.apache.lucene.search.TermRangeQuery;
|
||||
import org.apache.lucene.store.Directory;
|
||||
import org.apache.lucene.util.BytesRef;
|
||||
import org.apache.lucene.util.IndexableBinaryStringTools;
|
||||
import org.apache.lucene.util.LuceneTestCase;
|
||||
import org.apache.lucene.util._TestUtil;
|
||||
|
||||
import java.io.StringReader;
|
||||
import java.io.IOException;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* Base test class for testing Unicode collation.
|
||||
*/
|
||||
|
|
@ -80,15 +80,15 @@ public abstract class CollationTestBase extends LuceneTestCase {
|
|||
public void testFarsiRangeFilterCollating(Analyzer analyzer, BytesRef firstBeg,
|
||||
BytesRef firstEnd, BytesRef secondBeg,
|
||||
BytesRef secondEnd) throws Exception {
|
||||
RAMDirectory ramDir = new RAMDirectory();
|
||||
IndexWriter writer = new IndexWriter(ramDir, new IndexWriterConfig(
|
||||
Directory dir = newDirectory();
|
||||
IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
|
||||
TEST_VERSION_CURRENT, analyzer));
|
||||
Document doc = new Document();
|
||||
doc.add(new Field("content", "\u0633\u0627\u0628", TextField.TYPE_STORED));
|
||||
doc.add(new Field("body", "body", StringField.TYPE_STORED));
|
||||
writer.addDocument(doc);
|
||||
writer.close();
|
||||
IndexReader reader = IndexReader.open(ramDir);
|
||||
IndexReader reader = IndexReader.open(dir);
|
||||
IndexSearcher searcher = new IndexSearcher(reader);
|
||||
Query query = new TermQuery(new Term("body","body"));
|
||||
|
||||
|
|
@ -106,13 +106,14 @@ public abstract class CollationTestBase extends LuceneTestCase {
|
|||
assertEquals("The index Term should be included.", 1, result.length);
|
||||
|
||||
reader.close();
|
||||
dir.close();
|
||||
}
|
||||
|
||||
public void testFarsiRangeQueryCollating(Analyzer analyzer, BytesRef firstBeg,
|
||||
BytesRef firstEnd, BytesRef secondBeg,
|
||||
BytesRef secondEnd) throws Exception {
|
||||
RAMDirectory ramDir = new RAMDirectory();
|
||||
IndexWriter writer = new IndexWriter(ramDir, new IndexWriterConfig(
|
||||
Directory dir = newDirectory();
|
||||
IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
|
||||
TEST_VERSION_CURRENT, analyzer));
|
||||
Document doc = new Document();
|
||||
|
||||
|
|
@ -123,7 +124,7 @@ public abstract class CollationTestBase extends LuceneTestCase {
|
|||
doc.add(new Field("content", "\u0633\u0627\u0628", TextField.TYPE_STORED));
|
||||
writer.addDocument(doc);
|
||||
writer.close();
|
||||
IndexReader reader = IndexReader.open(ramDir);
|
||||
IndexReader reader = IndexReader.open(dir);
|
||||
IndexSearcher searcher = new IndexSearcher(reader);
|
||||
|
||||
Query query = new TermRangeQuery("content", firstBeg, firstEnd, true, true);
|
||||
|
|
@ -134,12 +135,13 @@ public abstract class CollationTestBase extends LuceneTestCase {
|
|||
hits = searcher.search(query, null, 1000).scoreDocs;
|
||||
assertEquals("The index Term should be included.", 1, hits.length);
|
||||
reader.close();
|
||||
dir.close();
|
||||
}
|
||||
|
||||
public void testFarsiTermRangeQuery(Analyzer analyzer, BytesRef firstBeg,
|
||||
BytesRef firstEnd, BytesRef secondBeg, BytesRef secondEnd) throws Exception {
|
||||
|
||||
RAMDirectory farsiIndex = new RAMDirectory();
|
||||
Directory farsiIndex = newDirectory();
|
||||
IndexWriter writer = new IndexWriter(farsiIndex, new IndexWriterConfig(
|
||||
TEST_VERSION_CURRENT, analyzer));
|
||||
Document doc = new Document();
|
||||
|
|
@ -165,6 +167,8 @@ public abstract class CollationTestBase extends LuceneTestCase {
|
|||
("content", secondBeg, secondEnd, true, true);
|
||||
result = search.search(csrq, null, 1000).scoreDocs;
|
||||
assertEquals("The index Term should be included.", 1, result.length);
|
||||
reader.close();
|
||||
farsiIndex.close();
|
||||
}
|
||||
|
||||
// Test using various international locales with accented characters (which
|
||||
|
|
@ -183,7 +187,7 @@ public abstract class CollationTestBase extends LuceneTestCase {
|
|||
String frResult,
|
||||
String svResult,
|
||||
String dkResult) throws Exception {
|
||||
RAMDirectory indexStore = new RAMDirectory();
|
||||
Directory indexStore = newDirectory();
|
||||
IndexWriter writer = new IndexWriter(indexStore, new IndexWriterConfig(
|
||||
TEST_VERSION_CURRENT, new MockAnalyzer(random, MockTokenizer.WHITESPACE, false)));
|
||||
|
||||
|
|
@ -241,6 +245,7 @@ public abstract class CollationTestBase extends LuceneTestCase {
|
|||
sort.setSort(new SortField("Denmark", SortField.Type.STRING));
|
||||
assertMatches(searcher, queryY, sort, dkResult);
|
||||
reader.close();
|
||||
indexStore.close();
|
||||
}
|
||||
|
||||
// Make sure the documents returned by the search match the expected list
|
||||
|
|
|
|||
Loading…
Reference in New Issue