Googletest export

Project import generated by Copybara.

PiperOrigin-RevId: 214456152

googletest/include/gtest/internal/gtest-internal.h

@@ -1189,18 +1189,6 @@ class NativeArray {
   GTEST_DISALLOW_ASSIGN_(NativeArray);
 };
 
-class AdditionalMessage {
- public:
-  explicit AdditionalMessage(const char* message) : msg_value_(message) {}
-  void set(const std::string& message) { msg_value_ = message; }
-  explicit operator bool() const { return true; }
-
-  const std::string& get() const { return msg_value_; }
-
- private:
-  std::string msg_value_;
-};
-
 }  // namespace internal
 }  // namespace testing
 
@@ -1228,56 +1216,43 @@ class AdditionalMessage {
 
 #define GTEST_TEST_THROW_(statement, expected_exception, fail) \
   GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
-  if (::testing::internal::AdditionalMessage message{""}) {         \
+  if (::testing::internal::ConstCharPtr gtest_msg = "") { \
     bool gtest_caught_expected = false; \
-    try {                                                           \
     try { \
       GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
-      } catch (expected_exception const&) {                         \
+    } \
+    catch (expected_exception const&) { \
       gtest_caught_expected = true; \
-        throw;                                                      \
     } \
-    } catch (const std::exception& e) {                             \
+    catch (...) { \
-      if (!gtest_caught_expected) {                                 \
+      gtest_msg.value = \
-        message.set("it throws a different type with message: " +   \
+          "Expected: " #statement " throws an exception of type " \
-                    std::string(e.what()));                         \
+          #expected_exception ".\n  Actual: it throws a different type."; \
       goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \
     } \
-    } catch (...) {                                                 \
     if (!gtest_caught_expected) { \
-        message.set("it throws a different type.");                 \
+      gtest_msg.value = \
-        goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \
+          "Expected: " #statement " throws an exception of type " \
-      }                                                             \
+          #expected_exception ".\n  Actual: it throws nothing."; \
-    }                                                               \
-    if (!gtest_caught_expected) {                                   \
-      message.set("it throws nothing.");                            \
       goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \
     } \
   } else \
-    GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__)           \
+    GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__): \
-        : fail(("Expected: " #statement                             \
+      fail(gtest_msg.value)
-                " throws an exception of type " #expected_exception \
-                ".\n  Actual: " +                                   \
-                message.get())                                      \
-                   .c_str())
 
 #define GTEST_TEST_NO_THROW_(statement, fail) \
   GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
-  if (::testing::internal::AdditionalMessage message{"."}) {             \
+  if (::testing::internal::AlwaysTrue()) { \
     try { \
       GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \
-    } catch (const std::exception& e) {                                  \
+    } \
-      message.set(std::string(": ") + e.what());                         \
+    catch (...) { \
-      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__)              \
+    GTEST_CONCAT_TOKEN_(gtest_label_testnothrow_, __LINE__): \
-        : fail(("Expected: " #statement " doesn't throw an exception.\n" \
+      fail("Expected: " #statement " doesn't throw an exception.\n" \
-                "  Actual: it throws" +                                  \
+           "  Actual: it throws.")
-                message.get())                                           \
-                   .c_str())
 
 #define GTEST_TEST_ANY_THROW_(statement, fail) \
   GTEST_AMBIGUOUS_ELSE_BLOCKER_ \

googletest/test/gtest_unittest.cc

@@ -3328,7 +3328,6 @@ TEST_F(SingleEvaluationTest, OtherCases) {
 void ThrowAnInteger() {
   throw 1;
 }
-void ThrowAnException(const char* what) { throw std::runtime_error(what); }
 
 // Tests that assertion arguments are evaluated exactly once.
 TEST_F(SingleEvaluationTest, ExceptionTests) {
@@ -3371,26 +3370,6 @@ TEST_F(SingleEvaluationTest, ExceptionTests) {
   // failed EXPECT_ANY_THROW
   EXPECT_NONFATAL_FAILURE(EXPECT_ANY_THROW(a_++), "it doesn't");
   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
@@ -3823,11 +3802,6 @@ TEST(AssertionTest, ASSERT_THROW) {
       ASSERT_THROW(ThrowNothing(), bool),
       "Expected: ThrowNothing() throws an exception of type bool.\n"
       "  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.
@@ -3836,9 +3810,6 @@ TEST(AssertionTest, ASSERT_NO_THROW) {
   EXPECT_FATAL_FAILURE(ASSERT_NO_THROW(ThrowAnInteger()),
                        "Expected: ThrowAnInteger() doesn't throw an exception."
                        "\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.
@@ -4565,17 +4536,13 @@ TEST(ExpectTest, EXPECT_GT) {
 // Tests EXPECT_THROW.
 TEST(ExpectTest, EXPECT_THROW) {
   EXPECT_THROW(ThrowAnInteger(), int);
-  EXPECT_THROW(ThrowAnException(""), std::exception);
   EXPECT_NONFATAL_FAILURE(EXPECT_THROW(ThrowAnInteger(), bool),
                           "Expected: ThrowAnInteger() throws an exception of "
                           "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.
@@ -4584,9 +4551,6 @@ TEST(ExpectTest, EXPECT_NO_THROW) {
   EXPECT_NONFATAL_FAILURE(EXPECT_NO_THROW(ThrowAnInteger()),
                           "Expected: ThrowAnInteger() doesn't throw an "
                           "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.