Allow fixtures to be used with async tests

PiperOrigin-RevId: 802212419

Author: cramertj

.github/workflows/ci.yml

@@ -93,7 +93,7 @@ jobs:
     name: test (no default features) / ubuntu / ${{ matrix.toolchain }}
     strategy:
       matrix:
-        toolchain: [stable, 1.70.0]
+        toolchain: [stable, 1.85.0]
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       - name: Install ${{ matrix.toolchain }}
@@ -108,7 +108,7 @@ jobs:
     name: integration-test / ubuntu / ${{ matrix.toolchain }}
     strategy:
       matrix:
-        toolchain: [stable, 1.70.0, nightly, beta]
+        toolchain: [stable, 1.85.0, nightly, beta]
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       - name: Install ${{ matrix.toolchain }}

README.md

@@ -28,7 +28,7 @@ This library brings the rich assertion types of Google's C++ testing library
  * A new set of assertion macros offering similar functionality to those of
    [GoogleTest](https://google.github.io/googletest/primer.html#assertions).
 
-**The minimum supported Rust version is 1.70**.
+**The minimum supported Rust version is 1.85**.
 
 > :warning: The API is not fully stable and may still be changed until we
 > publish version 1.0.

googletest/Cargo.toml

@@ -22,7 +22,7 @@ repository = "https://github.com/google/googletest-rust"
 readme = "../README.md"
 license = "Apache-2.0"
 edition = "2021"
-rust-version = "1.70.0"
+rust-version = "1.85.0"  # Needed for async closures.
 authors = [
   "Bradford Hovinen <hovinen@google.com>",
   "Bastien Jacot-Guillarmod <bjacotg@google.com>",

googletest/src/fixtures.rs

@@ -24,7 +24,7 @@ use std::{
 /// test function.
 ///
 /// ```ignore
-/// strct MyFixture { ... }
+/// struct MyFixture { ... }
 ///
 /// impl Fixture for MyFixture { ... }
 ///
@@ -54,7 +54,7 @@ pub trait Fixture: Sized {
 /// a test function.
 ///
 /// ```ignore
-/// strct MyFixture { ... }
+/// struct MyFixture { ... }
 ///
 /// impl ConsumableFixture for MyFixture { ... }
 ///
@@ -100,7 +100,7 @@ impl<T> DerefMut for FixtureOf<T> {
 /// argument to a test function.
 ///
 /// ```ignore
-/// strct MyFixture{ ... }
+/// struct MyFixture{ ... }
 ///
 /// impl StaticFixture for MyFixture { ... }
 ///
@@ -214,22 +214,40 @@ mod tests {
 
     #[test]
     #[should_panic(expected = "Whoooops")]
-    fn fixture_teardown_called_even_if_test_fail(_: &PanickyFixture) {
-        panic!("Test failed");
+    fn fixture_teardown_called_even_if_test_fail(_: &PanickyFixture) -> Result<()> {
+        Err(googletest::TestAssertionFailure::create("It must fail!".into()))
     }
 
-    struct FailingTearDown;
+    struct AbortIfNotTornDownFixture {
+        has_been_torn_down: bool,
+    }
 
-    impl Fixture for FailingTearDown {
+    impl Fixture for AbortIfNotTornDownFixture {
         fn set_up() -> crate::Result<Self> {
-            Ok(Self)
+            Ok(Self { has_been_torn_down: false })
         }
+        fn tear_down(mut self) -> crate::Result<()> {
+            self.has_been_torn_down = true;
+            Ok(())
+        }
+    }
 
-        fn tear_down(self) -> crate::Result<()> {
-            Err(googletest::TestAssertionFailure::create("It must fail!".into()))
+    impl Drop for AbortIfNotTornDownFixture {
+        fn drop(&mut self) {
+            if !self.has_been_torn_down {
+                eprintln!("AbortIfNotTornDownFixture was not torn down");
+                std::process::abort();
+            }
         }
     }
 
+    #[test]
+    #[should_panic(expected = "simple_fail")]
+    fn fixture_torn_down_after_test_panics(f: &AbortIfNotTornDownFixture) {
+        expect_that!(f.has_been_torn_down, eq(false));
+        panic!("simple_fail");
+    }
+
     struct OnlyOnce;
 
     impl StaticFixture for OnlyOnce {
@@ -263,9 +281,9 @@ mod tests {
     #[test]
     fn static_fixture_two_different_static_fixtures(_: &&OnlyOnce, _: &&AnotherStaticFixture) {}
 
-    struct FailingFixture;
+    struct FailingSetUp;
 
-    impl Fixture for FailingFixture {
+    impl Fixture for FailingSetUp {
         fn set_up() -> crate::Result<Self> {
             Err(googletest::TestAssertionFailure::create("sad fixture".into()))
         }
@@ -277,5 +295,23 @@ mod tests {
 
     #[test]
     #[should_panic(expected = "See failure output above")]
-    fn failing_fixture_causes_test_failure(_: &FailingFixture) {}
+    fn failing_fixture_causes_test_failure(_: &FailingSetUp) {
+        unreachable!()
+    }
+
+    struct FailingTearDown;
+
+    impl Fixture for FailingTearDown {
+        fn set_up() -> crate::Result<Self> {
+            Ok(Self)
+        }
+
+        fn tear_down(self) -> crate::Result<()> {
+            Err(googletest::TestAssertionFailure::create("It must fail!".into()))
+        }
+    }
+
+    #[test]
+    #[should_panic(expected = "See failure output above")]
+    fn failing_teardown_causes_test_failure(_: &FailingTearDown) {}
 }

googletest/src/lib.rs

@@ -324,3 +324,45 @@ impl<T> OrFail for Option<T> {
         }
     }
 }
+
+#[doc(hidden)]
+pub mod __internal_macro_support {
+    use crate::fixtures::Fixture;
+
+    pub struct FixtureTearDownOnDrop<T: Fixture> {
+        fixture: Option<T>,
+    }
+
+    impl<T: Fixture> FixtureTearDownOnDrop<T> {
+        pub fn new(fixture: T) -> Self {
+            Self { fixture: Some(fixture) }
+        }
+        pub fn tear_down(mut self) -> crate::Result<()> {
+            if let Some(fixture) = self.fixture.take() {
+                fixture.tear_down()
+            } else {
+                Ok(())
+            }
+        }
+    }
+
+    impl<T: Fixture> AsRef<T> for FixtureTearDownOnDrop<T> {
+        fn as_ref(&self) -> &T {
+            self.fixture.as_ref().unwrap()
+        }
+    }
+
+    impl<T: Fixture> AsMut<T> for FixtureTearDownOnDrop<T> {
+        fn as_mut(&mut self) -> &mut T {
+            self.fixture.as_mut().unwrap()
+        }
+    }
+
+    impl<T: Fixture> Drop for FixtureTearDownOnDrop<T> {
+        fn drop(&mut self) {
+            if let Some(fixture) = self.fixture.take() {
+                fixture.tear_down().unwrap();
+            }
+        }
+    }
+}