diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2020-03-30 10:46:04 +0200 |
---|---|---|
committer | Tor Egge <Tor.Egge@broadpark.no> | 2020-03-30 10:46:04 +0200 |
commit | eea2cb29dba9c3214eedb64381f665ae5174b04d (patch) | |
tree | cd4fd9f1a145da006221827b5a53b75caf01116b /storageapi | |
parent | 463b515efa427bb031e6b83047050084f94008a4 (diff) |
Reduce code duplication in test code.
Diffstat (limited to 'storageapi')
-rw-r--r-- | storageapi/src/tests/mbusprot/storageprotocoltest.cpp | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/storageapi/src/tests/mbusprot/storageprotocoltest.cpp b/storageapi/src/tests/mbusprot/storageprotocoltest.cpp index ba7c2a9a7c3..0f628f59aac 100644 --- a/storageapi/src/tests/mbusprot/storageprotocoltest.cpp +++ b/storageapi/src/tests/mbusprot/storageprotocoltest.cpp @@ -20,7 +20,7 @@ #include <iomanip> #include <sstream> -#include <gtest/gtest.h> +#include <vespa/vespalib/gtest/gtest.h> using namespace ::testing; @@ -105,17 +105,10 @@ std::string version_as_gtest_string(TestParamInfo<vespalib::Version> info) { } -#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 +VESPA_GTEST_INSTANTIATE_TEST_SUITE_P(MultiVersionTest, StorageProtocolTest, + Values(vespalib::Version(6, 240, 0), + vespalib::Version(7, 41, 19)), + version_as_gtest_string); namespace { mbus::Message::UP lastCommand; |