Merge pull request #31513 from vespa-engine/toregge/rewrite-query-wrapper-unit-test-to-gtest

Rewrite query wrapper unit test to gtest.

2 files changed, 7 insertions, 26 deletions

diff --git a/streamingvisitors/src/tests/querywrapper/CMakeLists.txt b/streamingvisitors/src/tests/querywrapper/CMakeLists.txt
index 9fa9f75f047..1acd513f952 100644
--- a/streamingvisitors/src/tests/querywrapper/CMakeLists.txt
+++ b/streamingvisitors/src/tests/querywrapper/CMakeLists.txt
@@ -4,5 +4,6 @@ vespa_add_executable(streamingvisitors_querywrapper_test_app TEST
     querywrapper_test.cpp
     DEPENDS
     streamingvisitors
+    GTest::gtest
 )
 vespa_add_test(NAME streamingvisitors_querywrapper_test_app COMMAND streamingvisitors_querywrapper_test_app)
diff --git a/streamingvisitors/src/tests/querywrapper/querywrapper_test.cpp b/streamingvisitors/src/tests/querywrapper/querywrapper_test.cpp
index 2a4b9e1f869..6deb0d4cda4 100644
--- a/streamingvisitors/src/tests/querywrapper/querywrapper_test.cpp
+++ b/streamingvisitors/src/tests/querywrapper/querywrapper_test.cpp
@@ -1,10 +1,10 @@
 // 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/searchlib/query/tree/querybuilder.h>
 #include <vespa/searchlib/query/tree/simplequery.h>
 #include <vespa/searchlib/query/tree/stackdumpcreator.h>
 #include <vespa/searchvisitor/querywrapper.h>
+#include <vespa/vespalib/gtest/gtest.h>
 #include <iostream>
 
 using namespace search;
@@ -13,17 +13,7 @@ using namespace search::streaming;
 
 namespace streaming {
 
-class QueryWrapperTest : public vespalib::TestApp
-{
-private:
-    void testQueryWrapper();
-
-public:
-    int Main() override;
-};
-
-void
-QueryWrapperTest::testQueryWrapper()
+TEST(QueryWrapperTest, test_query_wrapper)
 {
     QueryNodeResultFactory empty;
     {
@@ -49,27 +39,17 @@ QueryWrapperTest::testQueryWrapper()
         q.getLeaves(terms);
         ASSERT_TRUE(tl.size() == 3 && terms.size() == 3);
         for (size_t i = 0; i < 3; ++i) {
-            EXPECT_EQUAL(tl[i], terms[i]);
+            EXPECT_EQ(tl[i], terms[i]);
             std::cout << "t[" << i << "]:" << terms[i] << std::endl;
             auto phrase = dynamic_cast<PhraseQueryNode*>(terms[i]);
-            EXPECT_EQUAL(i == 1, phrase != nullptr);
+            EXPECT_EQ(i == 1, phrase != nullptr);
             if (i == 1) {
-                EXPECT_EQUAL(3u, phrase->get_terms().size());
+                EXPECT_EQ(3u, phrase->get_terms().size());
             }
         }
     }
 }
 
-int
-QueryWrapperTest::Main()
-{
-    TEST_INIT("querywrapper_test");
-
-    testQueryWrapper();
-
-    TEST_DONE();
 }
 
-} // namespace streaming
-
-TEST_APPHOOK(::streaming::QueryWrapperTest)
+GTEST_MAIN_RUN_ALL_TESTS()