svn commit: r1070243 - in /lucene/dev/branches/branch_3x: ./ lucene/ lucene/src/test/org/apache/lucene/index/TestStressAdvance.java solr/

[mi...@apache.org]

Author: mikemccand
Date: Sun Feb 13 14:33:09 2011
New Revision: 1070243

URL: http://svn.apache.org/viewvc?rev=1070243&view=rev
Log:
add test case to stress advance/next

Added:
    lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestStressAdvance.java
      - copied, changed from r1070240, lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressAdvance.java
Modified:
    lucene/dev/branches/branch_3x/   (props changed)
    lucene/dev/branches/branch_3x/lucene/   (props changed)
    lucene/dev/branches/branch_3x/solr/   (props changed)

Copied: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestStressAdvance.java (from r1070240, lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressAdvance.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestStressAdvance.java?p2=lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestStressAdvance.java&p1=lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressAdvance.java&r1=1070240&r2=1070243&rev=1070243&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressAdvance.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestStressAdvance.java Sun Feb 13 14:33:09 2011
@@ -66,19 +66,16 @@ public class TestStressAdvance extends L
           bDocIDs.add(docID);
         }
       }
-      final TermsEnum te = r.getSequentialSubReaders()[0].fields().terms("field").iterator();
+      final TermDocs de = r.termDocs();
       
-      DocsEnum de = null;
       for(int iter2=0;iter2<10;iter2++) {
         if (VERBOSE) {
           System.out.println("\nTEST: iter=" + iter + " iter2=" + iter2);
         }
-        assertEquals(TermsEnum.SeekStatus.FOUND, te.seek(new BytesRef("a")));
-        de = te.docs(null, de);
+        de.seek(new Term("field", "a"));
         testOne(de, aDocIDs);
 
-        assertEquals(TermsEnum.SeekStatus.FOUND, te.seek(new BytesRef("b")));
-        de = te.docs(null, de);
+        de.seek(new Term("field", "b"));
         testOne(de, bDocIDs);
       }
 
@@ -88,7 +85,7 @@ public class TestStressAdvance extends L
     }
   }
 
-  private void testOne(DocsEnum docs, List<Integer> expected) throws Exception {
+  private void testOne(TermDocs docs, List<Integer> expected) throws Exception {
     if (VERBOSE) {
       System.out.println("test");
     }
@@ -104,7 +101,11 @@ public class TestStressAdvance extends L
           System.out.println("    do nextDoc");
         }
         upto++;
-        docID = docs.nextDoc();
+        if (docs.next()) {
+          docID = docs.doc();
+        } else {
+          docID = -1;
+        }
       } else {
         // test advance()
         final int inc = _TestUtil.nextInt(random, 1, expected.size()-1-upto);
@@ -112,18 +113,22 @@ public class TestStressAdvance extends L
           System.out.println("    do advance inc=" + inc);
         }
         upto += inc;
-        docID = docs.advance(expected.get(upto));
+        if (docs.skipTo(expected.get(upto))) {
+          docID = docs.doc();
+        } else {
+          docID = -1;
+        }
       }
       if (upto == expected.size()) {
         if (VERBOSE) {
-          System.out.println("  expect docID=" + DocsEnum.NO_MORE_DOCS + " actual=" + docID);
+          System.out.println("  expect docID=" + -1 + " actual=" + docID);
         }
-        assertEquals(DocsEnum.NO_MORE_DOCS, docID);
+        assertEquals(-1, docID);
       } else {
         if (VERBOSE) {
           System.out.println("  expect docID=" + expected.get(upto) + " actual=" + docID);
         }
-        assertTrue(docID != DocsEnum.NO_MORE_DOCS);
+        assertTrue(docID != -1);
         assertEquals(expected.get(upto).intValue(), docID);
       }
     }