diff options
| author | Henning Baldersheim <balder@oath.com> | 2018-02-09 09:58:47 +0100 |
|---|---|---|
| committer | Henning Baldersheim <balder@oath.com> | 2018-02-09 09:58:47 +0100 |
| commit | e5bddcb27e266d6545775843eeca617306de5ff6 (patch) | |
| tree | a9704bbc5a9ca246dd98f6d938aa99245c31f075 /searchlib/src/tests | |
| parent | 3e349b470c968586116245ef9a8719002cdf47b7 (diff) | |
Ensure that we filter and QFLAGS and do not automatically say we have the same capabilities as our master.
Diffstat (limited to 'searchlib/src/tests')
| -rw-r--r-- | searchlib/src/tests/common/packets/packets_test.cpp | 4 | ||||
| -rw-r--r-- | searchlib/src/tests/engine/searchapi/searchapi_test.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/searchlib/src/tests/common/packets/packets_test.cpp b/searchlib/src/tests/common/packets/packets_test.cpp index ad4cf02f4e8..060a07dcdac 100644 --- a/searchlib/src/tests/common/packets/packets_test.cpp +++ b/searchlib/src/tests/common/packets/packets_test.cpp @@ -398,7 +398,7 @@ createAndFill_QUERYX() EXPECT_EQUAL(0l, src->getTimeout()); src->setTimeout(fastos::TimeStamp(4*fastos::TimeStamp::MS)); EXPECT_EQUAL(fastos::TimeStamp(4*fastos::TimeStamp::MS), src->getTimeout()); - src->_qflags = 5u; + src->setQueryFlags(5u); src->setRanking("seven"); src->_numStackItems = 14u; src->_propsVector.resize(2); @@ -419,7 +419,7 @@ verifyQueryX(FS4Packet_QUERYX & queryX, uint32_t features) EXPECT_EQUAL(2u, queryX._offset); EXPECT_EQUAL(3u, queryX._maxhits); EXPECT_EQUAL(fastos::TimeStamp(4*fastos::TimeStamp::MS), queryX.getTimeout()); - EXPECT_EQUAL(0x5u, queryX._qflags); + EXPECT_EQUAL(0x1u, queryX.getQueryFlags()); //Filtered if (queryX._features & QF_RANKP) { EXPECT_EQUAL("seven", queryX._ranking); } else { diff --git a/searchlib/src/tests/engine/searchapi/searchapi_test.cpp b/searchlib/src/tests/engine/searchapi/searchapi_test.cpp index 3e8be3a99fc..a517890620c 100644 --- a/searchlib/src/tests/engine/searchapi/searchapi_test.cpp +++ b/searchlib/src/tests/engine/searchapi/searchapi_test.cpp @@ -54,7 +54,7 @@ Test::convertToRequest() src._offset = 2u; src._maxhits = 3u; src.setTimeout(fastos::TimeStamp(4*fastos::TimeStamp::MS)); - src._qflags = 5u; + src.setQueryFlags(5u); src._features |= QF_RANKP; src.setRanking("seven"); src._features |= QF_PROPERTIES; @@ -92,7 +92,7 @@ Test::convertToRequest() EXPECT_EQUAL(dst.offset, 2u); EXPECT_EQUAL(dst.maxhits, 3u); EXPECT_EQUAL((dst.getTimeOfDoom() - dst.getStartTime()).ms(), 4u); - EXPECT_EQUAL(dst.queryFlags, 5u); + EXPECT_EQUAL(dst.queryFlags, 1u); //Filtered EXPECT_EQUAL(vespalib::string("seven"), dst.ranking); EXPECT_EQUAL(dst.propertiesMap.size(), 2u); EXPECT_EQUAL(dst.propertiesMap.featureOverrides().lookup("p1k1").get(), std::string("p1v1")); |