lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aro...@apache.org
Subject svn commit: r677059 [6/19] - in /incubator/lucene.net/trunk/C#/src: ./ Demo/DeleteFiles/ Demo/DemoLib/ Demo/IndexFiles/ Demo/IndexHtml/ Demo/SearchFiles/ Lucene.Net/ Lucene.Net/Analysis/ Lucene.Net/Index/ Lucene.Net/Search/ Lucene.Net/Search/Function/ ...
Date Tue, 15 Jul 2008 21:44:10 GMT
Modified: incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Index/TestIndexReader.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexReader.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexReader.cs Tue Jul 15 14:44:04 2008
@@ -19,23 +19,23 @@
 
 using NUnit.Framework;
 
-using Directory = Lucene.Net.Store.Directory;
-using RAMDirectory = Lucene.Net.Store.RAMDirectory;
-using FSDirectory = Lucene.Net.Store.FSDirectory;
-using StandardAnalyzer = Lucene.Net.Analysis.Standard.StandardAnalyzer;
-using WhitespaceAnalyzer = Lucene.Net.Analysis.WhitespaceAnalyzer;
+//using TestRunner = junit.textui.TestRunner;
 using Document = Lucene.Net.Documents.Document;
 using Field = Lucene.Net.Documents.Field;
-using IndexSearcher = Lucene.Net.Search.IndexSearcher;
+using FieldOption = Lucene.Net.Index.IndexReader.FieldOption;
+using Lucene.Net.Store;
+using WhitespaceAnalyzer = Lucene.Net.Analysis.WhitespaceAnalyzer;
+using StandardAnalyzer = Lucene.Net.Analysis.Standard.StandardAnalyzer;
 using Hits = Lucene.Net.Search.Hits;
+using IndexSearcher = Lucene.Net.Search.IndexSearcher;
 using TermQuery = Lucene.Net.Search.TermQuery;
+using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;
 using _TestUtil = Lucene.Net.Util._TestUtil;
-using MockRAMDirectory = Lucene.Net.Store.MockRAMDirectory;
 
 namespace Lucene.Net.Index
 {
 	[TestFixture]
-	public class TestIndexReader
+	public class TestIndexReader : LuceneTestCase
 	{
 		/// <summary>Main for running test case by itself. </summary>
 		[STAThread]
@@ -48,13 +48,13 @@
 			//        TestRunner.run (new TestIndexReader("testFilesOpenClose"));
 		}
 		
-        // public TestIndexReader(System.String name)
-        // {
-        // }
+		// public TestIndexReader(System.String name)
+		// {
+		// }
 		
-        public virtual void  TestIsCurrent()
+		public virtual void  TestIsCurrent()
 		{
-			RAMDirectory d = new RAMDirectory();
+			RAMDirectory d = new MockRAMDirectory();
 			IndexWriter writer = new IndexWriter(d, new StandardAnalyzer(), true);
 			AddDocumentWithFields(writer);
 			writer.Close();
@@ -72,13 +72,14 @@
 			writer.Close();
 			Assert.IsFalse(reader.IsCurrent());
 			reader.Close();
+			d.Close();
 		}
 		
 		/// <summary> Tests the IndexReader.getFieldNames implementation</summary>
 		/// <throws>  Exception on error </throws>
 		public virtual void  TestGetFieldNames()
 		{
-			RAMDirectory d = new RAMDirectory();
+			RAMDirectory d = new MockRAMDirectory();
 			// set up writer
 			IndexWriter writer = new IndexWriter(d, new StandardAnalyzer(), true);
 			AddDocumentWithFields(writer);
@@ -90,6 +91,7 @@
 			Assert.IsTrue(CollectionContains(fieldNames, "text"));
 			Assert.IsTrue(CollectionContains(fieldNames, "unindexed"));
 			Assert.IsTrue(CollectionContains(fieldNames, "unstored"));
+			reader.Close();
 			// add more documents
 			writer = new IndexWriter(d, new StandardAnalyzer(), false);
 			// want to get some more segments here
@@ -164,19 +166,44 @@
 			fieldNames = reader.GetFieldNames(IndexReader.FieldOption.TERMVECTOR_WITH_POSITION_OFFSET);
 			Assert.AreEqual(1, fieldNames.Count); // 4 fields are indexed with term vectors
 			Assert.IsTrue(CollectionContains(fieldNames, "tvpositionoffset"));
+			reader.Close();
+			d.Close();
+		}
+		
+		[Test]
+		public virtual void  TestTermVectors()
+		{
+			RAMDirectory d = new MockRAMDirectory();
+			// set up writer
+			IndexWriter writer = new IndexWriter(d, new StandardAnalyzer(), true);
+			// want to get some more segments here
+			// new termvector fields
+			for (int i = 0; i < 5 * writer.GetMergeFactor(); i++)
+			{
+				Document doc = new Document();
+				doc.Add(new Field("tvnot", "one two two three three three", Field.Store.YES, Field.Index.TOKENIZED, Field.TermVector.NO));
+				doc.Add(new Field("termvector", "one two two three three three", Field.Store.YES, Field.Index.TOKENIZED, Field.TermVector.YES));
+				doc.Add(new Field("tvoffset", "one two two three three three", Field.Store.YES, Field.Index.TOKENIZED, Field.TermVector.WITH_OFFSETS));
+				doc.Add(new Field("tvposition", "one two two three three three", Field.Store.YES, Field.Index.TOKENIZED, Field.TermVector.WITH_POSITIONS));
+				doc.Add(new Field("tvpositionoffset", "one two two three three three", Field.Store.YES, Field.Index.TOKENIZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
+				
+				writer.AddDocument(doc);
+			}
+			writer.Close();
+			IndexReader reader = IndexReader.Open(d);
+			FieldSortedTermVectorMapper mapper = new FieldSortedTermVectorMapper(new TermVectorEntryFreqSortedComparator());
+			reader.GetTermFreqVector(0, mapper);
+			System.Collections.IDictionary map = mapper.GetFieldToTerms();
+			Assert.IsTrue(map != null, "map is null and it shouldn't be");
+			Assert.IsTrue(map.Count == 4, "map Size: " + map.Count + " is not: " + 4);
+			System.Collections.IDictionary set_Renamed = (System.Collections.IDictionary) map["termvector"];
+			for (System.Collections.IEnumerator iterator = set_Renamed.Keys.GetEnumerator(); iterator.MoveNext(); )
+			{
+				TermVectorEntry entry = (TermVectorEntry) iterator.Current;
+				Assert.IsTrue(entry != null, "entry is null and it shouldn't be");
+				System.Console.Out.WriteLine("Entry: " + entry);
+			}
 		}
-
-        public static bool CollectionContains(System.Collections.ICollection col, System.String val)
-        {
-            for (System.Collections.IEnumerator iterator = col.GetEnumerator(); iterator.MoveNext(); )
-            {
-                System.Collections.DictionaryEntry fi = (System.Collections.DictionaryEntry) iterator.Current;
-                System.String s = fi.Key.ToString();
-                if (s == val)
-                    return true;
-            }
-            return false;
-        }
 		
 		private void  AssertTermDocsCount(System.String msg, IndexReader reader, Term term, int expected)
 		{
@@ -204,7 +231,7 @@
 		[Test]
 		public virtual void  TestBasicDelete()
 		{
-			Directory dir = new RAMDirectory();
+			Directory dir = new MockRAMDirectory();
 			
 			IndexWriter writer = null;
 			IndexReader reader = null;
@@ -223,6 +250,7 @@
 			reader = IndexReader.Open(dir);
 			Assert.AreEqual(100, reader.DocFreq(searchTerm), "first docFreq");
 			AssertTermDocsCount("first reader", reader, searchTerm, 100);
+			reader.Close();
 			
 			// DELETE DOCUMENTS CONTAINING TERM: aaa
 			int deleted = 0;
@@ -232,104 +260,248 @@
 			Assert.AreEqual(100, reader.DocFreq(searchTerm), "deleted docFreq");
 			AssertTermDocsCount("deleted termDocs", reader, searchTerm, 0);
 			
-            // open a 2nd reader to make sure first reader can
-            // commit its changes (.del) while second reader
-            // is open:
-            IndexReader reader2 = IndexReader.Open(dir);
-            reader.Close();
+			// open a 2nd reader to make sure first reader can
+			// commit its changes (.del) while second reader
+			// is open:
+			IndexReader reader2 = IndexReader.Open(dir);
+			reader.Close();
 			
-            // CREATE A NEW READER and re-test
+			// CREATE A NEW READER and re-test
 			reader = IndexReader.Open(dir);
 			Assert.AreEqual(100, reader.DocFreq(searchTerm), "deleted docFreq");
 			AssertTermDocsCount("deleted termDocs", reader, searchTerm, 0);
 			reader.Close();
+			reader2.Close();
+			dir.Close();
+		}
+		
+		// Make sure attempts to make changes after reader is
+		// closed throws IOException:
+		[Test]
+		public virtual void  TestChangesAfterClose()
+		{
+			Directory dir = new RAMDirectory();
+			
+			IndexWriter writer = null;
+			IndexReader reader = null;
+			Term searchTerm = new Term("content", "aaa");
+			
+			//  add 11 documents with term : aaa
+			writer = new IndexWriter(dir, new WhitespaceAnalyzer(), true);
+			for (int i = 0; i < 11; i++)
+			{
+				AddDoc(writer, searchTerm.Text());
+			}
+			writer.Close();
+			
+			reader = IndexReader.Open(dir);
+			
+			// Close reader:
+			reader.Close();
+			
+			// Then, try to make changes:
+			try
+			{
+				reader.DeleteDocument(4);
+				Assert.Fail("deleteDocument after close failed to throw IOException");
+			}
+			catch (AlreadyClosedException)
+			{
+				// expected
+			}
+			
+			try
+			{
+				reader.SetNorm(5, "aaa", 2.0f);
+				Assert.Fail("setNorm after close failed to throw IOException");
+			}
+			catch (AlreadyClosedException)
+			{
+				// expected
+			}
+			
+			try
+			{
+				reader.UndeleteAll();
+				Assert.Fail("undeleteAll after close failed to throw IOException");
+			}
+			catch (AlreadyClosedException)
+			{
+				// expected
+			}
+		}
+		
+		// Make sure we get lock obtain failed exception with 2 writers:
+		[Test]
+		public virtual void  TestLockObtainFailed()
+		{
+			Directory dir = new RAMDirectory();
+			
+			IndexWriter writer = null;
+			IndexReader reader = null;
+			Term searchTerm = new Term("content", "aaa");
+			
+			//  add 11 documents with term : aaa
+			writer = new IndexWriter(dir, new WhitespaceAnalyzer(), true);
+			for (int i = 0; i < 11; i++)
+			{
+				AddDoc(writer, searchTerm.Text());
+			}
+			
+			// Create reader:
+			reader = IndexReader.Open(dir);
+			
+			// Try to make changes
+			try
+			{
+				reader.DeleteDocument(4);
+				Assert.Fail("deleteDocument should have hit LockObtainFailedException");
+			}
+			catch (LockObtainFailedException)
+			{
+				// expected
+			}
+			
+			try
+			{
+				reader.SetNorm(5, "aaa", 2.0f);
+				Assert.Fail("setNorm should have hit LockObtainFailedException");
+			}
+			catch (LockObtainFailedException)
+			{
+				// expected
+			}
+			
+			try
+			{
+				reader.UndeleteAll();
+				Assert.Fail("undeleteAll should have hit LockObtainFailedException");
+			}
+			catch (LockObtainFailedException)
+			{
+				// expected
+			}
+			writer.Close();
+			reader.Close();
 		}
 		
-        // Make sure you can set norms & commit even if a reader
-        // is open against the index:
-        [Test]
-        public virtual void  TestWritingNorms()
-        {
-            System.String tempDir = SupportClass.AppSettings.Get("tempDir", "");
-            if (tempDir == null)
-                throw new System.IO.IOException("tempDir undefined, cannot run test");
+		// Make sure you can set norms & commit even if a reader
+		// is open against the index:
+		[Test]
+		public virtual void  TestWritingNorms()
+		{
+			System.String tempDir = SupportClass.AppSettings.Get("tempDir", "");
+			if (tempDir == null)
+				throw new System.IO.IOException("tempDir undefined, cannot run test");
+			
+			System.IO.FileInfo indexDir = new System.IO.FileInfo(tempDir + "\\" + "lucenetestnormwriter");
+			Directory dir = FSDirectory.GetDirectory(indexDir);
+			IndexWriter writer;
+			IndexReader reader;
+			Term searchTerm = new Term("content", "aaa");
+			
+			//  add 1 documents with term : aaa
+			writer = new IndexWriter(dir, new WhitespaceAnalyzer(), true);
+			AddDoc(writer, searchTerm.Text());
+			writer.Close();
+			
+			//  now open reader & set norm for doc 0
+			reader = IndexReader.Open(dir);
+			reader.SetNorm(0, "content", (float) 2.0);
+			
+			// we should be holding the write lock now:
+			Assert.IsTrue(IndexReader.IsLocked(dir), "locked");
 			
-            System.IO.FileInfo indexDir = new System.IO.FileInfo(System.IO.Path.Combine(tempDir, "lucenetestnormwriter"));
-            Directory dir = FSDirectory.GetDirectory(indexDir);
-            IndexWriter writer = null;
-            IndexReader reader = null;
-            Term searchTerm = new Term("content", "aaa");
+			reader.Commit();
 			
-            //  add 1 documents with term : aaa
-            writer = new IndexWriter(dir, new WhitespaceAnalyzer(), true);
-            AddDoc(writer, searchTerm.Text());
-            writer.Close();
+			// we should not be holding the write lock now:
+			Assert.IsTrue(!IndexReader.IsLocked(dir), "not locked");
 			
-            //  now open reader & set norm for doc 0
-            reader = IndexReader.Open(dir);
-            reader.SetNorm(0, "content", (float) 2.0);
+			// open a 2nd reader:
+			IndexReader reader2 = IndexReader.Open(dir);
 			
-            // we should be holding the write lock now:
-            Assert.IsTrue(IndexReader.IsLocked(dir), "locked");
+			// set norm again for doc 0
+			reader.SetNorm(0, "content", (float) 3.0);
+			Assert.IsTrue(IndexReader.IsLocked(dir), "locked");
 			
-            reader.Commit();
+			reader.Close();
 			
-            // we should not be holding the write lock now:
-            Assert.IsTrue(!IndexReader.IsLocked(dir), "not locked");
+			// we should not be holding the write lock now:
+			Assert.IsTrue(!IndexReader.IsLocked(dir), "not locked");
 			
-            // open a 2nd reader:
-            IndexReader reader2 = IndexReader.Open(dir);
+			reader2.Close();
+			dir.Close();
 			
-            // set norm again for doc 0
-            reader.SetNorm(0, "content", (float) 3.0);
-            Assert.IsTrue(IndexReader.IsLocked(dir), "locked");
+			RmDir(indexDir);
+		}
+		
+		
+		// Make sure you can set norms & commit, and there are
+		// no extra norms files left:
+		[Test]
+		public virtual void  TestWritingNormsNoReader()
+		{
+			Directory dir = new MockRAMDirectory();
+			IndexWriter writer = null;
+			IndexReader reader = null;
+			Term searchTerm = new Term("content", "aaa");
 			
-            reader.Close();
+			//  add 1 documents with term : aaa
+			writer = new IndexWriter(dir, new WhitespaceAnalyzer(), true);
+			writer.SetUseCompoundFile(false);
+			AddDoc(writer, searchTerm.Text());
+			writer.Close();
 			
-            // we should not be holding the write lock now:
-            Assert.IsTrue(!IndexReader.IsLocked(dir), "not locked");
+			//  now open reader & set norm for doc 0 (writes to
+			//  _0_1.s0)
+			reader = IndexReader.Open(dir);
+			reader.SetNorm(0, "content", (float) 2.0);
+			reader.Close();
 			
-            reader2.Close();
-            dir.Close();
+			//  now open reader again & set norm for doc 0 (writes to _0_2.s0)
+			reader = IndexReader.Open(dir);
+			reader.SetNorm(0, "content", (float) 2.0);
+			reader.Close();
+			Assert.IsFalse(dir.FileExists("_0_1.s0"), "failed to remove first generation norms file on writing second generation");
 			
-            RmDir(indexDir);
-        }
+			dir.Close();
+		}
 		
 		
-        [Test]
+		[Test]
 		public virtual void  TestDeleteReaderWriterConflictUnoptimized()
 		{
 			DeleteReaderWriterConflict(false);
 		}
 		
-        [Test]
-        public virtual void  TestOpenEmptyDirectory()
-        {
-            System.String dirName = "test.empty";
-            System.IO.FileInfo fileDirName = new System.IO.FileInfo(dirName);
-            bool tmpBool;
-            if (System.IO.File.Exists(fileDirName.FullName))
-                tmpBool = true;
-            else
-                tmpBool = System.IO.Directory.Exists(fileDirName.FullName);
-            if (!tmpBool)
-            {
-                System.IO.Directory.CreateDirectory(fileDirName.FullName);
-            }
-            try
-            {
-                IndexReader reader = IndexReader.Open(fileDirName);
-                Assert.Fail("opening IndexReader on empty directory failed to produce FileNotFoundException");
-            }
-            catch (System.IO.FileNotFoundException e)
-            {
-                // GOOD
-            }
-            RmDir(fileDirName);
-        }
+		[Test]
+		public virtual void  TestOpenEmptyDirectory()
+		{
+			System.String dirName = "test.empty";
+			System.IO.FileInfo fileDirName = new System.IO.FileInfo(dirName);
+			bool tmpBool;
+			if (System.IO.File.Exists(fileDirName.FullName))
+				tmpBool = true;
+			else
+				tmpBool = System.IO.Directory.Exists(fileDirName.FullName);
+			if (!tmpBool)
+			{
+				System.IO.Directory.CreateDirectory(fileDirName.FullName);
+			}
+			try
+			{
+				IndexReader reader = IndexReader.Open(fileDirName);
+				Assert.Fail("opening IndexReader on empty directory failed to produce FileNotFoundException");
+			}
+			catch (System.IO.FileNotFoundException)
+			{
+				// GOOD
+			}
+			RmDir(fileDirName);
+		}
 		
-        [Test]
-        public virtual void  TestDeleteReaderWriterConflictOptimized()
+		[Test]
+		public virtual void  TestDeleteReaderWriterConflictOptimized()
 		{
 			DeleteReaderWriterConflict(true);
 		}
@@ -386,10 +558,10 @@
 			int deleted = 0;
 			try
 			{
-                deleted = reader.DeleteDocuments(searchTerm);
+				deleted = reader.DeleteDocuments(searchTerm);
 				Assert.Fail("Delete allowed on an index reader with stale segment information");
 			}
-			catch (System.IO.IOException e)
+			catch (StaleReaderException)
 			{
 				/* success */
 			}
@@ -420,43 +592,113 @@
 			reader.Close();
 		}
 		
-        [Test]
-        public virtual void  TestFilesOpenClose()
-        {
-            // Create initial data set
-            System.IO.FileInfo dirFile = new System.IO.FileInfo(System.IO.Path.Combine("tempDir", "testIndex"));
-            Directory dir = GetDirectory();
-            IndexWriter writer = new IndexWriter(dir, new WhitespaceAnalyzer(), true);
-            AddDoc(writer, "test");
-            writer.Close();
-            dir.Close();
-			
-            // Try to erase the data - this ensures that the writer closed all files
-            _TestUtil.RmDir(dirFile);
-            dir = GetDirectory();
-			
-            // Now create the data set again, just as before
-            writer = new IndexWriter(dir, new WhitespaceAnalyzer(), true);
-            AddDoc(writer, "test");
-            writer.Close();
-            dir.Close();
-			
-            // Now open existing directory and test that reader closes all files
-            dir = GetDirectory();
-            IndexReader reader1 = IndexReader.Open(dir);
-            reader1.Close();
-            dir.Close();
-			
-            // The following will fail if reader did not Close
-            // all files
-            _TestUtil.RmDir(dirFile);
-        }
+		private Directory GetDirectory()
+		{
+			return FSDirectory.GetDirectory(new System.IO.FileInfo(System.IO.Path.Combine(SupportClass.AppSettings.Get("tempDir", ""), "testIndex")));
+		}
 		
-        [Test]
+		[Test]
+		public virtual void  TestFilesOpenClose()
+		{
+			// Create initial data set
+			System.IO.FileInfo dirFile = new System.IO.FileInfo(System.IO.Path.Combine("tempDir", "testIndex"));
+			Directory dir = GetDirectory();
+			IndexWriter writer = new IndexWriter(dir, new WhitespaceAnalyzer(), true);
+			AddDoc(writer, "test");
+			writer.Close();
+			dir.Close();
+			
+			// Try to erase the data - this ensures that the writer closed all files
+			_TestUtil.RmDir(dirFile);
+			dir = GetDirectory();
+			
+			// Now create the data set again, just as before
+			writer = new IndexWriter(dir, new WhitespaceAnalyzer(), true);
+			AddDoc(writer, "test");
+			writer.Close();
+			dir.Close();
+			
+			// Now open existing directory and test that reader closes all files
+			dir = GetDirectory();
+			IndexReader reader1 = IndexReader.Open(dir);
+			reader1.Close();
+			dir.Close();
+			
+			// The following will fail if reader did not Close
+			// all files
+			_TestUtil.RmDir(dirFile);
+		}
+		
+		[Test]
 		public virtual void  TestLastModified()
 		{
 			Assert.IsFalse(IndexReader.IndexExists("there_is_no_such_index"));
-			Directory dir = new RAMDirectory();
+			System.IO.FileInfo fileDir = new System.IO.FileInfo(System.IO.Path.Combine(SupportClass.AppSettings.Get("tempDir", ""), "testIndex"));
+			// can't do the filesystem version of this test, as a system level process lock prevents deletion of the index file
+			//for (int i = 0; i < 2; i++)
+			for (int i = 0; i < 1; i++)
+			{
+				try
+				{
+					Directory dir;
+					if (0 == i)
+						dir = new MockRAMDirectory();
+					else
+						dir = GetDirectory();
+					Assert.IsFalse(IndexReader.IndexExists(dir));
+					IndexWriter writer = new IndexWriter(dir, new WhitespaceAnalyzer(), true);
+					AddDocumentWithFields(writer);
+					Assert.IsTrue(IndexReader.IsLocked(dir)); // writer open, so dir is locked
+					writer.Close();
+					Assert.IsTrue(IndexReader.IndexExists(dir));
+					IndexReader reader = IndexReader.Open(dir);
+					Assert.IsFalse(IndexReader.IsLocked(dir)); // reader only, no lock
+					long version = IndexReader.LastModified(dir);
+					if (i == 1)
+					{
+						long version2 = IndexReader.LastModified(fileDir);
+						Assert.AreEqual(version, version2);
+					}
+					reader.Close();
+					// modify index and check version has been
+					// incremented:
+					while (true)
+					{
+						try
+						{
+							System.Threading.Thread.Sleep(new System.TimeSpan((System.Int64) 10000 * 1000));
+							break;
+						}
+						catch (System.Threading.ThreadInterruptedException)
+						{
+							SupportClass.ThreadClass.Current().Interrupt();
+						}
+					}
+					
+					writer = new IndexWriter(dir, new WhitespaceAnalyzer(), true);
+					AddDocumentWithFields(writer);
+					writer.Close();
+					reader = IndexReader.Open(dir);
+					Assert.IsTrue(
+						version <= IndexReader.LastModified(dir),
+						"old lastModified is " + version + "; new lastModified is " + IndexReader.LastModified(dir)
+					);
+					reader.Close();
+					dir.Close();
+				}
+				finally
+				{
+					if (i == 1)
+						_TestUtil.RmDir(fileDir);
+				}
+			}
+		}
+		
+		[Test]
+		public virtual void  TestVersion()
+		{
+			Assert.IsFalse(IndexReader.IndexExists("there_is_no_such_index"));
+			Directory dir = new MockRAMDirectory();
 			Assert.IsFalse(IndexReader.IndexExists(dir));
 			IndexWriter writer = new IndexWriter(dir, new WhitespaceAnalyzer(), true);
 			AddDocumentWithFields(writer);
@@ -465,7 +707,7 @@
 			Assert.IsTrue(IndexReader.IndexExists(dir));
 			IndexReader reader = IndexReader.Open(dir);
 			Assert.IsFalse(IndexReader.IsLocked(dir)); // reader only, no lock
-			long version = IndexReader.LastModified(dir);
+			long version = IndexReader.GetCurrentVersion(dir);
 			reader.Close();
 			// modify index and check version has been
 			// incremented:
@@ -473,44 +715,15 @@
 			AddDocumentWithFields(writer);
 			writer.Close();
 			reader = IndexReader.Open(dir);
-			Assert.IsTrue(version <= IndexReader.LastModified(dir), "old lastModified is " + version + "; new lastModified is " + IndexReader.LastModified(dir));
+			Assert.IsTrue(version < IndexReader.GetCurrentVersion(dir), "old version is " + version + "; new version is " + IndexReader.GetCurrentVersion(dir));
 			reader.Close();
+			dir.Close();
 		}
 		
-        private Directory GetDirectory()
-		{
-            return FSDirectory.GetDirectory(new System.IO.FileInfo(System.IO.Path.Combine(SupportClass.AppSettings.Get("tempDir", ""), "testIndex")));
-		}
-		
-        [Test]
-        public virtual void  TestVersion()
-        {
-            Assert.IsFalse(IndexReader.IndexExists("there_is_no_such_index"));
-            Directory dir = new RAMDirectory();
-            Assert.IsFalse(IndexReader.IndexExists(dir));
-            IndexWriter writer = new IndexWriter(dir, new WhitespaceAnalyzer(), true);
-            AddDocumentWithFields(writer);
-            Assert.IsTrue(IndexReader.IsLocked(dir)); // writer open, so dir is locked
-            writer.Close();
-            Assert.IsTrue(IndexReader.IndexExists(dir));
-            IndexReader reader = IndexReader.Open(dir);
-            Assert.IsFalse(IndexReader.IsLocked(dir)); // reader only, no lock
-            long version = IndexReader.GetCurrentVersion(dir);
-            reader.Close();
-            // modify index and check version has been
-            // incremented:
-            writer = new IndexWriter(dir, new WhitespaceAnalyzer(), true);
-            AddDocumentWithFields(writer);
-            writer.Close();
-            reader = IndexReader.Open(dir);
-            Assert.IsTrue(version < IndexReader.GetCurrentVersion(dir), "old version is " + version + "; new version is " + IndexReader.GetCurrentVersion(dir));
-            reader.Close();
-        }
-		
-        [Test]
-        public virtual void  TestLock()
+		[Test]
+		public virtual void  TestLock()
 		{
-			Directory dir = new RAMDirectory();
+			Directory dir = new MockRAMDirectory();
 			IndexWriter writer = new IndexWriter(dir, new WhitespaceAnalyzer(), true);
 			AddDocumentWithFields(writer);
 			writer.Close();
@@ -521,7 +734,7 @@
 				reader.DeleteDocument(0);
 				Assert.Fail("expected lock");
 			}
-			catch (System.IO.IOException e)
+			catch (System.IO.IOException)
 			{
 				// expected exception
 			}
@@ -529,12 +742,13 @@
 			reader.DeleteDocument(0);
 			reader.Close();
 			writer.Close();
+			dir.Close();
 		}
 		
 		[Test]
-        public virtual void  TestUndeleteAll()
+		public virtual void  TestUndeleteAll()
 		{
-			Directory dir = new RAMDirectory();
+			Directory dir = new MockRAMDirectory();
 			IndexWriter writer = new IndexWriter(dir, new WhitespaceAnalyzer(), true);
 			AddDocumentWithFields(writer);
 			AddDocumentWithFields(writer);
@@ -547,392 +761,426 @@
 			reader = IndexReader.Open(dir);
 			Assert.AreEqual(2, reader.NumDocs()); // nothing has really been deleted thanks to undeleteAll()
 			reader.Close();
+			dir.Close();
+		}
+		
+		[Test]
+		public virtual void  TestUndeleteAllAfterClose()
+		{
+			Directory dir = new RAMDirectory();
+			IndexWriter writer = new IndexWriter(dir, new WhitespaceAnalyzer(), true);
+			AddDocumentWithFields(writer);
+			AddDocumentWithFields(writer);
+			writer.Close();
+			IndexReader reader = IndexReader.Open(dir);
+			reader.DeleteDocument(0);
+			reader.DeleteDocument(1);
+			reader.Close();
+			reader = IndexReader.Open(dir);
+			reader.UndeleteAll();
+			Assert.AreEqual(2, reader.NumDocs()); // nothing has really been deleted thanks to undeleteAll()
+			reader.Close();
+			dir.Close();
 		}
 		
-        [Test]
-        public virtual void  TestUndeleteAllAfterClose()
-        {
-            Directory dir = new RAMDirectory();
-            IndexWriter writer = new IndexWriter(dir, new WhitespaceAnalyzer(), true);
-            AddDocumentWithFields(writer);
-            AddDocumentWithFields(writer);
-            writer.Close();
-            IndexReader reader = IndexReader.Open(dir);
-            reader.DeleteDocument(0);
-            reader.DeleteDocument(1);
-            reader.Close();
-            reader = IndexReader.Open(dir);
-            reader.UndeleteAll();
-            Assert.AreEqual(2, reader.NumDocs()); // nothing has really been deleted thanks to undeleteAll()
-            reader.Close();
-        }
-		
-        [Test]
-        public virtual void  TestUndeleteAllAfterCloseThenReopen()
-        {
-            Directory dir = new RAMDirectory();
-            IndexWriter writer = new IndexWriter(dir, new WhitespaceAnalyzer(), true);
-            AddDocumentWithFields(writer);
-            AddDocumentWithFields(writer);
-            writer.Close();
-            IndexReader reader = IndexReader.Open(dir);
-            reader.DeleteDocument(0);
-            reader.DeleteDocument(1);
-            reader.Close();
-            reader = IndexReader.Open(dir);
-            reader.UndeleteAll();
-            reader.Close();
-            reader = IndexReader.Open(dir);
-            Assert.AreEqual(2, reader.NumDocs()); // nothing has really been deleted thanks to undeleteAll()
-            reader.Close();
-        }
+		[Test]
+		public virtual void  TestUndeleteAllAfterCloseThenReopen()
+		{
+			Directory dir = new MockRAMDirectory();
+			IndexWriter writer = new IndexWriter(dir, new WhitespaceAnalyzer(), true);
+			AddDocumentWithFields(writer);
+			AddDocumentWithFields(writer);
+			writer.Close();
+			IndexReader reader = IndexReader.Open(dir);
+			reader.DeleteDocument(0);
+			reader.DeleteDocument(1);
+			reader.Close();
+			reader = IndexReader.Open(dir);
+			reader.UndeleteAll();
+			reader.Close();
+			reader = IndexReader.Open(dir);
+			Assert.AreEqual(2, reader.NumDocs()); // nothing has really been deleted thanks to undeleteAll()
+			reader.Close();
+			dir.Close();
+		}
 		
-        [Test]
-        public virtual void  TestDeleteReaderReaderConflictUnoptimized()
+		[Test]
+		public virtual void  TestDeleteReaderReaderConflictUnoptimized()
 		{
 			DeleteReaderReaderConflict(false);
 		}
 		
 		[Test]
-        public virtual void  TestDeleteReaderReaderConflictOptimized()
+		public virtual void  TestDeleteReaderReaderConflictOptimized()
 		{
 			DeleteReaderReaderConflict(true);
 		}
 		
-        /// <summary> Make sure if reader tries to commit but hits disk
-        /// full that reader remains consistent and usable.
-        /// </summary>
-        [Test]
-        public virtual void  TestDiskFull()
-        {
-			
-            bool debug = false;
-            Term searchTerm = new Term("content", "aaa");
-            int START_COUNT = 157;
-            int END_COUNT = 144;
-			
-            // First build up a starting index:
-            RAMDirectory startDir = new RAMDirectory();
-            IndexWriter writer = new IndexWriter(startDir, new WhitespaceAnalyzer(), true);
-            for (int i = 0; i < 157; i++)
-            {
-                Lucene.Net.Documents.Document d = new Lucene.Net.Documents.Document();
-                d.Add(new Field("id", System.Convert.ToString(i), Field.Store.YES, Field.Index.UN_TOKENIZED));
-                d.Add(new Field("content", "aaa " + i, Field.Store.NO, Field.Index.TOKENIZED));
-                writer.AddDocument(d);
-            }
-            writer.Close();
-			
-            long diskUsage = startDir.SizeInBytes();
-            long diskFree = diskUsage + 100;
-			
-            System.IO.IOException err = null;
-			
-            bool done = false;
-			
-            // Iterate w/ ever increasing free disk space:
-            while (!done)
-            {
-                MockRAMDirectory dir = new MockRAMDirectory(startDir);
-                IndexReader reader = IndexReader.Open(dir);
+		/// <summary> Make sure if reader tries to commit but hits disk
+		/// full that reader remains consistent and usable.
+		/// </summary>
+		[Test]
+		public virtual void  TestDiskFull()
+		{
+			
+			bool debug = false;
+			Term searchTerm = new Term("content", "aaa");
+			int START_COUNT = 157;
+			int END_COUNT = 144;
+			
+			// First build up a starting index:
+			RAMDirectory startDir = new MockRAMDirectory();
+			IndexWriter writer = new IndexWriter(startDir, new WhitespaceAnalyzer(), true);
+			for (int i = 0; i < 157; i++)
+			{
+				Lucene.Net.Documents.Document d = new Lucene.Net.Documents.Document();
+				d.Add(new Field("id", System.Convert.ToString(i), Field.Store.YES, Field.Index.UN_TOKENIZED));
+				d.Add(new Field("content", "aaa " + i, Field.Store.NO, Field.Index.TOKENIZED));
+				writer.AddDocument(d);
+			}
+			writer.Close();
+			
+			long diskUsage = startDir.SizeInBytes();
+			long diskFree = diskUsage + 100;
+			
+			System.IO.IOException err = null;
+			
+			bool done = false;
+			
+			// Iterate w/ ever increasing free disk space:
+			while (!done)
+			{
+				MockRAMDirectory dir = new MockRAMDirectory(startDir);
+				IndexReader reader = IndexReader.Open(dir);
 				
-                // For each disk size, first try to commit against
-                // dir that will hit random IOExceptions & disk
-                // full; after, give it infinite disk space & turn
-                // off random IOExceptions & retry w/ same reader:
-                bool success = false;
+				// For each disk size, first try to commit against
+				// dir that will hit random IOExceptions & disk
+				// full; after, give it infinite disk space & turn
+				// off random IOExceptions & retry w/ same reader:
+				bool success = false;
 				
-                for (int x = 0; x < 2; x++)
-                {
+				for (int x = 0; x < 2; x++)
+				{
 					
-                    double rate = 0.05;
-                    double diskRatio = ((double) diskFree) / diskUsage;
-                    long thisDiskFree;
-                    System.String testName;
+					double rate = 0.05;
+					double diskRatio = ((double) diskFree) / diskUsage;
+					long thisDiskFree;
+					System.String testName;
 					
-                    if (0 == x)
-                    {
-                        thisDiskFree = diskFree;
-                        if (diskRatio >= 2.0)
-                        {
-                            rate /= 2;
-                        }
-                        if (diskRatio >= 4.0)
-                        {
-                            rate /= 2;
-                        }
-                        if (diskRatio >= 6.0)
-                        {
-                            rate = 0.0;
-                        }
-                        if (debug)
-                        {
-                            System.Console.Out.WriteLine("\ncycle: " + diskFree + " bytes");
-                        }
-                        testName = "disk full during reader.Close() @ " + thisDiskFree + " bytes";
-                    }
-                    else
-                    {
-                        thisDiskFree = 0;
-                        rate = 0.0;
-                        if (debug)
-                        {
-                            System.Console.Out.WriteLine("\ncycle: same writer: unlimited disk space");
-                        }
-                        testName = "reader re-use after disk full";
-                    }
+					if (0 == x)
+					{
+						thisDiskFree = diskFree;
+						if (diskRatio >= 2.0)
+						{
+							rate /= 2;
+						}
+						if (diskRatio >= 4.0)
+						{
+							rate /= 2;
+						}
+						if (diskRatio >= 6.0)
+						{
+							rate = 0.0;
+						}
+						if (debug)
+						{
+							System.Console.Out.WriteLine("\ncycle: " + diskFree + " bytes");
+						}
+						testName = "disk full during reader.Close() @ " + thisDiskFree + " bytes";
+					}
+					else
+					{
+						thisDiskFree = 0;
+						rate = 0.0;
+						if (debug)
+						{
+							System.Console.Out.WriteLine("\ncycle: same writer: unlimited disk space");
+						}
+						testName = "reader re-use after disk full";
+					}
 					
-                    dir.SetMaxSizeInBytes(thisDiskFree);
-                    dir.SetRandomIOExceptionRate(rate, diskFree);
+					dir.SetMaxSizeInBytes(thisDiskFree);
+					dir.SetRandomIOExceptionRate(rate, diskFree);
 					
-                    try
-                    {
-                        if (0 == x)
-                        {
-                            int docId = 12;
-                            for (int i = 0; i < 13; i++)
-                            {
-                                reader.DeleteDocument(docId);
-                                reader.SetNorm(docId, "contents", (float) 2.0);
-                                docId += 12;
-                            }
-                        }
-                        reader.Close();
-                        success = true;
-                        if (0 == x)
-                        {
-                            done = true;
-                        }
-                    }
-                    catch (System.IO.IOException e)
-                    {
-                        if (debug)
-                        {
-                            System.Console.Out.WriteLine("  hit IOException: " + e);
-                        }
-                        err = e;
-                        if (1 == x)
-                        {
-                            System.Console.Error.WriteLine(e.StackTrace);
-                            Assert.Fail(testName + " hit IOException after disk space was freed up");
-                        }
-                    }
+					try
+					{
+						if (0 == x)
+						{
+							int docId = 12;
+							for (int i = 0; i < 13; i++)
+							{
+								reader.DeleteDocument(docId);
+								reader.SetNorm(docId, "contents", (float) 2.0);
+								docId += 12;
+							}
+						}
+						reader.Close();
+						success = true;
+						if (0 == x)
+						{
+							done = true;
+						}
+					}
+					catch (System.IO.IOException e)
+					{
+						if (debug)
+						{
+							System.Console.Out.WriteLine("  hit IOException: " + e);
+						}
+						err = e;
+						if (1 == x)
+						{
+							System.Console.Error.WriteLine(e.StackTrace);
+							Assert.Fail(testName + " hit IOException after disk space was freed up");
+						}
+					}
 					
-                    // Whether we succeeded or failed, check that all
-                    // un-referenced files were in fact deleted (ie,
-                    // we did not create garbage).  Just create a
-                    // new IndexFileDeleter, have it delete
-                    // unreferenced files, then verify that in fact
-                    // no files were deleted:
-                    System.String[] startFiles = dir.List();
-                    SegmentInfos infos = new SegmentInfos();
-                    infos.Read(dir);
-                    IndexFileDeleter d = new IndexFileDeleter(infos, dir);
-                    d.FindDeletableFiles();
-                    d.DeleteFiles();
-                    System.String[] endFiles = dir.List();
+					// Whether we succeeded or failed, check that all
+					// un-referenced files were in fact deleted (ie,
+					// we did not create garbage).  Just create a
+					// new IndexFileDeleter, have it delete
+					// unreferenced files, then verify that in fact
+					// no files were deleted:
+					System.String[] startFiles = dir.List();
+					SegmentInfos infos = new SegmentInfos();
+					infos.Read(dir);
+					IndexFileDeleter d = new IndexFileDeleter(dir, new KeepOnlyLastCommitDeletionPolicy(), infos, null, null);
+					System.String[] endFiles = dir.List();
 					
-                    System.Array.Sort(startFiles);
-                    System.Array.Sort(endFiles);
+					System.Array.Sort(startFiles);
+					System.Array.Sort(endFiles);
 					
-                    //for(int i=0;i<startFiles.length;i++) {
-                    //  System.out.println("  startFiles: " + i + ": " + startFiles[i]);
-                    //}
+					//for(int i=0;i<startFiles.length;i++) {
+					//  System.out.println("  startFiles: " + i + ": " + startFiles[i]);
+					//}
 					
-                    if (SupportClass.Compare.CompareStringArrays(startFiles, endFiles) == false)
-                    {
-                        System.String successStr;
-                        if (success)
-                        {
-                            successStr = "success";
-                        }
-                        else
-                        {
-                            successStr = "IOException";
-                            System.Console.Error.WriteLine(err.StackTrace);
-                        }
-                        Assert.Fail("reader.Close() failed to delete unreferenced files after " + successStr + " (" + diskFree + " bytes): before delete:\n    " + ArrayToString(startFiles) + "\n  after delete:\n    " + ArrayToString(endFiles));
-                    }
+					if (SupportClass.Compare.CompareStringArrays(startFiles, endFiles) == false)
+					{
+						System.String successStr;
+						if (success)
+						{
+							successStr = "success";
+						}
+						else
+						{
+							successStr = "IOException";
+							System.Console.Error.WriteLine(err.StackTrace);
+						}
+						Assert.Fail("reader.Close() failed to delete unreferenced files after " + successStr + " (" + diskFree + " bytes): before delete:\n    " + ArrayToString(startFiles) + "\n  after delete:\n    " + ArrayToString(endFiles));
+					}
 					
-                    // Finally, verify index is not corrupt, and, if
-                    // we succeeded, we see all docs changed, and if
-                    // we failed, we see either all docs or no docs
-                    // changed (transactional semantics):
-                    IndexReader newReader = null;
-                    try
-                    {
-                        newReader = IndexReader.Open(dir);
-                    }
-                    catch (System.IO.IOException e)
-                    {
-                        System.Console.Error.WriteLine(e.StackTrace);
-                        Assert.Fail(testName + ":exception when creating IndexReader after disk full during Close: " + e);
-                    }
-                    /*
-                    int result = newReader.docFreq(searchTerm);
-                    if (success) {
-                    if (result != END_COUNT) {
-                    fail(testName + ": method did not throw exception but docFreq('aaa') is " + result + " instead of expected " + END_COUNT);
-                    }
-                    } else {
-                    // On hitting exception we still may have added
-                    // all docs:
-                    if (result != START_COUNT && result != END_COUNT) {
-                    err.printStackTrace();
-                    fail(testName + ": method did throw exception but docFreq('aaa') is " + result + " instead of expected " + START_COUNT + " or " + END_COUNT);
-                    }
-                    }
-                    */
+					// Finally, verify index is not corrupt, and, if
+					// we succeeded, we see all docs changed, and if
+					// we failed, we see either all docs or no docs
+					// changed (transactional semantics):
+					IndexReader newReader = null;
+					try
+					{
+						newReader = IndexReader.Open(dir);
+					}
+					catch (System.IO.IOException e)
+					{
+						System.Console.Error.WriteLine(e.StackTrace);
+						Assert.Fail(testName + ":exception when creating IndexReader after disk full during Close: " + e);
+					}
+					/*
+					int result = newReader.docFreq(searchTerm);
+					if (success) {
+					if (result != END_COUNT) {
+					fail(testName + ": method did not throw exception but docFreq('aaa') is " + result + " instead of expected " + END_COUNT);
+					}
+					} else {
+					// On hitting exception we still may have added
+					// all docs:
+					if (result != START_COUNT && result != END_COUNT) {
+					err.printStackTrace();
+					fail(testName + ": method did throw exception but docFreq('aaa') is " + result + " instead of expected " + START_COUNT + " or " + END_COUNT);
+					}
+					}
+					*/
 					
-                    IndexSearcher searcher = new IndexSearcher(newReader);
-                    Hits hits = null;
-                    try
-                    {
-                        hits = searcher.Search(new TermQuery(searchTerm));
-                    }
-                    catch (System.IO.IOException e)
-                    {
-                        System.Console.Error.WriteLine(e.StackTrace);
-                        Assert.Fail(testName + ": exception when searching: " + e);
-                    }
-                    int result2 = hits.Length();
-                    if (success)
-                    {
-                        if (result2 != END_COUNT)
-                        {
-                            Assert.Fail(testName + ": method did not throw exception but hits.length for search on term 'aaa' is " + result2 + " instead of expected " + END_COUNT);
-                        }
-                    }
-                    else
-                    {
-                        // On hitting exception we still may have added
-                        // all docs:
-                        if (result2 != START_COUNT && result2 != END_COUNT)
-                        {
-                            System.Console.Error.WriteLine(err.StackTrace);
-                            Assert.Fail(testName + ": method did throw exception but hits.length for search on term 'aaa' is " + result2 + " instead of expected " + START_COUNT);
-                        }
-                    }
+					IndexSearcher searcher = new IndexSearcher(newReader);
+					Hits hits = null;
+					try
+					{
+						hits = searcher.Search(new TermQuery(searchTerm));
+					}
+					catch (System.IO.IOException e)
+					{
+						System.Console.Error.WriteLine(e.StackTrace);
+						Assert.Fail(testName + ": exception when searching: " + e);
+					}
+					int result2 = hits.Length();
+					if (success)
+					{
+						if (result2 != END_COUNT)
+						{
+							Assert.Fail(testName + ": method did not throw exception but hits.length for search on term 'aaa' is " + result2 + " instead of expected " + END_COUNT);
+						}
+					}
+					else
+					{
+						// On hitting exception we still may have added
+						// all docs:
+						if (result2 != START_COUNT && result2 != END_COUNT)
+						{
+							System.Console.Error.WriteLine(err.StackTrace);
+							Assert.Fail(testName + ": method did throw exception but hits.length for search on term 'aaa' is " + result2 + " instead of expected " + START_COUNT);
+						}
+					}
 					
-                    searcher.Close();
-                    newReader.Close();
+					searcher.Close();
+					newReader.Close();
 					
-                    if (result2 == END_COUNT)
-                    {
-                        break;
-                    }
-                }
+					if (result2 == END_COUNT)
+					{
+						break;
+					}
+				}
 				
-                dir.Close();
+				dir.Close();
 				
-                // Try again with 10 more bytes of free space:
-                diskFree += 10;
-            }
-        }
-		
-        [Test]
-        public virtual void  TestDocsOutOfOrderJIRA140()
-        {
-            Directory dir = new RAMDirectory();
-            IndexWriter writer = new IndexWriter(dir, new WhitespaceAnalyzer(), true);
-            for (int i = 0; i < 11; i++)
-            {
-                AddDoc(writer, "aaa");
-            }
-            writer.Close();
-            IndexReader reader = IndexReader.Open(dir);
-			
-            // Try to delete an invalid docId, yet, within range
-            // of the final bits of the BitVector:
-			
-            bool gotException = false;
-            try
-            {
-                reader.DeleteDocument(11);
-            }
-            catch (System.IndexOutOfRangeException e)
-            {
-                gotException = true;
-            }
-            reader.Close();
-			
-            writer = new IndexWriter(dir, new WhitespaceAnalyzer(), false);
-			
-            // We must add more docs to get a new segment written
-            for (int i = 0; i < 11; i++)
-            {
-                AddDoc(writer, "aaa");
-            }
-			
-            // Without the fix for LUCENE-140 this call will
-            // [incorrectly] hit a "docs out of order"
-            // IllegalStateException because above out-of-bounds
-            // deleteDocument corrupted the index:
-            writer.Optimize();
-			
-            if (!gotException)
-            {
-                Assert.Fail("delete of out-of-bounds doc number failed to hit exception");
-            }
-        }
-		
-        [Test]
-        public virtual void  TestExceptionReleaseWriteLockJIRA768()
-        {
-			
-            Directory dir = new RAMDirectory();
-            IndexWriter writer = new IndexWriter(dir, new WhitespaceAnalyzer(), true);
-            AddDoc(writer, "aaa");
-            writer.Close();
-			
-            IndexReader reader = IndexReader.Open(dir);
-            try
-            {
-                reader.DeleteDocument(1);
-                Assert.Fail("did not hit exception when deleting an invalid doc number");
-            }
-            catch (System.IndexOutOfRangeException e)
-            {
-                // expected
-            }
-            reader.Close();
-            if (IndexReader.IsLocked(dir))
-            {
-                Assert.Fail("write lock is still held after Close");
-            }
-			
-            reader = IndexReader.Open(dir);
-            try
-            {
-                reader.SetNorm(1, "content", (float) 2.0);
-                Assert.Fail("did not hit exception when calling setNorm on an invalid doc number");
-            }
-            catch (System.IndexOutOfRangeException e)
-            {
-                // expected
-            }
-            reader.Close();
-            if (IndexReader.IsLocked(dir))
-            {
-                Assert.Fail("write lock is still held after Close");
-            }
-        }
-		
-        private System.String ArrayToString(System.String[] l)
-        {
-            System.String s = "";
-            for (int i = 0; i < l.Length; i++)
-            {
-                if (i > 0)
-                {
-                    s += "\n    ";
-                }
-                s += l[i];
-            }
-            return s;
-        }
+				// Try again with 10 more bytes of free space:
+				diskFree += 10;
+			}
+			
+			startDir.Close();
+		}
 		
-        private void  DeleteReaderReaderConflict(bool optimize)
+		[Test]
+		public virtual void  TestDocsOutOfOrderJIRA140()
+		{
+			Directory dir = new MockRAMDirectory();
+			IndexWriter writer = new IndexWriter(dir, new WhitespaceAnalyzer(), true);
+			for (int i = 0; i < 11; i++)
+			{
+				AddDoc(writer, "aaa");
+			}
+			writer.Close();
+			IndexReader reader = IndexReader.Open(dir);
+			
+			// Try to delete an invalid docId, yet, within range
+			// of the final bits of the BitVector:
+			
+			bool gotException = false;
+			try
+			{
+				reader.DeleteDocument(11);
+			}
+			catch (System.IndexOutOfRangeException)
+			{
+				gotException = true;
+			}
+			reader.Close();
+			
+			writer = new IndexWriter(dir, new WhitespaceAnalyzer(), false);
+			
+			// We must add more docs to get a new segment written
+			for (int i = 0; i < 11; i++)
+			{
+				AddDoc(writer, "aaa");
+			}
+			
+			// Without the fix for LUCENE-140 this call will
+			// [incorrectly] hit a "docs out of order"
+			// IllegalStateException because above out-of-bounds
+			// deleteDocument corrupted the index:
+			writer.Optimize();
+			
+			if (!gotException)
+			{
+				Assert.Fail("delete of out-of-bounds doc number failed to hit exception");
+			}
+			dir.Close();
+		}
+		
+		[Test]
+		public virtual void  TestExceptionReleaseWriteLockJIRA768()
+		{
+			
+			Directory dir = new MockRAMDirectory();
+			IndexWriter writer = new IndexWriter(dir, new WhitespaceAnalyzer(), true);
+			AddDoc(writer, "aaa");
+			writer.Close();
+			
+			IndexReader reader = IndexReader.Open(dir);
+			try
+			{
+				reader.DeleteDocument(1);
+				Assert.Fail("did not hit exception when deleting an invalid doc number");
+			}
+			catch (System.IndexOutOfRangeException)
+			{
+				// expected
+			}
+			reader.Close();
+			if (IndexReader.IsLocked(dir))
+			{
+				Assert.Fail("write lock is still held after Close");
+			}
+			
+			reader = IndexReader.Open(dir);
+			try
+			{
+				reader.SetNorm(1, "content", (float) 2.0);
+				Assert.Fail("did not hit exception when calling setNorm on an invalid doc number");
+			}
+			catch (System.IndexOutOfRangeException)
+			{
+				// expected
+			}
+			reader.Close();
+			if (IndexReader.IsLocked(dir))
+			{
+				Assert.Fail("write lock is still held after Close");
+			}
+			dir.Close();
+		}
+		
+		private System.String ArrayToString(System.String[] l)
+		{
+			System.String s = "";
+			for (int i = 0; i < l.Length; i++)
+			{
+				if (i > 0)
+				{
+					s += "\n    ";
+				}
+				s += l[i];
+			}
+			return s;
+		}
+		
+		[Test]
+		public virtual void  TestOpenReaderAfterDelete()
+		{
+			System.IO.FileInfo dirFile = new System.IO.FileInfo(System.IO.Path.Combine(SupportClass.AppSettings.Get("tempDir", ""), "deletetest"));
+			Directory dir = FSDirectory.GetDirectory(dirFile);
+			try
+			{
+				IndexReader reader = IndexReader.Open(dir);
+				Assert.Fail("expected FileNotFoundException");
+			}
+			catch (System.IO.FileNotFoundException)
+			{
+				// expected
+			}
+
+			System.IO.Directory.Delete(dirFile.FullName);
+
+			// Make sure we still get a CorruptIndexException (not NPE):
+			try
+			{
+				IndexReader reader = IndexReader.Open(dir);
+				Assert.Fail("expected FileNotFoundException");
+			}
+			catch (System.IO.DirectoryNotFoundException)
+			{
+				// expected
+			}
+		}
+		
+		private void  DeleteReaderReaderConflict(bool optimize)
 		{
 			Directory dir = GetDirectory();
 			
@@ -1001,7 +1249,7 @@
 				reader1.DeleteDocuments(searchTerm2);
 				Assert.Fail("Delete allowed from a stale index reader");
 			}
-			catch (System.IO.IOException e)
+			catch (System.IO.IOException)
 			{
 				/* success */
 			}
@@ -1078,40 +1326,138 @@
 			writer.AddDocument(doc);
 		}
 
-        private void  RmDir(System.IO.FileInfo dir)
-        {
-            System.IO.FileInfo[] files = SupportClass.FileSupport.GetFiles(dir);
-            for (int i = 0; i < files.Length; i++)
-            {
-                bool tmpBool;
-                if (System.IO.File.Exists(files[i].FullName))
-                {
-                    System.IO.File.Delete(files[i].FullName);
-                    tmpBool = true;
-                }
-                else if (System.IO.Directory.Exists(files[i].FullName))
-                {
-                    System.IO.Directory.Delete(files[i].FullName);
-                    tmpBool = true;
-                }
-                else
-                    tmpBool = false;
-                bool generatedAux = tmpBool;
-            }
-            bool tmpBool2;
-            if (System.IO.File.Exists(dir.FullName))
-            {
-                System.IO.File.Delete(dir.FullName);
-                tmpBool2 = true;
-            }
-            else if (System.IO.Directory.Exists(dir.FullName))
-            {
-                System.IO.Directory.Delete(dir.FullName);
-                tmpBool2 = true;
-            }
-            else
-                tmpBool2 = false;
-            bool generatedAux2 = tmpBool2;
-        }
-    }
+		private void  RmDir(System.IO.FileInfo dir)
+		{
+			System.IO.FileInfo[] files = SupportClass.FileSupport.GetFiles(dir);
+			for (int i = 0; i < files.Length; i++)
+			{
+				bool tmpBool;
+				if (System.IO.File.Exists(files[i].FullName))
+				{
+					System.IO.File.Delete(files[i].FullName);
+					tmpBool = true;
+				}
+				else if (System.IO.Directory.Exists(files[i].FullName))
+				{
+					System.IO.Directory.Delete(files[i].FullName);
+					tmpBool = true;
+				}
+				else
+					tmpBool = false;
+				bool generatedAux = tmpBool;
+			}
+			bool tmpBool2;
+			if (System.IO.File.Exists(dir.FullName))
+			{
+				System.IO.File.Delete(dir.FullName);
+				tmpBool2 = true;
+			}
+			else if (System.IO.Directory.Exists(dir.FullName))
+			{
+				System.IO.Directory.Delete(dir.FullName);
+				tmpBool2 = true;
+			}
+			else
+				tmpBool2 = false;
+			bool generatedAux2 = tmpBool2;
+		}
+		
+		public static void  AssertIndexEquals(IndexReader index1, IndexReader index2)
+		{
+			Assert.AreEqual(index1.NumDocs(), index2.NumDocs(), "IndexReaders have different values for numDocs.");
+			Assert.AreEqual(index1.MaxDoc(), index2.MaxDoc(), "IndexReaders have different values for maxDoc.");
+			Assert.AreEqual(index1.HasDeletions(), index2.HasDeletions(), "Only one IndexReader has deletions.");
+			Assert.AreEqual(index1.IsOptimized(), index2.IsOptimized(), "Only one index is optimized.");
+			
+			// check field names
+			System.Collections.ICollection fields1 = index1.GetFieldNames(FieldOption.ALL);
+			System.Collections.ICollection fields2 = index2.GetFieldNames(FieldOption.ALL);
+			Assert.AreEqual(fields1.Count, fields2.Count, "IndexReaders have different numbers of fields.");
+			System.Collections.IEnumerator it1 = ((System.Collections.IDictionary) fields1).Keys.GetEnumerator();
+			System.Collections.IEnumerator it2 = ((System.Collections.IDictionary) fields2).Keys.GetEnumerator();
+			while (it1.MoveNext())
+			{
+				Assert.IsTrue(it2.MoveNext());
+				Assert.AreEqual((System.String) it1.Current, (System.String) it2.Current, "Different field names.");
+			}
+			
+			// check norms
+			it1 = ((System.Collections.IDictionary) fields1).Keys.GetEnumerator();
+			while (it1.MoveNext())
+			{
+				System.String curField = (System.String) it1.Current;
+				byte[] norms1 = index1.Norms(curField);
+				byte[] norms2 = index2.Norms(curField);
+				Assert.AreEqual(norms1.Length, norms2.Length);
+				for (int i = 0; i < norms1.Length; i++)
+				{
+					Assert.AreEqual(norms1[i], norms2[i], "Norm different for doc " + i + " and field '" + curField + "'.");
+				}
+			}
+			
+			// check deletions
+			for (int i = 0; i < index1.MaxDoc(); i++)
+			{
+				Assert.AreEqual(index1.IsDeleted(i), index2.IsDeleted(i), "Doc " + i + " only deleted in one index.");
+			}
+			
+			// check stored fields
+			for (int i = 0; i < index1.MaxDoc(); i++)
+			{
+				if (!index1.IsDeleted(i))
+				{
+					Document doc1 = index1.Document(i);
+					Document doc2 = index2.Document(i);
+					fields1 = doc1.GetFields();
+					fields2 = doc2.GetFields();
+					Assert.AreEqual(fields1.Count, fields2.Count, "Different numbers of fields for doc " + i + ".");
+					it1 = fields1.GetEnumerator();
+					it2 = fields2.GetEnumerator();
+					while (it1.MoveNext())
+					{
+						Assert.IsTrue(it2.MoveNext());
+						Field curField1 = (Field) it1.Current;
+						Field curField2 = (Field) it2.Current;
+						Assert.AreEqual(curField1.Name(), curField2.Name(), "Different fields names for doc " + i + ".");
+						Assert.AreEqual(curField1.StringValue(), curField2.StringValue(), "Different field values for doc " + i + ".");
+					}
+				}
+			}
+			
+			// check dictionary and posting lists
+			TermEnum enum1 = index1.Terms();
+			TermEnum enum2 = index2.Terms();
+			TermPositions tp1 = index1.TermPositions();
+			TermPositions tp2 = index2.TermPositions();
+			while (enum1.Next())
+			{
+				Assert.IsTrue(enum2.Next());
+				Assert.AreEqual(enum1.Term(), enum2.Term(), "Different term in dictionary.");
+				tp1.Seek(enum1.Term());
+				tp2.Seek(enum1.Term());
+				while (tp1.Next())
+				{
+					Assert.IsTrue(tp2.Next());
+					Assert.AreEqual(tp1.Doc(), tp2.Doc(), "Different doc id in postinglist of term " + enum1.Term() + ".");
+					Assert.AreEqual(tp1.Freq(), tp2.Freq(), "Different term frequence in postinglist of term " + enum1.Term() + ".");
+					for (int i = 0; i < tp1.Freq(); i++)
+					{
+						Assert.AreEqual(tp1.NextPosition(), tp2.NextPosition(), "Different positions in postinglist of term " + enum1.Term() + ".");
+					}
+				}
+			}
+		}
+
+		public static bool CollectionContains(System.Collections.ICollection col, System.String val)
+		{
+			for (System.Collections.IEnumerator iterator = col.GetEnumerator(); iterator.MoveNext(); )
+			{
+				System.Collections.DictionaryEntry fi = (System.Collections.DictionaryEntry)iterator.Current;
+				System.String s = fi.Key.ToString();
+				if (s == val)
+					return true;
+			}
+			return false;
+		}
+	}
 }
\ No newline at end of file



Mime
View raw message