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 00:04:00 UTC
svn commit: r984232 [2/3] - in /lucene/dev/trunk:
lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/
lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/
lucene/contrib/instantiated/src/test/org/apache/luce...
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java Tue Aug 10 22:03:54 2010
@@ -46,7 +46,7 @@ import org.apache.lucene.search.TermQuer
import org.apache.lucene.search.NumericRangeQuery;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util._TestUtil;
import org.apache.lucene.util.BytesRef;
@@ -226,7 +226,7 @@ public class TestBackwardsCompatibility
String fullPath = fullDir(name);
Directory dir = FSDirectory.open(new File(fullPath));
- Directory targetDir = new RAMDirectory();
+ Directory targetDir = new MockRAMDirectory();
IndexWriter w = new IndexWriter(targetDir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer()));
w.addIndexes(new Directory[] { dir });
@@ -247,7 +247,7 @@ public class TestBackwardsCompatibility
Directory dir = FSDirectory.open(new File(fullPath));
IndexReader reader = IndexReader.open(dir);
- Directory targetDir = new RAMDirectory();
+ Directory targetDir = new MockRAMDirectory();
IndexWriter w = new IndexWriter(targetDir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer()));
w.addIndexes(new IndexReader[] { reader });
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestCodecs.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestCodecs.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestCodecs.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestCodecs.java Tue Aug 10 22:03:54 2010
@@ -40,7 +40,7 @@ import org.apache.lucene.search.Query;
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.MockRAMDirectory;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.MultiCodecTestCase;
import org.apache.lucene.util.Version;
@@ -352,7 +352,7 @@ public class TestCodecs extends MultiCod
}
public void testSepPositionAfterMerge() throws IOException {
- final Directory dir = new RAMDirectory();
+ final Directory dir = new MockRAMDirectory();
final IndexWriterConfig config = newIndexWriterConfig(newRandom(), Version.LUCENE_31,
new MockAnalyzer());
config.setCodecProvider(new MockSepCodecs());
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java Tue Aug 10 22:03:54 2010
@@ -18,7 +18,7 @@ package org.apache.lucene.index;
*/
import org.apache.lucene.store.MockRAMDirectory;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
@@ -108,7 +108,7 @@ public class TestConcurrentMergeSchedule
// before it finishes, are correctly merged back:
public void testDeleteMerging() throws IOException {
- RAMDirectory directory = new MockRAMDirectory();
+ MockRAMDirectory directory = new MockRAMDirectory();
LogDocMergePolicy mp = new LogDocMergePolicy();
// Force degenerate merging so we can get a mix of
@@ -147,7 +147,7 @@ public class TestConcurrentMergeSchedule
public void testNoExtraFiles() throws IOException {
- RAMDirectory directory = new MockRAMDirectory();
+ MockRAMDirectory directory = new MockRAMDirectory();
Random random = newRandom();
IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer())
@@ -176,7 +176,7 @@ public class TestConcurrentMergeSchedule
}
public void testNoWaitClose() throws IOException {
- RAMDirectory directory = new MockRAMDirectory();
+ MockRAMDirectory directory = new MockRAMDirectory();
Random random = newRandom();
Document doc = new Document();
Field idField = new Field("id", "", Field.Store.YES, Field.Index.NOT_ANALYZED);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDeletionPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDeletionPolicy.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDeletionPolicy.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDeletionPolicy.java Tue Aug 10 22:03:54 2010
@@ -33,7 +33,7 @@ import org.apache.lucene.search.Query;
import org.apache.lucene.search.ScoreDoc;
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.store.MockRAMDirectory;
import org.apache.lucene.util.LuceneTestCase;
@@ -202,7 +202,7 @@ public class TestDeletionPolicy extends
boolean useCompoundFile = true;
Random random = newRandom();
- Directory dir = new RAMDirectory();
+ Directory dir = new MockRAMDirectory();
ExpirationTimeDeletionPolicy policy = new ExpirationTimeDeletionPolicy(dir, SECONDS);
IndexWriterConfig conf = newIndexWriterConfig(random, TEST_VERSION_CURRENT,
new MockAnalyzer())
@@ -282,7 +282,7 @@ public class TestDeletionPolicy extends
// Never deletes a commit
KeepAllDeletionPolicy policy = new KeepAllDeletionPolicy();
- Directory dir = new RAMDirectory();
+ Directory dir = new MockRAMDirectory();
policy.dir = dir;
IndexWriterConfig conf = newIndexWriterConfig(random,
@@ -474,7 +474,7 @@ public class TestDeletionPolicy extends
KeepNoneOnInitDeletionPolicy policy = new KeepNoneOnInitDeletionPolicy();
- Directory dir = new RAMDirectory();
+ Directory dir = new MockRAMDirectory();
IndexWriterConfig conf = newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer())
@@ -523,7 +523,7 @@ public class TestDeletionPolicy extends
boolean useCompoundFile = (pass % 2) != 0;
- Directory dir = new RAMDirectory();
+ Directory dir = new MockRAMDirectory();
KeepLastNDeletionPolicy policy = new KeepLastNDeletionPolicy(N);
@@ -588,7 +588,7 @@ public class TestDeletionPolicy extends
KeepLastNDeletionPolicy policy = new KeepLastNDeletionPolicy(N);
- Directory dir = new RAMDirectory();
+ Directory dir = new MockRAMDirectory();
IndexWriterConfig conf = newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer())
.setOpenMode(OpenMode.CREATE).setIndexDeletionPolicy(policy);
@@ -646,7 +646,7 @@ public class TestDeletionPolicy extends
dir.deleteFile(IndexFileNames.SEGMENTS_GEN);
int expectedCount = 176;
-
+ searcher.close();
for(int i=0;i<N+1;i++) {
try {
IndexReader reader = IndexReader.open(dir, true);
@@ -678,7 +678,6 @@ public class TestDeletionPolicy extends
}
gen--;
}
-
dir.close();
}
}
@@ -698,7 +697,7 @@ public class TestDeletionPolicy extends
KeepLastNDeletionPolicy policy = new KeepLastNDeletionPolicy(N);
- Directory dir = new RAMDirectory();
+ Directory dir = new MockRAMDirectory();
IndexWriterConfig conf = newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer())
.setOpenMode(OpenMode.CREATE).setIndexDeletionPolicy(policy)
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDirectoryReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDirectoryReader.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDirectoryReader.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDirectoryReader.java Tue Aug 10 22:03:54 2010
@@ -24,7 +24,7 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.BytesRef;
import java.io.IOException;
@@ -45,7 +45,7 @@ public class TestDirectoryReader extends
@Override
protected void setUp() throws Exception {
super.setUp();
- dir = new RAMDirectory();
+ dir = new MockRAMDirectory();
doc1 = new Document();
doc2 = new Document();
DocHelper.setupDoc(doc1);
@@ -126,9 +126,9 @@ public class TestDirectoryReader extends
public void testIsCurrent() throws IOException {
Random random = newRandom();
- RAMDirectory ramDir1=new RAMDirectory();
+ MockRAMDirectory ramDir1=new MockRAMDirectory();
addDoc(random, ramDir1, "test foo", true);
- RAMDirectory ramDir2=new RAMDirectory();
+ MockRAMDirectory ramDir2=new MockRAMDirectory();
addDoc(random, ramDir2, "test blah", true);
IndexReader[] readers = new IndexReader[]{IndexReader.open(ramDir1, false), IndexReader.open(ramDir2, false)};
MultiReader mr = new MultiReader(readers);
@@ -148,11 +148,11 @@ public class TestDirectoryReader extends
public void testMultiTermDocs() throws IOException {
Random random = newRandom();
- RAMDirectory ramDir1=new RAMDirectory();
+ MockRAMDirectory ramDir1=new MockRAMDirectory();
addDoc(random, ramDir1, "test foo", true);
- RAMDirectory ramDir2=new RAMDirectory();
+ MockRAMDirectory ramDir2=new MockRAMDirectory();
addDoc(random, ramDir2, "test blah", true);
- RAMDirectory ramDir3=new RAMDirectory();
+ MockRAMDirectory ramDir3=new MockRAMDirectory();
addDoc(random, ramDir3, "test wow", true);
IndexReader[] readers1 = new IndexReader[]{IndexReader.open(ramDir1, false), IndexReader.open(ramDir3, false)};
@@ -184,7 +184,7 @@ public class TestDirectoryReader extends
assertTrue(ret > 0);
}
- private void addDoc(Random random, RAMDirectory ramDir1, String s, boolean create) throws IOException {
+ private void addDoc(Random random, MockRAMDirectory ramDir1, String s, boolean create) throws IOException {
IndexWriter iw = new IndexWriter(ramDir1, newIndexWriterConfig(random,
TEST_VERSION_CURRENT,
new MockAnalyzer()).setOpenMode(
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDocumentWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDocumentWriter.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDocumentWriter.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDocumentWriter.java Tue Aug 10 22:03:54 2010
@@ -34,14 +34,14 @@ import org.apache.lucene.document.Fielda
import org.apache.lucene.document.Field.Index;
import org.apache.lucene.document.Field.Store;
import org.apache.lucene.document.Field.TermVector;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.AttributeSource;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util._TestUtil;
import org.apache.lucene.util.BytesRef;
public class TestDocumentWriter extends LuceneTestCase {
- private RAMDirectory dir;
+ private MockRAMDirectory dir;
public TestDocumentWriter(String s) {
super(s);
@@ -50,7 +50,7 @@ public class TestDocumentWriter extends
@Override
protected void setUp() throws Exception {
super.setUp();
- dir = new RAMDirectory();
+ dir = new MockRAMDirectory();
}
public void test() {
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFieldInfos.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFieldInfos.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFieldInfos.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFieldInfos.java Tue Aug 10 22:03:54 2010
@@ -19,7 +19,7 @@ package org.apache.lucene.index;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.document.Document;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.store.IndexOutput;
import java.io.IOException;
@@ -47,7 +47,7 @@ public class TestFieldInfos extends Luce
fieldInfos.add(testDoc);
//Since the complement is stored as well in the fields map
assertTrue(fieldInfos.size() == DocHelper.all.size()); //this is all b/c we are using the no-arg constructor
- RAMDirectory dir = new RAMDirectory();
+ MockRAMDirectory dir = new MockRAMDirectory();
String name = "testFile";
IndexOutput output = dir.createOutput(name);
assertTrue(output != null);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFieldsReader.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFieldsReader.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFieldsReader.java Tue Aug 10 22:03:54 2010
@@ -40,12 +40,12 @@ import org.apache.lucene.store.Directory
import org.apache.lucene.store.FSDirectory;
import org.apache.lucene.store.IndexInput;
import org.apache.lucene.store.IndexOutput;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util._TestUtil;
public class TestFieldsReader extends LuceneTestCase {
- private RAMDirectory dir = new RAMDirectory();
+ private MockRAMDirectory dir = new MockRAMDirectory();
private Document testDoc = new Document();
private FieldInfos fieldInfos = null;
private Random random;
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFilterIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFilterIndexReader.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFilterIndexReader.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFilterIndexReader.java Tue Aug 10 22:03:54 2010
@@ -22,7 +22,7 @@ import org.apache.lucene.util.LuceneTest
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
@@ -132,7 +132,7 @@ public class TestFilterIndexReader exten
*/
public void testFilterIndexReader() throws Exception {
Random random = newRandom();
- RAMDirectory directory = new MockRAMDirectory();
+ MockRAMDirectory directory = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
Document d1 = new Document();
@@ -150,7 +150,7 @@ public class TestFilterIndexReader exten
writer.close();
//IndexReader reader = new TestReader(IndexReader.open(directory, true));
- RAMDirectory target = new MockRAMDirectory();
+ MockRAMDirectory target = new MockRAMDirectory();
writer = new IndexWriter(target, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
IndexReader reader = new TestReader(IndexReader.open(directory, true));
writer.addIndexes(reader);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexCommit.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexCommit.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexCommit.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexCommit.java Tue Aug 10 22:03:54 2010
@@ -24,7 +24,7 @@ import java.util.Collection;
import java.util.Map;
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.junit.Test;
@@ -33,7 +33,7 @@ public class TestIndexCommit extends Luc
@Test
public void testEqualsHashCode() throws Exception {
// LUCENE-2417: equals and hashCode() impl was inconsistent
- final Directory dir = new RAMDirectory();
+ final Directory dir = new MockRAMDirectory();
IndexCommit ic1 = new IndexCommit() {
@Override public String getSegmentsFileName() { return "a"; }
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexFileDeleter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexFileDeleter.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexFileDeleter.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexFileDeleter.java Tue Aug 10 22:03:54 2010
@@ -21,7 +21,7 @@ import org.apache.lucene.util.LuceneTest
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IndexInput;
import org.apache.lucene.store.IndexOutput;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
@@ -39,8 +39,8 @@ public class TestIndexFileDeleter extend
public void testDeleteLeftoverFiles() throws IOException {
Random random = newRandom();
- Directory dir = new RAMDirectory();
-
+ MockRAMDirectory dir = new MockRAMDirectory();
+ dir.setPreventDoubleWrite(false);
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer())
.setMaxBufferedDocs(10));
@@ -135,14 +135,14 @@ public class TestIndexFileDeleter extend
// Create a bogus fnm file when the CFS already exists:
copyFile(dir, "_0.cfs", "_0.fnm");
-
+
// Create some old segments file:
copyFile(dir, "segments_2", "segments");
copyFile(dir, "segments_2", "segments_1");
// Create a bogus cfs file shadowing a non-cfs segment:
copyFile(dir, "_1.cfs", "_2.cfs");
-
+
String[] filesPre = dir.listAll();
// Open & close a writer: it should delete the above 4
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReader.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReader.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReader.java Tue Aug 10 22:03:54 2010
@@ -53,7 +53,7 @@ import org.apache.lucene.store.FSDirecto
import org.apache.lucene.store.LockObtainFailedException;
import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.store.NoSuchDirectoryException;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util._TestUtil;
import org.apache.lucene.util.BytesRef;
@@ -83,7 +83,7 @@ public class TestIndexReader extends Luc
}
public void testCommitUserData() throws Exception {
- RAMDirectory d = new MockRAMDirectory();
+ MockRAMDirectory d = new MockRAMDirectory();
Map<String,String> commitUserData = new HashMap<String,String>();
commitUserData.put("foo", "fighters");
@@ -138,7 +138,7 @@ public class TestIndexReader extends Luc
}
public void testIsCurrent() throws Exception {
- RAMDirectory d = new MockRAMDirectory();
+ MockRAMDirectory d = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(d, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer()));
addDocumentWithFields(writer);
@@ -167,7 +167,7 @@ public class TestIndexReader extends Luc
* @throws Exception on error
*/
public void testGetFieldNames() throws Exception {
- RAMDirectory d = new MockRAMDirectory();
+ MockRAMDirectory d = new MockRAMDirectory();
// set up writer
IndexWriter writer = new IndexWriter(d, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer()));
@@ -259,7 +259,7 @@ public class TestIndexReader extends Luc
}
public void testTermVectors() throws Exception {
- RAMDirectory d = new MockRAMDirectory();
+ MockRAMDirectory d = new MockRAMDirectory();
// set up writer
IndexWriter writer = new IndexWriter(d, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer()));
@@ -356,7 +356,7 @@ public class TestIndexReader extends Luc
}
public void testBinaryFields() throws IOException {
- Directory dir = new RAMDirectory();
+ Directory dir = new MockRAMDirectory();
byte[] bin = new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
@@ -426,7 +426,7 @@ public class TestIndexReader extends Luc
// Make sure attempts to make changes after reader is
// closed throws IOException:
public void testChangesAfterClose() throws IOException {
- Directory dir = new RAMDirectory();
+ Directory dir = new MockRAMDirectory();
IndexWriter writer = null;
IndexReader reader = null;
@@ -469,7 +469,7 @@ public class TestIndexReader extends Luc
// Make sure we get lock obtain failed exception with 2 writers:
public void testLockObtainFailed() throws IOException {
- Directory dir = new RAMDirectory();
+ Directory dir = new MockRAMDirectory();
Term searchTerm = new Term("content", "aaa");
@@ -878,7 +878,7 @@ public class TestIndexReader extends Luc
int END_COUNT = 144;
// First build up a starting index:
- RAMDirectory startDir = new MockRAMDirectory();
+ MockRAMDirectory startDir = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(startDir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
for(int i=0;i<157;i++) {
Document d = new Document();
@@ -1381,7 +1381,7 @@ public class TestIndexReader extends Luc
public void testGetIndexCommit() throws IOException {
- RAMDirectory d = new MockRAMDirectory();
+ MockRAMDirectory d = new MockRAMDirectory();
// set up writer
IndexWriter writer = new IndexWriter(d, newIndexWriterConfig(random,
@@ -1430,7 +1430,7 @@ public class TestIndexReader extends Luc
}
public void testReadOnly() throws Throwable {
- RAMDirectory d = new MockRAMDirectory();
+ MockRAMDirectory d = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(d, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer()));
addDocumentWithFields(writer);
@@ -1498,7 +1498,7 @@ public class TestIndexReader extends Luc
// LUCENE-1474
public void testIndexReader() throws Exception {
- Directory dir = new RAMDirectory();
+ Directory dir = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer()));
writer.addDocument(createDocument("a"));
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java Tue Aug 10 22:03:54 2010
@@ -70,7 +70,7 @@ import org.apache.lucene.store.Lock;
import org.apache.lucene.store.LockFactory;
import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.store.NoLockFactory;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.store.SingleInstanceLockFactory;
import org.apache.lucene.util.UnicodeUtil;
import org.apache.lucene.util._TestUtil;
@@ -91,7 +91,7 @@ public class TestIndexWriter extends Luc
}
public void testDocCount() throws IOException {
- Directory dir = new RAMDirectory();
+ Directory dir = new MockRAMDirectory();
IndexWriter writer = null;
IndexReader reader = null;
@@ -187,7 +187,7 @@ public class TestIndexWriter extends Luc
Directory[] dirs = new Directory[NUM_DIR];
long inputDiskUsage = 0;
for(int i=0;i<NUM_DIR;i++) {
- dirs[i] = new RAMDirectory();
+ dirs[i] = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(dirs[i], newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
for(int j=0;j<25;j++) {
addDocWithIndex(writer, 25*i+j);
@@ -201,7 +201,7 @@ public class TestIndexWriter extends Luc
// Now, build a starting index that has START_COUNT docs. We
// will then try to addIndexesNoOptimize into a copy of this:
- RAMDirectory startDir = new RAMDirectory();
+ MockRAMDirectory startDir = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(startDir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
for(int j=0;j<START_COUNT;j++) {
addDocWithIndex(writer, j);
@@ -714,7 +714,8 @@ public class TestIndexWriter extends Luc
// gracefully fallback to the previous segments file),
// and that we can add to the index:
public void testSimulatedCrashedWriter() throws IOException {
- Directory dir = new RAMDirectory();
+ MockRAMDirectory dir = new MockRAMDirectory();
+ dir.setPreventDoubleWrite(false);
IndexWriter writer = null;
@@ -775,7 +776,7 @@ public class TestIndexWriter extends Luc
// latest segments file and make sure we get an
// IOException trying to open the index:
public void testSimulatedCorruptIndex1() throws IOException {
- Directory dir = new RAMDirectory();
+ Directory dir = new MockRAMDirectory();
IndexWriter writer = null;
@@ -818,7 +819,7 @@ public class TestIndexWriter extends Luc
}
public void testChangesAfterClose() throws IOException {
- Directory dir = new RAMDirectory();
+ Directory dir = new MockRAMDirectory();
IndexWriter writer = null;
@@ -840,7 +841,7 @@ public class TestIndexWriter extends Luc
// files and make sure we get an IOException trying to
// open the index:
public void testSimulatedCorruptIndex2() throws IOException {
- Directory dir = new RAMDirectory();
+ Directory dir = new MockRAMDirectory();
IndexWriter writer = null;
@@ -886,7 +887,7 @@ public class TestIndexWriter extends Luc
* these docs until writer is closed.
*/
public void testCommitOnClose() throws IOException {
- Directory dir = new RAMDirectory();
+ Directory dir = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
for (int i = 0; i < 14; i++) {
addDoc(writer);
@@ -1049,7 +1050,8 @@ public class TestIndexWriter extends Luc
* and close().
*/
public void testCommitOnCloseOptimize() throws IOException {
- RAMDirectory dir = new RAMDirectory();
+ MockRAMDirectory dir = new MockRAMDirectory();
+ dir.setPreventDoubleWrite(false); // TODO: should this be disabled here?
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()).setMaxBufferedDocs(10));
((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(10);
for(int j=0;j<17;j++) {
@@ -1093,7 +1095,7 @@ public class TestIndexWriter extends Luc
}
public void testIndexNoDocuments() throws IOException {
- RAMDirectory dir = new RAMDirectory();
+ MockRAMDirectory dir = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
writer.commit();
writer.close();
@@ -1114,7 +1116,7 @@ public class TestIndexWriter extends Luc
}
public void testManyFields() throws IOException {
- RAMDirectory dir = new RAMDirectory();
+ MockRAMDirectory dir = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()).setMaxBufferedDocs(10));
for(int j=0;j<100;j++) {
Document doc = new Document();
@@ -1144,7 +1146,7 @@ public class TestIndexWriter extends Luc
}
public void testSmallRAMBuffer() throws IOException {
- RAMDirectory dir = new RAMDirectory();
+ MockRAMDirectory dir = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()).setRAMBufferSizeMB(0.000001));
((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(10);
int lastNumFile = dir.listAll().length;
@@ -1171,7 +1173,7 @@ public class TestIndexWriter extends Luc
* session won't be possible.
*/
public void testChangingRAMBuffer() throws IOException {
- RAMDirectory dir = new RAMDirectory();
+ MockRAMDirectory dir = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer()).setMaxBufferedDocs(10).setRAMBufferSizeMB(
IndexWriterConfig.DISABLE_AUTO_FLUSH));
@@ -1229,7 +1231,7 @@ public class TestIndexWriter extends Luc
* changing those settings on IW won't be possible.
*/
public void testChangingRAMBuffer2() throws IOException {
- RAMDirectory dir = new RAMDirectory();
+ MockRAMDirectory dir = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer()).setMaxBufferedDocs(10).setMaxBufferedDeleteTerms(
10).setRAMBufferSizeMB(IndexWriterConfig.DISABLE_AUTO_FLUSH));
@@ -1288,7 +1290,7 @@ public class TestIndexWriter extends Luc
}
public void testDiverseDocs() throws IOException {
- RAMDirectory dir = new RAMDirectory();
+ MockRAMDirectory dir = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()).setRAMBufferSizeMB(0.5));
for(int i=0;i<3;i++) {
// First, docs where every term is unique (heavy on
@@ -1335,7 +1337,7 @@ public class TestIndexWriter extends Luc
}
public void testEnablingNorms() throws IOException {
- RAMDirectory dir = new RAMDirectory();
+ MockRAMDirectory dir = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()).setMaxBufferedDocs(10));
// Enable norms for only 1 doc, pre flush
for(int j=0;j<10;j++) {
@@ -1381,7 +1383,7 @@ public class TestIndexWriter extends Luc
}
public void testHighFreqTerm() throws IOException {
- RAMDirectory dir = new RAMDirectory();
+ MockRAMDirectory dir = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer()).setMaxFieldLength(100000000).setRAMBufferSizeMB(0.01));
// Massive doc that has 128 K a's
@@ -1419,7 +1421,7 @@ public class TestIndexWriter extends Luc
// compatibility.
public void testNullLockFactory() throws IOException {
- final class MyRAMDirectory extends RAMDirectory {
+ final class MyRAMDirectory extends MockRAMDirectory {
private LockFactory myLockFactory;
MyRAMDirectory() {
lockFactory = null;
@@ -1442,17 +1444,17 @@ public class TestIndexWriter extends Luc
IndexSearcher searcher = new IndexSearcher(dir, false);
ScoreDoc[] hits = searcher.search(new TermQuery(searchTerm), null, 1000).scoreDocs;
assertEquals("did not get right number of hits", 100, hits.length);
- writer.close();
+ searcher.close();
writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer())
.setOpenMode(OpenMode.CREATE));
writer.close();
-
+ searcher.close();
dir.close();
}
public void testFlushWithNoMerging() throws IOException {
- Directory dir = new RAMDirectory();
+ Directory dir = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer()).setMaxBufferedDocs(2));
((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(10);
@@ -1472,7 +1474,7 @@ public class TestIndexWriter extends Luc
// Make sure we can flush segment w/ norms, then add
// empty doc (no norms) and flush
public void testEmptyDocAfterFlushingRealDoc() throws IOException {
- Directory dir = new RAMDirectory();
+ Directory dir = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
Document doc = new Document();
doc.add(new Field("field", "aaa", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
@@ -1678,7 +1680,7 @@ public class TestIndexWriter extends Luc
// LUCENE-1072
public void testExceptionFromTokenStream() throws IOException {
- RAMDirectory dir = new MockRAMDirectory();
+ MockRAMDirectory dir = new MockRAMDirectory();
IndexWriterConfig conf = newIndexWriterConfig(random, TEST_VERSION_CURRENT, new Analyzer() {
@Override
@@ -2080,7 +2082,7 @@ public class TestIndexWriter extends Luc
}
public void testNoWaitClose() throws Throwable {
- RAMDirectory directory = new MockRAMDirectory();
+ MockRAMDirectory directory = new MockRAMDirectory();
final Document doc = new Document();
Field idField = new Field("id", "", Field.Store.YES, Field.Index.NOT_ANALYZED);
@@ -4005,7 +4007,7 @@ public class TestIndexWriter extends Luc
}
public void testOptimizeExceptions() throws IOException {
- RAMDirectory startDir = new MockRAMDirectory();
+ MockRAMDirectory startDir = new MockRAMDirectory();
IndexWriterConfig conf = newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()).setMaxBufferedDocs(2);
((LogMergePolicy) conf.getMergePolicy()).setMergeFactor(100);
IndexWriter w = new IndexWriter(startDir, conf);
@@ -4341,7 +4343,7 @@ public class TestIndexWriter extends Luc
@Override
public void run() {
- RAMDirectory dir = new RAMDirectory();
+ MockRAMDirectory dir = new MockRAMDirectory();
IndexWriter w = null;
boolean first = true;
while(!finish) {
@@ -4939,7 +4941,7 @@ public class TestIndexWriter extends Luc
// Tests that if we don't call commit(), the directory has 0 commits. This has
// changed since LUCENE-2386, where before IW would always commit on a fresh
// new index.
- Directory dir = new RAMDirectory();
+ Directory dir = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
try {
IndexReader.listCommits(dir);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterConfig.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterConfig.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterConfig.java Tue Aug 10 22:03:54 2010
@@ -34,7 +34,7 @@ import org.apache.lucene.index.codecs.Co
import org.apache.lucene.search.DefaultSimilarity;
import org.apache.lucene.search.Similarity;
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.junit.Test;
@@ -264,7 +264,7 @@ public class TestIndexWriterConfig exten
// iw.getConfig().getXYZ(), he'll get the same value he passed to
// iw.setXYZ().
IndexWriterConfig conf = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer());
- Directory dir = new RAMDirectory();
+ Directory dir = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(dir, conf);
writer.setSimilarity(new MySimilarity());
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java Tue Aug 10 22:03:54 2010
@@ -24,7 +24,7 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util._TestUtil;
import org.apache.lucene.util.LuceneTestCase;
@@ -33,7 +33,7 @@ public class TestIndexWriterMergePolicy
// Test the normal case
public void testNormalCase() throws IOException {
- Directory dir = new RAMDirectory();
+ Directory dir = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer())
@@ -49,7 +49,7 @@ public class TestIndexWriterMergePolicy
// Test to see if there is over merge
public void testNoOverMerge() throws IOException {
- Directory dir = new RAMDirectory();
+ Directory dir = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer())
@@ -70,7 +70,7 @@ public class TestIndexWriterMergePolicy
// Test the case where flush is forced after every addDoc
public void testForceFlush() throws IOException {
- Directory dir = new RAMDirectory();
+ Directory dir = new MockRAMDirectory();
LogDocMergePolicy mp = new LogDocMergePolicy();
mp.setMinMergeDocs(100);
@@ -97,7 +97,7 @@ public class TestIndexWriterMergePolicy
// Test the case where mergeFactor changes
public void testMergeFactorChange() throws IOException {
- Directory dir = new RAMDirectory();
+ Directory dir = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer())
@@ -122,7 +122,7 @@ public class TestIndexWriterMergePolicy
// Test the case where both mergeFactor and maxBufferedDocs change
public void testMaxBufferedDocsChange() throws IOException {
- Directory dir = new RAMDirectory();
+ Directory dir = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer())
@@ -170,7 +170,7 @@ public class TestIndexWriterMergePolicy
// Test the case where a merge results in no doc at all
public void testMergeDocCount0() throws IOException {
- Directory dir = new RAMDirectory();
+ Directory dir = new MockRAMDirectory();
LogDocMergePolicy ldmp = new LogDocMergePolicy();
ldmp.setMergeFactor(100);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestLazyBug.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestLazyBug.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestLazyBug.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestLazyBug.java Tue Aug 10 22:03:54 2010
@@ -31,7 +31,7 @@ import org.apache.lucene.document.FieldS
import org.apache.lucene.document.FieldSelectorResult;
import org.apache.lucene.document.Fieldable;
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 TestLazyBug extends LuceneT
};
private Directory makeIndex() throws RuntimeException {
- Directory dir = new RAMDirectory();
+ Directory dir = new MockRAMDirectory();
try {
Random r = newRandom();
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(r,
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestLazyProxSkipping.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestLazyProxSkipping.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestLazyProxSkipping.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestLazyProxSkipping.java Tue Aug 10 22:03:54 2010
@@ -29,7 +29,7 @@ import org.apache.lucene.search.ScoreDoc
import org.apache.lucene.search.Searcher;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IndexInput;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.BytesRef;
@@ -46,7 +46,7 @@ public class TestLazyProxSkipping extend
private String term2 = "yy";
private String term3 = "zz";
- private class SeekCountingDirectory extends RAMDirectory {
+ private class SeekCountingDirectory extends MockRAMDirectory {
@Override
public IndexInput openInput(String name) throws IOException {
IndexInput ii = super.openInput(name);
@@ -120,7 +120,7 @@ public class TestLazyProxSkipping extend
}
public void testSeek() throws IOException {
- Directory directory = new RAMDirectory();
+ Directory directory = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig(newRandom(), TEST_VERSION_CURRENT, new MockAnalyzer()));
for (int i = 0; i < 10; i++) {
Document doc = new Document();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNewestSegment.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNewestSegment.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNewestSegment.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNewestSegment.java Tue Aug 10 22:03:54 2010
@@ -20,12 +20,12 @@ package org.apache.lucene.index;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.index.IndexWriter.MaxFieldLength;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.LuceneTestCase;
public class TestNewestSegment extends LuceneTestCase {
public void testNewestSegment() throws Exception {
- RAMDirectory directory = new RAMDirectory();
+ MockRAMDirectory directory = new MockRAMDirectory();
Analyzer analyzer = new MockAnalyzer();
IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig(newRandom(), TEST_VERSION_CURRENT, new MockAnalyzer()));
assertNull(writer.newestSegment());
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java Tue Aug 10 22:03:54 2010
@@ -30,7 +30,7 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.document.Field.Index;
import org.apache.lucene.document.Field.Store;
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.junit.Test;
@@ -73,7 +73,7 @@ public class TestNoDeletionPolicy extend
@Test
public void testAllCommitsRemain() throws Exception {
- Directory dir = new RAMDirectory();
+ Directory dir = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(newRandom(),
TEST_VERSION_CURRENT, new MockAnalyzer())
.setIndexDeletionPolicy(NoDeletionPolicy.INSTANCE));
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNorms.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNorms.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNorms.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNorms.java Tue Aug 10 22:03:54 2010
@@ -31,7 +31,7 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.search.DefaultSimilarity;
import org.apache.lucene.search.Similarity;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.LuceneTestCase;
/**
@@ -76,7 +76,7 @@ public class TestNorms extends LuceneTes
*/
public void testNorms() throws IOException {
Random random = newRandom();
- Directory dir1 = new RAMDirectory();
+ Directory dir1 = new MockRAMDirectory();
norms = new ArrayList<Float>();
modifiedNorms = new ArrayList<Float>();
@@ -93,13 +93,13 @@ public class TestNorms extends LuceneTes
modifiedNorms = new ArrayList<Float>();
numDocNorms = 0;
- Directory dir2 = new RAMDirectory();
+ Directory dir2 = new MockRAMDirectory();
createIndex(random, dir2);
doTestNorms(random, dir2);
// add index1 and index2 to a third index: index3
- Directory dir3 = new RAMDirectory();
+ Directory dir3 = new MockRAMDirectory();
createIndex(random, dir3);
IndexWriter iw = new IndexWriter(dir3, newIndexWriterConfig(random,
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelReader.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelReader.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelReader.java Tue Aug 10 22:03:54 2010
@@ -35,7 +35,7 @@ import org.apache.lucene.search.TermQuer
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.MockRAMDirectory;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.LuceneTestCase;
public class TestParallelReader extends LuceneTestCase {
@@ -262,7 +262,7 @@ public class TestParallelReader extends
}
private Directory getDir2(Random random) throws IOException {
- Directory dir2 = new RAMDirectory();
+ Directory dir2 = new MockRAMDirectory();
IndexWriter w2 = new IndexWriter(dir2, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
Document d3 = new Document();
d3.add(new Field("f3", "v1", Field.Store.YES, Field.Index.ANALYZED));
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java Tue Aug 10 22:03:54 2010
@@ -31,7 +31,7 @@ import org.apache.lucene.document.Field.
import org.apache.lucene.document.Field.TermVector;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.store.MockRAMDirectory;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
/**
* Some tests for {@link ParallelReader}s with empty indexes
@@ -48,13 +48,13 @@ public class TestParallelReaderEmptyInde
*/
public void testEmptyIndex() throws IOException {
Random random = newRandom();
- RAMDirectory rd1 = new MockRAMDirectory();
+ MockRAMDirectory rd1 = new MockRAMDirectory();
IndexWriter iw = new IndexWriter(rd1, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
iw.close();
- RAMDirectory rd2 = new MockRAMDirectory(rd1);
+ MockRAMDirectory rd2 = new MockRAMDirectory(rd1);
- RAMDirectory rdOut = new MockRAMDirectory();
+ MockRAMDirectory rdOut = new MockRAMDirectory();
IndexWriter iwOut = new IndexWriter(rdOut, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
ParallelReader pr = new ParallelReader();
@@ -78,7 +78,7 @@ public class TestParallelReaderEmptyInde
* any exception.
*/
public void testEmptyIndexWithVectors() throws IOException {
- RAMDirectory rd1 = new MockRAMDirectory();
+ MockRAMDirectory rd1 = new MockRAMDirectory();
Random random = newRandom();
{
IndexWriter iw = new IndexWriter(rd1, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
@@ -100,7 +100,7 @@ public class TestParallelReaderEmptyInde
iw.close();
}
- RAMDirectory rd2 = new MockRAMDirectory();
+ MockRAMDirectory rd2 = new MockRAMDirectory();
{
IndexWriter iw = new IndexWriter(rd2, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
Document doc = new Document();
@@ -108,7 +108,7 @@ public class TestParallelReaderEmptyInde
iw.close();
}
- RAMDirectory rdOut = new MockRAMDirectory();
+ MockRAMDirectory rdOut = new MockRAMDirectory();
IndexWriter iwOut = new IndexWriter(rdOut, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
ParallelReader pr = new ParallelReader();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelTermEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelTermEnum.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelTermEnum.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelTermEnum.java Tue Aug 10 22:03:54 2010
@@ -26,7 +26,7 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.document.Field.Index;
import org.apache.lucene.document.Field.Store;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.Bits;
public class TestParallelTermEnum extends LuceneTestCase {
@@ -38,7 +38,7 @@ public class TestParallelTermEnum extend
super.setUp();
Document doc;
Random random = newRandom();
- RAMDirectory rd1 = new RAMDirectory();
+ MockRAMDirectory rd1 = new MockRAMDirectory();
IndexWriter iw1 = new IndexWriter(rd1, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
doc = new Document();
@@ -50,7 +50,7 @@ public class TestParallelTermEnum extend
iw1.addDocument(doc);
iw1.close();
- RAMDirectory rd2 = new RAMDirectory();
+ MockRAMDirectory rd2 = new MockRAMDirectory();
IndexWriter iw2 = new IndexWriter(rd2, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
doc = new Document();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java Tue Aug 10 22:03:54 2010
@@ -20,7 +20,7 @@ package org.apache.lucene.index;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.store.BufferedIndexInput;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.document.Document;
import org.apache.lucene.index.codecs.CodecProvider;
import org.apache.lucene.util.BytesRef;
@@ -30,14 +30,14 @@ import java.util.Collection;
public class TestSegmentMerger extends LuceneTestCase {
//The variables for the new merged segment
- private Directory mergedDir = new RAMDirectory();
+ private Directory mergedDir = new MockRAMDirectory();
private String mergedSegment = "test";
//First segment to be merged
- private Directory merge1Dir = new RAMDirectory();
+ private Directory merge1Dir = new MockRAMDirectory();
private Document doc1 = new Document();
private SegmentReader reader1 = null;
//Second Segment to be merged
- private Directory merge2Dir = new RAMDirectory();
+ private Directory merge2Dir = new MockRAMDirectory();
private Document doc2 = new Document();
private SegmentReader reader2 = null;
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentReader.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentReader.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentReader.java Tue Aug 10 22:03:54 2010
@@ -28,10 +28,10 @@ import org.apache.lucene.util.BytesRef;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Fieldable;
import org.apache.lucene.search.Similarity;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
public class TestSegmentReader extends LuceneTestCase {
- private RAMDirectory dir = new RAMDirectory();
+ private MockRAMDirectory dir = new MockRAMDirectory();
private Document testDoc = new Document();
private SegmentReader reader = null;
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentTermDocs.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentTermDocs.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentTermDocs.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentTermDocs.java Tue Aug 10 22:03:54 2010
@@ -18,7 +18,7 @@ package org.apache.lucene.index;
*/
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.store.Directory;
import org.apache.lucene.analysis.MockAnalyzer;
@@ -30,7 +30,7 @@ import java.io.IOException;
public class TestSegmentTermDocs extends LuceneTestCase {
private Document testDoc = new Document();
- private Directory dir = new RAMDirectory();
+ private Directory dir = new MockRAMDirectory();
private SegmentInfo info;
public TestSegmentTermDocs(String s) {
@@ -103,7 +103,7 @@ public class TestSegmentTermDocs extends
}
public void testSkipTo(int indexDivisor) throws IOException {
- Directory dir = new RAMDirectory();
+ Directory dir = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(newRandom(), TEST_VERSION_CURRENT, new MockAnalyzer()));
Term ta = new Term("content","aaa");
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentTermEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentTermEnum.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentTermEnum.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentTermEnum.java Tue Aug 10 22:03:54 2010
@@ -28,13 +28,13 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.store.MockRAMDirectory;
public class TestSegmentTermEnum extends LuceneTestCase {
- Directory dir = new RAMDirectory();
+ Directory dir = new MockRAMDirectory();
public void testTermEnum() throws IOException {
Random random = newRandom();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermdocPerf.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermdocPerf.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermdocPerf.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermdocPerf.java Tue Aug 10 22:03:54 2010
@@ -28,7 +28,7 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
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.BytesRef;
@@ -87,7 +87,7 @@ public class TestTermdocPerf extends Luc
public int doTest(int iter, int ndocs, int maxTF, float percentDocs) throws IOException {
- Directory dir = new RAMDirectory();
+ Directory dir = new MockRAMDirectory();
long start = System.currentTimeMillis();
addDocs(dir, ndocs, "foo", "val", maxTF, percentDocs);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/queryParser/TestMultiFieldQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/queryParser/TestMultiFieldQueryParser.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/queryParser/TestMultiFieldQueryParser.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/queryParser/TestMultiFieldQueryParser.java Tue Aug 10 22:03:54 2010
@@ -35,7 +35,7 @@ import org.apache.lucene.search.Query;
import org.apache.lucene.search.ScoreDoc;
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;
/**
@@ -283,7 +283,7 @@ public class TestMultiFieldQueryParser e
public void testStopWordSearching() throws Exception {
Analyzer analyzer = new MockAnalyzer();
- Directory ramDir = new RAMDirectory();
+ Directory ramDir = new MockRAMDirectory();
IndexWriter iw = new IndexWriter(ramDir, new IndexWriterConfig(TEST_VERSION_CURRENT, analyzer));
Document doc = new Document();
doc.add(new Field("body", "blah the footest blah", Field.Store.NO, Field.Index.ANALYZED));
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/queryParser/TestQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/queryParser/TestQueryParser.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/queryParser/TestQueryParser.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/queryParser/TestQueryParser.java Tue Aug 10 22:03:54 2010
@@ -58,7 +58,7 @@ import org.apache.lucene.search.TermRang
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.WildcardQuery;
-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.util.LocalizedTestCase;
@@ -570,7 +570,7 @@ public class TestQueryParser extends Loc
public void testFarsiRangeCollating() throws Exception {
- RAMDirectory ramDir = new RAMDirectory();
+ MockRAMDirectory ramDir = new MockRAMDirectory();
IndexWriter iw = new IndexWriter(ramDir, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(MockTokenizer.WHITESPACE, false)));
Document doc = new Document();
doc.add(new Field("content","\u0633\u0627\u0628",
@@ -978,7 +978,7 @@ public class TestQueryParser extends Loc
}
public void testLocalDateFormat() throws IOException, ParseException {
- RAMDirectory ramDir = new RAMDirectory();
+ MockRAMDirectory ramDir = new MockRAMDirectory();
IndexWriter iw = new IndexWriter(ramDir, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(MockTokenizer.WHITESPACE, false)));
addDateDoc("a", 2005, 12, 2, 10, 15, 33, iw);
addDateDoc("b", 2005, 12, 4, 22, 15, 00, iw);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java Tue Aug 10 22:03:54 2010
@@ -27,7 +27,7 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
public class BaseTestRangeFilter extends LuceneTestCase {
@@ -46,7 +46,7 @@ public class BaseTestRangeFilter extends
int maxR;
int minR;
boolean allowNegativeRandomInts;
- RAMDirectory index = new RAMDirectory();
+ MockRAMDirectory index = new MockRAMDirectory();
TestIndex(int minR, int maxR, boolean allowNegativeRandomInts) {
this.minR = minR;
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/QueryUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/QueryUtils.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/QueryUtils.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/QueryUtils.java Tue Aug 10 22:03:54 2010
@@ -14,7 +14,7 @@ import org.apache.lucene.index.IndexRead
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.MultiReader;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import static org.apache.lucene.util.LuceneTestCaseJ4.TEST_VERSION_CURRENT;
/**
@@ -197,9 +197,9 @@ public class QueryUtils {
return out;
}
- private static RAMDirectory makeEmptyIndex(final int numDeletedDocs)
+ private static MockRAMDirectory makeEmptyIndex(final int numDeletedDocs)
throws IOException {
- RAMDirectory d = new RAMDirectory();
+ MockRAMDirectory d = new MockRAMDirectory();
IndexWriter w = new IndexWriter(d, new IndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer()));
for (int i = 0; i < numDeletedDocs; i++) {
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestAutomatonQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestAutomatonQuery.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestAutomatonQuery.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestAutomatonQuery.java Tue Aug 10 22:03:54 2010
@@ -27,7 +27,7 @@ import org.apache.lucene.index.RandomInd
import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermsEnum;
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.automaton.Automaton;
import org.apache.lucene.util.automaton.BasicAutomata;
@@ -43,7 +43,7 @@ public class TestAutomatonQuery extends
public void setUp() throws Exception {
super.setUp();
Random random = newRandom();
- directory = new RAMDirectory();
+ directory = new MockRAMDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, directory);
Document doc = new Document();
Field titleField = new Field("title", "some title", Field.Store.NO,
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java Tue Aug 10 22:03:54 2010
@@ -26,7 +26,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;
import org.apache.lucene.util.automaton.Automaton;
import org.apache.lucene.util.automaton.RegExp;
@@ -46,7 +46,7 @@ public class TestAutomatonQueryUnicode e
public void setUp() throws Exception {
super.setUp();
Random random = newRandom();
- directory = new RAMDirectory();
+ directory = new MockRAMDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, directory);
Document doc = new Document();
Field titleField = new Field("title", "some title", Field.Store.NO,
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBoolean2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBoolean2.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBoolean2.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBoolean2.java Tue Aug 10 22:03:54 2010
@@ -29,7 +29,7 @@ import org.apache.lucene.index.Term;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.queryParser.ParseException;
import org.apache.lucene.queryParser.QueryParser;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
@@ -53,7 +53,7 @@ public class TestBoolean2 extends Lucene
protected void setUp() throws Exception {
super.setUp();
rnd = newRandom();
- RAMDirectory directory = new RAMDirectory();
+ MockRAMDirectory directory = new MockRAMDirectory();
RandomIndexWriter writer= new RandomIndexWriter(rnd, directory);
for (int i = 0; i < docFields.length; i++) {
Document doc = new Document();
@@ -70,7 +70,7 @@ public class TestBoolean2 extends Lucene
mulFactor = 1;
int docCount = 0;
do {
- final Directory copy = new RAMDirectory(dir2);
+ final Directory copy = new MockRAMDirectory(dir2);
RandomIndexWriter w = new RandomIndexWriter(rnd, dir2);
w.addIndexes(new Directory[] {copy});
docCount = w.maxDoc();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java Tue Aug 10 22:03:54 2010
@@ -24,7 +24,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;
@@ -55,7 +55,7 @@ public class TestBooleanMinShouldMatch e
"X 4 5 6"
};
- index = new RAMDirectory();
+ index = new MockRAMDirectory();
RandomIndexWriter w = new RandomIndexWriter(rnd, index);
for (int i = 0; i < data.length; i++) {
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanOr.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanOr.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanOr.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanOr.java Tue Aug 10 22:03:54 2010
@@ -31,7 +31,7 @@ import org.apache.lucene.search.IndexSea
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
public class TestBooleanOr extends LuceneTestCase {
@@ -137,7 +137,7 @@ public class TestBooleanOr extends Lucen
super.setUp();
//
- dir = new RAMDirectory();
+ dir = new MockRAMDirectory();
Random random = newRandom();
//
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanPrefixQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanPrefixQuery.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanPrefixQuery.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanPrefixQuery.java Tue Aug 10 22:03:54 2010
@@ -21,7 +21,7 @@ import org.apache.lucene.util.LuceneTest
import junit.framework.Test;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.IndexReader;
@@ -65,7 +65,7 @@ public class TestBooleanPrefixQuery exte
}
public void testMethod() throws Exception {
- RAMDirectory directory = new RAMDirectory();
+ MockRAMDirectory directory = new MockRAMDirectory();
String[] categories = new String[]{"food",
"foodanddrink",
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java Tue Aug 10 22:03:54 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 org.apache.lucene.util.LuceneTestCase;
@@ -39,7 +39,7 @@ public class TestBooleanScorer extends L
private static final String FIELD = "category";
public void testMethod() throws Exception {
- RAMDirectory directory = new RAMDirectory();
+ MockRAMDirectory directory = new MockRAMDirectory();
String[] values = new String[] { "1", "2", "3", "4" };
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java Tue Aug 10 22:03:54 2010
@@ -27,7 +27,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;
@@ -35,7 +35,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 MockAnalyzer()));
writer.close();
@@ -61,7 +61,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 MockAnalyzer()));
writer.close();
@@ -83,7 +83,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 MockAnalyzer()));
writer.close();
@@ -124,7 +124,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 MockAnalyzer()));
writer.close();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCustomSearcherSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCustomSearcherSort.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCustomSearcherSort.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCustomSearcherSort.java Tue Aug 10 22:03:54 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/trunk/lucene/src/test/org/apache/lucene/search/TestDateFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDateFilter.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDateFilter.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDateFilter.java Tue Aug 10 22:03:54 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;
import java.io.IOException;
@@ -44,7 +44,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();
@@ -110,7 +110,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/trunk/lucene/src/test/org/apache/lucene/search/TestDateSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDateSort.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDateSort.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDateSort.java Tue Aug 10 22:03:54 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);
// oldest doc:
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java Tue Aug 10 22:03:54 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 MockAnalyzer())
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDocBoost.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDocBoost.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDocBoost.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDocBoost.java Tue Aug 10 22:03:54 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/trunk/lucene/src/test/org/apache/lucene/search/TestDocIdSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDocIdSet.java?rev=984232&r1=984231&r2=984232&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDocIdSet.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDocIdSet.java Tue Aug 10 22:03:54 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));