Skip to content

GitLab

Commit 0fc5466d authored by Abseil Team's avatar Abseil Team Committed by Gennadiy Civil
Browse files

Googletest export 

Project import generated by Copybara.
Including recently accepted and merged PRs

PiperOrigin-RevId: 213856848
parent 0f7f5cd9
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 106 deletions
googletest/include/gtest/internal/gtest-internal.h
View file @ 0fc5466d
...@@ -1189,18 +1189,6 @@ class NativeArray { ...@@ -1189,18 +1189,6 @@ class NativeArray {
GTEST_DISALLOW_ASSIGN_(NativeArray); GTEST_DISALLOW_ASSIGN_(NativeArray);
}; };
class AdditionalMessage {
public:
AdditionalMessage(const char* message) : msg(message) {}
void set(const std::string& message) { msg = message; }
operator bool() const { return true; }
const std::string& get() const { return msg; }
private:
std::string msg;
};
} // namespace internal } // namespace internal
} // namespace testing } // namespace testing
...@@ -1226,60 +1214,45 @@ class AdditionalMessage { ...@@ -1226,60 +1214,45 @@ class AdditionalMessage {
#define GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement) \ #define GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement) \
if (::testing::internal::AlwaysTrue()) { statement; } if (::testing::internal::AlwaysTrue()) { statement; }
#define GTEST_TEST_THROW_(statement, expected_exception, fail) \ #define GTEST_TEST_THROW_(statement, expected_exception, fail) \
GTEST_AMBIGUOUS_ELSE_BLOCKER_ \ GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
if (::testing::internal::AdditionalMessage message = "") { \ if (::testing::internal::ConstCharPtr gtest_msg = "") { \
bool gtest_caught_expected = false; \ bool gtest_caught_expected = false; \
try { \ try { \
try { \ GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \ } \
} catch (expected_exception const&) { \ catch (expected_exception const&) { \
gtest_caught_expected = true; \ gtest_caught_expected = true; \
throw; \ } \
} \ catch (...) { \
} catch (const std::exception& e) { \ gtest_msg.value = \
if (!gtest_caught_expected) { \ "Expected: " #statement " throws an exception of type " \
message.set( \ #expected_exception ".\n Actual: it throws a different type."; \
"it throws a different type " \ goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \
"with message: " + \ } \
std::string(e.what())); \ if (!gtest_caught_expected) { \
goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \ gtest_msg.value = \
} \ "Expected: " #statement " throws an exception of type " \
} catch (...) { \ #expected_exception ".\n Actual: it throws nothing."; \
if (!gtest_caught_expected) { \ goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \
message.set("it throws a different type."); \ } \
goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \ } else \
} \ GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__): \
} \ fail(gtest_msg.value)
if (!gtest_caught_expected) { \
message.set("it throws nothing."); \ #define GTEST_TEST_NO_THROW_(statement, fail) \
goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \ GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
} \ if (::testing::internal::AlwaysTrue()) { \
} else \ try { \
GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__) \ GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
: fail(("Expected: " #statement \ } \
" throws an exception of type " #expected_exception \ catch (...) { \
".\n Actual: " + \ goto GTEST_CONCAT_TOKEN_(gtest_label_testnothrow_, __LINE__); \
message.get()) \ } \
.c_str()) } else \
GTEST_CONCAT_TOKEN_(gtest_label_testnothrow_, __LINE__): \
#define GTEST_TEST_NO_THROW_(statement, fail) \ fail("Expected: " #statement " doesn't throw an exception.\n" \
GTEST_AMBIGUOUS_ELSE_BLOCKER_ \ " Actual: it throws.")
if (::testing::internal::AdditionalMessage message = ".") { \
try { \
GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
} catch (const std::exception& e) { \
message.set(std::string(": ") + e.what()); \
goto GTEST_CONCAT_TOKEN_(gtest_label_testnothrow_, __LINE__); \
} catch (...) { \
goto GTEST_CONCAT_TOKEN_(gtest_label_testnothrow_, __LINE__); \
} \
} else \
GTEST_CONCAT_TOKEN_(gtest_label_testnothrow_, __LINE__) \
: fail(("Expected: " #statement " doesn't throw an exception.\n" \
" Actual: it throws" + \
message.get()) \
.c_str())
#define GTEST_TEST_ANY_THROW_(statement, fail) \ #define GTEST_TEST_ANY_THROW_(statement, fail) \
GTEST_AMBIGUOUS_ELSE_BLOCKER_ \ GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
......
googletest/test/gtest_unittest.cc
View file @ 0fc5466d
...@@ -3328,7 +3328,6 @@ TEST_F(SingleEvaluationTest, OtherCases) { ...@@ -3328,7 +3328,6 @@ TEST_F(SingleEvaluationTest, OtherCases) {
void ThrowAnInteger() { void ThrowAnInteger() {
throw 1; throw 1;
} }
void ThrowAnException(const char* what) { throw std::runtime_error(what); }
// Tests that assertion arguments are evaluated exactly once. // Tests that assertion arguments are evaluated exactly once.
TEST_F(SingleEvaluationTest, ExceptionTests) { TEST_F(SingleEvaluationTest, ExceptionTests) {
...@@ -3371,26 +3370,6 @@ TEST_F(SingleEvaluationTest, ExceptionTests) { ...@@ -3371,26 +3370,6 @@ TEST_F(SingleEvaluationTest, ExceptionTests) {
// failed EXPECT_ANY_THROW // failed EXPECT_ANY_THROW
EXPECT_NONFATAL_FAILURE(EXPECT_ANY_THROW(a_++), "it doesn't"); EXPECT_NONFATAL_FAILURE(EXPECT_ANY_THROW(a_++), "it doesn't");
EXPECT_EQ(7, a_); EXPECT_EQ(7, a_);
// failed EXPECT_THROW std::exception, throws different
EXPECT_NONFATAL_FAILURE(EXPECT_THROW(
{ // NOLINT
a_++;
ThrowAnInteger();
},
std::exception),
"throws a different type");
EXPECT_EQ(8, a_);
// failed EXPECT_THROW, throws std::exception
EXPECT_NONFATAL_FAILURE(EXPECT_THROW(
{ // NOLINT
a_++;
ThrowAnException("blablubb");
},
bool),
"throws a different type with message: blablubb");
EXPECT_EQ(9, a_);
} }
#endif // GTEST_HAS_EXCEPTIONS #endif // GTEST_HAS_EXCEPTIONS
...@@ -3823,11 +3802,6 @@ TEST(AssertionTest, ASSERT_THROW) { ...@@ -3823,11 +3802,6 @@ TEST(AssertionTest, ASSERT_THROW) {
ASSERT_THROW(ThrowNothing(), bool), ASSERT_THROW(ThrowNothing(), bool),
"Expected: ThrowNothing() throws an exception of type bool.\n" "Expected: ThrowNothing() throws an exception of type bool.\n"
" Actual: it throws nothing."); " Actual: it throws nothing.");
EXPECT_FATAL_FAILURE(
ASSERT_THROW(ThrowAnException("b"), bool),
"Expected: ThrowAnException(\"b\") throws an exception of type bool.\n"
" Actual: it throws a different type with message: b");
} }
// Tests ASSERT_NO_THROW. // Tests ASSERT_NO_THROW.
...@@ -3836,9 +3810,6 @@ TEST(AssertionTest, ASSERT_NO_THROW) { ...@@ -3836,9 +3810,6 @@ TEST(AssertionTest, ASSERT_NO_THROW) {
EXPECT_FATAL_FAILURE(ASSERT_NO_THROW(ThrowAnInteger()), EXPECT_FATAL_FAILURE(ASSERT_NO_THROW(ThrowAnInteger()),
"Expected: ThrowAnInteger() doesn't throw an exception." "Expected: ThrowAnInteger() doesn't throw an exception."
"\n Actual: it throws."); "\n Actual: it throws.");
EXPECT_FATAL_FAILURE(ASSERT_NO_THROW(ThrowAnException("blablubb")),
"Expected: ThrowAnException(\"blablubb\") doesn't throw"
" an exception.\n Actual: it throws: blablubb");
} }
// Tests ASSERT_ANY_THROW. // Tests ASSERT_ANY_THROW.
...@@ -4565,17 +4536,13 @@ TEST(ExpectTest, EXPECT_GT) { ...@@ -4565,17 +4536,13 @@ TEST(ExpectTest, EXPECT_GT) {
// Tests EXPECT_THROW. // Tests EXPECT_THROW.
TEST(ExpectTest, EXPECT_THROW) { TEST(ExpectTest, EXPECT_THROW) {
EXPECT_THROW(ThrowAnInteger(), int); EXPECT_THROW(ThrowAnInteger(), int);
EXPECT_THROW(ThrowAnException(""), std::exception);
EXPECT_NONFATAL_FAILURE(EXPECT_THROW(ThrowAnInteger(), bool), EXPECT_NONFATAL_FAILURE(EXPECT_THROW(ThrowAnInteger(), bool),
"Expected: ThrowAnInteger() throws an exception of " "Expected: ThrowAnInteger() throws an exception of "
"type bool.\n Actual: it throws a different type."); "type bool.\n Actual: it throws a different type.");
EXPECT_NONFATAL_FAILURE(EXPECT_THROW(ThrowNothing(), bool), EXPECT_NONFATAL_FAILURE(
"Expected: ThrowNothing() throws an exception of " EXPECT_THROW(ThrowNothing(), bool),
"type bool.\n Actual: it throws nothing."); "Expected: ThrowNothing() throws an exception of type bool.\n"
EXPECT_NONFATAL_FAILURE(EXPECT_THROW(ThrowAnException("buuh"), bool), " Actual: it throws nothing.");
"Expected: ThrowAnException(\"buuh\") throws an "
"exception of type bool.\n Actual: "
"it throws a different type with message: buuh");
} }
// Tests EXPECT_NO_THROW. // Tests EXPECT_NO_THROW.
...@@ -4584,9 +4551,6 @@ TEST(ExpectTest, EXPECT_NO_THROW) { ...@@ -4584,9 +4551,6 @@ TEST(ExpectTest, EXPECT_NO_THROW) {
EXPECT_NONFATAL_FAILURE(EXPECT_NO_THROW(ThrowAnInteger()), EXPECT_NONFATAL_FAILURE(EXPECT_NO_THROW(ThrowAnInteger()),
"Expected: ThrowAnInteger() doesn't throw an " "Expected: ThrowAnInteger() doesn't throw an "
"exception.\n Actual: it throws."); "exception.\n Actual: it throws.");
EXPECT_NONFATAL_FAILURE(EXPECT_NO_THROW(ThrowAnException("blah")),
"Expected: ThrowAnException(\"blah\") doesn't "
"throw an exception.\n Actual: it throws: blah");
} }
// Tests EXPECT_ANY_THROW. // Tests EXPECT_ANY_THROW.
......
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