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/11 06:28:10 UTC
svn commit: r984299 [4/5] - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/backwards/src/ lucene/backwards/src/test/org/apache/lucene/analysis/
lucene/backwards/src/test/org/apache/lucene/document/
lucene/backwards/src/test/org/apache/lucene/inde...
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java Wed Aug 11 04:28:06 2010
@@ -28,7 +28,7 @@ import org.apache.lucene.index.Term;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.OpenBitSet;
@@ -36,7 +36,7 @@ import org.apache.lucene.util.OpenBitSet
public class TestCachingWrapperFilter extends LuceneTestCase {
public void testCachingWorks() throws Exception {
- Directory dir = new RAMDirectory();
+ Directory dir = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
TEST_VERSION_CURRENT, new KeywordAnalyzer()));
writer.close();
@@ -62,7 +62,7 @@ public class TestCachingWrapperFilter ex
}
public void testNullDocIdSet() throws Exception {
- Directory dir = new RAMDirectory();
+ Directory dir = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
TEST_VERSION_CURRENT, new KeywordAnalyzer()));
writer.close();
@@ -84,7 +84,7 @@ public class TestCachingWrapperFilter ex
}
public void testNullDocIdSetIterator() throws Exception {
- Directory dir = new RAMDirectory();
+ Directory dir = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
TEST_VERSION_CURRENT, new KeywordAnalyzer()));
writer.close();
@@ -125,7 +125,7 @@ public class TestCachingWrapperFilter ex
}
public void testIsCacheAble() throws Exception {
- Directory dir = new RAMDirectory();
+ Directory dir = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new KeywordAnalyzer()));
writer.close();
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestCustomSearcherSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestCustomSearcherSort.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestCustomSearcherSort.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestCustomSearcherSort.java Wed Aug 11 04:28:06 2010
@@ -31,7 +31,7 @@ import org.apache.lucene.index.IndexRead
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.LuceneTestCase;
/** Unit test for sorting code. */
@@ -50,7 +50,7 @@ public class TestCustomSearcherSort exte
protected void setUp() throws Exception {
super.setUp();
Random rand = newRandom();
- index = new RAMDirectory();
+ index = new MockRAMDirectory();
RandomIndexWriter writer = new RandomIndexWriter(rand, index);
RandomGen random = new RandomGen(rand);
for (int i = 0; i < INDEX_SIZE; ++i) { // don't decrease; if to low the
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestDateFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestDateFilter.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestDateFilter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestDateFilter.java Wed Aug 11 04:28:06 2010
@@ -25,7 +25,7 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import java.io.IOException;
@@ -45,7 +45,7 @@ public class TestDateFilter extends Luce
*/
public void testBefore() throws IOException {
// create an index
- RAMDirectory indexStore = new RAMDirectory();
+ MockRAMDirectory indexStore = new MockRAMDirectory();
RandomIndexWriter writer = new RandomIndexWriter(newRandom(), indexStore);
long now = System.currentTimeMillis();
@@ -111,7 +111,7 @@ public class TestDateFilter extends Luce
*/
public void testAfter() throws IOException {
// create an index
- RAMDirectory indexStore = new RAMDirectory();
+ MockRAMDirectory indexStore = new MockRAMDirectory();
RandomIndexWriter writer = new RandomIndexWriter(newRandom(), indexStore);
long now = System.currentTimeMillis();
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestDateSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestDateSort.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestDateSort.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestDateSort.java Wed Aug 11 04:28:06 2010
@@ -33,7 +33,7 @@ import org.apache.lucene.search.Query;
import org.apache.lucene.search.Sort;
import org.apache.lucene.search.SortField;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
/**
* Test date sorting, i.e. auto-sorting of fields with type "long".
@@ -51,7 +51,7 @@ public class TestDateSort extends Lucene
protected void setUp() throws Exception {
super.setUp();
// Create an index writer.
- directory = new RAMDirectory();
+ directory = new MockRAMDirectory();
RandomIndexWriter writer = new RandomIndexWriter(newRandom(), directory, new WhitespaceAnalyzer(TEST_VERSION_CURRENT));
// oldest doc:
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java Wed Aug 11 04:28:06 2010
@@ -25,7 +25,7 @@ import org.apache.lucene.index.IndexRead
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import java.text.DecimalFormat;
import java.util.Random;
@@ -79,7 +79,7 @@ public class TestDisjunctionMaxQuery ext
protected void setUp() throws Exception {
super.setUp();
- index = new RAMDirectory();
+ index = new MockRAMDirectory();
Random random = newRandom();
RandomIndexWriter writer = new RandomIndexWriter(random, index,
newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestDocBoost.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestDocBoost.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestDocBoost.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestDocBoost.java Wed Aug 11 04:28:06 2010
@@ -24,7 +24,7 @@ import org.apache.lucene.document.*;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
/** Document boost unit test.
*
@@ -37,7 +37,7 @@ public class TestDocBoost extends Lucene
}
public void testDocBoost() throws Exception {
- RAMDirectory store = new RAMDirectory();
+ MockRAMDirectory store = new MockRAMDirectory();
RandomIndexWriter writer = new RandomIndexWriter(newRandom(), store);
Fieldable f1 = new Field("field", "word", Field.Store.YES, Field.Index.ANALYZED);
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestDocIdSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestDocIdSet.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestDocIdSet.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestDocIdSet.java Wed Aug 11 04:28:06 2010
@@ -31,7 +31,7 @@ import org.apache.lucene.document.Field.
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.LuceneTestCase;
public class TestDocIdSet extends LuceneTestCase {
@@ -101,7 +101,7 @@ public class TestDocIdSet extends Lucene
public void testNullDocIdSet() throws Exception {
// Tests that if a Filter produces a null DocIdSet, which is given to
// IndexSearcher, everything works fine. This came up in LUCENE-1754.
- Directory dir = new RAMDirectory();
+ Directory dir = new MockRAMDirectory();
RandomIndexWriter writer = new RandomIndexWriter(newRandom(), dir);
Document doc = new Document();
doc.add(new Field("c", "val", Store.NO, Index.NOT_ANALYZED_NO_NORMS));
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestExplanations.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestExplanations.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestExplanations.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestExplanations.java Wed Aug 11 04:28:06 2010
@@ -32,7 +32,7 @@ import org.apache.lucene.search.spans.Sp
import org.apache.lucene.search.spans.SpanQuery;
import org.apache.lucene.search.spans.SpanTermQuery;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.LuceneTestCase;
/**
@@ -68,7 +68,7 @@ public class TestExplanations extends Lu
@Override
protected void setUp() throws Exception {
super.setUp();
- directory = new RAMDirectory();
+ directory = new MockRAMDirectory();
RandomIndexWriter writer= new RandomIndexWriter(newRandom(), directory);
for (int i = 0; i < docFields.length; i++) {
Document doc = new Document();
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFieldCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFieldCache.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFieldCache.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFieldCache.java Wed Aug 11 04:28:06 2010
@@ -20,7 +20,7 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.LuceneTestCase;
import java.io.IOException;
import java.io.ByteArrayOutputStream;
@@ -37,7 +37,7 @@ public class TestFieldCache extends Luce
@Override
protected void setUp() throws Exception {
super.setUp();
- RAMDirectory directory = new RAMDirectory();
+ MockRAMDirectory directory = new MockRAMDirectory();
RandomIndexWriter writer= new RandomIndexWriter(newRandom(), directory);
long theLong = Long.MAX_VALUE;
double theDouble = Double.MAX_VALUE;
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java Wed Aug 11 04:28:06 2010
@@ -27,7 +27,7 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.analysis.SimpleAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
/**
* A basic 'positive' Unit test class for the FieldCacheRangeFilter class.
@@ -524,7 +524,7 @@ public class TestFieldCacheRangeFilter e
// test using a sparse index (with deleted docs). The DocIdSet should be not cacheable, as it uses TermDocs if the range contains 0
public void testSparseIndex() throws IOException {
- RAMDirectory dir = new RAMDirectory();
+ MockRAMDirectory dir = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT)));
for (int d = -20; d <= 20; d++) {
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFilteredQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFilteredQuery.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFilteredQuery.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFilteredQuery.java Wed Aug 11 04:28:06 2010
@@ -23,7 +23,7 @@ import org.apache.lucene.index.IndexRead
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.BooleanClause.Occur;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.DocIdBitSet;
import java.util.BitSet;
@@ -40,14 +40,14 @@ public class TestFilteredQuery extends L
private IndexSearcher searcher;
private IndexReader reader;
- private RAMDirectory directory;
+ private MockRAMDirectory directory;
private Query query;
private Filter filter;
@Override
protected void setUp() throws Exception {
super.setUp();
- directory = new RAMDirectory();
+ directory = new MockRAMDirectory();
RandomIndexWriter writer = new RandomIndexWriter (newRandom(), directory);
Document doc = new Document();
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java Wed Aug 11 04:28:06 2010
@@ -31,7 +31,7 @@ import org.apache.lucene.index.Term;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.LockObtainFailedException;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.OpenBitSet;
@@ -48,7 +48,7 @@ public class TestFilteredSearch extends
public void testFilteredSearch() throws CorruptIndexException, LockObtainFailedException, IOException {
boolean enforceSingleSegment = true;
- RAMDirectory directory = new RAMDirectory();
+ MockRAMDirectory directory = new MockRAMDirectory();
int[] filterBits = {1, 36};
SimpleDocIdSetFilter filter = new SimpleDocIdSetFilter(filterBits);
IndexWriter writer = new IndexWriter(directory, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFuzzyQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFuzzyQuery.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFuzzyQuery.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFuzzyQuery.java Wed Aug 11 04:28:06 2010
@@ -21,16 +21,13 @@ import java.util.List;
import java.util.Arrays;
import java.io.IOException;
-import org.apache.lucene.analysis.WhitespaceAnalyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
-import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.queryParser.QueryParser;
@@ -42,7 +39,7 @@ import org.apache.lucene.queryParser.Que
public class TestFuzzyQuery extends LuceneTestCase {
public void testFuzziness() throws Exception {
- RAMDirectory directory = new RAMDirectory();
+ MockRAMDirectory directory = new MockRAMDirectory();
RandomIndexWriter writer = new RandomIndexWriter(newRandom(), directory);
addDoc("aaaaa", writer);
addDoc("aaaab", writer);
@@ -195,7 +192,7 @@ public class TestFuzzyQuery extends Luce
}
public void testFuzzinessLong() throws Exception {
- RAMDirectory directory = new RAMDirectory();
+ MockRAMDirectory directory = new MockRAMDirectory();
RandomIndexWriter writer = new RandomIndexWriter(newRandom(), directory);
addDoc("aaaaaaa", writer);
addDoc("segment", writer);
@@ -285,7 +282,7 @@ public class TestFuzzyQuery extends Luce
}
public void testTokenLengthOpt() throws IOException {
- RAMDirectory directory = new RAMDirectory();
+ MockRAMDirectory directory = new MockRAMDirectory();
RandomIndexWriter writer = new RandomIndexWriter(newRandom(), directory);
addDoc("12345678911", writer);
addDoc("segment", writer);
@@ -322,7 +319,7 @@ public class TestFuzzyQuery extends Luce
/** Test the TopTermsBoostOnlyBooleanQueryRewrite rewrite method. */
public void testBoostOnlyRewrite() throws Exception {
- RAMDirectory directory = new RAMDirectory();
+ MockRAMDirectory directory = new MockRAMDirectory();
RandomIndexWriter writer = new RandomIndexWriter(newRandom(), directory);
addDoc("Lucene", writer);
addDoc("Lucene", writer);
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java Wed Aug 11 04:28:06 2010
@@ -27,7 +27,7 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.index.Term;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.queryParser.QueryParser;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.LuceneTestCase;
@@ -40,7 +40,7 @@ public class TestMatchAllDocsQuery exten
public void testQuery() throws Exception {
- RAMDirectory dir = new RAMDirectory();
+ MockRAMDirectory dir = new MockRAMDirectory();
IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(
TEST_VERSION_CURRENT, analyzer).setMaxBufferedDocs(2));
addDoc("one", iw, 1f);
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiSearcher.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiSearcher.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiSearcher.java Wed Aug 11 04:28:06 2010
@@ -30,7 +30,7 @@ import org.apache.lucene.index.Term;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.store.MockRAMDirectory;
import java.io.IOException;
import java.util.Collections;
@@ -236,11 +236,11 @@ public class TestMultiSearcher extends L
}
public void testFieldSelector() throws Exception {
- RAMDirectory ramDirectory1, ramDirectory2;
+ MockRAMDirectory ramDirectory1, ramDirectory2;
IndexSearcher indexSearcher1, indexSearcher2;
- ramDirectory1 = new RAMDirectory();
- ramDirectory2 = new RAMDirectory();
+ ramDirectory1 = new MockRAMDirectory();
+ ramDirectory2 = new MockRAMDirectory();
Query query = new TermQuery(new Term("contents", "doc0"));
// Now put the documents in a different index
@@ -293,7 +293,7 @@ public class TestMultiSearcher extends L
private void testNormalization(int nDocs, String message) throws IOException {
Query query=new TermQuery(new Term("contents", "doc0"));
- RAMDirectory ramDirectory1;
+ MockRAMDirectory ramDirectory1;
IndexSearcher indexSearcher1;
ScoreDoc[] hits;
@@ -321,7 +321,7 @@ public class TestMultiSearcher extends L
- RAMDirectory ramDirectory2;
+ MockRAMDirectory ramDirectory2;
IndexSearcher indexSearcher2;
ramDirectory1=new MockRAMDirectory();
@@ -367,7 +367,7 @@ public class TestMultiSearcher extends L
* @throws IOException
*/
public void testCustomSimilarity () throws IOException {
- RAMDirectory dir = new RAMDirectory();
+ MockRAMDirectory dir = new MockRAMDirectory();
initIndex(dir, 10, true, "x"); // documents with two tokens "doc0" and "x", "doc1" and x, etc...
IndexSearcher srchr = new IndexSearcher(dir, true);
MultiSearcher msrchr = getMultiSearcherInstance(new Searcher[]{srchr});
@@ -407,8 +407,8 @@ public class TestMultiSearcher extends L
}
public void testDocFreq() throws IOException{
- RAMDirectory dir1 = new RAMDirectory();
- RAMDirectory dir2 = new RAMDirectory();
+ MockRAMDirectory dir1 = new MockRAMDirectory();
+ MockRAMDirectory dir2 = new MockRAMDirectory();
initIndex(dir1, 10, true, "x"); // documents with two tokens "doc0" and "x", "doc1" and x, etc...
initIndex(dir2, 5, true, "x"); // documents with two tokens "doc0" and "x", "doc1" and x, etc...
@@ -420,8 +420,8 @@ public class TestMultiSearcher extends L
}
public void testCreateDocFrequencyMap() throws IOException{
- RAMDirectory dir1 = new RAMDirectory();
- RAMDirectory dir2 = new RAMDirectory();
+ MockRAMDirectory dir1 = new MockRAMDirectory();
+ MockRAMDirectory dir2 = new MockRAMDirectory();
Term template = new Term("contents") ;
String[] contents = {"a", "b", "c"};
HashSet<Term> termsSet = new HashSet<Term>();
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiSearcherRanking.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiSearcherRanking.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiSearcherRanking.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiSearcherRanking.java Wed Aug 11 04:28:06 2010
@@ -26,7 +26,7 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.queryParser.ParseException;
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import java.io.IOException;
/**
@@ -112,11 +112,11 @@ public class TestMultiSearcherRanking ex
protected void setUp() throws Exception {
super.setUp();
// create MultiSearcher from two seperate searchers
- Directory d1 = new RAMDirectory();
+ Directory d1 = new MockRAMDirectory();
IndexWriter iw1 = new IndexWriter(d1, new IndexWriterConfig(TEST_VERSION_CURRENT, new StandardAnalyzer(TEST_VERSION_CURRENT)));
addCollection1(iw1);
iw1.close();
- Directory d2 = new RAMDirectory();
+ Directory d2 = new MockRAMDirectory();
IndexWriter iw2 = new IndexWriter(d2, new IndexWriterConfig(TEST_VERSION_CURRENT, new StandardAnalyzer(TEST_VERSION_CURRENT)));
addCollection2(iw2);
iw2.close();
@@ -127,7 +127,7 @@ public class TestMultiSearcherRanking ex
multiSearcher = new MultiSearcher(s);
// create IndexSearcher which contains all documents
- Directory d = new RAMDirectory();
+ Directory d = new MockRAMDirectory();
IndexWriter iw = new IndexWriter(d, new IndexWriterConfig(TEST_VERSION_CURRENT, new StandardAnalyzer(TEST_VERSION_CURRENT)));
addCollection1(iw);
addCollection2(iw);
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java Wed Aug 11 04:28:06 2010
@@ -25,7 +25,7 @@ import org.apache.lucene.index.IndexRead
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import java.io.IOException;
import java.text.Collator;
import java.util.Locale;
@@ -55,7 +55,7 @@ public class TestMultiTermConstantScore
"B 2 4 5 6", "Y 3 5 6", null, "C 3 6",
"X 4 5 6" };
- small = new RAMDirectory();
+ small = new MockRAMDirectory();
RandomIndexWriter writer = new RandomIndexWriter(rand, small, new WhitespaceAnalyzer(TEST_VERSION_CURRENT));
for (int i = 0; i < data.length; i++) {
@@ -609,7 +609,7 @@ public class TestMultiTermConstantScore
public void testFarsi() throws Exception {
/* build an index */
- RAMDirectory farsiIndex = new RAMDirectory();
+ MockRAMDirectory farsiIndex = new MockRAMDirectory();
RandomIndexWriter writer = new RandomIndexWriter(rand, farsiIndex, new SimpleAnalyzer(TEST_VERSION_CURRENT));
Document doc = new Document();
doc.add(new Field("content", "\u0633\u0627\u0628", Field.Store.YES,
@@ -649,7 +649,7 @@ public class TestMultiTermConstantScore
public void testDanish() throws Exception {
/* build an index */
- RAMDirectory danishIndex = new RAMDirectory();
+ MockRAMDirectory danishIndex = new MockRAMDirectory();
RandomIndexWriter writer = new RandomIndexWriter(rand, danishIndex, new SimpleAnalyzer(TEST_VERSION_CURRENT));
// Danish collation orders the words below in the given order
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java Wed Aug 11 04:28:06 2010
@@ -24,13 +24,13 @@ import org.apache.lucene.index.IndexRead
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.TermFreqVector;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.English;
import java.io.IOException;
public class TestMultiThreadTermVectors extends LuceneTestCase {
- private RAMDirectory directory = new RAMDirectory();
+ private MockRAMDirectory directory = new MockRAMDirectory();
public int numDocs = 100;
public int numThreads = 3;
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java Wed Aug 11 04:28:06 2010
@@ -27,7 +27,7 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.document.NumericField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.LuceneTestCase;
public class TestMultiValuedNumericRangeQuery extends LuceneTestCase {
@@ -40,7 +40,7 @@ public class TestMultiValuedNumericRange
public void testMultiValuedNRQ() throws Exception {
final Random rnd = newRandom();
- RAMDirectory directory = new RAMDirectory();
+ MockRAMDirectory directory = new MockRAMDirectory();
RandomIndexWriter writer = new RandomIndexWriter(rnd, directory);
DecimalFormat format = new DecimalFormat("00000000000", new DecimalFormatSymbols(Locale.US));
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestNot.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestNot.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestNot.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestNot.java Wed Aug 11 04:28:06 2010
@@ -22,7 +22,7 @@ import org.apache.lucene.util.LuceneTest
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.queryParser.QueryParser;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.analysis.SimpleAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
@@ -38,7 +38,7 @@ public class TestNot extends LuceneTestC
}
public void testNot() throws Exception {
- RAMDirectory store = new RAMDirectory();
+ MockRAMDirectory store = new MockRAMDirectory();
RandomIndexWriter writer = new RandomIndexWriter(newRandom(), store);
Document d1 = new Document();
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java Wed Aug 11 04:28:06 2010
@@ -28,7 +28,7 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.RandomIndexWriter;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.LuceneTestCaseJ4;
import org.apache.lucene.util.NumericUtils;
@@ -45,13 +45,13 @@ public class TestNumericRangeQuery32 ext
// number of docs to generate for testing
private static final int noDocs = 10000 * RANDOM_MULTIPLIER;
- private static RAMDirectory directory = null;
+ private static MockRAMDirectory directory = null;
private static IndexReader reader = null;
private static IndexSearcher searcher = null;
@BeforeClass
public static void beforeClass() throws Exception {
- directory = new RAMDirectory();
+ directory = new MockRAMDirectory();
Random random = newStaticRandom(TestNumericRangeQuery32.class);
RandomIndexWriter writer = new RandomIndexWriter(random, directory);
@@ -279,7 +279,7 @@ public class TestNumericRangeQuery32 ext
@Test
public void testInfiniteValues() throws Exception {
- RAMDirectory dir = new RAMDirectory();
+ MockRAMDirectory dir = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
Document doc = new Document();
doc.add(new NumericField("float").setFloatValue(Float.NEGATIVE_INFINITY));
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java Wed Aug 11 04:28:06 2010
@@ -27,7 +27,7 @@ import org.apache.lucene.index.IndexRead
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.RandomIndexWriter;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.LuceneTestCaseJ4;
import org.apache.lucene.util.NumericUtils;
@@ -44,13 +44,13 @@ public class TestNumericRangeQuery64 ext
// number of docs to generate for testing
private static final int noDocs = 10000 * RANDOM_MULTIPLIER;
- private static RAMDirectory directory = null;
+ private static MockRAMDirectory directory = null;
private static IndexReader reader = null;
private static IndexSearcher searcher = null;
@BeforeClass
public static void beforeClass() throws Exception {
- directory = new RAMDirectory();
+ directory = new MockRAMDirectory();
Random random = newStaticRandom(TestNumericRangeQuery64.class);
RandomIndexWriter writer = new RandomIndexWriter(random, directory);
@@ -297,7 +297,7 @@ public class TestNumericRangeQuery64 ext
@Test
public void testInfiniteValues() throws Exception {
- RAMDirectory dir = new RAMDirectory();
+ MockRAMDirectory dir = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
Document doc = new Document();
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java Wed Aug 11 04:28:06 2010
@@ -25,7 +25,7 @@ import org.apache.lucene.index.RandomInd
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermEnum;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import java.io.IOException;
import java.util.LinkedList;
@@ -42,7 +42,7 @@ public class TestPhrasePrefixQuery exten
*
*/
public void testPhrasePrefix() throws IOException {
- RAMDirectory indexStore = new RAMDirectory();
+ MockRAMDirectory indexStore = new MockRAMDirectory();
RandomIndexWriter writer = new RandomIndexWriter(newRandom(), indexStore);
Document doc1 = new Document();
Document doc2 = new Document();
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPhraseQuery.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPhraseQuery.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPhraseQuery.java Wed Aug 11 04:28:06 2010
@@ -48,14 +48,14 @@ public class TestPhraseQuery extends Luc
private IndexSearcher searcher;
private IndexReader reader;
private PhraseQuery query;
- private RAMDirectory directory;
+ private MockRAMDirectory directory;
private Random random;
@Override
public void setUp() throws Exception {
super.setUp();
random = newRandom();
- directory = new RAMDirectory();
+ directory = new MockRAMDirectory();
Analyzer analyzer = new Analyzer() {
@Override
public TokenStream tokenStream(String fieldName, Reader reader) {
@@ -213,7 +213,7 @@ public class TestPhraseQuery extends Luc
}
public void testPhraseQueryWithStopAnalyzer() throws Exception {
- RAMDirectory directory = new RAMDirectory();
+ MockRAMDirectory directory = new MockRAMDirectory();
StopAnalyzer stopAnalyzer = new StopAnalyzer(Version.LUCENE_24);
RandomIndexWriter writer = new RandomIndexWriter(random, directory,
newIndexWriterConfig(random, Version.LUCENE_24, stopAnalyzer));
@@ -249,7 +249,7 @@ public class TestPhraseQuery extends Luc
}
public void testPhraseQueryInConjunctionScorer() throws Exception {
- RAMDirectory directory = new RAMDirectory();
+ MockRAMDirectory directory = new MockRAMDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, directory);
Document doc = new Document();
@@ -336,7 +336,7 @@ public class TestPhraseQuery extends Luc
}
public void testSlopScoring() throws IOException {
- Directory directory = new RAMDirectory();
+ Directory directory = new MockRAMDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, directory);
Document doc = new Document();
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPrefixFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPrefixFilter.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPrefixFilter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPrefixFilter.java Wed Aug 11 04:28:06 2010
@@ -18,7 +18,7 @@ package org.apache.lucene.search;
*/
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -32,7 +32,7 @@ import org.apache.lucene.document.Field;
*/
public class TestPrefixFilter extends LuceneTestCase {
public void testPrefixFilter() throws Exception {
- RAMDirectory directory = new RAMDirectory();
+ MockRAMDirectory directory = new MockRAMDirectory();
String[] categories = new String[] {"/Computers/Linux",
"/Computers/Mac/One",
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java Wed Aug 11 04:28:06 2010
@@ -24,7 +24,7 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
/**
* https://issues.apache.org/jira/browse/LUCENE-1974
@@ -39,7 +39,7 @@ import org.apache.lucene.store.RAMDirect
public class TestPrefixInBooleanQuery extends LuceneTestCase {
private static final String FIELD = "name";
- private RAMDirectory directory = new RAMDirectory();
+ private MockRAMDirectory directory = new MockRAMDirectory();
private IndexReader reader;
private IndexSearcher searcher;
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPrefixQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPrefixQuery.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPrefixQuery.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPrefixQuery.java Wed Aug 11 04:28:06 2010
@@ -18,7 +18,7 @@ package org.apache.lucene.search;
*/
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -31,7 +31,7 @@ import org.apache.lucene.document.Field;
*/
public class TestPrefixQuery extends LuceneTestCase {
public void testPrefixQuery() throws Exception {
- RAMDirectory directory = new RAMDirectory();
+ MockRAMDirectory directory = new MockRAMDirectory();
String[] categories = new String[] {"/Computers",
"/Computers/Mac",
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java Wed Aug 11 04:28:06 2010
@@ -26,13 +26,13 @@ import org.apache.lucene.index.RandomInd
import org.apache.lucene.index.Term;
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.LuceneTestCase;
public class TestQueryWrapperFilter extends LuceneTestCase {
public void testBasic() throws Exception {
- Directory dir = new RAMDirectory();
+ Directory dir = new MockRAMDirectory();
RandomIndexWriter writer = new RandomIndexWriter(newRandom(), dir);
Document doc = new Document();
doc.add(new Field("field", "value", Store.NO, Index.ANALYZED));
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestScorerPerf.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestScorerPerf.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestScorerPerf.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestScorerPerf.java Wed Aug 11 04:28:06 2010
@@ -12,7 +12,7 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.store.Directory;
import org.apache.lucene.analysis.WhitespaceAnalyzer;
import org.apache.lucene.document.Document;
@@ -46,7 +46,7 @@ public class TestScorerPerf extends Luce
public void createDummySearcher() throws Exception {
// Create a dummy index with nothing in it.
// This could possibly fail if Lucene starts checking for docid ranges...
- RAMDirectory rd = new RAMDirectory();
+ MockRAMDirectory rd = new MockRAMDirectory();
IndexWriter iw = new IndexWriter(rd, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
iw.addDocument(new Document());
iw.close();
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestSetNorm.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestSetNorm.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestSetNorm.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestSetNorm.java Wed Aug 11 04:28:06 2010
@@ -26,7 +26,7 @@ import org.apache.lucene.index.IndexRead
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.Term;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
/** Document boost unit test.
*
@@ -39,7 +39,7 @@ public class TestSetNorm extends LuceneT
}
public void testSetNorm() throws Exception {
- RAMDirectory store = new RAMDirectory();
+ MockRAMDirectory store = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(store, new IndexWriterConfig(TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT)));
// add the same document four times
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestSimilarity.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestSimilarity.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestSimilarity.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestSimilarity.java Wed Aug 11 04:28:06 2010
@@ -25,7 +25,7 @@ import java.util.Random;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.analysis.SimpleAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
@@ -63,7 +63,7 @@ public class TestSimilarity extends Luce
}
public void testSimilarity() throws Exception {
- RAMDirectory store = new RAMDirectory();
+ MockRAMDirectory store = new MockRAMDirectory();
Random random = newRandom();
RandomIndexWriter writer = new RandomIndexWriter(random, store,
newIndexWriterConfig(random, TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT))
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java Wed Aug 11 04:28:06 2010
@@ -28,7 +28,7 @@ import org.apache.lucene.index.RandomInd
import org.apache.lucene.index.Term;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.PhraseQuery;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
public class TestSloppyPhraseQuery extends LuceneTestCase {
@@ -124,7 +124,7 @@ public class TestSloppyPhraseQuery exten
private float checkPhraseQuery(Document doc, PhraseQuery query, int slop, int expectedNumResults) throws Exception {
query.setSlop(slop);
- RAMDirectory ramDir = new RAMDirectory();
+ MockRAMDirectory ramDir = new MockRAMDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, ramDir, new WhitespaceAnalyzer(TEST_VERSION_CURRENT));
writer.addDocument(doc);
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestSort.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestSort.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestSort.java Wed Aug 11 04:28:06 2010
@@ -42,7 +42,7 @@ import org.apache.lucene.queryParser.Par
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.search.FieldValueHitQueue.Entry;
import org.apache.lucene.store.LockObtainFailedException;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.DocIdBitSet;
import org.apache.lucene.util.LuceneTestCase;
@@ -107,7 +107,7 @@ public class TestSort extends LuceneTest
// create an index of all the documents, or just the x, or just the y documents
private Searcher getIndex (boolean even, boolean odd)
throws IOException {
- RAMDirectory indexStore = new RAMDirectory();
+ MockRAMDirectory indexStore = new MockRAMDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, indexStore);
for (int i=0; i<data.length; ++i) {
@@ -142,7 +142,7 @@ public class TestSort extends LuceneTest
}
private IndexSearcher getFullStrings() throws CorruptIndexException, LockObtainFailedException, IOException {
- RAMDirectory indexStore = new RAMDirectory ();
+ MockRAMDirectory indexStore = new MockRAMDirectory ();
IndexWriter writer = new IndexWriter(indexStore, new IndexWriterConfig(
TEST_VERSION_CURRENT, new SimpleAnalyzer(
TEST_VERSION_CURRENT)).setMaxBufferedDocs(4));
@@ -1013,7 +1013,7 @@ public class TestSort extends LuceneTest
}
public void testLUCENE2142() throws IOException {
- RAMDirectory indexStore = new RAMDirectory ();
+ MockRAMDirectory indexStore = new MockRAMDirectory ();
IndexWriter writer = new IndexWriter(indexStore, new IndexWriterConfig(
TEST_VERSION_CURRENT, new SimpleAnalyzer(
TEST_VERSION_CURRENT)));
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestSpanQueryFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestSpanQueryFilter.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestSpanQueryFilter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestSpanQueryFilter.java Wed Aug 11 04:28:06 2010
@@ -25,7 +25,7 @@ import org.apache.lucene.index.RandomInd
import org.apache.lucene.index.Term;
import org.apache.lucene.search.spans.SpanTermQuery;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.English;
import org.apache.lucene.util.LuceneTestCase;
@@ -37,7 +37,7 @@ public class TestSpanQueryFilter extends
}
public void testFilterWorks() throws Exception {
- Directory dir = new RAMDirectory();
+ Directory dir = new MockRAMDirectory();
RandomIndexWriter writer = new RandomIndexWriter(newRandom(), dir);
for (int i = 0; i < 500; i++) {
Document document = new Document();
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestTermRangeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestTermRangeFilter.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestTermRangeFilter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestTermRangeFilter.java Wed Aug 11 04:28:06 2010
@@ -26,7 +26,7 @@ import org.apache.lucene.index.RandomInd
import org.apache.lucene.index.Term;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
/**
* A basic 'positive' Unit test class for the TermRangeFilter class.
@@ -398,7 +398,7 @@ public class TestTermRangeFilter extends
public void testFarsi() throws Exception {
/* build an index */
- RAMDirectory farsiIndex = new RAMDirectory();
+ MockRAMDirectory farsiIndex = new MockRAMDirectory();
RandomIndexWriter writer = new RandomIndexWriter(rand, farsiIndex);
Document doc = new Document();
doc.add(new Field("content", "\u0633\u0627\u0628", Field.Store.YES,
@@ -438,7 +438,7 @@ public class TestTermRangeFilter extends
public void testDanish() throws Exception {
/* build an index */
- RAMDirectory danishIndex = new RAMDirectory();
+ MockRAMDirectory danishIndex = new MockRAMDirectory();
RandomIndexWriter writer = new RandomIndexWriter(rand, danishIndex);
// Danish collation orders the words below in the given order
// (example taken from TestSort.testInternationalSort() ).
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestTermRangeQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestTermRangeQuery.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestTermRangeQuery.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestTermRangeQuery.java Wed Aug 11 04:28:06 2010
@@ -23,7 +23,7 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
@@ -42,12 +42,12 @@ import java.text.Collator;
public class TestTermRangeQuery extends LuceneTestCase {
private int docCount = 0;
- private RAMDirectory dir;
+ private MockRAMDirectory dir;
@Override
protected void setUp() throws Exception {
super.setUp();
- dir = new RAMDirectory();
+ dir = new MockRAMDirectory();
}
public void testExclusive() throws Exception {
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestTermScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestTermScorer.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestTermScorer.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestTermScorer.java Wed Aug 11 04:28:06 2010
@@ -27,10 +27,10 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
public class TestTermScorer extends LuceneTestCase {
- protected RAMDirectory directory;
+ protected MockRAMDirectory directory;
private static final String FIELD = "field";
protected String[] values = new String[] {"all", "dogs dogs", "like",
@@ -45,7 +45,7 @@ public class TestTermScorer extends Luce
@Override
protected void setUp() throws Exception {
super.setUp();
- directory = new RAMDirectory();
+ directory = new MockRAMDirectory();
RandomIndexWriter writer = new RandomIndexWriter(newRandom(), directory);
for (int i = 0; i < values.length; i++) {
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestThreadSafe.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestThreadSafe.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestThreadSafe.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestThreadSafe.java Wed Aug 11 04:28:06 2010
@@ -18,7 +18,7 @@ package org.apache.lucene.search;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -142,7 +142,7 @@ public class TestThreadSafe extends Luce
public void testLazyLoadThreadSafety() throws Exception{
r = newRandom();
- dir1 = new RAMDirectory();
+ dir1 = new MockRAMDirectory();
// test w/ field sizes bigger than the buffer of an index input
buildDir(dir1, 15, 5, 2000);
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java Wed Aug 11 04:28:06 2010
@@ -28,7 +28,7 @@ import org.apache.lucene.index.RandomInd
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.TimeLimitingCollector.TimeExceededException;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.ThreadInterruptedException;
@@ -76,7 +76,7 @@ public class TestTimeLimitingCollector e
"blueberry strudel",
"blueberry pizza",
};
- directory = new RAMDirectory();
+ directory = new MockRAMDirectory();
RandomIndexWriter iw = new RandomIndexWriter(newRandom(), directory);
for (int i=0; i<N_DOCS; i++) {
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestTopDocsCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestTopDocsCollector.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestTopDocsCollector.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestTopDocsCollector.java Wed Aug 11 04:28:06 2010
@@ -23,7 +23,7 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.LuceneTestCase;
public class TestTopDocsCollector extends LuceneTestCase {
@@ -90,7 +90,7 @@ public class TestTopDocsCollector extend
private static final float MAX_SCORE = 9.17561f;
- private Directory dir = new RAMDirectory();
+ private Directory dir = new MockRAMDirectory();
private IndexReader reader;
private TopDocsCollector<ScoreDoc> doSearch(int numResults) throws IOException {
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestTopScoreDocCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestTopScoreDocCollector.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestTopScoreDocCollector.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestTopScoreDocCollector.java Wed Aug 11 04:28:06 2010
@@ -24,7 +24,7 @@ import org.apache.lucene.index.IndexRead
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.LuceneTestCase;
public class TestTopScoreDocCollector extends LuceneTestCase {
@@ -38,7 +38,7 @@ public class TestTopScoreDocCollector ex
public void testOutOfOrderCollection() throws Exception {
- Directory dir = new RAMDirectory();
+ Directory dir = new MockRAMDirectory();
Random random = newRandom();
RandomIndexWriter writer = new RandomIndexWriter(random, dir);
for (int i = 0; i < 10; i++) {
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestWildcard.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestWildcard.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestWildcard.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestWildcard.java Wed Aug 11 04:28:06 2010
@@ -26,7 +26,7 @@ import org.apache.lucene.document.Field.
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.queryParser.QueryParser;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import java.io.IOException;
import java.util.Random;
@@ -70,7 +70,7 @@ public class TestWildcard
* a ConstantScoreQuery if the WildcardQuery had a ConstantScore rewriteMethod.
*/
public void testTermWithoutWildcard() throws IOException {
- RAMDirectory indexStore = getIndexStore("field", new String[]{"nowildcard", "nowildcardx"});
+ MockRAMDirectory indexStore = getIndexStore("field", new String[]{"nowildcard", "nowildcardx"});
IndexSearcher searcher = new IndexSearcher(indexStore, true);
MultiTermQuery wq = new WildcardQuery(new Term("field", "nowildcard"));
@@ -105,7 +105,7 @@ public class TestWildcard
* Tests if a WildcardQuery with an empty term is rewritten to an empty BooleanQuery
*/
public void testEmptyTerm() throws IOException {
- RAMDirectory indexStore = getIndexStore("field", new String[]{"nowildcard", "nowildcardx"});
+ MockRAMDirectory indexStore = getIndexStore("field", new String[]{"nowildcard", "nowildcardx"});
IndexSearcher searcher = new IndexSearcher(indexStore, true);
MultiTermQuery wq = new WildcardQuery(new Term("field", ""));
@@ -122,7 +122,7 @@ public class TestWildcard
* preserved.
*/
public void testPrefixTerm() throws IOException {
- RAMDirectory indexStore = getIndexStore("field", new String[]{"prefix", "prefixx"});
+ MockRAMDirectory indexStore = getIndexStore("field", new String[]{"prefix", "prefixx"});
IndexSearcher searcher = new IndexSearcher(indexStore, true);
MultiTermQuery wq = new WildcardQuery(new Term("field", "prefix*"));
@@ -159,7 +159,7 @@ public class TestWildcard
*/
public void testAsterisk()
throws IOException {
- RAMDirectory indexStore = getIndexStore("body", new String[]
+ MockRAMDirectory indexStore = getIndexStore("body", new String[]
{"metal", "metals"});
IndexSearcher searcher = new IndexSearcher(indexStore, true);
Query query1 = new TermQuery(new Term("body", "metal"));
@@ -198,7 +198,7 @@ public class TestWildcard
*/
public void testQuestionmark()
throws IOException {
- RAMDirectory indexStore = getIndexStore("body", new String[]
+ MockRAMDirectory indexStore = getIndexStore("body", new String[]
{"metal", "metals", "mXtals", "mXtXls"});
IndexSearcher searcher = new IndexSearcher(indexStore, true);
Query query1 = new WildcardQuery(new Term("body", "m?tal"));
@@ -216,9 +216,9 @@ public class TestWildcard
assertMatches(searcher, query6, 1); // Query: 'meta??' matches 'metals' not 'metal'
}
- private RAMDirectory getIndexStore(String field, String[] contents)
+ private MockRAMDirectory getIndexStore(String field, String[] contents)
throws IOException {
- RAMDirectory indexStore = new RAMDirectory();
+ MockRAMDirectory indexStore = new MockRAMDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, indexStore);
for (int i = 0; i < contents.length; ++i) {
Document doc = new Document();
@@ -274,7 +274,7 @@ public class TestWildcard
};
// prepare the index
- RAMDirectory dir = new RAMDirectory();
+ MockRAMDirectory dir = new MockRAMDirectory();
RandomIndexWriter iw = new RandomIndexWriter(random, dir);
for (int i = 0; i < docs.length; i++) {
Document doc = new Document();
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/function/FunctionTestSetup.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/function/FunctionTestSetup.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/function/FunctionTestSetup.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/function/FunctionTestSetup.java Wed Aug 11 04:28:06 2010
@@ -25,7 +25,7 @@ import org.apache.lucene.document.Fielda
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.LuceneTestCaseJ4;
import org.apache.lucene.util._TestUtil;
import java.util.Random;
@@ -95,7 +95,7 @@ public class FunctionTestSetup extends L
public void setUp() throws Exception {
super.setUp();
// prepare a small index with just a few documents.
- dir = new RAMDirectory();
+ dir = new MockRAMDirectory();
anlzr = new StandardAnalyzer(TEST_VERSION_CURRENT);
Random r = newRandom();
IndexWriterConfig iwc = new IndexWriterConfig(TEST_VERSION_CURRENT, anlzr);
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/payloads/PayloadHelper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/payloads/PayloadHelper.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/payloads/PayloadHelper.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/payloads/PayloadHelper.java Wed Aug 11 04:28:06 2010
@@ -22,7 +22,7 @@ import org.apache.lucene.analysis.tokena
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.Payload;
import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.util.English;
@@ -104,7 +104,7 @@ public class PayloadHelper {
* @throws IOException
*/
public IndexSearcher setUp(Similarity similarity, int numDocs) throws IOException {
- RAMDirectory directory = new RAMDirectory();
+ MockRAMDirectory directory = new MockRAMDirectory();
PayloadAnalyzer analyzer = new PayloadAnalyzer();
IndexWriter writer = new IndexWriter(directory, new IndexWriterConfig(
TEST_VERSION_CURRENT, analyzer).setSimilarity(similarity));
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java Wed Aug 11 04:28:06 2010
@@ -42,7 +42,7 @@ import org.apache.lucene.search.spans.Sp
import org.apache.lucene.search.spans.SpanNearQuery;
import org.apache.lucene.search.spans.SpanTermQuery;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.English;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.search.Explanation.IDFExplanation;
@@ -106,7 +106,7 @@ public class TestPayloadNearQuery extend
@Override
protected void setUp() throws Exception {
super.setUp();
- directory = new RAMDirectory();
+ directory = new MockRAMDirectory();
Random random = newRandom();
RandomIndexWriter writer = new RandomIndexWriter(random, directory,
newIndexWriterConfig(random, TEST_VERSION_CURRENT, new PayloadAnalyzer())
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java Wed Aug 11 04:28:06 2010
@@ -39,7 +39,7 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.index.Payload;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
@@ -59,7 +59,7 @@ public class TestPayloadTermQuery extend
private byte[] payloadField = new byte[]{1};
private byte[] payloadMultiField1 = new byte[]{2};
private byte[] payloadMultiField2 = new byte[]{4};
- protected RAMDirectory directory;
+ protected MockRAMDirectory directory;
public TestPayloadTermQuery(String s) {
super(s);
@@ -112,7 +112,7 @@ public class TestPayloadTermQuery extend
@Override
protected void setUp() throws Exception {
super.setUp();
- directory = new RAMDirectory();
+ directory = new MockRAMDirectory();
Random random = newRandom();
RandomIndexWriter writer = new RandomIndexWriter(random, directory,
newIndexWriterConfig(random, TEST_VERSION_CURRENT, new PayloadAnalyzer())
@@ -261,6 +261,7 @@ public class TestPayloadTermQuery extend
while (spans.next()) {
count++;
}
+ theSearcher.close();
}
public void testNoMatch() throws Exception {
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java Wed Aug 11 04:28:06 2010
@@ -34,7 +34,7 @@ import org.apache.lucene.search.Query;
import org.apache.lucene.search.QueryUtils;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.English;
import org.apache.lucene.util.LuceneTestCase;
@@ -58,7 +58,7 @@ public class TestBasics extends LuceneTe
@Override
protected void setUp() throws Exception {
super.setUp();
- directory = new RAMDirectory();
+ directory = new MockRAMDirectory();
RandomIndexWriter writer = new RandomIndexWriter(newRandom(), directory,
new SimpleAnalyzer(TEST_VERSION_CURRENT));
//writer.infoStream = System.out;
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java Wed Aug 11 04:28:06 2010
@@ -30,7 +30,7 @@ import org.apache.lucene.search.IndexSea
import org.apache.lucene.search.Query;
import org.apache.lucene.search.QueryUtils;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.LuceneTestCase;
public class TestFieldMaskingSpanQuery extends LuceneTestCase {
@@ -54,7 +54,7 @@ public class TestFieldMaskingSpanQuery e
@Override
protected void setUp() throws Exception {
super.setUp();
- directory = new RAMDirectory();
+ directory = new MockRAMDirectory();
RandomIndexWriter writer= new RandomIndexWriter(newRandom(), directory);
writer.addDocument(doc(new Field[] { field("id", "0")
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java Wed Aug 11 04:28:06 2010
@@ -30,7 +30,7 @@ import org.apache.lucene.search.IndexSea
import org.apache.lucene.search.Weight;
import org.apache.lucene.search.Scorer;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.LuceneTestCase;
public class TestNearSpansOrdered extends LuceneTestCase {
@@ -53,7 +53,7 @@ public class TestNearSpansOrdered extend
@Override
protected void setUp() throws Exception {
super.setUp();
- directory = new RAMDirectory();
+ directory = new MockRAMDirectory();
RandomIndexWriter writer= new RandomIndexWriter(newRandom(), directory);
for (int i = 0; i < docFields.length; i++) {
Document doc = new Document();
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java Wed Aug 11 04:28:06 2010
@@ -46,7 +46,7 @@ import org.apache.lucene.search.TopDocs;
import org.apache.lucene.search.payloads.PayloadHelper;
import org.apache.lucene.search.payloads.PayloadSpanUtil;
import org.apache.lucene.store.LockObtainFailedException;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.LuceneTestCase;
public class TestPayloadSpans extends LuceneTestCase {
@@ -113,7 +113,7 @@ public class TestPayloadSpans extends Lu
public IndexSearcher getSpanNotSearcher()
throws IOException {
- RAMDirectory directory = new RAMDirectory();
+ MockRAMDirectory directory = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(directory, new IndexWriterConfig(
TEST_VERSION_CURRENT, new PayloadAnalyzer()).setSimilarity(
similarity));
@@ -253,7 +253,7 @@ public class TestPayloadSpans extends Lu
public void testShrinkToAfterShortestMatch() throws CorruptIndexException,
LockObtainFailedException, IOException {
- RAMDirectory directory = new RAMDirectory();
+ MockRAMDirectory directory = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(directory, new IndexWriterConfig(
TEST_VERSION_CURRENT, new TestPayloadAnalyzer()));
Document doc = new Document();
@@ -287,7 +287,7 @@ public class TestPayloadSpans extends Lu
public void testShrinkToAfterShortestMatch2() throws CorruptIndexException,
LockObtainFailedException, IOException {
- RAMDirectory directory = new RAMDirectory();
+ MockRAMDirectory directory = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(directory, new IndexWriterConfig(
TEST_VERSION_CURRENT, new TestPayloadAnalyzer()));
Document doc = new Document();
@@ -320,7 +320,7 @@ public class TestPayloadSpans extends Lu
public void testShrinkToAfterShortestMatch3() throws CorruptIndexException,
LockObtainFailedException, IOException {
- RAMDirectory directory = new RAMDirectory();
+ MockRAMDirectory directory = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(directory, new IndexWriterConfig(
TEST_VERSION_CURRENT, new TestPayloadAnalyzer()));
Document doc = new Document();
@@ -358,7 +358,7 @@ public class TestPayloadSpans extends Lu
}
public void testPayloadSpanUtil() throws Exception {
- RAMDirectory directory = new RAMDirectory();
+ MockRAMDirectory directory = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(directory, new IndexWriterConfig(
TEST_VERSION_CURRENT, new PayloadAnalyzer()).setSimilarity(
similarity));
@@ -417,7 +417,7 @@ public class TestPayloadSpans extends Lu
}
private IndexSearcher getSearcher() throws Exception {
- RAMDirectory directory = new RAMDirectory();
+ MockRAMDirectory directory = new MockRAMDirectory();
String[] docs = new String[]{"xx rr yy mm pp","xx yy mm rr pp", "nopayload qq ss pp np", "one two three four five six seven eight nine ten eleven", "nine one two three four five six seven eight eleven ten"};
IndexWriter writer = new IndexWriter(directory, new IndexWriterConfig(
TEST_VERSION_CURRENT, new PayloadAnalyzer()).setSimilarity(similarity));
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java Wed Aug 11 04:28:06 2010
@@ -26,7 +26,7 @@ import org.apache.lucene.search.DefaultS
import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.Searcher;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
@@ -51,7 +51,7 @@ public class TestSpans extends LuceneTes
@Override
protected void setUp() throws Exception {
super.setUp();
- directory = new RAMDirectory();
+ directory = new MockRAMDirectory();
RandomIndexWriter writer= new RandomIndexWriter(newRandom(), directory);
for (int i = 0; i < docFields.length; i++) {
Document doc = new Document();
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java?rev=984299&r1=984298&r2=984299&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java Wed Aug 11 04:28:06 2010
@@ -30,7 +30,7 @@ import org.apache.lucene.index.RandomInd
import org.apache.lucene.index.Term;
import org.apache.lucene.search.*;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
/*******************************************************************************
* Tests the span query bug in Lucene. It demonstrates that SpanTermQuerys don't
@@ -57,7 +57,7 @@ public class TestSpansAdvanced extends L
super.setUp();
random = newRandom();
// create test index
- mDirectory = new RAMDirectory();
+ mDirectory = new MockRAMDirectory();
final RandomIndexWriter writer = new RandomIndexWriter(random,
mDirectory, newIndexWriterConfig(random, TEST_VERSION_CURRENT,
new StandardAnalyzer(TEST_VERSION_CURRENT)));