From 5c7712e1b34ae86cb5889404a1cd6c197ed3fd3d Mon Sep 17 00:00:00 2001 From: Tomek Mrugalski Date: Sat, 9 Nov 2019 18:23:43 +0100 Subject: [PATCH] [#1003] Replaced old TEST_CASE macros with TEST_SUITE --- src/bin/dhcp4/tests/get_config_unittest.cc | 8 ++++---- src/bin/dhcp4/tests/get_config_unittest.cc.skel | 8 ++++---- src/bin/dhcp6/tests/get_config_unittest.cc | 8 ++++---- src/bin/dhcp6/tests/get_config_unittest.cc.skel | 8 ++++---- src/lib/dns/tests/rdata_ds_like_unittest.cc | 2 +- src/lib/dns/tests/rdata_nsec3param_like_unittest.cc | 2 +- src/lib/dns/tests/rdata_nsecbitmap_unittest.cc | 2 +- src/lib/dns/tests/rdata_txt_like_unittest.cc | 2 +- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/bin/dhcp4/tests/get_config_unittest.cc b/src/bin/dhcp4/tests/get_config_unittest.cc index a45e1fa8b1..0319199b66 100644 --- a/src/bin/dhcp4/tests/get_config_unittest.cc +++ b/src/bin/dhcp4/tests/get_config_unittest.cc @@ -9923,8 +9923,8 @@ public: }; /// Define the parameterized test loop. -INSTANTIATE_TEST_CASE_P(Dhcp4GetConfigTest, Dhcp4GetConfigTest, - ::testing::Range(static_cast(0), - max_config_counter), - IntToString()); +INSTANTIATE_TEST_SUITE_P(Dhcp4GetConfigTest, Dhcp4GetConfigTest, + ::testing::Range(static_cast(0), + max_config_counter), + IntToString()); } // namespace diff --git a/src/bin/dhcp4/tests/get_config_unittest.cc.skel b/src/bin/dhcp4/tests/get_config_unittest.cc.skel index ca2e8f2c9b..9923d172e7 100644 --- a/src/bin/dhcp4/tests/get_config_unittest.cc.skel +++ b/src/bin/dhcp4/tests/get_config_unittest.cc.skel @@ -359,8 +359,8 @@ public: }; /// Define the parameterized test loop. -INSTANTIATE_TEST_CASE_P(Dhcp4GetConfigTest, Dhcp4GetConfigTest, - ::testing::Range(static_cast(0), - max_config_counter), - IntToString()); +INSTANTIATE_TEST_SUITE_P(Dhcp4GetConfigTest, Dhcp4GetConfigTest, + ::testing::Range(static_cast(0), + max_config_counter), + IntToString()); } // namespace diff --git a/src/bin/dhcp6/tests/get_config_unittest.cc b/src/bin/dhcp6/tests/get_config_unittest.cc index dd4c6a8d33..ec8d5e9bc2 100644 --- a/src/bin/dhcp6/tests/get_config_unittest.cc +++ b/src/bin/dhcp6/tests/get_config_unittest.cc @@ -8728,8 +8728,8 @@ public: }; /// Define the parameterized test loop. -INSTANTIATE_TEST_CASE_P(Dhcp6GetConfigTest, Dhcp6GetConfigTest, - ::testing::Range(static_cast(0), - max_config_counter), - IntToString()); +INSTANTIATE_TEST_SUITE_P(Dhcp6GetConfigTest, Dhcp6GetConfigTest, + ::testing::Range(static_cast(0), + max_config_counter), + IntToString()); } // namespace diff --git a/src/bin/dhcp6/tests/get_config_unittest.cc.skel b/src/bin/dhcp6/tests/get_config_unittest.cc.skel index 99f6c67bf0..0d8dee8a51 100644 --- a/src/bin/dhcp6/tests/get_config_unittest.cc.skel +++ b/src/bin/dhcp6/tests/get_config_unittest.cc.skel @@ -363,8 +363,8 @@ public: }; /// Define the parameterized test loop. -INSTANTIATE_TEST_CASE_P(Dhcp6GetConfigTest, Dhcp6GetConfigTest, - ::testing::Range(static_cast(0), - max_config_counter), - IntToString()); +INSTANTIATE_TEST_SUITE_P(Dhcp6GetConfigTest, Dhcp6GetConfigTest, + ::testing::Range(static_cast(0), + max_config_counter), + IntToString()); } // namespace diff --git a/src/lib/dns/tests/rdata_ds_like_unittest.cc b/src/lib/dns/tests/rdata_ds_like_unittest.cc index 3daecfe99e..7bd222f675 100644 --- a/src/lib/dns/tests/rdata_ds_like_unittest.cc +++ b/src/lib/dns/tests/rdata_ds_like_unittest.cc @@ -55,7 +55,7 @@ protected: // The list of types we want to test. typedef testing::Types Implementations; -TYPED_TEST_CASE(Rdata_DS_LIKE_Test, Implementations); +TYPED_TEST_SUITE(Rdata_DS_LIKE_Test, Implementations); TYPED_TEST(Rdata_DS_LIKE_Test, createFromText) { // It's valid for the digest's presentation format to contain diff --git a/src/lib/dns/tests/rdata_nsec3param_like_unittest.cc b/src/lib/dns/tests/rdata_nsec3param_like_unittest.cc index 344ef69f24..b087abe7ab 100644 --- a/src/lib/dns/tests/rdata_nsec3param_like_unittest.cc +++ b/src/lib/dns/tests/rdata_nsec3param_like_unittest.cc @@ -77,7 +77,7 @@ protected: // Instantiate specific typed tests typedef ::testing::Types TestRdataTypes; -TYPED_TEST_CASE(NSEC3PARAMLikeTest, TestRdataTypes); +TYPED_TEST_SUITE(NSEC3PARAMLikeTest, TestRdataTypes); template <> RRType diff --git a/src/lib/dns/tests/rdata_nsecbitmap_unittest.cc b/src/lib/dns/tests/rdata_nsecbitmap_unittest.cc index e50a430363..a5f3a6c593 100644 --- a/src/lib/dns/tests/rdata_nsecbitmap_unittest.cc +++ b/src/lib/dns/tests/rdata_nsecbitmap_unittest.cc @@ -65,7 +65,7 @@ protected: // Instantiate specific typed tests typedef ::testing::Types TestRdataTypes; -TYPED_TEST_CASE(NSECLikeBitmapTest, TestRdataTypes); +TYPED_TEST_SUITE(NSECLikeBitmapTest, TestRdataTypes); // 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 diff --git a/src/lib/dns/tests/rdata_txt_like_unittest.cc b/src/lib/dns/tests/rdata_txt_like_unittest.cc index 603af1d4fd..c6965033bb 100644 --- a/src/lib/dns/tests/rdata_txt_like_unittest.cc +++ b/src/lib/dns/tests/rdata_txt_like_unittest.cc @@ -72,7 +72,7 @@ protected: // The list of types we want to test. typedef testing::Types Implementations; -TYPED_TEST_CASE(Rdata_TXT_LIKE_Test, Implementations); +TYPED_TEST_SUITE(Rdata_TXT_LIKE_Test, Implementations); TYPED_TEST(Rdata_TXT_LIKE_Test, createFromText) { // Below we check the behavior for the "from text" constructors, both -- 2.47.2