From 50d39cd4486cd438735a36e928a8f91435bcdd7c Mon Sep 17 00:00:00 2001 From: Dmitri Naumov <dmitri.naumov@ufz.de> Date: Tue, 5 Jan 2021 20:24:59 +0100 Subject: [PATCH] [T] Use TYPED_TEST_SUITE instead of depricated. TYPED_TEST_CASE is deprecated, please use TYPED_TEST_SUITE since googletest 1.10.x. --- Tests/MaterialLib/MFront.cpp | 4 ++-- Tests/MathLib/TestNonlinear1D.cpp | 2 +- Tests/NumLib/TestCoordinatesMapping.cpp | 2 +- Tests/NumLib/TestFe.cpp | 2 +- Tests/NumLib/TestGradShapeFunction.cpp | 2 +- Tests/NumLib/TestODEInt.cpp | 2 +- Tests/NumLib/TestSerialExecutor.cpp | 2 +- Tests/NumLib/TestShapeFunctions.cpp | 2 +- Tests/ProcessLib/TestJacobianAssembler.cpp | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Tests/MaterialLib/MFront.cpp b/Tests/MaterialLib/MFront.cpp index 2b5847be01e..83ea6f77df2 100644 --- a/Tests/MaterialLib/MFront.cpp +++ b/Tests/MaterialLib/MFront.cpp @@ -157,8 +157,8 @@ using TestBehaviourTypes = ::testing::Types<StandardElasticityBrickBehaviour<Dim>, ElasticBehaviour<Dim>, MohrCoulombAbboSloanBehaviour<Dim>>; -TYPED_TEST_CASE(MaterialLib_SolidModelsMFront2, TestBehaviourTypes<2>); -TYPED_TEST_CASE(MaterialLib_SolidModelsMFront3, TestBehaviourTypes<3>); +TYPED_TEST_SUITE(MaterialLib_SolidModelsMFront2, TestBehaviourTypes<2>); +TYPED_TEST_SUITE(MaterialLib_SolidModelsMFront3, TestBehaviourTypes<3>); TYPED_TEST(MaterialLib_SolidModelsMFront2, IntegrateZeroDisplacement) { diff --git a/Tests/MathLib/TestNonlinear1D.cpp b/Tests/MathLib/TestNonlinear1D.cpp index 221d9c03837..c076a12e959 100644 --- a/Tests/MathLib/TestNonlinear1D.cpp +++ b/Tests/MathLib/TestNonlinear1D.cpp @@ -26,7 +26,7 @@ class MathLibRegulaFalsi : public ::testing::Test namespace NL = MathLib::Nonlinear; using RegulaFalsiTypes = ::testing::Types<NL::Unmodified, NL::Illinois, NL::Pegasus, NL::AndersonBjorck>; -TYPED_TEST_CASE(MathLibRegulaFalsi, RegulaFalsiTypes); +TYPED_TEST_SUITE(MathLibRegulaFalsi, RegulaFalsiTypes); TYPED_TEST(MathLibRegulaFalsi, QuadraticFunction) { diff --git a/Tests/NumLib/TestCoordinatesMapping.cpp b/Tests/NumLib/TestCoordinatesMapping.cpp index 46f1134604e..663a6d455d3 100644 --- a/Tests/NumLib/TestCoordinatesMapping.cpp +++ b/Tests/NumLib/TestCoordinatesMapping.cpp @@ -107,7 +107,7 @@ public: ElementType* zeroVolumeEle; }; -TYPED_TEST_CASE(NumLibFemNaturalCoordinatesMappingTest, TestTypes); +TYPED_TEST_SUITE(NumLibFemNaturalCoordinatesMappingTest, TestTypes); TYPED_TEST(NumLibFemNaturalCoordinatesMappingTest, CheckFieldSpecification_N) { diff --git a/Tests/NumLib/TestFe.cpp b/Tests/NumLib/TestFe.cpp index 40bd7bb9dd6..65b65c9dd23 100644 --- a/Tests/NumLib/TestFe.cpp +++ b/Tests/NumLib/TestFe.cpp @@ -185,7 +185,7 @@ const unsigned NumLibFemIsoTest<T>::n_sample_pt_order2; template <class T> const unsigned NumLibFemIsoTest<T>::n_sample_pt_order3; -TYPED_TEST_CASE(NumLibFemIsoTest, TestTypes); +TYPED_TEST_SUITE(NumLibFemIsoTest, TestTypes); TYPED_TEST(NumLibFemIsoTest, CheckMassMatrix) { diff --git a/Tests/NumLib/TestGradShapeFunction.cpp b/Tests/NumLib/TestGradShapeFunction.cpp index 53cbfbef254..5689bf1cf2f 100644 --- a/Tests/NumLib/TestGradShapeFunction.cpp +++ b/Tests/NumLib/TestGradShapeFunction.cpp @@ -169,7 +169,7 @@ const unsigned GradShapeFunctionTest<T>::n_sample_pt_order2; template <class T> const unsigned GradShapeFunctionTest<T>::n_sample_pt_order3; -TYPED_TEST_CASE(GradShapeFunctionTest, TestTypes); +TYPED_TEST_SUITE(GradShapeFunctionTest, TestTypes); TYPED_TEST(GradShapeFunctionTest, CheckGradShapeFunctionByComputingElementVolume) diff --git a/Tests/NumLib/TestODEInt.cpp b/Tests/NumLib/TestODEInt.cpp index 465a2558fba..d7fa999d1d0 100644 --- a/Tests/NumLib/TestODEInt.cpp +++ b/Tests/NumLib/TestODEInt.cpp @@ -234,7 +234,7 @@ public: } }; -TYPED_TEST_CASE(NumLibODEIntTyped, TestCases); +TYPED_TEST_SUITE(NumLibODEIntTyped, TestCases); // Temporarily disabled for PETSc issue #1989 #ifndef USE_PETSC diff --git a/Tests/NumLib/TestSerialExecutor.cpp b/Tests/NumLib/TestSerialExecutor.cpp index 45254bd30d8..b114c658751 100644 --- a/Tests/NumLib/TestSerialExecutor.cpp +++ b/Tests/NumLib/TestSerialExecutor.cpp @@ -72,7 +72,7 @@ public: using TestCases = ::testing::Types<int>; -TYPED_TEST_CASE(NumLibSerialExecutor, TestCases); +TYPED_TEST_SUITE(NumLibSerialExecutor, TestCases); TYPED_TEST(NumLibSerialExecutor, ContainerArgument) { diff --git a/Tests/NumLib/TestShapeFunctions.cpp b/Tests/NumLib/TestShapeFunctions.cpp index 2c61c5b7c40..aca35e3a766 100644 --- a/Tests/NumLib/TestShapeFunctions.cpp +++ b/Tests/NumLib/TestShapeFunctions.cpp @@ -105,7 +105,7 @@ using ShapeFunctionTestTypes = ShapeTet10, ShapeQuad4, ShapeQuad8, ShapeQuad9, ShapeHex8, ShapeHex20>; -TYPED_TEST_CASE(ShapeFunctionTest, ShapeFunctionTestTypes); +TYPED_TEST_SUITE(ShapeFunctionTest, ShapeFunctionTestTypes); // TypeParam is the type of the ShapeFunction. // Access private members via this pointer or TestFixture:: for types diff --git a/Tests/ProcessLib/TestJacobianAssembler.cpp b/Tests/ProcessLib/TestJacobianAssembler.cpp index 5967d69d43f..a2a1483ff4a 100644 --- a/Tests/ProcessLib/TestJacobianAssembler.cpp +++ b/Tests/ProcessLib/TestJacobianAssembler.cpp @@ -602,7 +602,7 @@ using TestCases = ::testing::Types< LocalAssemblerMKb<MatVecXSquaredShifted, MatVecXSquaredShifted, MatVecXSquaredShifted>>; -TYPED_TEST_CASE(ProcessLibCentralDifferencesJacobianAssembler, TestCases); +TYPED_TEST_SUITE(ProcessLibCentralDifferencesJacobianAssembler, TestCases); TYPED_TEST(ProcessLibCentralDifferencesJacobianAssembler, Test) { -- GitLab