svn commit: r440369 - in /incubator/solr/trunk/src: java/org/apache/solr/util/BitSetIterator.java test/org/apache/solr/util/TestOpenBitSet.java

[yonik]

Author: yonik
Date: Tue Sep  5 08:23:18 2006
New Revision: 440369

URL: http://svn.apache.org/viewvc?view=rev&rev=440369
Log:
BitSetIterator.next(int startFrom) public, add test

Modified:
    incubator/solr/trunk/src/java/org/apache/solr/util/BitSetIterator.java
    incubator/solr/trunk/src/test/org/apache/solr/util/TestOpenBitSet.java

Modified: incubator/solr/trunk/src/java/org/apache/solr/util/BitSetIterator.java
URL: 
http://svn.apache.org/viewvc/incubator/solr/trunk/src/java/org/apache/solr/util/BitSetIterator.java?view=diff&rev=440369&r1=440368&r2=440369
==============================================================================
--- incubator/solr/trunk/src/java/org/apache/solr/util/BitSetIterator.java 
(original)
+++ incubator/solr/trunk/src/java/org/apache/solr/util/BitSetIterator.java Tue 
Sep  5 08:23:18 2006
@@ -108,7 +108,7 @@
     return (i<<6) + bitIndex;
   }
 
-  int next(int fromIndex) {
+  public int next(int fromIndex) {
     indexArray=0;
     i = fromIndex >> 6;
     if (i>=words) {

Modified: incubator/solr/trunk/src/test/org/apache/solr/util/TestOpenBitSet.java
URL: 
http://svn.apache.org/viewvc/incubator/solr/trunk/src/test/org/apache/solr/util/TestOpenBitSet.java?view=diff&rev=440369&r1=440368&r2=440369
==============================================================================
--- incubator/solr/trunk/src/test/org/apache/solr/util/TestOpenBitSet.java 
(original)
+++ incubator/solr/trunk/src/test/org/apache/solr/util/TestOpenBitSet.java Tue 
Sep  5 08:23:18 2006
@@ -30,12 +30,16 @@
     } while (aa>=0);
   }
 
+  // test interleaving different BitSetIterator.next()
   void doIterate(BitSet a, OpenBitSet b) {
     int aa=-1,bb=-1;
     BitSetIterator iterator = new BitSetIterator(b);
     do {
       aa = a.nextSetBit(aa+1);
-      bb = iterator.next();
+      if (rand.nextBoolean())
+        bb = iterator.next();
+      else
+        bb = iterator.next(bb+1);
       assertEquals(aa,bb);
     } while (aa>=0);
   }