summaryrefslogtreecommitdiffstats
path: root/searchlib/src/tests/common/bitvector/bitvector_test.cpp
diff options
context:
space:
mode:
authorArne Juul <arnej@yahooinc.com>2023-01-23 21:56:51 +0000
committerArne Juul <arnej@yahooinc.com>2023-01-23 21:56:51 +0000
commit4b6f692bed109678f01b591f1a737f6d74775058 (patch)
tree6ea59d4ca175490d9c1217bf03e11fe7163dce1b /searchlib/src/tests/common/bitvector/bitvector_test.cpp
parenta69b9c38acebdbfd8240024601a9e61cc624605a (diff)
* use the sanitize range and check in "andWith" also
* verifyInclusiveStart is not needed now that we do range checks * the unit tests could only work in "/home/balder"
Diffstat (limited to 'searchlib/src/tests/common/bitvector/bitvector_test.cpp')
-rw-r--r--searchlib/src/tests/common/bitvector/bitvector_test.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/searchlib/src/tests/common/bitvector/bitvector_test.cpp b/searchlib/src/tests/common/bitvector/bitvector_test.cpp
index 9547e162c72..9afc4601801 100644
--- a/searchlib/src/tests/common/bitvector/bitvector_test.cpp
+++ b/searchlib/src/tests/common/bitvector/bitvector_test.cpp
@@ -304,9 +304,6 @@ TEST("requireThatSequentialOperationsOnPartialWorks")
PartialBitVector after(1000, 1100);
after.setInterval(1000, 1100);
- EXPECT_EXCEPTION(p2.orWith(after), vespalib::IllegalArgumentException,
- "IllegalArgumentException: [717, 919] starts before which is not allowed currently [1000, 1100] at "
- "verifyInclusiveStart in /home/balder/git/vespa/searchlib/src/vespa/searchlib/common/bitvector.cpp:33");
EXPECT_EQUAL(202u, p2.countTrueBits());
}
@@ -365,9 +362,13 @@ verifyNonOverlappingWorksAsZeroPadded(bool clear, Func func) {
BitVector::UP right = createEveryNthBitSet(3, 2000, 100);
EXPECT_EQUAL(CNT, left->countTrueBits());
EXPECT_EQUAL(CNT, right->countTrueBits());
- EXPECT_EXCEPTION(func(*left, *right), vespalib::IllegalArgumentException,
- "IllegalArgumentException: [1000, 1100] starts before which is not allowed currently [2000, 2100] at "
- "verifyInclusiveStart in /home/balder/git/vespa/searchlib/src/vespa/searchlib/common/bitvector.cpp:33");
+ func(*left, *right);
+ EXPECT_EQUAL(clear ? 0 : CNT, left->countTrueBits());
+ EXPECT_EQUAL(CNT, right->countTrueBits());
+ left = createEveryNthBitSet(3, 1000, 100);
+ right = createEveryNthBitSet(3, 2000, 100);
+ EXPECT_EQUAL(CNT, left->countTrueBits());
+ EXPECT_EQUAL(CNT, right->countTrueBits());
func(*right, *left);
EXPECT_EQUAL(CNT, left->countTrueBits());
EXPECT_EQUAL(clear ? 0 : CNT, right->countTrueBits());