Merge pull request #30578 from vespa-engine/toregge/rewrite-searchcore-feed-token-unit-test-to-gtest

Rewrite searchcore FeedToken unit test to gtest.

2 files changed, 9 insertions, 31 deletions

diff --git a/searchcore/src/tests/proton/feedtoken/CMakeLists.txt b/searchcore/src/tests/proton/feedtoken/CMakeLists.txt
index 1a13e46eb41..8ddb3831c97 100644
--- a/searchcore/src/tests/proton/feedtoken/CMakeLists.txt
+++ b/searchcore/src/tests/proton/feedtoken/CMakeLists.txt
@@ -5,5 +5,6 @@ vespa_add_executable(searchcore_feedtoken_test_app TEST
     DEPENDS
     searchcore_pcommon
     searchcore_proton_metrics
+    GTest::gtest
 )
 vespa_add_test(NAME searchcore_feedtoken_test_app COMMAND searchcore_feedtoken_test_app)
diff --git a/searchcore/src/tests/proton/feedtoken/feedtoken_test.cpp b/searchcore/src/tests/proton/feedtoken/feedtoken_test.cpp
index c3c67e74c70..d3eb7d08821 100644
--- a/searchcore/src/tests/proton/feedtoken/feedtoken_test.cpp
+++ b/searchcore/src/tests/proton/feedtoken/feedtoken_test.cpp
@@ -1,6 +1,6 @@
 // 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/searchcore/proton/common/feedtoken.h>
+#include <vespa/vespalib/gtest/gtest.h>
 #include <vespa/vespalib/util/exceptions.h>
 
 using namespace proton;
@@ -21,47 +21,24 @@ public:
     size_t getReceivedCount() const { return _receivedCount; }
 };
 
-class Test : public vespalib::TestApp {
-private:
-    void testAck();
-    void testFail();
-    void testHandover();
-
-public:
-    int Main() override {
-        TEST_INIT("feedtoken_test");
-
-        testAck();       TEST_FLUSH();
-        testFail();      TEST_FLUSH();
-        testHandover();  TEST_FLUSH();
-
-        TEST_DONE();
-    }
-};
-
-TEST_APPHOOK(Test);
-
-void
-Test::testAck()
+TEST(FeedTokenTest, test_ack)
 {
     LocalTransport transport;
     {
         FeedToken token = feedtoken::make(transport);
     }
-    EXPECT_EQUAL(1u, transport.getReceivedCount());
+    EXPECT_EQ(1u, transport.getReceivedCount());
 }
 
-void
-Test::testFail()
+TEST(FeedTokenTest, test_fail)
 {
     LocalTransport transport;
     FeedToken token = feedtoken::make(transport);
     token->fail();
-    EXPECT_EQUAL(1u, transport.getReceivedCount());
+    EXPECT_EQ(1u, transport.getReceivedCount());
 }
 
-void
-Test::testHandover()
+TEST(FeedTokenTest, test_handover)
 {
     struct MyHandover {
         static FeedToken handover(FeedToken token) {
@@ -75,7 +52,7 @@ Test::testHandover()
         FeedToken token = feedtoken::make(transport);
         token = MyHandover::handover(token);
     }
-    EXPECT_EQUAL(1u, transport.getReceivedCount());
+    EXPECT_EQ(1u, transport.getReceivedCount());
 }
 
-
+GTEST_MAIN_RUN_ALL_TESTS()