From aec489e80254bcf5d3300e60df568e5c83a11779 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Fri, 20 Mar 2020 19:03:44 +0100 Subject: Revert "Since the most important aspect our use of hash maps/sets is for spee…" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../documentdb/document_subdbs/document_subdbs_test.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp') diff --git a/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp b/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp index 11054566985..7139eb0d82d 100644 --- a/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp +++ b/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp @@ -447,8 +447,8 @@ void assertAttributes2(const AttributeGuardList &attributes) { EXPECT_EQUAL(2u, attributes.size()); - EXPECT_EQUAL("attr2", attributes[0]->getName()); - EXPECT_EQUAL("attr1", attributes[1]->getName()); + EXPECT_EQUAL("attr1", attributes[0]->getName()); + EXPECT_EQUAL("attr2", attributes[1]->getName()); } void @@ -544,7 +544,7 @@ requireThatAttributeManagerCanBeReconfigured(Fixture &f) f.basicReconfig(10); std::vector attributes; f.getAttributeManager()->getAttributeList(attributes); - TEST_DO(assertAttributes2(attributes)); + assertAttributes2(attributes); } TEST_F("require that attribute manager can be reconfigured", FastAccessFixture) @@ -791,13 +791,13 @@ assertAttribute(const AttributeGuard &attr, const vespalib::string &name, uint32 void assertAttribute1(const AttributeGuard &attr, SerialNum createSerialNum, SerialNum lastSerialNum) { - TEST_DO(assertAttribute(attr, "attr1", 3, 22, 44, createSerialNum, lastSerialNum)); + assertAttribute(attr, "attr1", 3, 22, 44, createSerialNum, lastSerialNum); } void assertAttribute2(const AttributeGuard &attr, SerialNum createSerialNum, SerialNum lastSerialNum) { - TEST_DO(assertAttribute(attr, "attr2", 3, 33, 55, createSerialNum, lastSerialNum)); + assertAttribute(attr, "attr2", 3, 33, 55, createSerialNum, lastSerialNum); } TEST_F("require that fast-access attributes are populated during feed", FastAccessOnlyFixture) @@ -833,8 +833,8 @@ requireThatAttributesArePopulatedDuringReprocessing(FixtureType &f) std::vector attrs; f.getAttributeManager()->getAttributeList(attrs); EXPECT_EQUAL(2u, attrs.size()); - TEST_DO(assertAttribute1(attrs[1], CFG_SERIAL, 40)); - TEST_DO(assertAttribute2(attrs[0], 40, 40)); + assertAttribute1(attrs[0], CFG_SERIAL, 40); + assertAttribute2(attrs[1], 40, 40); } } -- cgit v1.2.3