lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r890203 [1/4] - in /incubator/lucene.net/trunk/C#/src: Lucene.Net/Search/ Test/ Test/Analysis/ Test/Document/ Test/Index/ Test/QueryParser/ Test/Search/ Test/Search/Function/ Test/Search/Payloads/ Test/Search/Spans/ Test/Store/
Date Mon, 14 Dec 2009 07:25:40 GMT
Author: digy
Date: Mon Dec 14 07:25:37 2009
New Revision: 890203

URL: http://svn.apache.org/viewvc?rev=890203&view=rev
Log:
undo for TopDocs.totalHits and TopDocs.scoreDocs LUCENENET-325

Modified:
    incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Hits.cs
    incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/MultiSearcher.cs
    incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/ParallelMultiSearcher.cs
    incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/TopDocs.cs
    incubator/lucene.net/trunk/C#/src/Test/Analysis/TestKeywordAnalyzer.cs
    incubator/lucene.net/trunk/C#/src/Test/Document/TestDocument.cs
    incubator/lucene.net/trunk/C#/src/Test/Index/TestBackwardsCompatibility.cs
    incubator/lucene.net/trunk/C#/src/Test/Index/TestDeletionPolicy.cs
    incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexReader.cs
    incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexReaderReopen.cs
    incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexWriter.cs
    incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexWriterDelete.cs
    incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexWriterReader.cs
    incubator/lucene.net/trunk/C#/src/Test/Index/TestLazyProxSkipping.cs
    incubator/lucene.net/trunk/C#/src/Test/Index/TestParallelReader.cs
    incubator/lucene.net/trunk/C#/src/Test/QueryParser/TestMultiFieldQueryParser.cs
    incubator/lucene.net/trunk/C#/src/Test/QueryParser/TestQueryParser.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/CheckHits.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/Function/TestCustomScoreQuery.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/Function/TestFieldScoreQuery.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/Function/TestOrdValues.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/Payloads/TestBoostingTermQuery.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/Payloads/TestPayloadNearQuery.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/Payloads/TestPayloadTermQuery.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/Spans/TestPayloadSpans.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/Spans/TestSpans.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/Spans/TestSpansAdvanced.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestBoolean2.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestBooleanMinShouldMatch.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestBooleanOr.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestBooleanQuery.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestBooleanScorer.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestCustomSearcherSort.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestDateFilter.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestDateSort.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestDisjunctionMaxQuery.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestDocIdSet.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestElevationComparator.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestFieldCacheRangeFilter.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestFieldCacheTermsFilter.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestFilteredQuery.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestFilteredSearch.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestFuzzyQuery.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestMatchAllDocsQuery.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestMultiPhraseQuery.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestMultiSearcher.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestMultiSearcherRanking.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestMultiTermConstantScore.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestMultiValuedNumericRangeQuery.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestNot.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestNumericRangeQuery32.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestNumericRangeQuery64.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestPhrasePrefixQuery.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestPhraseQuery.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestPositionIncrement.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestPositiveScoresOnlyCollector.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestPrefixFilter.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestPrefixInBooleanQuery.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestPrefixQuery.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestQueryWrapperFilter.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestSimpleExplanations.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestSloppyPhraseQuery.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestSort.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestStressSort.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestTermRangeFilter.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestTermRangeQuery.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestTermVectors.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestTopDocsCollector.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestTopScoreDocCollector.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestWildcard.cs
    incubator/lucene.net/trunk/C#/src/Test/Store/TestBufferedIndexInput.cs
    incubator/lucene.net/trunk/C#/src/Test/Store/TestLockFactory.cs
    incubator/lucene.net/trunk/C#/src/Test/TestDemo.cs
    incubator/lucene.net/trunk/C#/src/Test/TestSearch.cs
    incubator/lucene.net/trunk/C#/src/Test/TestSearchForDuplicates.cs
    incubator/lucene.net/trunk/C#/src/Test/TestSupportClass.cs

Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Hits.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Search/Hits.cs?rev=890203&r1=890202&r2=890203&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Hits.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Hits.cs Mon Dec 14 07:25:37 2009
@@ -120,8 +120,8 @@
 			int n = min * 2; // double # retrieved
 			TopDocs topDocs = (sort == null)?searcher.Search(weight, filter, n):searcher.Search(weight, filter, n, sort);
 			
-			length = topDocs.TotalHits;
-			ScoreDoc[] scoreDocs = topDocs.ScoreDocs;
+			length = topDocs.totalHits;
+			ScoreDoc[] scoreDocs = topDocs.scoreDocs;
 			
 			float scoreNorm = 1.0f;
 			

Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/MultiSearcher.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Search/MultiSearcher.cs?rev=890203&r1=890202&r2=890203&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/MultiSearcher.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/MultiSearcher.cs Mon Dec 14 07:25:37 2009
@@ -255,8 +255,8 @@
 			{
 				// search each searcher
 				TopDocs docs = searchables[i].Search(weight, filter, nDocs);
-				totalHits += docs.TotalHits; // update totalHits
-				ScoreDoc[] scoreDocs = docs.ScoreDocs;
+				totalHits += docs.totalHits; // update totalHits
+				ScoreDoc[] scoreDocs = docs.scoreDocs;
 				for (int j = 0; j < scoreDocs.Length; j++)
 				{
 					// merge scoreDocs into hq
@@ -296,9 +296,9 @@
 					if (docs.fields[j].GetType() == SortField.DOC)
 					{
 						// iterate over the score docs and change their fields value
-						for (int j2 = 0; j2 < docs.ScoreDocs.Length; j2++)
+						for (int j2 = 0; j2 < docs.scoreDocs.Length; j2++)
 						{
-							FieldDoc fd = (FieldDoc) docs.ScoreDocs[j2];
+							FieldDoc fd = (FieldDoc) docs.scoreDocs[j2];
 							fd.fields[j] = (System.Int32) (((System.Int32) fd.fields[j]) + starts[i]);
 						}
 						break;
@@ -306,9 +306,9 @@
 				}
 				if (hq == null)
 					hq = new FieldDocSortedHitQueue(docs.fields, n);
-				totalHits += docs.TotalHits; // update totalHits
+				totalHits += docs.totalHits; // update totalHits
 				maxScore = System.Math.Max(maxScore, docs.GetMaxScore());
-				ScoreDoc[] scoreDocs = docs.ScoreDocs;
+				ScoreDoc[] scoreDocs = docs.scoreDocs;
 				for (int j = 0; j < scoreDocs.Length; j++)
 				{
 					// merge scoreDocs into hq

Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/ParallelMultiSearcher.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Search/ParallelMultiSearcher.cs?rev=890203&r1=890202&r2=890203&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/ParallelMultiSearcher.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/ParallelMultiSearcher.cs Mon Dec 14 07:25:37 2009
@@ -300,9 +300,9 @@
 						if (docsFields.fields[j].GetType() == SortField.DOC)
 						{
 							// iterate over the score docs and change their fields value
-							for (int j2 = 0; j2 < docs.ScoreDocs.Length; j2++)
+							for (int j2 = 0; j2 < docs.scoreDocs.Length; j2++)
 							{
-								FieldDoc fd = (FieldDoc) docs.ScoreDocs[j2];
+								FieldDoc fd = (FieldDoc) docs.scoreDocs[j2];
 								fd.fields[j] = (System.Int32) (((System.Int32) fd.fields[j]) + starts[i]);
 							}
 							break;
@@ -311,7 +311,7 @@
 					
 					((FieldDocSortedHitQueue) hq).SetFields(docsFields.fields);
 				}
-				ScoreDoc[] scoreDocs = docs.ScoreDocs;
+				ScoreDoc[] scoreDocs = docs.scoreDocs;
 				for (int j = 0; j < scoreDocs.Length; j++)
 				{
 					// merge scoreDocs into hq
@@ -329,7 +329,7 @@
 		
 		public virtual int Hits()
 		{
-			return docs.TotalHits;
+			return docs.totalHits;
 		}
 		
 		public virtual float GetMaxScore()

Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/TopDocs.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Search/TopDocs.cs?rev=890203&r1=890202&r2=890203&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/TopDocs.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/TopDocs.cs Mon Dec 14 07:25:37 2009
@@ -29,9 +29,9 @@
 		/// <summary>Expert: The total number of hits for the query.</summary>
 		/// <seealso cref="Hits.Length()">
 		/// </seealso>
-		public int TotalHits;
+		public int totalHits;
 		/// <summary>Expert: The top hits for the query. </summary>
-		public ScoreDoc[] ScoreDocs;
+		public ScoreDoc[] scoreDocs;
 		/// <summary>Expert: Stores the maximum score value encountered, needed for normalizing. </summary>
 		private float maxScore;
 		
@@ -57,8 +57,8 @@
 		/// <summary>Expert: Constructs a TopDocs.</summary>
 		public TopDocs(int totalHits, ScoreDoc[] scoreDocs, float maxScore)
 		{
-			this.TotalHits = totalHits;
-			this.ScoreDocs = scoreDocs;
+			this.totalHits = totalHits;
+			this.scoreDocs = scoreDocs;
 			this.maxScore = maxScore;
 		}
 	}

Modified: incubator/lucene.net/trunk/C#/src/Test/Analysis/TestKeywordAnalyzer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Analysis/TestKeywordAnalyzer.cs?rev=890203&r1=890202&r2=890203&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Analysis/TestKeywordAnalyzer.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Analysis/TestKeywordAnalyzer.cs Mon Dec 14 07:25:37 2009
@@ -68,7 +68,7 @@
 			QueryParser queryParser = new QueryParser("description", analyzer);
 			Query query = queryParser.Parse("partnum:Q36 AND SPACE");
 			
-			ScoreDoc[] hits = searcher.Search(query, null, 1000).ScoreDocs;
+			ScoreDoc[] hits = searcher.Search(query, null, 1000).scoreDocs;
 			Assert.AreEqual("+partnum:Q36 +space", query.ToString("description"), "Q36 kept as-is");
 			Assert.AreEqual(1, hits.Length, "doc found!");
 		}

Modified: incubator/lucene.net/trunk/C#/src/Test/Document/TestDocument.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Document/TestDocument.cs?rev=890203&r1=890202&r2=890203&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Document/TestDocument.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Document/TestDocument.cs Mon Dec 14 07:25:37 2009
@@ -180,7 +180,7 @@
 			Query query = new TermQuery(new Term("keyword", "test1"));
 			
 			// ensure that queries return expected results without DateFilter first
-			ScoreDoc[] hits = searcher.Search(query, null, 1000).ScoreDocs;
+			ScoreDoc[] hits = searcher.Search(query, null, 1000).scoreDocs;
 			Assert.AreEqual(1, hits.Length);
 			
 			DoAssert(searcher.Doc(hits[0].doc), true);
@@ -256,7 +256,7 @@
 			Query query = new TermQuery(new Term("keyword", "test"));
 			
 			// ensure that queries return expected results without DateFilter first
-			ScoreDoc[] hits = searcher.Search(query, null, 1000).ScoreDocs;
+			ScoreDoc[] hits = searcher.Search(query, null, 1000).scoreDocs;
 			Assert.AreEqual(3, hits.Length);
 			int result = 0;
 			for (int i = 0; i < 3; i++)

Modified: incubator/lucene.net/trunk/C#/src/Test/Index/TestBackwardsCompatibility.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Index/TestBackwardsCompatibility.cs?rev=890203&r1=890202&r2=890203&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Index/TestBackwardsCompatibility.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Index/TestBackwardsCompatibility.cs Mon Dec 14 07:25:37 2009
@@ -239,7 +239,7 @@
 					Assert.AreEqual(7, i);
 			}
 			
-			ScoreDoc[] hits = searcher.Search(new TermQuery(new Term("content", "aaa")), null, 1000).ScoreDocs;
+			ScoreDoc[] hits = searcher.Search(new TermQuery(new Term("content", "aaa")), null, 1000).scoreDocs;
 			
 			// First document should be #21 since it's norm was
 			// increased:
@@ -251,11 +251,11 @@
 			if (!oldName.StartsWith("19.") && !oldName.StartsWith("20.") && !oldName.StartsWith("21.") && !oldName.StartsWith("22."))
 			{
 				// Test on indices >= 2.3
-				hits = searcher.Search(new TermQuery(new Term("utf8", "\u0000")), null, 1000).ScoreDocs;
+				hits = searcher.Search(new TermQuery(new Term("utf8", "\u0000")), null, 1000).scoreDocs;
 				Assert.AreEqual(34, hits.Length);
-				hits = searcher.Search(new TermQuery(new Term("utf8", "Lu\uD834\uDD1Ece\uD834\uDD60ne")), null, 1000).ScoreDocs;
+				hits = searcher.Search(new TermQuery(new Term("utf8", "Lu\uD834\uDD1Ece\uD834\uDD60ne")), null, 1000).scoreDocs;
 				Assert.AreEqual(34, hits.Length);
-				hits = searcher.Search(new TermQuery(new Term("utf8", "ab\ud917\udc17cd")), null, 1000).ScoreDocs;
+				hits = searcher.Search(new TermQuery(new Term("utf8", "ab\ud917\udc17cd")), null, 1000).scoreDocs;
 				Assert.AreEqual(34, hits.Length);
 			}
 			
@@ -303,7 +303,7 @@
 			
 			// make sure searching sees right # hits
 			IndexSearcher searcher = new IndexSearcher(dir);
-			ScoreDoc[] hits = searcher.Search(new TermQuery(new Term("content", "aaa")), null, 1000).ScoreDocs;
+			ScoreDoc[] hits = searcher.Search(new TermQuery(new Term("content", "aaa")), null, 1000).scoreDocs;
 			Document d = searcher.Doc(hits[0].doc);
 			Assert.AreEqual("21", d.Get("id"), "wrong first document");
 			TestHits(hits, 44, searcher.GetIndexReader());
@@ -320,7 +320,7 @@
 			
 			// make sure they "took":
 			searcher = new IndexSearcher(dir);
-			hits = searcher.Search(new TermQuery(new Term("content", "aaa")), null, 1000).ScoreDocs;
+			hits = searcher.Search(new TermQuery(new Term("content", "aaa")), null, 1000).scoreDocs;
 			Assert.AreEqual(43, hits.Length, "wrong number of hits");
 			d = searcher.Doc(hits[0].doc);
 			Assert.AreEqual("22", d.Get("id"), "wrong first document");
@@ -333,7 +333,7 @@
 			writer.Close();
 			
 			searcher = new IndexSearcher(dir);
-			hits = searcher.Search(new TermQuery(new Term("content", "aaa")), null, 1000).ScoreDocs;
+			hits = searcher.Search(new TermQuery(new Term("content", "aaa")), null, 1000).scoreDocs;
 			Assert.AreEqual(43, hits.Length, "wrong number of hits");
 			d = searcher.Doc(hits[0].doc);
 			TestHits(hits, 43, searcher.GetIndexReader());
@@ -354,7 +354,7 @@
 			
 			// make sure searching sees right # hits
 			IndexSearcher searcher = new IndexSearcher(dir);
-			ScoreDoc[] hits = searcher.Search(new TermQuery(new Term("content", "aaa")), null, 1000).ScoreDocs;
+			ScoreDoc[] hits = searcher.Search(new TermQuery(new Term("content", "aaa")), null, 1000).scoreDocs;
 			Assert.AreEqual(34, hits.Length, "wrong number of hits");
 			Document d = searcher.Doc(hits[0].doc);
 			Assert.AreEqual("21", d.Get("id"), "wrong first document");
@@ -371,7 +371,7 @@
 			
 			// make sure they "took":
 			searcher = new IndexSearcher(dir);
-			hits = searcher.Search(new TermQuery(new Term("content", "aaa")), null, 1000).ScoreDocs;
+			hits = searcher.Search(new TermQuery(new Term("content", "aaa")), null, 1000).scoreDocs;
 			Assert.AreEqual(33, hits.Length, "wrong number of hits");
 			d = searcher.Doc(hits[0].doc);
 			Assert.AreEqual("22", d.Get("id"), "wrong first document");
@@ -384,7 +384,7 @@
 			writer.Close();
 			
 			searcher = new IndexSearcher(dir);
-			hits = searcher.Search(new TermQuery(new Term("content", "aaa")), null, 1000).ScoreDocs;
+			hits = searcher.Search(new TermQuery(new Term("content", "aaa")), null, 1000).scoreDocs;
 			Assert.AreEqual(33, hits.Length, "wrong number of hits");
 			d = searcher.Doc(hits[0].doc);
 			Assert.AreEqual("22", d.Get("id"), "wrong first document");

Modified: incubator/lucene.net/trunk/C#/src/Test/Index/TestDeletionPolicy.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Index/TestDeletionPolicy.cs?rev=890203&r1=890202&r2=890203&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Index/TestDeletionPolicy.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Index/TestDeletionPolicy.cs Mon Dec 14 07:25:37 2009
@@ -707,7 +707,7 @@
 					reader.DeleteDocument(3 * i + 1);
 					reader.SetNorm(4 * i + 1, "content", 2.0F);
 					IndexSearcher searcher = new IndexSearcher(reader);
-					ScoreDoc[] hits = searcher.Search(query, null, 1000).ScoreDocs;
+					ScoreDoc[] hits = searcher.Search(query, null, 1000).scoreDocs;
 					Assert.AreEqual(16 * (1 + i), hits.Length);
 					// this is a commit when autoCommit=false:
 					reader.Close();
@@ -724,7 +724,7 @@
 					Assert.AreEqual(2 * (N + 2) - 1, policy.numOnCommit);
 				
 				IndexSearcher searcher2 = new IndexSearcher(dir);
-				ScoreDoc[] hits2 = searcher2.Search(query, null, 1000).ScoreDocs;
+				ScoreDoc[] hits2 = searcher2.Search(query, null, 1000).scoreDocs;
 				Assert.AreEqual(176, hits2.Length);
 				
 				// Simplistic check: just verify only the past N segments_N's still
@@ -746,7 +746,7 @@
 						if (!autoCommit)
 						{
 							searcher2 = new IndexSearcher(reader);
-							hits2 = searcher2.Search(query, null, 1000).ScoreDocs;
+							hits2 = searcher2.Search(query, null, 1000).scoreDocs;
 							if (i > 1)
 							{
 								if (i % 2 == 0)
@@ -827,7 +827,7 @@
 					reader.DeleteDocument(3);
 					reader.SetNorm(5, "content", 2.0F);
 					IndexSearcher searcher = new IndexSearcher(reader);
-					ScoreDoc[] hits = searcher.Search(query, null, 1000).ScoreDocs;
+					ScoreDoc[] hits = searcher.Search(query, null, 1000).scoreDocs;
 					Assert.AreEqual(16, hits.Length);
 					// this is a commit when autoCommit=false:
 					reader.Close();
@@ -844,7 +844,7 @@
 					Assert.AreEqual(3 * (N + 1), policy.numOnCommit);
 				
 				IndexSearcher searcher2 = new IndexSearcher(dir);
-				ScoreDoc[] hits2 = searcher2.Search(query, null, 1000).ScoreDocs;
+				ScoreDoc[] hits2 = searcher2.Search(query, null, 1000).scoreDocs;
 				Assert.AreEqual(0, hits2.Length);
 				
 				// Simplistic check: just verify only the past N segments_N's still
@@ -866,7 +866,7 @@
 						if (!autoCommit)
 						{
 							searcher2 = new IndexSearcher(reader);
-							hits2 = searcher2.Search(query, null, 1000).ScoreDocs;
+							hits2 = searcher2.Search(query, null, 1000).scoreDocs;
 							Assert.AreEqual(expectedCount, hits2.Length);
 							searcher2.Close();
 							if (expectedCount == 0)

Modified: incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Index/TestIndexReader.cs?rev=890203&r1=890202&r2=890203&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexReader.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexReader.cs Mon Dec 14 07:25:37 2009
@@ -1160,7 +1160,7 @@
 					ScoreDoc[] hits = null;
 					try
 					{
-						hits = searcher.Search(new TermQuery(searchTerm), null, 1000).ScoreDocs;
+						hits = searcher.Search(new TermQuery(searchTerm), null, 1000).scoreDocs;
 					}
 					catch (System.IO.IOException e)
 					{

Modified: incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexReaderReopen.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Index/TestIndexReaderReopen.cs?rev=890203&r1=890202&r2=890203&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexReaderReopen.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexReaderReopen.cs Mon Dec 14 07:25:37 2009
@@ -408,7 +408,7 @@
 						
 						
 						IndexSearcher searcher = new IndexSearcher(refreshed);
-						ScoreDoc[] hits = searcher.Search(new TermQuery(new Term("field1", "a" + rnd.Next(refreshed.MaxDoc()))), null, 1000).ScoreDocs;
+						ScoreDoc[] hits = searcher.Search(new TermQuery(new Term("field1", "a" + rnd.Next(refreshed.MaxDoc()))), null, 1000).scoreDocs;
 						if (hits.Length > 0)
 						{
 							searcher.Doc(hits[0].doc);

Modified: incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexWriter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Index/TestIndexWriter.cs?rev=890203&r1=890202&r2=890203&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexWriter.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexWriter.cs Mon Dec 14 07:25:37 2009
@@ -560,7 +560,7 @@
 			Assert.AreEqual(57, reader.DocFreq(searchTerm), "first docFreq");
 			
 			IndexSearcher searcher = new IndexSearcher(reader);
-			ScoreDoc[] hits = searcher.Search(new TermQuery(searchTerm), null, 1000).ScoreDocs;
+			ScoreDoc[] hits = searcher.Search(new TermQuery(searchTerm), null, 1000).scoreDocs;
 			Assert.AreEqual(57, hits.Length, "first number of hits");
 			searcher.Close();
 			reader.Close();
@@ -811,7 +811,7 @@
 						searcher = new IndexSearcher(reader);
 						try
 						{
-							hits = searcher.Search(new TermQuery(searchTerm), null, END_COUNT).ScoreDocs;
+							hits = searcher.Search(new TermQuery(searchTerm), null, END_COUNT).scoreDocs;
 						}
 						catch (System.IO.IOException e)
 						{
@@ -1515,7 +1515,7 @@
 			
 			Term searchTerm = new Term("content", "aaa");
 			IndexSearcher searcher = new IndexSearcher(dir);
-			ScoreDoc[] hits = searcher.Search(new TermQuery(searchTerm), null, 1000).ScoreDocs;
+			ScoreDoc[] hits = searcher.Search(new TermQuery(searchTerm), null, 1000).scoreDocs;
 			Assert.AreEqual(14, hits.Length, "first number of hits");
 			searcher.Close();
 			
@@ -1529,7 +1529,7 @@
 					AddDoc(writer);
 				}
 				searcher = new IndexSearcher(dir);
-				hits = searcher.Search(new TermQuery(searchTerm), null, 1000).ScoreDocs;
+				hits = searcher.Search(new TermQuery(searchTerm), null, 1000).scoreDocs;
 				Assert.AreEqual(14, hits.Length, "reader incorrectly sees changes from writer with autoCommit disabled");
 				searcher.Close();
 				Assert.IsTrue(reader.IsCurrent(), "reader should have still been current");
@@ -1540,7 +1540,7 @@
 			Assert.IsFalse(reader.IsCurrent(), "reader should not be current now");
 			
 			searcher = new IndexSearcher(dir);
-			hits = searcher.Search(new TermQuery(searchTerm), null, 1000).ScoreDocs;
+			hits = searcher.Search(new TermQuery(searchTerm), null, 1000).scoreDocs;
 			Assert.AreEqual(47, hits.Length, "reader did not see changes after writer was closed");
 			searcher.Close();
 		}
@@ -1568,7 +1568,7 @@
 			
 			Term searchTerm = new Term("content", "aaa");
 			IndexSearcher searcher = new IndexSearcher(dir);
-			ScoreDoc[] hits = searcher.Search(new TermQuery(searchTerm), null, 1000).ScoreDocs;
+			ScoreDoc[] hits = searcher.Search(new TermQuery(searchTerm), null, 1000).scoreDocs;
 			Assert.AreEqual(14, hits.Length, "first number of hits");
 			searcher.Close();
 			
@@ -1582,7 +1582,7 @@
 			writer.DeleteDocuments(searchTerm);
 			
 			searcher = new IndexSearcher(dir);
-			hits = searcher.Search(new TermQuery(searchTerm), null, 1000).ScoreDocs;
+			hits = searcher.Search(new TermQuery(searchTerm), null, 1000).scoreDocs;
 			Assert.AreEqual(14, hits.Length, "reader incorrectly sees changes from writer with autoCommit disabled");
 			searcher.Close();
 			
@@ -1592,7 +1592,7 @@
 			AssertNoUnreferencedFiles(dir, "unreferenced files remain after abort()");
 			
 			searcher = new IndexSearcher(dir);
-			hits = searcher.Search(new TermQuery(searchTerm), null, 1000).ScoreDocs;
+			hits = searcher.Search(new TermQuery(searchTerm), null, 1000).scoreDocs;
 			Assert.AreEqual(14, hits.Length, "saw changes after writer.abort");
 			searcher.Close();
 			
@@ -1612,14 +1612,14 @@
 					AddDoc(writer);
 				}
 				searcher = new IndexSearcher(dir);
-				hits = searcher.Search(new TermQuery(searchTerm), null, 1000).ScoreDocs;
+				hits = searcher.Search(new TermQuery(searchTerm), null, 1000).scoreDocs;
 				Assert.AreEqual(14, hits.Length, "reader incorrectly sees changes from writer with autoCommit disabled");
 				searcher.Close();
 			}
 			
 			writer.Close();
 			searcher = new IndexSearcher(dir);
-			hits = searcher.Search(new TermQuery(searchTerm), null, 1000).ScoreDocs;
+			hits = searcher.Search(new TermQuery(searchTerm), null, 1000).scoreDocs;
 			Assert.AreEqual(218, hits.Length, "didn't see changes after close");
 			searcher.Close();
 			
@@ -2013,7 +2013,7 @@
 			writer.Close();
 			
 			IndexSearcher searcher = new IndexSearcher(dir);
-			ScoreDoc[] hits = searcher.Search(new TermQuery(new Term("field", "aaa")), null, 1000).ScoreDocs;
+			ScoreDoc[] hits = searcher.Search(new TermQuery(new Term("field", "aaa")), null, 1000).scoreDocs;
 			Assert.AreEqual(300, hits.Length);
 			searcher.Close();
 			
@@ -2043,7 +2043,7 @@
 			Term searchTerm = new Term("field", "aaa");
 			
 			IndexSearcher searcher = new IndexSearcher(dir);
-			ScoreDoc[] hits = searcher.Search(new TermQuery(searchTerm), null, 1000).ScoreDocs;
+			ScoreDoc[] hits = searcher.Search(new TermQuery(searchTerm), null, 1000).scoreDocs;
 			Assert.AreEqual(10, hits.Length);
 			searcher.Close();
 			
@@ -2063,7 +2063,7 @@
 			}
 			writer.Close();
 			searcher = new IndexSearcher(dir);
-			hits = searcher.Search(new TermQuery(searchTerm), null, 1000).ScoreDocs;
+			hits = searcher.Search(new TermQuery(searchTerm), null, 1000).scoreDocs;
 			Assert.AreEqual(27, hits.Length);
 			searcher.Close();
 			
@@ -2124,7 +2124,7 @@
 			writer.Close();
 			Term searchTerm = new Term("content", "aaa");
 			IndexSearcher searcher = new IndexSearcher(dir);
-			ScoreDoc[] hits = searcher.Search(new TermQuery(searchTerm), null, 1000).ScoreDocs;
+			ScoreDoc[] hits = searcher.Search(new TermQuery(searchTerm), null, 1000).scoreDocs;
 			Assert.AreEqual(100, hits.Length, "did not get right number of hits");
 			writer.Close();
 			
@@ -4358,11 +4358,11 @@
 			pq.Add(new Term("field", "a"));
 			pq.Add(new Term("field", "b"));
 			pq.Add(new Term("field", "c"));
-			ScoreDoc[] hits = s.Search(pq, null, 1000).ScoreDocs;
+			ScoreDoc[] hits = s.Search(pq, null, 1000).scoreDocs;
 			Assert.AreEqual(1, hits.Length);
 			
 			Query q = new SpanTermQuery(new Term("field", "a"));
-			hits = s.Search(q, null, 1000).ScoreDocs;
+			hits = s.Search(q, null, 1000).scoreDocs;
 			Assert.AreEqual(1, hits.Length);
 			TermPositions tps = s.GetIndexReader().TermPositions(new Term("field", "a"));
 			Assert.IsTrue(tps.Next());

Modified: incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexWriterDelete.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Index/TestIndexWriterDelete.cs?rev=890203&r1=890202&r2=890203&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexWriterDelete.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexWriterDelete.cs Mon Dec 14 07:25:37 2009
@@ -542,7 +542,7 @@
 		private int GetHitCount(Directory dir, Term term)
 		{
 			IndexSearcher searcher = new IndexSearcher(dir);
-			int hitCount = searcher.Search(new TermQuery(term), null, 1000).TotalHits;
+			int hitCount = searcher.Search(new TermQuery(term), null, 1000).totalHits;
 			searcher.Close();
 			return hitCount;
 		}
@@ -721,7 +721,7 @@
 						ScoreDoc[] hits = null;
 						try
 						{
-							hits = searcher.Search(new TermQuery(searchTerm), null, 1000).ScoreDocs;
+							hits = searcher.Search(new TermQuery(searchTerm), null, 1000).scoreDocs;
 						}
 						catch (System.IO.IOException e)
 						{

Modified: incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexWriterReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Index/TestIndexWriterReader.cs?rev=890203&r1=890202&r2=890203&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexWriterReader.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexWriterReader.cs Mon Dec 14 07:25:37 2009
@@ -925,7 +925,7 @@
 			// reader should remain usable even after IndexWriter is closed:
 			Assert.AreEqual(100, r.NumDocs());
 			Query q = new TermQuery(new Term("indexname", "test"));
-			Assert.AreEqual(100, new IndexSearcher(r).Search(q, 10).TotalHits);
+			Assert.AreEqual(100, new IndexSearcher(r).Search(q, 10).totalHits);
 			
 			try
 			{
@@ -985,7 +985,7 @@
 					r = r2;
 				}
 				Query q = new TermQuery(new Term("indexname", "test"));
-				int count = new IndexSearcher(r).Search(q, 10).TotalHits;
+				int count = new IndexSearcher(r).Search(q, 10).totalHits;
 				Assert.IsTrue(count >= lastCount);
 				lastCount = count;
 			}
@@ -1042,7 +1042,7 @@
 					r = r2;
 				}
 				Query q = new TermQuery(new Term("indexname", "test"));
-				sum += new IndexSearcher(r).Search(q, 10).TotalHits;
+				sum += new IndexSearcher(r).Search(q, 10).totalHits;
 			}
 			
 			for (int i = 0; i < NUM_THREAD; i++)

Modified: incubator/lucene.net/trunk/C#/src/Test/Index/TestLazyProxSkipping.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Index/TestLazyProxSkipping.cs?rev=890203&r1=890202&r2=890203&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Index/TestLazyProxSkipping.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Index/TestLazyProxSkipping.cs Mon Dec 14 07:25:37 2009
@@ -127,7 +127,7 @@
 			PhraseQuery pq = new PhraseQuery();
 			pq.Add(new Term(this.field, this.term1));
 			pq.Add(new Term(this.field, this.term2));
-			return this.searcher.Search(pq, null, 1000).ScoreDocs;
+			return this.searcher.Search(pq, null, 1000).scoreDocs;
 		}
 		
 		private void  PerformTest(int numHits)

Modified: incubator/lucene.net/trunk/C#/src/Test/Index/TestParallelReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Index/TestParallelReader.cs?rev=890203&r1=890202&r2=890203&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Index/TestParallelReader.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Index/TestParallelReader.cs Mon Dec 14 07:25:37 2009
@@ -238,8 +238,8 @@
 		
 		private void  QueryTest(Query query)
 		{
-			ScoreDoc[] parallelHits = parallel.Search(query, null, 1000).ScoreDocs;
-			ScoreDoc[] singleHits = single.Search(query, null, 1000).ScoreDocs;
+			ScoreDoc[] parallelHits = parallel.Search(query, null, 1000).scoreDocs;
+			ScoreDoc[] singleHits = single.Search(query, null, 1000).scoreDocs;
 			Assert.AreEqual(parallelHits.Length, singleHits.Length);
 			for (int i = 0; i < parallelHits.Length; i++)
 			{

Modified: incubator/lucene.net/trunk/C#/src/Test/QueryParser/TestMultiFieldQueryParser.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/QueryParser/TestMultiFieldQueryParser.cs?rev=890203&r1=890202&r2=890203&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/QueryParser/TestMultiFieldQueryParser.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/QueryParser/TestMultiFieldQueryParser.cs Mon Dec 14 07:25:37 2009
@@ -327,7 +327,7 @@
 			mfqp.SetDefaultOperator(QueryParser.Operator.AND);
 			Query q = mfqp.Parse("the footest");
 			IndexSearcher is_Renamed = new IndexSearcher(ramDir);
-			ScoreDoc[] hits = is_Renamed.Search(q, null, 1000).ScoreDocs;
+			ScoreDoc[] hits = is_Renamed.Search(q, null, 1000).scoreDocs;
 			Assert.AreEqual(1, hits.Length);
 			is_Renamed.Close();
 		}

Modified: incubator/lucene.net/trunk/C#/src/Test/QueryParser/TestQueryParser.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/QueryParser/TestQueryParser.cs?rev=890203&r1=890202&r2=890203&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/QueryParser/TestQueryParser.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/QueryParser/TestQueryParser.cs Mon Dec 14 07:25:37 2009
@@ -579,18 +579,18 @@
 			
 			// Test ConstantScoreRangeQuery
 			qp.SetMultiTermRewriteMethod(MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE);
-			ScoreDoc[] result = is_Renamed.Search(qp.Parse("[ \u062F TO \u0698 ]"), null, 1000).ScoreDocs;
+			ScoreDoc[] result = is_Renamed.Search(qp.Parse("[ \u062F TO \u0698 ]"), null, 1000).scoreDocs;
 			Assert.AreEqual(0, result.Length, "The index Term should not be included.");
 			
-			result = is_Renamed.Search(qp.Parse("[ \u0633 TO \u0638 ]"), null, 1000).ScoreDocs;
+			result = is_Renamed.Search(qp.Parse("[ \u0633 TO \u0638 ]"), null, 1000).scoreDocs;
 			Assert.AreEqual(1, result.Length, "The index Term should be included.");
 			
 			// Test TermRangeQuery
 			qp.SetMultiTermRewriteMethod(MultiTermQuery.SCORING_BOOLEAN_QUERY_REWRITE);
-			result = is_Renamed.Search(qp.Parse("[ \u062F TO \u0698 ]"), null, 1000).ScoreDocs;
+			result = is_Renamed.Search(qp.Parse("[ \u062F TO \u0698 ]"), null, 1000).scoreDocs;
 			Assert.AreEqual(0, result.Length, "The index Term should not be included.");
 			
-			result = is_Renamed.Search(qp.Parse("[ \u0633 TO \u0638 ]"), null, 1000).ScoreDocs;
+			result = is_Renamed.Search(qp.Parse("[ \u0633 TO \u0638 ]"), null, 1000).scoreDocs;
 			Assert.AreEqual(1, result.Length, "The index Term should be included.");
 			
 			is_Renamed.Close();
@@ -1106,7 +1106,7 @@
 			QueryParser qp = new QueryParser("date", new WhitespaceAnalyzer());
 			qp.SetLocale(new System.Globalization.CultureInfo("en-US"));
 			Query q = qp.Parse(query);
-			ScoreDoc[] hits = is_Renamed.Search(q, null, 1000).ScoreDocs;
+			ScoreDoc[] hits = is_Renamed.Search(q, null, 1000).scoreDocs;
 			Assert.AreEqual(expected, hits.Length);
 		}
 		
@@ -1144,7 +1144,7 @@
 			IndexSearcher s = new IndexSearcher(r);
 			QueryParser qp = new QueryParser(Version.LUCENE_CURRENT, "f", a);
 			Query q = qp.Parse("\"wizard of ozzy\"");
-			Assert.AreEqual(1, s.Search(q, 1).TotalHits);
+			Assert.AreEqual(1, s.Search(q, 1).totalHits);
 			r.Close();
 			dir.Close();
 		}

Modified: incubator/lucene.net/trunk/C#/src/Test/Search/CheckHits.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Search/CheckHits.cs?rev=890203&r1=890202&r2=890203&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Search/CheckHits.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Search/CheckHits.cs Mon Dec 14 07:25:37 2009
@@ -170,7 +170,7 @@
 				QueryUtils.Check(query, searcher);
 			}
 			
-			ScoreDoc[] hits = searcher.Search(query, null, 1000).ScoreDocs;
+			ScoreDoc[] hits = searcher.Search(query, null, 1000).scoreDocs;
 			
 			System.Collections.ArrayList correct = new System.Collections.ArrayList();
 			for (int i = 0; i < results.Length; i++)
@@ -271,19 +271,19 @@
 		public static System.String TopdocsString(TopDocs docs, int start, int end)
 		{
 			System.Text.StringBuilder sb = new System.Text.StringBuilder();
-			sb.Append("TopDocs totalHits=").Append(docs.TotalHits).Append(" top=").Append(docs.ScoreDocs.Length).Append('\n');
+			sb.Append("TopDocs totalHits=").Append(docs.totalHits).Append(" top=").Append(docs.scoreDocs.Length).Append('\n');
 			if (end <= 0)
-				end = docs.ScoreDocs.Length;
+				end = docs.scoreDocs.Length;
 			else
-				end = System.Math.Min(end, docs.ScoreDocs.Length);
+				end = System.Math.Min(end, docs.scoreDocs.Length);
 			for (int i = start; i < end; i++)
 			{
 				sb.Append('\t');
 				sb.Append(i);
 				sb.Append(") doc=");
-				sb.Append(docs.ScoreDocs[i].doc);
+				sb.Append(docs.scoreDocs[i].doc);
 				sb.Append("\tscore=");
-				sb.Append(docs.ScoreDocs[i].score);
+				sb.Append(docs.scoreDocs[i].score);
 				sb.Append('\n');
 			}
 			return sb.ToString();

Modified: incubator/lucene.net/trunk/C#/src/Test/Search/Function/TestCustomScoreQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Search/Function/TestCustomScoreQuery.cs?rev=890203&r1=890202&r2=890203&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Search/Function/TestCustomScoreQuery.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Search/Function/TestCustomScoreQuery.cs Mon Dec 14 07:25:37 2009
@@ -271,9 +271,9 @@
 		private System.Collections.Hashtable TopDocsToMap(TopDocs td)
 		{
 			System.Collections.Hashtable h = new System.Collections.Hashtable();
-			for (int i = 0; i < td.TotalHits; i++)
+			for (int i = 0; i < td.totalHits; i++)
 			{
-				h[(System.Int32) td.ScoreDocs[i].doc] = (float) td.ScoreDocs[i].score;
+				h[(System.Int32) td.scoreDocs[i].doc] = (float) td.scoreDocs[i].score;
 			}
 			return h;
 		}

Modified: incubator/lucene.net/trunk/C#/src/Test/Search/Function/TestFieldScoreQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Search/Function/TestFieldScoreQuery.cs?rev=890203&r1=890202&r2=890203&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Search/Function/TestFieldScoreQuery.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Search/Function/TestFieldScoreQuery.cs Mon Dec 14 07:25:37 2009
@@ -92,7 +92,7 @@
 			Query q = new FieldScoreQuery(field, tp);
 			Log("test: " + q);
 			QueryUtils.Check(q, s);
-			ScoreDoc[] h = s.Search(q, null, 1000).ScoreDocs;
+			ScoreDoc[] h = s.Search(q, null, 1000).scoreDocs;
 			Assert.AreEqual(N_DOCS, h.Length, "All docs should be matched!");
 			System.String prevID = "ID" + (N_DOCS + 1); // greater than all ids of docs in this test
 			for (int i = 0; i < h.Length; i++)
@@ -144,8 +144,8 @@
 			IndexSearcher s = new IndexSearcher(dir);
 			Query q = new FieldScoreQuery(field, tp);
 			TopDocs td = s.Search(q, null, 1000);
-			Assert.AreEqual(N_DOCS, td.TotalHits, "All docs should be matched!");
-			ScoreDoc[] sd = td.ScoreDocs;
+			Assert.AreEqual(N_DOCS, td.totalHits, "All docs should be matched!");
+			ScoreDoc[] sd = td.scoreDocs;
 			for (int i = 0; i < sd.Length; i++)
 			{
 				float score = sd[i].score;
@@ -206,7 +206,7 @@
 			for (int i = 0; i < 10; i++)
 			{
 				FieldScoreQuery q = new FieldScoreQuery(field, tp);
-				ScoreDoc[] h = s.Search(q, null, 1000).ScoreDocs;
+				ScoreDoc[] h = s.Search(q, null, 1000).scoreDocs;
 				Assert.AreEqual(N_DOCS, h.Length, "All docs should be matched!");
 				IndexReader[] readers = s.GetIndexReader().GetSequentialSubReaders();
 				for (int j = 0; j < readers.Length; j++)
@@ -240,7 +240,7 @@
 			// verify new values are reloaded (not reused) for a new reader
 			s = new IndexSearcher(dir);
 			FieldScoreQuery q2 = new FieldScoreQuery(field, tp);
-			ScoreDoc[] h2 = s.Search(q2, null, 1000).ScoreDocs;
+			ScoreDoc[] h2 = s.Search(q2, null, 1000).scoreDocs;
 			Assert.AreEqual(N_DOCS, h2.Length, "All docs should be matched!");
 			IndexReader[] readers2 = s.GetIndexReader().GetSequentialSubReaders();
 			for (int j = 0; j < readers2.Length; j++)

Modified: incubator/lucene.net/trunk/C#/src/Test/Search/Function/TestOrdValues.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Search/Function/TestOrdValues.cs?rev=890203&r1=890202&r2=890203&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Search/Function/TestOrdValues.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Search/Function/TestOrdValues.cs Mon Dec 14 07:25:37 2009
@@ -83,7 +83,7 @@
 			Query q = new ValueSourceQuery(vs);
 			Log("test: " + q);
 			QueryUtils.Check(q, s);
-			ScoreDoc[] h = s.Search(q, null, 1000).ScoreDocs;
+			ScoreDoc[] h = s.Search(q, null, 1000).scoreDocs;
 			Assert.AreEqual(N_DOCS, h.Length, "All docs should be matched!");
 			System.String prevID = inOrder?"IE":"IC"; // smaller than all ids of docs in this test ("ID0001", etc.)
 			
@@ -134,8 +134,8 @@
 			}
 			Query q = new ValueSourceQuery(vs);
 			TopDocs td = s.Search(q, null, 1000);
-			Assert.AreEqual(N_DOCS, td.TotalHits, "All docs should be matched!");
-			ScoreDoc[] sd = td.ScoreDocs;
+			Assert.AreEqual(N_DOCS, td.totalHits, "All docs should be matched!");
+			ScoreDoc[] sd = td.scoreDocs;
 			for (int i = 0; i < sd.Length; i++)
 			{
 				float score = sd[i].score;
@@ -183,7 +183,7 @@
 					vs = new ReverseOrdFieldSource(field);
 				}
 				ValueSourceQuery q = new ValueSourceQuery(vs);
-				ScoreDoc[] h = s.Search(q, null, 1000).ScoreDocs;
+				ScoreDoc[] h = s.Search(q, null, 1000).scoreDocs;
 				try
 				{
 					Assert.AreEqual(N_DOCS, h.Length, "All docs should be matched!");
@@ -229,7 +229,7 @@
 				vs2 = new ReverseOrdFieldSource(field2);
 			}
 			q2 = new ValueSourceQuery(vs2);
-			h2 = s.Search(q2, null, 1000).ScoreDocs;
+			h2 = s.Search(q2, null, 1000).scoreDocs;
 			Assert.AreEqual(N_DOCS, h2.Length, "All docs should be matched!");
 			IndexReader[] readers2 = s.GetIndexReader().GetSequentialSubReaders();
 			
@@ -262,7 +262,7 @@
 				vs2 = new ReverseOrdFieldSource(field);
 			}
 			q2 = new ValueSourceQuery(vs2);
-			h2 = s.Search(q2, null, 1000).ScoreDocs;
+			h2 = s.Search(q2, null, 1000).scoreDocs;
 			Assert.AreEqual(N_DOCS, h2.Length, "All docs should be matched!");
 			readers2 = s.GetIndexReader().GetSequentialSubReaders();
 			

Modified: incubator/lucene.net/trunk/C#/src/Test/Search/Payloads/TestBoostingTermQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Search/Payloads/TestBoostingTermQuery.cs?rev=890203&r1=890202&r2=890203&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Search/Payloads/TestBoostingTermQuery.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Search/Payloads/TestBoostingTermQuery.cs Mon Dec 14 07:25:37 2009
@@ -180,15 +180,15 @@
 			BoostingTermQuery query = new BoostingTermQuery(new Term("field", "seventy"));
 			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);
+			Assert.IsTrue(hits.totalHits == 100, "hits Size: " + hits.totalHits + " is not: " + 100);
 			
 			//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);
-			for (int i = 0; i < hits.ScoreDocs.Length; i++)
+			for (int i = 0; i < hits.scoreDocs.Length; i++)
 			{
-				ScoreDoc doc = hits.ScoreDocs[i];
+				ScoreDoc doc = hits.scoreDocs[i];
 				Assert.IsTrue(doc.score == 1, doc.score + " does not equal: " + 1);
 			}
 			CheckHits.CheckExplanations(query, PayloadHelper.FIELD, searcher, true);
@@ -208,7 +208,7 @@
 			BoostingTermQuery query = new BoostingTermQuery(new Term(PayloadHelper.MULTI_FIELD, "seventy"));
 			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);
+			Assert.IsTrue(hits.totalHits == 100, "hits Size: " + hits.totalHits + " is not: " + 100);
 			
 			//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
@@ -218,9 +218,9 @@
 			//there should be exactly 10 items that score a 3, 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++)
+			for (int i = 0; i < hits.scoreDocs.Length; i++)
 			{
-				ScoreDoc doc = hits.ScoreDocs[i];
+				ScoreDoc doc = hits.scoreDocs[i];
 				if (doc.doc % 10 == 0)
 				{
 					numTens++;
@@ -252,7 +252,7 @@
 			BoostingTermQuery query = new BoostingTermQuery(new Term(PayloadHelper.FIELD, "junk"));
 			TopDocs hits = searcher.Search(query, null, 100);
 			Assert.IsTrue(hits != null, "hits is null and it shouldn't be");
-			Assert.IsTrue(hits.TotalHits == 0, "hits Size: " + hits.TotalHits + " is not: " + 0);
+			Assert.IsTrue(hits.totalHits == 0, "hits Size: " + hits.totalHits + " is not: " + 0);
 		}
 		
 		[Test]
@@ -267,7 +267,7 @@
 			query.Add(c2);
 			TopDocs hits = searcher.Search(query, null, 100);
 			Assert.IsTrue(hits != null, "hits is null and it shouldn't be");
-			Assert.IsTrue(hits.TotalHits == 1, "hits Size: " + hits.TotalHits + " is not: " + 1);
+			Assert.IsTrue(hits.totalHits == 1, "hits Size: " + hits.totalHits + " is not: " + 1);
 			int[] results = new int[1];
 			results[0] = 0; //hits.scoreDocs[0].doc;
 			CheckHits.CheckHitCollector(query, PayloadHelper.NO_PAYLOAD_FIELD, searcher, results);

Modified: incubator/lucene.net/trunk/C#/src/Test/Search/Payloads/TestPayloadNearQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Search/Payloads/TestPayloadNearQuery.cs?rev=890203&r1=890202&r2=890203&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Search/Payloads/TestPayloadNearQuery.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Search/Payloads/TestPayloadNearQuery.cs Mon Dec 14 07:25:37 2009
@@ -185,10 +185,10 @@
 			// and all the similarity factors are set to 1
 			hits = searcher.Search(query, null, 100);
 			Assert.IsTrue(hits != null, "hits is null and it shouldn't be");
-			Assert.IsTrue(hits.TotalHits == 10, "should be 10 hits");
-			for (int j = 0; j < hits.ScoreDocs.Length; j++)
+			Assert.IsTrue(hits.totalHits == 10, "should be 10 hits");
+			for (int j = 0; j < hits.scoreDocs.Length; j++)
 			{
-				ScoreDoc doc = hits.ScoreDocs[j];
+				ScoreDoc doc = hits.scoreDocs[j];
 				Assert.IsTrue(doc.score == 3, doc.score + " does not equal: " + 3);
 			}
 			for (int i = 1; i < 10; i++)
@@ -198,10 +198,10 @@
 				// and all the similarity factors are set to 1
 				hits = searcher.Search(query, null, 100);
 				Assert.IsTrue(hits != null, "hits is null and it shouldn't be");
-				Assert.IsTrue(hits.TotalHits == 100, "should be 100 hits");
-				for (int j = 0; j < hits.ScoreDocs.Length; j++)
+				Assert.IsTrue(hits.totalHits == 100, "should be 100 hits");
+				for (int j = 0; j < hits.scoreDocs.Length; j++)
 				{
-					ScoreDoc doc = hits.ScoreDocs[j];
+					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);
@@ -223,7 +223,7 @@
 			clauses[1] = q2;
 			query = new PayloadNearQuery(clauses, 10, false);
 			// System.out.println(query.toString());
-			Assert.AreEqual(12, searcher.Search(query, null, 100).TotalHits);
+			Assert.AreEqual(12, searcher.Search(query, null, 100).totalHits);
 			/*
 			* System.out.println(hits.totalHits); for (int j = 0; j <
 			* hits.scoreDocs.length; j++) { ScoreDoc doc = hits.scoreDocs[j];
@@ -249,11 +249,11 @@
 			TopDocs hits;
 			query = NewPhraseQuery("field", "nine hundred ninety nine", true);
 			hits = searcher.Search(query, null, 100);
-			ScoreDoc doc = hits.ScoreDocs[0];
+			ScoreDoc doc = hits.scoreDocs[0];
 			//		System.out.println("Doc: " + doc.toString());
 			//		System.out.println("Explain: " + searcher.explain(query, doc.doc));
 			Assert.IsTrue(hits != null, "hits is null and it shouldn't be");
-			Assert.IsTrue(hits.TotalHits == 1, "there should only be one hit");
+			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);
 		}
@@ -275,9 +275,9 @@
 			hits = searcher.Search(query, null, 100);
 			Assert.IsTrue(hits != null, "hits is null and it shouldn't be");
 			// should be only 1 hit - doc 999
-			Assert.IsTrue(hits.ScoreDocs.Length == 1, "should only be one hit");
+			Assert.IsTrue(hits.scoreDocs.Length == 1, "should only be one hit");
 			// the score should be 3 - the average of all the underlying payloads
-			ScoreDoc doc = hits.ScoreDocs[0];
+			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);

Modified: incubator/lucene.net/trunk/C#/src/Test/Search/Payloads/TestPayloadTermQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Search/Payloads/TestPayloadTermQuery.cs?rev=890203&r1=890202&r2=890203&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Search/Payloads/TestPayloadTermQuery.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Search/Payloads/TestPayloadTermQuery.cs Mon Dec 14 07:25:37 2009
@@ -188,15 +188,15 @@
 			PayloadTermQuery query = new PayloadTermQuery(new Term("field", "seventy"), new MaxPayloadFunction());
 			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);
+			Assert.IsTrue(hits.totalHits == 100, "hits Size: " + hits.totalHits + " is not: " + 100);
 			
 			//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);
-			for (int i = 0; i < hits.ScoreDocs.Length; i++)
+			for (int i = 0; i < hits.scoreDocs.Length; i++)
 			{
-				ScoreDoc doc = hits.ScoreDocs[i];
+				ScoreDoc doc = hits.scoreDocs[i];
 				Assert.IsTrue(doc.score == 1, doc.score + " does not equal: " + 1);
 			}
 			CheckHits.CheckExplanations(query, PayloadHelper.FIELD, searcher, true);
@@ -231,7 +231,7 @@
 			PayloadTermQuery query = new PayloadTermQuery(new Term(PayloadHelper.MULTI_FIELD, "seventy"), new MaxPayloadFunction());
 			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);
+			Assert.IsTrue(hits.totalHits == 100, "hits Size: " + hits.totalHits + " is not: " + 100);
 			
 			//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
@@ -241,9 +241,9 @@
 			//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++)
+			for (int i = 0; i < hits.scoreDocs.Length; i++)
 			{
-				ScoreDoc doc = hits.ScoreDocs[i];
+				ScoreDoc doc = hits.scoreDocs[i];
 				if (doc.doc % 10 == 0)
 				{
 					numTens++;
@@ -279,7 +279,7 @@
 			theSearcher.SetSimilarity(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);
+			Assert.IsTrue(hits.totalHits == 100, "hits Size: " + hits.totalHits + " is not: " + 100);
 			
 			//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
@@ -289,9 +289,9 @@
 			//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++)
+			for (int i = 0; i < hits.scoreDocs.Length; i++)
 			{
-				ScoreDoc doc = hits.ScoreDocs[i];
+				ScoreDoc doc = hits.scoreDocs[i];
 				if (doc.doc % 10 == 0)
 				{
 					numTens++;
@@ -322,7 +322,7 @@
 			PayloadTermQuery query = new PayloadTermQuery(new Term(PayloadHelper.FIELD, "junk"), new MaxPayloadFunction());
 			TopDocs hits = searcher.Search(query, null, 100);
 			Assert.IsTrue(hits != null, "hits is null and it shouldn't be");
-			Assert.IsTrue(hits.TotalHits == 0, "hits Size: " + hits.TotalHits + " is not: " + 0);
+			Assert.IsTrue(hits.totalHits == 0, "hits Size: " + hits.totalHits + " is not: " + 0);
 		}
 		
         [Test]
@@ -337,7 +337,7 @@
 			query.Add(c2);
 			TopDocs hits = searcher.Search(query, null, 100);
 			Assert.IsTrue(hits != null, "hits is null and it shouldn't be");
-			Assert.IsTrue(hits.TotalHits == 1, "hits Size: " + hits.TotalHits + " is not: " + 1);
+			Assert.IsTrue(hits.totalHits == 1, "hits Size: " + hits.totalHits + " is not: " + 1);
 			int[] results = new int[1];
 			results[0] = 0; //hits.scoreDocs[0].doc;
 			CheckHits.CheckHitCollector(query, PayloadHelper.NO_PAYLOAD_FIELD, searcher, results);

Modified: incubator/lucene.net/trunk/C#/src/Test/Search/Spans/TestPayloadSpans.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Search/Spans/TestPayloadSpans.cs?rev=890203&r1=890202&r2=890203&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Search/Spans/TestPayloadSpans.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Search/Spans/TestPayloadSpans.cs Mon Dec 14 07:25:37 2009
@@ -278,7 +278,7 @@
 			
 			TopDocs topDocs = is_Renamed.Search(snq, 1);
 			System.Collections.Hashtable payloadSet = new System.Collections.Hashtable();
-			for (int i = 0; i < topDocs.ScoreDocs.Length; i++)
+			for (int i = 0; i < topDocs.scoreDocs.Length; i++)
 			{
 				while (spans.Next())
 				{
@@ -315,7 +315,7 @@
 			
 			TopDocs topDocs = is_Renamed.Search(snq, 1);
 			System.Collections.Hashtable payloadSet = new System.Collections.Hashtable();
-			for (int i = 0; i < topDocs.ScoreDocs.Length; i++)
+			for (int i = 0; i < topDocs.scoreDocs.Length; i++)
 			{
 				while (spans.Next())
 				{
@@ -352,7 +352,7 @@
 			
 			TopDocs topDocs = is_Renamed.Search(snq, 1);
 			System.Collections.Hashtable payloadSet = new System.Collections.Hashtable();
-			for (int i = 0; i < topDocs.ScoreDocs.Length; i++)
+			for (int i = 0; i < topDocs.scoreDocs.Length; i++)
 			{
 				while (spans.Next())
 				{

Modified: incubator/lucene.net/trunk/C#/src/Test/Search/Spans/TestSpans.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Search/Spans/TestSpans.cs?rev=890203&r1=890202&r2=890203&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Search/Spans/TestSpans.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Search/Spans/TestSpans.cs Mon Dec 14 07:25:37 2009
@@ -479,7 +479,7 @@
 		// LUCENE-1404
 		private int HitCount(Searcher searcher, System.String word)
 		{
-			return searcher.Search(new TermQuery(new Term("text", word)), 10).TotalHits;
+			return searcher.Search(new TermQuery(new Term("text", word)), 10).totalHits;
 		}
 		
 		// LUCENE-1404
@@ -525,7 +525,7 @@
 			Assert.AreEqual(0, HitCount(searcher, "rabbit"));
 			
 			// This throws exception (it shouldn't)
-			Assert.AreEqual(1, searcher.Search(CreateSpan(0, true, new SpanQuery[]{CreateSpan(4, false, "chased", "cat"), CreateSpan("ate")}), 10).TotalHits);
+			Assert.AreEqual(1, searcher.Search(CreateSpan(0, true, new SpanQuery[]{CreateSpan(4, false, "chased", "cat"), CreateSpan("ate")}), 10).totalHits);
 			reader.Close();
 			dir.Close();
 		}

Modified: incubator/lucene.net/trunk/C#/src/Test/Search/Spans/TestSpansAdvanced.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Search/Spans/TestSpansAdvanced.cs?rev=890203&r1=890202&r2=890203&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Search/Spans/TestSpansAdvanced.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Search/Spans/TestSpansAdvanced.cs Mon Dec 14 07:25:37 2009
@@ -156,14 +156,14 @@
 			*****/
 			
 			// did we get the hits we expected
-			Assert.AreEqual(expectedIds.Length, topdocs.TotalHits);
-			for (int i = 0; i < topdocs.TotalHits; i++)
+			Assert.AreEqual(expectedIds.Length, topdocs.totalHits);
+			for (int i = 0; i < topdocs.totalHits; i++)
 			{
 				//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/C#/src/Test/Search/TestBoolean2.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Search/TestBoolean2.cs?rev=890203&r1=890202&r2=890203&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Search/TestBoolean2.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Search/TestBoolean2.cs Mon Dec 14 07:25:37 2009
@@ -108,11 +108,11 @@
 			{
 				Query query1 = MakeQuery(queryText);
 				BooleanQuery.SetAllowDocsOutOfOrder(true);
-				ScoreDoc[] hits1 = searcher.Search(query1, null, 1000).ScoreDocs;
+				ScoreDoc[] hits1 = searcher.Search(query1, null, 1000).scoreDocs;
 				
 				Query query2 = MakeQuery(queryText); // there should be no need to parse again...
 				BooleanQuery.SetAllowDocsOutOfOrder(false);
-				ScoreDoc[] hits2 = searcher.Search(query2, null, 1000).ScoreDocs;
+				ScoreDoc[] hits2 = searcher.Search(query2, null, 1000).scoreDocs;
 				
 				CheckHits.CheckHitsQuery(query2, hits1, hits2, expDocNrs);
 			}
@@ -231,10 +231,10 @@
 					
 					QueryUtils.Check(q1, searcher);
 					
-					ScoreDoc[] hits1 = searcher.Search(q1, null, 1000, sort).ScoreDocs;
+					ScoreDoc[] hits1 = searcher.Search(q1, null, 1000, sort).scoreDocs;
 					
 					BooleanQuery.SetAllowDocsOutOfOrder(true);
-					ScoreDoc[] hits2 = searcher.Search(q1, null, 1000, sort).ScoreDocs;
+					ScoreDoc[] hits2 = searcher.Search(q1, null, 1000, sort).scoreDocs;
 					tot += hits2.Length;
 					CheckHits.CheckEqual(q1, hits1, hits2);
 				}

Modified: incubator/lucene.net/trunk/C#/src/Test/Search/TestBooleanMinShouldMatch.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Search/TestBooleanMinShouldMatch.cs?rev=890203&r1=890202&r2=890203&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Search/TestBooleanMinShouldMatch.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Search/TestBooleanMinShouldMatch.cs Mon Dec 14 07:25:37 2009
@@ -109,7 +109,7 @@
 		
 		public virtual void  VerifyNrHits(Query q, int expected)
 		{
-			ScoreDoc[] h = s.Search(q, null, 1000).ScoreDocs;
+			ScoreDoc[] h = s.Search(q, null, 1000).scoreDocs;
 			if (expected != h.Length)
 			{
 				PrintHits("getName()", h, s);  // {{Aroush-2.9}} String junit.framework.TestCase.getName()
@@ -388,24 +388,24 @@
 				
 				// The constrained query
 				// should be a superset to the unconstrained query.
-				if (top2.TotalHits > top1.TotalHits)
+				if (top2.totalHits > top1.totalHits)
 				{
 					//TestCase.fail("Constrained results not a subset:\n" + CheckHits.TopdocsString(top1, 0, 0) + CheckHits.TopdocsString(top2, 0, 0) + "for query:" + q2.ToString());
 					Assert.Fail("Constrained results not a subset:\n" + CheckHits.TopdocsString(top1, 0, 0) + CheckHits.TopdocsString(top2, 0, 0) + "for query:" + q2.ToString());
 				}
 				
-				for (int hit = 0; hit < top2.TotalHits; hit++)
+				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++)
+					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)
 							{

Modified: incubator/lucene.net/trunk/C#/src/Test/Search/TestBooleanOr.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Search/TestBooleanOr.cs?rev=890203&r1=890202&r2=890203&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Search/TestBooleanOr.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Search/TestBooleanOr.cs Mon Dec 14 07:25:37 2009
@@ -47,7 +47,7 @@
 		private int Search(Query q)
 		{
 			QueryUtils.Check(q, searcher);
-			return searcher.Search(q, null, 1000).TotalHits;
+			return searcher.Search(q, null, 1000).totalHits;
 		}
 		
 		[Test]

Modified: incubator/lucene.net/trunk/C#/src/Test/Search/TestBooleanQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Search/TestBooleanQuery.cs?rev=890203&r1=890202&r2=890203&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Search/TestBooleanQuery.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Search/TestBooleanQuery.cs Mon Dec 14 07:25:37 2009
@@ -89,7 +89,7 @@
 			// PhraseQuery w/ no terms added returns a null scorer
 			PhraseQuery pq = new PhraseQuery();
 			q.Add(pq, BooleanClause.Occur.SHOULD);
-			Assert.AreEqual(1, s.Search(q, 10).TotalHits);
+			Assert.AreEqual(1, s.Search(q, 10).totalHits);
 			
 			// A required clause which returns null scorer should return null scorer to
 			// IndexSearcher.
@@ -97,12 +97,12 @@
 			pq = new PhraseQuery();
 			q.Add(new TermQuery(new Term("field", "a")), BooleanClause.Occur.SHOULD);
 			q.Add(pq, BooleanClause.Occur.MUST);
-			Assert.AreEqual(0, s.Search(q, 10).TotalHits);
+			Assert.AreEqual(0, s.Search(q, 10).totalHits);
 			
 			DisjunctionMaxQuery dmq = new DisjunctionMaxQuery(1.0f);
 			dmq.Add(new TermQuery(new Term("field", "a")));
 			dmq.Add(pq);
-			Assert.AreEqual(1, s.Search(dmq, 10).TotalHits);
+			Assert.AreEqual(1, s.Search(dmq, 10).totalHits);
 			
 			r.Close();
 			w.Close();

Modified: incubator/lucene.net/trunk/C#/src/Test/Search/TestBooleanScorer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Search/TestBooleanScorer.cs?rev=890203&r1=890202&r2=890203&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Search/TestBooleanScorer.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Search/TestBooleanScorer.cs Mon Dec 14 07:25:37 2009
@@ -132,7 +132,7 @@
 				query.Add(new TermQuery(new Term(FIELD, "9")), BooleanClause.Occur.MUST_NOT);
 				
 				IndexSearcher indexSearcher = new IndexSearcher(directory);
-				ScoreDoc[] hits = indexSearcher.Search(query, null, 1000).ScoreDocs;
+				ScoreDoc[] hits = indexSearcher.Search(query, null, 1000).scoreDocs;
 				Assert.AreEqual(2, hits.Length, "Number of matched documents");
 			}
 			catch (System.IO.IOException e)

Modified: incubator/lucene.net/trunk/C#/src/Test/Search/TestCustomSearcherSort.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Search/TestCustomSearcherSort.cs?rev=890203&r1=890202&r2=890203&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Search/TestCustomSearcherSort.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Search/TestCustomSearcherSort.cs Mon Dec 14 07:25:37 2009
@@ -140,7 +140,7 @@
 		private void  MatchHits(Searcher searcher, Sort sort)
 		{
 			// make a query without sorting first
-			ScoreDoc[] hitsByRank = searcher.Search(query, null, 1000).ScoreDocs;
+			ScoreDoc[] hitsByRank = searcher.Search(query, null, 1000).scoreDocs;
 			CheckHits(hitsByRank, "Sort by rank: "); // check for duplicates
 			System.Collections.IDictionary resultMap = new System.Collections.SortedList();
 			// store hits in TreeMap - TreeMap does not allow duplicates; existing entries are silently overwritten
@@ -150,7 +150,7 @@
 			}
 			
 			// now make a query using the sort criteria
-			ScoreDoc[] resultSort = searcher.Search(query, null, 1000, sort).ScoreDocs;
+			ScoreDoc[] resultSort = searcher.Search(query, null, 1000, sort).scoreDocs;
 			CheckHits(resultSort, "Sort by custom criteria: "); // check for duplicates
 			
 			// besides the sorting both sets of hits must be identical

Modified: incubator/lucene.net/trunk/C#/src/Test/Search/TestDateFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Search/TestDateFilter.cs?rev=890203&r1=890202&r2=890203&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Search/TestDateFilter.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Search/TestDateFilter.cs Mon Dec 14 07:25:37 2009
@@ -77,24 +77,24 @@
 			ScoreDoc[] result;
 			
 			// ensure that queries return expected results without DateFilter first
-			result = searcher.Search(query1, null, 1000).ScoreDocs;
+			result = searcher.Search(query1, null, 1000).scoreDocs;
 			Assert.AreEqual(0, result.Length);
 			
-			result = searcher.Search(query2, null, 1000).ScoreDocs;
+			result = searcher.Search(query2, null, 1000).scoreDocs;
 			Assert.AreEqual(1, result.Length);
 			
 			
 			// run queries with DateFilter
-			result = searcher.Search(query1, df1, 1000).ScoreDocs;
+			result = searcher.Search(query1, df1, 1000).scoreDocs;
 			Assert.AreEqual(0, result.Length);
 			
-			result = searcher.Search(query1, df2, 1000).ScoreDocs;
+			result = searcher.Search(query1, df2, 1000).scoreDocs;
 			Assert.AreEqual(0, result.Length);
 			
-			result = searcher.Search(query2, df1, 1000).ScoreDocs;
+			result = searcher.Search(query2, df1, 1000).scoreDocs;
 			Assert.AreEqual(1, result.Length);
 			
-			result = searcher.Search(query2, df2, 1000).ScoreDocs;
+			result = searcher.Search(query2, df2, 1000).scoreDocs;
 			Assert.AreEqual(0, result.Length);
 		}
 		
@@ -134,24 +134,24 @@
 			ScoreDoc[] result;
 			
 			// ensure that queries return expected results without DateFilter first
-			result = searcher.Search(query1, null, 1000).ScoreDocs;
+			result = searcher.Search(query1, null, 1000).scoreDocs;
 			Assert.AreEqual(0, result.Length);
 			
-			result = searcher.Search(query2, null, 1000).ScoreDocs;
+			result = searcher.Search(query2, null, 1000).scoreDocs;
 			Assert.AreEqual(1, result.Length);
 			
 			
 			// run queries with DateFilter
-			result = searcher.Search(query1, df1, 1000).ScoreDocs;
+			result = searcher.Search(query1, df1, 1000).scoreDocs;
 			Assert.AreEqual(0, result.Length);
 			
-			result = searcher.Search(query1, df2, 1000).ScoreDocs;
+			result = searcher.Search(query1, df2, 1000).scoreDocs;
 			Assert.AreEqual(0, result.Length);
 			
-			result = searcher.Search(query2, df1, 1000).ScoreDocs;
+			result = searcher.Search(query2, df1, 1000).scoreDocs;
 			Assert.AreEqual(1, result.Length);
 			
-			result = searcher.Search(query2, df2, 1000).ScoreDocs;
+			result = searcher.Search(query2, df2, 1000).scoreDocs;
 			Assert.AreEqual(0, result.Length);
 		}
 	}

Modified: incubator/lucene.net/trunk/C#/src/Test/Search/TestDateSort.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Search/TestDateSort.cs?rev=890203&r1=890202&r2=890203&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Search/TestDateSort.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Search/TestDateSort.cs Mon Dec 14 07:25:37 2009
@@ -83,7 +83,7 @@
 			
 			// Execute the search and process the search results.
 			System.String[] actualOrder = new System.String[5];
-			ScoreDoc[] hits = searcher.Search(query, null, 1000, sort).ScoreDocs;
+			ScoreDoc[] hits = searcher.Search(query, null, 1000, sort).scoreDocs;
 			for (int i = 0; i < hits.Length; i++)
 			{
 				Document document = searcher.Doc(hits[i].doc);

Modified: incubator/lucene.net/trunk/C#/src/Test/Search/TestDisjunctionMaxQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Search/TestDisjunctionMaxQuery.cs?rev=890203&r1=890202&r2=890203&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Search/TestDisjunctionMaxQuery.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Search/TestDisjunctionMaxQuery.cs Mon Dec 14 07:25:37 2009
@@ -185,7 +185,7 @@
 			q.Add(Tq("hed", "elephant"));
 			QueryUtils.Check(q, s);
 			
-			ScoreDoc[] h = s.Search(q, null, 1000).ScoreDocs;
+			ScoreDoc[] h = s.Search(q, null, 1000).scoreDocs;
 			
 			try
 			{
@@ -214,7 +214,7 @@
 			QueryUtils.Check(q, s);
 			
 			
-			ScoreDoc[] h = s.Search(q, null, 1000).ScoreDocs;
+			ScoreDoc[] h = s.Search(q, null, 1000).scoreDocs;
 			
 			try
 			{
@@ -244,7 +244,7 @@
 			QueryUtils.Check(q, s);
 			
 			
-			ScoreDoc[] h = s.Search(q, null, 1000).ScoreDocs;
+			ScoreDoc[] h = s.Search(q, null, 1000).scoreDocs;
 			
 			try
 			{
@@ -272,7 +272,7 @@
 			QueryUtils.Check(q, s);
 			
 			
-			ScoreDoc[] h = s.Search(q, null, 1000).ScoreDocs;
+			ScoreDoc[] h = s.Search(q, null, 1000).scoreDocs;
 			
 			try
 			{
@@ -313,7 +313,7 @@
 			
 			QueryUtils.Check(q, s);
 			
-			ScoreDoc[] h = s.Search(q, null, 1000).ScoreDocs;
+			ScoreDoc[] h = s.Search(q, null, 1000).scoreDocs;
 			
 			try
 			{
@@ -352,7 +352,7 @@
 			QueryUtils.Check(q, s);
 			
 			
-			ScoreDoc[] h = s.Search(q, null, 1000).ScoreDocs;
+			ScoreDoc[] h = s.Search(q, null, 1000).scoreDocs;
 			
 			try
 			{
@@ -395,7 +395,7 @@
 			QueryUtils.Check(q, s);
 			
 			
-			ScoreDoc[] h = s.Search(q, null, 1000).ScoreDocs;
+			ScoreDoc[] h = s.Search(q, null, 1000).scoreDocs;
 			
 			try
 			{
@@ -449,7 +449,7 @@
 			QueryUtils.Check(q, s);
 			
 			
-			ScoreDoc[] h = s.Search(q, null, 1000).ScoreDocs;
+			ScoreDoc[] h = s.Search(q, null, 1000).scoreDocs;
 			
 			try
 			{

Modified: incubator/lucene.net/trunk/C#/src/Test/Search/TestDocIdSet.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Search/TestDocIdSet.cs?rev=890203&r1=890202&r2=890203&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Search/TestDocIdSet.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Search/TestDocIdSet.cs Mon Dec 14 07:25:37 2009
@@ -235,12 +235,12 @@
 			
 			// First verify the document is searchable.
 			IndexSearcher searcher = new IndexSearcher(dir, true);
-			Assert.AreEqual(1, searcher.Search(new MatchAllDocsQuery(), 10).TotalHits);
+			Assert.AreEqual(1, searcher.Search(new MatchAllDocsQuery(), 10).totalHits);
 			
 			// Now search w/ a Filter which returns a null DocIdSet
 			Filter f = new AnonymousClassFilter(this);
 			
-			Assert.AreEqual(0, searcher.Search(new MatchAllDocsQuery(), f, 10).TotalHits);
+			Assert.AreEqual(0, searcher.Search(new MatchAllDocsQuery(), f, 10).totalHits);
 			searcher.Close();
 		}
 	}

Modified: incubator/lucene.net/trunk/C#/src/Test/Search/TestElevationComparator.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Search/TestElevationComparator.cs?rev=890203&r1=890202&r2=890203&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Search/TestElevationComparator.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Search/TestElevationComparator.cs Mon Dec 14 07:25:37 2009
@@ -78,23 +78,23 @@
 			searcher.Search(newq, null, topCollector);
 			
 			TopDocs topDocs = topCollector.TopDocs(0, 10);
-			int nDocsReturned = topDocs.ScoreDocs.Length;
+			int nDocsReturned = topDocs.scoreDocs.Length;
 			
 			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);
 			}
 			
 			/*



Mime
View raw message