From 9014cc63351ae052ae7941daebfc9948fb002aaa Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Sat, 2 Sep 2023 13:22:11 +0200 Subject: [PATCH] changed: use INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P causes deprecation warnings with newer gtest versions --- Apps/Common/Test/LR/TestMultiPatchLRRefine.C | 12 ++++++------ src/ASM/LR/Test/TestASMu2D.C | 4 ++-- src/ASM/LR/Test/TestASMu3D.C | 6 +++--- src/ASM/Test/MPI/TestDomainDecomposition.C | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Apps/Common/Test/LR/TestMultiPatchLRRefine.C b/Apps/Common/Test/LR/TestMultiPatchLRRefine.C index 9b0b74619..4f7c76bba 100644 --- a/Apps/Common/Test/LR/TestMultiPatchLRRefine.C +++ b/Apps/Common/Test/LR/TestMultiPatchLRRefine.C @@ -123,9 +123,9 @@ TEST_P(TestMultiPatchLRRefine3D, Refine) const std::vector refValues = {0,1,2}; -INSTANTIATE_TEST_CASE_P(TestMultiPatchLRRefine2D, - TestMultiPatchLRRefine2D, - testing::ValuesIn(refValues)); -INSTANTIATE_TEST_CASE_P(TestMultiPatchLRRefine3D, - TestMultiPatchLRRefine3D, - testing::ValuesIn(refValues)); +INSTANTIATE_TEST_SUITE_P(TestMultiPatchLRRefine2D, + TestMultiPatchLRRefine2D, + testing::ValuesIn(refValues)); +INSTANTIATE_TEST_SUITE_P(TestMultiPatchLRRefine3D, + TestMultiPatchLRRefine3D, + testing::ValuesIn(refValues)); diff --git a/src/ASM/LR/Test/TestASMu2D.C b/src/ASM/LR/Test/TestASMu2D.C index e3fb61aec..498581bbf 100644 --- a/src/ASM/LR/Test/TestASMu2D.C +++ b/src/ASM/LR/Test/TestASMu2D.C @@ -95,8 +95,8 @@ static const std::vector edgeTestData = {4, 2, {{-1, 1}}, {{ 1, 1}}}}}; -INSTANTIATE_TEST_CASE_P(TestASMu2D, TestASMu2D, - testing::ValuesIn(edgeTestData)); +INSTANTIATE_TEST_SUITE_P(TestASMu2D, TestASMu2D, + testing::ValuesIn(edgeTestData)); TEST(TestASMu2D, InterfaceChecker) diff --git a/src/ASM/LR/Test/TestASMu3D.C b/src/ASM/LR/Test/TestASMu3D.C index f71549846..d159b6c7a 100644 --- a/src/ASM/LR/Test/TestASMu3D.C +++ b/src/ASM/LR/Test/TestASMu3D.C @@ -85,9 +85,9 @@ TEST_P(TestASMu3D, ConnectUneven) const std::vector tests = {0,1,2,3,4,5,6,7,8,9,10,11,12}; -INSTANTIATE_TEST_CASE_P(TestASMu3D, - TestASMu3D, - testing::ValuesIn(tests)); +INSTANTIATE_TEST_SUITE_P(TestASMu3D, + TestASMu3D, + testing::ValuesIn(tests)); TEST(TestASMu3D, TransferGaussPtVars) diff --git a/src/ASM/Test/MPI/TestDomainDecomposition.C b/src/ASM/Test/MPI/TestDomainDecomposition.C index bbb231c71..8cad22d3b 100644 --- a/src/ASM/Test/MPI/TestDomainDecomposition.C +++ b/src/ASM/Test/MPI/TestDomainDecomposition.C @@ -619,6 +619,6 @@ TEST_P(TestDomainDecomposition3D, CornerLR) } const std::vector orientations2D = {0,1}; -INSTANTIATE_TEST_CASE_P(TestDomainDecomposition2D, TestDomainDecomposition2D, testing::ValuesIn(orientations2D)); +INSTANTIATE_TEST_SUITE_P(TestDomainDecomposition2D, TestDomainDecomposition2D, testing::ValuesIn(orientations2D)); const std::vector orientations3D = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16}; -INSTANTIATE_TEST_CASE_P(TestDomainDecomposition3D, TestDomainDecomposition3D, testing::ValuesIn(orientations3D)); +INSTANTIATE_TEST_SUITE_P(TestDomainDecomposition3D, TestDomainDecomposition3D, testing::ValuesIn(orientations3D));