Merge pull request #30581 from vespa-engine/toregge/rewrite-searchlib-attribute-guard-unit-test-to-gtest

Rewrite searchlib AttributeGuard unit test to gtest.

2 files changed, 4 insertions, 17 deletions

diff --git a/searchlib/src/tests/attribute/guard/CMakeLists.txt b/searchlib/src/tests/attribute/guard/CMakeLists.txt
index a956182e1e1..f5570377814 100644
--- a/searchlib/src/tests/attribute/guard/CMakeLists.txt
+++ b/searchlib/src/tests/attribute/guard/CMakeLists.txt
@@ -4,6 +4,7 @@ vespa_add_executable(searchlib_attributeguard_test_app TEST
     attributeguard_test.cpp
     DEPENDS
     searchlib
+    GTest::gtest
 )
 vespa_add_test(NAME searchlib_attributeguard_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/attributeguard_test.sh
                DEPENDS searchlib_attributeguard_test_app)
diff --git a/searchlib/src/tests/attribute/guard/attributeguard_test.cpp b/searchlib/src/tests/attribute/guard/attributeguard_test.cpp
index 47df9d7c320..513fa7406b6 100644
--- a/searchlib/src/tests/attribute/guard/attributeguard_test.cpp
+++ b/searchlib/src/tests/attribute/guard/attributeguard_test.cpp
@@ -1,31 +1,17 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/log/log.h>
-LOG_SETUP("attributeguard_test");
-#include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/searchlib/attribute/attributeguard.h>
 #include <vespa/searchlib/attribute/extendableattributes.h>
+#include <vespa/vespalib/gtest/gtest.h>
 
 namespace search {
 
-class AttributeGuardTest : public vespalib::TestApp
+TEST(AttributeGuardTest, test_attribute_guard)
 {
-public:
-    int Main() override;
-};
-
-int
-AttributeGuardTest::Main()
-{
-    TEST_INIT("attributeguard_test");
-
-
     AttributeVector::SP ssattr(new SingleStringExtAttribute("ss1"));
     AttributeGuard guard(ssattr);
     EXPECT_TRUE(guard.valid());
-
-    TEST_DONE();
 }
 
 }
 
-TEST_APPHOOK(search::AttributeGuardTest);
+GTEST_MAIN_RUN_ALL_TESTS()