From b72e2141220d065586c9189c704e0cec61c3f392 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Thu, 9 Jul 2015 18:11:22 +0200
Subject: [PATCH] [T] Replace EXPECT_THROW with EXPECT_DEATH.
---
Tests/GeoLib/TestGrid.cpp | 2 +-
Tests/GeoLib/TestPointVec.cpp | 16 ++++++++--------
Tests/MeshLib/MeshSubsets.cpp | 8 +++++---
3 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/Tests/GeoLib/TestGrid.cpp b/Tests/GeoLib/TestGrid.cpp
index f44fa4d8834..3a1bde2863d 100644
--- a/Tests/GeoLib/TestGrid.cpp
+++ b/Tests/GeoLib/TestGrid.cpp
@@ -23,7 +23,7 @@
TEST(GeoLib, InsertZeroPointsInGrid)
{
std::vector<GeoLib::Point*> pnts;
- ASSERT_THROW(GeoLib::Grid<GeoLib::Point> grid(pnts.begin(), pnts.end()), std::invalid_argument);
+ ASSERT_DEATH(GeoLib::Grid<GeoLib::Point> grid(pnts.begin(), pnts.end()), "");
}
TEST(GeoLib, InsertOnePointInGrid)
diff --git a/Tests/GeoLib/TestPointVec.cpp b/Tests/GeoLib/TestPointVec.cpp
index ddedaa7b607..9d4247770cf 100644
--- a/Tests/GeoLib/TestPointVec.cpp
+++ b/Tests/GeoLib/TestPointVec.cpp
@@ -46,14 +46,14 @@ protected:
// Testing nullptr input vector.
TEST_F(PointVecTest, TestPointVecCtorNullptr)
{
- ASSERT_ANY_THROW(GeoLib::PointVec(name, nullptr));
+ ASSERT_DEATH(GeoLib::PointVec(name, nullptr), "");
delete ps_ptr;
}
// Testing empty input vector.
TEST_F(PointVecTest, TestPointVecCtorEmpty)
{
- ASSERT_ANY_THROW(GeoLib::PointVec(name, ps_ptr));
+ ASSERT_DEATH(GeoLib::PointVec(name, ps_ptr), "");
}
// Testing input vector with single point.
@@ -61,7 +61,7 @@ TEST_F(PointVecTest, TestPointVecCtorSinglePoint)
{
ps_ptr->push_back(new GeoLib::Point(0,0,0,0));
GeoLib::PointVec* point_vec = nullptr;
- ASSERT_NO_THROW(point_vec = new GeoLib::PointVec(name, ps_ptr));
+ point_vec = new GeoLib::PointVec(name, ps_ptr);
ASSERT_EQ(std::size_t(1), point_vec->size());
delete point_vec;
@@ -74,7 +74,7 @@ TEST_F(PointVecTest, TestPointVecCtorTwoDiffPoints)
ps_ptr->push_back(new GeoLib::Point(1,0,0,1));
GeoLib::PointVec* point_vec = nullptr;
- ASSERT_NO_THROW(point_vec = new GeoLib::PointVec(name, ps_ptr));
+ point_vec = new GeoLib::PointVec(name, ps_ptr);
ASSERT_EQ(std::size_t(2), point_vec->size());
delete point_vec;
@@ -87,7 +87,7 @@ TEST_F(PointVecTest, TestPointVecCtorTwoEqualPoints)
ps_ptr->push_back(new GeoLib::Point(0,0,0,1));
GeoLib::PointVec* point_vec = nullptr;
- ASSERT_NO_THROW(point_vec = new GeoLib::PointVec(name, ps_ptr));
+ point_vec = new GeoLib::PointVec(name, ps_ptr);
ASSERT_EQ(std::size_t(1), point_vec->size());
delete point_vec;
@@ -187,7 +187,7 @@ TEST_F(PointVecTest, TestPointVecCtorRandomPoints)
generateRandomPoints(10000);
GeoLib::PointVec* point_vec = nullptr;
- ASSERT_NO_THROW(point_vec = new GeoLib::PointVec(name, ps_ptr));
+ point_vec = new GeoLib::PointVec(name, ps_ptr);
delete point_vec;
}
@@ -196,8 +196,8 @@ TEST_F(PointVecTest, TestPointVecCtorRandomPointsLargeEps)
generateRandomPoints(10000);
GeoLib::PointVec* point_vec = nullptr;
- ASSERT_NO_THROW(point_vec = new GeoLib::PointVec(name, ps_ptr,
- nullptr, GeoLib::PointVec::PointType::POINT, 1e-2));
+ point_vec = new GeoLib::PointVec(name, ps_ptr,
+ nullptr, GeoLib::PointVec::PointType::POINT, 1e-2);
delete point_vec;
}
diff --git a/Tests/MeshLib/MeshSubsets.cpp b/Tests/MeshLib/MeshSubsets.cpp
index 23127ca8cd7..fa25854940b 100644
--- a/Tests/MeshLib/MeshSubsets.cpp
+++ b/Tests/MeshLib/MeshSubsets.cpp
@@ -30,9 +30,11 @@ TEST(MeshLibMeshSubsets, UniqueMeshIds)
MeshSubset const* const mesh_subsets[3] = {&ms0, &ms1, &ms1a};
- EXPECT_NO_THROW(MeshSubsets(&mesh_subsets[0], &mesh_subsets[0] + 2));
- EXPECT_THROW(MeshSubsets(&mesh_subsets[1], &mesh_subsets[1] + 2), std::logic_error);
- EXPECT_THROW(MeshSubsets(&mesh_subsets[0], &mesh_subsets[0] + 3), std::logic_error);
+ // EXPECT_NO_DEATH
+ MeshSubsets(&mesh_subsets[0], &mesh_subsets[0] + 2);
+
+ EXPECT_DEATH(MeshSubsets(&mesh_subsets[1], &mesh_subsets[1] + 2), "");
+ EXPECT_DEATH(MeshSubsets(&mesh_subsets[0], &mesh_subsets[0] + 3), "");
}
--
GitLab