Drop support for old gtest.

5 files changed, 12 insertions, 24 deletions

diff --git a/vespalib/src/tests/btree/btree-stress/btree_stress_test.cpp b/vespalib/src/tests/btree/btree-stress/btree_stress_test.cpp
index caed5c3543c..cf809e0d730 100644
--- a/vespalib/src/tests/btree/btree-stress/btree_stress_test.cpp
+++ b/vespalib/src/tests/btree/btree-stress/btree_stress_test.cpp
@@ -507,7 +507,7 @@ using BTreeStressTest = Fixture<Params>;
 
 using TestTypes = testing::Types<DirectKeyValueParams, IndirectKeyValueParams>;
 
-VESPA_GTEST_TYPED_TEST_SUITE(BTreeStressTest, TestTypes);
+TYPED_TEST_SUITE(BTreeStressTest, TestTypes);
 
 // Disable warnings emitted by gtest generated files when using typed tests
 #pragma GCC diagnostic push
diff --git a/vespalib/src/tests/datastore/array_store/array_store_test.cpp b/vespalib/src/tests/datastore/array_store/array_store_test.cpp
index e9ea1a67156..d46df668df6 100644
--- a/vespalib/src/tests/datastore/array_store/array_store_test.cpp
+++ b/vespalib/src/tests/datastore/array_store/array_store_test.cpp
@@ -193,15 +193,15 @@ TEST(BasicStoreTest, test_with_trivial_and_non_trivial_types)
     EXPECT_FALSE(vespalib::can_skip_destruction<StringStoreTest::value_type>);
 }
 
-VESPA_GTEST_INSTANTIATE_TEST_SUITE_P(NumberStoreMultiTest,
-                                     NumberStoreTest,
-                                     testing::Values(TestParam(false), TestParam(true)),
-                                     testing::PrintToStringParamName());
-
-VESPA_GTEST_INSTANTIATE_TEST_SUITE_P(NumberStoreFreeListsDisabledMultiTest,
-                                     NumberStoreFreeListsDisabledTest,
-                                     testing::Values(TestParam(false), TestParam(true)),
-                                     testing::PrintToStringParamName());
+INSTANTIATE_TEST_SUITE_P(NumberStoreMultiTest,
+                         NumberStoreTest,
+                         testing::Values(TestParam(false), TestParam(true)),
+                         testing::PrintToStringParamName());
+
+INSTANTIATE_TEST_SUITE_P(NumberStoreFreeListsDisabledMultiTest,
+                         NumberStoreFreeListsDisabledTest,
+                         testing::Values(TestParam(false), TestParam(true)),
+                         testing::PrintToStringParamName());
 
 TEST_P(NumberStoreTest, control_static_sizes) {
 #ifdef _LIBCPP_VERSION
diff --git a/vespalib/src/tests/datastore/unique_store/unique_store_test.cpp b/vespalib/src/tests/datastore/unique_store/unique_store_test.cpp
index 48a0ecafbc6..bc1aac3a8cd 100644
--- a/vespalib/src/tests/datastore/unique_store/unique_store_test.cpp
+++ b/vespalib/src/tests/datastore/unique_store/unique_store_test.cpp
@@ -288,7 +288,7 @@ struct HashSmallOffsetNumberUniqueStore
 };
 
 using UniqueStoreTestTypes = ::testing::Types<BTreeNumberUniqueStore, BTreeStringUniqueStore, BTreeCStringUniqueStore, BTreeDoubleUniqueStore, HybridNumberUniqueStore, HybridStringUniqueStore, HybridCStringUniqueStore, HybridDoubleUniqueStore, HashNumberUniqueStore, HashStringUniqueStore, HashCStringUniqueStore, HashDoubleUniqueStore>;
-VESPA_GTEST_TYPED_TEST_SUITE(TestBase, UniqueStoreTestTypes);
+TYPED_TEST_SUITE(TestBase, UniqueStoreTestTypes);
 
 // Disable warnings emitted by gtest generated files when using typed tests
 #pragma GCC diagnostic push
diff --git a/vespalib/src/tests/datastore/unique_store_dictionary/unique_store_dictionary_test.cpp b/vespalib/src/tests/datastore/unique_store_dictionary/unique_store_dictionary_test.cpp
index 496bc814d0d..61853079af6 100644
--- a/vespalib/src/tests/datastore/unique_store_dictionary/unique_store_dictionary_test.cpp
+++ b/vespalib/src/tests/datastore/unique_store_dictionary/unique_store_dictionary_test.cpp
@@ -75,7 +75,7 @@ struct UniqueStoreDictionaryTest : public ::testing::Test {
 };
 
 using UniqueStoreDictionaryTestTypes = ::testing::Types<DefaultUniqueStoreDictionary, UniqueStoreDictionary<DefaultDictionary, IUniqueStoreDictionary, ShardedHashMap>, UniqueStoreDictionary<NoBTreeDictionary, IUniqueStoreDictionary, ShardedHashMap>>;
-VESPA_GTEST_TYPED_TEST_SUITE(UniqueStoreDictionaryTest, UniqueStoreDictionaryTestTypes);
+TYPED_TEST_SUITE(UniqueStoreDictionaryTest, UniqueStoreDictionaryTestTypes);
 
 // Disable warnings emitted by gtest generated files when using typed tests
 #pragma GCC diagnostic push
diff --git a/vespalib/src/vespa/vespalib/gtest/gtest.h b/vespalib/src/vespa/vespalib/gtest/gtest.h
index 6a1adf7dc34..b2614f4af5d 100644
--- a/vespalib/src/vespa/vespalib/gtest/gtest.h
+++ b/vespalib/src/vespa/vespalib/gtest/gtest.h
@@ -24,18 +24,6 @@ main(int argc, char* argv[])                \
     return RUN_ALL_TESTS();                 \
 }
 
-#ifdef INSTANTIATE_TEST_SUITE_P
-#define VESPA_GTEST_INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_SUITE_P
-#else
-#define VESPA_GTEST_INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
-#endif
-
-#ifdef TYPED_TEST_SUITE
-#define VESPA_GTEST_TYPED_TEST_SUITE TYPED_TEST_SUITE
-#else
-#define VESPA_GTEST_TYPED_TEST_SUITE TYPED_TEST_CASE
-#endif
-
 #define VESPA_EXPECT_EXCEPTION(TRY_BLOCK, EXCEPTION_TYPE, MESSAGE) \
     try {                                                                 \
         TRY_BLOCK;                                                        \