diff options
author | Tor Egge <Tor.Egge@online.no> | 2024-03-11 15:35:07 +0100 |
---|---|---|
committer | Tor Egge <Tor.Egge@online.no> | 2024-03-11 15:35:07 +0100 |
commit | 294ab805c782752283e49b3a57ee8d0e7996deb7 (patch) | |
tree | c02f0b20fbc0c9a136daa127b433bcec6df42a90 /messagebus/src | |
parent | 8cc59f6509e649f4b6210cc23b07537718c3e81d (diff) |
Rewrite messagebus result unit test to gtest.
Diffstat (limited to 'messagebus/src')
-rw-r--r-- | messagebus/src/tests/result/CMakeLists.txt | 1 | ||||
-rw-r--r-- | messagebus/src/tests/result/result.cpp | 26 |
2 files changed, 12 insertions, 15 deletions
diff --git a/messagebus/src/tests/result/CMakeLists.txt b/messagebus/src/tests/result/CMakeLists.txt index 6aba63fdc41..d4360f3826b 100644 --- a/messagebus/src/tests/result/CMakeLists.txt +++ b/messagebus/src/tests/result/CMakeLists.txt @@ -5,5 +5,6 @@ vespa_add_executable(messagebus_result_test_app TEST DEPENDS messagebus_messagebus-test messagebus + GTest::gtest ) vespa_add_test(NAME messagebus_result_test_app COMMAND messagebus_result_test_app) diff --git a/messagebus/src/tests/result/result.cpp b/messagebus/src/tests/result/result.cpp index 4140e26db95..ce6e19b7dcb 100644 --- a/messagebus/src/tests/result/result.cpp +++ b/messagebus/src/tests/result/result.cpp @@ -1,13 +1,15 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/vespalib/testkit/testapp.h> #include <vespa/messagebus/result.h> #include <vespa/messagebus/error.h> #include <vespa/messagebus/errorcode.h> #include <vespa/messagebus/testlib/simplemessage.h> +#include <vespa/vespalib/gtest/gtest.h> using namespace mbus; +namespace { + struct MyMessage : public SimpleMessage { static int ctorCnt; @@ -22,28 +24,23 @@ struct MyMessage : public SimpleMessage int MyMessage::ctorCnt = 0; int MyMessage::dtorCnt = 0; -struct Test : public vespalib::TestApp -{ - Result sendOk(Message::UP msg); - Result sendFail(Message::UP msg); - int Main() override; -}; - Result -Test::sendOk(Message::UP msg) { +sendOk(Message::UP msg) +{ (void) msg; return Result(); } Result -Test::sendFail(Message::UP msg) { +sendFail(Message::UP msg) +{ return Result(Error(ErrorCode::FATAL_ERROR, "error"), std::move(msg)); } -int -Test::Main() +} + +TEST(ResultTest, test_result) { - TEST_INIT("result_test"); { // test accepted Message::UP msg(new MyMessage("test")); Result res = sendOk(std::move(msg)); @@ -68,7 +65,6 @@ Test::Main() } EXPECT_TRUE(MyMessage::ctorCnt == 2); EXPECT_TRUE(MyMessage::dtorCnt == 2); - TEST_DONE(); } -TEST_APPHOOK(Test); +GTEST_MAIN_RUN_ALL_TESTS() |