OilfieldToolsNet/IFEM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use INSTANTIATE_TEST_SUITE_P instead of INSTANTIATE_TEST_CASE_P

Browse Source 
latter is deprecated
This commit is contained in:
Arne Morten Kvarving 2022-05-19 11:05:59 +02:00
parent 1d7439f36f
commit ad4264505e
9 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Apps/Common/Test/TestMultiPatchModelGenerator.C
View File

@ -431,9 +431,9 @@ const std::vector<SubPatchTest> SubPatch1D =
};
INSTANTIATE_TEST_CASE_P(TestGetSubPatch1D,
TestGetSubPatch1D,
testing::ValuesIn(SubPatch1D));
INSTANTIATE_TEST_SUITE_P(TestGetSubPatch1D,
TestGetSubPatch1D,
testing::ValuesIn(SubPatch1D));
class TestGetSubPatch2D :
@ -605,9 +605,9 @@ const std::vector<SubPatchTest> SubPatch2D =
};
INSTANTIATE_TEST_CASE_P(TestGetSubPatch2D,
TestGetSubPatch2D,
testing::ValuesIn(SubPatch2D));
INSTANTIATE_TEST_SUITE_P(TestGetSubPatch2D,
TestGetSubPatch2D,
testing::ValuesIn(SubPatch2D));
class TestGetSubPatch3D :
@ -820,9 +820,9 @@ const std::vector<SubPatchTest> SubPatch3D =
};
INSTANTIATE_TEST_CASE_P(TestGetSubPatch3D,
TestGetSubPatch3D,
testing::ValuesIn(SubPatch3D));
INSTANTIATE_TEST_SUITE_P(TestGetSubPatch3D,
TestGetSubPatch3D,
testing::ValuesIn(SubPatch3D));
TEST(TestMultiPatchModelGenerator3D, InnerPatches)
{
@ -1068,9 +1068,9 @@ const std::vector<GeomTest> geometry2D =
"Vertex4: 4 4 0 \n"}};
INSTANTIATE_TEST_CASE_P(TestMultiPatchModelGenerator2D,
TestMultiPatchModelGenerator2D,
testing::ValuesIn(geometry2D));
INSTANTIATE_TEST_SUITE_P(TestMultiPatchModelGenerator2D,
TestMultiPatchModelGenerator2D,
testing::ValuesIn(geometry2D));
const std::vector<GeomTest> geometry3D =
@ -1663,6 +1663,6 @@ const std::vector<GeomTest> geometry3D =
"Vertex8: 8 8 0 \n"}};
INSTANTIATE_TEST_CASE_P(TestMultiPatchModelGenerator3D,
TestMultiPatchModelGenerator3D,
testing::ValuesIn(geometry3D));
INSTANTIATE_TEST_SUITE_P(TestMultiPatchModelGenerator3D,
TestMultiPatchModelGenerator3D,
testing::ValuesIn(geometry3D));

4
Apps/Common/Test/TestSIMNodalConstraint.C
View File

@ -392,5 +392,5 @@ TEST(TestSIMNodalConstraint, ASMs3DmxE3)
}
const std::vector<int> tests = {1,2,3,4,5,6,7,8,9,10,11,12};
INSTANTIATE_TEST_CASE_P(TestSIMNodalConstraint, TestSIMNodalConstraint,
testing::ValuesIn(tests));
INSTANTIATE_TEST_SUITE_P(TestSIMNodalConstraint, TestSIMNodalConstraint,
testing::ValuesIn(tests));

2
src/ASM/Test/TestASMs2D.C
View File

@ -75,7 +75,7 @@ TEST_P(TestASMs2D, Connect)
}
INSTANTIATE_TEST_CASE_P(TestASMs2D, TestASMs2D, testing::Values(0,1));
INSTANTIATE_TEST_SUITE_P(TestASMs2D, TestASMs2D, testing::Values(0,1));
class ASMdegenerate2D : public ASMs2D

4
src/ASM/Test/TestASMs3D.C
View File

@ -105,8 +105,8 @@ TEST_P(TestASMs3D, ConnectUneven)
}
INSTANTIATE_TEST_CASE_P(TestASMs3D, TestASMs3D,
testing::Values(0,1,2,3,5,6,7,8,9,10,11,12));
INSTANTIATE_TEST_SUITE_P(TestASMs3D, TestASMs3D,
testing::Values(0,1,2,3,5,6,7,8,9,10,11,12));
class ASMdegenerate3D : public ASMs3D

2
src/ASM/Test/TestASMsupel.C
View File

@ -47,4 +47,4 @@ const std::vector<TestCase> testFiles = {
{ "src/ASM/Test/refdata/kjoint.dat", 4U }};
INSTANTIATE_TEST_CASE_P(TestASMsup, TestASMsup, testing::ValuesIn(testFiles));
INSTANTIATE_TEST_SUITE_P(TestASMsup, TestASMsup, testing::ValuesIn(testFiles));

2
src/Eig/Test/TestEigSolver.C
View File

@ -68,4 +68,4 @@ TEST_P(TestEigSolver, Arpack)
const std::vector<int> modes = {1,2,3,4};
INSTANTIATE_TEST_CASE_P(TestEigSolver, TestEigSolver, testing::ValuesIn(modes));
INSTANTIATE_TEST_SUITE_P(TestEigSolver, TestEigSolver, testing::ValuesIn(modes));

6
src/SIM/Test/TestModelGenerator.C
View File

@ -194,7 +194,7 @@ const std::vector<DefaultGeomTest> geometry1D =
"Vertex2: 1 2 0 \n"}};
INSTANTIATE_TEST_CASE_P(TestModelGenerator1D, TestModelGenerator1D, testing::ValuesIn(geometry1D));
INSTANTIATE_TEST_SUITE_P(TestModelGenerator1D, TestModelGenerator1D, testing::ValuesIn(geometry1D));
const std::vector<DefaultGeomTest> geometry2D =
@ -337,7 +337,7 @@ const std::vector<DefaultGeomTest> geometry2D =
"1 2\n", ""}};
INSTANTIATE_TEST_CASE_P(TestModelGenerator2D, TestModelGenerator2D, testing::ValuesIn(geometry2D));
INSTANTIATE_TEST_SUITE_P(TestModelGenerator2D, TestModelGenerator2D, testing::ValuesIn(geometry2D));
const std::vector<DefaultGeomTest> geometry3D =
@ -674,4 +674,4 @@ const std::vector<DefaultGeomTest> geometry3D =
"1 1 2 \n", ""}};
INSTANTIATE_TEST_CASE_P(TestModelGenerator3D, TestModelGenerator3D, testing::ValuesIn(geometry3D));
INSTANTIATE_TEST_SUITE_P(TestModelGenerator3D, TestModelGenerator3D, testing::ValuesIn(geometry3D));

4
src/SIM/Test/TestSIM.C
View File

@ -273,7 +273,7 @@ std::vector<std::pair<int,ASM::Discretization>> orientations2D = {{0, ASM::Splin
{1, ASM::LRSpline}
#endif
};
INSTANTIATE_TEST_CASE_P(TestSIM2D, TestSIM2D, testing::ValuesIn(orientations2D));
INSTANTIATE_TEST_SUITE_P(TestSIM2D, TestSIM2D, testing::ValuesIn(orientations2D));
class TestSIM3D : public testing::Test,
@ -452,4 +452,4 @@ const std::vector<std::pair<int,ASM::Discretization>> orientations3D = {{0, ASM:
#endif
};
INSTANTIATE_TEST_CASE_P(TestSIM3D, TestSIM3D, testing::ValuesIn(orientations3D));
INSTANTIATE_TEST_SUITE_P(TestSIM3D, TestSIM3D, testing::ValuesIn(orientations3D));

6
src/Utility/Test/TestGaussQuadrature.C
View File

@ -40,6 +40,6 @@ TEST_P(TestGaussQuadrature, Integrate)
}
INSTANTIATE_TEST_CASE_P(TestGaussQuadrature,
TestGaussQuadrature,
testing::Values(1, 2, 3, 4, 5, 6, 7, 8, 9, 10));
INSTANTIATE_TEST_SUITE_P(TestGaussQuadrature,
TestGaussQuadrature,
testing::Values(1, 2, 3, 4, 5, 6, 7, 8, 9, 10));