From: Adam C. Emerson <aemerson@redhat.com>
Date: Tue, 18 Jun 2019 17:08:18 +0000 (-0400)
Subject: test: Replace deprecated TYPED_TEST_CASE with TYPED_TEST_SUITE
X-Git-Tag: v15.1.0~2390^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F28684%2Fhead;p=ceph.git

test: Replace deprecated TYPED_TEST_CASE with TYPED_TEST_SUITE

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
---

diff --git a/src/test/common/test_bit_vector.cc b/src/test/common/test_bit_vector.cc
index dda77b0a0734..b986c232ab43 100644
--- a/src/test/common/test_bit_vector.cc
+++ b/src/test/common/test_bit_vector.cc
@@ -28,7 +28,7 @@ public:
 };
 
 typedef ::testing::Types<TestParams<2> > BitVectorTypes;
-TYPED_TEST_CASE(BitVectorTest, BitVectorTypes);
+TYPED_TEST_SUITE(BitVectorTest, BitVectorTypes);
 
 TYPED_TEST(BitVectorTest, resize) {
   typename TestFixture::bit_vector_t bit_vector;
diff --git a/src/test/common/test_interval_map.cc b/src/test/common/test_interval_map.cc
index f84fbd3d413c..99f676f288b6 100644
--- a/src/test/common/test_interval_map.cc
+++ b/src/test/common/test_interval_map.cc
@@ -72,7 +72,7 @@ struct bufferlist_test_type {
 
 using IntervalMapTypes = ::testing::Types< bufferlist_test_type<uint64_t> >;
 
-TYPED_TEST_CASE(IntervalMapTest, IntervalMapTypes);
+TYPED_TEST_SUITE(IntervalMapTest, IntervalMapTypes);
 
 #define USING(_can_merge)					 \
   using TT = typename TestFixture::TestType;                     \
diff --git a/src/test/common/test_interval_set.cc b/src/test/common/test_interval_set.cc
index e63953a6bb13..f43abadffabc 100644
--- a/src/test/common/test_interval_set.cc
+++ b/src/test/common/test_interval_set.cc
@@ -38,7 +38,7 @@ typedef ::testing::Types<
 	       boost::container::flat_map<IntervalValueType,IntervalValueType>>
   > IntervalSetTypes;
 
-TYPED_TEST_CASE(IntervalSetTest, IntervalSetTypes);
+TYPED_TEST_SUITE(IntervalSetTest, IntervalSetTypes);
 
 TYPED_TEST(IntervalSetTest, compare) {
   typedef typename TestFixture::ISet ISet;
diff --git a/src/test/erasure-code/TestErasureCodeJerasure.cc b/src/test/erasure-code/TestErasureCodeJerasure.cc
index 54930e5ed0bb..033225cefd3b 100644
--- a/src/test/erasure-code/TestErasureCodeJerasure.cc
+++ b/src/test/erasure-code/TestErasureCodeJerasure.cc
@@ -40,7 +40,7 @@ typedef ::testing::Types<
   ErasureCodeJerasureBlaumRoth,
   ErasureCodeJerasureLiber8tion
 > JerasureTypes;
-TYPED_TEST_CASE(ErasureCodeTest, JerasureTypes);
+TYPED_TEST_SUITE(ErasureCodeTest, JerasureTypes);
 
 TYPED_TEST(ErasureCodeTest, sanity_check_k)
 {
diff --git a/src/test/journal/test_JournalPlayer.cc b/src/test/journal/test_JournalPlayer.cc
index 3ae04c07ad94..7c2388f5a6b1 100644
--- a/src/test/journal/test_JournalPlayer.cc
+++ b/src/test/journal/test_JournalPlayer.cc
@@ -143,7 +143,7 @@ public:
 
 typedef ::testing::Types<TestJournalPlayerParams<0>,
                          TestJournalPlayerParams<16> > TestJournalPlayerTypes;
-TYPED_TEST_CASE(TestJournalPlayer, TestJournalPlayerTypes);
+TYPED_TEST_SUITE(TestJournalPlayer, TestJournalPlayerTypes);
 
 TYPED_TEST(TestJournalPlayer, Prefetch) {
   std::string oid = this->get_temp_oid();
diff --git a/src/test/journal/test_ObjectPlayer.cc b/src/test/journal/test_ObjectPlayer.cc
index 3c255c9ed6cc..2b0deecd1091 100644
--- a/src/test/journal/test_ObjectPlayer.cc
+++ b/src/test/journal/test_ObjectPlayer.cc
@@ -69,7 +69,7 @@ struct TestObjectPlayerParams {
 
 typedef ::testing::Types<TestObjectPlayerParams<0>,
                          TestObjectPlayerParams<10> > TestObjectPlayerTypes;
-TYPED_TEST_CASE(TestObjectPlayer, TestObjectPlayerTypes);
+TYPED_TEST_SUITE(TestObjectPlayer, TestObjectPlayerTypes);
 
 TYPED_TEST(TestObjectPlayer, Fetch) {
   std::string oid = this->get_temp_oid();
diff --git a/src/test/librados/misc_cxx.cc b/src/test/librados/misc_cxx.cc
index 6e0eb2543af3..20348a5e1287 100644
--- a/src/test/librados/misc_cxx.cc
+++ b/src/test/librados/misc_cxx.cc
@@ -714,7 +714,7 @@ typedef ::testing::Types<
 			   Checksummer::crc32c, uint32_t>
   > LibRadosChecksumTypes;
 
-TYPED_TEST_CASE(LibRadosChecksum, LibRadosChecksumTypes);
+TYPED_TEST_SUITE(LibRadosChecksum, LibRadosChecksumTypes);
 
 TYPED_TEST(LibRadosChecksum, Subset) {
   uint32_t chunk_size = 1024;
diff --git a/src/test/test_str_list.cc b/src/test/test_str_list.cc
index 9c8e5355a2a2..cb2536dd7378 100644
--- a/src/test/test_str_list.cc
+++ b/src/test/test_str_list.cc
@@ -26,7 +26,7 @@ struct SplitTest : ::testing::Test {
   }
 };
 
-TYPED_TEST_CASE(SplitTest, Types);
+TYPED_TEST_SUITE(SplitTest, Types);
 
 TYPED_TEST(SplitTest, Get)
 {