Handle newer gtest versions where the legacy API is deprecated.

1 files changed, 7 insertions, 1 deletions

diff --git a/storageapi/src/tests/mbusprot/storageprotocoltest.cpp b/storageapi/src/tests/mbusprot/storageprotocoltest.cpp
index 2e5eb115844..ba7c2a9a7c3 100644
--- a/storageapi/src/tests/mbusprot/storageprotocoltest.cpp
+++ b/storageapi/src/tests/mbusprot/storageprotocoltest.cpp
@@ -105,11 +105,17 @@ std::string version_as_gtest_string(TestParamInfo<vespalib::Version> info) {
 
 }
 
-// TODO replace with INSTANTIATE_TEST_SUITE_P on newer gtest versions
+#ifdef INSTANTIATE_TEST_SUITE_P
+INSTANTIATE_TEST_SUITE_P(MultiVersionTest, StorageProtocolTest,
+                        Values(vespalib::Version(6, 240, 0),
+                               vespalib::Version(7, 41, 19)),
+                        version_as_gtest_string);
+#else
 INSTANTIATE_TEST_CASE_P(MultiVersionTest, StorageProtocolTest,
                         Values(vespalib::Version(6, 240, 0),
                                vespalib::Version(7, 41, 19)),
                         version_as_gtest_string);
+#endif
 
 namespace {
     mbus::Message::UP lastCommand;