From 2ac52894b6aba0ffe5ef0a9188ce4b5b5b25d79b Mon Sep 17 00:00:00 2001
From: Tor Egge <Tor.Egge@online.no>
Date: Fri, 18 Nov 2022 14:46:10 +0100
Subject: Drop support for old gtest.

---
 storage/src/tests/bucketdb/lockablemaptest.cpp                | 2 +-
 storage/src/tests/distributor/btree_bucket_database_test.cpp  | 4 ++--
 storage/src/tests/distributor/maintenanceschedulertest.cpp    | 2 +-
 storage/src/tests/storageapi/mbusprot/storageprotocoltest.cpp | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'storage/src')

diff --git a/storage/src/tests/bucketdb/lockablemaptest.cpp b/storage/src/tests/bucketdb/lockablemaptest.cpp
index edbbaf833f6..7a629920606 100644
--- a/storage/src/tests/bucketdb/lockablemaptest.cpp
+++ b/storage/src/tests/bucketdb/lockablemaptest.cpp
@@ -60,7 +60,7 @@ struct LockableMapTest : ::testing::Test {
 };
 
 using MapTypes = ::testing::Types<bucketdb::BTreeLockableMap<A>, bucketdb::StripedBTreeLockableMap<A>>;
-VESPA_GTEST_TYPED_TEST_SUITE(LockableMapTest, MapTypes);
+TYPED_TEST_SUITE(LockableMapTest, MapTypes);
 
 // Disable warnings emitted by gtest generated files when using typed tests
 #pragma GCC diagnostic push
diff --git a/storage/src/tests/distributor/btree_bucket_database_test.cpp b/storage/src/tests/distributor/btree_bucket_database_test.cpp
index 36e700ab1ff..14d5a4142a8 100644
--- a/storage/src/tests/distributor/btree_bucket_database_test.cpp
+++ b/storage/src/tests/distributor/btree_bucket_database_test.cpp
@@ -12,8 +12,8 @@ using namespace ::testing;
 
 namespace storage::distributor {
 
-VESPA_GTEST_INSTANTIATE_TEST_SUITE_P(BTreeDatabase, BucketDatabaseTest,
-                                     ::testing::Values(std::make_shared<BTreeBucketDatabase>()));
+INSTANTIATE_TEST_SUITE_P(BTreeDatabase, BucketDatabaseTest,
+                         ::testing::Values(std::make_shared<BTreeBucketDatabase>()));
 
 using document::BucketId;
 
diff --git a/storage/src/tests/distributor/maintenanceschedulertest.cpp b/storage/src/tests/distributor/maintenanceschedulertest.cpp
index 44b842a2622..75b2cb6f98a 100644
--- a/storage/src/tests/distributor/maintenanceschedulertest.cpp
+++ b/storage/src/tests/distributor/maintenanceschedulertest.cpp
@@ -122,6 +122,6 @@ TEST_P(MaintenanceSchedulerTest, priority_not_cleared_if_operation_not_started_o
               _priority_db.toString());
 }
 
-VESPA_GTEST_INSTANTIATE_TEST_SUITE_P(ImplicitClearOfDbPri, MaintenanceSchedulerTest, ::testing::Values(false, true));
+INSTANTIATE_TEST_SUITE_P(ImplicitClearOfDbPri, MaintenanceSchedulerTest, ::testing::Values(false, true));
 
 }
diff --git a/storage/src/tests/storageapi/mbusprot/storageprotocoltest.cpp b/storage/src/tests/storageapi/mbusprot/storageprotocoltest.cpp
index 344c909c13e..aeef0f613b2 100644
--- a/storage/src/tests/storageapi/mbusprot/storageprotocoltest.cpp
+++ b/storage/src/tests/storageapi/mbusprot/storageprotocoltest.cpp
@@ -111,7 +111,7 @@ std::string version_as_gtest_string(TestParamInfo<vespalib::Version> info) {
 
 }
 
-VESPA_GTEST_INSTANTIATE_TEST_SUITE_P(MultiVersionTest, StorageProtocolTest,
+INSTANTIATE_TEST_SUITE_P(MultiVersionTest, StorageProtocolTest,
                                      Values(vespalib::Version(7, 41, 19)),
                                      version_as_gtest_string);
 
-- 
cgit v1.2.3