svn commit: r922984 - in /lucene/solr/branches/solr/src/java/org/apache/solr/tst: OldRequestHandler.java TestRequestHandler.java

[ma...@apache.org]

Author: markrmiller
Date: Sun Mar 14 22:24:06 2010
New Revision: 922984

URL: http://svn.apache.org/viewvc?rev=922984&view=rev
Log:
fix a couple tests

Modified:
    lucene/solr/branches/solr/src/java/org/apache/solr/tst/OldRequestHandler.java
    lucene/solr/branches/solr/src/java/org/apache/solr/tst/TestRequestHandler.java

Modified: lucene/solr/branches/solr/src/java/org/apache/solr/tst/OldRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/solr/src/java/org/apache/solr/tst/OldRequestHandler.java?rev=922984&r1=922983&r2=922984&view=diff
==============================================================================
--- lucene/solr/branches/solr/src/java/org/apache/solr/tst/OldRequestHandler.java (original)
+++ lucene/solr/branches/solr/src/java/org/apache/solr/tst/OldRequestHandler.java Sun Mar 14 22:24:06 2010
@@ -68,9 +68,21 @@ public class OldRequestHandler implement
 
 
     try {
-      TopFieldDocs hits = req.getSearcher().search(query,filter, req.getStart()+req.getLimit(), sort);
 
-      int numHits = hits.totalHits;
+      int numHits;
+      ScoreDoc[] scoreDocs;
+      if (sort != null) {
+        TopFieldDocs hits = req.getSearcher().search(query, filter,
+            req.getStart() + req.getLimit(), sort);
+        scoreDocs = hits.scoreDocs;
+        numHits = hits.totalHits;
+      } else {
+        TopDocs hits = req.getSearcher().search(query, filter,
+            req.getStart() + req.getLimit());
+        scoreDocs = hits.scoreDocs;
+        numHits = hits.totalHits;
+      }
+
       int startRow = Math.min(numHits, req.getStart());
       int endRow = Math.min(numHits,req.getStart()+req.getLimit());
       int numRows = endRow-startRow;
@@ -78,7 +90,7 @@ public class OldRequestHandler implement
       int[] ids = new int[numRows];
       Document[] data = new Document[numRows];
       for (int i=startRow; i<endRow; i++) {
-        ids[i] = hits.scoreDocs[i].doc;
+        ids[i] = scoreDocs[i].doc;
         data[i] = req.getSearcher().doc(ids[i]);
       }
 

Modified: lucene/solr/branches/solr/src/java/org/apache/solr/tst/TestRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/solr/src/java/org/apache/solr/tst/TestRequestHandler.java?rev=922984&r1=922983&r2=922984&view=diff
==============================================================================
--- lucene/solr/branches/solr/src/java/org/apache/solr/tst/TestRequestHandler.java (original)
+++ lucene/solr/branches/solr/src/java/org/apache/solr/tst/TestRequestHandler.java Sun Mar 14 22:24:06 2010
@@ -169,11 +169,22 @@ public class TestRequestHandler implemen
       // System.out.println("limit="+limit+" results.size()="+results.size()+" matches="+results.matches());
       test((start==0 && limit>=results.matches()) ? results.size()==results.matches() : true );
 
+    
       //
       // test against hits
       //
-      TopFieldDocs hits = searcher.search(query, lfilter, 1000, sort);
-      test(hits.totalHits == results.matches());
+      int numHits;
+      ScoreDoc[] scoreDocs;
+      if (sort != null) {
+        TopFieldDocs hits = searcher.search(query, lfilter, 1000, sort);
+        numHits = hits.totalHits;
+        scoreDocs = hits.scoreDocs;
+      } else {
+        TopDocs hits = searcher.search(query, lfilter, 1000);
+        numHits = hits.totalHits;
+        scoreDocs = hits.scoreDocs;
+      }
+      test(numHits == results.matches());
 
 
       DocList rrr2 = results.subset(start,limit);
@@ -189,7 +200,7 @@ public class TestRequestHandler implemen
       ***/
 
       for (int i=0; i<results.size(); i++) {
-        test( iter.nextDoc() == hits.scoreDocs[i].doc);
+        test( iter.nextDoc() == scoreDocs[i].doc);
 
         // Document doesn't implement equals()
         // test( searcher.document(i).equals(hits.doc(i)));