Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove duplicate test code (#13982) 

The only diff between doIterate1  and doIterate2  is bb < b.length() in doIterate1 , but this condition is always true, so we should remove it
This commit is contained in:
Lu Xugang 2024-11-16 02:09:41 +08:00
parent 98918aa223
commit a5d44d89eb
2 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lucene/CHANGES.txt
View File

@ -85,7 +85,7 @@ Build
Other Other
--------------------- ---------------------
(No changes) * GITHUB#13982: Remove duplicate test code. (Lu Xugang)
======================== Lucene 10.0.1 ======================= ======================== Lucene 10.0.1 =======================

36
lucene/core/src/test/org/apache/lucene/util/TestFixedBitSet.java
View File

@ -98,26 +98,7 @@ public class TestFixedBitSet extends BaseBitSetTestCase<FixedBitSet> {
} }
// test interleaving different FixedBitSetIterator.next()/skipTo() // test interleaving different FixedBitSetIterator.next()/skipTo()
void doIterate(java.util.BitSet a, FixedBitSet b, int mode) throws IOException { void doIterate(java.util.BitSet a, FixedBitSet b) throws IOException {
if (mode == 1) doIterate1(a, b);
if (mode == 2) doIterate2(a, b);
}
void doIterate1(java.util.BitSet a, FixedBitSet b) throws IOException {
assertEquals(a.cardinality(), b.cardinality());
int aa = -1, bb = -1;
DocIdSetIterator iterator = new BitSetIterator(b, 0);
do {
aa = a.nextSetBit(aa + 1);
bb =
(bb < b.length() && random().nextBoolean())
? iterator.nextDoc()
: iterator.advance(bb + 1);
assertEquals(aa == -1 ? DocIdSetIterator.NO_MORE_DOCS : aa, bb);
} while (aa >= 0);
}
void doIterate2(java.util.BitSet a, FixedBitSet b) throws IOException {
assertEquals(a.cardinality(), b.cardinality()); assertEquals(a.cardinality(), b.cardinality());
int aa = -1, bb = -1; int aa = -1, bb = -1;
DocIdSetIterator iterator = new BitSetIterator(b, 0); DocIdSetIterator iterator = new BitSetIterator(b, 0);
@ -128,7 +109,7 @@ public class TestFixedBitSet extends BaseBitSetTestCase<FixedBitSet> {
} while (aa >= 0); } while (aa >= 0);
} }
void doRandomSets(int maxSize, int iter, int mode) throws IOException { void doRandomSets(int maxSize, int iter) throws IOException {
java.util.BitSet a0 = null; java.util.BitSet a0 = null;
FixedBitSet b0 = null; FixedBitSet b0 = null;
@ -181,7 +162,7 @@ public class TestFixedBitSet extends BaseBitSetTestCase<FixedBitSet> {
FixedBitSet bb = b.clone(); FixedBitSet bb = b.clone();
bb.flip(fromIndex, toIndex); bb.flip(fromIndex, toIndex);
doIterate(aa, bb, mode); // a problem here is from flip or doIterate doIterate(aa, bb); // a problem here is from flip or doIterate
fromIndex = random().nextInt(sz / 2); fromIndex = random().nextInt(sz / 2);
toIndex = fromIndex + random().nextInt(sz - fromIndex); toIndex = fromIndex + random().nextInt(sz - fromIndex);
@ -230,10 +211,10 @@ public class TestFixedBitSet extends BaseBitSetTestCase<FixedBitSet> {
assertEquals(a0.cardinality(), b0.cardinality()); assertEquals(a0.cardinality(), b0.cardinality());
assertEquals(a_or.cardinality(), b_or.cardinality()); assertEquals(a_or.cardinality(), b_or.cardinality());
doIterate(a_and, b_and, mode); doIterate(a_and, b_and);
doIterate(a_or, b_or, mode); doIterate(a_or, b_or);
doIterate(a_andn, b_andn, mode); doIterate(a_andn, b_andn);
doIterate(a_xor, b_xor, mode); doIterate(a_xor, b_xor);
assertEquals(a_and.cardinality(), b_and.cardinality()); assertEquals(a_and.cardinality(), b_and.cardinality());
assertEquals(a_or.cardinality(), b_or.cardinality()); assertEquals(a_or.cardinality(), b_or.cardinality());
@ -250,8 +231,7 @@ public class TestFixedBitSet extends BaseBitSetTestCase<FixedBitSet> {
// larger testsuite. // larger testsuite.
public void testSmall() throws IOException { public void testSmall() throws IOException {
final int iters = TEST_NIGHTLY ? atLeast(1000) : 100; final int iters = TEST_NIGHTLY ? atLeast(1000) : 100;
doRandomSets(atLeast(1200), iters, 1); doRandomSets(atLeast(1200), iters);
doRandomSets(atLeast(1200), iters, 2);
} }
// uncomment to run a bigger test (~2 minutes). // uncomment to run a bigger test (~2 minutes).