diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-02-02 01:13:10 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-02-03 14:51:08 +0100 |
commit | 6d4ed4f88706ee05b56096a86f473587f0e8e804 (patch) | |
tree | c2ea3484099c927825678d022cd4b4bc398330a2 /searchlib/src/tests/attribute/bitvector/bitvector_test.cpp | |
parent | 0cf5991a9f248f852d84ff0db34b5ac1fcac0361 (diff) |
Use one SearchIteratorVerifier where you overload create() and run verify().
Will go through all tests using InitRangeVerifier and swap in this one.
Diffstat (limited to 'searchlib/src/tests/attribute/bitvector/bitvector_test.cpp')
-rw-r--r-- | searchlib/src/tests/attribute/bitvector/bitvector_test.cpp | 55 |
1 files changed, 17 insertions, 38 deletions
diff --git a/searchlib/src/tests/attribute/bitvector/bitvector_test.cpp b/searchlib/src/tests/attribute/bitvector/bitvector_test.cpp index c528122aded..1eafefa5458 100644 --- a/searchlib/src/tests/attribute/bitvector/bitvector_test.cpp +++ b/searchlib/src/tests/attribute/bitvector/bitvector_test.cpp @@ -13,7 +13,7 @@ #include <vespa/searchlib/attribute/i_document_weight_attribute.h> #include <vespa/searchlib/queryeval/document_weight_search_iterator.h> #include <vespa/searchlib/test/initrange.h> -#include <vespa/searchlib/test/termwise.h> +#include <vespa/searchlib/test/searchiteratorverifier.h> #include <vespa/searchlib/common/bitvectoriterator.h> #include <vespa/searchlib/parsequery/parse.h> @@ -523,29 +523,17 @@ BitVectorTest::test(BasicType bt, template <typename VectorType, typename BufferType> void -BitVectorTest::test(BasicType bt, - CollectionType ct, - const vespalib::string &pref) -{ - LOG(info, - "test run, pref is %s", - pref.c_str()); - test<VectorType, BufferType>(bt, ct, pref, - false, false, false, false); - test<VectorType, BufferType>(bt, ct, pref, - false, false, false, true); - test<VectorType, BufferType>(bt, ct, pref, - true, false, false, false); - test<VectorType, BufferType>(bt, ct, pref, - true, false, false, true); - test<VectorType, BufferType>(bt, ct, pref, - true, true, false, false); - test<VectorType, BufferType>(bt, ct, pref, - true, true, false, true); - test<VectorType, BufferType>(bt, ct, pref, - true, true, true, false); - test<VectorType, BufferType>(bt, ct, pref, - true, true, true, true); +BitVectorTest::test(BasicType bt,CollectionType ct, const vespalib::string &pref) +{ + LOG(info, "test run, pref is %s", pref.c_str()); + test<VectorType, BufferType>(bt, ct, pref, false, false, false, false); + test<VectorType, BufferType>(bt, ct, pref, false, false, false, true); + test<VectorType, BufferType>(bt, ct, pref, true, false, false, false); + test<VectorType, BufferType>(bt, ct, pref, true, false, false, true); + test<VectorType, BufferType>(bt, ct, pref, true, true, false, false); + test<VectorType, BufferType>(bt, ct, pref, true, true, false, true); + test<VectorType, BufferType>(bt, ct, pref, true, true, true, false); + test<VectorType, BufferType>(bt, ct, pref, true, true, true, true); } @@ -621,18 +609,8 @@ TEST_F("Test bitvectors with weighted set value string", BitVectorTest) "string_ws"); } -TEST("Test bitvector iterators adheres to initRange") { - search::test::InitRangeVerifier initRangeTest; - BitVector::UP bv = BitVector::create(initRangeTest.getDocIdLimit()); - for (uint32_t docId: initRangeTest.getExpectedDocIds()) { - bv->setBit(docId); - } - TermFieldMatchData tfmd; - initRangeTest.verify(*BitVectorIterator::create(bv.get(), initRangeTest.getDocIdLimit(), tfmd, false)); - initRangeTest.verify(*BitVectorIterator::create(bv.get(), initRangeTest.getDocIdLimit(), tfmd, true)); -} -class Verifier : public search::test::TermwiseVerifier { +class Verifier : public search::test::SearchIteratorVerifier { public: Verifier() : _bv(BitVector::create(getDocIdLimit())) { for (uint32_t docId: getExpectedDocIds()) { @@ -648,9 +626,10 @@ private: mutable TermFieldMatchData _tfmd; BitVector::UP _bv; }; -TEST("Test bitvector iterators adheres to termwise search too") { - Verifier termwiseTest; - termwiseTest.verify(); + +TEST("Test bitvector iterators does not break SearchIterator requirements") { + Verifier searchIteratorVerifier; + searchIteratorVerifier.verify(); } |