diff options
Diffstat (limited to 'searchlib/src/tests/common/packets/packets_test.cpp')
-rw-r--r-- | searchlib/src/tests/common/packets/packets_test.cpp | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/searchlib/src/tests/common/packets/packets_test.cpp b/searchlib/src/tests/common/packets/packets_test.cpp index c4da5ca4873..ad4cf02f4e8 100644 --- a/searchlib/src/tests/common/packets/packets_test.cpp +++ b/searchlib/src/tests/common/packets/packets_test.cpp @@ -2,7 +2,6 @@ #include <vespa/searchlib/common/mapnames.h> #include <vespa/searchlib/common/packets.h> -#include <vector> #include <vespa/vespalib/testkit/testapp.h> #include <vespa/vespalib/util/stringfmt.h> #include <vespa/fnet/controlpacket.h> @@ -10,15 +9,6 @@ using namespace search::fs4transport; using vespalib::compression::CompressionConfig; - -// ---------------------------------------------------------------------------- -// -// Utilities -// -// ---------------------------------------------------------------------------- - -#define QRF_RANKTYPE QRF_RANKTYPE_DOUBLE - #define PCODE_BEGIN PCODE_EOL #define PCODE_END PCODE_LastCode @@ -59,7 +49,7 @@ testEncodeDecode(FS4PersistentPacketStreamer &streamer, FNET_Packet &packet) EXPECT_EQUAL(myStreamer.getChannelId(pcode, 1u), chid); FNET_Packet *ret = streamer.Decode(&buf, plen, pcode, ctx); - ASSERT_TRUE(ret); + assert(ret); if (ret->GetPCODE() == (pcode & PCODE_MASK)) { FNET_DataBuffer rhs; streamer.Encode(ret, 1u, &rhs); @@ -325,6 +315,10 @@ TEST("testQueryResultX") { src->setDistributionKey(4u); src->_coverageDocs = 6u; src->_activeDocs = 7u; + src->_soonActiveDocs = 8; + src->_coverageDegradeReason = 0x17; + src->setNodesQueried(12); + src->setNodesReplied(11); uint32_t sortIndex[3] = { 0u, 1u, 3u /* size of data */}; // numDocs + 1 src->SetSortDataRef(2, sortIndex, "foo"); src->SetGroupDataRef("baz", 3u); @@ -358,8 +352,12 @@ TEST("testQueryResultX") { EXPECT_EQUAL(2u, ptr->_totNumDocs); EXPECT_EQUAL((search::HitRank)3, ptr->_maxRank); EXPECT_EQUAL(4u, ptr->getDistributionKey()); - EXPECT_EQUAL(ptr->_features & QRF_COVERAGE ? 6u : 0u, ptr->_coverageDocs); - EXPECT_EQUAL(ptr->_features & QRF_COVERAGE ? 7u : 0u, ptr->_activeDocs); + EXPECT_EQUAL(ptr->_features & QRF_COVERAGE_NODES ? 12 : 0u, ptr->getNodesQueried()); + EXPECT_EQUAL(ptr->_features & QRF_COVERAGE_NODES ? 11 : 0u, ptr->getNodesReplied()); + EXPECT_EQUAL(6u, ptr->_coverageDocs); + EXPECT_EQUAL(7u, ptr->_activeDocs); + EXPECT_EQUAL(8u, ptr->_soonActiveDocs); + EXPECT_EQUAL(0x17u, ptr->_coverageDegradeReason); if (ptr->_features & QRF_SORTDATA) { EXPECT_EQUAL(0u, ptr->_sortIndex[0]); EXPECT_EQUAL(1u, ptr->_sortIndex[1]); |