Commit 8be9232b authored by Chen Song's avatar Chen Song
Browse files

replace new googletest function, the old function will be deprecated

parent 73ebefde
......@@ -46,7 +46,7 @@ typedef ::testing::Types< LADescriptorCoupledD
>
MyTypeListBlockMatrix;
TYPED_TEST_CASE(BlockMatrixTest, MyTypeListBlockMatrix);
TYPED_TEST_SUITE(BlockMatrixTest, MyTypeListBlockMatrix);
/// Test adding and getting values to/from HypreMatrix
......
......@@ -48,7 +48,7 @@ typedef ::testing::Types< BlockVector< LADescriptorCoupledD >
>
MyTypeListBlockVector;
TYPED_TEST_CASE(BlockVectorTest, MyTypeListBlockVector);
TYPED_TEST_SUITE(BlockVectorTest, MyTypeListBlockVector);
TYPED_TEST(BlockVectorTest, set_get_value) {
MPI_Comm comm(MPI_COMM_WORLD);
......
......@@ -41,7 +41,7 @@ template < class MT, class VT, class DT, class PT > struct TypeList {
template < typename T > class LocalSolverTest : public ::testing::Test {};
TYPED_TEST_CASE_P(LocalSolverTest);
TYPED_TEST_SUITE_P(LocalSolverTest);
template < class VectorType >
void read_vector(VectorType &v, std::string const &filename) {
......
......@@ -217,7 +217,7 @@ TEST_P(PETScLinearSolverTestReadData, PETScGeneralKSP_solver) {
}
}
INSTANTIATE_TEST_CASE_P(AllTests, PETScLinearSolverTestReadData,
INSTANTIATE_TEST_SUITE_P(AllTests, PETScLinearSolverTestReadData,
::testing::Values(InputData("set_A", petsc::CG),
InputData("set_A", petsc::GMRES),
InputData("set_B", petsc::CG),
......
......@@ -48,7 +48,7 @@ typedef ::testing::Types< CoupledVector< double >
>
MyTypeList;
TYPED_TEST_CASE(ParallelHDF5, MyTypeList);
TYPED_TEST_SUITE(ParallelHDF5, MyTypeList);
TYPED_TEST(ParallelHDF5, write_read_hdf5) {
MPI_Comm comm(MPI_COMM_WORLD);
......@@ -126,4 +126,4 @@ TYPED_TEST(ParallelHDF5, write_read_hdf5) {
for (int i = local_ilower; i <= local_iupper; ++i) {
EXPECT_DOUBLE_EQ(vec_check.GetValue(i), vec.GetValue(i));
}
}
\ No newline at end of file
}
......@@ -46,7 +46,7 @@ typedef ::testing::Types< LADescriptorCoupledD
>
MyTypeList;
TYPED_TEST_CASE(ParallelMatrix, MyTypeList);
TYPED_TEST_SUITE(ParallelMatrix, MyTypeList);
/// Test adding and getting values to/from HypreMatrix
......
......@@ -48,7 +48,7 @@ typedef ::testing::Types< LADescriptorCoupledD
>
MyTypeList;
TYPED_TEST_CASE(ParallelVector, MyTypeList);
TYPED_TEST_SUITE(ParallelVector, MyTypeList);
TYPED_TEST(ParallelVector, set_get_value) {
MPI_Comm comm(MPI_COMM_WORLD);
......@@ -860,4 +860,4 @@ TYPED_TEST(ParallelVector, get_all_dofs_and_values) {
for (int i = 0; i < dof_ids.size(); ++i) {
EXPECT_DOUBLE_EQ(dof_vals[i], static_cast< double >(dof_ids[i]));
}
}
\ No newline at end of file
}
......@@ -402,7 +402,7 @@ TEST_P(SeqDenseMatrixTest, compute_eigenvalues_and_vectors) {
}
}
INSTANTIATE_TEST_CASE_P(GeneralAndSpecial, SeqDenseMatrixTest,
INSTANTIATE_TEST_SUITE_P(GeneralAndSpecial, SeqDenseMatrixTest,
testing::Values(NAIVE
#ifdef WITH_OPENMP
,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment