diff options
author | Tor Brede Vekterli <vekterli@yahooinc.com> | 2022-11-18 15:04:16 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-18 15:04:16 +0100 |
commit | affce745472b6128972c7d92f42d011a681ca156 (patch) | |
tree | 0f07aa5c43b39c090f688f880000882aa07a0b47 /searchlib/src/tests/tensor | |
parent | 6c99d117b8e18fa5742d190d2fdcf0cf8f5a4fa2 (diff) | |
parent | 2ac52894b6aba0ffe5ef0a9188ce4b5b5b25d79b (diff) |
Merge pull request #24924 from vespa-engine/toregge/drop-support-for-old-gtest
Drop support for old gtest.
Diffstat (limited to 'searchlib/src/tests/tensor')
4 files changed, 14 insertions, 14 deletions
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) { |