svn commit: r1558100 - in /lucene/dev/trunk/lucene/suggest/src: java/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggester.java test/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggesterTest.java

[mi...@apache.org]

Author: mikemccand
Date: Tue Jan 14 16:31:55 2014
New Revision: 1558100

URL: http://svn.apache.org/r1558100
Log:
LUCENE-5354: BlendedInfixSuggester: fix wrong return (0 instead of -1) from the LookupResult comparator

Modified:
    lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggester.java
    lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggesterTest.java

Modified: lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggester.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggester.java?rev=1558100&r1=1558099&r2=1558100&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggester.java (original)
+++ lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggester.java Tue Jan 14 16:31:55 2014
@@ -276,7 +276,7 @@ public class BlendedInfixSuggester exten
       if (o1.value > o2.value) {
         return 1;
       } else if (o1.value < o2.value) {
-        return 0;
+        return -1;
       }
 
       // otherwise on alphabetic order

Modified: lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggesterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggesterTest.java?rev=1558100&r1=1558099&r2=1558100&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggesterTest.java (original)
+++ lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggesterTest.java Tue Jan 14 16:31:55 2014
@@ -136,7 +136,7 @@ public class BlendedInfixSuggesterTest e
     BytesRef ret = new BytesRef("ret");
 
     Input keys[] = new Input[]{
-        new Input("top of the lake", 15, lake),
+        new Input("top of the lake", 18, lake),
         new Input("star wars: episode v - the empire strikes back", 12, star),
         new Input("the returned", 10, ret),
     };
@@ -152,13 +152,19 @@ public class BlendedInfixSuggesterTest e
         return newFSDirectory(path);
       }
     };
+
     suggester.build(new InputArrayIterator(keys));
 
+
+    // we don't find it for in the 2 first
+    assertEquals(2, suggester.lookup("the", 2, true, false).size());
     long w0 = getInResults(suggester, "the", ret, 2);
-    assertTrue(w0 < 1);
+    assertTrue(w0 < 0);
 
+    // but it's there if we search for 3 elements
+    assertEquals(3, suggester.lookup("the", 3, true, false).size());
     long w1 = getInResults(suggester, "the", ret, 3);
-    assertTrue(w1 > 1);
+    assertTrue(w1 > 0);
 
     suggester.close();
 
@@ -172,11 +178,13 @@ public class BlendedInfixSuggesterTest e
     };
     suggester.build(new InputArrayIterator(keys));
 
+    // we have it
     long w2 = getInResults(suggester, "the", ret, 2);
-    assertTrue(w2 > 1);
+    assertTrue(w2 > 0);
 
+    // but we don't have the other
     long w3 = getInResults(suggester, "the", star, 2);
-    assertTrue(w3 < 1);
+    assertTrue(w3 < 0);
 
     suggester.close();
   }