From: Kefu Chai <kchai@redhat.com>
Date: Thu, 2 May 2019 17:29:21 +0000 (+0800)
Subject: test: s/INSTANTIATE_TEST_CASE_P/INSTANTIATE_TEST_SUITE_P/
X-Git-Tag: v15.1.0~2769^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=71f5f3e8da9644fa54032fa8255f6ef7d36de3a5;p=ceph.git

test: s/INSTANTIATE_TEST_CASE_P/INSTANTIATE_TEST_SUITE_P/

the former is deprecated

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/test/compressor/test_compression.cc b/src/test/compressor/test_compression.cc
index 102ab56153db..534d7b5ddb8e 100644
--- a/src/test/compressor/test_compression.cc
+++ b/src/test/compressor/test_compression.cc
@@ -323,7 +323,7 @@ TEST_P(CompressorTest, decompress_16384)
 }
 
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
   Compressor,
   CompressorTest,
   ::testing::Values(
diff --git a/src/test/erasure-code/TestErasureCodeShec_all.cc b/src/test/erasure-code/TestErasureCodeShec_all.cc
index c52571302135..81a5ac4b077a 100644
--- a/src/test/erasure-code/TestErasureCodeShec_all.cc
+++ b/src/test/erasure-code/TestErasureCodeShec_all.cc
@@ -260,7 +260,7 @@ TEST_P(ParameterTest, parameter_all)
   delete crush;
 }
 
-INSTANTIATE_TEST_CASE_P(Test, ParameterTest, ::testing::ValuesIn(param));
+INSTANTIATE_TEST_SUITE_P(Test, ParameterTest, ::testing::ValuesIn(param));
 
 int main(int argc, char **argv)
 {
diff --git a/src/test/librados/watch_notify_cxx.cc b/src/test/librados/watch_notify_cxx.cc
index 0289cba8b707..011d7bada312 100644
--- a/src/test/librados/watch_notify_cxx.cc
+++ b/src/test/librados/watch_notify_cxx.cc
@@ -360,5 +360,5 @@ TEST_P(LibRadosWatchNotifyPP, WatchNotify3) {
 }
 // --
 
-INSTANTIATE_TEST_CASE_P(LibRadosWatchNotifyPPTests, LibRadosWatchNotifyPP,
+INSTANTIATE_TEST_SUITE_P(LibRadosWatchNotifyPPTests, LibRadosWatchNotifyPP,
 			::testing::Values("", "cache"));
diff --git a/src/test/libradosstriper/striping.cc b/src/test/libradosstriper/striping.cc
index 647014c0d676..2de8b55f8787 100644
--- a/src/test/libradosstriper/striping.cc
+++ b/src/test/libradosstriper/striping.cc
@@ -324,6 +324,6 @@ const TestData simple_stripe_schemes[] = {
   {CEPH_MIN_STRIPE_UNIT, 50,           3*CEPH_MIN_STRIPE_UNIT, 45*CEPH_MIN_STRIPE_UNIT+100}
 };
 
-INSTANTIATE_TEST_CASE_P(SimpleStriping,
+INSTANTIATE_TEST_SUITE_P(SimpleStriping,
                         StriperTestRT,
                         ::testing::ValuesIn(simple_stripe_schemes));
diff --git a/src/test/msgr/test_async_driver.cc b/src/test/msgr/test_async_driver.cc
index 08d35a0e1922..f15c37d9e41c 100644
--- a/src/test/msgr/test_async_driver.cc
+++ b/src/test/msgr/test_async_driver.cc
@@ -332,7 +332,7 @@ TEST(EventCenterTest, DispatchTest) {
   worker2.join();
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
   AsyncMessenger,
   EventDriverTest,
   ::testing::Values(
diff --git a/src/test/msgr/test_async_networkstack.cc b/src/test/msgr/test_async_networkstack.cc
index 88a196b05b6f..0cc7e351a1a5 100644
--- a/src/test/msgr/test_async_networkstack.cc
+++ b/src/test/msgr/test_async_networkstack.cc
@@ -1066,7 +1066,7 @@ TEST_P(NetworkWorkerTest, StressTest) {
 }
 
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
   NetworkStack,
   NetworkWorkerTest,
   ::testing::Values(
diff --git a/src/test/msgr/test_msgr.cc b/src/test/msgr/test_msgr.cc
index 7b55ad4b2d28..4818b4c9f53f 100644
--- a/src/test/msgr/test_msgr.cc
+++ b/src/test/msgr/test_msgr.cc
@@ -2213,7 +2213,7 @@ TEST_P(MessengerTest, MarkdownTest) {
   delete server_msgr2;
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
   Messenger,
   MessengerTest,
   ::testing::Values(
diff --git a/src/test/objectstore/Allocator_bench.cc b/src/test/objectstore/Allocator_bench.cc
index 2a20a7ac49b3..bd030df701ca 100755
--- a/src/test/objectstore/Allocator_bench.cc
+++ b/src/test/objectstore/Allocator_bench.cc
@@ -329,7 +329,7 @@ TEST_P(AllocTest, test_alloc_bench_10_300)
   doOverwriteTest(capacity, prefill, overwrite);
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
   Allocator,
   AllocTest,
   ::testing::Values("stupid", "bitmap"));
diff --git a/src/test/objectstore/Allocator_test.cc b/src/test/objectstore/Allocator_test.cc
index 09e4f37245ef..5c579103c533 100644
--- a/src/test/objectstore/Allocator_test.cc
+++ b/src/test/objectstore/Allocator_test.cc
@@ -328,7 +328,7 @@ TEST_P(AllocTest, test_alloc_bug_24598)
   EXPECT_EQ(1u, tmp.size());
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
   Allocator,
   AllocTest,
   ::testing::Values("stupid", "bitmap"));
diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc
index eac90a3aacb7..ddd54c149b15 100644
--- a/src/test/objectstore/store_test.cc
+++ b/src/test/objectstore/store_test.cc
@@ -6188,7 +6188,7 @@ TEST_P(StoreTest, BluestoreOnOffCSumTest) {
 }
 #endif
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
   ObjectStore,
   StoreTest,
   ::testing::Values(
@@ -6200,7 +6200,7 @@ INSTANTIATE_TEST_CASE_P(
     "kstore"));
 
 // Note: instantiate all stores to preserve store numbering order only
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
   ObjectStore,
   StoreTestSpecificAUSize,
   ::testing::Values(
diff --git a/src/test/objectstore/test_kv.cc b/src/test/objectstore/test_kv.cc
index c47a29299bc4..fe2560e63417 100644
--- a/src/test/objectstore/test_kv.cc
+++ b/src/test/objectstore/test_kv.cc
@@ -467,7 +467,7 @@ TEST_P(KVTest, RocksDBCFMerge) {
   fini();
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
   KeyValueDB,
   KVTest,
   ::testing::Values("leveldb", "rocksdb", "memdb"));
diff --git a/src/test/test_stress_watch.cc b/src/test/test_stress_watch.cc
index 003fc2b0ac5b..aee257b9a8bd 100644
--- a/src/test/test_stress_watch.cc
+++ b/src/test/test_stress_watch.cc
@@ -62,7 +62,7 @@ struct WatcherUnwatcher : public Thread {
 
 typedef RadosTestParamPP WatchStress;
 
-INSTANTIATE_TEST_CASE_P(WatchStressTests, WatchStress,
+INSTANTIATE_TEST_SUITE_P(WatchStressTests, WatchStress,
 			::testing::Values("", "cache"));
 
 TEST_P(WatchStress, Stress1) {