svn commit: r1201287 - /lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java

[rm...@apache.org]

Author: rmuir
Date: Sat Nov 12 17:35:03 2011
New Revision: 1201287

URL: http://svn.apache.org/viewvc?rev=1201287&view=rev
Log:
LUCENE-2621: cut over test

Modified:
    lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java

Modified: lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java?rev=1201287&r1=1201286&r2=1201287&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java (original)
+++ lucene/dev/branches/lucene2621/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java Sat Nov 12 17:35:03 2011
@@ -24,15 +24,19 @@ import org.apache.lucene.analysis.core.L
 import org.apache.lucene.analysis.standard.StandardFilter;
 import org.apache.lucene.analysis.standard.StandardTokenizer;
 import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
+import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
 import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
 import org.apache.lucene.document.FieldType;
 import org.apache.lucene.document.TextField;
+import org.apache.lucene.index.DocsAndPositionsEnum;
+import org.apache.lucene.index.DocsEnum;
+import org.apache.lucene.index.Fields;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.TermPositionVector;
-import org.apache.lucene.index.TermVectorOffsetInfo;
+import org.apache.lucene.index.Terms;
+import org.apache.lucene.index.TermsEnum;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.util.AttributeSource;
 import org.apache.lucene.util.English;
@@ -102,12 +106,22 @@ public class TestTeeSinkTokenFilter exte
     w.close();
 
     IndexReader r = IndexReader.open(dir, true);
-    TermVectorOffsetInfo[] termOffsets = ((TermPositionVector) r.getTermFreqVector(0, "field")).getOffsets(0);
-    assertEquals(2, termOffsets.length);
-    assertEquals(0, termOffsets[0].getStartOffset());
-    assertEquals(4, termOffsets[0].getEndOffset());
-    assertEquals(8, termOffsets[1].getStartOffset());
-    assertEquals(12, termOffsets[1].getEndOffset());
+    Terms vector = r.getTermVectors(0).terms("field");
+    assertEquals(1, vector.getUniqueTermCount());
+    TermsEnum termsEnum = vector.iterator();
+    termsEnum.next();
+    assertEquals(2, termsEnum.totalTermFreq());
+    DocsAndPositionsEnum positions = termsEnum.docsAndPositions(null, null);
+    OffsetAttribute offsetAtt = positions.attributes().getAttribute(OffsetAttribute.class);
+    assertTrue(positions.nextDoc() != DocsEnum.NO_MORE_DOCS);
+    assertEquals(2, positions.freq());
+    positions.nextPosition();
+    assertEquals(0, offsetAtt.startOffset());
+    assertEquals(4, offsetAtt.endOffset());
+    positions.nextPosition();
+    assertEquals(8, offsetAtt.startOffset());
+    assertEquals(12, offsetAtt.endOffset());
+    assertEquals(DocsEnum.NO_MORE_DOCS, positions.nextDoc());
     r.close();
     dir.close();
   }