lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ccurr...@apache.org
Subject svn commit: r1303294 [6/6] - in /incubator/lucene.net/trunk: src/contrib/Analyzers/AR/ src/contrib/Analyzers/BR/ src/contrib/Analyzers/CJK/ src/contrib/Analyzers/Cn/ src/contrib/Analyzers/Compound/ src/contrib/Analyzers/Cz/ src/contrib/Analyzers/De/ sr...
Date Wed, 21 Mar 2012 06:04:35 GMT
Modified: incubator/lucene.net/trunk/test/core/Index/TestTermVectorsReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestTermVectorsReader.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestTermVectorsReader.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestTermVectorsReader.cs Wed Mar 21 06:04:26 2012
@@ -251,7 +251,7 @@ namespace Lucene.Net.Index
 			Assert.IsTrue(reader != null);
 			for (int j = 0; j < 5; j++)
 			{
-				TermFreqVector vector = reader.Get(j, testFields[0]);
+				ITermFreqVector vector = reader.Get(j, testFields[0]);
 				Assert.IsTrue(vector != null);
 				System.String[] terms = vector.GetTerms();
 				Assert.IsTrue(terms != null);
@@ -300,7 +300,7 @@ namespace Lucene.Net.Index
 				}
 			}
 			
-			TermFreqVector freqVector = reader.Get(0, testFields[1]); //no pos, no offset
+			ITermFreqVector freqVector = reader.Get(0, testFields[1]); //no pos, no offset
 			Assert.IsTrue(freqVector != null);
 			Assert.IsTrue(freqVector is TermPositionVector == false);
 			terms = freqVector.GetTerms();
@@ -364,8 +364,8 @@ namespace Lucene.Net.Index
 			{
 				TermVectorEntry tve = (TermVectorEntry) iterator.Current;
 				Assert.IsTrue(tve != null, "tve is null and it shouldn't be");
-				Assert.IsTrue(tve.Offsets != null, "tve.getOffsets() is null and it shouldn't be");
-				Assert.IsTrue(tve.Positions != null, "tve.getPositions() is null and it shouldn't be");
+				Assert.IsTrue(tve.GetOffsets() != null, "tve.getOffsets() is null and it shouldn't be");
+				Assert.IsTrue(tve.GetPositions() != null, "tve.getPositions() is null and it shouldn't be");
 			}
 			
 			mapper = new SortedTermVectorMapper(new TermVectorEntryFreqSortedComparator());
@@ -379,8 +379,8 @@ namespace Lucene.Net.Index
 			{
 				TermVectorEntry tve = (TermVectorEntry) iterator.Current;
 				Assert.IsTrue(tve != null, "tve is null and it shouldn't be");
-				Assert.IsTrue(tve.Offsets != null, "tve.getOffsets() is null and it shouldn't be");
-				Assert.IsTrue(tve.Positions != null, "tve.getPositions() is null and it shouldn't be");
+				Assert.IsTrue(tve.GetOffsets() != null, "tve.getOffsets() is null and it shouldn't be");
+				Assert.IsTrue(tve.GetPositions() != null, "tve.getPositions() is null and it shouldn't be");
 			}
 			
 			
@@ -404,15 +404,15 @@ namespace Lucene.Net.Index
 					{
 						//should have offsets
 						
-						Assert.IsTrue(tve.Offsets != null, "tve.getOffsets() is null and it shouldn't be");
-						Assert.IsTrue(tve.Positions != null, "tve.getPositions() is null and it shouldn't be");
+						Assert.IsTrue(tve.GetOffsets() != null, "tve.getOffsets() is null and it shouldn't be");
+						Assert.IsTrue(tve.GetPositions() != null, "tve.getPositions() is null and it shouldn't be");
 					}
 					else if (field.Equals(testFields[1]))
 					{
 						//should not have offsets
 						
-						Assert.IsTrue(tve.Offsets == null, "tve.getOffsets() is not null and it shouldn't be");
-						Assert.IsTrue(tve.Positions == null, "tve.getPositions() is not null and it shouldn't be");
+						Assert.IsTrue(tve.GetOffsets() == null, "tve.getOffsets() is not null and it shouldn't be");
+						Assert.IsTrue(tve.GetPositions() == null, "tve.getPositions() is not null and it shouldn't be");
 					}
 				}
 			}
@@ -437,15 +437,15 @@ namespace Lucene.Net.Index
 					{
 						//should have offsets
 						
-						Assert.IsTrue(tve.Offsets == null, "tve.getOffsets() is null and it shouldn't be");
-						Assert.IsTrue(tve.Positions == null, "tve.getPositions() is null and it shouldn't be");
+						Assert.IsTrue(tve.GetOffsets() == null, "tve.getOffsets() is null and it shouldn't be");
+						Assert.IsTrue(tve.GetPositions() == null, "tve.getPositions() is null and it shouldn't be");
 					}
 					else if (field.Equals(testFields[1]))
 					{
 						//should not have offsets
 						
-						Assert.IsTrue(tve.Offsets == null, "tve.getOffsets() is not null and it shouldn't be");
-						Assert.IsTrue(tve.Positions == null, "tve.getPositions() is not null and it shouldn't be");
+						Assert.IsTrue(tve.GetOffsets() == null, "tve.getOffsets() is not null and it shouldn't be");
+						Assert.IsTrue(tve.GetPositions() == null, "tve.getPositions() is not null and it shouldn't be");
 					}
 				}
 			}
@@ -457,19 +457,19 @@ namespace Lucene.Net.Index
 			
 			ir.GetTermFreqVector(0, docNumAwareMapper);
 			Assert.AreEqual(0, docNumAwareMapper.GetDocumentNumber());
-			docNumAwareMapper.SetDocumentNumber(- 1);
+            docNumAwareMapper.SetDocumentNumber(-1);
 			
 			ir.GetTermFreqVector(1, docNumAwareMapper);
 			Assert.AreEqual(1, docNumAwareMapper.GetDocumentNumber());
-			docNumAwareMapper.SetDocumentNumber(- 1);
+            docNumAwareMapper.SetDocumentNumber(-1);
 			
 			ir.GetTermFreqVector(0, "f1", docNumAwareMapper);
 			Assert.AreEqual(0, docNumAwareMapper.GetDocumentNumber());
-			docNumAwareMapper.SetDocumentNumber(- 1);
+		    docNumAwareMapper.SetDocumentNumber(-1);
 			
 			ir.GetTermFreqVector(1, "f2", docNumAwareMapper);
 			Assert.AreEqual(1, docNumAwareMapper.GetDocumentNumber());
-			docNumAwareMapper.SetDocumentNumber(- 1);
+		    docNumAwareMapper.SetDocumentNumber(-1);
 			
 			ir.GetTermFreqVector(0, "f1", docNumAwareMapper);
 			Assert.AreEqual(0, docNumAwareMapper.GetDocumentNumber());
@@ -511,7 +511,7 @@ namespace Lucene.Net.Index
 				TermVectorsReader reader = new TermVectorsReader(dir, seg, fieldInfos);
 				Assert.IsTrue(reader != null);
 				//good document number, bad field number
-				TermFreqVector vector = reader.Get(0, "f50");
+				ITermFreqVector vector = reader.Get(0, "f50");
 				Assert.IsTrue(vector == null);
 			}
 			catch (System.IO.IOException e)
@@ -550,11 +550,11 @@ namespace Lucene.Net.Index
 			{
 				return documentNumber;
 			}
-			
-			public override void  SetDocumentNumber(int documentNumber)
-			{
-				this.documentNumber = documentNumber;
-			}
+
+		    public override void SetDocumentNumber(int documentNumber)
+		    {
+		        this.documentNumber = documentNumber;
+		    }
 		}
 	}
 }
\ No newline at end of file

Modified: incubator/lucene.net/trunk/test/core/Index/TestTermdocPerf.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestTermdocPerf.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestTermdocPerf.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestTermdocPerf.cs Wed Mar 21 06:04:26 2012
@@ -115,7 +115,7 @@ namespace Lucene.Net.Index
 			doc.Add(new Field(field, val, Field.Store.NO, Field.Index.NOT_ANALYZED_NO_NORMS));
 			IndexWriter writer = new IndexWriter(dir, analyzer, true, IndexWriter.MaxFieldLength.LIMITED);
 			writer.SetMaxBufferedDocs(100);
-			writer.SetMergeFactor(100);
+			writer.MergeFactor = 100;
 			
 			for (int i = 0; i < ndocs; i++)
 			{

Modified: incubator/lucene.net/trunk/test/core/Index/TestThreadedOptimize.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestThreadedOptimize.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestThreadedOptimize.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestThreadedOptimize.cs Wed Mar 21 06:04:26 2012
@@ -119,7 +119,7 @@ namespace Lucene.Net.Index
 			{
 				int iterFinal = iter;
 				
-				writer.SetMergeFactor(1000);
+				writer.MergeFactor = 1000;
 				
 				for (int i = 0; i < 200; i++)
 				{
@@ -129,7 +129,7 @@ namespace Lucene.Net.Index
 					writer.AddDocument(d);
 				}
 				
-				writer.SetMergeFactor(4);
+				writer.MergeFactor = 4;
 				//writer.setInfoStream(System.out);
 				
 				ThreadClass[] threads = new ThreadClass[NUM_THREADS];
@@ -153,15 +153,15 @@ namespace Lucene.Net.Index
 				
 				// System.out.println("TEST: now index=" + writer.segString());
 				
-				Assert.AreEqual(expectedDocCount, writer.MaxDoc);
+				Assert.AreEqual(expectedDocCount, writer.MaxDoc());
 				
 				writer.Close();
 				writer = new IndexWriter(directory, ANALYZER, false, IndexWriter.MaxFieldLength.UNLIMITED);
 				writer.SetMaxBufferedDocs(2);
 
 			    IndexReader reader = IndexReader.Open(directory, true);
-				Assert.IsTrue(reader.IsOptimized);
-				Assert.AreEqual(expectedDocCount, reader.NumDocs);
+				Assert.IsTrue(reader.IsOptimized());
+				Assert.AreEqual(expectedDocCount, reader.GetNumDocs());
 				reader.Close();
 			}
 			writer.Close();

Modified: incubator/lucene.net/trunk/test/core/Index/TestTransactionRollback.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestTransactionRollback.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestTransactionRollback.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestTransactionRollback.cs Wed Mar 21 06:04:26 2012
@@ -252,7 +252,7 @@ namespace Lucene.Net.Index
 				// should not work:
 				new IndexWriter(dir, new WhitespaceAnalyzer(), new DeleteLastCommitPolicy(this), MaxFieldLength.UNLIMITED).Close();
 			    IndexReader r = IndexReader.Open(dir, true);
-				Assert.AreEqual(100, r.NumDocs);
+				Assert.AreEqual(100, r.GetNumDocs());
 				r.Close();
 			}
 		}

Modified: incubator/lucene.net/trunk/test/core/Index/TestTransactions.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Index/TestTransactions.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Index/TestTransactions.cs (original)
+++ incubator/lucene.net/trunk/test/core/Index/TestTransactions.cs Wed Mar 21 06:04:26 2012
@@ -133,14 +133,14 @@ namespace Lucene.Net.Index
 				
 				IndexWriter writer1 = new IndexWriter(dir1, new WhitespaceAnalyzer(), IndexWriter.MaxFieldLength.LIMITED);
 				writer1.SetMaxBufferedDocs(3);
-				writer1.SetMergeFactor(2);
+				writer1.MergeFactor = 2;
 				((ConcurrentMergeScheduler) writer1.MergeScheduler).SetSuppressExceptions();
 				
 				IndexWriter writer2 = new IndexWriter(dir2, new WhitespaceAnalyzer(), IndexWriter.MaxFieldLength.LIMITED);
 				// Intentionally use different params so flush/merge
 				// happen @ different times
 				writer2.SetMaxBufferedDocs(2);
-				writer2.SetMergeFactor(3);
+				writer2.MergeFactor = 3;
 				((ConcurrentMergeScheduler) writer2.MergeScheduler).SetSuppressExceptions();
 				
 				Update(writer1);
@@ -228,8 +228,8 @@ namespace Lucene.Net.Index
 					r1 = IndexReader.Open(dir1, true);
 				    r2 = IndexReader.Open(dir2, true);
 				}
-				if (r1.NumDocs != r2.NumDocs)
-					throw new System.SystemException("doc counts differ: r1=" + r1.NumDocs + " r2=" + r2.NumDocs);
+				if (r1.GetNumDocs() != r2.GetNumDocs())
+					throw new System.SystemException("doc counts differ: r1=" + r1.GetNumDocs() + " r2=" + r2.GetNumDocs());
 				r1.Close();
 				r2.Close();
 			}

Modified: incubator/lucene.net/trunk/test/core/QueryParser/TestMultiAnalyzer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/QueryParser/TestMultiAnalyzer.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/QueryParser/TestMultiAnalyzer.cs (original)
+++ incubator/lucene.net/trunk/test/core/QueryParser/TestMultiAnalyzer.cs Wed Mar 21 06:04:26 2012
@@ -195,7 +195,7 @@ namespace Lucene.Net.QueryParsers
 				{
 					termAtt.SetTermBuffer("multi" + (Lucene.Net.QueryParsers.TestMultiAnalyzer.multiToken + 1));
 					offsetAtt.SetOffset(prevStartOffset, prevEndOffset);
-					typeAtt.SetType(prevType);
+					typeAtt.Type = prevType;
 					posIncrAtt.PositionIncrement = 0;
 					Lucene.Net.QueryParsers.TestMultiAnalyzer.multiToken--;
 					return true;
@@ -207,9 +207,9 @@ namespace Lucene.Net.QueryParsers
 					{
 						return false;
 					}
-					prevType = typeAtt.Type();
-					prevStartOffset = offsetAtt.StartOffset();
-					prevEndOffset = offsetAtt.EndOffset();
+					prevType = typeAtt.Type;
+					prevStartOffset = offsetAtt.StartOffset;
+					prevEndOffset = offsetAtt.EndOffset;
 					System.String text = termAtt.Term();
 					if (text.Equals("triplemulti"))
 					{

Modified: incubator/lucene.net/trunk/test/core/QueryParser/TestQueryParser.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/QueryParser/TestQueryParser.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/QueryParser/TestQueryParser.cs (original)
+++ incubator/lucene.net/trunk/test/core/QueryParser/TestQueryParser.cs Wed Mar 21 06:04:26 2012
@@ -161,8 +161,8 @@ namespace Lucene.Net.QueryParsers
 						if (termAtt.Term().Equals("phrase"))
 						{
 							inPhrase = true;
-							savedStart = offsetAtt.StartOffset();
-							savedEnd = offsetAtt.EndOffset();
+							savedStart = offsetAtt.StartOffset;
+							savedEnd = offsetAtt.EndOffset;
 							termAtt.SetTermBuffer("phrase1");
 							offsetAtt.SetOffset(savedStart, savedEnd);
 							return true;
@@ -208,7 +208,7 @@ namespace Lucene.Net.QueryParsers
 		public override void  SetUp()
 		{
 			base.SetUp();
-			originalMaxClauses = BooleanQuery.GetMaxClauseCount();
+			originalMaxClauses = BooleanQuery.MaxClauseCount;
 		}
 		
 		public virtual QueryParser GetParser(Analyzer a)
@@ -969,7 +969,7 @@ namespace Lucene.Net.QueryParsers
 		[Test]
 		public virtual void  TestBooleanQuery()
 		{
-			BooleanQuery.SetMaxClauseCount(2);
+			BooleanQuery.MaxClauseCount = 2;
 			try
 			{
                 QueryParser qp = new QueryParser(Version.LUCENE_CURRENT, "field", new WhitespaceAnalyzer());
@@ -1128,7 +1128,7 @@ namespace Lucene.Net.QueryParsers
 		public override void  TearDown()
 		{
 			base.TearDown();
-			BooleanQuery.SetMaxClauseCount(originalMaxClauses);
+			BooleanQuery.MaxClauseCount = originalMaxClauses;
 		}
 		
 		// LUCENE-2002: make sure defaults for StandardAnalyzer's

Modified: incubator/lucene.net/trunk/test/core/Search/CheckHits.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/CheckHits.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/CheckHits.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/CheckHits.cs Wed Mar 21 06:04:26 2012
@@ -62,7 +62,7 @@ namespace Lucene.Net.Search
 				
 				Explanation exp = searcher.Explain(q, doc);
 				Assert.IsNotNull(exp, "Explanation of [[" + d + "]] for #" + doc + " is null");
-				Assert.AreEqual(0.0f, exp.GetValue(), 0.0f, "Explanation of [[" + d + "]] for #" + doc + " doesn't indicate non-match: " + exp.ToString());
+				Assert.AreEqual(0.0f, exp.Value, 0.0f, "Explanation of [[" + d + "]] for #" + doc + " doesn't indicate non-match: " + exp.ToString());
 			}
 		}
 		
@@ -139,10 +139,11 @@ namespace Lucene.Net.Search
 			{
 				base_Renamed = docBase;
 			}
-			public override bool AcceptsDocsOutOfOrder()
-			{
-				return true;
-			}
+
+		    public override bool AcceptsDocsOutOfOrder
+		    {
+		        get { return true; }
+		    }
 		}
 		
 		/// <summary> Tests that a query matches the an expected set of documents using Hits.
@@ -348,7 +349,7 @@ namespace Lucene.Net.Search
 		/// </param>
 		public static void  VerifyExplanation(System.String q, int doc, float score, bool deep, Explanation expl)
 		{
-			float value_Renamed = expl.GetValue();
+			float value_Renamed = expl.Value;
 			Assert.AreEqual(score, value_Renamed, EXPLAIN_SCORE_TOLERANCE_DELTA, q + ": score(doc=" + doc + ")=" + score + " != explanationScore=" + value_Renamed + " Explanation: " + expl);
 			
 			if (!deep)
@@ -369,7 +370,7 @@ namespace Lucene.Net.Search
 					// - end with one of: "product of:", "sum of:", "max of:", or
 					// - have "max plus <x> times others" (where <x> is float).
 					float x = 0;
-					System.String descr = expl.GetDescription().ToLower();
+					System.String descr = expl.Description.ToLower();
 					bool productOf = descr.EndsWith("product of:");
 					bool sumOf = descr.EndsWith("sum of:");
 					bool maxOf = descr.EndsWith("max of:");
@@ -401,7 +402,7 @@ namespace Lucene.Net.Search
 					float max = 0;
 					for (int i = 0; i < detail.Length; i++)
 					{
-						float dval = detail[i].GetValue();
+						float dval = detail[i].Value;
 						VerifyExplanation(q, doc, dval, deep, detail[i]);
 						product *= dval;
 						sum += dval;
@@ -538,10 +539,11 @@ namespace Lucene.Net.Search
 			{
 				base_Renamed = docBase;
 			}
-			public override bool AcceptsDocsOutOfOrder()
-			{
-				return true;
-			}
+
+		    public override bool AcceptsDocsOutOfOrder
+		    {
+		        get { return true; }
+		    }
 		}
 	}
 }
\ No newline at end of file

Modified: incubator/lucene.net/trunk/test/core/Search/Function/TestCustomScoreQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/Function/TestCustomScoreQuery.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/Function/TestCustomScoreQuery.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/Function/TestCustomScoreQuery.cs Wed Mar 21 06:04:26 2012
@@ -118,8 +118,8 @@ namespace Lucene.Net.Search.Function
 
                 public override Explanation CustomExplain(int doc, Explanation subQueryExpl, Explanation valSrcExpl)
                 {
-                    float valSrcScore = valSrcExpl == null ? 0 : valSrcExpl.GetValue();
-                    Explanation exp = new Explanation(valSrcScore + subQueryExpl.GetValue(), "custom score: sum of:");
+                    float valSrcScore = valSrcExpl == null ? 0 : valSrcExpl.Value;
+                    Explanation exp = new Explanation(valSrcScore + subQueryExpl.Value, "custom score: sum of:");
                     exp.AddDetail(subQueryExpl);
                     if (valSrcExpl != null)
                     {
@@ -179,15 +179,15 @@ namespace Lucene.Net.Search.Function
                     {
                         return subQueryExpl;
                     }
-                    Explanation exp = new Explanation(valSrcExpls[0].GetValue() + subQueryExpl.GetValue(), "sum of:");
+                    Explanation exp = new Explanation(valSrcExpls[0].Value + subQueryExpl.Value, "sum of:");
                     exp.AddDetail(subQueryExpl);
                     exp.AddDetail(valSrcExpls[0]);
                     if (valSrcExpls.Length == 1)
                     {
-                        exp.SetDescription("CustomMulAdd, sum of:");
+                        exp.Description = "CustomMulAdd, sum of:";
                         return exp;
                     }
-                    Explanation exp2 = new Explanation(valSrcExpls[1].GetValue() * exp.GetValue(), "custom score: product of:");
+                    Explanation exp2 = new Explanation(valSrcExpls[1].Value * exp.Value, "custom score: product of:");
                     exp2.AddDetail(valSrcExpls[1]);
                     exp2.AddDetail(exp);
                     return exp2;

Modified: incubator/lucene.net/trunk/test/core/Search/Function/TestFieldScoreQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/Function/TestFieldScoreQuery.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/Function/TestFieldScoreQuery.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/Function/TestFieldScoreQuery.cs Wed Mar 21 06:04:26 2012
@@ -200,7 +200,7 @@ namespace Lucene.Net.Search.Function
 			expectedArrayTypes[FieldScoreQuery.Type.FLOAT] = new float[0];
 			
 			IndexSearcher s = new IndexSearcher(dir, true);
-			System.Object[] innerArray = new Object[s.IndexReader.SequentialSubReaders.Length];
+			System.Object[] innerArray = new Object[s.IndexReader.GetSequentialSubReaders().Length];
 			
 			bool warned = false; // print warning once.
 			for (int i = 0; i < 10; i++)
@@ -208,7 +208,7 @@ namespace Lucene.Net.Search.Function
 				FieldScoreQuery q = new FieldScoreQuery(field, tp);
 				ScoreDoc[] h = s.Search(q, null, 1000).ScoreDocs;
 				Assert.AreEqual(N_DOCS, h.Length, "All docs should be matched!");
-				IndexReader[] readers = s.IndexReader.SequentialSubReaders;
+				IndexReader[] readers = s.IndexReader.GetSequentialSubReaders();
 				for (int j = 0; j < readers.Length; j++)
 				{
 					IndexReader reader = readers[j];
@@ -242,7 +242,7 @@ namespace Lucene.Net.Search.Function
 			FieldScoreQuery q2 = new FieldScoreQuery(field, tp);
 			ScoreDoc[] h2 = s.Search(q2, null, 1000).ScoreDocs;
 			Assert.AreEqual(N_DOCS, h2.Length, "All docs should be matched!");
-			IndexReader[] readers2 = s.IndexReader.SequentialSubReaders;
+			IndexReader[] readers2 = s.IndexReader.GetSequentialSubReaders();
 			for (int j = 0; j < readers2.Length; j++)
 			{
 				IndexReader reader = readers2[j];

Modified: incubator/lucene.net/trunk/test/core/Search/Function/TestOrdValues.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/Function/TestOrdValues.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/Function/TestOrdValues.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/Function/TestOrdValues.cs Wed Mar 21 06:04:26 2012
@@ -187,7 +187,7 @@ namespace Lucene.Net.Search.Function
 				try
 				{
 					Assert.AreEqual(N_DOCS, h.Length, "All docs should be matched!");
-					IndexReader[] readers = s.IndexReader.SequentialSubReaders;
+					IndexReader[] readers = s.IndexReader.GetSequentialSubReaders();
 					
 					for (int j = 0; j < readers.Length; j++)
 					{
@@ -231,7 +231,7 @@ namespace Lucene.Net.Search.Function
 			q2 = new ValueSourceQuery(vs2);
 			h2 = s.Search(q2, null, 1000).ScoreDocs;
 			Assert.AreEqual(N_DOCS, h2.Length, "All docs should be matched!");
-			IndexReader[] readers2 = s.IndexReader.SequentialSubReaders;
+			IndexReader[] readers2 = s.IndexReader.GetSequentialSubReaders();
 			
 			for (int j = 0; j < readers2.Length; j++)
 			{
@@ -264,7 +264,7 @@ namespace Lucene.Net.Search.Function
 			q2 = new ValueSourceQuery(vs2);
 			h2 = s.Search(q2, null, 1000).ScoreDocs;
 			Assert.AreEqual(N_DOCS, h2.Length, "All docs should be matched!");
-			readers2 = s.IndexReader.SequentialSubReaders;
+			readers2 = s.IndexReader.GetSequentialSubReaders();
 			
 			for (int j = 0; j < readers2.Length; j++)
 			{

Modified: incubator/lucene.net/trunk/test/core/Search/JustCompileSearch.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/JustCompileSearch.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/JustCompileSearch.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/JustCompileSearch.cs Wed Mar 21 06:04:26 2012
@@ -160,11 +160,11 @@ namespace Lucene.Net.Search
 			{
 				throw new System.NotSupportedException(Lucene.Net.Search.JustCompileSearch.UNSUPPORTED_MSG);
 			}
-			
-			public override bool AcceptsDocsOutOfOrder()
-			{
-				throw new System.NotSupportedException(Lucene.Net.Search.JustCompileSearch.UNSUPPORTED_MSG);
-			}
+
+		    public override bool AcceptsDocsOutOfOrder
+		    {
+		        get { throw new System.NotSupportedException(Lucene.Net.Search.JustCompileSearch.UNSUPPORTED_MSG); }
+		    }
 		}
 		
 		internal sealed class JustCompileDocIdSet:DocIdSet
@@ -441,11 +441,11 @@ namespace Lucene.Net.Search
 			{
 				throw new System.NotSupportedException(Lucene.Net.Search.JustCompileSearch.UNSUPPORTED_MSG);
 			}
-			
-			public override bool AcceptsDocsOutOfOrder()
-			{
-				throw new System.NotSupportedException(Lucene.Net.Search.JustCompileSearch.UNSUPPORTED_MSG);
-			}
+
+		    public override bool AcceptsDocsOutOfOrder
+		    {
+		        get { throw new System.NotSupportedException(Lucene.Net.Search.JustCompileSearch.UNSUPPORTED_MSG); }
+		    }
 		}
 		
 		[Serializable]
@@ -472,9 +472,9 @@ namespace Lucene.Net.Search
 				throw new System.NotSupportedException(Lucene.Net.Search.JustCompileSearch.UNSUPPORTED_MSG);
 			}
 
-		    public override float SumOfSquaredWeights
+		    public override float GetSumOfSquaredWeights()
 		    {
-		        get { throw new System.NotSupportedException(Lucene.Net.Search.JustCompileSearch.UNSUPPORTED_MSG); }
+		        throw new System.NotSupportedException(Lucene.Net.Search.JustCompileSearch.UNSUPPORTED_MSG);
 		    }
 
 		    public override Scorer Scorer(IndexReader reader, bool scoreDocsInOrder, bool topScorer)

Modified: incubator/lucene.net/trunk/test/core/Search/QueryUtils.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/QueryUtils.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/QueryUtils.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/QueryUtils.cs Wed Mar 21 06:04:26 2012
@@ -138,11 +138,11 @@ namespace Lucene.Net.Search
                 this.scorer = null;
                 lastDoc[0] = -1;
 			}
-			
-			public override bool AcceptsDocsOutOfOrder()
-			{
-				return true;
-			}
+
+		    public override bool AcceptsDocsOutOfOrder
+		    {
+		        get { return true; }
+		    }
 		}
 		private class AnonymousClassCollector1:Collector
 		{
@@ -214,10 +214,10 @@ namespace Lucene.Net.Search
                 lastDoc[0] = -1;
             }
 
-			public override bool AcceptsDocsOutOfOrder()
-			{
-				return false;
-			}
+		    public override bool AcceptsDocsOutOfOrder
+		    {
+		        get { return false; }
+		    }
 		}
 		
 		/// <summary>Check the types of things query objects should be able to do. </summary>
@@ -416,7 +416,7 @@ namespace Lucene.Net.Search
 			if (0 < numDeletedDocs)
 				Assert.IsTrue(w.HasDeletions(), "writer has no deletions");
 			
-			Assert.AreEqual(numDeletedDocs, w.MaxDoc, "writer is missing some deleted docs");
+			Assert.AreEqual(numDeletedDocs, w.MaxDoc(), "writer is missing some deleted docs");
 			Assert.AreEqual(0, w.NumDocs(), "writer has non-deleted docs");
 			w.Close();
             IndexReader r = IndexReader.Open(d, true);
@@ -461,7 +461,7 @@ namespace Lucene.Net.Search
 		{
 			//System.out.println("Checking "+q);
 			
-			if (q.Weight(s).ScoresDocsOutOfOrder)
+			if (q.Weight(s).GetScoresDocsOutOfOrder())
 				return ; // in this case order of skipTo() might differ from that of next().
 			
 			int skip_op = 0;

Modified: incubator/lucene.net/trunk/test/core/Search/Spans/JustCompileSearchSpans.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/Spans/JustCompileSearchSpans.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/Spans/JustCompileSearchSpans.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/Spans/JustCompileSearchSpans.cs Wed Mar 21 06:04:26 2012
@@ -65,9 +65,9 @@ namespace Lucene.Net.Search.Spans
 				throw new System.NotSupportedException(Lucene.Net.Search.Spans.JustCompileSearchSpans.UNSUPPORTED_MSG);
 			}
 
-		    public override ICollection<byte[]> Payload
+		    public override ICollection<byte[]> GetPayload()
 		    {
-		        get { throw new System.NotSupportedException(Lucene.Net.Search.Spans.JustCompileSearchSpans.UNSUPPORTED_MSG); }
+		        throw new System.NotSupportedException(Lucene.Net.Search.Spans.JustCompileSearchSpans.UNSUPPORTED_MSG);
 		    }
 
 		    public override bool IsPayloadAvailable
@@ -97,9 +97,9 @@ namespace Lucene.Net.Search.Spans
 		
 		internal sealed class JustCompilePayloadSpans:Spans
 		{
-		    public override ICollection<byte[]> Payload
+		    public override ICollection<byte[]> GetPayload()
 		    {
-		        get { throw new System.NotSupportedException(Lucene.Net.Search.Spans.JustCompileSearchSpans.UNSUPPORTED_MSG); }
+		        throw new System.NotSupportedException(Lucene.Net.Search.Spans.JustCompileSearchSpans.UNSUPPORTED_MSG);
 		    }
 
 		    public override bool IsPayloadAvailable

Modified: incubator/lucene.net/trunk/test/core/Search/Spans/TestBasics.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/Spans/TestBasics.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/Spans/TestBasics.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/Spans/TestBasics.cs Wed Mar 21 06:04:26 2012
@@ -132,8 +132,8 @@ namespace Lucene.Net.Search.Spans
 			SpanNearQuery query = new SpanNearQuery(new SpanQuery[]{term1, term2}, 0, true);
 			CheckHits(query, new int[]{77, 177, 277, 377, 477, 577, 677, 777, 877, 977});
 			
-			Assert.IsTrue(searcher.Explain(query, 77).GetValue() > 0.0f);
-			Assert.IsTrue(searcher.Explain(query, 977).GetValue() > 0.0f);
+			Assert.IsTrue(searcher.Explain(query, 77).Value > 0.0f);
+			Assert.IsTrue(searcher.Explain(query, 977).Value > 0.0f);
 			
 			QueryUtils.Check(term1);
 			QueryUtils.Check(term2);
@@ -170,8 +170,8 @@ namespace Lucene.Net.Search.Spans
 			
 			CheckHits(query, new int[]{801, 821, 831, 851, 861, 871, 881, 891});
 			
-			Assert.IsTrue(searcher.Explain(query, 801).GetValue() > 0.0f);
-			Assert.IsTrue(searcher.Explain(query, 891).GetValue() > 0.0f);
+			Assert.IsTrue(searcher.Explain(query, 801).Value > 0.0f);
+			Assert.IsTrue(searcher.Explain(query, 891).Value > 0.0f);
 		}
 		
 		[Test]
@@ -188,8 +188,8 @@ namespace Lucene.Net.Search.Spans
 			
 			CheckHits(query, new int[]{801, 821, 831, 851, 861, 871, 881, 891});
 			
-			Assert.IsTrue(searcher.Explain(query, 801).GetValue() > 0.0f);
-			Assert.IsTrue(searcher.Explain(query, 891).GetValue() > 0.0f);
+			Assert.IsTrue(searcher.Explain(query, 801).Value > 0.0f);
+			Assert.IsTrue(searcher.Explain(query, 891).Value > 0.0f);
 		}
 		
 		[Test]
@@ -208,8 +208,8 @@ namespace Lucene.Net.Search.Spans
 			
 			CheckHits(query, new int[]{801, 821, 831, 851, 871, 891});
 			
-			Assert.IsTrue(searcher.Explain(query, 801).GetValue() > 0.0f);
-			Assert.IsTrue(searcher.Explain(query, 891).GetValue() > 0.0f);
+			Assert.IsTrue(searcher.Explain(query, 801).Value > 0.0f);
+			Assert.IsTrue(searcher.Explain(query, 891).Value > 0.0f);
 		}
 		
 		[Test]
@@ -226,8 +226,8 @@ namespace Lucene.Net.Search.Spans
 			
 			CheckHits(query, new int[]{801, 821, 831, 851, 861, 871, 881, 891});
 			
-			Assert.IsTrue(searcher.Explain(query, 801).GetValue() > 0.0f);
-			Assert.IsTrue(searcher.Explain(query, 891).GetValue() > 0.0f);
+			Assert.IsTrue(searcher.Explain(query, 801).Value > 0.0f);
+			Assert.IsTrue(searcher.Explain(query, 891).Value > 0.0f);
 		}
 		
 		
@@ -255,8 +255,8 @@ namespace Lucene.Net.Search.Spans
 			
 			CheckHits(query, new int[]{5, 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511, 512, 513, 514, 515, 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531, 532, 533, 534, 535, 536, 537, 538, 539, 540, 541, 542, 543, 544, 545, 546, 547, 548, 549, 550, 551, 552, 553, 554, 555, 556, 557, 558, 559, 560, 561, 562, 563, 564, 565, 566, 567, 568, 569, 570, 571, 572, 573, 574, 575, 576, 577, 578, 579, 580, 581, 582, 583, 584, 585, 586, 587, 588, 589, 590, 591, 592, 593, 594, 595, 596, 597, 598, 599});
 			
-			Assert.IsTrue(searcher.Explain(query, 5).GetValue() > 0.0f);
-			Assert.IsTrue(searcher.Explain(query, 599).GetValue() > 0.0f);
+			Assert.IsTrue(searcher.Explain(query, 5).Value > 0.0f);
+			Assert.IsTrue(searcher.Explain(query, 599).Value > 0.0f);
 		}
 		
 		[Test]
@@ -273,8 +273,8 @@ namespace Lucene.Net.Search.Spans
 			
 			CheckHits(query, new int[]{33, 47, 133, 147, 233, 247, 333, 347, 433, 447, 533, 547, 633, 647, 733, 747, 833, 847, 933, 947});
 			
-			Assert.IsTrue(searcher.Explain(query, 33).GetValue() > 0.0f);
-			Assert.IsTrue(searcher.Explain(query, 947).GetValue() > 0.0f);
+			Assert.IsTrue(searcher.Explain(query, 33).Value > 0.0f);
+			Assert.IsTrue(searcher.Explain(query, 947).Value > 0.0f);
 		}
 		
 		[Test]
@@ -291,7 +291,7 @@ namespace Lucene.Net.Search.Spans
 			
 			CheckHits(query, new int[]{333});
 			
-			Assert.IsTrue(searcher.Explain(query, 333).GetValue() > 0.0f);
+			Assert.IsTrue(searcher.Explain(query, 333).Value > 0.0f);
 		}
 		
 		[Test]

Modified: incubator/lucene.net/trunk/test/core/Search/Spans/TestNearSpansOrdered.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/Spans/TestNearSpansOrdered.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/Spans/TestNearSpansOrdered.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/Spans/TestNearSpansOrdered.cs Wed Mar 21 06:04:26 2012
@@ -189,7 +189,7 @@ namespace Lucene.Net.Search.Spans
 		{
 			SpanNearQuery q = MakeQuery();
 		    Explanation e = q.Weight(searcher).Explain(searcher.IndexReader, 1);
-		    Assert.IsTrue(0.0f < e.GetValue(), "Scorer explanation value for doc#1 isn't positive: " + e.ToString());
+		    Assert.IsTrue(0.0f < e.Value, "Scorer explanation value for doc#1 isn't positive: " + e.ToString());
 		}
 	}
 }
\ No newline at end of file

Modified: incubator/lucene.net/trunk/test/core/Search/Spans/TestPayloadSpans.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/Spans/TestPayloadSpans.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/Spans/TestPayloadSpans.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/Spans/TestPayloadSpans.cs Wed Mar 21 06:04:26 2012
@@ -282,7 +282,7 @@ namespace Lucene.Net.Search.Spans
 			{
 				while (spans.Next())
 				{
-					System.Collections.Generic.ICollection<byte[]> payloads = spans.Payload;
+					System.Collections.Generic.ICollection<byte[]> payloads = spans.GetPayload();
 					
 					for (System.Collections.IEnumerator it = payloads.GetEnumerator(); it.MoveNext(); )
 					{
@@ -319,7 +319,7 @@ namespace Lucene.Net.Search.Spans
 			{
 				while (spans.Next())
 				{
-					System.Collections.Generic.ICollection<byte[]> payloads = spans.Payload;
+					System.Collections.Generic.ICollection<byte[]> payloads = spans.GetPayload();
 					for (System.Collections.IEnumerator it = payloads.GetEnumerator(); it.MoveNext(); )
 					{
 						CollectionsHelper.AddIfNotContains(payloadSet, new System.String(System.Text.UTF8Encoding.UTF8.GetChars((byte[]) it.Current)));
@@ -355,7 +355,7 @@ namespace Lucene.Net.Search.Spans
 			{
 				while (spans.Next())
 				{
-					System.Collections.Generic.ICollection<byte[]> payloads = spans.Payload;
+					System.Collections.Generic.ICollection<byte[]> payloads = spans.GetPayload();
 					
 					for (System.Collections.IEnumerator it = payloads.GetEnumerator(); it.MoveNext(); )
 					{
@@ -426,7 +426,7 @@ namespace Lucene.Net.Search.Spans
 				//See payload helper, for the PayloadHelper.FIELD field, there is a single byte payload at every token
 				if (spans.IsPayloadAvailable)
 				{
-					System.Collections.Generic.ICollection<byte[]> payload = spans.Payload;
+					System.Collections.Generic.ICollection<byte[]> payload = spans.GetPayload();
 					Assert.IsTrue(payload.Count == expectedNumPayloads, "payload Size: " + payload.Count + " is not: " + expectedNumPayloads);
 					for (System.Collections.IEnumerator iterator = payload.GetEnumerator(); iterator.MoveNext(); )
 					{
@@ -474,7 +474,7 @@ namespace Lucene.Net.Search.Spans
 					System.Console.Out.WriteLine("\nSpans Dump --");
 				if (spans.IsPayloadAvailable)
 				{
-					System.Collections.Generic.ICollection<byte[]> payload = spans.Payload;
+					System.Collections.Generic.ICollection<byte[]> payload = spans.GetPayload();
 					if (DEBUG)
 						System.Console.Out.WriteLine("payloads for span:" + payload.Count);
 					System.Collections.IEnumerator it = payload.GetEnumerator();

Modified: incubator/lucene.net/trunk/test/core/Search/Spans/TestSpansAdvanced.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/Spans/TestSpansAdvanced.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/Spans/TestSpansAdvanced.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/Spans/TestSpansAdvanced.cs Wed Mar 21 06:04:26 2012
@@ -173,7 +173,7 @@ namespace Lucene.Net.Search.Spans
 					System.Console.Out.WriteLine(s.Explain(query, id));
 				}
 				Assert.AreEqual(expectedScores[i], score, tolerance);
-				Assert.AreEqual(s.Explain(query, id).GetValue(), score, tolerance);
+				Assert.AreEqual(s.Explain(query, id).Value, score, tolerance);
 			}
 		}
 	}

Modified: incubator/lucene.net/trunk/test/core/Search/Spans/TestSpansAdvanced2.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/Spans/TestSpansAdvanced2.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/Spans/TestSpansAdvanced2.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/Spans/TestSpansAdvanced2.cs Wed Mar 21 06:04:26 2012
@@ -63,7 +63,7 @@ namespace Lucene.Net.Search.Spans
 		public virtual void  TestVerifyIndex()
 		{
 			IndexReader reader = IndexReader.Open(mDirectory, true);
-			Assert.AreEqual(8, reader.NumDocs);
+			Assert.AreEqual(8, reader.GetNumDocs());
 			reader.Close();
 		}
 		

Modified: incubator/lucene.net/trunk/test/core/Search/TestBoolean2.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestBoolean2.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestBoolean2.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestBoolean2.cs Wed Mar 21 06:04:26 2012
@@ -99,7 +99,7 @@ namespace Lucene.Net.Search
 		        Directory copy = new RAMDirectory(dir2);
                 IndexWriter indexWriter = new IndexWriter(dir2, new WhitespaceAnalyzer(), IndexWriter.MaxFieldLength.UNLIMITED);
 		        indexWriter.AddIndexesNoOptimize(new[] {copy});
-		        docCount = indexWriter.MaxDoc;
+		        docCount = indexWriter.MaxDoc();
 		        indexWriter.Close();
 		        mulFactor *= 2;
 		    } while (docCount < 3000);
@@ -144,12 +144,12 @@ namespace Lucene.Net.Search
             //System.out.println();
             //System.out.println("Query: " + queryText);
             Query query1 = MakeQuery(queryText);
-            TopScoreDocCollector collector = TopScoreDocCollector.create(1000, false);
+            TopScoreDocCollector collector = TopScoreDocCollector.Create(1000, false);
             searcher.Search(query1, null, collector);
             ScoreDoc[] hits1 = collector.TopDocs().ScoreDocs;
 
             Query query2 = MakeQuery(queryText); // there should be no need to parse again...
-            collector = TopScoreDocCollector.create(1000, true);
+            collector = TopScoreDocCollector.Create(1000, true);
             searcher.Search(query2, null, collector);
             ScoreDoc[] hits2 = collector.TopDocs().ScoreDocs;
 

Modified: incubator/lucene.net/trunk/test/core/Search/TestBooleanQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestBooleanQuery.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestBooleanQuery.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestBooleanQuery.cs Wed Mar 21 06:04:26 2012
@@ -63,7 +63,7 @@ namespace Lucene.Net.Search
 		{
 			try
 			{
-				BooleanQuery.SetMaxClauseCount(0);
+				BooleanQuery.MaxClauseCount = 0;
 				Assert.Fail();
 			}
 			catch (System.ArgumentException e)

Modified: incubator/lucene.net/trunk/test/core/Search/TestDocBoost.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestDocBoost.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestDocBoost.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestDocBoost.cs Wed Mar 21 06:04:26 2012
@@ -74,10 +74,11 @@ namespace Lucene.Net.Search
 			{
 				base_Renamed = docBase;
 			}
-			public override bool AcceptsDocsOutOfOrder()
-			{
-				return true;
-			}
+
+		    public override bool AcceptsDocsOutOfOrder
+		    {
+		        get { return true; }
+		    }
 		}
 		
 		[Test]
@@ -94,8 +95,8 @@ namespace Lucene.Net.Search
 			Document d2 = new Document();
 			Document d3 = new Document();
 			Document d4 = new Document();
-			d3.SetBoost(3.0f);
-			d4.SetBoost(2.0f);
+			d3.Boost = 3.0f;
+			d4.Boost = 2.0f;
 			
 			d1.Add(f1); // boost = 1
 			d2.Add(f2); // boost = 2

Modified: incubator/lucene.net/trunk/test/core/Search/TestElevationComparator.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestElevationComparator.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestElevationComparator.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestElevationComparator.cs Wed Mar 21 06:04:26 2012
@@ -42,7 +42,7 @@ namespace Lucene.Net.Search
 			Directory directory = new MockRAMDirectory();
 			IndexWriter writer = new IndexWriter(directory, new WhitespaceAnalyzer(), true, IndexWriter.MaxFieldLength.LIMITED);
 			writer.SetMaxBufferedDocs(2);
-			writer.SetMergeFactor(1000);
+			writer.MergeFactor = 1000;
 			writer.AddDocument(Adoc(new System.String[]{"id", "a", "title", "ipod", "str_s", "a"}));
 			writer.AddDocument(Adoc(new System.String[]{"id", "b", "title", "ipod ipod", "str_s", "b"}));
 			writer.AddDocument(Adoc(new System.String[]{"id", "c", "title", "ipod ipod ipod", "str_s", "c"}));

Modified: incubator/lucene.net/trunk/test/core/Search/TestFieldCacheRangeFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestFieldCacheRangeFilter.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestFieldCacheRangeFilter.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestFieldCacheRangeFilter.cs Wed Mar 21 06:04:26 2012
@@ -62,7 +62,7 @@ namespace Lucene.Net.Search
 			System.String maxIP = Pad(maxId);
 			System.String medIP = Pad(medId);
 			
-			int numDocs = reader.NumDocs;
+			int numDocs = reader.GetNumDocs();
 			
 			Assert.AreEqual(numDocs, 1 + maxId - minId, "num of docs");
 			
@@ -145,7 +145,7 @@ namespace Lucene.Net.Search
 			System.String minRP = Pad(signedIndex.minR);
 			System.String maxRP = Pad(signedIndex.maxR);
 			
-			int numDocs = reader.NumDocs;
+			int numDocs = reader.GetNumDocs();
 			
 			Assert.AreEqual(numDocs, 1 + maxId - minId, "num of docs");
 			
@@ -207,7 +207,7 @@ namespace Lucene.Net.Search
             IndexReader reader = IndexReader.Open(signedIndex.index, true);
 			IndexSearcher Search = new IndexSearcher(reader);
 			
-			int numDocs = reader.NumDocs;
+			int numDocs = reader.GetNumDocs();
 			int medId = ((maxId - minId) / 2);
 			System.Int16 minIdO = (short) minId;
 			System.Int16 maxIdO = (short) maxId;
@@ -301,7 +301,7 @@ namespace Lucene.Net.Search
             IndexReader reader = IndexReader.Open(signedIndex.index, true);
 			IndexSearcher Search = new IndexSearcher(reader);
 			
-			int numDocs = reader.NumDocs;
+			int numDocs = reader.GetNumDocs();
 			int medId = ((maxId - minId) / 2);
 			System.Int32 minIdO = (System.Int32) minId;
 			System.Int32 maxIdO = (System.Int32) maxId;
@@ -395,7 +395,7 @@ namespace Lucene.Net.Search
             IndexReader reader = IndexReader.Open(signedIndex.index, true);
 			IndexSearcher Search = new IndexSearcher(reader);
 			
-			int numDocs = reader.NumDocs;
+			int numDocs = reader.GetNumDocs();
 			int medId = ((maxId - minId) / 2);
 			System.Int64 minIdO = (long) minId;
 			System.Int64 maxIdO = (long) maxId;
@@ -491,7 +491,7 @@ namespace Lucene.Net.Search
             IndexReader reader = IndexReader.Open(signedIndex.index, true);
 			IndexSearcher Search = new IndexSearcher(reader);
 			
-			int numDocs = reader.NumDocs;
+			int numDocs = reader.GetNumDocs();
 			System.Single minIdO = (float) (minId + .5f);
 			System.Single medIdO = (float) ((float) minIdO + ((float) (maxId - minId)) / 2.0f);
 			
@@ -523,7 +523,7 @@ namespace Lucene.Net.Search
             IndexReader reader = IndexReader.Open(signedIndex.index, true);
 			IndexSearcher Search = new IndexSearcher(reader);
 			
-			int numDocs = reader.NumDocs;
+			int numDocs = reader.GetNumDocs();
 			System.Double minIdO = (double) (minId + .5);
 			System.Double medIdO = (double) ((float) minIdO + ((double) (maxId - minId)) / 2.0);
 			
@@ -575,23 +575,23 @@ namespace Lucene.Net.Search
 
     FieldCacheRangeFilter<sbyte?> fcrf;
     result = Search.Search(q, fcrf = FieldCacheRangeFilter.NewByteRange("id", -20, 20, T, T), 100).ScoreDocs;
-    Assert.False(fcrf.GetDocIdSet(reader.SequentialSubReaders[0]).IsCacheable, "DocIdSet must be not cacheable");
+    Assert.False(fcrf.GetDocIdSet(reader.GetSequentialSubReaders()[0]).IsCacheable, "DocIdSet must be not cacheable");
     Assert.AreEqual(40, result.Length, "find all");
 
     result = Search.Search(q, fcrf = FieldCacheRangeFilter.NewByteRange("id", 0, 20, T, T), 100).ScoreDocs;
-    Assert.False(fcrf.GetDocIdSet(reader.SequentialSubReaders[0]).IsCacheable, "DocIdSet must be not cacheable");
+    Assert.False(fcrf.GetDocIdSet(reader.GetSequentialSubReaders()[0]).IsCacheable, "DocIdSet must be not cacheable");
     Assert.AreEqual( 20, result.Length, "find all");
 
             result = Search.Search(q, fcrf = FieldCacheRangeFilter.NewByteRange("id", -20, 0, T, T), 100).ScoreDocs;
-    Assert.False(fcrf.GetDocIdSet(reader.SequentialSubReaders[0]).IsCacheable, "DocIdSet must be not cacheable");
+    Assert.False(fcrf.GetDocIdSet(reader.GetSequentialSubReaders()[0]).IsCacheable, "DocIdSet must be not cacheable");
     Assert.AreEqual( 20, result.Length, "find all");
 
     result = Search.Search(q, fcrf = FieldCacheRangeFilter.NewByteRange("id", 10, 20, T, T), 100).ScoreDocs;
-    Assert.True(fcrf.GetDocIdSet(reader.SequentialSubReaders[0]).IsCacheable, "DocIdSet must be not cacheable");
+    Assert.True(fcrf.GetDocIdSet(reader.GetSequentialSubReaders()[0]).IsCacheable, "DocIdSet must be not cacheable");
     Assert.AreEqual( 11, result.Length, "find all");
 
     result = Search.Search(q, fcrf = FieldCacheRangeFilter.NewByteRange("id", -20, -10, T, T), 100).ScoreDocs;
-    Assert.True(fcrf.GetDocIdSet(reader.SequentialSubReaders[0]).IsCacheable, "DocIdSet must be not cacheable");
+    Assert.True(fcrf.GetDocIdSet(reader.GetSequentialSubReaders()[0]).IsCacheable, "DocIdSet must be not cacheable");
     Assert.AreEqual( 11, result.Length, "find all");
   }
 	}

Modified: incubator/lucene.net/trunk/test/core/Search/TestFieldCacheTermsFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestFieldCacheTermsFilter.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestFieldCacheTermsFilter.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestFieldCacheTermsFilter.cs Wed Mar 21 06:04:26 2012
@@ -56,7 +56,7 @@ namespace Lucene.Net.Search
 
             IndexReader reader = IndexReader.Open(rd, true);
 			IndexSearcher searcher = new IndexSearcher(reader);
-			int numDocs = reader.NumDocs;
+			int numDocs = reader.GetNumDocs();
 			ScoreDoc[] results;
 			MatchAllDocsQuery q = new MatchAllDocsQuery();
 			

Modified: incubator/lucene.net/trunk/test/core/Search/TestFuzzyQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestFuzzyQuery.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestFuzzyQuery.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestFuzzyQuery.cs Wed Mar 21 06:04:26 2012
@@ -96,10 +96,10 @@ namespace Lucene.Net.Search
             }
 
             // test BooleanQuery.maxClauseCount
-            int savedClauseCount = BooleanQuery.GetMaxClauseCount();
+            int savedClauseCount = BooleanQuery.MaxClauseCount;
             try
             {
-                BooleanQuery.SetMaxClauseCount(2);
+                BooleanQuery.MaxClauseCount = 2;
                 // This query would normally return 3 documents, because 3 terms match (see above):
                 query = new FuzzyQuery(new Term("field", "bbbbb"), FuzzyQuery.defaultMinSimilarity, 0);
                 hits = searcher.Search(query, null, 1000).ScoreDocs;
@@ -114,7 +114,7 @@ namespace Lucene.Net.Search
             }
             finally
             {
-                BooleanQuery.SetMaxClauseCount(savedClauseCount);
+                BooleanQuery.MaxClauseCount = savedClauseCount;
             }
 
             // not similar enough:

Modified: incubator/lucene.net/trunk/test/core/Search/TestMultiTermConstantScore.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestMultiTermConstantScore.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestMultiTermConstantScore.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestMultiTermConstantScore.cs Wed Mar 21 06:04:26 2012
@@ -68,10 +68,11 @@ namespace Lucene.Net.Search
 			{
 				base_Renamed = docBase;
 			}
-			public override bool AcceptsDocsOutOfOrder()
-			{
-				return true;
-			}
+
+		    public override bool AcceptsDocsOutOfOrder
+		    {
+		        get { return true; }
+		    }
 		}
 		
 		/// <summary>threshold for comparing floats </summary>
@@ -316,7 +317,7 @@ namespace Lucene.Net.Search
 			System.String maxIP = Pad(maxId);
 			System.String medIP = Pad(medId);
 			
-			int numDocs = reader.NumDocs;
+			int numDocs = reader.GetNumDocs();
 			
 			AssertEquals("num of docs", numDocs, 1 + maxId - minId);
 			
@@ -445,7 +446,7 @@ namespace Lucene.Net.Search
 			System.String maxIP = Pad(maxId);
 			System.String medIP = Pad(medId);
 			
-			int numDocs = reader.NumDocs;
+			int numDocs = reader.GetNumDocs();
 			
 			AssertEquals("num of docs", numDocs, 1 + maxId - minId);
 			
@@ -527,7 +528,7 @@ namespace Lucene.Net.Search
 			System.String minRP = Pad(signedIndex.minR);
 			System.String maxRP = Pad(signedIndex.maxR);
 			
-			int numDocs = reader.NumDocs;
+			int numDocs = reader.GetNumDocs();
 			
 			AssertEquals("num of docs", numDocs, 1 + maxId - minId);
 			
@@ -591,7 +592,7 @@ namespace Lucene.Net.Search
 			System.String minRP = Pad(unsignedIndex.minR);
 			System.String maxRP = Pad(unsignedIndex.maxR);
 			
-			int numDocs = reader.NumDocs;
+			int numDocs = reader.GetNumDocs();
 			
 			AssertEquals("num of docs", numDocs, 1 + maxId - minId);
 			

Modified: incubator/lucene.net/trunk/test/core/Search/TestMultiThreadTermVectors.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestMultiThreadTermVectors.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestMultiThreadTermVectors.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestMultiThreadTermVectors.cs Wed Mar 21 06:04:26 2012
@@ -16,6 +16,7 @@
  */
 
 using System;
+using Lucene.Net.Index;
 using Lucene.Net.Support;
 using NUnit.Framework;
 
@@ -23,7 +24,6 @@ using SimpleAnalyzer = Lucene.Net.Analys
 using Lucene.Net.Documents;
 using IndexReader = Lucene.Net.Index.IndexReader;
 using IndexWriter = Lucene.Net.Index.IndexWriter;
-using TermFreqVector = Lucene.Net.Index.TermFreqVector;
 using RAMDirectory = Lucene.Net.Store.RAMDirectory;
 using English = Lucene.Net.Util.English;
 using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;
@@ -171,29 +171,29 @@ namespace Lucene.Net.Search
 		private void  TestTermVectors()
 		{
 			// check:
-			int numDocs = reader.NumDocs;
+			int numDocs = reader.GetNumDocs();
 			long start = 0L;
 			for (int docId = 0; docId < numDocs; docId++)
 			{
 				start = (DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond);
-				TermFreqVector[] vectors = reader.GetTermFreqVectors(docId);
+				ITermFreqVector[] vectors = reader.GetTermFreqVectors(docId);
 				timeElapsed += (DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond) - start;
 				
 				// verify vectors result
 				VerifyVectors(vectors, docId);
 				
 				start = (DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond);
-				TermFreqVector vector = reader.GetTermFreqVector(docId, "field");
+				ITermFreqVector vector = reader.GetTermFreqVector(docId, "field");
 				timeElapsed += (DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond) - start;
 				
-				vectors = new TermFreqVector[1];
+				vectors = new ITermFreqVector[1];
 				vectors[0] = vector;
 				
 				VerifyVectors(vectors, docId);
 			}
 		}
 		
-		private void  VerifyVectors(TermFreqVector[] vectors, int num)
+		private void  VerifyVectors(ITermFreqVector[] vectors, int num)
 		{
 			System.Text.StringBuilder temp = new System.Text.StringBuilder();
 			System.String[] terms = null;

Modified: incubator/lucene.net/trunk/test/core/Search/TestNumericRangeQuery32.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestNumericRangeQuery32.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestNumericRangeQuery32.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestNumericRangeQuery32.cs Wed Mar 21 06:04:26 2012
@@ -548,7 +548,7 @@ namespace Lucene.Net.Search
 				try
 				{
 					// set the theoretical maximum term count for 8bit (see docs for the number)
-					BooleanQuery.SetMaxClauseCount(3 * 255 * 2 + 255);
+					BooleanQuery.MaxClauseCount = 3 * 255 * 2 + 255;
 					
 					directory = new RAMDirectory();
 					IndexWriter writer = new IndexWriter(directory, new WhitespaceAnalyzer(), true, MaxFieldLength.UNLIMITED);

Modified: incubator/lucene.net/trunk/test/core/Search/TestNumericRangeQuery64.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestNumericRangeQuery64.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestNumericRangeQuery64.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestNumericRangeQuery64.cs Wed Mar 21 06:04:26 2012
@@ -545,7 +545,7 @@ namespace Lucene.Net.Search
 				try
 				{
 					// set the theoretical maximum term count for 8bit (see docs for the number)
-					BooleanQuery.SetMaxClauseCount(7 * 255 * 2 + 255);
+					BooleanQuery.MaxClauseCount = 7 * 255 * 2 + 255;
 					
 					directory = new RAMDirectory();
 					IndexWriter writer = new IndexWriter(directory, new WhitespaceAnalyzer(), true, MaxFieldLength.UNLIMITED);

Modified: incubator/lucene.net/trunk/test/core/Search/TestPositionIncrement.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestPositionIncrement.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestPositionIncrement.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestPositionIncrement.cs Wed Mar 21 06:04:26 2012
@@ -323,7 +323,7 @@ namespace Lucene.Net.Search
             while (pspans.Next())
             {
                 //System.out.println(pspans.doc() + " - " + pspans.start() + " - "+ pspans.end());
-                System.Collections.Generic.ICollection<byte[]> payloads = pspans.Payload;
+                System.Collections.Generic.ICollection<byte[]> payloads = pspans.GetPayload();
                 sawZero |= pspans.Start() == 0;
                 for (System.Collections.IEnumerator it = payloads.GetEnumerator(); it.MoveNext();)
                 {

Modified: incubator/lucene.net/trunk/test/core/Search/TestPositiveScoresOnlyCollector.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestPositiveScoresOnlyCollector.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestPositiveScoresOnlyCollector.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestPositiveScoresOnlyCollector.cs Wed Mar 21 06:04:26 2012
@@ -80,7 +80,7 @@ namespace Lucene.Net.Search
 			}
 			
 			Scorer s = new SimpleScorer();
-			TopDocsCollector<ScoreDoc> tdc = TopScoreDocCollector.create(scores.Length, true);
+			TopDocsCollector<ScoreDoc> tdc = TopScoreDocCollector.Create(scores.Length, true);
 			Collector c = new PositiveScoresOnlyCollector(tdc);
 			c.SetScorer(s);
 			while (s.NextDoc() != DocIdSetIterator.NO_MORE_DOCS)

Modified: incubator/lucene.net/trunk/test/core/Search/TestScoreCachingWrappingScorer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestScoreCachingWrappingScorer.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestScoreCachingWrappingScorer.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestScoreCachingWrappingScorer.cs Wed Mar 21 06:04:26 2012
@@ -99,11 +99,11 @@ namespace Lucene.Net.Search
 			{
 				this.scorer = new ScoreCachingWrappingScorer(scorer);
 			}
-			
-			public override bool AcceptsDocsOutOfOrder()
-			{
-				return true;
-			}
+
+		    public override bool AcceptsDocsOutOfOrder
+		    {
+		        get { return true; }
+		    }
 		}
 		
 		private static readonly float[] scores = new float[]{0.7767749f, 1.7839992f, 8.9925785f, 7.9608946f, 0.07948637f, 2.6356435f, 7.4950366f, 7.1490803f, 8.108544f, 4.961808f, 2.2423935f, 7.285586f, 4.6699767f};

Modified: incubator/lucene.net/trunk/test/core/Search/TestScorerPerf.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestScorerPerf.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestScorerPerf.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestScorerPerf.cs Wed Mar 21 06:04:26 2012
@@ -164,10 +164,11 @@ namespace Lucene.Net.Search
 			{
 				docBase = base_Renamed;
 			}
-			public override bool AcceptsDocsOutOfOrder()
-			{
-				return true;
-			}
+
+		    public override bool AcceptsDocsOutOfOrder
+		    {
+		        get { return true; }
+		    }
 		}
 		
 		

Modified: incubator/lucene.net/trunk/test/core/Search/TestSetNorm.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestSetNorm.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestSetNorm.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestSetNorm.cs Wed Mar 21 06:04:26 2012
@@ -70,10 +70,11 @@ namespace Lucene.Net.Search
 			{
 				base_Renamed = docBase;
 			}
-			public override bool AcceptsDocsOutOfOrder()
-			{
-				return true;
-			}
+
+		    public override bool AcceptsDocsOutOfOrder
+		    {
+		        get { return true; }
+		    }
 		}
 		
 		[Test]

Modified: incubator/lucene.net/trunk/test/core/Search/TestSimilarity.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestSimilarity.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestSimilarity.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestSimilarity.cs Wed Mar 21 06:04:26 2012
@@ -66,10 +66,11 @@ namespace Lucene.Net.Search
 			public override void  SetNextReader(IndexReader reader, int docBase)
 			{
 			}
-			public override bool AcceptsDocsOutOfOrder()
-			{
-				return true;
-			}
+
+		    public override bool AcceptsDocsOutOfOrder
+		    {
+		        get { return true; }
+		    }
 		}
 		private class AnonymousClassCollector1:Collector
 		{
@@ -105,10 +106,11 @@ namespace Lucene.Net.Search
 			{
 				base_Renamed = docBase;
 			}
-			public override bool AcceptsDocsOutOfOrder()
-			{
-				return true;
-			}
+
+		    public override bool AcceptsDocsOutOfOrder
+		    {
+		        get { return true; }
+		    }
 		}
 		private class AnonymousClassCollector2:Collector
 		{
@@ -142,10 +144,11 @@ namespace Lucene.Net.Search
 			public override void  SetNextReader(IndexReader reader, int docBase)
 			{
 			}
-			public override bool AcceptsDocsOutOfOrder()
-			{
-				return true;
-			}
+
+		    public override bool AcceptsDocsOutOfOrder
+		    {
+		        get { return true; }
+		    }
 		}
 		private class AnonymousClassCollector3:Collector
 		{
@@ -179,10 +182,11 @@ namespace Lucene.Net.Search
 			public override void  SetNextReader(IndexReader reader, int docBase)
 			{
 			}
-			public override bool AcceptsDocsOutOfOrder()
-			{
-				return true;
-			}
+
+		    public override bool AcceptsDocsOutOfOrder
+		    {
+		        get { return true; }
+		    }
 		}
 		
         private class AnonymousIDFExplanation : Explanation.IDFExplanation

Modified: incubator/lucene.net/trunk/test/core/Search/TestSort.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestSort.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestSort.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestSort.cs Wed Mar 21 06:04:26 2012
@@ -282,7 +282,7 @@ namespace Lucene.Net.Search
 			RAMDirectory indexStore = new RAMDirectory();
 			IndexWriter writer = new IndexWriter(indexStore, new SimpleAnalyzer(), true, IndexWriter.MaxFieldLength.LIMITED);
 			writer.SetMaxBufferedDocs(2);
-			writer.SetMergeFactor(1000);
+			writer.MergeFactor = 1000;
 			for (int i = 0; i < data.Length; ++i)
 			{
 				if (((i % 2) == 0 && even) || ((i % 2) == 1 && odd))
@@ -310,7 +310,7 @@ namespace Lucene.Net.Search
 						doc.Add(new Field("byte", data[i][10], Field.Store.NO, Field.Index.NOT_ANALYZED));
 					if (data[i][11] != null)
 						doc.Add(new Field("parser", data[i][11], Field.Store.NO, Field.Index.NOT_ANALYZED));
-					doc.SetBoost(2); // produce some scores above 1.0
+					doc.Boost = 2; // produce some scores above 1.0
 					writer.AddDocument(doc);
 				}
 			}
@@ -331,7 +331,7 @@ namespace Lucene.Net.Search
 			RAMDirectory indexStore = new RAMDirectory();
 			IndexWriter writer = new IndexWriter(indexStore, new SimpleAnalyzer(), true, IndexWriter.MaxFieldLength.LIMITED);
 			writer.SetMaxBufferedDocs(4);
-			writer.SetMergeFactor(97);
+			writer.MergeFactor = 97;
 			for (int i = 0; i < NUM_STRINGS; i++)
 			{
 				Document doc = new Document();
@@ -342,7 +342,7 @@ namespace Lucene.Net.Search
 				System.String num2 = GetRandomCharString(GetRandomNumber(1, 4), 48, 50);
 				doc.Add(new Field("string2", num2, Field.Store.NO, Field.Index.NOT_ANALYZED));
 				doc.Add(new Field("tracer2", num2, Field.Store.YES, Field.Index.NO));
-				doc.SetBoost(2); // produce some scores above 1.0
+				doc.Boost = 2; // produce some scores above 1.0
 				writer.SetMaxBufferedDocs(GetRandomNumber(2, 12));
 				writer.AddDocument(doc);
 			}

Modified: incubator/lucene.net/trunk/test/core/Search/TestTermRangeFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestTermRangeFilter.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestTermRangeFilter.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestTermRangeFilter.cs Wed Mar 21 06:04:26 2012
@@ -62,7 +62,7 @@ namespace Lucene.Net.Search
 			System.String maxIP = Pad(maxId);
 			System.String medIP = Pad(medId);
 			
-			int numDocs = reader.NumDocs;
+			int numDocs = reader.GetNumDocs();
 			
 			Assert.AreEqual(numDocs, 1 + maxId - minId, "num of docs");
 			
@@ -147,7 +147,7 @@ namespace Lucene.Net.Search
 			System.String maxIP = Pad(maxId);
 			System.String medIP = Pad(medId);
 			
-			int numDocs = reader.NumDocs;
+			int numDocs = reader.GetNumDocs();
 			
 			Assert.AreEqual(numDocs, 1 + maxId - minId, "num of docs");
 			
@@ -227,7 +227,7 @@ namespace Lucene.Net.Search
 			System.String minRP = Pad(signedIndex.minR);
 			System.String maxRP = Pad(signedIndex.maxR);
 			
-			int numDocs = reader.NumDocs;
+			int numDocs = reader.GetNumDocs();
 			
 			Assert.AreEqual(numDocs, 1 + maxId - minId, "num of docs");
 			
@@ -293,7 +293,7 @@ namespace Lucene.Net.Search
 			System.String minRP = Pad(unsignedIndex.minR);
 			System.String maxRP = Pad(unsignedIndex.maxR);
 			
-			int numDocs = reader.NumDocs;
+			int numDocs = reader.GetNumDocs();
 			
 			Assert.AreEqual(numDocs, 1 + maxId - minId, "num of docs");
 			

Modified: incubator/lucene.net/trunk/test/core/Search/TestTermRangeQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestTermRangeQuery.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestTermRangeQuery.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestTermRangeQuery.cs Wed Mar 21 06:04:26 2012
@@ -276,11 +276,11 @@ namespace Lucene.Net.Search
 			
 			public override TokenStream ReusableTokenStream(System.String fieldName, System.IO.TextReader reader)
 			{
-				Tokenizer tokenizer = (Tokenizer) GetPreviousTokenStream();
+				Tokenizer tokenizer = (Tokenizer) PreviousTokenStream;
 				if (tokenizer == null)
 				{
 					tokenizer = new SingleCharTokenizer(reader);
-					SetPreviousTokenStream(tokenizer);
+					PreviousTokenStream = tokenizer;
 				}
 				else
 					tokenizer.Reset(reader);

Modified: incubator/lucene.net/trunk/test/core/Search/TestTermScorer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestTermScorer.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestTermScorer.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestTermScorer.cs Wed Mar 21 06:04:26 2012
@@ -74,10 +74,11 @@ namespace Lucene.Net.Search
 			{
 				base_Renamed = docBase;
 			}
-			public override bool AcceptsDocsOutOfOrder()
-			{
-				return true;
-			}
+
+		    public override bool AcceptsDocsOutOfOrder
+		    {
+		        get { return true; }
+		    }
 		}
 		protected internal RAMDirectory directory;
 		private const System.String FIELD = "field";

Modified: incubator/lucene.net/trunk/test/core/Search/TestTermVectors.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestTermVectors.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestTermVectors.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestTermVectors.cs Wed Mar 21 06:04:26 2012
@@ -90,7 +90,7 @@ namespace Lucene.Net.Search
 				
 				for (int i = 0; i < hits.Length; i++)
 				{
-					TermFreqVector[] vector = searcher.reader_ForNUnit.GetTermFreqVectors(hits[i].Doc);
+					ITermFreqVector[] vector = searcher.reader_ForNUnit.GetTermFreqVectors(hits[i].Doc);
 					Assert.IsTrue(vector != null);
 					Assert.IsTrue(vector.Length == 1);
 				}
@@ -114,14 +114,14 @@ namespace Lucene.Net.Search
 			writer.AddDocument(doc);
 			writer.Close();
 		    IndexReader reader = IndexReader.Open(dir, true);
-			TermFreqVector[] v = reader.GetTermFreqVectors(0);
+			ITermFreqVector[] v = reader.GetTermFreqVectors(0);
 			Assert.AreEqual(4, v.Length);
 			System.String[] expectedFields = new System.String[]{"a", "b", "c", "x"};
 			int[] expectedPositions = new int[]{1, 2, 0};
 			for (int i = 0; i < v.Length; i++)
 			{
 				TermPositionVector posVec = (TermPositionVector) v[i];
-				Assert.AreEqual(expectedFields[i], posVec.GetField());
+				Assert.AreEqual(expectedFields[i], posVec.Field);
 				System.String[] terms = posVec.GetTerms();
 				Assert.AreEqual(3, terms.Length);
 				Assert.AreEqual("content", terms[0]);
@@ -147,7 +147,7 @@ namespace Lucene.Net.Search
 				
 				for (int i = 0; i < hits.Length; i++)
 				{
-					TermFreqVector[] vector = searcher.reader_ForNUnit.GetTermFreqVectors(hits[i].Doc);
+					ITermFreqVector[] vector = searcher.reader_ForNUnit.GetTermFreqVectors(hits[i].Doc);
 					Assert.IsTrue(vector != null);
 					Assert.IsTrue(vector.Length == 1);
 					
@@ -194,7 +194,7 @@ namespace Lucene.Net.Search
 						}
 						catch (System.InvalidCastException ignore)
 						{
-							TermFreqVector freqVec = vector[0];
+							ITermFreqVector freqVec = vector[0];
 							System.String[] terms = freqVec.GetTerms();
 							Assert.IsTrue(terms != null && terms.Length > 0);
 						}
@@ -218,7 +218,7 @@ namespace Lucene.Net.Search
 				
 				for (int i = 0; i < hits.Length; i++)
 				{
-					TermFreqVector[] vector = searcher.reader_ForNUnit.GetTermFreqVectors(hits[i].Doc);
+					ITermFreqVector[] vector = searcher.reader_ForNUnit.GetTermFreqVectors(hits[i].Doc);
 					Assert.IsTrue(vector != null);
 					Assert.IsTrue(vector.Length == 1);
 					
@@ -287,7 +287,7 @@ namespace Lucene.Net.Search
 						int docId = termDocs.Doc;
 						int freq = termDocs.Freq;
 						//System.out.println("Doc Id: " + docId + " freq " + freq);
-						TermFreqVector vector = knownSearcher.reader_ForNUnit.GetTermFreqVector(docId, "field");
+						ITermFreqVector vector = knownSearcher.reader_ForNUnit.GetTermFreqVector(docId, "field");
 						float tf = sim.Tf(freq);
 						float idf = sim.Idf(knownSearcher.DocFreq(term), knownSearcher.MaxDoc);
 						//float qNorm = sim.queryNorm()
@@ -322,7 +322,7 @@ namespace Lucene.Net.Search
 				Assert.IsTrue(hits[0].Doc == 2);
 				Assert.IsTrue(hits[1].Doc == 3);
 				Assert.IsTrue(hits[2].Doc == 0);
-				TermFreqVector vector2 = knownSearcher.reader_ForNUnit.GetTermFreqVector(hits[1].Doc, "field");
+				ITermFreqVector vector2 = knownSearcher.reader_ForNUnit.GetTermFreqVector(hits[1].Doc, "field");
 				Assert.IsTrue(vector2 != null);
 				//System.out.println("Vector: " + vector);
 				System.String[] terms = vector2.GetTerms();
@@ -411,7 +411,7 @@ namespace Lucene.Net.Search
 			Assert.AreEqual(10, hits.Length);
 			for (int i = 0; i < hits.Length; i++)
 			{
-				TermFreqVector[] vector = searcher.reader_ForNUnit.GetTermFreqVectors(hits[i].Doc);
+				ITermFreqVector[] vector = searcher.reader_ForNUnit.GetTermFreqVectors(hits[i].Doc);
 				Assert.IsTrue(vector != null);
 				Assert.IsTrue(vector.Length == 1);
 			}
@@ -439,11 +439,11 @@ namespace Lucene.Net.Search
 			ScoreDoc[] hits = searcher.Search(query, null, 1000).ScoreDocs;
 			Assert.AreEqual(1, hits.Length);
 			
-			TermFreqVector[] vector = searcher.reader_ForNUnit.GetTermFreqVectors(hits[0].Doc);
+			ITermFreqVector[] vector = searcher.reader_ForNUnit.GetTermFreqVectors(hits[0].Doc);
 			Assert.IsTrue(vector != null);
 			Assert.IsTrue(vector.Length == 1);
 			TermPositionVector tfv = (TermPositionVector) vector[0];
-			Assert.IsTrue(tfv.GetField().Equals("field"));
+			Assert.IsTrue(tfv.Field.Equals("field"));
 			System.String[] terms = tfv.GetTerms();
 			Assert.AreEqual(1, terms.Length);
 			Assert.AreEqual(terms[0], "one");

Modified: incubator/lucene.net/trunk/test/core/Search/TestTimeLimitingCollector.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestTimeLimitingCollector.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestTimeLimitingCollector.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestTimeLimitingCollector.cs Wed Mar 21 06:04:26 2012
@@ -405,11 +405,11 @@ namespace Lucene.Net.Search
 			{
 				docBase = base_Renamed;
 			}
-			
-			public override bool AcceptsDocsOutOfOrder()
-			{
-				return false;
-			}
+
+		    public override bool AcceptsDocsOutOfOrder
+		    {
+		        get { return false; }
+		    }
 		}
 	}
 }
\ No newline at end of file

Modified: incubator/lucene.net/trunk/test/core/Search/TestTopDocsCollector.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestTopDocsCollector.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestTopDocsCollector.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestTopDocsCollector.cs Wed Mar 21 06:04:26 2012
@@ -84,11 +84,11 @@ namespace Lucene.Net.Search
 			{
 				// Don't do anything. Assign scores in random
 			}
-			
-			public override bool AcceptsDocsOutOfOrder()
-			{
-				return true;
-			}
+
+            public override bool AcceptsDocsOutOfOrder
+            {
+                get { return true; }
+            }
 		}
 		
 		// Scores array to be used by MyTopDocsCollector. If it is changed, MAX_SCORE

Modified: incubator/lucene.net/trunk/test/core/Search/TestTopScoreDocCollector.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestTopScoreDocCollector.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestTopScoreDocCollector.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestTopScoreDocCollector.cs Wed Mar 21 06:04:26 2012
@@ -69,7 +69,7 @@ namespace Lucene.Net.Search
             IndexSearcher searcher = new IndexSearcher(dir, true);
             for (int i = 0; i < inOrder.Length; i++)
             {
-                TopDocsCollector<ScoreDoc> tdc = TopScoreDocCollector.create(3, inOrder[i]);
+                TopDocsCollector<ScoreDoc> tdc = TopScoreDocCollector.Create(3, inOrder[i]);
                 Assert.AreEqual("Lucene.Net.Search.TopScoreDocCollector+" + actualTSDCClass[i], tdc.GetType().FullName);
 
                 searcher.Search(new MatchAllDocsQuery(), tdc);

Modified: incubator/lucene.net/trunk/test/core/Store/TestRAMDirectory.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Store/TestRAMDirectory.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Store/TestRAMDirectory.cs (original)
+++ incubator/lucene.net/trunk/test/core/Store/TestRAMDirectory.cs Wed Mar 21 06:04:26 2012
@@ -106,7 +106,7 @@ namespace Lucene.Net.Store
 				doc.Add(new Field("content", English.IntToEnglish(i).Trim(), Field.Store.YES, Field.Index.NOT_ANALYZED));
 				writer.AddDocument(doc);
 			}
-			Assert.AreEqual(docsToAdd, writer.MaxDoc);
+			Assert.AreEqual(docsToAdd, writer.MaxDoc());
 			writer.Close();
 		    dir.Close();
 		}
@@ -126,7 +126,7 @@ namespace Lucene.Net.Store
 			
 			// open reader to test document count
 			IndexReader reader = IndexReader.Open(ramDir, true);
-			Assert.AreEqual(docsToAdd, reader.NumDocs);
+			Assert.AreEqual(docsToAdd, reader.GetNumDocs());
 			
 			// open search zo check if all doc's are there
 			IndexSearcher searcher = new IndexSearcher(reader);

Modified: incubator/lucene.net/trunk/test/core/Support/TestOldPatches.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Support/TestOldPatches.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Support/TestOldPatches.cs (original)
+++ incubator/lucene.net/trunk/test/core/Support/TestOldPatches.cs Wed Mar 21 06:04:26 2012
@@ -179,20 +179,20 @@ namespace Lucene.Net.Support
 
             writer.DeleteDocuments(new Lucene.Net.Index.Term("TEST", "mytest"));
 
-            Assert.IsFalse(reader.IsCurrent);
+            Assert.IsFalse(reader.IsCurrent());
 
             int resCount1 = new IndexSearcher(reader).Search(new TermQuery(new Term("TEST", "mytest")),100).TotalHits; 
             Assert.AreEqual(1, resCount1);
 
             writer.Commit();
 
-            Assert.IsFalse(reader.IsCurrent);
+            Assert.IsFalse(reader.IsCurrent());
 
             int resCount2 = new IndexSearcher(reader).Search(new TermQuery(new Term("TEST", "mytest")),100).TotalHits;
             Assert.AreEqual(1, resCount2, "Reopen not invoked yet, resultCount must still be 1.");
 
             reader = reader.Reopen();
-            Assert.IsTrue(reader.IsCurrent);
+            Assert.IsTrue(reader.IsCurrent());
 
             int resCount3 = new IndexSearcher(reader).Search(new TermQuery(new Term("TEST", "mytest")), 100).TotalHits;
             Assert.AreEqual(0, resCount3, "After reopen, resultCount must be 0.");

Modified: incubator/lucene.net/trunk/test/core/Util/TestAttributeSource.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Util/TestAttributeSource.cs?rev=1303294&r1=1303293&r2=1303294&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Util/TestAttributeSource.cs (original)
+++ incubator/lucene.net/trunk/test/core/Util/TestAttributeSource.cs Wed Mar 21 06:04:26 2012
@@ -38,19 +38,19 @@ namespace Lucene.Net.Util
             TermAttribute termAtt = src.AddAttribute<TermAttribute>();
             TypeAttribute typeAtt = src.AddAttribute<TypeAttribute>();
             termAtt.SetTermBuffer("TestTerm");
-            typeAtt.SetType("TestType");
+            typeAtt.Type = "TestType";
             int hashCode = src.GetHashCode();
 
             AttributeSource.State state = src.CaptureState();
 
             // modify the attributes
             termAtt.SetTermBuffer("AnotherTestTerm");
-            typeAtt.SetType("AnotherTestType");
+            typeAtt.Type = "AnotherTestType";
             Assert.IsTrue(hashCode != src.GetHashCode(), "Hash code should be different");
 
             src.RestoreState(state);
             Assert.AreEqual("TestTerm", termAtt.Term());
-            Assert.AreEqual("TestType", typeAtt.Type());
+            Assert.AreEqual("TestType", typeAtt.Type);
             Assert.AreEqual(hashCode, src.GetHashCode(), "Hash code should be equal after restore");
 
             // restore into an exact configured copy
@@ -70,7 +70,7 @@ namespace Lucene.Net.Util
 
             src2.RestoreState(state);
             Assert.AreEqual("TestTerm", termAtt.Term());
-            Assert.AreEqual("TestType", typeAtt.Type());
+            Assert.AreEqual("TestType", typeAtt.Type);
             Assert.AreEqual(12345, flagsAtt.Flags, "FlagsAttribute should not be touched");
 
             // init a third instance missing one Attribute
@@ -94,10 +94,10 @@ namespace Lucene.Net.Util
             TermAttribute termAtt = src.AddAttribute<TermAttribute>();
             TypeAttribute typeAtt = src.AddAttribute<TypeAttribute>();
             termAtt.SetTermBuffer("TestTerm");
-            typeAtt.SetType("TestType");
+            typeAtt.Type = "TestType";
 
             AttributeSource clone = src.CloneAttributes();
-            System.Collections.Generic.IEnumerator<Type> it = clone.GetAttributeClassesIterator().GetEnumerator();
+            System.Collections.Generic.IEnumerator<Type> it = clone.GetAttributeTypesIterator().GetEnumerator();
             Assert.IsTrue(it.MoveNext());
             Assert.AreEqual(typeof(TermAttribute), it.Current, "TermAttribute must be the first attribute");
             Assert.IsTrue(it.MoveNext());
@@ -119,7 +119,7 @@ namespace Lucene.Net.Util
             TermAttribute termAtt = src.AddAttribute<TermAttribute>();
             TypeAttribute typeAtt = src.AddAttribute<TypeAttribute>();
             termAtt.SetTermBuffer("TestTerm");
-            typeAtt.SetType("TestType");
+            typeAtt.Type = "TestType";
             Assert.AreEqual("(" + termAtt.ToString() + "," + typeAtt.ToString() + ")", src.ToString(), "Attributes should appear in original order");
             System.Collections.Generic.IEnumerator<AttributeImpl> it = src.GetAttributeImplsIterator().GetEnumerator();
             Assert.IsTrue(it.MoveNext(), "Iterator should have 2 attributes left");



Mime
View raw message