summaryrefslogtreecommitdiffstats
path: root/searchlib/src/tests/engine
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-03-13 17:48:44 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2019-03-13 17:48:44 +0000
commitcd7ada2b6fa7afec39b6090b9b0d4f59ccd1419d (patch)
tree66f002b0a0f199e21b930c8547568344c53044b3 /searchlib/src/tests/engine
parent64b3ff5093cedb87fc3672368a9c28ad4a787d57 (diff)
Make it lazy and safe.
Diffstat (limited to 'searchlib/src/tests/engine')
-rw-r--r--searchlib/src/tests/engine/searchapi/searchapi_test.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/searchlib/src/tests/engine/searchapi/searchapi_test.cpp b/searchlib/src/tests/engine/searchapi/searchapi_test.cpp
index 28c90dd18ca..ed103bf501c 100644
--- a/searchlib/src/tests/engine/searchapi/searchapi_test.cpp
+++ b/searchlib/src/tests/engine/searchapi/searchapi_test.cpp
@@ -228,21 +228,18 @@ TEST("convertFromReply") {
}
}
-void verify(vespalib::stringref expected, const vespalib::Slime * slime) {
+void verify(vespalib::stringref expected, const vespalib::Slime & slime) {
vespalib::Slime expectedSlime;
vespalib::slime::JsonFormat::decode(expected, expectedSlime);
- if (slime) {
- EXPECT_EQUAL(expectedSlime, *slime);
- } else {
- EXPECT_TRUE(expected.empty());
- }
+ EXPECT_EQUAL(expectedSlime, slime);
}
TEST("verify trace") {
RelativeTime clock(std::make_unique<CountingClock>(fastos::TimeStamp::fromSec(1500000000), 1700000L));
Trace t(clock);
- verify("", t.getSlime());
+ EXPECT_FALSE(t.hasTrace());
t.start(0);
+ EXPECT_TRUE(t.hasTrace());
t.createCursor("tag_a");
verify("{"
" start_time_utc: '2017-07-14 02:40:00.000 UTC',"