svn commit: r1291511 - in /lucene/dev/branches/branch_3x/lucene/contrib/spellchecker: ./ src/test/org/apache/lucene/search/suggest/TestTermFreqIterator.java

[rm...@apache.org]

Author: rmuir
Date: Mon Feb 20 22:59:36 2012
New Revision: 1291511

URL: http://svn.apache.org/viewvc?rev=1291511&view=rev
Log:
add test for suggester iterators

Added:
    lucene/dev/branches/branch_3x/lucene/contrib/spellchecker/src/test/org/apache/lucene/search/suggest/TestTermFreqIterator.java
      - copied, changed from r1291502, lucene/dev/trunk/modules/suggest/src/test/org/apache/lucene/search/suggest/TestTermFreqIterator.java
Modified:
    lucene/dev/branches/branch_3x/lucene/contrib/spellchecker/   (props changed)

Copied: lucene/dev/branches/branch_3x/lucene/contrib/spellchecker/src/test/org/apache/lucene/search/suggest/TestTermFreqIterator.java (from r1291502, lucene/dev/trunk/modules/suggest/src/test/org/apache/lucene/search/suggest/TestTermFreqIterator.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/spellchecker/src/test/org/apache/lucene/search/suggest/TestTermFreqIterator.java?p2=lucene/dev/branches/branch_3x/lucene/contrib/spellchecker/src/test/org/apache/lucene/search/suggest/TestTermFreqIterator.java&p1=lucene/dev/trunk/modules/suggest/src/test/org/apache/lucene/search/suggest/TestTermFreqIterator.java&r1=1291502&r2=1291511&rev=1291511&view=diff
==============================================================================
--- lucene/dev/trunk/modules/suggest/src/test/org/apache/lucene/search/suggest/TestTermFreqIterator.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/spellchecker/src/test/org/apache/lucene/search/suggest/TestTermFreqIterator.java Mon Feb 20 22:59:36 2012
@@ -22,29 +22,28 @@ import java.util.Map;
 import java.util.TreeMap;
 
 import org.apache.lucene.search.spell.TermFreqIterator;
-import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.LuceneTestCase;
 import org.apache.lucene.util._TestUtil;
 
 public class TestTermFreqIterator extends LuceneTestCase {
   public void testEmpty() throws Exception {
     TermFreqArrayIterator iterator = new TermFreqArrayIterator(new TermFreq[0]);
-    TermFreqIterator wrapper = new SortedTermFreqIteratorWrapper(iterator, BytesRef.getUTF8SortedAsUnicodeComparator());
-    assertNull(wrapper.next());
+    TermFreqIterator wrapper = new SortedTermFreqIteratorWrapper(iterator);
+    assertFalse(wrapper.hasNext());
     wrapper = new UnsortedTermFreqIteratorWrapper(iterator);
-    assertNull(wrapper.next());
+    assertFalse(wrapper.hasNext());
   }
   
   public void testTerms() throws Exception {
     int num = atLeast(10000);
     
-    TreeMap<BytesRef,Float> sorted = new TreeMap<BytesRef,Float>();
+    TreeMap<String,Float> sorted = new TreeMap<String,Float>();
     TermFreq[] unsorted = new TermFreq[num];
 
     for (int i = 0; i < num; i++) {
-      BytesRef key;
+      String key;
       do {
-        key = new BytesRef(_TestUtil.randomUnicodeString(random));
+        key = _TestUtil.randomUnicodeString(random);
       } while (sorted.containsKey(key));
       float value = random.nextFloat();
       sorted.put(key, value);
@@ -52,23 +51,24 @@ public class TestTermFreqIterator extend
     }
     
     // test the sorted iterator wrapper
-    TermFreqIterator wrapper = new SortedTermFreqIteratorWrapper(new TermFreqArrayIterator(unsorted), BytesRef.getUTF8SortedAsUnicodeComparator());
-    Iterator<Map.Entry<BytesRef,Float>> expected = sorted.entrySet().iterator();
+    TermFreqIterator wrapper = new SortedTermFreqIteratorWrapper(new TermFreqArrayIterator(unsorted));
+    Iterator<Map.Entry<String,Float>> expected = sorted.entrySet().iterator();
     while (expected.hasNext()) {
-      Map.Entry<BytesRef,Float> entry = expected.next();
+      Map.Entry<String,Float> entry = expected.next();
       
+      assertTrue(wrapper.hasNext());
       assertEquals(entry.getKey(), wrapper.next());
       assertEquals(entry.getValue().floatValue(), wrapper.freq(), 0F);
     }
-    assertNull(wrapper.next());
+    assertFalse(wrapper.hasNext());
     
     // test the unsorted iterator wrapper
     wrapper = new UnsortedTermFreqIteratorWrapper(new TermFreqArrayIterator(unsorted));
-    TreeMap<BytesRef,Float> actual = new TreeMap<BytesRef,Float>();
-    BytesRef key;
-    while ((key = wrapper.next()) != null) {
+    TreeMap<String,Float> actual = new TreeMap<String,Float>();
+    while (wrapper.hasNext()) {
+      String key = wrapper.next();
       float value = wrapper.freq();
-      actual.put(BytesRef.deepCopyOf(key), value);
+      actual.put(key, value);
     }
     assertEquals(sorted, actual);
   }