Merge pull request #255 from google:replace-test-return-type

PiperOrigin-RevId: 546303798

Author: copybara-github

googletest/src/internal/test_outcome.rs

@@ -62,14 +62,16 @@ impl TestOutcome {
     ///
     /// **For internal use only. API stablility is not guaranteed!**
     #[doc(hidden)]
-    pub fn close_current_test_outcome<E: Display>(inner_result: Result<(), E>) -> Result<(), ()> {
+    pub fn close_current_test_outcome<E: Display>(
+        inner_result: Result<(), E>,
+    ) -> Result<(), TestFailure> {
         TestOutcome::with_current_test_outcome(|mut outcome| {
             let outer_result = match &*outcome {
                 Some(TestOutcome::Success) => match inner_result {
                     Ok(()) => Ok(()),
-                    Err(_) => Err(()),
+                    Err(_) => Err(TestFailure),
                 },
-                Some(TestOutcome::Failure) => Err(()),
+                Some(TestOutcome::Failure) => Err(TestFailure),
                 None => {
                     panic!("No test context found. This indicates a bug in GoogleTest.")
                 }
@@ -114,6 +116,29 @@ No test context found.
     }
 }
 
+/// A marking struct indicating that a test has failed.
+///
+/// This exists to implement the [Error][std::error::Error] trait. It displays
+/// to a message indicating that the actual test assertion failure messages are
+/// in the text above.
+pub struct TestFailure;
+
+impl std::error::Error for TestFailure {}
+
+impl std::fmt::Debug for TestFailure {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), Error> {
+        writeln!(f, "See failure output above")?;
+        Ok(())
+    }
+}
+
+impl std::fmt::Display for TestFailure {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), Error> {
+        writeln!(f, "See failure output above")?;
+        Ok(())
+    }
+}
+
 /// A report that a single test assertion failed.
 ///
 /// **For internal use only. API stablility is not guaranteed!**

googletest_macro/src/lib.rs

@@ -95,7 +95,7 @@ pub fn test(
     };
     let function = quote! {
         #(#attrs)*
-        #sig -> std::result::Result<(), ()> {
+        #sig -> std::result::Result<(), googletest::internal::test_outcome::TestFailure> {
             #maybe_closure
             use googletest::internal::test_outcome::TestOutcome;
             TestOutcome::init_current_test_outcome();