You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2016/01/22 22:54:47 UTC

svn commit: r1726326 - in /lucene/dev/trunk: ./ lucene/ lucene/grouping/ lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java

Author: mikemccand
Date: Fri Jan 22 21:54:47 2016
New Revision: 1726326

URL: http://svn.apache.org/viewvc?rev=1726326&view=rev
Log:
fix test bug abusing hit score

Modified:
    lucene/dev/trunk/   (props changed)
    lucene/dev/trunk/lucene/   (props changed)
    lucene/dev/trunk/lucene/grouping/   (props changed)
    lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java

Modified: lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java?rev=1726326&r1=1726325&r2=1726326&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java (original)
+++ lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java Fri Jan 22 21:54:47 2016
@@ -771,18 +771,26 @@ public class TestGrouping extends Lucene
       
       final ShardState shards = new ShardState(s);
       
+      Set<Integer> seenIDs = new HashSet<>();
       for(int contentID=0;contentID<3;contentID++) {
         final ScoreDoc[] hits = s.search(new TermQuery(new Term("content", "real"+contentID)), numDocs).scoreDocs;
         for(ScoreDoc hit : hits) {
-          final GroupDoc gd = groupDocs[(int) docIDToID.get(hit.doc)];
+          int idValue = (int) docIDToID.get(hit.doc);
+
+          final GroupDoc gd = groupDocs[idValue];
+          seenIDs.add(idValue);
           assertTrue(gd.score == 0.0);
           gd.score = hit.score;
-          assertEquals(gd.id, docIDToID.get(hit.doc));
+          assertEquals(gd.id, idValue);
         }
       }
       
+      // make sure all groups were seen across the hits
+      assertEquals(groupDocs.length, seenIDs.size());
+
       for(GroupDoc gd : groupDocs) {
-        assertTrue(gd.score != 0.0);
+        assertTrue(Float.isFinite(gd.score));
+        assertTrue(gd.score >= 0.0);
       }
       
       // Build 2nd index, where docs are added in blocks by