Index: solr/src/test/org/apache/solr/search/TestSort.java =================================================================== --- solr/src/test/org/apache/solr/search/TestSort.java (revision 988190) +++ solr/src/test/org/apache/solr/search/TestSort.java (working copy) @@ -23,7 +23,7 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.search.*; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; import org.apache.lucene.util.OpenBitSet; import org.apache.solr.util.AbstractSolrTestCase; @@ -49,7 +49,7 @@ public void testSort() throws Exception { Random random = newRandom(); - MockRAMDirectory dir = newDirectory(random); + Directory dir = newDirectory(random); Document smallDoc = new Document(); // Field id = new Field("id","0", Field.Store.NO, Field.Index.NOT_ANALYZED_NO_NORMS); Field f = new Field("f","0", Field.Store.NO, Field.Index.NOT_ANALYZED_NO_NORMS); @@ -181,8 +181,8 @@ } } searcher.close(); - dir.close(); } + dir.close(); } Index: .hgignore =================================================================== --- .hgignore (revision 0) +++ .hgignore (revision 0) @@ -0,0 +1,2 @@ +syntax: glob +*/build/* Index: modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java =================================================================== --- modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java (revision 988190) +++ modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java (working copy) @@ -32,10 +32,9 @@ import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.TermPositionVector; import org.apache.lucene.index.TermVectorOffsetInfo; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; import org.apache.lucene.util.AttributeSource; import org.apache.lucene.util.English; import java.io.IOException; @@ -94,7 +93,7 @@ // with BaseTokenStreamTestCase now... public void testEndOffsetPositionWithTeeSinkTokenFilter() throws Exception { Random random = newRandom(); - MockRAMDirectory dir = newDirectory(random); + Directory dir = newDirectory(random); Analyzer analyzer = new WhitespaceAnalyzer(TEST_VERSION_CURRENT); IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, analyzer)); Document doc = new Document(); Index: lucene/common-build.xml =================================================================== --- lucene/common-build.xml (revision 988190) +++ lucene/common-build.xml (working copy) @@ -60,6 +60,7 @@ + @@ -444,6 +445,8 @@ + + Index: lucene/src/test/org/apache/lucene/TestMergeSchedulerExternal.java =================================================================== --- lucene/src/test/org/apache/lucene/TestMergeSchedulerExternal.java (revision 988190) +++ lucene/src/test/org/apache/lucene/TestMergeSchedulerExternal.java (working copy) @@ -20,7 +20,7 @@ import java.util.Random; import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.MockDirectoryWrapper; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.LogMergePolicy; @@ -71,9 +71,9 @@ } } - private static class FailOnlyOnMerge extends MockRAMDirectory.Failure { + private static class FailOnlyOnMerge extends MockDirectoryWrapper.Failure { @Override - public void eval(MockRAMDirectory dir) throws IOException { + public void eval(MockDirectoryWrapper dir) throws IOException { StackTraceElement[] trace = new Exception().getStackTrace(); for (int i = 0; i < trace.length; i++) { if ("doMerge".equals(trace[i].getMethodName())) @@ -84,7 +84,7 @@ public void testSubclassConcurrentMergeScheduler() throws IOException { Random random = newRandom(); - MockRAMDirectory dir = newDirectory(random); + MockDirectoryWrapper dir = newDirectory(random); dir.failOn(new FailOnlyOnMerge()); Document doc = new Document(); Index: lucene/src/test/org/apache/lucene/queryParser/TestMultiFieldQueryParser.java =================================================================== --- lucene/src/test/org/apache/lucene/queryParser/TestMultiFieldQueryParser.java (revision 988190) +++ lucene/src/test/org/apache/lucene/queryParser/TestMultiFieldQueryParser.java (working copy) @@ -29,14 +29,12 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.IndexSearcher; 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.MockRAMDirectory; import org.apache.lucene.util.LuceneTestCase; /** Index: lucene/src/test/org/apache/lucene/queryParser/TestQueryParser.java =================================================================== --- lucene/src/test/org/apache/lucene/queryParser/TestQueryParser.java (revision 988190) +++ lucene/src/test/org/apache/lucene/queryParser/TestQueryParser.java (working copy) @@ -43,7 +43,6 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.Term; import org.apache.lucene.index.IndexReader; import org.apache.lucene.search.BooleanQuery; @@ -59,9 +58,7 @@ import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.WildcardQuery; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.util.LocalizedTestCase; import org.apache.lucene.util.automaton.BasicAutomata; import org.apache.lucene.util.automaton.CharacterRunAutomaton; @@ -571,7 +568,7 @@ public void testFarsiRangeCollating() throws Exception { Random random = newRandom(); - MockRAMDirectory ramDir = newDirectory(random); + Directory ramDir = newDirectory(random); IndexWriter iw = new IndexWriter(ramDir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer(MockTokenizer.WHITESPACE, false))); Document doc = new Document(); doc.add(new Field("content","\u0633\u0627\u0628", @@ -981,7 +978,7 @@ public void testLocalDateFormat() throws IOException, ParseException { Random random = newRandom(); - MockRAMDirectory ramDir = newDirectory(random); + Directory ramDir = newDirectory(random); IndexWriter iw = new IndexWriter(ramDir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer(MockTokenizer.WHITESPACE, false))); addDateDoc("a", 2005, 12, 2, 10, 15, 33, iw); addDateDoc("b", 2005, 12, 4, 22, 15, 00, iw); Index: lucene/src/test/org/apache/lucene/TestDemo.java =================================================================== --- lucene/src/test/org/apache/lucene/TestDemo.java (revision 988190) +++ lucene/src/test/org/apache/lucene/TestDemo.java (working copy) @@ -33,7 +33,7 @@ import org.apache.lucene.search.TermQuery; 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.util.LuceneTestCase; /** @@ -49,7 +49,7 @@ Analyzer analyzer = new MockAnalyzer(); // Store the index in memory: - Directory directory = new MockRAMDirectory(); + Directory directory = newDirectory(newRandom()); // To store an index on disk, use this instead: //Directory directory = FSDirectory.open("/tmp/testindex"); IndexWriter iwriter = new IndexWriter(directory, new IndexWriterConfig( Index: lucene/src/test/org/apache/lucene/search/TestFuzzyQuery2.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestFuzzyQuery2.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestFuzzyQuery2.java (working copy) @@ -29,7 +29,7 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; import org.apache.lucene.util.LuceneTestCase; /** @@ -86,7 +86,7 @@ int bits = Integer.parseInt(reader.readLine()); int terms = (int) Math.pow(2, bits); - MockRAMDirectory dir = newDirectory(random); + Directory dir = newDirectory(random); RandomIndexWriter writer = new RandomIndexWriter(random, dir, new MockAnalyzer(MockTokenizer.KEYWORD, false)); Document doc = new Document(); Index: lucene/src/test/org/apache/lucene/search/TestNot.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestNot.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestNot.java (working copy) @@ -24,7 +24,7 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.queryParser.QueryParser; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -41,7 +41,7 @@ public void testNot() throws Exception { Random random = newRandom(); - MockRAMDirectory store = newDirectory(random); + Directory store = newDirectory(random); RandomIndexWriter writer = new RandomIndexWriter(random, store); Document d1 = new Document(); Index: lucene/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java (working copy) @@ -29,7 +29,6 @@ import org.apache.lucene.queryParser.QueryParser; import org.apache.lucene.search.TimeLimitingCollector.TimeExceededException; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.ThreadInterruptedException; Index: lucene/src/test/org/apache/lucene/search/TestPrefixFilter.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestPrefixFilter.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestPrefixFilter.java (working copy) @@ -20,7 +20,7 @@ import java.util.Random; import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; @@ -34,7 +34,7 @@ public class TestPrefixFilter extends LuceneTestCase { public void testPrefixFilter() throws Exception { Random random = newRandom(); - MockRAMDirectory directory = newDirectory(random); + Directory directory = newDirectory(random); String[] categories = new String[] {"/Computers/Linux", "/Computers/Mac/One", Index: lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java (working copy) @@ -27,7 +27,6 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.SlowMultiReaderWrapper; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.OpenBitSet; import org.apache.lucene.util.OpenBitSetDISI; Index: lucene/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java (working copy) @@ -26,7 +26,6 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; -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; Index: lucene/src/test/org/apache/lucene/search/TestBooleanQuery.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestBooleanQuery.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestBooleanQuery.java (working copy) @@ -23,7 +23,6 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.store.Directory; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.index.Term; Index: lucene/src/test/org/apache/lucene/search/TestPhraseQuery.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestPhraseQuery.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestPhraseQuery.java (working copy) @@ -48,7 +48,7 @@ private IndexSearcher searcher; private IndexReader reader; private PhraseQuery query; - private MockRAMDirectory directory; + private Directory directory; private Random random; @Override @@ -213,7 +213,7 @@ } public void testPhraseQueryWithStopAnalyzer() throws Exception { - MockRAMDirectory directory = newDirectory(random); + Directory directory = newDirectory(random); Analyzer stopAnalyzer = new MockAnalyzer(MockTokenizer.SIMPLE, true, MockTokenFilter.ENGLISH_STOPSET, false); RandomIndexWriter writer = new RandomIndexWriter(random, directory, newIndexWriterConfig(random, Version.LUCENE_24, stopAnalyzer)); @@ -249,7 +249,7 @@ } public void testPhraseQueryInConjunctionScorer() throws Exception { - MockRAMDirectory directory = newDirectory(random); + Directory directory = newDirectory(random); RandomIndexWriter writer = new RandomIndexWriter(random, directory); Document doc = new Document(); Index: lucene/src/test/org/apache/lucene/search/TestPositionIncrement.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestPositionIncrement.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestPositionIncrement.java (working copy) @@ -40,7 +40,6 @@ import org.apache.lucene.index.SlowMultiReaderWrapper; import org.apache.lucene.index.Term; import org.apache.lucene.queryParser.QueryParser; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.store.Directory; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.index.Payload; Index: lucene/src/test/org/apache/lucene/search/TestTermRangeQuery.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestTermRangeQuery.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestTermRangeQuery.java (working copy) @@ -21,7 +21,7 @@ import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig.OpenMode; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.MockTokenizer; @@ -43,7 +43,7 @@ public class TestTermRangeQuery extends LuceneTestCase { private int docCount = 0; - private MockRAMDirectory dir; + private Directory dir; private Random random; @Override Index: lucene/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java (working copy) @@ -24,7 +24,6 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; import java.text.DecimalFormat; import java.util.Random; Index: lucene/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java (working copy) @@ -29,7 +29,7 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.PhraseQuery; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; public class TestSloppyPhraseQuery extends LuceneTestCase { @@ -125,7 +125,7 @@ private float checkPhraseQuery(Document doc, PhraseQuery query, int slop, int expectedNumResults) throws Exception { query.setSlop(slop); - MockRAMDirectory ramDir = newDirectory(random); + Directory ramDir = newDirectory(random); RandomIndexWriter writer = new RandomIndexWriter(random, ramDir, new MockAnalyzer(MockTokenizer.WHITESPACE, false)); writer.addDocument(doc); Index: lucene/src/test/org/apache/lucene/search/TestBooleanOr.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestBooleanOr.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestBooleanOr.java (working copy) @@ -31,7 +31,6 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; public class TestBooleanOr extends LuceneTestCase { Index: lucene/src/test/org/apache/lucene/search/TestDateSort.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestDateSort.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestDateSort.java (working copy) @@ -34,7 +34,6 @@ import org.apache.lucene.search.Sort; import org.apache.lucene.search.SortField; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; /** * Test date sorting, i.e. auto-sorting of fields with type "long". Index: lucene/src/test/org/apache/lucene/search/TestSort.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestSort.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestSort.java (working copy) @@ -44,7 +44,6 @@ 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.MockRAMDirectory; import org.apache.lucene.store.Directory; import org.apache.lucene.util.DocIdBitSet; import org.apache.lucene.util.LuceneTestCase; @@ -110,7 +109,7 @@ // create an index of all the documents, or just the x, or just the y documents private IndexSearcher getIndex (boolean even, boolean odd) throws IOException { - MockRAMDirectory indexStore = newDirectory(random); + Directory indexStore = newDirectory(random); dirs.add(indexStore); RandomIndexWriter writer = new RandomIndexWriter(random, indexStore); @@ -146,7 +145,7 @@ } private IndexSearcher getFullStrings() throws CorruptIndexException, LockObtainFailedException, IOException { - MockRAMDirectory indexStore = newDirectory (random); + Directory indexStore = newDirectory (random); dirs.add(indexStore); IndexWriter writer = new IndexWriter(indexStore, new IndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer()).setMaxBufferedDocs(4)); @@ -1057,7 +1056,7 @@ } public void testLUCENE2142() throws IOException { - MockRAMDirectory indexStore = newDirectory (random); + Directory indexStore = newDirectory (random); IndexWriter writer = new IndexWriter(indexStore, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer())); for (int i=0; i<5; i++) { Index: lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java (working copy) @@ -25,7 +25,6 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; import java.io.IOException; import java.text.Collator; import java.util.Locale; @@ -609,7 +608,7 @@ public void testFarsi() throws Exception { /* build an index */ - MockRAMDirectory farsiIndex = newDirectory(rand); + Directory farsiIndex = newDirectory(rand); RandomIndexWriter writer = new RandomIndexWriter(rand, farsiIndex, new MockAnalyzer(MockTokenizer.SIMPLE, true)); Document doc = new Document(); doc.add(new Field("content", "\u0633\u0627\u0628", Field.Store.YES, @@ -649,7 +648,7 @@ public void testDanish() throws Exception { /* build an index */ - MockRAMDirectory danishIndex = newDirectory(rand); + Directory danishIndex = newDirectory(rand); RandomIndexWriter writer = new RandomIndexWriter(rand, danishIndex, new MockAnalyzer(MockTokenizer.SIMPLE, true)); // Danish collation orders the words below in the given order Index: lucene/src/test/org/apache/lucene/search/TestWildcardRandom.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestWildcardRandom.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestWildcardRandom.java (working copy) @@ -29,7 +29,6 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.util.LuceneTestCase; /** Index: lucene/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java =================================================================== --- lucene/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java (working copy) @@ -39,7 +39,7 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.index.SlowMultiReaderWrapper; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -59,7 +59,7 @@ private byte[] payloadField = new byte[]{1}; private byte[] payloadMultiField1 = new byte[]{2}; private byte[] payloadMultiField2 = new byte[]{4}; - protected MockRAMDirectory directory; + protected Directory directory; public TestPayloadTermQuery(String s) { super(s); Index: lucene/src/test/org/apache/lucene/search/payloads/PayloadHelper.java =================================================================== --- lucene/src/test/org/apache/lucene/search/payloads/PayloadHelper.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/payloads/PayloadHelper.java (working copy) @@ -22,7 +22,6 @@ import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.Payload; import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.util.English; @@ -30,6 +29,10 @@ import org.apache.lucene.index.SlowMultiReaderWrapper; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Similarity; +import org.apache.lucene.store.Directory; +import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.store.RAMDirectory; + import static org.apache.lucene.util.LuceneTestCaseJ4.TEST_VERSION_CURRENT; import java.io.Reader; @@ -109,7 +112,7 @@ */ // TODO: randomize public IndexSearcher setUp(Similarity similarity, int numDocs) throws IOException { - MockRAMDirectory directory = new MockRAMDirectory(); + Directory directory = new MockDirectoryWrapper(new RAMDirectory()); PayloadAnalyzer analyzer = new PayloadAnalyzer(); // TODO randomize this Index: lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java (working copy) @@ -26,7 +26,7 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; import org.apache.lucene.util.LuceneTestCase; @@ -41,7 +41,7 @@ public void testMethod() throws Exception { Random random = newRandom(); - MockRAMDirectory directory = newDirectory(random); + Directory directory = newDirectory(random); String[] values = new String[] { "1", "2", "3", "4" }; Index: lucene/src/test/org/apache/lucene/search/TestDocIdSet.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestDocIdSet.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestDocIdSet.java (working copy) @@ -32,7 +32,6 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.util.LuceneTestCase; public class TestDocIdSet extends LuceneTestCase { Index: lucene/src/test/org/apache/lucene/search/spans/TestBasics.java =================================================================== --- lucene/src/test/org/apache/lucene/search/spans/TestBasics.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/spans/TestBasics.java (working copy) @@ -37,7 +37,6 @@ import org.apache.lucene.search.QueryUtils; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.util.English; import org.apache.lucene.util.LuceneTestCase; Index: lucene/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java =================================================================== --- lucene/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java (working copy) @@ -32,7 +32,6 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.*; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; /******************************************************************************* * Tests the span query bug in Lucene. It demonstrates that SpanTermQuerys don't Index: lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java =================================================================== --- lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java (working copy) @@ -48,7 +48,6 @@ import org.apache.lucene.search.payloads.PayloadSpanUtil; import org.apache.lucene.store.Directory; import org.apache.lucene.store.LockObtainFailedException; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.util.LuceneTestCase; public class TestPayloadSpans extends LuceneTestCase { @@ -117,7 +116,7 @@ - MockRAMDirectory directory = newDirectory(rand); + Directory directory = newDirectory(rand); RandomIndexWriter writer = new RandomIndexWriter(rand, directory, newIndexWriterConfig(rand, TEST_VERSION_CURRENT, new PayloadAnalyzer()).setSimilarity(similarity)); @@ -261,7 +260,7 @@ public void testShrinkToAfterShortestMatch() throws CorruptIndexException, LockObtainFailedException, IOException { - MockRAMDirectory directory = newDirectory(rand); + Directory directory = newDirectory(rand); RandomIndexWriter writer = new RandomIndexWriter(rand, directory, newIndexWriterConfig(rand, TEST_VERSION_CURRENT, new TestPayloadAnalyzer())); @@ -299,7 +298,7 @@ public void testShrinkToAfterShortestMatch2() throws CorruptIndexException, LockObtainFailedException, IOException { - MockRAMDirectory directory = newDirectory(rand); + Directory directory = newDirectory(rand); RandomIndexWriter writer = new RandomIndexWriter(rand, directory, newIndexWriterConfig(rand, TEST_VERSION_CURRENT, new TestPayloadAnalyzer())); @@ -335,7 +334,7 @@ public void testShrinkToAfterShortestMatch3() throws CorruptIndexException, LockObtainFailedException, IOException { - MockRAMDirectory directory = newDirectory(rand); + Directory directory = newDirectory(rand); RandomIndexWriter writer = new RandomIndexWriter(rand, directory, newIndexWriterConfig(rand, TEST_VERSION_CURRENT, new TestPayloadAnalyzer())); @@ -376,7 +375,7 @@ } public void testPayloadSpanUtil() throws Exception { - MockRAMDirectory directory = newDirectory(rand); + Directory directory = newDirectory(rand); RandomIndexWriter writer = new RandomIndexWriter(rand, directory, newIndexWriterConfig(rand, TEST_VERSION_CURRENT, new PayloadAnalyzer()).setSimilarity(similarity)); Index: lucene/src/test/org/apache/lucene/search/TestMultiSearcher.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestMultiSearcher.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestMultiSearcher.java (working copy) @@ -29,7 +29,6 @@ import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.queryParser.QueryParser; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; import java.io.IOException; import java.util.Collections; import java.util.HashSet; @@ -243,7 +242,7 @@ } public void testFieldSelector() throws Exception { - MockRAMDirectory ramDirectory1, ramDirectory2; + Directory ramDirectory1, ramDirectory2; IndexSearcher indexSearcher1, indexSearcher2; ramDirectory1 = newDirectory(random); @@ -304,7 +303,7 @@ private void testNormalization(int nDocs, String message) throws IOException { Query query=new TermQuery(new Term("contents", "doc0")); - MockRAMDirectory ramDirectory1; + Directory ramDirectory1; IndexSearcher indexSearcher1; ScoreDoc[] hits; @@ -332,7 +331,7 @@ - MockRAMDirectory ramDirectory2; + Directory ramDirectory2; IndexSearcher indexSearcher2; ramDirectory1=newDirectory(random); @@ -378,7 +377,7 @@ * @throws IOException */ public void testCustomSimilarity () throws IOException { - MockRAMDirectory dir = newDirectory(random); + Directory dir = newDirectory(random); initIndex(random, 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}); @@ -421,8 +420,8 @@ } public void testDocFreq() throws IOException{ - MockRAMDirectory dir1 = newDirectory(random); - MockRAMDirectory dir2 = newDirectory(random); + Directory dir1 = newDirectory(random); + Directory dir2 = newDirectory(random); initIndex(random, dir1, 10, true, "x"); // documents with two tokens "doc0" and "x", "doc1" and x, etc... initIndex(random, dir2, 5, true, "x"); // documents with two tokens "doc0" and "x", "doc1" and x, etc... @@ -439,8 +438,8 @@ } public void testCreateDocFrequencyMap() throws IOException{ - MockRAMDirectory dir1 = newDirectory(random); - MockRAMDirectory dir2 = newDirectory(random); + Directory dir1 = newDirectory(random); + Directory dir2 = newDirectory(random); Term template = new Term("contents") ; String[] contents = {"a", "b", "c"}; HashSet termsSet = new HashSet(); Index: lucene/src/test/org/apache/lucene/search/TestSimpleExplanations.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestSimpleExplanations.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestSimpleExplanations.java (working copy) @@ -17,20 +17,16 @@ * limitations under the License. */ -import java.util.Random; - import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.Term; import org.apache.lucene.queryParser.QueryParser; import org.apache.lucene.search.spans.SpanNearQuery; 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.MockRAMDirectory; /** Index: lucene/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java (working copy) @@ -27,7 +27,7 @@ import org.apache.lucene.document.NumericField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; import org.apache.lucene.util.LuceneTestCase; public class TestMultiValuedNumericRangeQuery extends LuceneTestCase { @@ -40,7 +40,7 @@ public void testMultiValuedNRQ() throws Exception { final Random rnd = newRandom(); - MockRAMDirectory directory = newDirectory(rnd); + Directory directory = newDirectory(rnd); RandomIndexWriter writer = new RandomIndexWriter(rnd, directory); DecimalFormat format = new DecimalFormat("00000000000", new DecimalFormatSymbols(Locale.US)); Index: lucene/src/test/org/apache/lucene/search/TestTermScorer.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestTermScorer.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestTermScorer.java (working copy) @@ -29,10 +29,10 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.index.SlowMultiReaderWrapper; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; public class TestTermScorer extends LuceneTestCase { - protected MockRAMDirectory directory; + protected Directory directory; private static final String FIELD = "field"; protected String[] values = new String[] {"all", "dogs dogs", "like", Index: lucene/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java (working copy) @@ -26,7 +26,7 @@ import org.apache.lucene.index.Term; import org.apache.lucene.index.MultiFields; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; import java.io.IOException; import java.util.LinkedList; @@ -45,7 +45,7 @@ */ public void testPhrasePrefix() throws IOException { Random random = newRandom(); - MockRAMDirectory indexStore = newDirectory(random); + Directory indexStore = newDirectory(random); RandomIndexWriter writer = new RandomIndexWriter(random, indexStore); Document doc1 = new Document(); Document doc2 = new Document(); Index: lucene/src/test/org/apache/lucene/search/TestSetNorm.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestSetNorm.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestSetNorm.java (working copy) @@ -25,9 +25,8 @@ import org.apache.lucene.document.*; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.Term; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; /** Document boost unit test. * @@ -41,7 +40,7 @@ public void testSetNorm() throws Exception { Random random = newRandom(); - MockRAMDirectory store = newDirectory(random); + Directory store = newDirectory(random); IndexWriter writer = new IndexWriter(store, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer())); // add the same document four times Index: lucene/src/test/org/apache/lucene/search/TestWildcard.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestWildcard.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestWildcard.java (working copy) @@ -17,6 +17,7 @@ * limitations under the License. */ +import org.apache.lucene.store.Directory; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; @@ -26,7 +27,6 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.queryParser.QueryParser; -import org.apache.lucene.store.MockRAMDirectory; import java.io.IOException; import java.util.Random; @@ -70,7 +70,7 @@ * a ConstantScoreQuery if the WildcardQuery had a ConstantScore rewriteMethod. */ public void testTermWithoutWildcard() throws IOException { - MockRAMDirectory indexStore = getIndexStore("field", new String[]{"nowildcard", "nowildcardx"}); + Directory indexStore = getIndexStore("field", new String[]{"nowildcard", "nowildcardx"}); IndexSearcher searcher = new IndexSearcher(indexStore, true); MultiTermQuery wq = new WildcardQuery(new Term("field", "nowildcard")); @@ -107,7 +107,7 @@ * Tests if a WildcardQuery with an empty term is rewritten to an empty BooleanQuery */ public void testEmptyTerm() throws IOException { - MockRAMDirectory indexStore = getIndexStore("field", new String[]{"nowildcard", "nowildcardx"}); + Directory indexStore = getIndexStore("field", new String[]{"nowildcard", "nowildcardx"}); IndexSearcher searcher = new IndexSearcher(indexStore, true); MultiTermQuery wq = new WildcardQuery(new Term("field", "")); @@ -126,7 +126,7 @@ * preserved. */ public void testPrefixTerm() throws IOException { - MockRAMDirectory indexStore = getIndexStore("field", new String[]{"prefix", "prefixx"}); + Directory indexStore = getIndexStore("field", new String[]{"prefix", "prefixx"}); IndexSearcher searcher = new IndexSearcher(indexStore, true); MultiTermQuery wq = new WildcardQuery(new Term("field", "prefix*")); @@ -147,7 +147,7 @@ */ public void testAsterisk() throws IOException { - MockRAMDirectory indexStore = getIndexStore("body", new String[] + Directory indexStore = getIndexStore("body", new String[] {"metal", "metals"}); IndexSearcher searcher = new IndexSearcher(indexStore, true); Query query1 = new TermQuery(new Term("body", "metal")); @@ -188,7 +188,7 @@ */ public void testQuestionmark() throws IOException { - MockRAMDirectory indexStore = getIndexStore("body", new String[] + Directory indexStore = getIndexStore("body", new String[] {"metal", "metals", "mXtals", "mXtXls"}); IndexSearcher searcher = new IndexSearcher(indexStore, true); Query query1 = new WildcardQuery(new Term("body", "m?tal")); @@ -208,9 +208,9 @@ indexStore.close(); } - private MockRAMDirectory getIndexStore(String field, String[] contents) + private Directory getIndexStore(String field, String[] contents) throws IOException { - MockRAMDirectory indexStore = newDirectory(random); + Directory indexStore = newDirectory(random); RandomIndexWriter writer = new RandomIndexWriter(random, indexStore); for (int i = 0; i < contents.length; ++i) { Document doc = new Document(); @@ -266,7 +266,7 @@ }; // prepare the index - MockRAMDirectory dir = newDirectory(random); + Directory dir = newDirectory(random); RandomIndexWriter iw = new RandomIndexWriter(random, dir); for (int i = 0; i < docs.length; i++) { Document doc = new Document(); Index: lucene/src/test/org/apache/lucene/search/TestAutomatonQuery.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestAutomatonQuery.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestAutomatonQuery.java (working copy) @@ -27,7 +27,6 @@ import org.apache.lucene.index.Term; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.store.Directory; -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; Index: lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java =================================================================== --- lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java (working copy) @@ -27,7 +27,7 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.IndexWriterConfig.OpenMode; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; public class BaseTestRangeFilter extends LuceneTestCase { @@ -46,7 +46,7 @@ int maxR; int minR; boolean allowNegativeRandomInts; - MockRAMDirectory index; + Directory index; TestIndex(int minR, int maxR, boolean allowNegativeRandomInts) { this.minR = minR; Index: lucene/src/test/org/apache/lucene/search/TestBoolean2.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestBoolean2.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestBoolean2.java (working copy) @@ -23,17 +23,15 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.RandomIndexWriter; 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.MockRAMDirectory; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.store.Directory; +import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.store.RAMDirectory; import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util._TestUtil; /** Test BooleanQuery2 against BooleanQuery by overriding the standard query parser. * This also tests the scoring order of BooleanQuery. @@ -65,13 +63,13 @@ searcher = new IndexSearcher(directory, true); // Make big index - dir2 = new MockRAMDirectory(directory); + dir2 = new MockDirectoryWrapper(new RAMDirectory(directory)); // First multiply small test index: mulFactor = 1; int docCount = 0; do { - final Directory copy = new MockRAMDirectory(dir2); + final Directory copy = new MockDirectoryWrapper(new RAMDirectory(dir2)); RandomIndexWriter w = new RandomIndexWriter(rnd, dir2); w.addIndexes(new Directory[] {copy}); docCount = w.maxDoc(); Index: lucene/src/test/org/apache/lucene/search/TestExplanations.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestExplanations.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestExplanations.java (working copy) @@ -34,7 +34,6 @@ 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.MockRAMDirectory; import org.apache.lucene.util.LuceneTestCase; /** Index: lucene/src/test/org/apache/lucene/search/TestFieldCache.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestFieldCache.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestFieldCache.java (working copy) @@ -21,10 +21,8 @@ import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.TermsEnum; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.store.Directory; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util._TestUtil; Index: lucene/src/test/org/apache/lucene/search/TestScorerPerf.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestScorerPerf.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestScorerPerf.java (working copy) @@ -9,10 +9,8 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.Term; import org.apache.lucene.index.IndexWriterConfig.OpenMode; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.store.Directory; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; Index: lucene/src/test/org/apache/lucene/search/TestRegexpRandom2.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestRegexpRandom2.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestRegexpRandom2.java (working copy) @@ -32,7 +32,6 @@ import org.apache.lucene.index.TermsEnum; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.UnicodeUtil; Index: lucene/src/test/org/apache/lucene/search/TestFuzzyQuery.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestFuzzyQuery.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestFuzzyQuery.java (working copy) @@ -30,7 +30,6 @@ import org.apache.lucene.index.Term; import org.apache.lucene.queryParser.QueryParser; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.util.LuceneTestCase; /** @@ -41,7 +40,7 @@ public void testFuzziness() throws Exception { Random random = newRandom(); - MockRAMDirectory directory = newDirectory(random); + Directory directory = newDirectory(random); RandomIndexWriter writer = new RandomIndexWriter(random, directory); addDoc("aaaaa", writer); addDoc("aaaab", writer); @@ -195,7 +194,7 @@ public void testFuzzinessLong() throws Exception { Random random = newRandom(); - MockRAMDirectory directory = newDirectory(random); + Directory directory = newDirectory(random); RandomIndexWriter writer = new RandomIndexWriter(random, directory); addDoc("aaaaaaa", writer); addDoc("segment", writer); @@ -286,7 +285,7 @@ public void testTokenLengthOpt() throws IOException { Random random = newRandom(); - MockRAMDirectory directory = newDirectory(random); + Directory directory = newDirectory(random); RandomIndexWriter writer = new RandomIndexWriter(random, directory); addDoc("12345678911", writer); addDoc("segment", writer); @@ -324,7 +323,7 @@ /** Test the TopTermsBoostOnlyBooleanQueryRewrite rewrite method. */ public void testBoostOnlyRewrite() throws Exception { Random random = newRandom(); - MockRAMDirectory directory = newDirectory(random); + Directory directory = newDirectory(random); RandomIndexWriter writer = new RandomIndexWriter(random, directory); addDoc("Lucene", writer); addDoc("Lucene", writer); Index: lucene/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java (working copy) @@ -24,14 +24,14 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.TermFreqVector; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; import org.apache.lucene.util.English; import java.io.IOException; import java.util.Random; public class TestMultiThreadTermVectors extends LuceneTestCase { - private MockRAMDirectory directory; + private Directory directory; public int numDocs = 100; public int numThreads = 3; Index: lucene/src/test/org/apache/lucene/search/TestDateFilter.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestDateFilter.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestDateFilter.java (working copy) @@ -17,6 +17,7 @@ * limitations under the License. */ +import org.apache.lucene.store.Directory; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.document.DateTools; import org.apache.lucene.document.Document; @@ -24,7 +25,6 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; -import org.apache.lucene.store.MockRAMDirectory; import java.io.IOException; import java.util.Random; @@ -46,7 +46,7 @@ public void testBefore() throws IOException { // create an index Random random = newRandom(); - MockRAMDirectory indexStore = newDirectory(random); + Directory indexStore = newDirectory(random); RandomIndexWriter writer = new RandomIndexWriter(random, indexStore); long now = System.currentTimeMillis(); @@ -113,7 +113,7 @@ public void testAfter() throws IOException { // create an index Random random = newRandom(); - MockRAMDirectory indexStore = newDirectory(random); + Directory indexStore = newDirectory(random); RandomIndexWriter writer = new RandomIndexWriter(random, indexStore); long now = System.currentTimeMillis(); Index: lucene/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java (working copy) @@ -24,11 +24,10 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.Term; import org.apache.lucene.index.IndexReader; import org.apache.lucene.queryParser.QueryParser; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; import org.apache.lucene.util.LuceneTestCase; @@ -41,7 +40,7 @@ public void testQuery() throws Exception { Random random = newRandom(); - MockRAMDirectory dir = newDirectory(random); + Directory dir = newDirectory(random); IndexWriter iw = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, analyzer).setMaxBufferedDocs(2)); addDoc("one", iw, 1f); Index: lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java (working copy) @@ -31,7 +31,6 @@ import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.store.Directory; import org.apache.lucene.store.LockObtainFailedException; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.util.OpenBitSet; @@ -49,7 +48,7 @@ public void testFilteredSearch() throws CorruptIndexException, LockObtainFailedException, IOException { boolean enforceSingleSegment = true; Random random = newRandom(); - MockRAMDirectory directory = newDirectory(random); + Directory directory = newDirectory(random); int[] filterBits = {1, 36}; SimpleDocIdSetFilter filter = new SimpleDocIdSetFilter(filterBits); IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer())); Index: lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java (working copy) @@ -26,7 +26,6 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; import java.text.DecimalFormat; import java.util.Random; Index: lucene/src/test/org/apache/lucene/search/TestSimilarity.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestSimilarity.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestSimilarity.java (working copy) @@ -23,11 +23,9 @@ import java.util.Random; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; -import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -66,7 +64,7 @@ public void testSimilarity() throws Exception { Random random = newRandom(); - MockRAMDirectory store = newDirectory(random); + Directory store = newDirectory(random); RandomIndexWriter writer = new RandomIndexWriter(random, store, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()) .setSimilarity(new SimpleSimilarity())); Index: lucene/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java (working copy) @@ -26,7 +26,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; /** * A basic 'positive' Unit test class for the FieldCacheRangeFilter class. @@ -515,7 +515,7 @@ // test using a sparse index (with deleted docs). public void testSparseIndex() throws IOException { - MockRAMDirectory dir = newDirectory(rand); + Directory dir = newDirectory(rand); IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(rand, TEST_VERSION_CURRENT, new MockAnalyzer())); for (int d = -20; d <= 20; d++) { Index: lucene/src/test/org/apache/lucene/search/TestRegexpRandom.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestRegexpRandom.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestRegexpRandom.java (working copy) @@ -29,7 +29,6 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.util.LuceneTestCase; /** Index: lucene/src/test/org/apache/lucene/search/TestPrefixRandom.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestPrefixRandom.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestPrefixRandom.java (working copy) @@ -29,7 +29,6 @@ import org.apache.lucene.index.TermsEnum; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util._TestUtil; Index: lucene/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java (working copy) @@ -25,7 +25,7 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; /** * https://issues.apache.org/jira/browse/LUCENE-1974 @@ -40,7 +40,7 @@ public class TestPrefixInBooleanQuery extends LuceneTestCase { private static final String FIELD = "name"; - private MockRAMDirectory directory; + private Directory directory; private IndexReader reader; private IndexSearcher searcher; Index: lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java (working copy) @@ -28,7 +28,7 @@ import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.TermsEnum; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.LuceneTestCaseJ4; import org.apache.lucene.util.NumericUtils; @@ -46,7 +46,7 @@ // number of docs to generate for testing private static final int noDocs = 10000 * RANDOM_MULTIPLIER; - private static MockRAMDirectory directory = null; + private static Directory directory = null; private static IndexReader reader = null; private static IndexSearcher searcher = null; private static Random random = null; @@ -281,7 +281,7 @@ @Test public void testInfiniteValues() throws Exception { - MockRAMDirectory dir = newDirectory(random); + Directory dir = newDirectory(random); IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer())); Document doc = new Document(); doc.add(new NumericField("float").setFloatValue(Float.NEGATIVE_INFINITY)); Index: lucene/src/test/org/apache/lucene/search/TestDocBoost.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestDocBoost.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestDocBoost.java (working copy) @@ -25,7 +25,7 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; /** Document boost unit test. * @@ -39,7 +39,7 @@ public void testDocBoost() throws Exception { Random random = newRandom(); - MockRAMDirectory store = newDirectory(random); + Directory store = newDirectory(random); RandomIndexWriter writer = new RandomIndexWriter(random, store); Fieldable f1 = new Field("field", "word", Field.Store.YES, Field.Index.ANALYZED); Index: lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java (working copy) @@ -27,7 +27,7 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.RandomIndexWriter; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.LuceneTestCaseJ4; import org.apache.lucene.util.NumericUtils; @@ -45,7 +45,7 @@ // number of docs to generate for testing private static final int noDocs = 10000 * RANDOM_MULTIPLIER; - private static MockRAMDirectory directory = null; + private static Directory directory = null; private static IndexReader reader = null; private static IndexSearcher searcher = null; private static Random random = null; @@ -299,7 +299,7 @@ @Test public void testInfiniteValues() throws Exception { - MockRAMDirectory dir = newDirectory(random); + Directory dir = newDirectory(random); IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer())); Document doc = new Document(); Index: lucene/src/test/org/apache/lucene/search/TestMultiSearcherRanking.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestMultiSearcherRanking.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestMultiSearcherRanking.java (working copy) @@ -22,11 +22,9 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.queryParser.QueryParser; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; import java.io.IOException; import java.util.Random; Index: lucene/src/test/org/apache/lucene/search/TestPrefixQuery.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestPrefixQuery.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestPrefixQuery.java (working copy) @@ -19,8 +19,8 @@ import java.util.Random; +import org.apache.lucene.store.Directory; import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; @@ -34,7 +34,7 @@ public class TestPrefixQuery extends LuceneTestCase { public void testPrefixQuery() throws Exception { Random random = newRandom(); - MockRAMDirectory directory = newDirectory(random); + Directory directory = newDirectory(random); String[] categories = new String[] {"/Computers", "/Computers/Mac", Index: lucene/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java (working copy) @@ -22,8 +22,8 @@ import org.apache.lucene.index.TermsEnum; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.MultiFields; +import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -45,7 +45,7 @@ public void testPhrasePrefix() throws IOException { Random random = newRandom(); - MockRAMDirectory indexStore = newDirectory(random); + Directory indexStore = newDirectory(random); RandomIndexWriter writer = new RandomIndexWriter(random, indexStore); add("blueberry pie", writer); add("blueberry strudel", writer); @@ -139,7 +139,7 @@ // LUCENE-2580 public void testTall() throws IOException { Random random = newRandom(); - MockRAMDirectory indexStore = newDirectory(random); + Directory indexStore = newDirectory(random); RandomIndexWriter writer = new RandomIndexWriter(random, indexStore); add("blueberry chocolate pie", writer); add("blueberry chocolate tart", writer); @@ -169,7 +169,7 @@ // and all terms required. // The contained PhraseMultiQuery must contain exactly one term array. Random random = newRandom(); - MockRAMDirectory indexStore = newDirectory(random); + Directory indexStore = newDirectory(random); RandomIndexWriter writer = new RandomIndexWriter(random, indexStore); add("blueberry pie", writer); add("blueberry chewing gum", writer); @@ -202,7 +202,7 @@ public void testPhrasePrefixWithBooleanQuery() throws IOException { Random random = newRandom(); - MockRAMDirectory indexStore = newDirectory(random); + Directory indexStore = newDirectory(random); RandomIndexWriter writer = new RandomIndexWriter(random, indexStore); add("This is a test", "object", writer); add("a note", "note", writer); @@ -231,7 +231,7 @@ public void testNoDocs() throws Exception { Random random = newRandom(); - MockRAMDirectory indexStore = newDirectory(random); + Directory indexStore = newDirectory(random); RandomIndexWriter writer = new RandomIndexWriter(random, indexStore); add("a note", "note", writer); Index: lucene/src/test/org/apache/lucene/search/TestBooleanPrefixQuery.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestBooleanPrefixQuery.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestBooleanPrefixQuery.java (working copy) @@ -23,7 +23,6 @@ import junit.framework.Test; import junit.framework.TestSuite; import junit.textui.TestRunner; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.index.IndexReader; @@ -32,6 +31,7 @@ import org.apache.lucene.search.PrefixQuery; import org.apache.lucene.search.Query; import org.apache.lucene.search.BooleanQuery; +import org.apache.lucene.store.Directory; /** * @@ -68,7 +68,7 @@ public void testMethod() throws Exception { Random random = newRandom(); - MockRAMDirectory directory = newDirectory(random); + Directory directory = newDirectory(random); String[] categories = new String[]{"food", "foodanddrink", Index: lucene/src/test/org/apache/lucene/search/TestFilteredQuery.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestFilteredQuery.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestFilteredQuery.java (working copy) @@ -23,7 +23,7 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.DocIdBitSet; import java.util.BitSet; @@ -41,7 +41,7 @@ private IndexSearcher searcher; private IndexReader reader; - private MockRAMDirectory directory; + private Directory directory; private Query query; private Filter filter; Index: lucene/src/test/org/apache/lucene/search/QueryUtils.java =================================================================== --- lucene/src/test/org/apache/lucene/search/QueryUtils.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/QueryUtils.java (working copy) @@ -14,7 +14,10 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.MultiReader; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; +import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.store.RAMDirectory; + import static org.apache.lucene.util.LuceneTestCaseJ4.TEST_VERSION_CURRENT; /** @@ -197,9 +200,9 @@ return out; } - private static MockRAMDirectory makeEmptyIndex(final int numDeletedDocs) + private static Directory makeEmptyIndex(final int numDeletedDocs) throws IOException { - MockRAMDirectory d = new MockRAMDirectory(); + Directory d = new MockDirectoryWrapper(new RAMDirectory()); IndexWriter w = new IndexWriter(d, new IndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer())); for (int i = 0; i < numDeletedDocs; i++) { Index: lucene/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java (working copy) @@ -23,7 +23,7 @@ import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; import java.util.ArrayList; import java.util.List; @@ -38,7 +38,7 @@ public void testMissingTerms() throws Exception { String fieldName = "field1"; Random random = newRandom(); - MockRAMDirectory rd = newDirectory(random); + Directory rd = newDirectory(random); RandomIndexWriter w = new RandomIndexWriter(random, rd); for (int i = 0; i < 100; i++) { Document doc = new Document(); Index: lucene/src/test/org/apache/lucene/search/TestTermRangeFilter.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestTermRangeFilter.java (revision 988190) +++ lucene/src/test/org/apache/lucene/search/TestTermRangeFilter.java (working copy) @@ -26,7 +26,7 @@ import org.apache.lucene.index.Term; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; /** * A basic 'positive' Unit test class for the TermRangeFilter class. @@ -398,7 +398,7 @@ public void testFarsi() throws Exception { /* build an index */ - MockRAMDirectory farsiIndex = newDirectory(rand); + Directory farsiIndex = newDirectory(rand); 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 void testDanish() throws Exception { /* build an index */ - MockRAMDirectory danishIndex = newDirectory(rand); + Directory danishIndex = newDirectory(rand); RandomIndexWriter writer = new RandomIndexWriter(rand, danishIndex); // Danish collation orders the words below in the given order // (example taken from TestSort.testInternationalSort() ). Index: lucene/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java =================================================================== --- lucene/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java (revision 988190) +++ lucene/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java (working copy) @@ -13,7 +13,6 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; import org.apache.lucene.store.IndexInput; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.index.IndexCommit; import org.apache.lucene.index.IndexWriterConfig; @@ -102,7 +101,7 @@ _TestUtil.rmDir(dir); } - MockRAMDirectory dir2 = newDirectory(random); + Directory dir2 = newDirectory(random); runTest(random, dir2); dir2.close(); } Index: lucene/src/test/org/apache/lucene/index/TestPayloadProcessorProvider.java =================================================================== --- lucene/src/test/org/apache/lucene/index/TestPayloadProcessorProvider.java (revision 988190) +++ lucene/src/test/org/apache/lucene/index/TestPayloadProcessorProvider.java (working copy) @@ -37,7 +37,6 @@ import org.apache.lucene.index.PayloadProcessorProvider.PayloadProcessor; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.LuceneTestCaseJ4; import org.junit.Test; Index: lucene/src/test/org/apache/lucene/index/TestParallelTermEnum.java =================================================================== --- lucene/src/test/org/apache/lucene/index/TestParallelTermEnum.java (revision 988190) +++ lucene/src/test/org/apache/lucene/index/TestParallelTermEnum.java (working copy) @@ -26,14 +26,14 @@ 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.MockRAMDirectory; +import org.apache.lucene.store.Directory; import org.apache.lucene.util.Bits; public class TestParallelTermEnum extends LuceneTestCase { private IndexReader ir1; private IndexReader ir2; - private MockRAMDirectory rd1; - private MockRAMDirectory rd2; + private Directory rd1; + private Directory rd2; @Override protected void setUp() throws Exception { Index: lucene/src/test/org/apache/lucene/index/TestIndexReader.java =================================================================== --- lucene/src/test/org/apache/lucene/index/TestIndexReader.java (revision 988190) +++ lucene/src/test/org/apache/lucene/index/TestIndexReader.java (working copy) @@ -51,8 +51,10 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; import org.apache.lucene.store.LockObtainFailedException; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.MockDirectoryWrapper; import org.apache.lucene.store.NoSuchDirectoryException; +import org.apache.lucene.store.RAMDirectory; +import org.apache.lucene.store.LockReleaseFailedException; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util._TestUtil; import org.apache.lucene.util.BytesRef; @@ -82,7 +84,7 @@ } public void testCommitUserData() throws Exception { - MockRAMDirectory d = newDirectory(random); + Directory d = newDirectory(random); Map commitUserData = new HashMap(); commitUserData.put("foo", "fighters"); @@ -137,7 +139,7 @@ } public void testIsCurrent() throws Exception { - MockRAMDirectory d = newDirectory(random); + Directory d = newDirectory(random); IndexWriter writer = new IndexWriter(d, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer())); addDocumentWithFields(writer); @@ -166,7 +168,7 @@ * @throws Exception on error */ public void testGetFieldNames() throws Exception { - MockRAMDirectory d = newDirectory(random); + Directory d = newDirectory(random); // set up writer IndexWriter writer = new IndexWriter(d, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer())); @@ -258,7 +260,7 @@ } public void testTermVectors() throws Exception { - MockRAMDirectory d = newDirectory(random); + Directory d = newDirectory(random); // set up writer IndexWriter writer = new IndexWriter(d, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer())); @@ -794,7 +796,7 @@ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer())); addDocumentWithFields(writer); writer.close(); - writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()).setOpenMode(OpenMode.APPEND)); + writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()).setOpenMode(OpenMode.APPEND)); IndexReader reader = IndexReader.open(dir, false); try { reader.deleteDocument(0); @@ -802,7 +804,11 @@ } catch(IOException e) { // expected exception } - IndexWriter.unlock(dir); // this should not be done in the real world! + try { + IndexWriter.unlock(dir); // this should not be done in the real world! + } catch (LockReleaseFailedException lrfe) { + writer.close(); + } reader.deleteDocument(0); reader.close(); writer.close(); @@ -881,7 +887,7 @@ int END_COUNT = 144; // First build up a starting index: - MockRAMDirectory startDir = newDirectory(random); + MockDirectoryWrapper startDir = newDirectory(random); IndexWriter writer = new IndexWriter(startDir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer())); for(int i=0;i<157;i++) { Document d = new Document(); @@ -893,7 +899,7 @@ } writer.close(); - long diskUsage = ((MockRAMDirectory) startDir).getRecomputedActualSizeInBytes(); + long diskUsage = startDir.getRecomputedActualSizeInBytes(); long diskFree = diskUsage+100; IOException err = null; @@ -903,7 +909,7 @@ // Iterate w/ ever increasing free disk space: while(!done) { - MockRAMDirectory dir = new MockRAMDirectory(startDir); + MockDirectoryWrapper dir = new MockDirectoryWrapper(new RAMDirectory(startDir)); // If IndexReader hits disk full, it can write to // the same files again. @@ -1150,7 +1156,7 @@ } public void testMultiReaderDeletes() throws Exception { - Directory dir = new MockRAMDirectory(); + Directory dir = newDirectory(random); RandomIndexWriter w = new RandomIndexWriter(random, dir); Document doc = new Document(); doc.add(new Field("f", "doctor", Field.Store.NO, Field.Index.NOT_ANALYZED)); @@ -1417,7 +1423,7 @@ public void testGetIndexCommit() throws IOException { - MockRAMDirectory d = newDirectory(random); + Directory d = newDirectory(random); // set up writer IndexWriter writer = new IndexWriter(d, newIndexWriterConfig(random, @@ -1466,7 +1472,7 @@ } public void testReadOnly() throws Throwable { - MockRAMDirectory d = newDirectory(random); + Directory d = newDirectory(random); IndexWriter writer = new IndexWriter(d, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer())); addDocumentWithFields(writer); @@ -1553,7 +1559,7 @@ // LUCENE-1647 public void testIndexReaderUnDeleteAll() throws Exception { - MockRAMDirectory dir = newDirectory(random); + MockDirectoryWrapper dir = newDirectory(random); dir.setPreventDoubleWrite(false); IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer())); Index: lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java =================================================================== --- lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java (revision 988190) +++ lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java (working copy) @@ -35,7 +35,6 @@ import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; public class TestStressIndexing2 extends MultiCodecTestCase { static int maxFields=4; Index: lucene/src/test/org/apache/lucene/index/TestTermVectorsReader.java =================================================================== --- lucene/src/test/org/apache/lucene/index/TestTermVectorsReader.java (revision 988190) +++ lucene/src/test/org/apache/lucene/index/TestTermVectorsReader.java (working copy) @@ -32,7 +32,7 @@ import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.LuceneTestCase; @@ -44,7 +44,7 @@ private String[] testTerms = {"this", "is", "a", "test"}; private int[][] positions = new int[testTerms.length][]; private TermVectorOffsetInfo[][] offsets = new TermVectorOffsetInfo[testTerms.length][]; - private MockRAMDirectory dir; + private Directory dir; private String seg; private FieldInfos fieldInfos = new FieldInfos(); private static int TERM_FREQ = 3; @@ -171,7 +171,7 @@ } } - public void test() { + public void test() throws IOException { //Check to see the files were created properly in setup assertTrue(dir.fileExists(IndexFileNames.segmentFileName(seg, "", IndexFileNames.VECTORS_DOCUMENTS_EXTENSION))); assertTrue(dir.fileExists(IndexFileNames.segmentFileName(seg, "", IndexFileNames.VECTORS_INDEX_EXTENSION))); Index: lucene/src/test/org/apache/lucene/index/TestIndexWriter.java =================================================================== --- lucene/src/test/org/apache/lucene/index/TestIndexWriter.java (revision 988190) +++ lucene/src/test/org/apache/lucene/index/TestIndexWriter.java (working copy) @@ -68,9 +68,9 @@ import org.apache.lucene.store.IndexOutput; 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.MockRAMDirectory; +import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.store.RAMDirectory; import org.apache.lucene.store.SingleInstanceLockFactory; import org.apache.lucene.util.UnicodeUtil; import org.apache.lucene.util._TestUtil; @@ -203,7 +203,7 @@ // Now, build a starting index that has START_COUNT docs. We // will then try to addIndexesNoOptimize into a copy of this: - MockRAMDirectory startDir = newDirectory(random); + MockDirectoryWrapper startDir = newDirectory(random); IndexWriter writer = new IndexWriter(startDir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer())); for(int j=0;j 0); + assertTrue(dir.fileLength(name) > 0); FieldInfos readIn = new FieldInfos(dir, name); assertTrue(fieldInfos.size() == readIn.size()); FieldInfo info = readIn.fieldInfo("textField1"); @@ -80,10 +79,5 @@ assertTrue(info.omitNorms == true); dir.close(); - - } catch (IOException e) { - assertTrue(false); - } - } } Index: lucene/src/test/org/apache/lucene/index/TestDirectoryReader.java =================================================================== --- lucene/src/test/org/apache/lucene/index/TestDirectoryReader.java (revision 988190) +++ lucene/src/test/org/apache/lucene/index/TestDirectoryReader.java (working copy) @@ -24,7 +24,6 @@ import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.util.BytesRef; import java.io.IOException; @@ -137,9 +136,9 @@ } public void testIsCurrent() throws IOException { - MockRAMDirectory ramDir1=newDirectory(random); + Directory ramDir1=newDirectory(random); addDoc(random, ramDir1, "test foo", true); - MockRAMDirectory ramDir2=newDirectory(random); + Directory ramDir2=newDirectory(random); addDoc(random, ramDir2, "test blah", true); IndexReader[] readers = new IndexReader[]{IndexReader.open(ramDir1, false), IndexReader.open(ramDir2, false)}; MultiReader mr = new MultiReader(readers); @@ -160,11 +159,11 @@ } public void testMultiTermDocs() throws IOException { - MockRAMDirectory ramDir1=newDirectory(random); + Directory ramDir1=newDirectory(random); addDoc(random, ramDir1, "test foo", true); - MockRAMDirectory ramDir2=newDirectory(random); + Directory ramDir2=newDirectory(random); addDoc(random, ramDir2, "test blah", true); - MockRAMDirectory ramDir3=newDirectory(random); + Directory ramDir3=newDirectory(random); addDoc(random, ramDir3, "test wow", true); IndexReader[] readers1 = new IndexReader[]{IndexReader.open(ramDir1, false), IndexReader.open(ramDir3, false)}; @@ -204,7 +203,7 @@ ramDir3.close(); } - private void addDoc(Random random, MockRAMDirectory ramDir1, String s, boolean create) throws IOException { + private void addDoc(Random random, Directory ramDir1, String s, boolean create) throws IOException { IndexWriter iw = new IndexWriter(ramDir1, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()).setOpenMode( Index: lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java =================================================================== --- lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java (revision 988190) +++ lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java (working copy) @@ -28,7 +28,8 @@ import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.store.RAMDirectory; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util._TestUtil; @@ -423,7 +424,7 @@ int END_COUNT = 144; // First build up a starting index: - MockRAMDirectory startDir = newDirectory(random); + MockDirectoryWrapper startDir = newDirectory(random); // TODO: find the resource leak that only occurs sometimes here. startDir.setNoDeleteOpenFile(false); IndexWriter writer = new IndexWriter(startDir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer(MockTokenizer.WHITESPACE, false))); @@ -446,7 +447,7 @@ // Iterate w/ ever increasing free disk space: while (!done) { - MockRAMDirectory dir = new MockRAMDirectory(startDir); + MockDirectoryWrapper dir = new MockDirectoryWrapper(new RAMDirectory(startDir)); dir.setPreventDoubleWrite(false); IndexWriter modifier = new IndexWriter(dir, newIndexWriterConfig(random, @@ -599,34 +600,34 @@ } searcher.close(); newReader.close(); - dir.close(); if (result2 == END_COUNT) { break; } } + dir.close(); modifier.close(); - startDir.close(); // Try again with 10 more bytes of free space: diskFree += 10; } + startDir.close(); } // This test tests that buffered deletes are cleared when // an Exception is hit during flush. public void testErrorAfterApplyDeletes() throws IOException { - MockRAMDirectory.Failure failure = new MockRAMDirectory.Failure() { + MockDirectoryWrapper.Failure failure = new MockDirectoryWrapper.Failure() { boolean sawMaybe = false; boolean failed = false; @Override - public MockRAMDirectory.Failure reset() { + public MockDirectoryWrapper.Failure reset() { sawMaybe = false; failed = false; return this; } @Override - public void eval(MockRAMDirectory dir) throws IOException { + public void eval(MockDirectoryWrapper dir) throws IOException { if (sawMaybe && !failed) { boolean seen = false; StackTraceElement[] trace = new Exception().getStackTrace(); @@ -662,7 +663,7 @@ "Venice has lots of canals" }; String[] text = { "Amsterdam", "Venice" }; - MockRAMDirectory dir = newDirectory(random); + MockDirectoryWrapper dir = newDirectory(random); IndexWriter modifier = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer(MockTokenizer.WHITESPACE, false)).setMaxBufferedDeleteTerms(2).setReaderPooling(false)); LogMergePolicy lmp = (LogMergePolicy) modifier.getConfig().getMergePolicy(); @@ -748,15 +749,15 @@ public void testErrorInDocsWriterAdd() throws IOException { - MockRAMDirectory.Failure failure = new MockRAMDirectory.Failure() { + MockDirectoryWrapper.Failure failure = new MockDirectoryWrapper.Failure() { boolean failed = false; @Override - public MockRAMDirectory.Failure reset() { + public MockDirectoryWrapper.Failure reset() { failed = false; return this; } @Override - public void eval(MockRAMDirectory dir) throws IOException { + public void eval(MockDirectoryWrapper dir) throws IOException { if (!failed) { failed = true; throw new IOException("fail in add doc"); @@ -772,7 +773,7 @@ "Venice has lots of canals" }; String[] text = { "Amsterdam", "Venice" }; - MockRAMDirectory dir = newDirectory(random); + MockDirectoryWrapper dir = newDirectory(random); IndexWriter modifier = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer(MockTokenizer.WHITESPACE, false))); modifier.commit(); dir.failOn(failure.reset()); Index: lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java =================================================================== --- lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java (revision 988190) +++ lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java (working copy) @@ -34,8 +34,9 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.MockDirectoryWrapper; import org.apache.lucene.store.AlreadyClosedException; +import org.apache.lucene.store.RAMDirectory; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util._TestUtil; import org.apache.lucene.util.BytesRef; @@ -355,7 +356,7 @@ try { final Directory[] dirs = new Directory[numDirs]; for (int k = 0; k < numDirs; k++) - dirs[k] = new MockRAMDirectory(addDir); + dirs[k] = new MockDirectoryWrapper(new RAMDirectory(addDir)); //int j = 0; //while (true) { // System.out.println(Thread.currentThread().getName() + ": iter @@ -631,7 +632,7 @@ final Directory[] dirs = new Directory[10]; for (int i=0;i<10;i++) { - dirs[i] = new MockRAMDirectory(dir1); + dirs[i] = new MockDirectoryWrapper(new RAMDirectory(dir1)); } IndexReader r = writer.getReader(); Index: lucene/src/test/org/apache/lucene/index/TestFieldsReader.java =================================================================== --- lucene/src/test/org/apache/lucene/index/TestFieldsReader.java (revision 988190) +++ lucene/src/test/org/apache/lucene/index/TestFieldsReader.java (working copy) @@ -40,12 +40,11 @@ import org.apache.lucene.store.FSDirectory; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util._TestUtil; public class TestFieldsReader extends LuceneTestCase { - private MockRAMDirectory dir; + private Directory dir; private Document testDoc = new Document(); private FieldInfos fieldInfos = null; private Random random; Index: lucene/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java =================================================================== --- lucene/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java (revision 988190) +++ lucene/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java (working copy) @@ -23,7 +23,6 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.util.LuceneTestCase; public class TestNRTReaderWithThreads extends LuceneTestCase { Index: lucene/src/test/org/apache/lucene/index/TestFilterIndexReader.java =================================================================== --- lucene/src/test/org/apache/lucene/index/TestFilterIndexReader.java (revision 988190) +++ lucene/src/test/org/apache/lucene/index/TestFilterIndexReader.java (working copy) @@ -22,8 +22,7 @@ import junit.framework.TestSuite; import junit.textui.TestRunner; -import org.apache.lucene.store.MockRAMDirectory; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -132,7 +131,7 @@ */ public void testFilterIndexReader() throws Exception { Random random = newRandom(); - MockRAMDirectory directory = newDirectory(random); + Directory directory = newDirectory(random); IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer())); Document d1 = new Document(); @@ -150,7 +149,7 @@ writer.close(); //IndexReader reader = new TestReader(IndexReader.open(directory, true)); - MockRAMDirectory target = newDirectory(random); + Directory target = newDirectory(random); writer = new IndexWriter(target, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer())); IndexReader reader = new TestReader(IndexReader.open(directory, true)); writer.addIndexes(reader); Index: lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java =================================================================== --- lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java (revision 988190) +++ lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java (working copy) @@ -20,7 +20,6 @@ import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.store.BufferedIndexInput; import org.apache.lucene.store.Directory; -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; Index: lucene/src/test/org/apache/lucene/index/TestAddIndexes.java =================================================================== --- lucene/src/test/org/apache/lucene/index/TestAddIndexes.java (revision 988190) +++ lucene/src/test/org/apache/lucene/index/TestAddIndexes.java (working copy) @@ -26,8 +26,8 @@ import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.store.RAMDirectory; import org.apache.lucene.util._TestUtil; import org.apache.lucene.search.DocIdSetIterator; @@ -368,7 +368,7 @@ .setOpenMode(OpenMode.APPEND).setMaxBufferedDocs(10)); ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(4); - writer.addIndexes(new Directory[] { aux, new MockRAMDirectory(aux) }); + writer.addIndexes(new Directory[] { aux, new MockDirectoryWrapper(new RAMDirectory(aux)) }); assertEquals(1060, writer.maxDoc()); assertEquals(1000, writer.getDocCount(0)); writer.close(); @@ -400,7 +400,7 @@ .setOpenMode(OpenMode.APPEND).setMaxBufferedDocs(4)); ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(4); - writer.addIndexes(new Directory[] { aux, new MockRAMDirectory(aux) }); + writer.addIndexes(new Directory[] { aux, new MockDirectoryWrapper(new RAMDirectory(aux)) }); assertEquals(1060, writer.maxDoc()); assertEquals(1000, writer.getDocCount(0)); writer.close(); Index: lucene/src/test/org/apache/lucene/index/TestTermdocPerf.java =================================================================== --- lucene/src/test/org/apache/lucene/index/TestTermdocPerf.java (revision 988190) +++ lucene/src/test/org/apache/lucene/index/TestTermdocPerf.java (working copy) @@ -28,7 +28,6 @@ import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; Index: lucene/src/test/org/apache/lucene/index/TestPayloads.java =================================================================== --- lucene/src/test/org/apache/lucene/index/TestPayloads.java (revision 988190) +++ lucene/src/test/org/apache/lucene/index/TestPayloads.java (working copy) @@ -39,7 +39,6 @@ import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.Bits; import org.apache.lucene.util.LuceneTestCase; Index: lucene/src/test/org/apache/lucene/index/TestLazyBug.java =================================================================== --- lucene/src/test/org/apache/lucene/index/TestLazyBug.java (revision 988190) +++ lucene/src/test/org/apache/lucene/index/TestLazyBug.java (working copy) @@ -31,7 +31,6 @@ import org.apache.lucene.document.FieldSelectorResult; import org.apache.lucene.document.Fieldable; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.util.LuceneTestCase; Index: lucene/src/test/org/apache/lucene/index/TestIndexWriterMerging.java =================================================================== --- lucene/src/test/org/apache/lucene/index/TestIndexWriterMerging.java (revision 988190) +++ lucene/src/test/org/apache/lucene/index/TestIndexWriterMerging.java (working copy) @@ -16,7 +16,6 @@ */ import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; Index: lucene/src/test/org/apache/lucene/index/TestParallelReader.java =================================================================== --- lucene/src/test/org/apache/lucene/index/TestParallelReader.java (revision 988190) +++ lucene/src/test/org/apache/lucene/index/TestParallelReader.java (working copy) @@ -30,12 +30,9 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; import org.apache.lucene.search.ScoreDoc; -import org.apache.lucene.search.Searcher; import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.util.LuceneTestCase; public class TestParallelReader extends LuceneTestCase { Index: lucene/src/test/org/apache/lucene/index/TestDeletionPolicy.java =================================================================== --- lucene/src/test/org/apache/lucene/index/TestDeletionPolicy.java (revision 988190) +++ lucene/src/test/org/apache/lucene/index/TestDeletionPolicy.java (working copy) @@ -33,8 +33,6 @@ import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.util.LuceneTestCase; /* Index: lucene/src/test/org/apache/lucene/index/TestSegmentReader.java =================================================================== --- lucene/src/test/org/apache/lucene/index/TestSegmentReader.java (revision 988190) +++ lucene/src/test/org/apache/lucene/index/TestSegmentReader.java (working copy) @@ -28,10 +28,10 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Fieldable; import org.apache.lucene.search.Similarity; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; public class TestSegmentReader extends LuceneTestCase { - private MockRAMDirectory dir; + private Directory dir; private Document testDoc = new Document(); private SegmentReader reader = null; Index: lucene/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java =================================================================== --- lucene/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java (revision 988190) +++ lucene/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java (working copy) @@ -20,6 +20,7 @@ import java.io.IOException; import java.util.Random; +import org.apache.lucene.store.Directory; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util._TestUtil; @@ -30,8 +31,6 @@ import org.apache.lucene.document.Field.Store; 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.MockRAMDirectory; /** * Some tests for {@link ParallelReader}s with empty indexes @@ -48,13 +47,13 @@ */ public void testEmptyIndex() throws IOException { Random random = newRandom(); - MockRAMDirectory rd1 = newDirectory(random); + Directory rd1 = newDirectory(random); IndexWriter iw = new IndexWriter(rd1, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer())); iw.close(); - MockRAMDirectory rd2 = newDirectory(random, rd1); + Directory rd2 = newDirectory(random, rd1); - MockRAMDirectory rdOut = newDirectory(random); + Directory rdOut = newDirectory(random); IndexWriter iwOut = new IndexWriter(rdOut, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer())); ParallelReader pr = new ParallelReader(); @@ -79,7 +78,7 @@ */ public void testEmptyIndexWithVectors() throws IOException { Random random = newRandom(); - MockRAMDirectory rd1 = newDirectory(random); + Directory rd1 = newDirectory(random); { IndexWriter iw = new IndexWriter(rd1, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer())); Document doc = new Document(); @@ -100,7 +99,7 @@ iw.close(); } - MockRAMDirectory rd2 = newDirectory(random); + Directory rd2 = newDirectory(random); { IndexWriter iw = new IndexWriter(rd2, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer())); Document doc = new Document(); @@ -108,7 +107,7 @@ iw.close(); } - MockRAMDirectory rdOut = newDirectory(random); + Directory rdOut = newDirectory(random); IndexWriter iwOut = new IndexWriter(rdOut, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer())); ParallelReader pr = new ParallelReader(); Index: lucene/src/test/org/apache/lucene/index/TestLazyProxSkipping.java =================================================================== --- lucene/src/test/org/apache/lucene/index/TestLazyProxSkipping.java (revision 988190) +++ lucene/src/test/org/apache/lucene/index/TestLazyProxSkipping.java (working copy) @@ -29,7 +29,8 @@ import org.apache.lucene.search.Searcher; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IndexInput; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.store.RAMDirectory; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; @@ -46,7 +47,11 @@ private String term2 = "yy"; private String term3 = "zz"; - private class SeekCountingDirectory extends MockRAMDirectory { + private class SeekCountingDirectory extends MockDirectoryWrapper { + public SeekCountingDirectory(Directory delegate) { + super(delegate); + } + @Override public IndexInput openInput(String name) throws IOException { IndexInput ii = super.openInput(name); @@ -56,12 +61,13 @@ } return ii; } + } private void createIndex(Random random, int numHits) throws IOException { int numDocs = 500; - Directory directory = new SeekCountingDirectory(); + Directory directory = new SeekCountingDirectory(new RAMDirectory()); IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()).setMaxBufferedDocs(10)); ((LogMergePolicy) writer.getConfig().getMergePolicy()).setUseCompoundFile(false); ((LogMergePolicy) writer.getConfig().getMergePolicy()).setUseCompoundDocStore(false); Index: lucene/src/test/org/apache/lucene/index/TestNorms.java =================================================================== --- lucene/src/test/org/apache/lucene/index/TestNorms.java (revision 988190) +++ lucene/src/test/org/apache/lucene/index/TestNorms.java (working copy) @@ -31,7 +31,6 @@ import org.apache.lucene.search.DefaultSimilarity; import org.apache.lucene.search.Similarity; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.util.LuceneTestCase; /** Index: lucene/src/test/org/apache/lucene/store/MockIndexInputWrapper.java =================================================================== --- lucene/src/test/org/apache/lucene/store/MockIndexInputWrapper.java (revision 988190) +++ lucene/src/test/org/apache/lucene/store/MockIndexInputWrapper.java (working copy) @@ -1,6 +1,7 @@ package org.apache.lucene.store; import java.io.IOException; +import java.util.Map; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -20,26 +21,27 @@ */ /** - * Used by MockRAMDirectory to create an input stream that + * Used by MockDirectoryWrapper to create an input stream that * keeps track of when it's been closed. */ -public class MockRAMInputStream extends RAMInputStream { - private MockRAMDirectory dir; +public class MockIndexInputWrapper extends IndexInput { + private MockDirectoryWrapper dir; private String name; + private IndexInput delegate; private boolean isClone; /** Construct an empty output buffer. * @throws IOException */ - public MockRAMInputStream(MockRAMDirectory dir, String name, RAMFile f) throws IOException { - super(f); + public MockIndexInputWrapper(MockDirectoryWrapper dir, String name, IndexInput delegate) { this.name = name; this.dir = dir; + this.delegate = delegate; } @Override - public void close() { - super.close(); + public void close() throws IOException { + delegate.close(); // Pending resolution on LUCENE-686 we may want to // remove the conditional check so we also track that // all clones get closed: @@ -61,7 +63,8 @@ @Override public Object clone() { - MockRAMInputStream clone = (MockRAMInputStream) super.clone(); + IndexInput iiclone = (IndexInput) delegate.clone(); + MockIndexInputWrapper clone = new MockIndexInputWrapper(dir, name, iiclone); clone.isClone = true; // Pending resolution on LUCENE-686 we may want to // uncomment this code so that we also track that all @@ -79,4 +82,75 @@ */ return clone; } + + @Override + public long getFilePointer() { + return delegate.getFilePointer(); + } + + @Override + public void seek(long pos) throws IOException { + delegate.seek(pos); + } + + @Override + public long length() { + return delegate.length(); + } + + @Override + public byte readByte() throws IOException { + return delegate.readByte(); + } + + @Override + public void readBytes(byte[] b, int offset, int len) throws IOException { + delegate.readBytes(b, offset, len); + } + + @Override + public void copyBytes(IndexOutput out, long numBytes) throws IOException { + delegate.copyBytes(out, numBytes); + } + + @Override + public void readBytes(byte[] b, int offset, int len, boolean useBuffer) + throws IOException { + delegate.readBytes(b, offset, len, useBuffer); + } + + @Override + public short readShort() throws IOException { + return delegate.readShort(); + } + + @Override + public int readInt() throws IOException { + return delegate.readInt(); + } + + @Override + public int readVInt() throws IOException { + return delegate.readVInt(); + } + + @Override + public long readLong() throws IOException { + return delegate.readLong(); + } + + @Override + public long readVLong() throws IOException { + return delegate.readVLong(); + } + + @Override + public String readString() throws IOException { + return delegate.readString(); + } + + @Override + public Map readStringStringMap() throws IOException { + return delegate.readStringStringMap(); + } } Index: lucene/src/test/org/apache/lucene/store/MockIndexOutputWrapper.java =================================================================== --- lucene/src/test/org/apache/lucene/store/MockIndexOutputWrapper.java (revision 988190) +++ lucene/src/test/org/apache/lucene/store/MockIndexOutputWrapper.java (working copy) @@ -18,6 +18,7 @@ */ import java.io.IOException; +import java.util.Map; /** * Used by MockRAMDirectory to create an output stream that @@ -26,26 +27,27 @@ * IOExceptions. */ -public class MockRAMOutputStream extends RAMOutputStream { - private MockRAMDirectory dir; +public class MockIndexOutputWrapper extends IndexOutput { + private MockDirectoryWrapper dir; + private final IndexOutput delegate; private boolean first=true; private final String name; byte[] singleByte = new byte[1]; /** Construct an empty output buffer. */ - public MockRAMOutputStream(MockRAMDirectory dir, RAMFile f, String name) { - super(f); + public MockIndexOutputWrapper(MockDirectoryWrapper dir, IndexOutput delegate, String name) { this.dir = dir; this.name = name; + this.delegate = delegate; } @Override public void close() throws IOException { - super.close(); - + dir.maybeThrowDeterministicException(); + delegate.close(); // Now compute actual disk usage & track the maxUsedSize - // in the MockRAMDirectory: + // in the MockDirectoryWrapper: long size = dir.getRecomputedActualSizeInBytes(); if (size > dir.maxUsedSize) { dir.maxUsedSize = size; @@ -55,7 +57,7 @@ @Override public void flush() throws IOException { dir.maybeThrowDeterministicException(); - super.flush(); + delegate.flush(); } @Override @@ -66,7 +68,7 @@ @Override public void writeBytes(byte[] b, int offset, int len) throws IOException { - long freeSpace = dir.maxSize - dir.sizeInBytes(); + long freeSpace = dir.maxSize == 0 ? 0 : dir.maxSize - dir.sizeInBytes(); long realUsage = 0; // If MockRAMDir crashed since we were opened, then @@ -85,14 +87,14 @@ if (dir.maxSize != 0 && freeSpace <= len) { if (freeSpace > 0 && freeSpace < len) { realUsage += freeSpace; - super.writeBytes(b, offset, (int) freeSpace); + delegate.writeBytes(b, offset, (int) freeSpace); } if (realUsage > dir.maxUsedSize) { dir.maxUsedSize = realUsage; } throw new IOException("fake disk full at " + dir.getRecomputedActualSizeInBytes() + " bytes when writing " + name); } else { - super.writeBytes(b, offset, len); + delegate.writeBytes(b, offset, len); } dir.maybeThrowDeterministicException(); @@ -104,4 +106,78 @@ dir.maybeThrowIOException(); } } + + @Override + public long getFilePointer() { + return delegate.getFilePointer(); + } + + @Override + public void seek(long pos) throws IOException { + delegate.seek(pos); + } + + @Override + public long length() throws IOException { + return delegate.length(); + } + + @Override + public void setLength(long length) throws IOException { + delegate.setLength(length); + } + + /* + @Override + public void writeBytes(byte[] b, int length) throws IOException { + delegate.writeBytes(b, length); + } + + @Override + public void writeInt(int i) throws IOException { + delegate.writeInt(i); + } + + @Override + public void writeVInt(int i) throws IOException { + delegate.writeVInt(i); + } + + @Override + public void writeLong(long i) throws IOException { + delegate.writeLong(i); + } + + @Override + public void writeVLong(long i) throws IOException { + delegate.writeVLong(i); + } + + @Override + public void writeString(String s) throws IOException { + delegate.writeString(s); + } + + @Override + public void writeChars(String s, int start, int length) throws IOException { + delegate.writeChars(s, start, length); + } + + @Override + public void writeChars(char[] s, int start, int length) throws IOException { + delegate.writeChars(s, start, length); + } + + @Override + public void writeStringStringMap(Map map) throws IOException { + delegate.writeStringStringMap(map); + } + */ + + @Override + public void copyBytes(DataInput input, long numBytes) throws IOException { + delegate.copyBytes(input, numBytes); + // TODO: we may need to check disk full here as well + dir.maybeThrowDeterministicException(); + } } Index: lucene/src/test/org/apache/lucene/store/TestRAMDirectory.java =================================================================== --- lucene/src/test/org/apache/lucene/store/TestRAMDirectory.java (revision 988190) +++ lucene/src/test/org/apache/lucene/store/TestRAMDirectory.java (working copy) @@ -69,7 +69,7 @@ public void testRAMDirectory () throws IOException { Directory dir = FSDirectory.open(indexDir); - MockRAMDirectory ramDir = new MockRAMDirectory(dir); + MockDirectoryWrapper ramDir = new MockDirectoryWrapper(new RAMDirectory(dir)); // close the underlaying directory dir.close(); @@ -101,7 +101,7 @@ public void testRAMDirectorySize() throws IOException, InterruptedException { Directory dir = FSDirectory.open(indexDir); - final MockRAMDirectory ramDir = new MockRAMDirectory(dir); + final MockDirectoryWrapper ramDir = new MockDirectoryWrapper(new RAMDirectory(dir)); dir.close(); final IndexWriter writer = new IndexWriter(ramDir, new IndexWriterConfig( Index: lucene/src/test/org/apache/lucene/store/MockRAMDirectory.java =================================================================== --- lucene/src/test/org/apache/lucene/store/MockRAMDirectory.java (revision 988190) +++ lucene/src/test/org/apache/lucene/store/MockRAMDirectory.java (working copy) @@ -1,357 +0,0 @@ -package org.apache.lucene.store; - -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.io.IOException; -import java.io.FileNotFoundException; -import java.util.Collection; -import java.util.Collections; -import java.util.Iterator; -import java.util.Random; -import java.util.Map; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Set; -import java.util.ArrayList; -import java.util.Arrays; - -/** - * This is a subclass of RAMDirectory that adds methods - * intended to be used only by unit tests. - */ - -public class MockRAMDirectory extends RAMDirectory { - long maxSize; - - // Max actual bytes used. This is set by MockRAMOutputStream: - long maxUsedSize; - double randomIOExceptionRate; - Random randomState; - boolean noDeleteOpenFile = true; - boolean preventDoubleWrite = true; - private Set unSyncedFiles; - private Set createdFiles; - volatile boolean crashed; - - // NOTE: we cannot initialize the Map here due to the - // order in which our constructor actually does this - // member initialization vs when it calls super. It seems - // like super is called, then our members are initialized: - Map openFiles; - - private synchronized void init() { - if (openFiles == null) - openFiles = new HashMap(); - if (createdFiles == null) - createdFiles = new HashSet(); - if (unSyncedFiles == null) - unSyncedFiles = new HashSet(); - } - - public MockRAMDirectory() { - super(); - init(); - } - public MockRAMDirectory(Directory dir) throws IOException { - super(dir); - init(); - } - - /** If set to true, we throw an IOException if the same - * file is opened by createOutput, ever. */ - public void setPreventDoubleWrite(boolean value) { - preventDoubleWrite = value; - } - - @Deprecated - @Override - public void sync(String name) throws IOException { - sync(Collections.singleton(name)); - } - - @Override - public synchronized void sync(Collection names) throws IOException { - for (String name : names) - maybeThrowDeterministicException(); - if (crashed) - throw new IOException("cannot sync after crash"); - unSyncedFiles.removeAll(names); - } - - /** Simulates a crash of OS or machine by overwriting - * unsynced files. */ - public synchronized void crash() throws IOException { - crashed = true; - openFiles = new HashMap(); - Iterator it = unSyncedFiles.iterator(); - unSyncedFiles = new HashSet(); - int count = 0; - while(it.hasNext()) { - String name = it.next(); - RAMFile file = fileMap.get(name); - if (count % 3 == 0) { - deleteFile(name, true); - } else if (count % 3 == 1) { - // Zero out file entirely - final int numBuffers = file.numBuffers(); - for(int i=0;i 0.0) { - int number = Math.abs(randomState.nextInt() % 1000); - if (number < randomIOExceptionRate*1000) { - throw new IOException("a random IOException"); - } - } - } - - @Override - public synchronized void deleteFile(String name) throws IOException { - deleteFile(name, false); - } - - private synchronized void deleteFile(String name, boolean forced) throws IOException { - - maybeThrowDeterministicException(); - - if (crashed && !forced) - throw new IOException("cannot delete after crash"); - - if (unSyncedFiles.contains(name)) - unSyncedFiles.remove(name); - if (!forced) { - if (noDeleteOpenFile && openFiles.containsKey(name)) { - throw new IOException("MockRAMDirectory: file \"" + name + "\" is still open: cannot delete"); - } - } - super.deleteFile(name); - } - - @Override - public synchronized IndexOutput createOutput(String name) throws IOException { - if (crashed) - throw new IOException("cannot createOutput after crash"); - init(); - synchronized(this) { - if (preventDoubleWrite && createdFiles.contains(name) && !name.equals("segments.gen")) - throw new IOException("file \"" + name + "\" was already written to"); - } - if (noDeleteOpenFile && openFiles.containsKey(name)) - throw new IOException("MockRAMDirectory: file \"" + name + "\" is still open: cannot overwrite"); - RAMFile file = new RAMFile(this); - if (crashed) - throw new IOException("cannot createOutput after crash"); - unSyncedFiles.add(name); - createdFiles.add(name); - RAMFile existing = fileMap.get(name); - // Enforce write once: - if (existing!=null && !name.equals("segments.gen") && preventDoubleWrite) - throw new IOException("file " + name + " already exists"); - else { - if (existing!=null) { - sizeInBytes.getAndAdd(-existing.sizeInBytes); - existing.directory = null; - } - - fileMap.put(name, file); - } - - return new MockRAMOutputStream(this, file, name); - } - - @Override - public synchronized IndexInput openInput(String name) throws IOException { - RAMFile file = fileMap.get(name); - if (file == null) - throw new FileNotFoundException(name); - else { - if (openFiles.containsKey(name)) { - Integer v = openFiles.get(name); - v = Integer.valueOf(v.intValue()+1); - openFiles.put(name, v); - } else { - openFiles.put(name, Integer.valueOf(1)); - } - } - return new MockRAMInputStream(this, name, file); - } - - /** Provided for testing purposes. Use sizeInBytes() instead. */ - public synchronized final long getRecomputedSizeInBytes() { - long size = 0; - for(final RAMFile file: fileMap.values()) { - size += file.getSizeInBytes(); - } - return size; - } - - /** Like getRecomputedSizeInBytes(), but, uses actual file - * lengths rather than buffer allocations (which are - * quantized up to nearest - * RAMOutputStream.BUFFER_SIZE (now 1024) bytes. - */ - - public final synchronized long getRecomputedActualSizeInBytes() { - long size = 0; - for (final RAMFile file : fileMap.values()) - size += file.length; - return size; - } - - @Override - public synchronized void close() { - if (openFiles == null) { - openFiles = new HashMap(); - } - if (noDeleteOpenFile && openFiles.size() > 0) { - // RuntimeException instead of IOException because - // super() does not throw IOException currently: - throw new RuntimeException("MockRAMDirectory: cannot close: there are still open files: " + openFiles); - } - open = false; - } - - boolean open = true; - - public synchronized boolean isOpen() { - return open; - } - - /** - * Objects that represent fail-able conditions. Objects of a derived - * class are created and registered with the mock directory. After - * register, each object will be invoked once for each first write - * of a file, giving the object a chance to throw an IOException. - */ - public static class Failure { - /** - * eval is called on the first write of every new file. - */ - public void eval(MockRAMDirectory dir) throws IOException { } - - /** - * reset should set the state of the failure to its default - * (freshly constructed) state. Reset is convenient for tests - * that want to create one failure object and then reuse it in - * multiple cases. This, combined with the fact that Failure - * subclasses are often anonymous classes makes reset difficult to - * do otherwise. - * - * A typical example of use is - * Failure failure = new Failure() { ... }; - * ... - * mock.failOn(failure.reset()) - */ - public Failure reset() { return this; } - - protected boolean doFail; - - public void setDoFail() { - doFail = true; - } - - public void clearDoFail() { - doFail = false; - } - } - - ArrayList failures; - - /** - * add a Failure object to the list of objects to be evaluated - * at every potential failure point - */ - synchronized public void failOn(Failure fail) { - if (failures == null) { - failures = new ArrayList(); - } - failures.add(fail); - } - - /** - * Iterate through the failures list, giving each object a - * chance to throw an IOE - */ - synchronized void maybeThrowDeterministicException() throws IOException { - if (failures != null) { - for(int i = 0; i < failures.size(); i++) { - failures.get(i).eval(this); - } - } - } - - -} Index: lucene/src/test/org/apache/lucene/store/MockDirectoryWrapper.java =================================================================== --- lucene/src/test/org/apache/lucene/store/MockDirectoryWrapper.java (revision 988190) +++ lucene/src/test/org/apache/lucene/store/MockDirectoryWrapper.java (working copy) @@ -31,11 +31,12 @@ import java.util.Arrays; /** - * This is a subclass of RAMDirectory that adds methods + * This is a Directory Wrapper that adds methods * intended to be used only by unit tests. */ -public class MockRAMDirectory extends RAMDirectory { +public class MockDirectoryWrapper extends Directory { + final Directory delegate; long maxSize; // Max actual bytes used. This is set by MockRAMOutputStream: @@ -63,14 +64,10 @@ unSyncedFiles = new HashSet(); } - public MockRAMDirectory() { - super(); + public MockDirectoryWrapper(Directory delegate) { + this.delegate = delegate; init(); } - public MockRAMDirectory(Directory dir) throws IOException { - super(dir); - init(); - } /** If set to true, we throw an IOException if the same * file is opened by createOutput, ever. */ @@ -81,7 +78,11 @@ @Deprecated @Override public void sync(String name) throws IOException { - sync(Collections.singleton(name)); + maybeThrowDeterministicException(); + if (crashed) + throw new IOException("cannot sync after crash"); + unSyncedFiles.remove(name); + delegate.sync(name); } @Override @@ -91,7 +92,20 @@ if (crashed) throw new IOException("cannot sync after crash"); unSyncedFiles.removeAll(names); + delegate.sync(names); } + + public synchronized final long sizeInBytes() throws IOException { + if (delegate instanceof RAMDirectory) + return ((RAMDirectory) delegate).sizeInBytes(); + else { + // hack + long size = 0; + for (String file : delegate.listAll()) + size += delegate.fileLength(file); + return size; + } + } /** Simulates a crash of OS or machine by overwriting * unsynced files. */ @@ -101,23 +115,52 @@ Iterator it = unSyncedFiles.iterator(); unSyncedFiles = new HashSet(); int count = 0; - while(it.hasNext()) { - String name = it.next(); - RAMFile file = fileMap.get(name); - if (count % 3 == 0) { - deleteFile(name, true); - } else if (count % 3 == 1) { - // Zero out file entirely - final int numBuffers = file.numBuffers(); - for(int i=0;i(); } @@ -282,6 +333,7 @@ throw new RuntimeException("MockRAMDirectory: cannot close: there are still open files: " + openFiles); } open = false; + delegate.close(); } boolean open = true; @@ -300,7 +352,7 @@ /** * eval is called on the first write of every new file. */ - public void eval(MockRAMDirectory dir) throws IOException { } + public void eval(MockDirectoryWrapper dir) throws IOException { } /** * reset should set the state of the failure to its default @@ -353,5 +405,58 @@ } } + @Override + public synchronized String[] listAll() throws IOException { + return delegate.listAll(); + } + @Override + public synchronized boolean fileExists(String name) throws IOException { + return delegate.fileExists(name); + } + + @Override + public synchronized long fileModified(String name) throws IOException { + return delegate.fileModified(name); + } + + @Override + public synchronized void touchFile(String name) throws IOException { + delegate.touchFile(name); + } + + @Override + public synchronized long fileLength(String name) throws IOException { + return delegate.fileLength(name); + } + + @Override + public synchronized Lock makeLock(String name) { + return delegate.makeLock(name); + } + + @Override + public synchronized void clearLock(String name) throws IOException { + delegate.clearLock(name); + } + + @Override + public synchronized void setLockFactory(LockFactory lockFactory) { + delegate.setLockFactory(lockFactory); + } + + @Override + public synchronized LockFactory getLockFactory() { + return delegate.getLockFactory(); + } + + @Override + public synchronized String getLockID() { + return delegate.getLockID(); + } + + @Override + public synchronized void copy(Directory to, String src, String dest) throws IOException { + delegate.copy(to, src, dest); + } } Index: lucene/src/test/org/apache/lucene/store/TestLockFactory.java =================================================================== --- lucene/src/test/org/apache/lucene/store/TestLockFactory.java (revision 988190) +++ lucene/src/test/org/apache/lucene/store/TestLockFactory.java (working copy) @@ -42,7 +42,7 @@ // methods are called at the right time, locks are created, etc. public void testCustomLockFactory() throws IOException { - Directory dir = new MockRAMDirectory(); + Directory dir = new MockDirectoryWrapper(new RAMDirectory()); MockLockFactory lf = new MockLockFactory(); dir.setLockFactory(lf); @@ -75,7 +75,7 @@ // exceptions raised: // Verify: NoLockFactory allows two IndexWriters public void testRAMDirectoryNoLocking() throws IOException { - Directory dir = new MockRAMDirectory(); + Directory dir = new MockDirectoryWrapper(new RAMDirectory()); dir.setLockFactory(NoLockFactory.getNoLockFactory()); assertTrue("RAMDirectory.setLockFactory did not take", @@ -102,7 +102,7 @@ // Verify: SingleInstanceLockFactory is the default lock for RAMDirectory // Verify: RAMDirectory does basic locking correctly (can't create two IndexWriters) public void testDefaultRAMDirectory() throws IOException { - Directory dir = new MockRAMDirectory(); + Directory dir = new RAMDirectory(); assertTrue("RAMDirectory did not use correct LockFactory: got " + dir.getLockFactory(), SingleInstanceLockFactory.class.isInstance(dir.getLockFactory())); Index: lucene/src/test/org/apache/lucene/store/MockRAMInputStream.java =================================================================== --- lucene/src/test/org/apache/lucene/store/MockRAMInputStream.java (revision 988190) +++ lucene/src/test/org/apache/lucene/store/MockRAMInputStream.java (working copy) @@ -1,82 +0,0 @@ -package org.apache.lucene.store; - -import java.io.IOException; - -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Used by MockRAMDirectory to create an input stream that - * keeps track of when it's been closed. - */ - -public class MockRAMInputStream extends RAMInputStream { - private MockRAMDirectory dir; - private String name; - private boolean isClone; - - /** Construct an empty output buffer. - * @throws IOException */ - public MockRAMInputStream(MockRAMDirectory dir, String name, RAMFile f) throws IOException { - super(f); - this.name = name; - this.dir = dir; - } - - @Override - public void close() { - super.close(); - // Pending resolution on LUCENE-686 we may want to - // remove the conditional check so we also track that - // all clones get closed: - if (!isClone) { - synchronized(dir) { - Integer v = dir.openFiles.get(name); - // Could be null when MockRAMDirectory.crash() was called - if (v != null) { - if (v.intValue() == 1) { - dir.openFiles.remove(name); - } else { - v = Integer.valueOf(v.intValue()-1); - dir.openFiles.put(name, v); - } - } - } - } - } - - @Override - public Object clone() { - MockRAMInputStream clone = (MockRAMInputStream) super.clone(); - clone.isClone = true; - // Pending resolution on LUCENE-686 we may want to - // uncomment this code so that we also track that all - // clones get closed: - /* - synchronized(dir.openFiles) { - if (dir.openFiles.containsKey(name)) { - Integer v = (Integer) dir.openFiles.get(name); - v = Integer.valueOf(v.intValue()+1); - dir.openFiles.put(name, v); - } else { - throw new RuntimeException("BUG: cloned file was not open?"); - } - } - */ - return clone; - } -} Index: lucene/src/test/org/apache/lucene/store/MockRAMOutputStream.java =================================================================== --- lucene/src/test/org/apache/lucene/store/MockRAMOutputStream.java (revision 988190) +++ lucene/src/test/org/apache/lucene/store/MockRAMOutputStream.java (working copy) @@ -1,107 +0,0 @@ -package org.apache.lucene.store; - -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.io.IOException; - -/** - * Used by MockRAMDirectory to create an output stream that - * will throw an IOException on fake disk full, track max - * disk space actually used, and maybe throw random - * IOExceptions. - */ - -public class MockRAMOutputStream extends RAMOutputStream { - private MockRAMDirectory dir; - private boolean first=true; - private final String name; - - byte[] singleByte = new byte[1]; - - /** Construct an empty output buffer. */ - public MockRAMOutputStream(MockRAMDirectory dir, RAMFile f, String name) { - super(f); - this.dir = dir; - this.name = name; - } - - @Override - public void close() throws IOException { - super.close(); - - // Now compute actual disk usage & track the maxUsedSize - // in the MockRAMDirectory: - long size = dir.getRecomputedActualSizeInBytes(); - if (size > dir.maxUsedSize) { - dir.maxUsedSize = size; - } - } - - @Override - public void flush() throws IOException { - dir.maybeThrowDeterministicException(); - super.flush(); - } - - @Override - public void writeByte(byte b) throws IOException { - singleByte[0] = b; - writeBytes(singleByte, 0, 1); - } - - @Override - public void writeBytes(byte[] b, int offset, int len) throws IOException { - long freeSpace = dir.maxSize - dir.sizeInBytes(); - long realUsage = 0; - - // If MockRAMDir crashed since we were opened, then - // don't write anything: - if (dir.crashed) - throw new IOException("MockRAMDirectory was crashed; cannot write to " + name); - - // Enforce disk full: - if (dir.maxSize != 0 && freeSpace <= len) { - // Compute the real disk free. This will greatly slow - // down our test but makes it more accurate: - realUsage = dir.getRecomputedActualSizeInBytes(); - freeSpace = dir.maxSize - realUsage; - } - - if (dir.maxSize != 0 && freeSpace <= len) { - if (freeSpace > 0 && freeSpace < len) { - realUsage += freeSpace; - super.writeBytes(b, offset, (int) freeSpace); - } - if (realUsage > dir.maxUsedSize) { - dir.maxUsedSize = realUsage; - } - throw new IOException("fake disk full at " + dir.getRecomputedActualSizeInBytes() + " bytes when writing " + name); - } else { - super.writeBytes(b, offset, len); - } - - dir.maybeThrowDeterministicException(); - - if (first) { - // Maybe throw random exception; only do this on first - // write to a new file: - first = false; - dir.maybeThrowIOException(); - } - } -} Index: lucene/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java =================================================================== --- lucene/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java (revision 988190) +++ lucene/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java (working copy) @@ -40,8 +40,8 @@ fileExtensions.add(IndexFileNames.FIELDS_EXTENSION); fileExtensions.add(IndexFileNames.FIELDS_INDEX_EXTENSION); - Directory primaryDir = new MockRAMDirectory(); - RAMDirectory secondaryDir = new MockRAMDirectory(); + Directory primaryDir = new MockDirectoryWrapper(new RAMDirectory()); + Directory secondaryDir = new MockDirectoryWrapper(new RAMDirectory()); FileSwitchDirectory fsd = new FileSwitchDirectory(fileExtensions, primaryDir, secondaryDir, true); IndexWriter writer = new IndexWriter(fsd, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer())); Index: lucene/src/test/org/apache/lucene/util/TestBitVector.java =================================================================== --- lucene/src/test/org/apache/lucene/util/TestBitVector.java (revision 988190) +++ lucene/src/test/org/apache/lucene/util/TestBitVector.java (working copy) @@ -20,8 +20,8 @@ import java.io.IOException; import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.store.RAMDirectory; /** * TestBitVector tests the BitVector, obviously. @@ -140,7 +140,7 @@ } private void doTestWriteRead(int n) throws Exception { - MockRAMDirectory d = new MockRAMDirectory(); + MockDirectoryWrapper d = new MockDirectoryWrapper(new RAMDirectory()); d.setPreventDoubleWrite(false); BitVector bv = new BitVector(n); // test count when incrementally setting bits @@ -171,7 +171,7 @@ } private void doTestDgaps(int size, int count1, int count2) throws IOException { - MockRAMDirectory d = new MockRAMDirectory(); + MockDirectoryWrapper d = new MockDirectoryWrapper(new RAMDirectory()); d.setPreventDoubleWrite(false); BitVector bv = new BitVector(size); for (int i=0; i stores; + private static Map stores; private static final String[] TEST_CODECS = new String[] {"MockSep", "MockFixedIntBlock", "MockVariableIntBlock"}; @@ -279,7 +283,7 @@ @BeforeClass public static void beforeClassLuceneTestCaseJ4() { - stores = Collections.synchronizedMap(new IdentityHashMap()); + stores = Collections.synchronizedMap(new IdentityHashMap()); codec = installTestCodecs(); savedLocale = Locale.getDefault(); locale = TEST_LOCALE.equals("random") ? randomLocale(seedRnd) : localeForName(TEST_LOCALE); @@ -295,7 +299,7 @@ Locale.setDefault(savedLocale); TimeZone.setDefault(savedTimeZone); // now look for unclosed resources - for (MockRAMDirectory d : stores.keySet()) { + for (MockDirectoryWrapper d : stores.keySet()) { if (d.isOpen()) { StackTraceElement elements[] = stores.get(d); StackTraceElement element = (elements.length > 1) ? elements[1] : null; @@ -582,16 +586,17 @@ return c; } - public static MockRAMDirectory newDirectory(Random r) throws IOException { + public static MockDirectoryWrapper newDirectory(Random r) throws IOException { StackTraceElement[] stack = new Exception().getStackTrace(); - MockRAMDirectory dir = new MockRAMDirectory(); + Directory impl = newDirectoryImpl(TEST_DIRECTORY); + MockDirectoryWrapper dir = new MockDirectoryWrapper(impl); stores.put(dir, stack); return dir; } - public static MockRAMDirectory newDirectory(Random r, Directory d) throws IOException { + public static MockDirectoryWrapper newDirectory(Random r, Directory d) throws IOException { StackTraceElement[] stack = new Exception().getStackTrace(); - MockRAMDirectory dir = new MockRAMDirectory(d); + MockDirectoryWrapper dir = new MockDirectoryWrapper(new RAMDirectory(d)); stores.put(dir, stack); return dir; } @@ -619,6 +624,32 @@ } } + static Directory newDirectoryImpl(String clazzName) { + if (clazzName.indexOf(".") == -1) // if not fully qualified, assume .store + clazzName = "org.apache.lucene.store." + clazzName; + try { + final Class clazz = Class.forName(clazzName).asSubclass(Directory.class); + try { + // try empty ctor + return clazz.newInstance(); + } catch (Exception e) { + final File tmpFile = File.createTempFile("test", "tmp", TEMP_DIR); + tmpFile.delete(); + tmpFile.mkdir(); + try { + Constructor ctor = clazz.getConstructor(File.class); + return ctor.newInstance(tmpFile); + } catch (Exception e2) { + // try .open(File) + Method method = clazz.getMethod("open", new Class[] { File.class }); + return (Directory) method.invoke(null, tmpFile); + } + } + } catch (Exception e) { + throw new RuntimeException(e); + } + } + public String getName() { return this.name; } Index: lucene/src/test/org/apache/lucene/util/LuceneTestCase.java =================================================================== --- lucene/src/test/org/apache/lucene/util/LuceneTestCase.java (revision 988190) +++ lucene/src/test/org/apache/lucene/util/LuceneTestCase.java (working copy) @@ -42,7 +42,9 @@ import org.apache.lucene.search.FieldCache; import org.apache.lucene.search.FieldCache.CacheEntry; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.FSDirectory; +import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.store.RAMDirectory; import org.apache.lucene.util.FieldCacheSanityChecker.Insanity; /** @@ -84,6 +86,8 @@ static final String TEST_LOCALE = LuceneTestCaseJ4.TEST_LOCALE; /** Gets the timezone to run tests with */ static final String TEST_TIMEZONE = LuceneTestCaseJ4.TEST_TIMEZONE; + /** Gets the directory to run tests with */ + static final String TEST_DIRECTORY = LuceneTestCaseJ4.TEST_DIRECTORY; /** * A random multiplier which you should use when writing random tests: @@ -102,7 +106,7 @@ private TimeZone timeZone; private TimeZone savedTimeZone; - private Map stores; + private Map stores; /** Used to track if setUp and tearDown are called correctly from subclasses */ private boolean setup; @@ -131,7 +135,7 @@ super.setUp(); assertFalse("ensure your tearDown() calls super.tearDown()!!!", setup); setup = true; - stores = new IdentityHashMap(); + stores = new IdentityHashMap(); savedUncaughtExceptionHandler = Thread.getDefaultUncaughtExceptionHandler(); Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() { public void uncaughtException(Thread t, Throwable e) { @@ -211,7 +215,7 @@ } // now look for unclosed resources - for (MockRAMDirectory d : stores.keySet()) { + for (MockDirectoryWrapper d : stores.keySet()) { if (d.isOpen()) { StackTraceElement elements[] = stores.get(d); StackTraceElement element = (elements.length > 1) ? elements[1] : null; @@ -329,16 +333,17 @@ return LuceneTestCaseJ4.newIndexWriterConfig(r, v, a); } - public MockRAMDirectory newDirectory(Random r) throws IOException { + public MockDirectoryWrapper newDirectory(Random r) throws IOException { StackTraceElement[] stack = new Exception().getStackTrace(); - MockRAMDirectory dir = new MockRAMDirectory(); + Directory impl = LuceneTestCaseJ4.newDirectoryImpl(TEST_DIRECTORY); + MockDirectoryWrapper dir = new MockDirectoryWrapper(impl); stores.put(dir, stack); return dir; } - public MockRAMDirectory newDirectory(Random r, Directory d) throws IOException { + public MockDirectoryWrapper newDirectory(Random r, Directory d) throws IOException { StackTraceElement[] stack = new Exception().getStackTrace(); - MockRAMDirectory dir = new MockRAMDirectory(d); + MockDirectoryWrapper dir = new MockDirectoryWrapper(new RAMDirectory(d)); stores.put(dir, stack); return dir; } Index: lucene/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java =================================================================== --- lucene/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java (revision 988190) +++ lucene/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java (working copy) @@ -24,7 +24,7 @@ import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.MultiReader; import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; import org.apache.lucene.util.FieldCacheSanityChecker.Insanity; import org.apache.lucene.util.FieldCacheSanityChecker.InsanityType; @@ -36,7 +36,7 @@ protected IndexReader readerA; protected IndexReader readerB; protected IndexReader readerX; - protected MockRAMDirectory dirA, dirB; + protected Directory dirA, dirB; private static final int NUM_DOCS = 1000; @Override Index: lucene/src/test/org/apache/lucene/document/TestBinaryDocument.java =================================================================== --- lucene/src/test/org/apache/lucene/document/TestBinaryDocument.java (revision 988190) +++ lucene/src/test/org/apache/lucene/document/TestBinaryDocument.java (working copy) @@ -6,7 +6,7 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -58,7 +58,7 @@ /** add the doc to a ram index */ Random random = newRandom(); - MockRAMDirectory dir = newDirectory(random); + Directory dir = newDirectory(random); RandomIndexWriter writer = new RandomIndexWriter(random, dir); writer.addDocument(doc); @@ -98,7 +98,7 @@ /** add the doc to a ram index */ Random random = newRandom(); - MockRAMDirectory dir = newDirectory(random); + Directory dir = newDirectory(random); RandomIndexWriter writer = new RandomIndexWriter(random, dir); writer.addDocument(doc); Index: lucene/src/test/org/apache/lucene/document/TestDocument.java =================================================================== --- lucene/src/test/org/apache/lucene/document/TestDocument.java (revision 988190) +++ lucene/src/test/org/apache/lucene/document/TestDocument.java (working copy) @@ -10,7 +10,7 @@ import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.Searcher; import org.apache.lucene.search.TermQuery; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; import org.apache.lucene.util.LuceneTestCase; /** @@ -155,7 +155,7 @@ */ public void testGetValuesForIndexedDocument() throws Exception { Random random = newRandom(); - MockRAMDirectory dir = newDirectory(random); + Directory dir = newDirectory(random); RandomIndexWriter writer = new RandomIndexWriter(random, dir); writer.addDocument(makeDocumentWithFields()); IndexReader reader = writer.getReader(); @@ -234,7 +234,7 @@ Field.Index.NOT_ANALYZED)); Random random = newRandom(); - MockRAMDirectory dir = newDirectory(random); + Directory dir = newDirectory(random); RandomIndexWriter writer = new RandomIndexWriter(random, dir); writer.addDocument(doc); field.setValue("id2"); Index: lucene/src/java/org/apache/lucene/index/FieldsWriter.java =================================================================== --- lucene/src/java/org/apache/lucene/index/FieldsWriter.java (revision 988190) +++ lucene/src/java/org/apache/lucene/index/FieldsWriter.java (working copy) @@ -135,7 +135,6 @@ final void close() throws IOException { if (doClose) { - try { if (fieldsStream != null) { try { Index: lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQPHelper.java =================================================================== --- lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQPHelper.java (revision 988190) +++ lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQPHelper.java (working copy) @@ -28,7 +28,6 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.queryParser.core.QueryNodeException; import org.apache.lucene.queryParser.standard.config.DefaultOperatorAttribute.Operator; import org.apache.lucene.search.BooleanClause; @@ -37,7 +36,6 @@ import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.util.LuceneTestCase; /** Index: lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQPHelper.java =================================================================== --- lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQPHelper.java (revision 988190) +++ lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQPHelper.java (working copy) @@ -48,7 +48,6 @@ import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.Term; import org.apache.lucene.messages.MessageImpl; import org.apache.lucene.queryParser.core.QueryNodeException; @@ -73,8 +72,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TermRangeQuery; import org.apache.lucene.search.WildcardQuery; -import org.apache.lucene.store.MockRAMDirectory; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; import org.apache.lucene.util.LocalizedTestCase; import org.apache.lucene.util.automaton.BasicAutomata; import org.apache.lucene.util.automaton.CharacterRunAutomaton; @@ -655,7 +653,7 @@ public void testFarsiRangeCollating() throws Exception { Random random = newRandom(); - MockRAMDirectory ramDir = newDirectory(random); + Directory ramDir = newDirectory(random); IndexWriter iw = new IndexWriter(ramDir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer(MockTokenizer.WHITESPACE, false))); Document doc = new Document(); doc.add(new Field("content", "\u0633\u0627\u0628", Field.Store.YES, @@ -1079,7 +1077,7 @@ public void testLocalDateFormat() throws IOException, QueryNodeException { Random random = newRandom(); - MockRAMDirectory ramDir = newDirectory(random); + Directory ramDir = newDirectory(random); IndexWriter iw = new IndexWriter(ramDir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer(MockTokenizer.WHITESPACE, false))); addDateDoc("a", 2005, 12, 2, 10, 15, 33, iw); addDateDoc("b", 2005, 12, 4, 22, 15, 00, iw); @@ -1279,7 +1277,7 @@ public void testMultiPhraseQuery() throws Exception { Random random = newRandom(); - MockRAMDirectory dir = newDirectory(random); + Directory dir = newDirectory(random); IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new CannedAnalyzer())); Document doc = new Document(); doc.add(new Field("field", "", Field.Store.NO, Field.Index.ANALYZED)); Index: lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQueryParserWrapper.java =================================================================== --- lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQueryParserWrapper.java (revision 988190) +++ lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQueryParserWrapper.java (working copy) @@ -36,7 +36,6 @@ import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.util.LuceneTestCase; /** Index: lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQueryParserWrapper.java =================================================================== --- lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQueryParserWrapper.java (revision 988190) +++ lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQueryParserWrapper.java (working copy) @@ -67,7 +67,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TermRangeQuery; import org.apache.lucene.search.WildcardQuery; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; import org.apache.lucene.util.LocalizedTestCase; import org.apache.lucene.util.automaton.BasicAutomata; import org.apache.lucene.util.automaton.CharacterRunAutomaton; @@ -654,7 +654,7 @@ public void testFarsiRangeCollating() throws Exception { - MockRAMDirectory ramDir = newDirectory(newRandom()); + Directory ramDir = newDirectory(newRandom()); IndexWriter iw = new IndexWriter(ramDir, new MockAnalyzer(MockTokenizer.WHITESPACE, false), true, IndexWriter.MaxFieldLength.LIMITED); Document doc = new Document(); @@ -1063,7 +1063,7 @@ public void testLocalDateFormat() throws IOException, ParseException { - MockRAMDirectory ramDir = newDirectory(newRandom()); + Directory ramDir = newDirectory(newRandom()); IndexWriter iw = new IndexWriter(ramDir, new MockAnalyzer(MockTokenizer.WHITESPACE, false), true, IndexWriter.MaxFieldLength.LIMITED); addDateDoc("a", 2005, 12, 2, 10, 15, 33, iw); Index: lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/SingleFieldTestDb.java =================================================================== --- lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/SingleFieldTestDb.java (revision 988190) +++ lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/SingleFieldTestDb.java (working copy) @@ -18,7 +18,8 @@ */ import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.store.RAMDirectory; import org.apache.lucene.util.Version; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; @@ -33,7 +34,7 @@ public SingleFieldTestDb(String[] documents, String fName) { try { - db = new MockRAMDirectory(); + db = new MockDirectoryWrapper(new RAMDirectory()); docs = documents; fieldName = fName; IndexWriter writer = new IndexWriter(db, new IndexWriterConfig( Index: lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/complexPhrase/TestComplexPhraseQuery.java =================================================================== --- lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/complexPhrase/TestComplexPhraseQuery.java (revision 988190) +++ lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/complexPhrase/TestComplexPhraseQuery.java (working copy) @@ -25,17 +25,16 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.queryParser.QueryParser; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TopDocs; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; import org.apache.lucene.util.LuceneTestCase; public class TestComplexPhraseQuery extends LuceneTestCase { - MockRAMDirectory rd; + Directory rd; Analyzer analyzer = new MockAnalyzer(); DocData docsContent[] = { new DocData("john smith", "1"), Index: lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestEmptyIndex.java =================================================================== --- lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestEmptyIndex.java (revision 988190) +++ lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestEmptyIndex.java (working copy) @@ -23,14 +23,12 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.MultiFields; import org.apache.lucene.index.Term; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.util.LuceneTestCase; public class TestEmptyIndex extends LuceneTestCase { Index: lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java =================================================================== --- lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java (revision 988190) +++ lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java (working copy) @@ -41,7 +41,6 @@ import org.apache.lucene.index.TermFreqVector; import org.apache.lucene.index.TermPositionVector; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.util.AttributeImpl; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; @@ -63,7 +62,7 @@ public void testLoadIndexReader() throws Exception { Random random = newRandom(); - MockRAMDirectory dir = newDirectory(random); + Directory dir = newDirectory(random); // create dir data IndexWriter indexWriter = new IndexWriter(dir, newIndexWriterConfig(random, @@ -88,7 +87,7 @@ public void testInstantiatedIndexWriter() throws Exception { Random random = newRandom(); - MockRAMDirectory dir = newDirectory(random); + Directory dir = newDirectory(random); InstantiatedIndex ii = new InstantiatedIndex(); // create dir data Index: lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestUnoptimizedReaderOnConstructor.java =================================================================== --- lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestUnoptimizedReaderOnConstructor.java (revision 988190) +++ lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestUnoptimizedReaderOnConstructor.java (working copy) @@ -22,7 +22,6 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.IndexWriterConfig.OpenMode; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.store.Directory; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.analysis.MockAnalyzer; Index: lucene/contrib/misc/src/test/org/apache/lucene/index/codecs/appending/TestAppendingCodec.java =================================================================== --- lucene/contrib/misc/src/test/org/apache/lucene/index/codecs/appending/TestAppendingCodec.java (revision 988190) +++ lucene/contrib/misc/src/test/org/apache/lucene/index/codecs/appending/TestAppendingCodec.java (working copy) @@ -42,7 +42,8 @@ import org.apache.lucene.index.codecs.SegmentInfosWriter; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IndexOutput; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.store.RAMDirectory; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.Version; @@ -118,8 +119,12 @@ } @SuppressWarnings("serial") - private static class AppendingRAMDirectory extends MockRAMDirectory { + private static class AppendingRAMDirectory extends MockDirectoryWrapper { + public AppendingRAMDirectory(Directory delegate) { + super(delegate); + } + @Override public IndexOutput createOutput(String name) throws IOException { return new AppendingIndexOutputWrapper(super.createOutput(name)); @@ -130,7 +135,7 @@ private static final String text = "the quick brown fox jumped over the lazy dog"; public void testCodec() throws Exception { - Directory dir = new AppendingRAMDirectory(); + Directory dir = new AppendingRAMDirectory(new RAMDirectory()); IndexWriterConfig cfg = new IndexWriterConfig(Version.LUCENE_40, new MockAnalyzer()); cfg.setCodecProvider(new AppendingCodecProvider()); Index: lucene/contrib/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java =================================================================== --- lucene/contrib/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java (revision 988190) +++ lucene/contrib/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java (working copy) @@ -22,7 +22,6 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; @@ -30,7 +29,7 @@ IndexReader input; int NUM_DOCS = 11; private Random random; - MockRAMDirectory dir; + Directory dir; @Override protected void setUp() throws Exception { Index: lucene/contrib/misc/src/test/org/apache/lucene/index/TestTermVectorAccessor.java =================================================================== --- lucene/contrib/misc/src/test/org/apache/lucene/index/TestTermVectorAccessor.java (revision 988190) +++ lucene/contrib/misc/src/test/org/apache/lucene/index/TestTermVectorAccessor.java (working copy) @@ -4,10 +4,8 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.util.LuceneTestCase; -import java.util.Collections; import java.util.Random; /* * Licensed under the Apache License, Version 2.0 (the "License"); Index: lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java =================================================================== --- lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java (revision 988190) +++ lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java (working copy) @@ -31,7 +31,6 @@ import org.apache.lucene.search.Similarity; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.util.LuceneTestCase; /** Index: lucene/contrib/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java =================================================================== --- lucene/contrib/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java (revision 988190) +++ lucene/contrib/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java (working copy) @@ -21,10 +21,9 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; @@ -33,7 +32,7 @@ public class TestHighFreqTerms extends LuceneTestCase { private static IndexWriter writer =null; - private static MockRAMDirectory dir = null; + private static Directory dir = null; private static IndexReader reader =null; public void setUp() throws Exception { Index: lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java =================================================================== --- lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java (revision 988190) +++ lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java (working copy) @@ -35,7 +35,6 @@ import org.apache.lucene.search.Similarity; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.util.LuceneTestCase; /** Index: lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteCachingWrapperFilter.java =================================================================== --- lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteCachingWrapperFilter.java (revision 988190) +++ lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteCachingWrapperFilter.java (working copy) @@ -24,7 +24,7 @@ import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.Term; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -35,7 +35,7 @@ * Tests that the index is cached on the searcher side of things. */ public class TestRemoteCachingWrapperFilter extends RemoteTestCaseJ4 { - private static MockRAMDirectory indexStore; + private static Directory indexStore; private static Searchable local; @BeforeClass Index: lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteSort.java =================================================================== --- lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteSort.java (revision 988190) +++ lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteSort.java (working copy) @@ -30,10 +30,9 @@ import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.LogMergePolicy; import org.apache.lucene.index.Term; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; import org.junit.AfterClass; import org.junit.Before; @@ -49,7 +48,7 @@ public class TestRemoteSort extends RemoteTestCaseJ4 { private static IndexSearcher full; - private static MockRAMDirectory indexStore; + private static Directory indexStore; private Query queryX; private Query queryY; private Query queryA; Index: lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteSearchable.java =================================================================== --- lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteSearchable.java (revision 988190) +++ lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteSearchable.java (working copy) @@ -21,7 +21,7 @@ import org.apache.lucene.document.*; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.Term; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -34,7 +34,7 @@ import java.util.HashSet; public class TestRemoteSearchable extends RemoteTestCaseJ4 { - private static MockRAMDirectory indexStore; + private static Directory indexStore; private static Searchable local; @BeforeClass Index: lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/builders/TestNumericRangeFilterBuilder.java =================================================================== --- lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/builders/TestNumericRangeFilterBuilder.java (revision 988190) +++ lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/builders/TestNumericRangeFilterBuilder.java (working copy) @@ -30,11 +30,10 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.IndexWriter.MaxFieldLength; import org.apache.lucene.search.Filter; import org.apache.lucene.search.NumericRangeFilter; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; import org.apache.lucene.xmlparser.ParserException; import org.w3c.dom.Document; import org.xml.sax.SAXException; @@ -63,7 +62,7 @@ Document doc = getDocumentFromString(xml); Filter filter = filterBuilder.getFilter(doc.getDocumentElement()); Random random = newRandom(); - MockRAMDirectory ramDir = newDirectory(random); + Directory ramDir = newDirectory(random); IndexWriter writer = new IndexWriter(ramDir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, null)); writer.commit(); try Index: lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestParser.java =================================================================== --- lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestParser.java (revision 988190) +++ lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestParser.java (working copy) @@ -14,13 +14,11 @@ import org.apache.lucene.document.NumericField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.util.Version; import org.apache.lucene.util.LuceneTestCase; /** Index: lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestQueryTemplateManager.java =================================================================== --- lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestQueryTemplateManager.java (revision 988190) +++ lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestQueryTemplateManager.java (working copy) @@ -12,10 +12,9 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; import org.apache.lucene.util.LuceneTestCase; import org.w3c.dom.Document; import org.xml.sax.SAXException; @@ -45,7 +44,7 @@ CoreParser builder; Analyzer analyzer=new MockAnalyzer(); private IndexSearcher searcher; - private MockRAMDirectory dir; + private Directory dir; //A collection of documents' field values for use in our tests String docFieldValues []= Index: lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestDistance.java =================================================================== --- lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestDistance.java (revision 988190) +++ lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestDistance.java (working copy) @@ -29,11 +29,11 @@ import org.apache.lucene.search.QueryWrapperFilter; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; public class TestDistance extends LuceneTestCase { - private MockRAMDirectory directory; + private Directory directory; // reston va private double lat = 38.969398; private double lng= -77.386398; Index: lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java =================================================================== --- lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java (revision 988190) +++ lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java (working copy) @@ -35,7 +35,6 @@ import org.apache.lucene.index.CorruptIndexException; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.Term; import org.apache.lucene.index.TermPositionVector; import org.apache.lucene.search.Collector; @@ -49,7 +48,6 @@ import org.apache.lucene.search.spans.SpanTermQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.store.LockObtainFailedException; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.OpenBitSet; Index: lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java =================================================================== --- lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java (revision 988190) +++ lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java (working copy) @@ -78,7 +78,6 @@ 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.MockRAMDirectory; import org.apache.lucene.util.automaton.BasicAutomata; import org.apache.lucene.util.automaton.CharacterRunAutomaton; import org.apache.lucene.util.automaton.RegExp; @@ -95,7 +94,7 @@ static final String FIELD_NAME = "contents"; private static final String NUMERIC_FIELD_NAME = "nfield"; private Query query; - MockRAMDirectory ramDir; + Directory ramDir; public IndexSearcher searcher = null; int numHighlights = 0; final Analyzer analyzer = new MockAnalyzer(MockTokenizer.SIMPLE, true, MockTokenFilter.ENGLISH_STOPSET, true); @@ -1323,7 +1322,7 @@ public void testMultiSearcher() throws Exception { // setup index 1 - MockRAMDirectory ramDir1 = newDirectory(random); + Directory ramDir1 = newDirectory(random); IndexWriter writer1 = new IndexWriter(ramDir1, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer(MockTokenizer.SIMPLE, true, MockTokenFilter.ENGLISH_STOPSET, true))); Document d = new Document(); @@ -1335,7 +1334,7 @@ IndexReader reader1 = IndexReader.open(ramDir1, true); // setup index 2 - MockRAMDirectory ramDir2 = newDirectory(random); + Directory ramDir2 = newDirectory(random); IndexWriter writer2 = new IndexWriter(ramDir2, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer(MockTokenizer.SIMPLE, true, MockTokenFilter.ENGLISH_STOPSET, true))); d = new Document(); Index: lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java =================================================================== --- lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java (revision 988190) +++ lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java (working copy) @@ -44,7 +44,6 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.util.LuceneTestCase; public abstract class AbstractTestCase extends LuceneTestCase { Index: lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java =================================================================== --- lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java (revision 988190) +++ lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java (working copy) @@ -23,14 +23,11 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.MockTokenizer; -import org.apache.lucene.analysis.core.WhitespaceAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.util.LuceneTestCase; /** Index: lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestPlainTextDictionary.java =================================================================== --- lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestPlainTextDictionary.java (revision 988190) +++ lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestPlainTextDictionary.java (working copy) @@ -20,7 +20,7 @@ import java.io.IOException; import java.io.StringReader; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; import org.apache.lucene.util.LuceneTestCase; /** @@ -33,7 +33,7 @@ final String LF = System.getProperty("line.separator"); String input = "oneword" + LF + "twoword" + LF + "threeword"; PlainTextDictionary ptd = new PlainTextDictionary(new StringReader(input)); - MockRAMDirectory ramDir = newDirectory(newRandom()); + Directory ramDir = newDirectory(newRandom()); SpellChecker spellChecker = new SpellChecker(ramDir); spellChecker.indexDictionary(ptd); String[] similar = spellChecker.suggestSimilar("treeword", 2); Index: lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java =================================================================== --- lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java (revision 988190) +++ lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java (working copy) @@ -37,7 +37,7 @@ import org.apache.lucene.queryParser.QueryParser; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.TopDocs; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; import org.apache.lucene.util._TestUtil; /** @@ -106,7 +106,7 @@ termField.append(randomTerm()); } - MockRAMDirectory ramdir = newDirectory(random); + Directory ramdir = newDirectory(random); Analyzer analyzer = randomAnalyzer(); IndexWriter writer = new IndexWriter(ramdir, new IndexWriterConfig(TEST_VERSION_CURRENT, analyzer).setCodecProvider(_TestUtil.alwaysCodec("Standard"))); @@ -128,7 +128,7 @@ /** * Run all queries against both the RAMDirectory and MemoryIndex, ensuring they are the same. */ - public void assertAllQueries(MemoryIndex memory, MockRAMDirectory ramdir, Analyzer analyzer) throws Exception { + public void assertAllQueries(MemoryIndex memory, Directory ramdir, Analyzer analyzer) throws Exception { IndexSearcher ram = new IndexSearcher(ramdir); IndexSearcher mem = memory.createSearcher(); QueryParser qp = new QueryParser(TEST_VERSION_CURRENT, "foo", analyzer); Index: lucene/contrib/queries/src/test/org/apache/lucene/search/similar/TestMoreLikeThis.java =================================================================== --- lucene/contrib/queries/src/test/org/apache/lucene/search/similar/TestMoreLikeThis.java (revision 988190) +++ lucene/contrib/queries/src/test/org/apache/lucene/search/similar/TestMoreLikeThis.java (working copy) @@ -34,11 +34,11 @@ import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.TermQuery; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; import org.apache.lucene.util.LuceneTestCase; public class TestMoreLikeThis extends LuceneTestCase { - private MockRAMDirectory directory; + private Directory directory; private IndexReader reader; private IndexSearcher searcher; Index: lucene/contrib/queries/src/test/org/apache/lucene/search/DuplicateFilterTest.java =================================================================== --- lucene/contrib/queries/src/test/org/apache/lucene/search/DuplicateFilterTest.java (revision 988190) +++ lucene/contrib/queries/src/test/org/apache/lucene/search/DuplicateFilterTest.java (working copy) @@ -28,13 +28,13 @@ import org.apache.lucene.index.Term; import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.MultiFields; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.BytesRef; public class DuplicateFilterTest extends LuceneTestCase { private static final String KEY_FIELD = "url"; - private MockRAMDirectory directory; + private Directory directory; private IndexReader reader; TermQuery tq=new TermQuery(new Term("text","lucene")); private IndexSearcher searcher; Index: lucene/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java =================================================================== --- lucene/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java (revision 988190) +++ lucene/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java (working copy) @@ -25,7 +25,7 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; import org.apache.lucene.index.SlowMultiReaderWrapper; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.OpenBitSet; @@ -53,7 +53,7 @@ public void testMissingTerms() throws Exception { String fieldName="field1"; Random random = newRandom(); - MockRAMDirectory rd=newDirectory(random); + Directory rd=newDirectory(random); RandomIndexWriter w = new RandomIndexWriter(random, rd); for (int i = 0; i < 100; i++) { Document doc=new Document(); Index: lucene/contrib/queries/src/test/org/apache/lucene/search/ChainedFilterTest.java =================================================================== --- lucene/contrib/queries/src/test/org/apache/lucene/search/ChainedFilterTest.java (revision 988190) +++ lucene/contrib/queries/src/test/org/apache/lucene/search/ChainedFilterTest.java (working copy) @@ -39,13 +39,12 @@ import org.apache.lucene.search.TermRangeFilter; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.util.LuceneTestCase; public class ChainedFilterTest extends LuceneTestCase { public static final int MAX = 500; - private MockRAMDirectory directory; + private Directory directory; private IndexSearcher searcher; private IndexReader reader; private Query query; Index: lucene/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java =================================================================== --- lucene/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java (revision 988190) +++ lucene/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java (working copy) @@ -28,11 +28,11 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.SlowMultiReaderWrapper; import org.apache.lucene.index.Term; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; import org.apache.lucene.util.LuceneTestCase; public class BooleanFilterTest extends LuceneTestCase { - private MockRAMDirectory directory; + private Directory directory; private IndexReader mainReader; private IndexReader reader; Index: lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestRegexQuery.java =================================================================== --- lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestRegexQuery.java (revision 988190) +++ lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestRegexQuery.java (working copy) @@ -20,7 +20,6 @@ import java.util.Random; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; Index: lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java =================================================================== --- lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java (revision 988190) +++ lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java (working copy) @@ -35,7 +35,6 @@ import org.apache.lucene.search.spans.SpanQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.store.LockObtainFailedException; -import org.apache.lucene.store.MockRAMDirectory; import org.apache.lucene.util.LuceneTestCase; public class TestSpanRegexQuery extends LuceneTestCase { @@ -60,7 +59,7 @@ } public void testSpanRegex() throws Exception { - MockRAMDirectory directory = newDirectory(random); + Directory directory = newDirectory(random); IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer())); Document doc = new Document(); Index: lucene/contrib/queries/src/test/org/apache/lucene/search/FuzzyLikeThisQueryTest.java =================================================================== --- lucene/contrib/queries/src/test/org/apache/lucene/search/FuzzyLikeThisQueryTest.java (revision 988190) +++ lucene/contrib/queries/src/test/org/apache/lucene/search/FuzzyLikeThisQueryTest.java (working copy) @@ -28,11 +28,11 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; -import org.apache.lucene.store.MockRAMDirectory; +import org.apache.lucene.store.Directory; import org.apache.lucene.util.LuceneTestCase; public class FuzzyLikeThisQueryTest extends LuceneTestCase { - private MockRAMDirectory directory; + private Directory directory; private IndexSearcher searcher; private IndexReader reader; private Analyzer analyzer=new MockAnalyzer();