svn commit: r1459156 - in /lucene/dev/branches/branch_4x: ./ lucene/ lucene/core/ lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java

[rm...@apache.org]

Author: rmuir
Date: Thu Mar 21 05:26:47 2013
New Revision: 1459156

URL: http://svn.apache.org/r1459156
Log:
make sure the simple tests run against both cases

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/lucene/core/   (props changed)
    lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java

Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java?rev=1459156&r1=1459155&r2=1459156&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java Thu Mar 21 05:26:47 2013
@@ -85,12 +85,22 @@ public class TestBooleanMinShouldMatch e
 
 
     public void verifyNrHits(Query q, int expected) throws Exception {
+        // bs1
         ScoreDoc[] h = s.search(q, null, 1000).scoreDocs;
         if (expected != h.length) {
             printHits(getTestName(), h, s);
         }
         assertEquals("result count", expected, h.length);
         //System.out.println("TEST: now check");
+        // bs2
+        TopScoreDocCollector collector = TopScoreDocCollector.create(1000, true);
+        s.search(q, collector);
+        ScoreDoc[] h2 = collector.topDocs().scoreDocs;
+        if (expected != h2.length) {
+          printHits(getTestName(), h2, s);
+        }
+        assertEquals("result count (bs2)", expected, h2.length);
+
         QueryUtils.check(random(), q,s);
     }