aboutsummaryrefslogtreecommitdiffstats
path: root/searchcore/src
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2020-03-20 21:51:55 +0100
committerGitHub <noreply@github.com>2020-03-20 21:51:55 +0100
commit677c69bd6d620c8e919aaad9b8297f15eb7e9865 (patch)
treeb550da38900253b64477792250323335b1c689da /searchcore/src
parent13c55e53d2f39fafc47f372c02127a01f7514d3b (diff)
Revert "Revert "Since the most important aspect our use of hash maps/sets is for spee…""
Diffstat (limited to 'searchcore/src')
-rw-r--r--searchcore/src/tests/proton/docsummary/docsummary.cpp4
-rw-r--r--searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp14
2 files changed, 9 insertions, 9 deletions
diff --git a/searchcore/src/tests/proton/docsummary/docsummary.cpp b/searchcore/src/tests/proton/docsummary/docsummary.cpp
index c15fd2ccfc1..3c3ff863345 100644
--- a/searchcore/src/tests/proton/docsummary/docsummary.cpp
+++ b/searchcore/src/tests/proton/docsummary/docsummary.cpp
@@ -774,8 +774,8 @@ Test::requireThatAttributesAreUsed()
"bd:[20,30],"
"be:[20.2,30.3],"
"bf:['bar','baz'],"
- "bg:[{item:50,weight:3},{item:40,weight:2}],"
- "bh:[{item:40.4,weight:4},{item:50.5,weight:5}],"
+ "bg:[document_sub{item:40,weight:2},{item:50,weight:3}],"
+ "bh:[{item:50.5,weight:5},{item:40.4,weight:4}],"
"bi:[{item:'quux',weight:7},{item:'qux',weight:6}],"
"bj:'0x01020178017901016601674008000000000000'}", *rep, 0, true));
TEST_DO(assertTensor(make_tensor(TensorSpec("tensor(x{},y{})")
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 7139eb0d82d..11054566985 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("attr1", attributes[0]->getName());
- EXPECT_EQUAL("attr2", attributes[1]->getName());
+ EXPECT_EQUAL("attr2", attributes[0]->getName());
+ EXPECT_EQUAL("attr1", attributes[1]->getName());
}
void
@@ -544,7 +544,7 @@ requireThatAttributeManagerCanBeReconfigured(Fixture &f)
f.basicReconfig(10);
std::vector<AttributeGuard> attributes;
f.getAttributeManager()->getAttributeList(attributes);
- assertAttributes2(attributes);
+ TEST_DO(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)
{
- assertAttribute(attr, "attr1", 3, 22, 44, createSerialNum, lastSerialNum);
+ TEST_DO(assertAttribute(attr, "attr1", 3, 22, 44, createSerialNum, lastSerialNum));
}
void
assertAttribute2(const AttributeGuard &attr, SerialNum createSerialNum, SerialNum lastSerialNum)
{
- assertAttribute(attr, "attr2", 3, 33, 55, createSerialNum, lastSerialNum);
+ TEST_DO(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<AttributeGuard> attrs;
f.getAttributeManager()->getAttributeList(attrs);
EXPECT_EQUAL(2u, attrs.size());
- assertAttribute1(attrs[0], CFG_SERIAL, 40);
- assertAttribute2(attrs[1], 40, 40);
+ TEST_DO(assertAttribute1(attrs[1], CFG_SERIAL, 40));
+ TEST_DO(assertAttribute2(attrs[0], 40, 40));
}
}