Drop support for old gtest.

10 files changed, 25 insertions, 25 deletions

diff --git a/searchlib/src/tests/attribute/enum_attribute_compaction/enum_attribute_compaction_test.cpp b/searchlib/src/tests/attribute/enum_attribute_compaction/enum_attribute_compaction_test.cpp
index f54e1efdf5c..1d3e2408ab0 100644
--- a/searchlib/src/tests/attribute/enum_attribute_compaction/enum_attribute_compaction_test.cpp
+++ b/searchlib/src/tests/attribute/enum_attribute_compaction/enum_attribute_compaction_test.cpp
@@ -221,7 +221,7 @@ TEST_P(IntegerCompactionTest, compact)
     test_enum_store_compaction();
 }
 
-VESPA_GTEST_INSTANTIATE_TEST_SUITE_P(IntegerCompactionTestSet, IntegerCompactionTest, ::testing::Values(CollectionType::SINGLE, CollectionType::ARRAY, CollectionType::WSET));
+INSTANTIATE_TEST_SUITE_P(IntegerCompactionTestSet, IntegerCompactionTest, ::testing::Values(CollectionType::SINGLE, CollectionType::ARRAY, CollectionType::WSET));
 
 using StringCompactionTest = CompactionTest<StringAttribute>;
 
@@ -230,6 +230,6 @@ TEST_P(StringCompactionTest, compact)
     test_enum_store_compaction();
 }
 
-VESPA_GTEST_INSTANTIATE_TEST_SUITE_P(StringCompactionTestSet, StringCompactionTest, ::testing::Values(CollectionType::SINGLE, CollectionType::ARRAY, CollectionType::WSET));
+INSTANTIATE_TEST_SUITE_P(StringCompactionTestSet, StringCompactionTest, ::testing::Values(CollectionType::SINGLE, CollectionType::ARRAY, CollectionType::WSET));
 
 GTEST_MAIN_RUN_ALL_TESTS()
diff --git a/searchlib/src/tests/attribute/enumstore/enumstore_test.cpp b/searchlib/src/tests/attribute/enumstore/enumstore_test.cpp
index 0542a253cc5..2f60d64ec37 100644
--- a/searchlib/src/tests/attribute/enumstore/enumstore_test.cpp
+++ b/searchlib/src/tests/attribute/enumstore/enumstore_test.cpp
@@ -158,7 +158,7 @@ public:
 #endif
 
 using FloatEnumStoreTestTypes = ::testing::Types<BTreeFloatEnumStore, BTreeDoubleEnumStore, HybridFloatEnumStore, HybridDoubleEnumStore, HashFloatEnumStore, HashDoubleEnumStore>;
-VESPA_GTEST_TYPED_TEST_SUITE(FloatEnumStoreTest, FloatEnumStoreTestTypes);
+TYPED_TEST_SUITE(FloatEnumStoreTest, FloatEnumStoreTestTypes);
 
 TYPED_TEST(FloatEnumStoreTest, numbers_can_be_inserted_and_retrieved)
 {
@@ -554,7 +554,7 @@ public:
 #endif
 
 using LoaderTestTypes = ::testing::Types<BTreeNumericEnumStore, BTreeFloatEnumStore, BTreeStringEnumStore, HybridNumericEnumStore, HybridFloatEnumStore, HybridStringEnumStore, HashNumericEnumStore, HashFloatEnumStore, HashStringEnumStore>;
-VESPA_GTEST_TYPED_TEST_SUITE(LoaderTest, LoaderTestTypes);
+TYPED_TEST_SUITE(LoaderTest, LoaderTestTypes);
 
 TYPED_TEST(LoaderTest, store_is_instantiated_with_enumerated_loader)
 {
@@ -803,7 +803,7 @@ EnumStoreDictionaryTest<EnumStoreTypeAndDictionaryType>::test_foreach_posting_li
 #endif
 
 using EnumStoreDictionaryTestTypes = ::testing::Types<BTreeNumericEnumStore, HybridNumericEnumStore, HashNumericEnumStore>;
-VESPA_GTEST_TYPED_TEST_SUITE(EnumStoreDictionaryTest, EnumStoreDictionaryTestTypes);
+TYPED_TEST_SUITE(EnumStoreDictionaryTest, EnumStoreDictionaryTestTypes);
 
 TYPED_TEST(EnumStoreDictionaryTest, find_frozen_index_works)
 {
diff --git a/searchlib/src/tests/attribute/multi_value_read_view/multi_value_read_view_test.cpp b/searchlib/src/tests/attribute/multi_value_read_view/multi_value_read_view_test.cpp
index 2b47bf0a7c9..651f4458008 100644
--- a/searchlib/src/tests/attribute/multi_value_read_view/multi_value_read_view_test.cpp
+++ b/searchlib/src/tests/attribute/multi_value_read_view/multi_value_read_view_test.cpp
@@ -448,7 +448,7 @@ auto test_values = ::testing::Values(TestParam(BasicType::Type::INT8),
                                      TestParam(BasicType::Type::DOUBLE),
                                      TestParam(BasicType::Type::STRING));
 
-VESPA_GTEST_INSTANTIATE_TEST_SUITE_P(ReadView, MultiValueReadViewTest, test_values,testing::PrintToStringParamName());
+INSTANTIATE_TEST_SUITE_P(ReadView, MultiValueReadViewTest, test_values,testing::PrintToStringParamName());
 
 }
 
diff --git a/searchlib/src/tests/attribute/posting_store/posting_store_test.cpp b/searchlib/src/tests/attribute/posting_store/posting_store_test.cpp
index 75e7faf0227..57029f92111 100644
--- a/searchlib/src/tests/attribute/posting_store/posting_store_test.cpp
+++ b/searchlib/src/tests/attribute/posting_store/posting_store_test.cpp
@@ -220,9 +220,9 @@ PostingStoreTest::test_compact_btree_nodes(uint32_t sequence_length)
     }
 }
 
-VESPA_GTEST_INSTANTIATE_TEST_SUITE_P(PostingStoreMultiTest,
-                                     PostingStoreTest,
-                                     testing::Values(PostingStoreSetup(false), PostingStoreSetup(true)), testing::PrintToStringParamName());
+INSTANTIATE_TEST_SUITE_P(PostingStoreMultiTest,
+                         PostingStoreTest,
+                         testing::Values(PostingStoreSetup(false), PostingStoreSetup(true)), testing::PrintToStringParamName());
 
 TEST_P(PostingStoreTest, require_that_nodes_for_multiple_small_btrees_are_compacted)
 {
diff --git a/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp b/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp
index 9c098e0c2bf..42d55c8f769 100644
--- a/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp
+++ b/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp
@@ -540,7 +540,7 @@ struct FieldIndexTest : public ::testing::Test {
 };
 
 using FieldIndexTestTypes = ::testing::Types<FieldIndex<false>, FieldIndex<true>>;
-VESPA_GTEST_TYPED_TEST_SUITE(FieldIndexTest, FieldIndexTestTypes);
+TYPED_TEST_SUITE(FieldIndexTest, FieldIndexTestTypes);
 
 // Disable warnings emitted by gtest generated files when using typed tests
 #pragma GCC diagnostic push
diff --git a/searchlib/src/tests/queryeval/matching_elements_search/matching_elements_search_test.cpp b/searchlib/src/tests/queryeval/matching_elements_search/matching_elements_search_test.cpp
index 561691cc5c8..4643f71ddc3 100644
--- a/searchlib/src/tests/queryeval/matching_elements_search/matching_elements_search_test.cpp
+++ b/searchlib/src/tests/queryeval/matching_elements_search/matching_elements_search_test.cpp
@@ -122,7 +122,7 @@ template <> MatchingElementsSearchTest<const char *>::LookupTests MatchingElemen
 #endif
 
 using MatchingElementsSearchTestTypes = ::testing::Types<int64_t, const char *>;
-VESPA_GTEST_TYPED_TEST_SUITE(MatchingElementsSearchTest, MatchingElementsSearchTestTypes);
+TYPED_TEST_SUITE(MatchingElementsSearchTest, MatchingElementsSearchTestTypes);
 
 TYPED_TEST(MatchingElementsSearchTest, verify_matching_elements)
 {
diff --git a/searchlib/src/tests/tensor/hnsw_index/hnsw_index_test.cpp b/searchlib/src/tests/tensor/hnsw_index/hnsw_index_test.cpp
index d4415884cd3..eacec323e70 100644
--- a/searchlib/src/tests/tensor/hnsw_index/hnsw_index_test.cpp
+++ b/searchlib/src/tests/tensor/hnsw_index/hnsw_index_test.cpp
@@ -200,7 +200,7 @@ public:
 
 using HnswIndexTestTypes = ::testing::Types<HnswIndex<HnswIndexType::SINGLE>, HnswIndex<HnswIndexType::MULTI>>;
 
-VESPA_GTEST_TYPED_TEST_SUITE(HnswIndexTest, HnswIndexTestTypes);
+TYPED_TEST_SUITE(HnswIndexTest, HnswIndexTestTypes);
 
 TYPED_TEST(HnswIndexTest, 2d_vectors_inserted_in_level_0_graph_with_simple_select_neighbors)
 {
@@ -759,7 +759,7 @@ public:
     }
 };
 
-VESPA_GTEST_TYPED_TEST_SUITE(TwoPhaseTest, HnswIndexTestTypes);
+TYPED_TEST_SUITE(TwoPhaseTest, HnswIndexTestTypes);
 
 TYPED_TEST(TwoPhaseTest, two_phase_add)
 {
diff --git a/searchlib/src/tests/tensor/hnsw_index/stress_hnsw_mt.cpp b/searchlib/src/tests/tensor/hnsw_index/stress_hnsw_mt.cpp
index 84833a8c49e..d8bfb1de9a9 100644
--- a/searchlib/src/tests/tensor/hnsw_index/stress_hnsw_mt.cpp
+++ b/searchlib/src/tests/tensor/hnsw_index/stress_hnsw_mt.cpp
@@ -351,7 +351,7 @@ public:
 
 using StressorTypes = ::testing::Types<HnswIndex<HnswIndexType::SINGLE>>;
 
-VESPA_GTEST_TYPED_TEST_SUITE(Stressor, StressorTypes);
+TYPED_TEST_SUITE(Stressor, StressorTypes);
 
 TYPED_TEST(Stressor, stress)
 {
diff --git a/searchlib/src/tests/tensor/tensor_buffer_operations/tensor_buffer_operations_test.cpp b/searchlib/src/tests/tensor/tensor_buffer_operations/tensor_buffer_operations_test.cpp
index bda229f8074..9bed7a11bee 100644
--- a/searchlib/src/tests/tensor/tensor_buffer_operations/tensor_buffer_operations_test.cpp
+++ b/searchlib/src/tests/tensor/tensor_buffer_operations/tensor_buffer_operations_test.cpp
@@ -158,9 +158,9 @@ TensorBufferOperationsTest::assert_store_encode_decode(const TensorSpec& tensor_
     EXPECT_EQ(tensor_spec, decoded_spec);
 }
 
-VESPA_GTEST_INSTANTIATE_TEST_SUITE_P(TensorBufferOperationsMultiTest,
-                                     TensorBufferOperationsTest,
-                                     testing::Values(TestParam("1d", {8, 16, 32, 40, 64}, TensorSpec(tensor_type_spec).add({{"x", "a"}}, 4.5)),
+INSTANTIATE_TEST_SUITE_P(TensorBufferOperationsMultiTest,
+                         TensorBufferOperationsTest,
+                         testing::Values(TestParam("1d", {8, 16, 32, 40, 64}, TensorSpec(tensor_type_spec).add({{"x", "a"}}, 4.5)),
                                                      TestParam("1dmulti", {8, 16, 32, 40, 64}, TensorSpec(tensor_type_spec).add({{"x", "a"}}, 4.5).add({{"x", "c"}}, 4.25)),
                                                      TestParam("1dfloat", {4, 12, 20, 28, 36}, TensorSpec(float_tensor_type_spec).add({{"y", "aa"}}, 4.25)),
                                                      TestParam("2d", {8, 24, 40, 56, 80}, TensorSpec(tensor_type_2d_spec).add({{"x", "a"},{"y", "aa"}}, 4.75)),
diff --git a/searchlib/src/tests/tensor/tensor_buffer_type_mapper/tensor_buffer_type_mapper_test.cpp b/searchlib/src/tests/tensor/tensor_buffer_type_mapper/tensor_buffer_type_mapper_test.cpp
index 8e88c103516..d7eaa6b633d 100644
--- a/searchlib/src/tests/tensor/tensor_buffer_type_mapper/tensor_buffer_type_mapper_test.cpp
+++ b/searchlib/src/tests/tensor/tensor_buffer_type_mapper/tensor_buffer_type_mapper_test.cpp
@@ -99,14 +99,14 @@ TensorBufferTypeMapperTest::select_type_ids()
  * TensorBufferStore.
  */
 
-VESPA_GTEST_INSTANTIATE_TEST_SUITE_P(TensorBufferTypeMapperMultiTest,
-                                     TensorBufferTypeMapperTest,
-                                     testing::Values(TestParam("1d", {8, 16, 32, 40, 64}, tensor_type_sparse_spec),
-                                                     TestParam("1dfloat", {4, 12, 20, 28, 36}, float_tensor_type_spec),
-                                                     TestParam("2d", {8, 24, 40, 56, 80}, tensor_type_2d_spec),
-                                                     TestParam("2dmixed", {8, 24, 48, 64, 96}, tensor_type_2d_mixed_spec),
-                                                     TestParam("dense", {8, 24}, tensor_type_dense_spec)),
-                                     testing::PrintToStringParamName());
+INSTANTIATE_TEST_SUITE_P(TensorBufferTypeMapperMultiTest,
+                         TensorBufferTypeMapperTest,
+                         testing::Values(TestParam("1d", {8, 16, 32, 40, 64}, tensor_type_sparse_spec),
+                                         TestParam("1dfloat", {4, 12, 20, 28, 36}, float_tensor_type_spec),
+                                         TestParam("2d", {8, 24, 40, 56, 80}, tensor_type_2d_spec),
+                                         TestParam("2dmixed", {8, 24, 48, 64, 96}, tensor_type_2d_mixed_spec),
+                                         TestParam("dense", {8, 24}, tensor_type_dense_spec)),
+                         testing::PrintToStringParamName());
 
 TEST_P(TensorBufferTypeMapperTest, array_sizes_are_calculated)
 {