[#1003] Replaced old TEST_CASE macros with TEST_SUITE

diff --git a/src/bin/dhcp4/tests/get_config_unittest.cc b/src/bin/dhcp4/tests/get_config_unittest.cc
index a45e1fa8b1b3ee36ab41c319a636bd4fb4bbcf49..0319199b661c78b62d9f45d922dc945a49353a0c 100644 (file)
--- 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<size_t>(0),
-                                         max_config_counter),
-                        IntToString());
+INSTANTIATE_TEST_SUITE_P(Dhcp4GetConfigTest, Dhcp4GetConfigTest,
+                         ::testing::Range(static_cast<size_t>(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 ca2e8f2c9ba7bf339da95d58e26bedc3662e47e6..9923d172e723907566e9eaed085eabf34b396d4b 100644 (file)
--- 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<size_t>(0),
-                                         max_config_counter),
-                        IntToString());
+INSTANTIATE_TEST_SUITE_P(Dhcp4GetConfigTest, Dhcp4GetConfigTest,
+                         ::testing::Range(static_cast<size_t>(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 dd4c6a8d33aeca752bfd5d76ed4305dd6c7d04f3..ec8d5e9bc2b90021dfa70d39b597604ac9e490e3 100644 (file)
--- 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<size_t>(0),
-                                         max_config_counter),
-                        IntToString());
+INSTANTIATE_TEST_SUITE_P(Dhcp6GetConfigTest, Dhcp6GetConfigTest,
+                         ::testing::Range(static_cast<size_t>(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 99f6c67bf035591913e174dbc84d2d2b6793b7cf..0d8dee8a51f92e1f28314a72e7b9b3ec93515eb1 100644 (file)
--- 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<size_t>(0),
-                                         max_config_counter),
-                        IntToString());
+INSTANTIATE_TEST_SUITE_P(Dhcp6GetConfigTest, Dhcp6GetConfigTest,
+                         ::testing::Range(static_cast<size_t>(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 3daecfe99ef82d58298864389836b0d52e025a7f..7bd222f67533ce432f887e75d5659198e742f71c 100644 (file)
--- 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<generic::DS, generic::DLV> 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 344ef69f24961b62b664e33f66656f0d0b4cc643..b087abe7abffb45d4c5ca210d1281c6524efc318 100644 (file)
--- 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<generic::NSEC3, generic::NSEC3PARAM> 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 e50a430363cb01e7926885c46e43f12c948e0eda..a5f3a6c5939ec8112c86d21fb4b3abe836017ca1 100644 (file)
--- 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<generic::NSEC, generic::NSEC3> 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 603af1d4fd243af687b01bbaecb7709398303025..c6965033bbaa8312aaf311fb3e802eea1a0069bc 100644 (file)
--- 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<generic::TXT, generic::SPF> 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