Commit cec0e1ca authored by Francis Dupont's avatar Francis Dupont Committed by Tomek Mrugalski
Browse files

[954-support-of-google-tests-release-1-10-0] Moved from TEST_CASE to...

[954-support-of-google-tests-release-1-10-0] Moved from TEST_CASE to TEST_SUITE for last google test release
parent 179baf48
......@@ -9921,8 +9921,15 @@ public:
};
/// Define the parameterized test loop.
#ifdef INSTANTIATE_TEST_SUITE_P
INSTANTIATE_TEST_SUITE_P(Dhcp4GetConfigTest, Dhcp4GetConfigTest,
::testing::Range(static_cast<size_t>(0),
max_config_counter),
IntToString());
#else
INSTANTIATE_TEST_CASE_P(Dhcp4GetConfigTest, Dhcp4GetConfigTest,
::testing::Range(static_cast<size_t>(0),
max_config_counter),
IntToString());
#endif
} // namespace
......@@ -359,8 +359,15 @@ public:
};
/// Define the parameterized test loop.
#ifdef INSTANTIATE_TEST_SUITE_P
INSTANTIATE_TEST_SUITE_P(Dhcp4GetConfigTest, Dhcp4GetConfigTest,
::testing::Range(static_cast<size_t>(0),
max_config_counter),
IntToString());
#else
INSTANTIATE_TEST_CASE_P(Dhcp4GetConfigTest, Dhcp4GetConfigTest,
::testing::Range(static_cast<size_t>(0),
max_config_counter),
IntToString());
#endif
} // namespace
......@@ -8727,8 +8727,15 @@ public:
};
/// Define the parameterized test loop.
#ifdef INSTANTIATE_TEST_SUITE_P
INSTANTIATE_TEST_SUITE_P(Dhcp6GetConfigTest, Dhcp6GetConfigTest,
::testing::Range(static_cast<size_t>(0),
max_config_counter),
IntToString());
#else
INSTANTIATE_TEST_CASE_P(Dhcp6GetConfigTest, Dhcp6GetConfigTest,
::testing::Range(static_cast<size_t>(0),
max_config_counter),
IntToString());
#endif
} // namespace
......@@ -363,8 +363,15 @@ public:
};
/// Define the parameterized test loop.
#ifdef INSTANTIATE_TEST_SUITE_P
INSTANTIATE_TEST_SUITE_P(Dhcp6GetConfigTest, Dhcp6GetConfigTest,
::testing::Range(static_cast<size_t>(0),
max_config_counter),
IntToString());
#else
INSTANTIATE_TEST_CASE_P(Dhcp6GetConfigTest, Dhcp6GetConfigTest,
::testing::Range(static_cast<size_t>(0),
max_config_counter),
IntToString());
#endif
} // namespace
......@@ -55,7 +55,11 @@ protected:
// The list of types we want to test.
typedef testing::Types<generic::DS, generic::DLV> Implementations;
#ifdef TYPED_TEST_SUITE
TYPED_TEST_SUITE(Rdata_DS_LIKE_Test, Implementations);
#else
TYPED_TEST_CASE(Rdata_DS_LIKE_Test, Implementations);
#endif
TYPED_TEST(Rdata_DS_LIKE_Test, createFromText) {
// It's valid for the digest's presentation format to contain
......
// Copyright (C) 2012-2017 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2012-2019 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
......@@ -77,7 +77,11 @@ protected:
// Instantiate specific typed tests
typedef ::testing::Types<generic::NSEC3, generic::NSEC3PARAM> TestRdataTypes;
#ifdef TYPED_TEST_SUITE
TYPED_TEST_SUITE(NSEC3PARAMLikeTest, TestRdataTypes);
#else
TYPED_TEST_CASE(NSEC3PARAMLikeTest, TestRdataTypes);
#endif
template <>
RRType
......
// Copyright (C) 2011-2015 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2011-2019 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
......@@ -65,7 +65,11 @@ protected:
// Instantiate specific typed tests
typedef ::testing::Types<generic::NSEC, generic::NSEC3> TestRdataTypes;
#ifdef TYPED_TEST_SUITE
TYPED_TEST_SUITE(NSECLikeBitmapTest, TestRdataTypes);
#else
TYPED_TEST_CASE(NSECLikeBitmapTest, TestRdataTypes);
#endif
// NSEC and NSEC3 bitmaps have some subtle differences, in which case we
// need to test them separately. Using these typedef type names with TEST_F
......
......@@ -72,7 +72,11 @@ protected:
// The list of types we want to test.
typedef testing::Types<generic::TXT, generic::SPF> Implementations;
#ifdef TYPED_TEST_SUITE
TYPED_TEST_SUITE(Rdata_TXT_LIKE_Test, Implementations);
#else
TYPED_TEST_CASE(Rdata_TXT_LIKE_Test, Implementations);
#endif
TYPED_TEST(Rdata_TXT_LIKE_Test, createFromText) {
// Below we check the behavior for the "from text" constructors, both
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment