Index: lucene/test-framework/src/java/org/apache/lucene/search/AssertingIndexSearcher.java
===================================================================
--- lucene/test-framework/src/java/org/apache/lucene/search/AssertingIndexSearcher.java	(revision 1470728)
+++ lucene/test-framework/src/java/org/apache/lucene/search/AssertingIndexSearcher.java	(working copy)
@@ -90,7 +90,8 @@
 
   @Override
   protected void search(List<AtomicReaderContext> leaves, Weight weight, Collector collector) throws IOException {
-    super.search(leaves, AssertingWeight.wrap(random, weight), collector);
+    super.search(leaves, AssertingWeight.wrap(random, weight), AssertingCollector.wrap(random, collector, !weight.scoresDocsOutOfOrder()));
+    //    super.search(leaves, AssertingWeight.wrap(random, weight), collector);
   }
 
   @Override
Index: lucene/test-framework/src/java/org/apache/lucene/search/AssertingCollector.java
===================================================================
--- lucene/test-framework/src/java/org/apache/lucene/search/AssertingCollector.java	(revision 1470728)
+++ lucene/test-framework/src/java/org/apache/lucene/search/AssertingCollector.java	(working copy)
@@ -60,6 +60,7 @@
   @Override
   public void setNextReader(AtomicReaderContext context) throws IOException {
     lastCollected = -1;
+    in.setNextReader(context);
   }
 
   @Override
Index: lucene/core/src/java/org/apache/lucene/search/BooleanScorer.java
===================================================================
--- lucene/core/src/java/org/apache/lucene/search/BooleanScorer.java	(revision 1470728)
+++ lucene/core/src/java/org/apache/lucene/search/BooleanScorer.java	(working copy)
@@ -115,7 +115,7 @@
   private static final class BucketScorer extends Scorer {
 
     double score;
-    int doc = NO_MORE_DOCS;
+    int doc = -1;
     int freq;
     
     public BucketScorer(Weight weight) { super(weight); }