From 0e40b464ec262b14a44245957c1d7017e36c8e86 Mon Sep 17 00:00:00 2001 From: v4hn Date: Thu, 3 Jun 2021 11:45:47 +0200 Subject: [PATCH] support TYPED_TEST_SUITE Get rid of deprecation warning if new variant exists. --- core/test/test_cost_queue.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/core/test/test_cost_queue.cpp b/core/test/test_cost_queue.cpp index c6b56823..0f4a0433 100644 --- a/core/test/test_cost_queue.cpp +++ b/core/test/test_cost_queue.cpp @@ -62,7 +62,11 @@ protected: }; // set of template types to test for using TypeInstances = ::testing::Types; +#ifdef TYPED_TEST_SUITE +TYPED_TEST_SUITE(ValueOrPointeeLessTest, TypeInstances); +#else TYPED_TEST_CASE(ValueOrPointeeLessTest, TypeInstances); +#endif TYPED_TEST(ValueOrPointeeLessTest, less) { EXPECT_TRUE(this->less(2, 3)); EXPECT_FALSE(this->less(1, 1)); @@ -101,7 +105,11 @@ protected: SCOPED_TRACE("pushAndValidate(" #cost ", " #__VA_ARGS__ ")"); \ this->pushAndValidate(cost, __VA_ARGS__); \ } +#ifdef TYPED_TEST_SUITE +TYPED_TEST_SUITE(OrderedTest, TypeInstances); +#else TYPED_TEST_CASE(OrderedTest, TypeInstances); +#endif TYPED_TEST(OrderedTest, sorting) { pushAndValidate(2, { 2 }); pushAndValidate(1, { 1, 2 });