lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ccurr...@apache.org
Subject svn commit: r1299911 [12/14] - in /incubator/lucene.net/trunk: src/core/ src/core/Analysis/ src/core/Analysis/Standard/ src/core/Analysis/Tokenattributes/ src/core/Document/ src/core/Index/ src/core/Messages/ src/core/QueryParser/ src/core/Search/ src/...
Date Mon, 12 Mar 2012 22:29:37 GMT
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=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/Function/TestFieldScoreQuery.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/Function/TestFieldScoreQuery.cs Mon Mar 12 22:29:26 2012
@@ -97,9 +97,9 @@ namespace Lucene.Net.Search.Function
 			System.String prevID = "ID" + (N_DOCS + 1); // greater than all ids of docs in this test
 			for (int i = 0; i < h.Length; i++)
 			{
-				System.String resID = s.Doc(h[i].doc).Get(ID_FIELD);
-				Log(i + ".   score=" + h[i].score + "  -  " + resID);
-				Log(s.Explain(q, h[i].doc));
+				System.String resID = s.Doc(h[i].Doc).Get(ID_FIELD);
+				Log(i + ".   score=" + h[i].Score + "  -  " + resID);
+				Log(s.Explain(q, h[i].Doc));
 				Assert.IsTrue(String.CompareOrdinal(resID, prevID) < 0, "res id " + resID + " should be < prev res id " + prevID);
 				prevID = resID;
 			}
@@ -148,9 +148,9 @@ namespace Lucene.Net.Search.Function
 			ScoreDoc[] sd = td.ScoreDocs;
 			for (int i = 0; i < sd.Length; i++)
 			{
-				float score = sd[i].score;
-				Log(s.Explain(q, sd[i].doc));
-				System.String id = s.GetIndexReader().Document(sd[i].doc).Get(ID_FIELD);
+				float score = sd[i].Score;
+				Log(s.Explain(q, sd[i].Doc));
+				System.String id = s.IndexReader.Document(sd[i].Doc).Get(ID_FIELD);
 				float expectedScore = ExpectedFieldScore(id); // "ID7" --> 7.0
 				Assert.AreEqual(expectedScore, score, TEST_SCORE_TOLERANCE_DELTA, "score of " + id + " shuould be " + expectedScore + " != " + score);
 			}
@@ -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.GetIndexReader().GetSequentialSubReaders().Length];
+			System.Object[] innerArray = new Object[s.IndexReader.SequentialSubReaders.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.GetIndexReader().GetSequentialSubReaders();
+				IndexReader[] readers = s.IndexReader.SequentialSubReaders;
 				for (int j = 0; j < readers.Length; j++)
 				{
 					IndexReader reader = readers[j];
@@ -216,14 +216,14 @@ namespace Lucene.Net.Search.Function
 					{
 						if (i == 0)
 						{
-							innerArray[j] = q.valSrc_ForNUnit.GetValues(reader).GetInnerArray();
+							innerArray[j] = q.valSrc_ForNUnit.GetValues(reader).InnerArray;
 							Log(i + ".  compare: " + innerArray[j].GetType() + " to " + expectedArrayTypes[tp].GetType());
 							Assert.AreEqual(innerArray[j].GetType(), expectedArrayTypes[tp].GetType(), "field values should be cached in the correct array type!");
 						}
 						else
 						{
-							Log(i + ".  compare: " + innerArray[j] + " to " + q.valSrc_ForNUnit.GetValues(reader).GetInnerArray());
-							Assert.AreSame(innerArray[j], q.valSrc_ForNUnit.GetValues(reader).GetInnerArray(), "field values should be cached and reused!");
+							Log(i + ".  compare: " + innerArray[j] + " to " + q.valSrc_ForNUnit.GetValues(reader).InnerArray);
+							Assert.AreSame(innerArray[j], q.valSrc_ForNUnit.GetValues(reader).InnerArray, "field values should be cached and reused!");
 						}
 					}
 					catch (System.NotSupportedException e)
@@ -242,14 +242,14 @@ 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.GetIndexReader().GetSequentialSubReaders();
+			IndexReader[] readers2 = s.IndexReader.SequentialSubReaders;
 			for (int j = 0; j < readers2.Length; j++)
 			{
 				IndexReader reader = readers2[j];
 				try
 				{
-					Log("compare: " + innerArray + " to " + q2.valSrc_ForNUnit.GetValues(reader).GetInnerArray());
-					Assert.AreNotSame(innerArray, q2.valSrc_ForNUnit.GetValues(reader).GetInnerArray(), "cached field values should not be reused if reader as changed!");
+					Log("compare: " + innerArray + " to " + q2.valSrc_ForNUnit.GetValues(reader).InnerArray);
+					Assert.AreNotSame(innerArray, q2.valSrc_ForNUnit.GetValues(reader).InnerArray, "cached field values should not be reused if reader as changed!");
 				}
 				catch (System.NotSupportedException e)
 				{

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=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/Function/TestOrdValues.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/Function/TestOrdValues.cs Mon Mar 12 22:29:26 2012
@@ -89,9 +89,9 @@ namespace Lucene.Net.Search.Function
 			
 			for (int i = 0; i < h.Length; i++)
 			{
-				System.String resID = s.Doc(h[i].doc).Get(ID_FIELD);
-				Log(i + ".   score=" + h[i].score + "  -  " + resID);
-				Log(s.Explain(q, h[i].doc));
+				System.String resID = s.Doc(h[i].Doc).Get(ID_FIELD);
+				Log(i + ".   score=" + h[i].Score + "  -  " + resID);
+				Log(s.Explain(q, h[i].Doc));
 				if (inOrder)
 				{
 					Assert.IsTrue(String.CompareOrdinal(resID, prevID) < 0, "res id " + resID + " should be < prev res id " + prevID);
@@ -138,10 +138,10 @@ namespace Lucene.Net.Search.Function
 			ScoreDoc[] sd = td.ScoreDocs;
 			for (int i = 0; i < sd.Length; i++)
 			{
-				float score = sd[i].score;
-				System.String id = s.GetIndexReader().Document(sd[i].doc).Get(ID_FIELD);
+				float score = sd[i].Score;
+				System.String id = s.IndexReader.Document(sd[i].Doc).Get(ID_FIELD);
 				Log("-------- " + i + ". Explain doc " + id);
-				Log(s.Explain(q, sd[i].doc));
+				Log(s.Explain(q, sd[i].Doc));
 				float expectedScore = N_DOCS - i;
 				Assert.AreEqual(expectedScore, score, TEST_SCORE_TOLERANCE_DELTA, "score of result " + i + " shuould be " + expectedScore + " != " + score);
 				System.String expectedId = inOrder?Id2String(N_DOCS - i):Id2String(i + 1); // reverse  ==> smaller values first 
@@ -187,19 +187,19 @@ namespace Lucene.Net.Search.Function
 				try
 				{
 					Assert.AreEqual(N_DOCS, h.Length, "All docs should be matched!");
-					IndexReader[] readers = s.GetIndexReader().GetSequentialSubReaders();
+					IndexReader[] readers = s.IndexReader.SequentialSubReaders;
 					
 					for (int j = 0; j < readers.Length; j++)
 					{
 						IndexReader reader = readers[j];
 						if (i == 0)
 						{
-							innerArray = q.valSrc_ForNUnit.GetValues(reader).GetInnerArray();
+							innerArray = q.valSrc_ForNUnit.GetValues(reader).InnerArray;
 						}
 						else
 						{
-							Log(i + ".  compare: " + innerArray + " to " + q.valSrc_ForNUnit.GetValues(reader).GetInnerArray());
-							Assert.AreSame(innerArray, q.valSrc_ForNUnit.GetValues(reader).GetInnerArray(), "field values should be cached and reused!");
+							Log(i + ".  compare: " + innerArray + " to " + q.valSrc_ForNUnit.GetValues(reader).InnerArray);
+							Assert.AreSame(innerArray, q.valSrc_ForNUnit.GetValues(reader).InnerArray, "field values should be cached and reused!");
 						}
 					}
 				}
@@ -231,15 +231,15 @@ 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.GetIndexReader().GetSequentialSubReaders();
+			IndexReader[] readers2 = s.IndexReader.SequentialSubReaders;
 			
 			for (int j = 0; j < readers2.Length; j++)
 			{
 				IndexReader reader = readers2[j];
 				try
 				{
-					Log("compare (should differ): " + innerArray + " to " + q2.valSrc_ForNUnit.GetValues(reader).GetInnerArray());
-					Assert.AreNotSame(innerArray, q2.valSrc_ForNUnit.GetValues(reader).GetInnerArray(), "different values shuold be loaded for a different field!");
+					Log("compare (should differ): " + innerArray + " to " + q2.valSrc_ForNUnit.GetValues(reader).InnerArray);
+					Assert.AreNotSame(innerArray, q2.valSrc_ForNUnit.GetValues(reader).InnerArray, "different values shuold be loaded for a different field!");
 				}
 				catch (System.NotSupportedException e)
 				{
@@ -264,15 +264,15 @@ 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.GetIndexReader().GetSequentialSubReaders();
+			readers2 = s.IndexReader.SequentialSubReaders;
 			
 			for (int j = 0; j < readers2.Length; j++)
 			{
 				IndexReader reader = readers2[j];
 				try
 				{
-					Log("compare (should differ): " + innerArray + " to " + q2.valSrc_ForNUnit.GetValues(reader).GetInnerArray());
-					Assert.AreNotSame(innerArray, q2.valSrc_ForNUnit.GetValues(reader).GetInnerArray(), "cached field values should not be reused if reader as changed!");
+					Log("compare (should differ): " + innerArray + " to " + q2.valSrc_ForNUnit.GetValues(reader).InnerArray);
+					Assert.AreNotSame(innerArray, q2.valSrc_ForNUnit.GetValues(reader).InnerArray, "cached field values should not be reused if reader as changed!");
 				}
 				catch (System.NotSupportedException e)
 				{

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=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/JustCompileSearch.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/JustCompileSearch.cs Mon Mar 12 22:29:26 2012
@@ -67,13 +67,14 @@ namespace Lucene.Net.Search
 			{
 				throw new System.NotSupportedException(Lucene.Net.Search.JustCompileSearch.UNSUPPORTED_MSG);
 			}
-			
-			public override Similarity GetSimilarity()
-			{
-				throw new System.NotSupportedException(Lucene.Net.Search.JustCompileSearch.UNSUPPORTED_MSG);
-			}
-			
-			public override void  Search(Query query, Collector results)
+
+		    public override Similarity Similarity
+		    {
+		        get { throw new System.NotSupportedException(Lucene.Net.Search.JustCompileSearch.UNSUPPORTED_MSG); }
+		        set { throw new System.NotSupportedException(Lucene.Net.Search.JustCompileSearch.UNSUPPORTED_MSG); }
+		    }
+
+		    public override void  Search(Query query, Collector results)
 			{
 				throw new System.NotSupportedException(Lucene.Net.Search.JustCompileSearch.UNSUPPORTED_MSG);
 			}
@@ -97,13 +98,8 @@ namespace Lucene.Net.Search
 			{
 				throw new System.NotSupportedException(Lucene.Net.Search.JustCompileSearch.UNSUPPORTED_MSG);
 			}
-			
-			public override void  SetSimilarity(Similarity similarity)
-			{
-				throw new System.NotSupportedException(Lucene.Net.Search.JustCompileSearch.UNSUPPORTED_MSG);
-			}
-			
-			public override int DocFreq(Term term)
+
+		    public override int DocFreq(Term term)
 			{
 				throw new System.NotSupportedException(Lucene.Net.Search.JustCompileSearch.UNSUPPORTED_MSG);
 			}
@@ -242,11 +238,11 @@ namespace Lucene.Net.Search
 			{
 				throw new System.NotSupportedException(Lucene.Net.Search.JustCompileSearch.UNSUPPORTED_MSG);
 			}
-			
-			public override System.IComparable Value(int slot)
-			{
-				throw new System.NotSupportedException(Lucene.Net.Search.JustCompileSearch.UNSUPPORTED_MSG);
-			}
+
+		    public override IComparable this[int slot]
+		    {
+		        get { throw new System.NotSupportedException(Lucene.Net.Search.JustCompileSearch.UNSUPPORTED_MSG); }
+		    }
 		}
 		
 		[Serializable]
@@ -308,8 +304,8 @@ namespace Lucene.Net.Search
 			{
 				throw new System.NotSupportedException(Lucene.Net.Search.JustCompileSearch.UNSUPPORTED_MSG);
 			}
-			
-			public /*protected internal*/ override bool TermCompare(Term term)
+
+		    /*protected internal*/ protected internal override bool TermCompare(Term term)
 			{
 				throw new System.NotSupportedException(Lucene.Net.Search.JustCompileSearch.UNSUPPORTED_MSG);
 			}
@@ -457,28 +453,28 @@ namespace Lucene.Net.Search
 			{
 				throw new System.NotSupportedException(Lucene.Net.Search.JustCompileSearch.UNSUPPORTED_MSG);
 			}
-			
-			public override Query GetQuery()
-			{
-				throw new System.NotSupportedException(Lucene.Net.Search.JustCompileSearch.UNSUPPORTED_MSG);
-			}
-			
-			public override float GetValue()
-			{
-				throw new System.NotSupportedException(Lucene.Net.Search.JustCompileSearch.UNSUPPORTED_MSG);
-			}
-			
-			public override void  Normalize(float norm)
-			{
-				throw new System.NotSupportedException(Lucene.Net.Search.JustCompileSearch.UNSUPPORTED_MSG);
-			}
-			
-			public override float SumOfSquaredWeights()
+
+		    public override Query Query
+		    {
+		        get { throw new System.NotSupportedException(Lucene.Net.Search.JustCompileSearch.UNSUPPORTED_MSG); }
+		    }
+
+		    public override float Value
+		    {
+		        get { throw new System.NotSupportedException(Lucene.Net.Search.JustCompileSearch.UNSUPPORTED_MSG); }
+		    }
+
+		    public override void  Normalize(float norm)
 			{
 				throw new System.NotSupportedException(Lucene.Net.Search.JustCompileSearch.UNSUPPORTED_MSG);
 			}
-			
-			public override Scorer Scorer(IndexReader reader, bool scoreDocsInOrder, bool topScorer)
+
+		    public override float SumOfSquaredWeights
+		    {
+		        get { throw new System.NotSupportedException(Lucene.Net.Search.JustCompileSearch.UNSUPPORTED_MSG); }
+		    }
+
+		    public override Scorer Scorer(IndexReader reader, bool scoreDocsInOrder, bool topScorer)
 			{
 				throw new System.NotSupportedException(Lucene.Net.Search.JustCompileSearch.UNSUPPORTED_MSG);
 			}

Modified: incubator/lucene.net/trunk/test/core/Search/Payloads/PayloadHelper.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/Payloads/PayloadHelper.cs?rev=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/Payloads/PayloadHelper.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/Payloads/PayloadHelper.cs Mon Mar 12 22:29:26 2012
@@ -110,17 +110,17 @@ namespace Lucene.Net.Search.Payloads
 				{
 					if (fieldName.Equals(Lucene.Net.Search.Payloads.PayloadHelper.FIELD))
 					{
-						payloadAtt.SetPayload(new Payload(Enclosing_Instance.payloadField));
+						payloadAtt.Payload = new Payload(Enclosing_Instance.payloadField);
 					}
 					else if (fieldName.Equals(Lucene.Net.Search.Payloads.PayloadHelper.MULTI_FIELD))
 					{
 						if (numSeen % 2 == 0)
 						{
-							payloadAtt.SetPayload(new Payload(Enclosing_Instance.payloadMultiField1));
+							payloadAtt.Payload = new Payload(Enclosing_Instance.payloadMultiField1);
 						}
 						else
 						{
-							payloadAtt.SetPayload(new Payload(Enclosing_Instance.payloadMultiField2));
+							payloadAtt.Payload = new Payload(Enclosing_Instance.payloadMultiField2);
 						}
 						numSeen++;
 					}
@@ -159,7 +159,7 @@ namespace Lucene.Net.Search.Payloads
 			writer.Close();
 			
 			IndexSearcher searcher = new IndexSearcher(directory, true);
-			searcher.SetSimilarity(similarity);
+			searcher.Similarity = similarity;
 			return searcher;
 		}
 	}

Modified: incubator/lucene.net/trunk/test/core/Search/Payloads/TestPayloadNearQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/Payloads/TestPayloadNearQuery.cs?rev=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/Payloads/TestPayloadNearQuery.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/Payloads/TestPayloadNearQuery.cs Mon Mar 12 22:29:26 2012
@@ -123,11 +123,11 @@ namespace Lucene.Net.Search.Payloads
 				{
 					if (numSeen % 2 == 0)
 					{
-						payAtt.SetPayload(new Payload(Enclosing_Instance.payload2));
+						payAtt.Payload = new Payload(Enclosing_Instance.payload2);
 					}
 					else
 					{
-						payAtt.SetPayload(new Payload(Enclosing_Instance.payload4));
+						payAtt.Payload = new Payload(Enclosing_Instance.payload4);
 					}
 					numSeen++;
 					result = true;
@@ -169,7 +169,7 @@ namespace Lucene.Net.Search.Payloads
 			writer.Close();
 			
 			searcher = new IndexSearcher(directory, true);
-			searcher.SetSimilarity(similarity);
+			searcher.Similarity = similarity;
 		}
 		
         [Test]
@@ -189,7 +189,7 @@ namespace Lucene.Net.Search.Payloads
 			for (int j = 0; j < hits.ScoreDocs.Length; j++)
 			{
 				ScoreDoc doc = hits.ScoreDocs[j];
-				Assert.IsTrue(doc.score == 3, doc.score + " does not equal: " + 3);
+				Assert.IsTrue(doc.Score == 3, doc.Score + " does not equal: " + 3);
 			}
 			for (int i = 1; i < 10; i++)
 			{
@@ -204,7 +204,7 @@ namespace Lucene.Net.Search.Payloads
 					ScoreDoc doc = hits.ScoreDocs[j];
 					//				System.out.println("Doc: " + doc.toString());
 					//				System.out.println("Explain: " + searcher.explain(query, doc.doc));
-					Assert.IsTrue(doc.score == 3, doc.score + " does not equal: " + 3);
+					Assert.IsTrue(doc.Score == 3, doc.Score + " does not equal: " + 3);
 				}
 			}
 		}
@@ -255,7 +255,7 @@ namespace Lucene.Net.Search.Payloads
 			Assert.IsTrue(hits != null, "hits is null and it shouldn't be");
 			Assert.IsTrue(hits.TotalHits == 1, "there should only be one hit");
 			// should have score = 3 because adjacent terms have payloads of 2,4
-			Assert.IsTrue(doc.score == 3, doc.score + " does not equal: " + 3);
+			Assert.IsTrue(doc.Score == 3, doc.Score + " does not equal: " + 3);
 		}
 		
         [Test]
@@ -280,7 +280,7 @@ namespace Lucene.Net.Search.Payloads
 			ScoreDoc doc = hits.ScoreDocs[0];
 			//		System.out.println("Doc: " + doc.toString());
 			//		System.out.println("Explain: " + searcher.explain(query, doc.doc));
-			Assert.IsTrue(doc.score == 3, doc.score + " does not equal: " + 3);
+			Assert.IsTrue(doc.Score == 3, doc.Score + " does not equal: " + 3);
 		}
 		// must be static for weight serialization tests 
 		[Serializable]
@@ -331,9 +331,10 @@ namespace Lucene.Net.Search.Payloads
             {
                 public Func<float> GetIdfFunc { get; set; }
                 public Func<string> ExplainFunc { get; set; }
-                public override float GetIdf()
+
+                public override float Idf
                 {
-                    return GetIdfFunc.Invoke();
+                    get { return GetIdfFunc.Invoke(); }
                 }
 
                 public override string Explain()

Modified: incubator/lucene.net/trunk/test/core/Search/Payloads/TestPayloadTermQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/Payloads/TestPayloadTermQuery.cs?rev=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/Payloads/TestPayloadTermQuery.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/Payloads/TestPayloadTermQuery.cs Mon Mar 12 22:29:26 2012
@@ -133,17 +133,17 @@ namespace Lucene.Net.Search.Payloads
 				{
 					if (fieldName.Equals("field"))
 					{
-						payloadAtt.SetPayload(new Payload(Enclosing_Instance.payloadField));
+						payloadAtt.Payload = new Payload(Enclosing_Instance.payloadField);
 					}
 					else if (fieldName.Equals("multiField"))
 					{
 						if (numSeen % 2 == 0)
 						{
-							payloadAtt.SetPayload(new Payload(Enclosing_Instance.payloadMultiField1));
+							payloadAtt.Payload = new Payload(Enclosing_Instance.payloadMultiField1);
 						}
 						else
 						{
-							payloadAtt.SetPayload(new Payload(Enclosing_Instance.payloadMultiField2));
+							payloadAtt.Payload = new Payload(Enclosing_Instance.payloadMultiField2);
 						}
 						numSeen++;
 					}
@@ -179,7 +179,7 @@ namespace Lucene.Net.Search.Payloads
 			writer.Close();
 			
 			searcher = new IndexSearcher(directory, true);
-			searcher.SetSimilarity(similarity);
+			searcher.Similarity = similarity;
 		}
 		
         [Test]
@@ -192,15 +192,15 @@ namespace Lucene.Net.Search.Payloads
 			
 			//they should all have the exact same score, because they all contain seventy once, and we set
 			//all the other similarity factors to be 1
-			
-			Assert.IsTrue(hits.GetMaxScore() == 1, hits.GetMaxScore() + " does not equal: " + 1);
+
+            Assert.IsTrue(hits.MaxScore == 1, hits.MaxScore + " does not equal: " + 1);
 			for (int i = 0; i < hits.ScoreDocs.Length; i++)
 			{
 				ScoreDoc doc = hits.ScoreDocs[i];
-				Assert.IsTrue(doc.score == 1, doc.score + " does not equal: " + 1);
+				Assert.IsTrue(doc.Score == 1, doc.Score + " does not equal: " + 1);
 			}
 			CheckHits.CheckExplanations(query, PayloadHelper.FIELD, searcher, true);
-			Lucene.Net.Search.Spans.Spans spans = query.GetSpans(searcher.GetIndexReader());
+			Lucene.Net.Search.Spans.Spans spans = query.GetSpans(searcher.IndexReader);
 			Assert.IsTrue(spans != null, "spans is null and it shouldn't be");
 			Assert.IsTrue(spans is TermSpans, "spans is not an instanceof " + typeof(TermSpans));
             /*float score = hits.score(0);
@@ -237,26 +237,26 @@ namespace Lucene.Net.Search.Payloads
 			//all the other similarity factors to be 1
 			
 			//System.out.println("Hash: " + seventyHash + " Twice Hash: " + 2*seventyHash);
-			Assert.IsTrue(hits.GetMaxScore() == 4.0, hits.GetMaxScore() + " does not equal: " + 4.0);
+            Assert.IsTrue(hits.MaxScore == 4.0, hits.MaxScore + " does not equal: " + 4.0);
 			//there should be exactly 10 items that score a 4, all the rest should score a 2
 			//The 10 items are: 70 + i*100 where i in [0-9]
 			int numTens = 0;
 			for (int i = 0; i < hits.ScoreDocs.Length; i++)
 			{
 				ScoreDoc doc = hits.ScoreDocs[i];
-				if (doc.doc % 10 == 0)
+				if (doc.Doc % 10 == 0)
 				{
 					numTens++;
-					Assert.IsTrue(doc.score == 4.0, doc.score + " does not equal: " + 4.0);
+					Assert.IsTrue(doc.Score == 4.0, doc.Score + " does not equal: " + 4.0);
 				}
 				else
 				{
-					Assert.IsTrue(doc.score == 2, doc.score + " does not equal: " + 2);
+					Assert.IsTrue(doc.Score == 2, doc.Score + " does not equal: " + 2);
 				}
 			}
 			Assert.IsTrue(numTens == 10, numTens + " does not equal: " + 10);
 			CheckHits.CheckExplanations(query, "field", searcher, true);
-			Lucene.Net.Search.Spans.Spans spans = query.GetSpans(searcher.GetIndexReader());
+			Lucene.Net.Search.Spans.Spans spans = query.GetSpans(searcher.IndexReader);
 			Assert.IsTrue(spans != null, "spans is null and it shouldn't be");
 			Assert.IsTrue(spans is TermSpans, "spans is not an instanceof " + typeof(TermSpans));
 			//should be two matches per document
@@ -276,7 +276,7 @@ namespace Lucene.Net.Search.Payloads
 			PayloadTermQuery query = new PayloadTermQuery(new Term(PayloadHelper.MULTI_FIELD, "seventy"), new MaxPayloadFunction(), false);
 			
 			IndexSearcher theSearcher = new IndexSearcher(directory, true);
-			theSearcher.SetSimilarity(new FullSimilarity());
+			theSearcher.Similarity = new FullSimilarity();
 			TopDocs hits = searcher.Search(query, null, 100);
 			Assert.IsTrue(hits != null, "hits is null and it shouldn't be");
 			Assert.IsTrue(hits.TotalHits == 100, "hits Size: " + hits.TotalHits + " is not: " + 100);
@@ -285,26 +285,26 @@ namespace Lucene.Net.Search.Payloads
 			//all the other similarity factors to be 1
 			
 			//System.out.println("Hash: " + seventyHash + " Twice Hash: " + 2*seventyHash);
-			Assert.IsTrue(hits.GetMaxScore() == 4.0, hits.GetMaxScore() + " does not equal: " + 4.0);
+            Assert.IsTrue(hits.MaxScore == 4.0, hits.MaxScore + " does not equal: " + 4.0);
 			//there should be exactly 10 items that score a 4, all the rest should score a 2
 			//The 10 items are: 70 + i*100 where i in [0-9]
 			int numTens = 0;
 			for (int i = 0; i < hits.ScoreDocs.Length; i++)
 			{
 				ScoreDoc doc = hits.ScoreDocs[i];
-				if (doc.doc % 10 == 0)
+				if (doc.Doc % 10 == 0)
 				{
 					numTens++;
-					Assert.IsTrue(doc.score == 4.0, doc.score + " does not equal: " + 4.0);
+					Assert.IsTrue(doc.Score == 4.0, doc.Score + " does not equal: " + 4.0);
 				}
 				else
 				{
-					Assert.IsTrue(doc.score == 2, doc.score + " does not equal: " + 2);
+					Assert.IsTrue(doc.Score == 2, doc.Score + " does not equal: " + 2);
 				}
 			}
 			Assert.IsTrue(numTens == 10, numTens + " does not equal: " + 10);
 			CheckHits.CheckExplanations(query, "field", searcher, true);
-			Lucene.Net.Search.Spans.Spans spans = query.GetSpans(searcher.GetIndexReader());
+			Lucene.Net.Search.Spans.Spans spans = query.GetSpans(searcher.IndexReader);
 			Assert.IsTrue(spans != null, "spans is null and it shouldn't be");
 			Assert.IsTrue(spans is TermSpans, "spans is not an instanceof " + typeof(TermSpans));
 			//should be two matches per document

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=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/QueryUtils.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/QueryUtils.cs Mon Mar 12 22:29:26 2012
@@ -233,13 +233,13 @@ namespace Lucene.Net.Search
 			CheckEqual(q, q2);
 			
 			Query q3 = (Query) q.Clone();
-			q3.SetBoost(7.21792348f);
+			q3.Boost = 7.21792348f;
 			CheckUnequal(q, q3);
 			
 			// test that a class check is done so that no exception is thrown
 			// in the implementation of equals()
 			Query whacky = new AnonymousClassQuery();
-			whacky.SetBoost(q.GetBoost());
+			whacky.Boost = q.Boost;
 			CheckUnequal(q, whacky);
 		}
 		
@@ -336,7 +336,7 @@ namespace Lucene.Net.Search
 		public static IndexSearcher WrapUnderlyingReader(IndexSearcher s, int edge)
 		{
 			
-			IndexReader r = s.GetIndexReader();
+			IndexReader r = s.IndexReader;
 			
 			// we can't put deleted docs before the nested reader, because
 			// it will throw off the docIds
@@ -360,7 +360,7 @@ namespace Lucene.Net.Search
 		                                                        })
 		                                };
 			IndexSearcher out_Renamed = new IndexSearcher(new MultiReader(readers));
-			out_Renamed.SetSimilarity(s.GetSimilarity());
+			out_Renamed.Similarity = s.Similarity;
 			return out_Renamed;
 		}
 		/// <summary> Given a Searcher, returns a new MultiSearcher wrapping the  
@@ -397,7 +397,7 @@ namespace Lucene.Net.Search
 		                                                         })
 		                               };
 			MultiSearcher out_Renamed = new MultiSearcher(searchers);
-			out_Renamed.SetSimilarity(s.GetSimilarity());
+			out_Renamed.Similarity = s.Similarity;
 			return out_Renamed;
 		}
 		
@@ -420,7 +420,7 @@ namespace Lucene.Net.Search
 			Assert.AreEqual(0, w.NumDocs(), "writer has non-deleted docs");
 			w.Close();
             IndexReader r = IndexReader.Open(d, true);
-			Assert.AreEqual(numDeletedDocs, r.NumDeletedDocs(), "reader has wrong number of deleted docs");
+			Assert.AreEqual(numDeletedDocs, r.NumDeletedDocs, "reader has wrong number of deleted docs");
 			r.Close();
 			return d;
 		}
@@ -461,7 +461,7 @@ namespace Lucene.Net.Search
 		{
 			//System.out.println("Checking "+q);
 			
-			if (q.Weight(s).ScoresDocsOutOfOrder())
+			if (q.Weight(s).ScoresDocsOutOfOrder)
 				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/SingleDocTestFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/SingleDocTestFilter.cs?rev=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/SingleDocTestFilter.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/SingleDocTestFilter.cs Mon Mar 12 22:29:26 2012
@@ -37,7 +37,7 @@ namespace Lucene.Net.Search
 		
 		public override DocIdSet GetDocIdSet(IndexReader reader)
 		{
-			System.Collections.BitArray bits = new System.Collections.BitArray((reader.MaxDoc() % 64 == 0?reader.MaxDoc() / 64:reader.MaxDoc() / 64 + 1) * 64);
+			System.Collections.BitArray bits = new System.Collections.BitArray((reader.MaxDoc % 64 == 0?reader.MaxDoc / 64:reader.MaxDoc / 64 + 1) * 64);
 			bits.Set(doc, true);
 			return new DocIdBitSet(bits);
 		}

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=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/Spans/JustCompileSearchSpans.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/Spans/JustCompileSearchSpans.cs Mon Mar 12 22:29:26 2012
@@ -16,7 +16,7 @@
  */
 
 using System;
-
+using System.Collections.Generic;
 using NUnit.Framework;
 
 using IndexReader = Lucene.Net.Index.IndexReader;
@@ -64,28 +64,27 @@ namespace Lucene.Net.Search.Spans
 			{
 				throw new System.NotSupportedException(Lucene.Net.Search.Spans.JustCompileSearchSpans.UNSUPPORTED_MSG);
 			}
-			
-			public override System.Collections.Generic.ICollection<byte[]> GetPayload()
-			{
-				throw new System.NotSupportedException(Lucene.Net.Search.Spans.JustCompileSearchSpans.UNSUPPORTED_MSG);
-			}
-			
-			public override bool IsPayloadAvailable()
-			{
-				throw new System.NotSupportedException(Lucene.Net.Search.Spans.JustCompileSearchSpans.UNSUPPORTED_MSG);
-			}
+
+		    public override ICollection<byte[]> Payload
+		    {
+		        get { throw new System.NotSupportedException(Lucene.Net.Search.Spans.JustCompileSearchSpans.UNSUPPORTED_MSG); }
+		    }
+
+		    public override bool IsPayloadAvailable
+		    {
+		        get { throw new System.NotSupportedException(Lucene.Net.Search.Spans.JustCompileSearchSpans.UNSUPPORTED_MSG); }
+		    }
 		}
 		
 		[Serializable]
 		internal sealed class JustCompileSpanQuery:SpanQuery
 		{
-			
-			public override System.String GetField()
-			{
-				throw new System.NotSupportedException(Lucene.Net.Search.Spans.JustCompileSearchSpans.UNSUPPORTED_MSG);
-			}
-			
-			public override Spans GetSpans(IndexReader reader)
+		    public override string Field
+		    {
+		        get { throw new System.NotSupportedException(Lucene.Net.Search.Spans.JustCompileSearchSpans.UNSUPPORTED_MSG); }
+		    }
+
+		    public override Spans GetSpans(IndexReader reader)
 			{
 				throw new System.NotSupportedException(Lucene.Net.Search.Spans.JustCompileSearchSpans.UNSUPPORTED_MSG);
 			}
@@ -98,18 +97,17 @@ namespace Lucene.Net.Search.Spans
 		
 		internal sealed class JustCompilePayloadSpans:Spans
 		{
-			
-			public override System.Collections.Generic.ICollection<byte[]> GetPayload()
-			{
-				throw new System.NotSupportedException(Lucene.Net.Search.Spans.JustCompileSearchSpans.UNSUPPORTED_MSG);
-			}
-			
-			public override bool IsPayloadAvailable()
-			{
-				throw new System.NotSupportedException(Lucene.Net.Search.Spans.JustCompileSearchSpans.UNSUPPORTED_MSG);
-			}
-			
-			public override int Doc()
+		    public override ICollection<byte[]> Payload
+		    {
+		        get { throw new System.NotSupportedException(Lucene.Net.Search.Spans.JustCompileSearchSpans.UNSUPPORTED_MSG); }
+		    }
+
+		    public override bool IsPayloadAvailable
+		    {
+		        get { throw new System.NotSupportedException(Lucene.Net.Search.Spans.JustCompileSearchSpans.UNSUPPORTED_MSG); }
+		    }
+
+		    public override int Doc()
 			{
 				throw new System.NotSupportedException(Lucene.Net.Search.Spans.JustCompileSearchSpans.UNSUPPORTED_MSG);
 			}

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=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/Spans/TestBasics.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/Spans/TestBasics.cs Mon Mar 12 22:29:26 2012
@@ -340,8 +340,8 @@ namespace Lucene.Net.Search.Spans
 		{
 			SpanTermQuery t1 = new SpanTermQuery(new Term("field", "seventy"));
 			SpanTermQuery t2 = new SpanTermQuery(new Term("field", "seventy"));
-			Spans s1 = t1.GetSpans(searcher.GetIndexReader());
-			Spans s2 = t2.GetSpans(searcher.GetIndexReader());
+			Spans s1 = t1.GetSpans(searcher.IndexReader);
+			Spans s2 = t2.GetSpans(searcher.IndexReader);
 			
 			Assert.IsTrue(s1.Next());
 			Assert.IsTrue(s2.Next());

Modified: incubator/lucene.net/trunk/test/core/Search/Spans/TestFieldMaskingSpanQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/Spans/TestFieldMaskingSpanQuery.cs?rev=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/Spans/TestFieldMaskingSpanQuery.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/Spans/TestFieldMaskingSpanQuery.cs Mon Mar 12 22:29:26 2012
@@ -114,7 +114,7 @@ namespace Lucene.Net.Search.Spans
 		public virtual void  TestRewrite0()
 		{
 			SpanQuery q = new FieldMaskingSpanQuery(new SpanTermQuery(new Term("last", "sally")), "first");
-			q.SetBoost(8.7654321f);
+			q.Boost = 8.7654321f;
 			SpanQuery qr = (SpanQuery) searcher.Rewrite(q);
 			
 			QueryUtils.CheckEqual(q, qr);
@@ -168,10 +168,10 @@ namespace Lucene.Net.Search.Spans
 			QueryUtils.CheckUnequal(q1, q5);
 			
 			SpanQuery qA = new FieldMaskingSpanQuery(new SpanTermQuery(new Term("last", "sally")), "first");
-			qA.SetBoost(9f);
+			qA.Boost = 9f;
 			SpanQuery qB = new FieldMaskingSpanQuery(new SpanTermQuery(new Term("last", "sally")), "first");
 			QueryUtils.CheckUnequal(qA, qB);
-			qB.SetBoost(9f);
+			qB.Boost = 9f;
 			QueryUtils.CheckEqual(qA, qB);
 		}
 		
@@ -227,7 +227,7 @@ namespace Lucene.Net.Search.Spans
 			SpanQuery q = new SpanOrQuery(new SpanQuery[]{q1, new FieldMaskingSpanQuery(q2, "gender")});
 			Check(q, new int[]{0, 1, 2, 3, 4});
 			
-			Spans span = q.GetSpans(searcher.GetIndexReader());
+			Spans span = q.GetSpans(searcher.IndexReader);
 			
 			Assert.AreEqual(true, span.Next());
 			Assert.AreEqual(S(0, 0, 1), S(span));
@@ -270,8 +270,8 @@ namespace Lucene.Net.Search.Spans
 			Check(qA, new int[]{0, 1, 2, 4});
 			Check(qB, new int[]{0, 1, 2, 4});
 			
-			Spans spanA = qA.GetSpans(searcher.GetIndexReader());
-			Spans spanB = qB.GetSpans(searcher.GetIndexReader());
+			Spans spanA = qA.GetSpans(searcher.IndexReader);
+			Spans spanB = qB.GetSpans(searcher.IndexReader);
 			
 			while (spanA.Next())
 			{
@@ -291,7 +291,7 @@ namespace Lucene.Net.Search.Spans
 			SpanQuery q = new SpanNearQuery(new SpanQuery[]{new FieldMaskingSpanQuery(qA, "id"), new FieldMaskingSpanQuery(qB, "id")}, - 1, false);
 			Check(q, new int[]{0, 1, 2, 3});
 			
-			Spans span = q.GetSpans(searcher.GetIndexReader());
+			Spans span = q.GetSpans(searcher.IndexReader);
 			
 			Assert.AreEqual(true, span.Next());
 			Assert.AreEqual(S(0, 0, 1), S(span));

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=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/Spans/TestNearSpansOrdered.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/Spans/TestNearSpansOrdered.cs Mon Mar 12 22:29:26 2012
@@ -98,7 +98,7 @@ namespace Lucene.Net.Search.Spans
 		public virtual void  TestNearSpansNext()
 		{
 			SpanNearQuery q = MakeQuery();
-			Spans span = q.GetSpans(searcher.GetIndexReader());
+			Spans span = q.GetSpans(searcher.IndexReader);
 			Assert.AreEqual(true, span.Next());
 			Assert.AreEqual(S(0, 0, 3), S(span));
 			Assert.AreEqual(true, span.Next());
@@ -114,7 +114,7 @@ namespace Lucene.Net.Search.Spans
 		public virtual void  TestNearSpansSkipToLikeNext()
 		{
 			SpanNearQuery q = MakeQuery();
-			Spans span = q.GetSpans(searcher.GetIndexReader());
+			Spans span = q.GetSpans(searcher.IndexReader);
 			Assert.AreEqual(true, span.SkipTo(0));
 			Assert.AreEqual(S(0, 0, 3), S(span));
 			Assert.AreEqual(true, span.SkipTo(1));
@@ -126,7 +126,7 @@ namespace Lucene.Net.Search.Spans
 		public virtual void  TestNearSpansNextThenSkipTo()
 		{
 			SpanNearQuery q = MakeQuery();
-			Spans span = q.GetSpans(searcher.GetIndexReader());
+			Spans span = q.GetSpans(searcher.IndexReader);
 			Assert.AreEqual(true, span.Next());
 			Assert.AreEqual(S(0, 0, 3), S(span));
 			Assert.AreEqual(true, span.SkipTo(1));
@@ -138,7 +138,7 @@ namespace Lucene.Net.Search.Spans
 		public virtual void  TestNearSpansNextThenSkipPast()
 		{
 			SpanNearQuery q = MakeQuery();
-			Spans span = q.GetSpans(searcher.GetIndexReader());
+			Spans span = q.GetSpans(searcher.IndexReader);
 			Assert.AreEqual(true, span.Next());
 			Assert.AreEqual(S(0, 0, 3), S(span));
 			Assert.AreEqual(false, span.SkipTo(2));
@@ -148,7 +148,7 @@ namespace Lucene.Net.Search.Spans
 		public virtual void  TestNearSpansSkipPast()
 		{
 			SpanNearQuery q = MakeQuery();
-			Spans span = q.GetSpans(searcher.GetIndexReader());
+			Spans span = q.GetSpans(searcher.IndexReader);
 			Assert.AreEqual(false, span.SkipTo(2));
 		}
 		
@@ -156,7 +156,7 @@ namespace Lucene.Net.Search.Spans
 		public virtual void  TestNearSpansSkipTo0()
 		{
 			SpanNearQuery q = MakeQuery();
-			Spans span = q.GetSpans(searcher.GetIndexReader());
+			Spans span = q.GetSpans(searcher.IndexReader);
 			Assert.AreEqual(true, span.SkipTo(0));
 			Assert.AreEqual(S(0, 0, 3), S(span));
 		}
@@ -165,7 +165,7 @@ namespace Lucene.Net.Search.Spans
 		public virtual void  TestNearSpansSkipTo1()
 		{
 			SpanNearQuery q = MakeQuery();
-			Spans span = q.GetSpans(searcher.GetIndexReader());
+			Spans span = q.GetSpans(searcher.IndexReader);
 			Assert.AreEqual(true, span.SkipTo(1));
 			Assert.AreEqual(S(1, 0, 4), S(span));
 		}
@@ -178,7 +178,7 @@ namespace Lucene.Net.Search.Spans
 		{
 			SpanNearQuery q = MakeQuery();
 			Weight w = q.Weight(searcher);
-			Scorer s = w.Scorer(searcher.GetIndexReader(), true, false);
+			Scorer s = w.Scorer(searcher.IndexReader, true, false);
 			Assert.AreEqual(1, s.Advance(1));
 		}
 		/// <summary> not a direct test of NearSpans, but a demonstration of how/when
@@ -188,7 +188,7 @@ namespace Lucene.Net.Search.Spans
 		public virtual void  TestSpanNearScorerExplain()
 		{
 			SpanNearQuery q = MakeQuery();
-		    Explanation e = q.Weight(searcher).Explain(searcher.GetIndexReader(), 1);
+		    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());
 		}
 	}

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=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/Spans/TestPayloadSpans.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/Spans/TestPayloadSpans.cs Mon Mar 12 22:29:26 2012
@@ -61,7 +61,7 @@ namespace Lucene.Net.Search.Spans
 			base.SetUp();
 			PayloadHelper helper = new PayloadHelper();
 			searcher = helper.SetUp(similarity, 1000);
-			indexReader = searcher.GetIndexReader();
+			indexReader = searcher.IndexReader;
 		}
 		
 		[Test]
@@ -111,7 +111,7 @@ namespace Lucene.Net.Search.Spans
 			clauses[1] = new SpanTermQuery(new Term(PayloadHelper.FIELD, "three"));
 			SpanQuery spq = new SpanNearQuery(clauses, 5, true);
 			SpanNotQuery snq = new SpanNotQuery(spq, new SpanTermQuery(new Term(PayloadHelper.FIELD, "two")));
-			CheckSpans(snq.GetSpans(GetSpanNotSearcher().GetIndexReader()), 1, new int[]{2});
+			CheckSpans(snq.GetSpans(GetSpanNotSearcher().IndexReader), 1, new int[]{2});
 		}
 		
 		public virtual IndexSearcher GetSpanNotSearcher()
@@ -128,7 +128,7 @@ namespace Lucene.Net.Search.Spans
 			writer.Close();
 			
 			IndexSearcher searcher = new IndexSearcher(directory, true);
-			searcher.SetSimilarity(similarity);
+			searcher.Similarity = similarity;
 			return searcher;
 		}
 		
@@ -139,7 +139,7 @@ namespace Lucene.Net.Search.Spans
 			Spans spans;
 			IndexSearcher searcher = GetSearcher();
 			stq = new SpanTermQuery(new Term(PayloadHelper.FIELD, "mark"));
-			spans = stq.GetSpans(searcher.GetIndexReader());
+			spans = stq.GetSpans(searcher.IndexReader);
 			Assert.IsTrue(spans != null, "spans is null and it shouldn't be");
 			CheckSpans(spans, 0, null);
 			
@@ -150,7 +150,7 @@ namespace Lucene.Net.Search.Spans
 			clauses[2] = new SpanTermQuery(new Term(PayloadHelper.FIELD, "xx"));
 			SpanNearQuery spanNearQuery = new SpanNearQuery(clauses, 12, false);
 			
-			spans = spanNearQuery.GetSpans(searcher.GetIndexReader());
+			spans = spanNearQuery.GetSpans(searcher.IndexReader);
 			Assert.IsTrue(spans != null, "spans is null and it shouldn't be");
 			CheckSpans(spans, 2, new int[]{3, 3});
 			
@@ -162,7 +162,7 @@ namespace Lucene.Net.Search.Spans
 			spanNearQuery = new SpanNearQuery(clauses, 6, true);
 			
 			
-			spans = spanNearQuery.GetSpans(searcher.GetIndexReader());
+			spans = spanNearQuery.GetSpans(searcher.IndexReader);
 			Assert.IsTrue(spans != null, "spans is null and it shouldn't be");
 			CheckSpans(spans, 1, new int[]{3});
 			
@@ -184,7 +184,7 @@ namespace Lucene.Net.Search.Spans
 			
 			// yy within 6 of xx within 6 of rr
 			
-			spans = nestedSpanNearQuery.GetSpans(searcher.GetIndexReader());
+			spans = nestedSpanNearQuery.GetSpans(searcher.IndexReader);
 			Assert.IsTrue(spans != null, "spans is null and it shouldn't be");
 			CheckSpans(spans, 2, new int[]{3, 3});
 		}
@@ -216,7 +216,7 @@ namespace Lucene.Net.Search.Spans
 			
 			SpanNearQuery nestedSpanNearQuery = new SpanNearQuery(clauses3, 6, false);
 			
-			spans = nestedSpanNearQuery.GetSpans(searcher.GetIndexReader());
+			spans = nestedSpanNearQuery.GetSpans(searcher.IndexReader);
 			Assert.IsTrue(spans != null, "spans is null and it shouldn't be");
 			CheckSpans(spans, 1, new int[]{3});
 		}
@@ -253,7 +253,7 @@ namespace Lucene.Net.Search.Spans
 			
 			SpanNearQuery nestedSpanNearQuery = new SpanNearQuery(clauses3, 6, false);
 			
-			spans = nestedSpanNearQuery.GetSpans(searcher.GetIndexReader());
+			spans = nestedSpanNearQuery.GetSpans(searcher.IndexReader);
 			Assert.IsTrue(spans != null, "spans is null and it shouldn't be");
 			CheckSpans(spans, 2, new int[]{8, 8});
 		}
@@ -274,7 +274,7 @@ namespace Lucene.Net.Search.Spans
 			SpanTermQuery stq2 = new SpanTermQuery(new Term("content", "k"));
 			SpanQuery[] sqs = new SpanQuery[]{stq1, stq2};
 			SpanNearQuery snq = new SpanNearQuery(sqs, 1, true);
-			Spans spans = snq.GetSpans(is_Renamed.GetIndexReader());
+			Spans spans = snq.GetSpans(is_Renamed.IndexReader);
 			
 			TopDocs topDocs = is_Renamed.Search(snq, 1);
 			System.Collections.Hashtable payloadSet = new System.Collections.Hashtable();
@@ -282,7 +282,7 @@ namespace Lucene.Net.Search.Spans
 			{
 				while (spans.Next())
 				{
-					System.Collections.Generic.ICollection<byte[]> payloads = spans.GetPayload();
+					System.Collections.Generic.ICollection<byte[]> payloads = spans.Payload;
 					
 					for (System.Collections.IEnumerator it = payloads.GetEnumerator(); it.MoveNext(); )
 					{
@@ -311,7 +311,7 @@ namespace Lucene.Net.Search.Spans
 			SpanTermQuery stq2 = new SpanTermQuery(new Term("content", "k"));
 			SpanQuery[] sqs = new SpanQuery[]{stq1, stq2};
 			SpanNearQuery snq = new SpanNearQuery(sqs, 0, true);
-			Spans spans = snq.GetSpans(is_Renamed.GetIndexReader());
+			Spans spans = snq.GetSpans(is_Renamed.IndexReader);
 			
 			TopDocs topDocs = is_Renamed.Search(snq, 1);
 			System.Collections.Hashtable payloadSet = new System.Collections.Hashtable();
@@ -319,7 +319,7 @@ namespace Lucene.Net.Search.Spans
 			{
 				while (spans.Next())
 				{
-					System.Collections.Generic.ICollection<byte[]> payloads = spans.GetPayload();
+					System.Collections.Generic.ICollection<byte[]> payloads = spans.Payload;
 					for (System.Collections.IEnumerator it = payloads.GetEnumerator(); it.MoveNext(); )
 					{
 						CollectionsHelper.AddIfNotContains(payloadSet, new System.String(System.Text.UTF8Encoding.UTF8.GetChars((byte[]) it.Current)));
@@ -347,7 +347,7 @@ namespace Lucene.Net.Search.Spans
 			SpanTermQuery stq2 = new SpanTermQuery(new Term("content", "k"));
 			SpanQuery[] sqs = new SpanQuery[]{stq1, stq2};
 			SpanNearQuery snq = new SpanNearQuery(sqs, 0, true);
-			Spans spans = snq.GetSpans(is_Renamed.GetIndexReader());
+			Spans spans = snq.GetSpans(is_Renamed.IndexReader);
 			
 			TopDocs topDocs = is_Renamed.Search(snq, 1);
 			System.Collections.Hashtable payloadSet = new System.Collections.Hashtable();
@@ -355,7 +355,7 @@ namespace Lucene.Net.Search.Spans
 			{
 				while (spans.Next())
 				{
-					System.Collections.Generic.ICollection<byte[]> payloads = spans.GetPayload();
+					System.Collections.Generic.ICollection<byte[]> payloads = spans.Payload;
 					
 					for (System.Collections.IEnumerator it = payloads.GetEnumerator(); it.MoveNext(); )
 					{
@@ -391,7 +391,7 @@ namespace Lucene.Net.Search.Spans
 			
 			IndexSearcher searcher = new IndexSearcher(directory, true);
 			
-			IndexReader reader = searcher.GetIndexReader();
+			IndexReader reader = searcher.IndexReader;
 			PayloadSpanUtil psu = new PayloadSpanUtil(reader);
 			
 			System.Collections.Generic.ICollection<byte[]> payloads = psu.GetPayloadsForQuery(new TermQuery(new Term(PayloadHelper.FIELD, "rr")));
@@ -417,16 +417,16 @@ namespace Lucene.Net.Search.Spans
 				//if we expect payloads, then isPayloadAvailable should be true
 				if (expectedNumPayloads > 0)
 				{
-					Assert.IsTrue(spans.IsPayloadAvailable() == true, "isPayloadAvailable is not returning the correct value: " + spans.IsPayloadAvailable() + " and it should be: " + (expectedNumPayloads > 0));
+					Assert.IsTrue(spans.IsPayloadAvailable == true, "isPayloadAvailable is not returning the correct value: " + spans.IsPayloadAvailable + " and it should be: " + (expectedNumPayloads > 0));
 				}
 				else
 				{
-					Assert.IsTrue(spans.IsPayloadAvailable() == false, "isPayloadAvailable should be false");
+					Assert.IsTrue(spans.IsPayloadAvailable == false, "isPayloadAvailable should be false");
 				}
 				//See payload helper, for the PayloadHelper.FIELD field, there is a single byte payload at every token
-				if (spans.IsPayloadAvailable())
+				if (spans.IsPayloadAvailable)
 				{
-					System.Collections.Generic.ICollection<byte[]> payload = spans.GetPayload();
+					System.Collections.Generic.ICollection<byte[]> payload = spans.Payload;
 					Assert.IsTrue(payload.Count == expectedNumPayloads, "payload Size: " + payload.Count + " is not: " + expectedNumPayloads);
 					for (System.Collections.IEnumerator iterator = payload.GetEnumerator(); iterator.MoveNext(); )
 					{
@@ -472,9 +472,9 @@ namespace Lucene.Net.Search.Spans
 			{
 				if (DEBUG)
 					System.Console.Out.WriteLine("\nSpans Dump --");
-				if (spans.IsPayloadAvailable())
+				if (spans.IsPayloadAvailable)
 				{
-					System.Collections.Generic.ICollection<byte[]> payload = spans.GetPayload();
+					System.Collections.Generic.ICollection<byte[]> payload = spans.Payload;
 					if (DEBUG)
 						System.Console.Out.WriteLine("payloads for span:" + payload.Count);
 					System.Collections.IEnumerator it = payload.GetEnumerator();
@@ -573,14 +573,14 @@ namespace Lucene.Net.Search.Spans
 					{
 						if (entities.Contains(token))
 						{
-							payloadAtt.SetPayload(new Payload(System.Text.UTF8Encoding.UTF8.GetBytes(token + ":Entity:" + pos)));
+							payloadAtt.Payload = new Payload(System.Text.UTF8Encoding.UTF8.GetBytes(token + ":Entity:" + pos));
 						}
 						else
 						{
-							payloadAtt.SetPayload(new Payload(System.Text.UTF8Encoding.UTF8.GetBytes(token + ":Noise:" + pos)));
+							payloadAtt.Payload = new Payload(System.Text.UTF8Encoding.UTF8.GetBytes(token + ":Noise:" + pos));
 						}
 					}
-					pos += posIncrAtt.GetPositionIncrement();
+					pos += posIncrAtt.PositionIncrement;
 					return true;
 				}
 				return false;

Modified: incubator/lucene.net/trunk/test/core/Search/Spans/TestSpanExplanations.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/Spans/TestSpanExplanations.cs?rev=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/Spans/TestSpanExplanations.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/Spans/TestSpanExplanations.cs Mon Mar 12 22:29:26 2012
@@ -50,7 +50,7 @@ namespace Lucene.Net.Search.Spans
 		public virtual void  TestST2()
 		{
 			SpanQuery q = St("w1");
-			q.SetBoost(1000);
+			q.Boost = 1000;
 			Qtest(q, new int[]{0, 1, 2, 3});
 		}
 		[Test]
@@ -63,7 +63,7 @@ namespace Lucene.Net.Search.Spans
 		public virtual void  TestST5()
 		{
 			SpanQuery q = St("xx");
-			q.SetBoost(1000);
+			q.Boost = 1000;
 			Qtest(q, new int[]{2, 3});
 		}
 		
@@ -79,7 +79,7 @@ namespace Lucene.Net.Search.Spans
 		public virtual void  TestSF2()
 		{
 			SpanQuery q = Sf(("w1"), 1);
-			q.SetBoost(1000);
+			q.Boost = 1000;
 			Qtest(q, new int[]{0, 1, 2, 3});
 		}
 		[Test]
@@ -98,7 +98,7 @@ namespace Lucene.Net.Search.Spans
 		public virtual void  TestSF6()
 		{
 			SpanQuery q = Sf(("yy"), 4);
-			q.SetBoost(1000);
+			q.Boost = 1000;
 			Qtest(q, new int[]{2});
 		}
 		
@@ -214,7 +214,7 @@ namespace Lucene.Net.Search.Spans
 		public virtual void  TestSNot2()
 		{
 			SpanQuery q = Snot(Sf("w1", 10), St("QQ"));
-			q.SetBoost(1000);
+			q.Boost = 1000;
 			Qtest(q, new int[]{0, 1, 2, 3});
 		}
 		[Test]
@@ -227,14 +227,14 @@ namespace Lucene.Net.Search.Spans
 		public virtual void  TestSNot5()
 		{
 			SpanQuery q = Snot(Sf("w1", 10), St("xx"));
-			q.SetBoost(1000);
+			q.Boost = 1000;
 			Qtest(q, new int[]{0, 1, 2, 3});
 		}
 		[Test]
 		public virtual void  TestSNot7()
 		{
 			SpanQuery f = Snear("w1", "w3", 10, true);
-			f.SetBoost(1000);
+			f.Boost = 1000;
 			SpanQuery q = Snot(f, St("xx"));
 			Qtest(q, new int[]{0, 1, 3});
 		}
@@ -242,7 +242,7 @@ namespace Lucene.Net.Search.Spans
 		public virtual void  TestSNot10()
 		{
 			SpanQuery t = St("xx");
-			t.SetBoost(10000);
+			t.Boost = 10000;
 			SpanQuery q = Snot(Snear("w1", "w3", 10, true), t);
 			Qtest(q, new int[]{0, 1, 3});
 		}

Modified: incubator/lucene.net/trunk/test/core/Search/Spans/TestSpans.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/Spans/TestSpans.cs?rev=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/Spans/TestSpans.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/Spans/TestSpans.cs Mon Mar 12 22:29:26 2012
@@ -241,7 +241,7 @@ namespace Lucene.Net.Search.Spans
 			bool ordered = true;
 			int slop = 1;
 			SpanNearQuery snq = new SpanNearQuery(new SpanQuery[]{MakeSpanTermQuery("t1"), MakeSpanTermQuery("t2"), MakeSpanTermQuery("t3")}, slop, ordered);
-			Spans spans = snq.GetSpans(searcher.GetIndexReader());
+			Spans spans = snq.GetSpans(searcher.IndexReader);
 			
 			Assert.IsTrue(spans.Next(), "first range");
 			Assert.AreEqual(11, spans.Doc(), "first doc");
@@ -264,7 +264,7 @@ namespace Lucene.Net.Search.Spans
 			//See http://www.gossamer-threads.com/lists/lucene/java-dev/52270 for discussion about this test
 			SpanNearQuery snq;
 			snq = new SpanNearQuery(new SpanQuery[]{MakeSpanTermQuery("u1"), MakeSpanTermQuery("u2")}, 0, false);
-			Spans spans = snq.GetSpans(searcher.GetIndexReader());
+			Spans spans = snq.GetSpans(searcher.IndexReader);
 			Assert.IsTrue(spans.Next(), "Does not have next and it should");
 			Assert.AreEqual(4, spans.Doc(), "doc");
 			Assert.AreEqual(1, spans.Start(), "start");
@@ -293,7 +293,7 @@ namespace Lucene.Net.Search.Spans
 			
 			SpanNearQuery u1u2 = new SpanNearQuery(new SpanQuery[]{MakeSpanTermQuery("u1"), MakeSpanTermQuery("u2")}, 0, false);
 			snq = new SpanNearQuery(new SpanQuery[]{u1u2, MakeSpanTermQuery("u2")}, 1, false);
-			spans = snq.GetSpans(searcher.GetIndexReader());
+			spans = snq.GetSpans(searcher.IndexReader);
 			Assert.IsTrue(spans.Next(), "Does not have next and it should");
 			Assert.AreEqual(4, spans.Doc(), "doc");
 			Assert.AreEqual(0, spans.Start(), "start");
@@ -353,7 +353,7 @@ namespace Lucene.Net.Search.Spans
 			{
 				sqa[i] = MakeSpanTermQuery(terms[i]);
 			}
-			return (new SpanOrQuery(sqa)).GetSpans(searcher.GetIndexReader());
+			return (new SpanOrQuery(sqa)).GetSpans(searcher.IndexReader);
 		}
 		
 		private void  TstNextSpans(Spans spans, int doc, int start, int end)
@@ -458,7 +458,7 @@ namespace Lucene.Net.Search.Spans
 			
 			SpanNearQuery snq = new AnonymousClassSpanNearQuery(sim, this, new SpanQuery[]{MakeSpanTermQuery("t1"), MakeSpanTermQuery("t2")}, slop, ordered);
 			
-			Scorer spanScorer = snq.Weight(searcher).Scorer(searcher.GetIndexReader(), true, false);
+			Scorer spanScorer = snq.Weight(searcher).Scorer(searcher.IndexReader, true, false);
 			
 			Assert.IsTrue(spanScorer.NextDoc() != DocIdSetIterator.NO_MORE_DOCS, "first doc");
 			Assert.AreEqual(spanScorer.DocID(), 11, "first doc number");

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=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/Spans/TestSpansAdvanced.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/Spans/TestSpansAdvanced.cs Mon Mar 12 22:29:26 2012
@@ -162,8 +162,8 @@ namespace Lucene.Net.Search.Spans
 				//System.out.println(i + " exp: " + expectedIds[i]);
 				//System.out.println(i + " field: " + hits.doc(i).get(FIELD_ID));
 				
-				int id = topdocs.ScoreDocs[i].doc;
-				float score = topdocs.ScoreDocs[i].score;
+				int id = topdocs.ScoreDocs[i].Doc;
+				float score = topdocs.ScoreDocs[i].Score;
 				Document doc = s.Doc(id);
 				Assert.AreEqual(expectedIds[i], doc.Get(FIELD_ID));
 				bool scoreEq = System.Math.Abs(expectedScores[i] - 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=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/Spans/TestSpansAdvanced2.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/Spans/TestSpansAdvanced2.cs Mon Mar 12 22:29: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.NumDocs);
 			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=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestBoolean2.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestBoolean2.cs Mon Mar 12 22:29:26 2012
@@ -235,7 +235,7 @@ namespace Lucene.Net.Search
 		{
 			System.String queryText = "+w3 +xx +w2 zz";
 			int[] expDocNrs = new int[]{2, 3};
-			searcher.SetSimilarity(new AnonymousClassDefaultSimilarity(this));
+			searcher.Similarity = new AnonymousClassDefaultSimilarity(this);
 			QueriesTest(queryText, expDocNrs);
 		}
 		

Modified: incubator/lucene.net/trunk/test/core/Search/TestBooleanMinShouldMatch.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestBooleanMinShouldMatch.cs?rev=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestBooleanMinShouldMatch.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestBooleanMinShouldMatch.cs Mon Mar 12 22:29:26 2012
@@ -396,16 +396,16 @@ namespace Lucene.Net.Search
 				
 				for (int hit = 0; hit < top2.TotalHits; hit++)
 				{
-					int id = top2.ScoreDocs[hit].doc;
-					float score = top2.ScoreDocs[hit].score;
+					int id = top2.ScoreDocs[hit].Doc;
+					float score = top2.ScoreDocs[hit].Score;
 					bool found = false;
 					// find this doc in other hits
 					for (int other = 0; other < top1.TotalHits; other++)
 					{
-						if (top1.ScoreDocs[other].doc == id)
+						if (top1.ScoreDocs[other].Doc == id)
 						{
 							found = true;
-							float otherScore = top1.ScoreDocs[other].score;
+							float otherScore = top1.ScoreDocs[other].Score;
 							// check if scores match
 							if (System.Math.Abs(otherScore - score) > 1.0e-6f)
 							{
@@ -435,8 +435,8 @@ namespace Lucene.Net.Search
 			
 			for (int i = 0; i < h.Length; i++)
 			{
-				Document d = searcher.Doc(h[i].doc);
-				float score = h[i].score;
+				Document d = searcher.Doc(h[i].Doc);
+				float score = h[i].Score;
 				System.Console.Error.WriteLine("#" + i + ": {0.000000}" + score + " - " + d.Get("id") + " - " + d.Get("data"));
 			}
 		}

Modified: incubator/lucene.net/trunk/test/core/Search/TestBooleanPrefixQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestBooleanPrefixQuery.cs?rev=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestBooleanPrefixQuery.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestBooleanPrefixQuery.cs Mon Mar 12 22:29:26 2012
@@ -59,7 +59,7 @@ namespace Lucene.Net.Search
 			}
 			else if (q is ConstantScoreQuery)
 			{
-				DocIdSetIterator iter = ((ConstantScoreQuery) q).GetFilter().GetDocIdSet(r).Iterator();
+				DocIdSetIterator iter = ((ConstantScoreQuery) q).Filter.GetDocIdSet(r).Iterator();
 				int count = 0;
 				while (iter.NextDoc() != DocIdSetIterator.NO_MORE_DOCS)
 				{

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=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestBooleanQuery.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestBooleanQuery.cs Mon Mar 12 22:29:26 2012
@@ -88,11 +88,11 @@ namespace Lucene.Net.Search
 			q.Add(new TermQuery(new Term("field", "a")), BooleanClause.Occur.SHOULD);
 
             // LUCENE-2617: make sure that a term not in the index still contributes to the score via coord factor
-            float score = s.Search(q, 10).GetMaxScore();
+            float score = s.Search(q, 10).MaxScore;
             Query subQuery = new TermQuery(new Term("field", "not_in_index"));
-            subQuery.SetBoost(0);
+            subQuery.Boost = 0;
             q.Add(subQuery, BooleanClause.Occur.SHOULD);
-            float score2 = s.Search(q, 10).GetMaxScore();
+            float score2 = s.Search(q, 10).MaxScore;
             Assert.AreEqual(score * .5, score2, 1e-6);
 
             // LUCENE-2617: make sure that a clause not in the index still contributes to the score via coord factor
@@ -100,16 +100,16 @@ namespace Lucene.Net.Search
             PhraseQuery phrase = new PhraseQuery();
             phrase.Add(new Term("field", "not_in_index"));
             phrase.Add(new Term("field", "another_not_in_index"));
-            phrase.SetBoost(0);
+            phrase.Boost = 0;
             qq.Add(phrase, BooleanClause.Occur.SHOULD);
-            score2 = s.Search(qq, 10).GetMaxScore();
+            score2 = s.Search(qq, 10).MaxScore;
             Assert.AreEqual(score * (1.0 / 3), score2, 1e-6);
 
             // now test BooleanScorer2
             subQuery = new TermQuery(new Term("field", "b"));
-            subQuery.SetBoost(0);
+            subQuery.Boost = 0;
             q.Add(subQuery, BooleanClause.Occur.MUST);
-            score2 = s.Search(q, 10).GetMaxScore();
+            score2 = s.Search(q, 10).MaxScore;
             Assert.AreEqual(score * (2.0 / 3), score2, 1e-6);
 
 			// PhraseQuery w/ no terms added returns a null scorer

Modified: incubator/lucene.net/trunk/test/core/Search/TestBooleanScorer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestBooleanScorer.cs?rev=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestBooleanScorer.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestBooleanScorer.cs Mon Mar 12 22:29:26 2012
@@ -123,7 +123,7 @@ namespace Lucene.Net.Search
 			// 'more' variable to work properly, and this test ensures that if the logic
 			// changes, we have a test to back it up.
 			
-			Similarity sim = Similarity.GetDefault();
+			Similarity sim = Similarity.Default;
 			Scorer[] scorers = new Scorer[]{new AnonymousClassScorer(this, sim)};
 			BooleanScorer bs = new BooleanScorer(sim, 1, new List<Scorer>(scorers), null);
 			

Modified: incubator/lucene.net/trunk/test/core/Search/TestCachingWrapperFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestCachingWrapperFilter.cs?rev=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestCachingWrapperFilter.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestCachingWrapperFilter.cs Mon Mar 12 22:29:26 2012
@@ -128,10 +128,10 @@ namespace Lucene.Net.Search
             CachingWrapperFilter cacher = new CachingWrapperFilter(filter);
             DocIdSet originalSet = filter.GetDocIdSet(reader);
             DocIdSet cachedSet = cacher.GetDocIdSet(reader);
-            Assert.IsTrue(cachedSet.IsCacheable());
-            Assert.AreEqual(shouldCacheable, originalSet.IsCacheable());
+            Assert.IsTrue(cachedSet.IsCacheable);
+            Assert.AreEqual(shouldCacheable, originalSet.IsCacheable);
             //System.out.println("Original: "+originalSet.getClass().getName()+" -- cached: "+cachedSet.getClass().getName());
-            if (originalSet.IsCacheable())
+            if (originalSet.IsCacheable)
             {
                 Assert.AreEqual(originalSet.GetType(), cachedSet.GetType(), "Cached DocIdSet must be of same class like uncached, if cacheable");
             }

Modified: incubator/lucene.net/trunk/test/core/Search/TestComplexExplanations.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestComplexExplanations.cs?rev=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestComplexExplanations.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestComplexExplanations.cs Mon Mar 12 22:29:26 2012
@@ -48,7 +48,7 @@ namespace Lucene.Net.Search
 		public override void  SetUp()
 		{
 			base.SetUp();
-			searcher.SetSimilarity(createQnorm1Similarity());
+			searcher.Similarity = createQnorm1Similarity();
 		}
 
         [TearDown]
@@ -75,11 +75,11 @@ namespace Lucene.Net.Search
 			q.Add(Snear(Sf("w3", 2), St("w2"), St("w3"), 5, true), Occur.SHOULD);
 			
 			Query t = new FilteredQuery(qp.Parse("xx"), new ItemizedFilter(new int[]{1, 3}));
-			t.SetBoost(1000);
+			t.Boost = 1000;
 			q.Add(t, Occur.SHOULD);
 			
 			t = new ConstantScoreQuery(new ItemizedFilter(new int[]{0, 2}));
-			t.SetBoost(30);
+			t.Boost = 30;
 			q.Add(t, Occur.SHOULD);
 			
 			DisjunctionMaxQuery dm = new DisjunctionMaxQuery(0.2f);
@@ -118,11 +118,11 @@ namespace Lucene.Net.Search
 			q.Add(Snear(Sf("w3", 2), St("w2"), St("w3"), 5, true), Occur.SHOULD);
 			
 			Query t = new FilteredQuery(qp.Parse("xx"), new ItemizedFilter(new int[]{1, 3}));
-			t.SetBoost(1000);
+			t.Boost = 1000;
 			q.Add(t, Occur.SHOULD);
 			
 			t = new ConstantScoreQuery(new ItemizedFilter(new int[]{0, 2}));
-			t.SetBoost(- 20.0f);
+			t.Boost = - 20.0f;
 			q.Add(t, Occur.SHOULD);
 			
 			DisjunctionMaxQuery dm = new DisjunctionMaxQuery(0.2f);
@@ -144,7 +144,7 @@ namespace Lucene.Net.Search
 			b.Add(Snear("w1", "w2", 1, true), Occur.SHOULD);
 			b.Add(Snear("w2", "w3", 1, true), Occur.SHOULD);
 			b.Add(Snear("w1", "w3", 3, true), Occur.SHOULD);
-			b.SetBoost(0.0f);
+			b.Boost = 0.0f;
 			
 			q.Add(b, Occur.SHOULD);
 			
@@ -170,7 +170,7 @@ namespace Lucene.Net.Search
 		public virtual void  TestMA3()
 		{
 			Query q = new MatchAllDocsQuery();
-			q.SetBoost(0);
+			q.Boost = 0;
 			Bqtest(q, new int[]{0, 1, 2, 3});
 		}
 		
@@ -184,7 +184,7 @@ namespace Lucene.Net.Search
 		public virtual void  TestCSQ4()
 		{
 			Query q = new ConstantScoreQuery(new ItemizedFilter(new int[]{3}));
-			q.SetBoost(0);
+			q.Boost = 0;
 			Bqtest(q, new int[]{3});
 		}
 		
@@ -194,7 +194,7 @@ namespace Lucene.Net.Search
 			DisjunctionMaxQuery q = new DisjunctionMaxQuery(0.5f);
 			q.Add(qp.Parse("yy w5^100"));
 			q.Add(qp.Parse("xx^0"));
-			q.SetBoost(0.0f);
+			q.Boost = 0.0f;
 			Bqtest(q, new int[]{0, 2, 3});
 		}
 		
@@ -204,8 +204,8 @@ namespace Lucene.Net.Search
 			MultiPhraseQuery q = new MultiPhraseQuery();
 			q.Add(Ta(new System.String[]{"w1"}));
 			q.Add(Ta(new System.String[]{"w2"}));
-			q.SetSlop(1);
-			q.SetBoost(0.0f);
+			q.Slop = 1;
+			q.Boost = 0.0f;
 			Bqtest(q, new int[]{0, 1, 2});
 		}
 		
@@ -242,14 +242,14 @@ namespace Lucene.Net.Search
 		public virtual void  TestST3()
 		{
 			SpanQuery q = St("w1");
-			q.SetBoost(0);
+			q.Boost = 0;
 			Bqtest(q, new int[]{0, 1, 2, 3});
 		}
 		[Test]
 		public virtual void  TestST6()
 		{
 			SpanQuery q = St("xx");
-			q.SetBoost(0);
+			q.Boost = 0;
 			Qtest(q, new int[]{2, 3});
 		}
 		
@@ -257,14 +257,14 @@ namespace Lucene.Net.Search
 		public virtual void  TestSF3()
 		{
 			SpanQuery q = Sf(("w1"), 1);
-			q.SetBoost(0);
+			q.Boost = 0;
 			Bqtest(q, new int[]{0, 1, 2, 3});
 		}
 		[Test]
 		public virtual void  TestSF7()
 		{
 			SpanQuery q = Sf(("xx"), 3);
-			q.SetBoost(0);
+			q.Boost = 0;
 			Bqtest(q, new int[]{2, 3});
 		}
 		
@@ -272,14 +272,14 @@ namespace Lucene.Net.Search
 		public virtual void  TestSNot3()
 		{
 			SpanQuery q = Snot(Sf("w1", 10), St("QQ"));
-			q.SetBoost(0);
+			q.Boost = 0;
 			Bqtest(q, new int[]{0, 1, 2, 3});
 		}
 		[Test]
 		public virtual void  TestSNot6()
 		{
 			SpanQuery q = Snot(Sf("w1", 10), St("xx"));
-			q.SetBoost(0);
+			q.Boost = 0;
 			Bqtest(q, new int[]{0, 1, 2, 3});
 		}
 		
@@ -288,7 +288,7 @@ namespace Lucene.Net.Search
 		{
 			// NOTE: using qtest not bqtest
 			SpanQuery f = Snear("w1", "w3", 10, true);
-			f.SetBoost(0);
+			f.Boost = 0;
 			SpanQuery q = Snot(f, St("xx"));
 			Qtest(q, new int[]{0, 1, 3});
 		}
@@ -297,7 +297,7 @@ namespace Lucene.Net.Search
 		{
 			// NOTE: using qtest not bqtest
 			SpanQuery t = St("xx");
-			t.SetBoost(0);
+			t.Boost = 0;
 			SpanQuery q = Snot(Snear("w1", "w3", 10, true), t);
 			Qtest(q, new int[]{0, 1, 3});
 		}

Modified: incubator/lucene.net/trunk/test/core/Search/TestCustomSearcherSort.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestCustomSearcherSort.cs?rev=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestCustomSearcherSort.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestCustomSearcherSort.cs Mon Mar 12 22:29:26 2012
@@ -146,7 +146,7 @@ namespace Lucene.Net.Search
 			// store hits in TreeMap - TreeMap does not allow duplicates; existing entries are silently overwritten
 			for (int hitid = 0; hitid < hitsByRank.Length; ++hitid)
 			{
-				resultMap[hitsByRank[hitid].doc] = hitid; // Value: Hits-Objekt Index
+				resultMap[hitsByRank[hitid].Doc] = hitid; // Value: Hits-Objekt Index
 			}
 			
 			// now make a query using the sort criteria
@@ -156,7 +156,7 @@ namespace Lucene.Net.Search
 			// besides the sorting both sets of hits must be identical
 			for (int hitid = 0; hitid < resultSort.Length; ++hitid)
 			{
-				System.Int32 idHitDate = (System.Int32) resultSort[hitid].doc; // document ID from sorted search
+				System.Int32 idHitDate = (System.Int32) resultSort[hitid].Doc; // document ID from sorted search
 				if (!resultMap.Contains(idHitDate))
 				{
 					Log("ID " + idHitDate + " not found. Possibliy a duplicate.");
@@ -189,7 +189,7 @@ namespace Lucene.Net.Search
 				{
 					int luceneId;
 					
-					luceneId = hits[docnum].doc;
+					luceneId = hits[docnum].Doc;
 					if (idMap.Contains(luceneId))
 					{
 						System.Text.StringBuilder message = new System.Text.StringBuilder(prefix);

Modified: incubator/lucene.net/trunk/test/core/Search/TestDateSort.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestDateSort.cs?rev=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestDateSort.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestDateSort.cs Mon Mar 12 22:29:26 2012
@@ -84,7 +84,7 @@ namespace Lucene.Net.Search
 			ScoreDoc[] hits = searcher.Search(query, null, 1000, sort).ScoreDocs;
 			for (int i = 0; i < hits.Length; i++)
 			{
-				Document document = searcher.Doc(hits[i].doc);
+				Document document = searcher.Doc(hits[i].Doc);
 				System.String text = document.Get(TEXT_FIELD);
 				actualOrder[i] = text;
 			}

Modified: incubator/lucene.net/trunk/test/core/Search/TestDisjunctionMaxQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestDisjunctionMaxQuery.cs?rev=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestDisjunctionMaxQuery.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestDisjunctionMaxQuery.cs Mon Mar 12 22:29:26 2012
@@ -139,7 +139,7 @@ namespace Lucene.Net.Search
 
 		    r = IndexReader.Open(index, true);
 			s = new IndexSearcher(r);
-			s.SetSimilarity(sim);
+			s.Similarity = sim;
 		}
 		
 		[Test]
@@ -190,10 +190,10 @@ namespace Lucene.Net.Search
 			{
 				Assert.AreEqual(4, h.Length, "all docs should match " + q.ToString());
 				
-				float score = h[0].score;
+				float score = h[0].Score;
 				for (int i = 1; i < h.Length; i++)
 				{
-					Assert.AreEqual(score, h[i].score, SCORE_COMP_THRESH, "score #" + i + " is not the same");
+					Assert.AreEqual(score, h[i].Score, SCORE_COMP_THRESH, "score #" + i + " is not the same");
 				}
 			}
 			catch (System.ApplicationException e)
@@ -218,10 +218,10 @@ namespace Lucene.Net.Search
 			try
 			{
 				Assert.AreEqual(3, h.Length, "3 docs should match " + q.ToString());
-				float score = h[0].score;
+				float score = h[0].Score;
 				for (int i = 1; i < h.Length; i++)
 				{
-					Assert.AreEqual(score, h[i].score, SCORE_COMP_THRESH, "score #" + i + " is not the same");
+					Assert.AreEqual(score, h[i].Score, SCORE_COMP_THRESH, "score #" + i + " is not the same");
 				}
 			}
 			catch (System.ApplicationException e)
@@ -248,10 +248,10 @@ namespace Lucene.Net.Search
 			try
 			{
 				Assert.AreEqual(4, h.Length, "all docs should match " + q.ToString());
-				float score = h[0].score;
+				float score = h[0].Score;
 				for (int i = 1; i < h.Length; i++)
 				{
-					Assert.AreEqual(score, h[i].score, SCORE_COMP_THRESH, "score #" + i + " is not the same");
+					Assert.AreEqual(score, h[i].Score, SCORE_COMP_THRESH, "score #" + i + " is not the same");
 				}
 			}
 			catch (System.ApplicationException e)
@@ -276,10 +276,10 @@ namespace Lucene.Net.Search
 			try
 			{
 				Assert.AreEqual(3, h.Length, "3 docs should match " + q.ToString());
-				Assert.AreEqual(s.Doc(h[0].doc).Get("id"), "d2", "wrong first");
-				float score0 = h[0].score;
-				float score1 = h[1].score;
-				float score2 = h[2].score;
+				Assert.AreEqual(s.Doc(h[0].Doc).Get("id"), "d2", "wrong first");
+				float score0 = h[0].Score;
+				float score1 = h[1].Score;
+				float score2 = h[2].Score;
 				Assert.IsTrue(score0 > score1, "d2 does not have better score then others: " + score0 + " >? " + score1);
 				Assert.AreEqual(score1, score2, SCORE_COMP_THRESH, "d4 and d1 don't have equal scores");
 			}
@@ -317,10 +317,10 @@ namespace Lucene.Net.Search
 			try
 			{
 				Assert.AreEqual(3, h.Length, "3 docs should match " + q.ToString());
-				float score = h[0].score;
+				float score = h[0].Score;
 				for (int i = 1; i < h.Length; i++)
 				{
-					Assert.AreEqual(score, h[i].score, SCORE_COMP_THRESH, "score #" + i + " is not the same");
+					Assert.AreEqual(score, h[i].Score, SCORE_COMP_THRESH, "score #" + i + " is not the same");
 				}
 			}
 			catch (System.ApplicationException e)
@@ -356,14 +356,14 @@ namespace Lucene.Net.Search
 			try
 			{
 				Assert.AreEqual(4, h.Length, "4 docs should match " + q.ToString());
-				float score = h[0].score;
+				float score = h[0].Score;
 				for (int i = 1; i < h.Length - 1; i++)
 				{
 					/* note: -1 */
-					Assert.AreEqual(score, h[i].score, SCORE_COMP_THRESH, "score #" + i + " is not the same");
+					Assert.AreEqual(score, h[i].Score, SCORE_COMP_THRESH, "score #" + i + " is not the same");
 				}
-				Assert.AreEqual("d1", s.Doc(h[h.Length - 1].doc).Get("id"), "wrong last");
-				float score1 = h[h.Length - 1].score;
+				Assert.AreEqual("d1", s.Doc(h[h.Length - 1].Doc).Get("id"), "wrong last");
+				float score1 = h[h.Length - 1].Score;
 				Assert.IsTrue(score > score1, "d1 does not have worse score then others: " + score + " >? " + score1);
 			}
 			catch (System.ApplicationException e)
@@ -401,15 +401,15 @@ namespace Lucene.Net.Search
 				
 				Assert.AreEqual(4, h.Length, "4 docs should match " + q.ToString());
 				
-				float score0 = h[0].score;
-				float score1 = h[1].score;
-				float score2 = h[2].score;
-				float score3 = h[3].score;
-				
-				System.String doc0 = s.Doc(h[0].doc).Get("id");
-				System.String doc1 = s.Doc(h[1].doc).Get("id");
-				System.String doc2 = s.Doc(h[2].doc).Get("id");
-				System.String doc3 = s.Doc(h[3].doc).Get("id");
+				float score0 = h[0].Score;
+				float score1 = h[1].Score;
+				float score2 = h[2].Score;
+				float score3 = h[3].Score;
+				
+				System.String doc0 = s.Doc(h[0].Doc).Get("id");
+				System.String doc1 = s.Doc(h[1].Doc).Get("id");
+				System.String doc2 = s.Doc(h[2].Doc).Get("id");
+				System.String doc3 = s.Doc(h[3].Doc).Get("id");
 				
 				Assert.IsTrue(doc0.Equals("d2") || doc0.Equals("d4"), "doc0 should be d2 or d4: " + doc0);
 				Assert.IsTrue(doc1.Equals("d2") || doc1.Equals("d4"), "doc1 should be d2 or d4: " + doc0);
@@ -455,15 +455,15 @@ namespace Lucene.Net.Search
 				
 				Assert.AreEqual(4, h.Length, "4 docs should match " + q.ToString());
 				
-				float score0 = h[0].score;
-				float score1 = h[1].score;
-				float score2 = h[2].score;
-				float score3 = h[3].score;
-				
-				System.String doc0 = s.Doc(h[0].doc).Get("id");
-				System.String doc1 = s.Doc(h[1].doc).Get("id");
-				System.String doc2 = s.Doc(h[2].doc).Get("id");
-				System.String doc3 = s.Doc(h[3].doc).Get("id");
+				float score0 = h[0].Score;
+				float score1 = h[1].Score;
+				float score2 = h[2].Score;
+				float score3 = h[3].Score;
+				
+				System.String doc0 = s.Doc(h[0].Doc).Get("id");
+				System.String doc1 = s.Doc(h[1].Doc).Get("id");
+				System.String doc2 = s.Doc(h[2].Doc).Get("id");
+				System.String doc3 = s.Doc(h[3].Doc).Get("id");
 				
 				Assert.AreEqual("d4", doc0, "doc0 should be d4: ");
 				Assert.AreEqual("d3", doc1, "doc1 should be d3: ");
@@ -496,7 +496,7 @@ namespace Lucene.Net.Search
 		protected internal virtual Query Tq(System.String f, System.String t, float b)
 		{
 			Query q = Tq(f, t);
-			q.SetBoost(b);
+			q.Boost = b;
 			return q;
 		}
 		
@@ -508,8 +508,8 @@ namespace Lucene.Net.Search
 			
 			for (int i = 0; i < h.Length; i++)
 			{
-				Document d = searcher.Doc(h[i].doc);
-				float score = h[i].score;
+				Document d = searcher.Doc(h[i].Doc);
+				float score = h[i].Score;
 				System.Console.Error.WriteLine("#" + i + ": {0.000000000}" + score + " - " + d.Get("id"));
 			}
 		}

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=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestDocBoost.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestDocBoost.cs Mon Mar 12 22:29:26 2012
@@ -86,9 +86,9 @@ namespace Lucene.Net.Search
 			RAMDirectory store = new RAMDirectory();
 			IndexWriter writer = new IndexWriter(store, new SimpleAnalyzer(), true, IndexWriter.MaxFieldLength.LIMITED);
 			
-			Fieldable f1 = new Field("field", "word", Field.Store.YES, Field.Index.ANALYZED);
-			Fieldable f2 = new Field("field", "word", Field.Store.YES, Field.Index.ANALYZED);
-			f2.SetBoost(2.0f);
+			IFieldable f1 = new Field("field", "word", Field.Store.YES, Field.Index.ANALYZED);
+			IFieldable f2 = new Field("field", "word", Field.Store.YES, Field.Index.ANALYZED);
+			f2.Boost = 2.0f;
 			
 			Document d1 = new Document();
 			Document d2 = new Document();

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=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestElevationComparator.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestElevationComparator.cs Mon Mar 12 22:29:26 2012
@@ -83,18 +83,18 @@ namespace Lucene.Net.Search
 			Assert.AreEqual(4, nDocsReturned);
 			
 			// 0 & 3 were elevated
-			Assert.AreEqual(0, topDocs.ScoreDocs[0].doc);
-			Assert.AreEqual(3, topDocs.ScoreDocs[1].doc);
+			Assert.AreEqual(0, topDocs.ScoreDocs[0].Doc);
+			Assert.AreEqual(3, topDocs.ScoreDocs[1].Doc);
 			
 			if (reversed)
 			{
-				Assert.AreEqual(2, topDocs.ScoreDocs[2].doc);
-				Assert.AreEqual(1, topDocs.ScoreDocs[3].doc);
+				Assert.AreEqual(2, topDocs.ScoreDocs[2].Doc);
+				Assert.AreEqual(1, topDocs.ScoreDocs[3].Doc);
 			}
 			else
 			{
-				Assert.AreEqual(1, topDocs.ScoreDocs[2].doc);
-				Assert.AreEqual(2, topDocs.ScoreDocs[3].doc);
+				Assert.AreEqual(1, topDocs.ScoreDocs[2].Doc);
+				Assert.AreEqual(2, topDocs.ScoreDocs[3].Doc);
 			}
 			
 			/*
@@ -113,7 +113,7 @@ namespace Lucene.Net.Search
 		private Query GetElevatedQuery(System.String[] vals)
 		{
 			BooleanQuery q = new BooleanQuery(false);
-			q.SetBoost(0);
+			q.Boost = 0;
 			int max = (vals.Length / 2) + 5;
 			for (int i = 0; i < vals.Length - 1; i += 2)
 			{
@@ -198,11 +198,11 @@ namespace Lucene.Net.Search
 			{
 				idIndex = Lucene.Net.Search.FieldCache_Fields.DEFAULT.GetStringIndex(reader, fieldname);
 			}
-			
-			public override System.IComparable Value(int slot)
-			{
-				return (System.Int32) values[slot];
-			}
+
+		    public override IComparable this[int slot]
+		    {
+		        get { return (System.Int32) values[slot]; }
+		    }
 		}
 		private System.Collections.IDictionary priority;
 		

Modified: incubator/lucene.net/trunk/test/core/Search/TestFieldCache.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/core/Search/TestFieldCache.cs?rev=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestFieldCache.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestFieldCache.cs Mon Mar 12 22:29:26 2012
@@ -71,7 +71,7 @@ namespace Lucene.Net.Search
 				FieldCache cache = Lucene.Net.Search.FieldCache_Fields.DEFAULT;
 				System.IO.MemoryStream bos = new System.IO.MemoryStream(1024);
                 System.IO.StreamWriter writer = new System.IO.StreamWriter(bos);
-				cache.SetInfoStream(writer);
+				cache.InfoStream = writer;
 				double[] doubles = cache.GetDoubles(reader, "theDouble");
 				float[] floats = cache.GetFloats(reader, "theDouble");
 				char[] tmpChar;

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=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestFieldCacheRangeFilter.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestFieldCacheRangeFilter.cs Mon Mar 12 22:29: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.NumDocs;
 			
 			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.NumDocs;
 			
 			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.NumDocs;
 			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.NumDocs;
 			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.NumDocs;
 			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.NumDocs;
 			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.NumDocs;
 			System.Double minIdO = (double) (minId + .5);
 			System.Double medIdO = (double) ((float) minIdO + ((double) (maxId - minId)) / 2.0);
 			
@@ -568,30 +568,30 @@ namespace Lucene.Net.Search
 
     IndexReader reader = IndexReader.Open(dir);
     IndexSearcher Search = new IndexSearcher(reader);
-    Assert.True(reader.HasDeletions());
+    Assert.True(reader.HasDeletions);
 
     ScoreDoc[] result;
     Query q = new TermQuery(new Term("body","body"));
 
     FieldCacheRangeFilter<sbyte?> fcrf;
     result = Search.Search(q, fcrf = FieldCacheRangeFilter.NewByteRange("id", -20, 20, T, T), 100).ScoreDocs;
-    Assert.False(fcrf.GetDocIdSet(reader.GetSequentialSubReaders()[0]).IsCacheable(), "DocIdSet must be not cacheable");
+    Assert.False(fcrf.GetDocIdSet(reader.SequentialSubReaders[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.GetSequentialSubReaders()[0]).IsCacheable(), "DocIdSet must be not cacheable");
+    Assert.False(fcrf.GetDocIdSet(reader.SequentialSubReaders[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.GetSequentialSubReaders()[0]).IsCacheable(), "DocIdSet must be not cacheable");
+    Assert.False(fcrf.GetDocIdSet(reader.SequentialSubReaders[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.GetSequentialSubReaders()[0]).IsCacheable(), "DocIdSet must be not cacheable");
+    Assert.True(fcrf.GetDocIdSet(reader.SequentialSubReaders[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.GetSequentialSubReaders()[0]).IsCacheable(), "DocIdSet must be not cacheable");
+    Assert.True(fcrf.GetDocIdSet(reader.SequentialSubReaders[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=1299911&r1=1299910&r2=1299911&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/core/Search/TestFieldCacheTermsFilter.cs (original)
+++ incubator/lucene.net/trunk/test/core/Search/TestFieldCacheTermsFilter.cs Mon Mar 12 22:29: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.NumDocs;
 			ScoreDoc[] results;
 			MatchAllDocsQuery q = new MatchAllDocsQuery();
 			



Mime
View raw message