From: Kefu Chai <kchai@redhat.com>
Date: Tue, 3 Mar 2020 04:04:47 +0000 (+0800)
Subject: test: s/TYPED_TEST_CASE/TYPED_TEST_SUITE/
X-Git-Tag: v15.1.1~112^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e839e9be3e66377354c8b4174017d2e05b8a96e5;p=ceph.git

test: s/TYPED_TEST_CASE/TYPED_TEST_SUITE/

`TYPED_TEST_CASE` is deprecated. let's use `TYPED_TEST_SUITE` instead.

this silences the warning from gtest.

```
../src/test/rbd_mirror/test_ImageReplayer.cc:584:1: warning: 'TypedTestCaseIsDeprecated' is deprecated: TYPED_TEST_CASE is deprecated, please use TYPED_TEST_SUITE [-Wdeprecated-declarations]
TYPED_TEST_CASE(TestImageReplayer, TestImageReplayerTypes);
^
../src/googletest/googletest/include/gtest/gtest-typed-test.h:229:38: note: expanded from macro 'TYPED_TEST_CASE'
  static_assert(::testing::internal::TypedTestCaseIsDeprecated(), ""); \
                                     ^
../src/googletest/googletest/include/gtest/internal/gtest-internal.h:1246:1: note: 'TypedTestCaseIsDeprecated' has been explicitly marked deprecated here
GTEST_INTERNAL_DEPRECATED(
^
../src/googletest/googletest/include/gtest/internal/gtest-port.h:2216:59: note: expanded from macro 'GTEST_INTERNAL_DEPRECATED'
                                                          ^
```

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

diff --git a/src/test/librbd/test_librbd.cc b/src/test/librbd/test_librbd.cc
index 24d9822a7078..86aa95c88b63 100644
--- a/src/test/librbd/test_librbd.cc
+++ b/src/test/librbd/test_librbd.cc
@@ -3942,7 +3942,7 @@ public:
 
 typedef ::testing::Types<DiffIterateParams<false>,
                          DiffIterateParams<true> > DiffIterateTypes;
-TYPED_TEST_CASE(DiffIterateTest, DiffIterateTypes);
+TYPED_TEST_SUITE(DiffIterateTest, DiffIterateTypes);
 
 TYPED_TEST(DiffIterateTest, DiffIterate)
 {
diff --git a/src/test/rbd_mirror/test_ImageReplayer.cc b/src/test/rbd_mirror/test_ImageReplayer.cc
index d5962984369b..aeae293b12c3 100644
--- a/src/test/rbd_mirror/test_ImageReplayer.cc
+++ b/src/test/rbd_mirror/test_ImageReplayer.cc
@@ -581,7 +581,7 @@ typedef ::testing::Types<TestImageReplayerParams<
                            cls::rbd::MIRROR_IMAGE_MODE_SNAPSHOT>>
     TestImageReplayerTypes;
 
-TYPED_TEST_CASE(TestImageReplayer, TestImageReplayerTypes);
+TYPED_TEST_SUITE(TestImageReplayer, TestImageReplayerTypes);
 
 TYPED_TEST(TestImageReplayer, Bootstrap)
 {