Merge pull request #30575 from vespa-engine/toregge/rewrite-messagebus-timeout-unit-test-to-gtest

Rewrite messagebus timeout unit test to gtest.

2 files changed, 10 insertions, 29 deletions

diff --git a/messagebus/src/tests/timeout/CMakeLists.txt b/messagebus/src/tests/timeout/CMakeLists.txt
index 2292b6d649f..4aa3458cb14 100644
--- a/messagebus/src/tests/timeout/CMakeLists.txt
+++ b/messagebus/src/tests/timeout/CMakeLists.txt
@@ -5,5 +5,6 @@ vespa_add_executable(messagebus_timeout_test_app TEST
     DEPENDS
     messagebus_messagebus-test
     messagebus
+    GTest::gtest
 )
 vespa_add_test(NAME messagebus_timeout_test_app COMMAND messagebus_timeout_test_app)
diff --git a/messagebus/src/tests/timeout/timeout.cpp b/messagebus/src/tests/timeout/timeout.cpp
index 2ffdab11c40..497af9c5c0e 100644
--- a/messagebus/src/tests/timeout/timeout.cpp
+++ b/messagebus/src/tests/timeout/timeout.cpp
@@ -1,6 +1,5 @@
 // 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/errorcode.h>
 #include <vespa/messagebus/emptyreply.h>
 #include <vespa/messagebus/sourcesession.h>
@@ -11,33 +10,13 @@
 #include <vespa/messagebus/testlib/simplemessage.h>
 #include <vespa/messagebus/testlib/slobrok.h>
 #include <vespa/messagebus/testlib/testserver.h>
+#include <vespa/vespalib/gtest/gtest.h>
 
 using namespace mbus;
 using namespace std::chrono_literals;
 
 
-class Test : public vespalib::TestApp {
-public:
-    int Main() override;
-    void testZeroTimeout();
-    void testMessageExpires();
-};
-
-TEST_APPHOOK(Test);
-
-int
-Test::Main()
-{
-    TEST_INIT("timeout_test");
-
-    testZeroTimeout();    TEST_FLUSH();
-    testMessageExpires(); TEST_FLUSH();
-
-    TEST_DONE();
-}
-
-void
-Test::testZeroTimeout()
+TEST(TimeoutTest, test_zero_timeout)
 {
     Slobrok slobrok;
     TestServer srcServer(Identity("src"), RoutingSpec(), slobrok);
@@ -53,12 +32,11 @@ Test::testZeroTimeout()
 
     Reply::UP reply = srcHandler.getReply();
     ASSERT_TRUE(reply);
-    EXPECT_EQUAL(1u, reply->getNumErrors());
-    EXPECT_EQUAL((uint32_t)ErrorCode::TIMEOUT, reply->getError(0).getCode());
+    EXPECT_EQ(1u, reply->getNumErrors());
+    EXPECT_EQ((uint32_t)ErrorCode::TIMEOUT, reply->getError(0).getCode());
 }
 
-void
-Test::testMessageExpires()
+TEST(TimeoutTest, test_message_expires)
 {
     Slobrok slobrok;
     TestServer srcServer(Identity("src"), RoutingSpec(), slobrok);
@@ -73,11 +51,13 @@ Test::testMessageExpires()
 
     Reply::UP reply = srcHandler.getReply();
     ASSERT_TRUE(reply);
-    EXPECT_EQUAL(1u, reply->getNumErrors());
-    EXPECT_EQUAL((uint32_t)ErrorCode::TIMEOUT, reply->getError(0).getCode());
+    EXPECT_EQ(1u, reply->getNumErrors());
+    EXPECT_EQ((uint32_t)ErrorCode::TIMEOUT, reply->getError(0).getCode());
 
     Message::UP msg = dstHandler.getMessage(1s);
     if (msg) {
         msg->discard();
     }
 }
+
+GTEST_MAIN_RUN_ALL_TESTS()